Merge branch 'master' of https://git.1ka.si:/git/1ka

admin/survey/Branching.php

@@ -5519,7 +5519,7 @@ class Branching {
 
             echo '  <div class="variabla_vsota_border"></div>';
 
-			echo '  <div style="width:'.$gridWidth.'%;" id="vsota_'.$row['id'].'" name="vsota" class="variabla_vsota_inline vrednost_inline_vsota" style="display:inline" contenteditable="'.(!$locked?'true':'false').'" '.(strpos($vsota, $lang['srv_vsota_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $vsota . '</div>';
+			echo '  <div style="width:'.$gridWidth.'%;" id="vsota_'.$row['id'].'" name="vsota" class="variabla_vsota_inline vrednost_inline_vsota" style="display:inline; width:'.$gridWidth.'%;" contenteditable="'.(!$locked?'true':'false').'" '.(strpos($vsota, $lang['srv_vsota_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $vsota . '</div>';
             
             echo '  <input type="text" name="foo_' . $row['id'] . '" maxlength="8" size="5" >';
             if ($row['vsota_show'] == 1)
@@ -5868,15 +5868,24 @@ class Branching {
 			echo '          <td></td>';
 			echo '          <td></td>';
 
+            $col = 1;
+            $tip_prev = 0;
+            $id_prev = 0;
+
 			while ($row2 = mysqli_fetch_array($sql2)) {
 							
+                if ($id_prev == 0) $id_prev = $row2['id'];
+
+                if ($tip_prev != $row2['tip']) $col++;
+                    $tip_prev = $row2['tip'];
+                    
  				if ($this->lang_id != null) {
 					save('lang_id', $this->lang_id);					
 					$rowl = \App\Controllers\LanguageController::srv_language_spremenljivka($row2['id']);					
 					if (strip_tags($rowl['naslov']) != '') $row2['naslov'] = $rowl['naslov'];
 				}						
 
-				echo '          <td colspan="'.$row2['grids'].'" class="grid_header" grd="g_'.$row2['id'].'"><div class="naslov_inline grid_subtitle_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
+				echo '          <td colspan="'.$row2['grids'].'" class="grid_header '.($id_prev!=$row2['id']?'col_border ':'').'" grd="g_'.$row2['id'].'"><div class="naslov_inline grid_subtitle_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
 			}
 
 			echo '        </tr>';
@@ -5899,18 +5908,25 @@ class Branching {
 			$sql2 = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red");
 			$row2 = mysqli_fetch_array($sql2);
 
+            $col = 1;
+            $tip_prev = 0;
+            $id_prev = 0;
+
 			for ($i = 1; $i <= mysqli_num_rows($sql2); $i++) {
+
+                if ($id_prev == 0) $id_prev = $row2['id'];
+
+                if ($tip_prev != $row2['tip']) $col++;
+                    $tip_prev = $row2['tip'];
+                    
 				if ($this->lang_id != null) {
 					$naslov = \App\Controllers\LanguageController::srv_language_grid($row2['spr_id'], $row2['id']);
 					if ($naslov != '') $row2['naslov'] = $naslov;
 				}
 
-				if (true) {
+                echo '          <td class="grid_header '.($bg % 2 == 0 ? 'grid_light' : 'grid_dark').' '.($id_prev==$row2['id'] && $col!=2?'col_border ':'').'" grd="g_'.$row2['id'].'"><div class="grid_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row2['id'].'" spr_id="'.$row2['spr_id'].'" '.(strpos($row2['naslov'], $lang['srv_new_grid'])!==false || strpos($row2['naslov'], $lang1['srv_new_grid'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
-					echo '          <td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" grd="g_'.$row2['id'].'"><div class="grid_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row2['id'].'" spr_id="'.$row2['spr_id'].'" '.(strpos($row2['naslov'], $lang['srv_new_grid'])!==false || strpos($row2['naslov'], $lang1['srv_new_grid'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
+                
                 $row2 = mysqli_fetch_array($sql2);
-				} else {
-					echo '          <td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"></td>';
-				}
 			}
 
             echo '        </tr>';

admin/survey/classes/surveyAnalysis/class.SurveyChart.php

@@ -7112,7 +7112,7 @@ class SurveyChart {
 		echo '<div class="analysis_bottom_settings printHide">';
 		
         echo '<div class="comment_holder">';
-		echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'"><span class="faicon comments_creport" ></span>'.$lang['srv_custom_report_comments_add'].'</a>';
+		echo '  <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
 		echo '</div>';
 
 		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';
@@ -7232,14 +7232,9 @@ class SurveyChart {
 		}
 		
 		// Preview vprasanja
-		//SurveyAnalysis::showVariable($spid, $spremenljivka['variable']);
+		echo '<div class="chart_setting_icons">';
-		echo '<div class="chart_setting" style="text-align: center; margin-top: 20px;">';
+		echo '  <span class="variable">'.$spremenljivka['variable'].'</span>';
-		echo '<span style="margin-right: 6px; line-height: 6px; font-weight: 600; font-size: 11px;">';
+		echo '  <a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\''.$spid.'\'); return false;"><span class="faicon monitor"></span></a> ';	
-        echo $spremenljivka['variable'];
-		echo '</span>';
-		echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\''.$spid.'\'); return false;"><span class="faicon preview"></span></a> ';	
-			
-		//echo '<div class="chart_setting" style="text-align: center;">';
 		SurveyAnalysis::showIcons($spid,$spremenljivka,$_from='charts');
         echo '</div>';
 				
@@ -7546,14 +7541,12 @@ class SurveyChart {
 			
 			$lestvica = SurveyAnalysis::getSpremenljivkaLegenda($spremenljivka,'skalaAsValue');
 						
-			echo $lang['srv_skala'].': ';
+			echo '<label>'.$lang['srv_skala'].' '.Help :: display('srv_skala_edit').':</label>';
-			// Vprasajcek za pomoc
-			echo Help :: display('srv_skala_edit');
 			
-			echo '<span class="spaceLeft"></span>';
+            echo '<div class="scale_ordnom">';
-			echo '<a onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'0\', \''.self::$current_loop.'\'); return false;" href="#" title="'.$lang['srv_skala_long_0'].'"><span '.($lestvica == 0 ? ' class="strong"' : '').'>'.$lang['srv_skala_short_0'].'</span></a>';
+            echo '<button class="small '.($lestvica == 0 ? 'active' : '').'" onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'0\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_skala_short_0'].'</button>';
-			echo '<span class="blue"> / </span>';
+            echo '<button class="small '.($lestvica == 1 ? 'active' : '').'" onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'1\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_skala_short_1'].'</button>';
-			echo '<a onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'1\', \''.self::$current_loop.'\'); return false;" href="#" title="'.$lang['srv_skala_long_1'].'"><span '.($lestvica == 1 ? ' class="strong"' : '').'>'.$lang['srv_skala_short_1'].'</span></a>';
+            echo '</div>';
 
 			echo '</div>';	
 		}
@@ -8163,14 +8156,12 @@ class SurveyChart {
 			
         $lestvica = SurveyAnalysis::getSpremenljivkaLegenda($spremenljivka,'skalaAsValue');
                     
-		echo $lang['srv_skala'].': ';
+        echo '<label>'.$lang['srv_skala'].' '.Help :: display('srv_skala_edit').':</label>';
-		// Vprasajcek za pomoc
-		echo Help :: display('srv_skala_edit');
         
-		echo '<span class="spaceLeft"></span>';
+        echo '<div class="scale_ordnom">';
-		echo '<a onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'0\', \''.self::$current_loop.'\'); return false;" href="#" title="'.$lang['srv_skala_long_0'].'"><span '.($lestvica == 0 ? ' class="strong"' : '').'>'.$lang['srv_skala_short_0'].'</span></a>';
+        echo '<button class="small '.($lestvica == 0 ? 'active' : '').'" onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'0\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_skala_short_0'].'</button>';
-		echo '<span class="blue"> / </span>';
+        echo '<button class="small '.($lestvica == 1 ? 'active' : '').'" onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'1\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_skala_short_1'].'</button>';
-		echo '<a onclick="chartAdvancedSettingsSkala(\''.$spid.'\', \'1\', \''.self::$current_loop.'\'); return false;" href="#" title="'.$lang['srv_skala_long_1'].'"><span '.($lestvica == 1 ? ' class="strong"' : '').'>'.$lang['srv_skala_short_1'].'</span></a>';
+        echo '</div>';
 
         echo '</div>';	
 	}
@@ -9245,16 +9236,16 @@ class SurveyChart {
 		echo '<div class="chart_title">'.$stevilcenje . $title.'</div>';		
 		
 		# tekst vprašanja
-		echo '<table class="anl_tbl anl_bt anl_br anl_bb" style="font-size: '.(self::$fontSize+3).'px !important; padding:0px; margin-top:5px !important; border-collapse: collapse; width: 800px;">';
+		echo '<table>';
 		
 		if(self::$settings['type']==1){
-			echo '<tr>';
+			echo '<tr class="row1">';
+
 			#odgovori								
 			echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$lang['srv_analiza_frekvence_titleAnswers'] . '</td>';
 			echo '<td class="anl_br anl_bb anl_ac anl_w70">'. $lang['srv_analiza_frekvence_titleFrekvenca'] .'</td>';
 
 			echo '</tr>';				
-			// konec naslovne vrstice
 		}
 
 		$_answersOther = array();
@@ -9340,7 +9331,7 @@ class SurveyChart {
 		echo '</div>';
 		
 		// Izpisemo nastavitve za tabele
-		echo '<div class="chart_settings printHide iconHide" style="margin-top: 5px;">';
+		echo '<div class="chart_settings table_settings printHide iconHide">';
 		self::displaySingleSettings($spid);
 		echo '</div>';	
 			
@@ -9637,7 +9628,7 @@ class SurveyChart {
 		echo '<div class="chart_title">'.$stevilcenje . $title.'</div>';
 		
 		
-		echo '<table class="anl_tbl anl_bt anl_br anl_bb" style="font-size: '.(self::$fontSize+3).'px !important; padding:0px; margin:0px; border-collapse: collapse;">' . NEW_LINE;		
+		echo '<table style="font-size: '.(self::$fontSize+3).'px !important; padding:0px; margin:0px; border-collapse: collapse;">' . NEW_LINE;		
 
 		$counter = 0;
 		$_kumulativa = 0;
@@ -9691,6 +9682,7 @@ class SurveyChart {
 			return;
 		}
 		
+
 		echo '<div class="chart_holder" id="chart_'.$spid.'_loop_'.self::$current_loop.'">';			
 		//div za pozicijo popupa
 		echo '<div id="'.$spid.'"></div>';
@@ -9710,16 +9702,17 @@ class SurveyChart {
 		$_all_valid_answers_cnt = $_answers['validCnt'];
 		$_valid_answers = $_answers['valid'];
 		
+        
 		# tekst vprašanja
-		echo '<table class="anl_tbl anl_bt anl_bb" style="font-size: '.(self::$fontSize+3).'px !important; padding:0px; margin:0px;  border-collapse: collapse;">' . NEW_LINE;
+		echo '<table>' . NEW_LINE;
 		
 		# naslovna vrstica	
 		if(self::$settings['type']==1){
-			echo '<tr>';
+			echo '<tr class="row1">';
-			#odgovori											
-			echo '<td class="anl_br anl_bl anl_bb anl_ac">'.$lang['srv_analiza_opisne_subquestion'] . '</td>';
 
-			echo '<td class="anl_br anl_bb anl_ac" colspan="'.($_cols).'">'. $lang['srv_analiza_opisne_arguments'] .'</td>';
+			#odgovori											
+			echo '<td>'.$lang['srv_analiza_opisne_subquestion'] . '</td>';
+			echo '<td colspan="'.($_cols).'">'. $lang['srv_analiza_opisne_arguments'] .'</td>';
 
 			echo '</tr>';			
 		}
@@ -9728,17 +9721,19 @@ class SurveyChart {
 		$_answersOther = array();
 		$_grids_count = count($spremenljivka['grids']);
 		if ($_grids_count > 0) {
+
 			# naslovna vrstica
 			$_row = $spremenljivka['grids'][0];
-			echo '<tr>';
+
-			echo '<td class="anl_bl anl_br anl_bb">&nbsp;</td>';
+			echo '<tr class="row2">';
+
+			echo '<td>&nbsp;</td>';
 
 			if (count($_row['variables'])>0)
 			foreach ($_row['variables'] AS $rid => $_col ){
 				$_sequence = $_col['sequence'];	# id kolone z podatki
 				if ($_col['other'] != true) {
-					echo '<td class="anl_br anl_bb anl_ac anl_str">';
+					echo '<td>';
-					// echo $_col['variable'];
 					echo $_col['naslov'];
 					echo '</td>';
 				} else {
@@ -9773,8 +9768,9 @@ class SurveyChart {
                         if ($variable['other'] != true) {
 
 							# tabela z navedbami
-							echo '<td class=" anl_at" style="padding: 0pt; margin: 0pt; border-collapse: collapse; vertical-align:top;" >';
+							echo '<td class="cell_value cell_noPadding">';
-							echo '<table class="fullWidth anl_ac" style="padding:0; margin:0; border-collapse: collapse; vertical-align:top;">';
+
+							echo '<table class="cell_table">';
 
 							$index=0;
 							if (count($_valid_answers) > 0) { 
@@ -9818,7 +9814,7 @@ class SurveyChart {
 		echo '</div>';
 		
 		// Izpisemo nastavitve za tabele
-		echo '<div class="chart_settings printHide iconHide" style="margin-top: 5px;">';
+		echo '<div class="chart_settings table_settings printHide iconHide">';
 		self::displaySingleSettings($spid);
 		echo '</div>';	
 		

resources/sass/admin_new/pages/survey_analysis/page_charts.scss

@@ -71,10 +71,14 @@
         flex-direction: column;
 
         width: 230px;
-        margin-top: -46px;
+        margin-top: -45px;
 
         opacity: 0;
 
+        &.table_settings{
+            margin-top: -5px;
+        }
+
         .chart_setting_exportLinks {
             display: flex;
             align-items: center;
@@ -90,6 +94,9 @@
             }
 
             button{
+                display: flex;
+                align-items: center;
+
                 min-width: 0;
                 width: auto;
                 margin-left: 16px;
@@ -103,6 +110,7 @@
 
                 .faicon{
                     margin-right: 8px;
+                    margin-top: -2px;
 
                     &:before{
                         color: $blue;
@@ -174,6 +182,74 @@
                         color: $blue;
                         font-size: 14px;
                     }
+
+                    .scale_ordnom {
+                        display: inline-block;
+                        height: 24px;
+                        vertical-align: 1px;
+            
+                        button{
+                            cursor: pointer;
+            
+                            box-sizing: border-box;
+                            padding: 0 16px;
+                            margin: 0;
+                            height: 24px;
+                            width: auto;
+                            min-width: auto;
+            
+                            font-size: 12px;
+                            font-weight: 400;
+                            line-height: 15px;
+                            color: #A9A9A9;
+            
+                            background-color: $white;
+                            border: 1px solid $gray;
+            
+                            &:first-child{
+                                border-radius: 2px 0px 0px 2px;
+            
+                                border-right: 1px $blue solid !important;
+                            }
+                            
+                            &:nth-child(2){
+                                border-radius: 0px 2px 2px 0px;
+            
+                                border-left: 0 !important;
+                            }
+            
+                            &.active,
+                            &:hover{
+                                color: $blue;
+            
+                                background-color: $light-blue;
+                                border-color: $blue;
+                            }
+            
+                            &.active{
+                                cursor: default;
+                            }
+                        }
+                    }
+                }
+
+                .chart_setting_icons{
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    margin: 16px 0 0 0;
+
+                    .monitor:before{
+                        margin-right: 8px;
+                        font-size: 14px;
+                    }
+                    
+                    .variable{
+                        margin-right: 16px;
+                        font-size: 14px;
+                        font-weight: 600;
+                    }
                 }
 
                 fieldset.chart_num_limits {

resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss

@@ -1,15 +1,92 @@
 /*
-To change this license header, choose License Headers in Project Properties.
+    Skrcen nacin pri urejanju vprasalnika
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/* 
-    Created on : 06-Aug-2018, 11:37:12
-    Author     : podkrizniku
 */
 
 #branching.collapsed {
-    min-height: 317px;
+
+    ul{
+
+        li:not(.spr_editing):not(.if_editing){
+           
+            &:nth-child(3),
+            &:last-child{
+                font-weight: 600;
+            }
+
+            &.spr,
+            &.if,
+            &.endif,
+            &.block,
+            &.endblock,
+            &.loop,
+            &.endloop{
+                cursor: pointer;
+
+                display: flex;
+                align-items: center;
+
+                height: 28px;
+                padding-left: 8px;
+
+                &:hover{
+                    background-color: $medium-blue;
+                }
+            }
+
+            &.drop{
+                height: 16px;
+
+                .pb_new{
+                    height: 16px;
+                }
+            }
+
+
+            .pm{
+                padding-top: 0;
+            }
+
+            .pb_on{
+                flex-direction: row-reverse;
+
+                .pb_page{
+                    justify-content: flex-end;
+                    flex-shrink: 0;
+
+                    width: auto;
+                    margin-left: 8px;
+
+                    font-weight: 600;
+                    font-size: 10px;
+                    text-align: right;
+                }
+
+                .pb_page_hover{
+                    order: 1;
+                }
+            }
+
+            .spr_edit{
+                padding: 2px 6px;
+            }
+
+            .colorvariable,
+            .calculationvariable{
+                margin-right: 8px;
+                font-weight: 600;
+            }
+
+            .spr_comment{
+                margin: 0 8px;
+
+                font-style: normal;
+                color: #A9A9A9;
+            }
+        }
+    }
+
+
+    /*min-height: 317px;
     margin-top: 10px;
 
 	div.spr,
@@ -120,5 +197,5 @@ and open the template in the editor.
 	div.if_remove {
 		padding-top: 0px;
 		margin-top: 3px;
-	}
+	}*/
 }

resources/sass/admin_new/pages/survey_edit/questions/grids.scss

@@ -245,6 +245,11 @@ div.jezik_row.tip_24{
         table{
 
             tr{
+                td{  
+                    &.col_border{
+                        border-left: 1px $gray solid !important;
+                    }
+                }
 
                 td:first-child{
                     width: 270px !important;

resources/sass/admin_new/pages/survey_edit/questions/sum.scss

@@ -34,6 +34,10 @@ and open the template in the editor.
         flex-grow: 0 !important;
     }
 
+    &#variabla_new #vre_id_new{
+        max-width: none;
+    }
+    
     .variabla_vsota_inline{
         word-break:break-all;