From 73ee69af4fefd13cc8415c20c46730be92ee7332 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 15 Nov 2021 09:17:50 +0100
Subject: [PATCH] Razvrscanje - popravek buga pri notranjih pogojih (na desni
 je sedaj ustrezno stevilo okvirjev)

---
 main/survey/app/Controllers/JsController.php  | 13 +++++++
 .../Vprasanja/DragDropController.php          | 34 +++----------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/main/survey/app/Controllers/JsController.php b/main/survey/app/Controllers/JsController.php
index e1bfe47d8..c0c256ddf 100644
--- a/main/survey/app/Controllers/JsController.php
+++ b/main/survey/app/Controllers/JsController.php
@@ -1852,6 +1852,19 @@ class JsController extends Controller
                 echo '   $(\'#spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').hide(); ' . "\n";                 
                 echo '   $(\'#frame_spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').hide(); ' . "\n";                 
 
+
+                // Pri rankingu prestejemo in skrijemo tudi prazne okvirje na desni
+
+                // Prestejemo skrite
+                echo ' var count = $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.ranking:hidden\').length;   ' . "\n"; 
+
+                // Prikazemo vse
+                echo ' $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.dropholder\').find(\'ul li\').show();   ' . "\n"; 
+
+                // Skrijemo toliko okvirjev kolikor je skritih elementov
+                echo ' for(var i=0; i<count; i++){ $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.dropholder\').find(\'ul li:visible\').last().hide(); }' . "\n"; 
+                echo 'console.log(count);';
+
                 echo '  } ' . "\n";
 
                 echo $sum;
diff --git a/main/survey/app/Controllers/Vprasanja/DragDropController.php b/main/survey/app/Controllers/Vprasanja/DragDropController.php
index 5ff2afe0a..d2e8bae6a 100644
--- a/main/survey/app/Controllers/Vprasanja/DragDropController.php
+++ b/main/survey/app/Controllers/Vprasanja/DragDropController.php
@@ -416,13 +416,9 @@ class DragDropController extends Controller
             $length = strlen($value);    //dolzina teksta kategorije odgovora
             $style = '';
             if (get('mobile') == 0 || get('mobile') == 2) {// ce respondent uporablja PC ali tablico
-                //if($display_drag_and_drop_new_look != 1){
-					$class = 'ranking';
-/* 				}else if($display_drag_and_drop_new_look == 1){
-					$class = 'drag_and_drop_box';
-				} */
-				
-            } else if (get('mobile') == 1) {
+				$class = 'ranking';				
+            } 
+            else if (get('mobile') == 1) {
                 $class = 'ranking_mobile';
             }
             $c = '';
@@ -490,32 +486,12 @@ class DragDropController extends Controller
 
 
                 $(document).ready(function () {
-					//if(<?=$display_drag_and_drop_new_look?> == 0){
-						GridDraggable(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>, <?=$display_drag_and_drop_new_look?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev draggable in droppable
-/* 					}
-					else if(<?=$display_drag_and_drop_new_look?> == 1){
-						//GridDraggableBox(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', <?=$usr_id?>, <?=$other?>, <?=get('mobile')?>); //poklici funkcijo za ureditev draggable in droppable						
-						GridDraggableBox(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>); //poklici funkcijo za ureditev draggable in droppable						
-					} */
+					GridDraggable(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>, <?=$display_drag_and_drop_new_look?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev draggable in droppable
                 });
             </script>
             <?
-            //echo	'<div id="vrednost_if_'.$id.'" class="variabla">';
-            //echo	'</div>';	//vrednost_if_ID
-            //div ki vsebuje vrednost
-            //if($length > 30)
-            //	if($length > 90){
-            //		$niz = substr($value, 0, 90);
-            //echo	'<div title="'.strip_tags($value).'" id="'.$class.'_'.$id.'" class="'.$class.'_long '.$c.'">'.$niz.'...</div>'."\n";
-            //		echo	'<div title="'.strip_tags($value).'" id="'.$class.'_'.$vre_id.'" class="'.$class.'_long '.$c.'">'.$niz.'...</div>'."\n";
-            //	}
-            //	else
-            //echo	'<div title="'.strip_tags($value).'" id="'.$class.'_'.$id.'" class="'.$class.'_long '.$c.'">'.$value.'</div>'."\n";
-            //		echo	'<div title="'.strip_tags($value).'" id="'.$class.'_'.$vre_id.'" class="'.$class.'_long '.$c.'">'.$value.'</div>'."\n";
-            //else{
-            //echo	'<div id="'.$class.'_'.$id.'" class="'.$class.' '.$c.'">'.$value.'</div>'."\n";
+
             echo '<div id="spremenljivka_' . $spremenljivka . '_vrednost_' . $vre_id . '" class="' . $class . ' ' . $c . '">' . $value . '</div>' . "\n"; //'#spremenljivka_'+spremenljivka+'_vrednost_'+id
-            //}
         }
 
         echo '</li>' . "\n";