SecondNavigation meni za napredne statuse

admin/survey/SurveyAdmin.php

@@ -1958,7 +1958,8 @@ class SurveyAdmin
 			|| $this->first_action == 'langStatistic'
 			|| $this->first_action == 'usable_resp'
 			|| $this->first_action == 'speeder_index'
-			|| $this->first_action == 'reminder_tracking') {
+			|| $this->first_action == 'reminder_tracking'
+            || $this->first_action == 'status_advanced') {
 
             echo '<ul class="secondNavigation">';
 
@@ -1991,7 +1992,15 @@ class SurveyAdmin
             echo '<li class="space"></li>';
             //}
 
-            # usable respondents
+            # Gumb za novo stran napredni statusi
+            echo '<li>';
+            echo '<a class="no-img' . ($_GET['a'] == A_STATUS_ADVANCED ? ' active' : '') . '"'
+                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
+            echo $lang['srv_status_advanced'] . '</a>';
+            echo '</li>';
+            echo '<li class="space"></li>';
+
+            /*# usable respondents
             echo '<li>';
             echo '<a class="no-img' . ($_GET['a'] == A_USABLE_RESP ? ' active' : '') . '"'
                 . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_USABLE_RESP . '" title="' . $lang['srv_usable_respondents'] . '">';
@@ -2098,7 +2107,7 @@ class SurveyAdmin
                     echo '</li>';
                     echo '<li class="space"></li>';
                 }
-            }
+            }*/
 
             echo '</ul>';
         }
@@ -2211,6 +2220,9 @@ class SurveyAdmin
         elseif($_GET['a'] == 'nonresponse_graph'){
             $podstran = 'para_analysis_graph';
         }
+        elseif($_GET['a'] == 'status_advanced'){
+            $podstran = 'status_advanced';
+        }
 
         // Izrisemo ustrezen meni, ce je prisoten
         if($podstran != ''){
@@ -2438,6 +2450,8 @@ class SurveyAdmin
     }
 
     private function displayAnketaTabStatus(){
+    
+    global $lang;
         
         // Osnovni statusi
         if ($_GET['a'] == A_REPORTI) { 
@@ -2534,7 +2548,112 @@ class SurveyAdmin
             echo '	<div id="surveyStatistic">';
             $ss->DisplayLangStatistic();
             echo '	</div>';
-        } 
+        }
+        //prikaze napredne statuse
+        elseif ($_GET['a'] == A_STATUS_ADVANCED) { 
+            echo '<div class="status_advanced">';
+            
+                // Uporabni respondenti   
+                echo '<div class="status_advanced_box" name="status_advanced_box1" id="status_advanced_box1" >';
+                echo '<a class="no-img' . ($_GET['a'] == A_USABLE_RESP ? ' active' : '') . '"'
+                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_USABLE_RESP . '" title="' . $lang['srv_usable_respondents'] . '">';
+                echo $lang['srv_usable_respondents'] . '</a>';
+                echo '</div>';
+                    
+                // Kakovost respondentov - v delu, zaenkrat samo admini
+                if ($admin_type === '0') {
+                    echo '<div class="status_advanced_box" name="status_advanced_box2" id="status_advanced_box2" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_KAKOVOST_RESP ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KAKOVOST_RESP . '" title="' . $lang['srv_kakovost'] . '">';
+                    echo $lang['srv_kakovost'] . '</a>';
+                    echo '</div>';
+                }
+                
+                // Index hitrosti - v delu, zaenkrat samo admini
+                if ($admin_type === '0') {
+                    echo '<div class="status_advanced_box" name="status_advanced_box3" id="status_advanced_box3" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_SPEEDER_INDEX ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_SPEEDER_INDEX . '" title="' . $lang['srv_speeder_index'] . '">';
+                    echo $lang['srv_speeder_index'] . '</a>';
+                    echo '</div>';
+                }
+                
+                // Analiza besedil
+                if ($admin_type === '0' || $admin_type === '1') {
+                    echo '<div class="status_advanced_box" name="status_advanced_box4" id="status_advanced_box4" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_TEXT_ANALYSIS ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TEXT_ANALYSIS . '" title="' . $lang['srv_text_analysis'] . '">';
+                    echo $lang['srv_text_analysis'] . '</a>';
+                    echo '</div>';
+                }
+                
+                // IP lokacija - gorenje ima to ugasnjeno, volitve imajo tudi ugasnjeno
+                if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) {
+                    echo '<div class="status_advanced_box" name="status_advanced_box5" id="status_advanced_box5" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_GEOIP_LOCATION ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_GEOIP_LOCATION . '" title="' . $lang['srv_geoip_location'] . '">';
+                    echo $lang['srv_geoip_location'] . '</a>';
+                    echo '</div>';
+                }
+                
+                // Analize urejanja - v delu, zaenkrat samo admini
+                if ($admin_type === '0') {
+                    echo '<div class="status_advanced_box" name="status_advanced_box6" id="status_advanced_box6" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_EDITS_ANALYSIS ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_EDITS_ANALYSIS . '" title="' . $lang['srv_edits_analysis'] . '">';
+                    echo $lang['srv_edits_analysis'] . '</a>';
+                    echo '</div>';
+                }
+                
+                // reminder tracking - pokazi, ce je admin in so vklopljeni napredni parapodatki
+                $survey_track_reminders = SurveySetting::getInstance()->getSurveyMiscSetting('survey_track_reminders');
+                if ($survey_track_reminders == '') $survey_track_reminders = 0;    
+                if (($admin_type === '0' || $admin_type === '1') && SurveyInfo::getInstance()->checkSurveyModule('advanced_paradata')) {    
+                    echo '<div class="status_advanced_box" name="status_advanced_box7" id="status_advanced_box7" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_REMINDER_TRACKING ? ' active' : '') . '"'
+                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_REMINDER_TRACKING . '&m='. A_REMINDER_TRACKING_RECNUM .'" title="' . $lang['srv_reminder_tracking'] . '">';
+                    echo $lang['srv_reminder_tracking'] . '</a>';
+                    echo '</div>';
+                }
+
+                // ul evalvacija
+                if (Common::checkModule('evalvacija') == '1') {
+                    echo '<div class="status_advanced_box" name="status_advanced_box8" id="status_advanced_box8" >';
+                    echo '<a class="no-img' . ($_GET['a'] == A_UL_EVALVATION ? ' active' : '') . '"'
+                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_UL_EVALVATION . '" title="UL evalvacije">';
+                    echo 'UL evalvacije</a>';
+                    echo '</div>';
+                }
+
+                // AAPOR
+                // aapor naj bo viden samo če so vabila
+                if (SurveyInfo::getSurveyColumn('user_base') == 1 || SurveyInfo::getInstance()->checkSurveyModule('email')) {
+                    echo '<div class="status_advanced_box" name="status_advanced_box9" id="status_advanced_box9" >';
+                    echo '<a class="no-img' . ($_GET['a'] == 'AAPOR' ? ' active' : '') . '"'
+                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=AAPOR&m=aapor1" title="' . $lang['srv_aapor'] . '">';
+                    echo $lang['srv_aapor'] . '</a>';
+                    echo '</div>';
+                }
+
+                // langStatistic
+                // langStatistic naj bo viden samo če imamo različne jezike in nimamo volitev
+                if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) {
+
+                    $qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language";
+                    $qry = (sisplet_query($qry_string));
+                    $cntLang = mysqli_num_rows($qry);
+
+                    if ($cntLang > 1) {
+                        echo '<div class="status_advanced_box" name="status_advanced_box10" id="status_advanced_box10" >';
+                        echo '<a class="no-img' . ($_GET['a'] == 'langStatistic' ? ' active' : '') . '"'
+                            . ' href="index.php?anketa=' . $this->anketa . '&amp;a=langStatistic" title="' . $lang['srv_languages_statistics'] . '">';
+                        echo $lang['srv_languages_statistics'] . '</a>';
+                        echo '</div>';
+                    }
+                }
+            
+            echo '</div>';
+        }
     }
 
     private function displayAnketaTabUrejanje(){

admin/survey/classes/class.SurveyStaticHtml.php

@@ -342,7 +342,7 @@ class SurveyStaticHtml
   
         if( in_array($data_file_status, array(FILE_STATUS_SRV_DELETED, FILE_STATUS_NO_DATA))
             && in_array($podstran, array(
-                'para_analysis_graph', 'para_graph', 'usable_resp', 
+                'para_analysis_graph', 'para_graph', 'usable_resp', 'status_advanced',
                 'data', 'quick_edit', 'variables', 'export', 
                 'sumarnik', 'descriptor', 'frequency', 'crosstabs', 'ttest', 'means', 'break', 'multicrosstabs', 'charts', 'analysis_links'
             )) ){

admin/survey/classes/tracking/CrossRoad.php

@@ -45,6 +45,7 @@ class CrossRoad {
                 case A_PARA_GRAPH:
                 case 'langStatistic':
                 case 'AAPOR':
+                case A_STATUS_ADVANCED:
                     $first_action = NAVI_STATUS;
                     $second_action = NAVI_STATUS_OSNOVNI;
                     $status = 4;

admin/survey/definition.php

@@ -66,6 +66,7 @@
 	define("A_REMINDER_TRACKING", "reminder_tracking");
 	define("A_REMINDER_TRACKING_RECNUM", "recnum");
 	define("A_REMINDER_TRACKING_VAR", "vars");
+	define("A_STATUS_ADVANCED", "status_advanced");
 
 	#urejanje
 	define("A_BRANCHING", "branching");

lang/1.php

@@ -6356,6 +6356,7 @@ $lang = array (
 	'srv_comments_on_alert2'					=>	'Dodatne nastavitve lahko uredite spodaj.',
 	'srv_off'									=>	'Izklopi',
 	'srv_para_neodgovori'						=>	'Neodgovor spremenljivke',
+	'srv_status_advanced'						=>	'Napredni statusi',
 	'srv_usable_respondents'					=>	'Uporabni respondenti',
 	'srv_kakovost'	            				=>	'Kakovost respondentov',
 	'srv_speeder_index'							=>	'Indeks hitrosti',

lang/2.php

@@ -6241,6 +6241,7 @@ $lang = array (
 	'srv_comments_on_alert2'					=>	'You can edit extra settings below.',
 	'srv_off'									=>	'Turn off',
 	'srv_para_neodgovori'						=>	'Item nonresponse',
+	'srv_status_advanced'						=>	'Advanced statuses',
 	'srv_usable_respondents'					=>	'Usable respondents',
     'srv_kakovost'	            				=>	'Respondents quality',
 	'srv_speeder_index'							=>	'Speeder index',

resources/sass/admin/dashboard/dashboard.scss

@@ -18,4 +18,5 @@ and open the template in the editor.
 @import "edits_analysis";
 @import "language_statistics";
 @import "reminder_tracking";
-@import "other";
+@import "other";
+@import "status_advanced";

resources/sass/admin/dashboard/status_advanced.scss

@@ -0,0 +1,24 @@
+div.status_advanced {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-content: flex-start;
+    justify-content: flex-start;
+    align-items: auto;
+    
+    
+    
+}
+
+div.status_advanced_box {
+    display: flex;
+    border: 1px solid $soft_blue;
+    background-color: $soft_blue_very_lighten;
+    align-items: center;
+    justify-content: center;
+    margin: 10px;
+    padding: 20px;
+    font-size: 16px;
+    flex: 0 1 21%;
+    white-space: nowrap;
+}