may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Razvrscanje - popravek buga pri notranjih pogojih (na desni je sedaj ustrezno stevilo okvirjev)

Browse Source
This commit is contained in:
pero1203 2021-11-15 09:17:50 +01:00
parent 7b7cbc9cc2
commit 73ee69af4f
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/survey/app/Controllers/JsController.php
View File

@ -1852,6 +1852,19 @@ class JsController extends Controller
echo ' $(\'#spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').hide(); ' . "\n"; echo ' $(\'#spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').hide(); ' . "\n";
echo ' $(\'#frame_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 ' } ' . "\n";
echo $sum; echo $sum;

34
main/survey/app/Controllers/Vprasanja/DragDropController.php
View File

@ -416,13 +416,9 @@ class DragDropController extends Controller
$length = strlen($value); //dolzina teksta kategorije odgovora $length = strlen($value); //dolzina teksta kategorije odgovora
$style = ''; $style = '';
if (get('mobile') == 0 || get('mobile') == 2) {// ce respondent uporablja PC ali tablico if (get('mobile') == 0 || get('mobile') == 2) {// ce respondent uporablja PC ali tablico
//if($display_drag_and_drop_new_look != 1){ $class = 'ranking';
$class = 'ranking'; }
/* }else if($display_drag_and_drop_new_look == 1){ else if (get('mobile') == 1) {
$class = 'drag_and_drop_box';
} */
} else if (get('mobile') == 1) {
$class = 'ranking_mobile'; $class = 'ranking_mobile';
} }
$c = ''; $c = '';
@ -490,32 +486,12 @@ class DragDropController extends Controller
$(document).ready(function () { $(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
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
} */
}); });
</script> </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 '<div id="spremenljivka_' . $spremenljivka . '_vrednost_' . $vre_id . '" class="' . $class . ' ' . $c . '">' . $value . '</div>' . "\n"; //'#spremenljivka_'+spremenljivka+'_vrednost_'+id
//}
} }
echo '</li>' . "\n"; echo '</li>' . "\n";