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

admin/survey/Branching.php

@@ -329,7 +329,7 @@ class Branching {
 			}
 
             // Knjiznica
-            echo '<div class="toolbox_item open_lib" onClick="displayLibraryPopup();"><span class="item_icon faicon library"></span><span class="item_text">'.$lang['srv_library'].'</span></div>';
+            echo '<div class="toolbox_item open_lib"><span class="item_icon faicon library"></span><span class="item_text">'.$lang['srv_library'].'</span></div>';
             echo '<div class="toolbox_border open_lib"></div>';
 
 			// normalna anketa
@@ -342,8 +342,15 @@ class Branching {
                 echo '<div class="toolbox_border new_if"></div>';
 
 				echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>';
-                //echo '<div class="toolbox_border new_block"></div>';
+            }
-			}
+
+            // Pobrisana vprasanja
+            $vd = new VprasanjeDeleted($this->anketa);
+            $deleted_vrasanja_count = $vd->countDeletedVprasanja();
+            if($deleted_vrasanja_count > 0){
+                echo '<div class="toolbox_border"></div>';
+                echo '<div class="toolbox_item open_deleted"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' ('.$deleted_vrasanja_count.')</span></div>';
+            }
 		}
 		else {
 
@@ -391,8 +398,15 @@ class Branching {
                 echo '<div class="toolbox_border new_if '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'"></div>';
 
 				echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>';
-                //echo '<div class="toolbox_border new_block"></div>';
 			}
+
+            // Pobrisana vprasanja
+            $vd = new VprasanjeDeleted($this->anketa);
+            $deleted_vrasanja_count = $vd->countDeletedVprasanja();
+            if($deleted_vrasanja_count > 0){
+                echo '<div class="toolbox_border"></div>';
+                echo '<div class="toolbox_item open_deleted" onClick="displayDeletedVprasanjaPopup();"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' ('.$deleted_vrasanja_count.')</span></div>';
+            }
 		}
 
 		echo '</div>';
@@ -425,9 +439,11 @@ class Branching {
         // Vsebina okna
         echo '<div class="toolbox_expand_segments_holder">';
 
-		echo '<div class="toolbox_expand_segment">';
 
+        // Segment kategorije
+		echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna2'].'</p>';
+
 		echo '<p class="new_spr adv segment_option" tip="1">'.$lang['srv_vprasanje_tip_1'].'</p>';
 		echo '<p class="new_spr adv segment_option" tip="3">'.$lang['srv_vprasanje_tip_1'].' - '.$lang['srv_dropdown'].'</p>';
 		echo '<p class="new_spr adv segment_option" tip="2">'.$lang['srv_vprasanje_tip_2'].'</p>';
@@ -435,6 +451,18 @@ class Branching {
         echo '</div>';
 
 
+        // Segment vnos
+        echo '<div class="toolbox_expand_segment">';
+		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
+
+		echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
+		echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
+		echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
+
+        echo '</div>';
+
+
+        // Segment tabele
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_vprasanje_tables'].'</p>';
 
@@ -446,6 +474,19 @@ class Branching {
         echo '</div>';
 
 
+        // Segment ostale tabele
+        echo '<div class="toolbox_expand_segment">';
+        echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
+
+        echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
+        echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
+        echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
+        echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
+
+        echo '</div>';
+
+
+        // Segment posebna vprasanja
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_sklop_posebna'].'</p>';
 
@@ -459,27 +500,6 @@ class Branching {
 		echo '</div>';
 
 
-		echo '<div class="toolbox_expand_segment">';
-		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
-
-		echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
-		echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
-
-        echo '</div>';
-
-
-        echo '<div class="toolbox_expand_segment">';
-		echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
-
-		echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
-		echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
-
-        echo '</div>';
-
-
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_standardni_vnosi'].'</p>';
 

admin/survey/SurveyAdmin.php

@@ -4830,6 +4830,10 @@ class SurveyAdmin
 
             $rowg = Cache::srv_spremenljivka($spremenljivka);
 
+            // Preden vprasanje zbrisemo po novem ustvarimo kopijo vprasanja med zbrisanimi (knjiznica zbrisanih vprasanj)
+            $vd = new VprasanjeDeleted($this->anketa);
+            $vd->createDeletedVprasanje($spremenljivka);
+
             // pri brisanju multiple grid vprasanja, moramo pobrisate tudi vse child spremenljivke (ker kljuci niso nastavljeni)
             if ($rowg['tip'] == 24) {
                 $sqld = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka'");

admin/survey/classes/class.SurveyTimeProfiles.php

@@ -532,22 +532,22 @@ class SurveyTimeProfiles {
 		echo '<p class="setting_title">' . $lang['srv_time_profile_time'] . '</p>';
 
 		echo '<div class="setting_item">';
-		echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label>' . $lang['srv_time_profile_from'] . ':</label>';
+		echo '  <input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label for="time_date_type">' . $lang['srv_time_profile_from'] . ':</label>';
-		echo '<input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
+		echo '  <input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
-		echo '<span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
+		echo '  <span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
-		echo '<label>' . $lang['srv_time_profile_to'] . ':</label>';
+		echo '  <label>' . $lang['srv_time_profile_to'] . ':</label>';
-		echo '<input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
+		echo '  <input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
-		echo '<span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
+		echo '  <span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
 		echo '</div>';
 	
 		echo '<div class="setting_item">';
-		echo '<input type="radio"  name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label>'.$lang['srv_statistic_period_label'].':</label>';
+		echo '  <input type="radio" name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label for="time_date_interval">'.$lang['srv_statistic_period_label'].':</label>';
-		echo '<select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
+		echo '  <select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
-		echo '<option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
+		echo '      <option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
 		foreach (self::$STP_ARRAYS as $INTERVAL) {
-			echo '<option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
+			echo '      <option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
 		}
-			echo '</select>';
+			echo '  </select>';
 		echo '</div>';
 					
 		echo '</div>';

admin/survey/classes/class.Vprasanje.php

@@ -8368,7 +8368,7 @@ class Vprasanje {
 	}
 	
 	//posodobi skrite vrednosti odgovorov za diferencial trak
-	function ajax_diferencial_trak_skrite_vrednosti($spr_id, $num_grids, $diferencial_trak_starting_num){
+	function ajax_diferencial_trak_skrite_vrednosti($spr_id=null, $num_grids=null, $diferencial_trak_starting_num=null ){
 		if(isset ($_POST['spr_id'])){
 			$spr_id = $_POST['spr_id'];
 		}

admin/survey/classes/class.VprasanjeDeleted.php

@@ -8,28 +8,73 @@
 
 class VprasanjeDeleted {
 	
-	var $anketa;                // trenutna anketa
+	var $ank_id;                // trenutna anketa
-	var $spremenljivka;			// spremenljivka
 
 		
 	public function __construct ($anketa = 0) {
 		
 		if (isset ($_GET['anketa']))
-			$this->anketa = $_GET['anketa'];
+			$this->ank_id = $_GET['anketa'];
 		elseif (isset ($_POST['anketa'])) 
-			$this->anketa = $_POST['anketa'];
+			$this->ank_id = $_POST['anketa'];
 		elseif ($anketa != 0) 
-			$this->anketa = $anketa;
+			$this->ank_id = $anketa;
-		
-		SurveyInfo::getInstance()->SurveyInit($this->anketa);
 	}
 	
-
     
     // Prikazemo seznam pobrisanih vprasanj uporabnika
-    public function displayDeletedVprasanja(){
+    private function displayDeletedVprasanja(){
+        global $lang;
+        global $global_user_id;
+        global $admin_type;
+
+        // Loop po vseh pobrisanih vprasanjih v anketi
+        $sql = sisplet_query("SELECT sd.*, s.naslov 
+                                FROM srv_spremenljivka_deleted sd, srv_spremenljivka s 
+                                WHERE sd.ank_id='".$this->ank_id."' AND sd.spr_id=s.id 
+                                ORDER BY sd.delete_time DESC
+                            ");  
+        if(mysqli_num_rows($sql) == 0){
+            return;
+        }
+
+        while($row = mysqli_fetch_array($sql)){
+
+            echo '<div id="question_item_holder_'.$row['spr_id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$row['spr_id'].'\');">';
+
+            echo '  <input type="checkbox" id="question_item_check_'.$row['id'].'" item-type="1" item-subtype="1" class="question_item_check" onClick="selectLibraryItem(\''.$row['spr_id'].'\');"><label for="question_item_check_'.$row['spr_id'].'"></label>';
+
+            echo '  <div id="question_item_info_'.$row['spr_id'].'" item-type="1"  item-subtype="1" item-id="'.$row['spr_id'].'" class="question_item_info">';
+        
+            echo '      <span class="faicon list"></span>';
+            echo '      <span class="title">'.substr(strip_tags($row['naslov']), 0, 40).'</span>';
+            
+            echo '  </div>';
+
+            echo '</div>';
+        }     
+    }
+
+
+    // Pri brisanju najprej skopiramo vprasanje ki ga brisemo
+    public function createDeletedVprasanje($spr_id){
         global $global_user_id;
 
+        // Skopiramo spremenljivko 
+        $b = new Branching($this->ank_id);
+        $new_spr_id = $b->nova_spremenljivka(-3, 0, 0, $spr_id);  
+
+        // Zabelezimo v bazi povezavo z anketo in cas brisanja
+        $sql1 = sisplet_query("INSERT INTO srv_spremenljivka_deleted (spr_id, ank_id, delete_time) VALUES ('".$new_spr_id."', '".$this->ank_id."', NOW())");
+    }
+
+    // Vrnemo stevilo pobrisanih vprasanj v anketi
+    public function countDeletedVprasanja(){
+
+        $sql = sisplet_query("SELECT COUNT(id) AS cnt FROM srv_spremenljivka_deleted WHERE ank_id='".$this->ank_id."'");  
+        $row = mysqli_fetch_array($sql);
+
+        return $row['cnt'];
     }
 }
 

admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php

@@ -215,7 +215,8 @@ class MultiGridLatex extends LatexSurveyElement
 						//echo "userAnswer Missing je prisoten in njegov grd_id je: ".$userAnswerMissing['grd_id'].'</br>';
 						$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, 6, $spremenljivke['grids'], count($missingOdgovori), $userAnswerMissing['grd_id']);						
 					}else{
-						$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));						
+						//$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));
+						$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),($userAnswer['text']));
 					}
 					
 					//$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));
@@ -887,7 +888,8 @@ class MultiGridLatex extends LatexSurveyElement
 									$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
 								}else{
 									if($spremenljivke['tip']==19){	//ce je tip vprasanja besedilo
-										$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
+										//$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
+										$izpis .= '\\textcolor{crta}{'.$this->encodeText($data[$j]).'}';
 									}else{
 										$izpis .= '\\textcolor{crta}{'.$vodoravniOdgovori[$i].'}';
 									}

admin/survey/export/latexclasses/class.LatexAnalysisElement.php

@@ -933,12 +933,12 @@ class LatexAnalysisElement{
 		$text = str_replace('>','\textgreater',$text);
 		$text = str_replace(' ',' ',$text);
 		if(strpos($text, '&')){	//ce je prisotno v besedilu &'
-			$text = str_replace('&','\& ',$text);
+			$text = str_replace('&','\&',$text);
 		}else{
-			$text = str_replace('&','\& ',$text);
+			$text = str_replace('&','\&',$text);
 		}		
 		
-		$andSymbolPresent = 0;
+/* 		$andSymbolPresent = 0;
 		$posAndSymbolPresent = strpos($text,'&');
 		if($posAndSymbolPresent !== false){	//ce je v besedilu prisoten '&' zapisan kot '&'
 			$text = str_replace('&','\&',$text);
@@ -946,7 +946,7 @@ class LatexAnalysisElement{
 		}
 		if($andSymbolPresent == 0){
 			$text = str_replace('&','\&',$text);
-		}
+		} */
 		
 		/* //$text = str_replace('<','\textless ',$text);
 		$text = str_replace('<','\textless',$text);
@@ -1074,7 +1074,7 @@ class LatexAnalysisElement{
 			$text = "\seqsplit{".$text."}"; //ni v redu seqsplit, ker ne dela, če so posebni znaki			
 		}
 		//priprava izpisa zelo dolgega besedila brez presledkov - konec
-
+		//echo "Encoding ".$text."</br>";
 		return strip_tags($text); //vrni tekst brez html tag-ov
 	}
 	

lang/1.php

@@ -2431,6 +2431,9 @@ $lang = array (
     "srv_library_add_to_lib_success_block"  =>	 "Blok je bil uspešno dodan v knjižnico.",
     "srv_library_add_to_lib_success_loop"   =>	 "Zanka je bila uspešno dodana v knjižnico.",
     "srv_library_add_to_lib_success_err"    =>	 "Prišlo je do napake pri dodajanju v knjižnico!",
+    
+    "srv_deleted_vprasanja"    =>	 "Pobrisana vprašanja",
+
     "srv_nadzor"            =>	 "Nadzor",
     "srv_knjiznica_add"     =>	 "Če želite dodati spremenljivko v knjižnico, jo povlecite v to polje",
     "srv_knjiznica_copy"    =>	 "Če želite kopirati vprašanje, ga označite z ikono COPY",

lang/2.php

@@ -2412,6 +2412,9 @@ $lang = array (
     "srv_library_add_to_lib_name_loop"      =>	 "Loop name",
     "srv_library_add_to_lib_folder"         =>	 "Add to folder",
     "srv_library_add_to_lib" =>	 "Add to library",
+
+    "srv_deleted_vprasanja"    =>	 "Deleted questions",
+
     "srv_nadzor"            =>  "Supervise",
     "srv_knjiznica_add"     =>  "To add a question to a library, drag it to this field",
     "srv_knjiznica_copy"    =>  "To copy a question, click on COPY icon",

sql/update2.sql

@@ -9646,12 +9646,13 @@ UPDATE misc SET value='22.07.13' WHERE what="version";
 INSERT INTO srv_grupa (id, ank_id, naslov, vrstni_red) VALUES (-3, 0, 'system', 0);
 
 CREATE TABLE IF NOT EXISTS srv_spremenljivka_deleted (
+    id INT(11) NOT NULL auto_increment,
     spr_id INT(11) NOT NULL,
     ank_id INT(11) NOT NULL,
     delete_time DATETIME(3) NOT NULL,
     CONSTRAINT fk_srv_spremenljivka_deleted_ank_id FOREIGN KEY (ank_id) REFERENCES srv_anketa (id) ON DELETE CASCADE ON UPDATE CASCADE,
     CONSTRAINT fk_srv_spremenljivka_deleted_spr_id FOREIGN KEY (spr_id) REFERENCES srv_spremenljivka (id) ON DELETE CASCADE ON UPDATE CASCADE,
     PRIMARY KEY  (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 UPDATE misc SET value='22.08.05' WHERE what="version";