From abaf05470dd8e0b2d01e0584f1ecf562178c03ae Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 9 May 2022 14:13:33 +0200
Subject: [PATCH] Redesign popravki napak - manjsi popravki - testiranje,
 analize

---
 admin/survey/SurveyAdminSettings.php                      | 8 ++++----
 admin/survey/classes/class.SurveyAktivnost.php            | 4 +++-
 .../classes/surveyAnalysis/class.SurveyAnalysis.php       | 6 +++---
 admin/survey/classes/surveyAnalysis/class.SurveyBreak.php | 2 +-
 lang/1.php                                                | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 1d7b15226..4748bb9d9 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2481,7 +2481,7 @@ class SurveyAdminSettings {
 
             echo '<tr>';
             echo '<td>'.$row['link'].'</td>';
-            echo '<td><a href="index.php?anketa='.$row['id'].'&a=vabila&m=url">'.$row['naslov'].'</a></td>';
+            echo '<td><a href="index.php?anketa='.$row['id'].'&a=vabila">'.$row['naslov'].'</a></td>';
             echo '</tr>';
         }
 
@@ -5454,8 +5454,8 @@ class SurveyAdminSettings {
 	}
 	function anketa_diagnostika_note($diagnostics,$show_link = false) {
 		global $lang;
+
 		$diagnostics->printNote($show_link);
-			
 	}
 	
 	
@@ -5843,7 +5843,7 @@ class SurveyAdminSettings {
 			
 			echo '</tr>';
 		}
-		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.$skupni_cas.'s</td><td></td></tr>';
+		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.$skupni_cas.'</td><td></td></tr>';
 		echo '</table>';
 		
 		echo '<div class="tabela_trajanje_legenda">';
@@ -6594,7 +6594,7 @@ class SurveyAdminSettings {
 			else
 				$time = $expected_time[$vrstni_red][1];
 
-			echo '<span class="gray"> / '.$predviden_cas.'</span>';
+			echo '<span class="gray"> / '.$predviden_cas.'s</span>';
 		}
 		echo '</td><td></td><td></td>';
 		
diff --git a/admin/survey/classes/class.SurveyAktivnost.php b/admin/survey/classes/class.SurveyAktivnost.php
index 830045102..25e3da7db 100644
--- a/admin/survey/classes/class.SurveyAktivnost.php
+++ b/admin/survey/classes/class.SurveyAktivnost.php
@@ -394,8 +394,10 @@ class SurveyAktivnost{
 			if ($max == -1)
 			    $max = max($row['responses'], $max)*1.3;
 
+            SurveyInfo::getInstance()->SurveyInit($row['ank_id']);
+
 			echo '<tr>';
-			echo '<td><a href="'.SurveyInfo::getSurveyLink($row['ank_id']).'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
+			echo '<td><a href="'.SurveyInfo::getSurveyLink().'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
 			echo '<td class="gray">'.$row['email'].'</td>';
             $sum = $sum + $row['responses'];
             $sum_survey = $sum_survey + 1;
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 300ad8893..90ad0f69d 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -7543,7 +7543,7 @@ class SurveyAnalysis {
 				echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(1);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
 				echo '</div>';
 
-				//echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
+				echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
                 
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';								
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
@@ -7560,7 +7560,7 @@ class SurveyAnalysis {
 				echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(2);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
 				echo '</div>';
 
-				//echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
+				echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
 				
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
@@ -7577,7 +7577,7 @@ class SurveyAnalysis {
 				echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(3);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
 				echo '</div>';
 
-				//echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
+				echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
 				
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';				
 				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
index 0be6e14c6..4eab1442c 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
@@ -1656,7 +1656,7 @@ class SurveyBreak
 		echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(9);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
         echo '</div>';
 
-		//echo '<a href="#" onClick="printAnaliza(\'Break\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
+		echo '<a href="#" onClick="printAnaliza(\'Break\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
 		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_xls&anketa=' . $this->sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';								
 		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis_rtf&anketa=' . $this->sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
 		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=break_izpis&anketa=' . $this->sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf"></span></a>';
diff --git a/lang/1.php b/lang/1.php
index a3842dcf9..6df6836fa 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2829,7 +2829,7 @@ $lang = array (
 	"srv_analiza_opisne_povprecje1"			=>	"Povprečje", // "Povprečna<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek"	=>	"Povpre&#269;je<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek1"	=>	"Povprečje<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
-	"srv_analiza_opisne_odklon"				=>	"Std. Odklon",// "Standardni<br/>odklon",
+	"srv_analiza_opisne_odklon"				=>	"Std. odklon",// "Standardni<br/>odklon",
 	"srv_analiza_opisne_min"				=>	"Minimum", //"Najmanj&#353;a<br/>vrednost",
 	"srv_analiza_opisne_max"				=>	"Maksimum", //"Najve&#269;ja<br/>vrednost",
 	"srv_analiza_opisne_valid"				=>	"Veljavni",