Redesign - urejanje vprasalnika - vsota, razvrscanje, text, number

This commit is contained in:
pero1203 2022-04-04 12:28:05 +02:00
parent d8bf24ae38
commit 6fb2cab766
8 changed files with 2442 additions and 2203 deletions

View File

@ -3459,7 +3459,7 @@ class Branching {
echo '<div class="grid_subtitle_inline" grid_id=1 contenteditable="'.(!$locked?'true':'false').'" grid_subtitle="grid_subtitle1">' . $row['grid_subtitle1'] . '</div>';
echo '</td>';
echo ' <td style="width:0px;"></td>';
echo ' <td class="spacer double no-border"></td>';
// Urejanje podnaslova 2. grida
echo ' <td class="grid_header" colspan="'.$colspan.'">';
@ -3474,7 +3474,6 @@ class Branching {
// urejanje vrednosti
echo ' <tr id="grid_variable_'.$row['id'].'" '.$show_variable_row.'>';
echo ' <td></td>';
//echo ' <td style="width:' . $spacesize . '%"></td>';
echo ' <td></td>';
$bg = 1;
@ -3495,7 +3494,7 @@ class Branching {
}
}
echo '<td style="width:' . $spacesize*3 . '%"></td>';
echo '<td class="spacer double no-border"></td>';
echo '</tr>';
@ -3535,7 +3534,7 @@ class Branching {
}
}
echo '<td style="width:0px; border-left: 1px black solid;"></td>';
echo '<td class="spacer double"></td>';
//DRUGI DEL GRIDA
//$sql2 = sisplet_query("SELECT naslov, vrstni_red FROM srv_grid WHERE spr_id='$row[id]' AND other=0 AND part='2' ORDER BY vrstni_red");
@ -3658,7 +3657,7 @@ class Branching {
}
}
echo '<td style="width:1%; border-left: 1px black solid;"></td>';
echo '<td class="spacer double"></td>';
//DRUGI DEL GRIDA
//razlicni vnosi glede na tip multigrida
@ -4735,7 +4734,7 @@ class Branching {
// textbox*
elseif ($row['tip'] == 21) {
if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit'])
if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit'])
$limit = '('.$lang['srv_text_length_char_num'].$row['vsota_min'].')';
elseif($row['num_useMin'] == 1 && $row['num_useMax'] == 1)
$limit = '('.$lang['srv_text_length_char_num'].'min '.$row['vsota_min'].', max '.$row['vsota_limit'].')';
@ -4752,9 +4751,7 @@ class Branching {
if($taWidth == -1)
$taWidth = 30;
echo '<table class="text_vrednost" style="width: 100%; text-align: left">';
if($row['orientation'] != 3)
echo '<tr>';
echo '<div class="text_vrednost orientation_'.$row['orientation'].'">';
$_others = array();
$sql1 = sisplet_query("SELECT id, naslov, variable, size, other, hidden, naslov2 FROM srv_vrednost WHERE spr_id='$row[id]' AND vrstni_red > 0 ORDER BY vrstni_red");
@ -4762,8 +4759,11 @@ class Branching {
if ((int)$row1['other'] == 0) {
// sirina celice td
$cell = $row['text_kosov'] == 1 ? 100 : $row1['size'] ;
// sirina celice
$cell_width = $row['text_kosov'] > 0 ? 100 / $row['text_kosov'] : 100;
echo '<div id="f_'.$row1['id'].'" class="grid_question position_'.$row['text_orientation'].' '.($row['text_kosov'] > 1 ? 'multiple' : '').'" style="width:'.$cell_width.'%">';
// sirina vnosnega polja
$input = $taWidth;
@ -4772,77 +4772,70 @@ class Branching {
$naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') $row1['naslov'] = $naslov;
}
if($row['orientation'] == 3)
echo '<tr>';
echo '<td class="grid_question" style="width: '.$cell.'%; text-align:left" id="f_'.$row1['id'].'">';
// Polje za enoto
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
if($row['text_orientation'] == 1 || $row['text_orientation'] == 3){
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
if ($row['text_orientation'] == 3)
echo '<br />';
}
if ($taSize > 1)
echo '<textarea id="txt_f_' .$row1['id'] .'" vre_id="'.$row1['id'].'_2" name="foo_' . $row['id'] . '" rows="' . $taSize . '" style="width: ' . $input . '%;" ' .($locked?'disabled="disabled" ':' class="textfield_editable" contenteditable="true" ETF="true"') .'>' .$row1['naslov2'] .'</textarea>';
else
echo '<input id="txt_f_' .$row1['id'] .'" vre_id="'.$row1['id'].'_2" type="text" style="width: ' . $input . '%;" ' .($locked?'disabled="disabled" ':' class="textfield_editable" contenteditable="true" ETF="true"') .' value="' .$row1['naslov2'] .'" />';
if($row['text_orientation'] == 2){
echo '<br /><div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
}
echo '</td>';
if($row['orientation'] == 3)
echo '</tr>';
echo '</div>';
}
else {
# imamo opcijo drugo prikažemo kot checkbox
$_others[] = $row1;
}
}
if($row['orientation'] != 3)
echo '</tr>';
echo '</table>';
echo '</div>';
if ($row['vsota_show'] == 1 && $limit != '')
echo '<span id="variabla_limit_'.$spremenljivka.'" class="variabla_limit '.$cssFloat.'" style="padding: 0 15px 0 10px;">'.$limit.'</span>';
if ($row['vsota_show'] == 1 && $limit != '')
echo '<div id="variabla_limit_'.$spremenljivka.'" class="variabla_limit">'.$limit.'</div>';
if (count($_others)> 0 ) {
echo '<div class="text_vrednost_missing">';
foreach ($_others AS $oKey => $_other) {
if ($this->lang_id != null) {
save('lang_id', $this->lang_id);
$naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($_other['id']);
if ($naslov != '') $_other['naslov'] = $naslov;
}
// Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec
$missing_warning = '';
if(($_other['variable'] == '-97' && $row['alert_show_97'] > 0)
|| ($_other['variable'] == '-98' && $row['alert_show_98'] > 0)
|| ($_other['variable'] == '-99' && $row['alert_show_99'] > 0)){
$missing_warning = ' red';
if ($this->lang_id != null) {
save('lang_id', $this->lang_id);
$naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($_other['id']);
if ($naslov != '') $_other['naslov'] = $naslov;
}
// Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec
$missing_warning = '';
if(($_other['variable'] == '-97' && $row['alert_show_97'] > 0)
|| ($_other['variable'] == '-98' && $row['alert_show_98'] > 0)
|| ($_other['variable'] == '-99' && $row['alert_show_99'] > 0)){
$missing_warning = ' red';
}
echo '<div class="variabla' . $cssFloat . '" id="variabla_'.$_other['id'].'" other="'.$_other['other'].'">';
echo ' <input type="checkbox" name="foo_' . $_other['id'] . '" id="foo_' . $_other['id'] . '" value="" class="enka-admin-custom ' . (($_other['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<span class="enka-checkbox-radio "></span>';
echo '<div id="vre_id_'.$_other['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$_other['id'].'">' . $_other['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
}
echo '<div class="variabla' . $cssFloat . '" id="variabla_'.$_other['id'].'" other="'.$_other['other'].'">';
echo ' <input type="checkbox" name="foo_' . $_other['id'] . '" id="foo_' . $_other['id'] . '" value="" class="' . (($_other['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$_other['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$_other['id'].'">' . $_other['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
}
echo '</div>';
}
}
// number
elseif ($row['tip'] == 7) {
elseif ($row['tip'] == 7) {
if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit'])
$limit = '('.$row['vsota_min'].')';
@ -4873,20 +4866,19 @@ class Branching {
if($taWidth == -1)
$taWidth = 10;
$cssFloat = ' floatLeft';
$sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' AND other = 0 ");
$row1 = mysqli_fetch_array($sql1);
$sqlOther = sisplet_query("SELECT id, naslov, other FROM srv_vrednost WHERE spr_id='$row[id]' AND vrstni_red>0 AND other != 0");
$num_other = mysqli_num_rows($sqlOther);
$num_all = $num_other+$row['size'];
$cell_width = 'width:'.(80/$num_all).'% ';
if ( $row['ranking_k'] == '0' ) {
echo '<div class="variabla' . $cssFloat . '" style="'.$cell_width.'clear:none" id="variabla_'.$row1['id'].'">';
echo '<div class="number_vrednost enota_'.$row['enota'].'">';
echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
if ($this->lang_id != null) {
save('lang_id', $this->lang_id);
@ -4895,28 +4887,24 @@ class Branching {
}
if($row['enota'] == 1)
echo ' <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '</div>
<input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'">';
echo ' <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '</div>
<input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'">';
elseif($row['enota'] == 2)
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'" > <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null?' default="1"':'').'>' . $row1['naslov'].'</div>';
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'" > <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null?' default="1"':'').'>' . $row1['naslov'].'</div>';
else
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'" >';
echo '</div>';
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'" >';
echo '</div>';
// Omejitev vnosa
if ($row['orientacija'] == 1) {
echo '<div class="clr">ccc</div>';
$cssFloat = '';
}else {
$cssFloat = ' floatLeft';
}
if ($row['vsota_show'] == 1 && $limit != '') {
echo '<span id="variabla_limit_'.$spremenljivka.'" class="variabla_limit '.$cssFloat.'" style="padding: 0 15px 0 10px;">'.$limit.'</span>';
} elseif($row['size'] != 2 && $limit == '') {
echo '<span id="variabla_limit_'.$spremenljivka.'" class="variabla_limit '.$cssFloat.' editingOnly" style="padding-left: 10px;">'.$lang['srv_number_text'].'</span>';
echo '<div id="variabla_limit_'.$spremenljivka.'" class="variabla_limit">'.$limit.'</div>';
}
elseif($row['size'] != 2 && $limit == '') {
echo '<div id="variabla_limit_'.$spremenljivka.'" class="variabla_limit editingOnly">'.$lang['srv_number_text'].'</div>';
}
$cssFloat = ' floatLeft';
if ($row['size'] == 2) {
@ -4928,35 +4916,32 @@ class Branching {
if ($naslov != '') $row1['naslov'] = $naslov;
}
echo '<div class="variabla' . $cssFloat . '" style="width:'.$cell_width.'% !important; clear:none" id="variabla_'.$row1['id'].'">';
echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
if($row['enota'] == 1){
if($taWidth > 40)
echo '<br />';
echo ' <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '</div>
<input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'">';
echo ' <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '</div>
<input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'">';
}
elseif($row['enota'] == 2)
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'"> <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" style="float:none; display:inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'].'</div>';
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'"> <div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov'].'</div>';
else
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width: '.$taWidth.'em; float:none" id="foo_'.$row1['id'].'">';
echo ' <input type="text" name="foo_' . $row['id'] . '" style="width:'.$taWidth.'em;" id="foo_'.$row1['id'].'">';
echo '</div>';
//Omejitev vnosa
if ($row['orientacija'] == 1) {
echo '<div class="clr">ccc</div>';
$cssFloat = '';
}else {
$cssFloat = ' floatLeft';
}
// Omejitev vnosa
if ($row['vsota_show'] == 1 && $limit2 != '') {
echo '<span id="variabla_limit_'.$spremenljivka.'" class="variabla_limit '.$cssFloat.'" style="padding-left: 10px;">'.$limit2.'</span>';
} elseif($limit == '' && $limit2 == '') {
echo '<span id="variabla_limit_'.$spremenljivka.'" class="variabla_limit '.$cssFloat.' editingOnly" style="padding-left: 10px;">'.$lang['srv_number_text'].'</span>';
echo '<div id="variabla_limit_'.$spremenljivka.'" class="variabla_limit">'.$limit2.'</div>';
}
elseif($limit == '' && $limit2 == '') {
echo '<div id="variabla_limit_'.$spremenljivka.'" class="variabla_limit editingOnly">'.$lang['srv_number_text'].'</div>';
}
}
}//ranking_k == 0
echo '</div>';
}
//ranking_k == 0
if ( $row['ranking_k'] == '1' ) {
echo '<div id="variabla_'.$row1['id'].'">';
@ -5202,8 +5187,9 @@ class Branching {
}
echo '<div class="variabla' . $cssFloat . '" style="'.$cell_width.'" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="enka-admin-custom ' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<span class="enka-checkbox-radio "></span>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
@ -5247,8 +5233,9 @@ class Branching {
}
echo '<div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="enka-admin-custom ' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<span class="enka-checkbox-radio "></span>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
@ -5271,8 +5258,11 @@ class Branching {
$num = mysqli_num_rows($sql1);
$size = $num * 50;
echo '<div class="ranking_holder design_'.$row['design'].'">';
// n=k
if ($row['design'] == 2) {
echo '<div id="half_' . $row['podpora'] . '" class="dropzone '.($this->lang_id==null?'allow_new':'').'" style="min-height:' . $size . 'px;">';
while ($row1 = mysqli_fetch_array($sql1)) {
@ -5325,6 +5315,7 @@ class Branching {
echo '</div>';
}
echo '</div>';
}
@ -5332,7 +5323,7 @@ class Branching {
elseif ($row['design'] == 0) {
//zaslon razdelimo na dva dela - izris leve strani
echo '<div id="half" class="dropzone '.($this->lang_id==null?'allow_new':'').'" style="width: 50%; min-height:' . $size . 'px; float: left; border-right: 1px solid black;">';
echo '<div id="half" class="dropzone '.($this->lang_id==null ? 'allow_new' : '').'" style="min-height:'.$size.'px;">';
while ($row1 = mysqli_fetch_array($sql1)) {
@ -5356,13 +5347,6 @@ class Branching {
echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
@ -5382,12 +5366,21 @@ class Branching {
echo '</div>';
}
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
}
echo '</div>';
// izris desne strani
echo '<div id="half2" class="dropzone" style="width: 49%; min-height:' . $size . 'px; float: right;">';
echo '<div id="half2" class="dropzone" style="min-height:'.$size.'px;">';
if($row['ranking_k'] == 0)
$max = mysqli_num_rows($sql1);
@ -5399,8 +5392,6 @@ class Branching {
}
echo '</div>';
echo '<div class="clr"></div>';
}
// cifre - dropdown
@ -5459,6 +5450,8 @@ class Branching {
//izris hotspot nastavitev za dodajanje slike
$this->vprasanje_hotspot($row['id'], $row['tip'], $row['design']);
}
echo '</div>';
}
// vsota
@ -5478,7 +5471,7 @@ class Branching {
if ($naslov != '') $row1['naslov'] = $naslov;
}
echo '<div class="variabla variabla_vsota" id="variabla_'.$row1['id'].'" style="width:100%; ">';
echo '<div class="variabla variabla_vsota" id="variabla_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
@ -5488,7 +5481,7 @@ class Branching {
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline vrednost_inline_vsota '.$class.'" style="width:'.($gridWidth*7).'px" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline vrednost_inline_vsota '.$class.'" style="width:'.$gridWidth.'%" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
echo ' <input type="text" name="foo_' . $row['id'] . '" maxlength="8" size="5">';
if ($row1['if_id'] > 0) {
@ -5516,21 +5509,17 @@ class Branching {
$vsota = ($row1['vsota'] != '') ? $row1['vsota'] : $lang['srv_vsota_text'];
echo '<table class="variabla_vsota"><tr>';
echo '<div class="variabla_vsota sum">';
echo ' <td class="text">';
echo ' <div class="variabla_vsota_sum">';
echo ' <div style="width:'.($gridWidth*7).'px;" 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>';
echo ' </td>';
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 ' <td class="input">';
echo ' <input type="text" name="foo_' . $row['id'] . '" maxlength="8" size="5" >';
echo ' <input type="text" name="foo_' . $row['id'] . '" maxlength="8" size="5" >';
if ($row['vsota_show'] == 1)
echo ' <label style="color: red; padding-left: 5px;">'.$limit.'</label>';
echo ' </td>';
echo ' <label style="color: red; padding-left: 5px;">'.$limit.'</label>';
echo '</tr></table>';
echo '</div>';
}
// SN - imena

View File

@ -833,6 +833,8 @@ function inline_nova_vrednost (_this) {
var new_div = '<div id="variabla_new" class="variabla after_'+$(_this).attr('vre_id')+'">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
@ -840,14 +842,15 @@ function inline_nova_vrednost (_this) {
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
'</div>';
}
// vsota
} else if (tip == 18) {
var new_div = '<div id="variabla_new" class="variabla variabla_vsota after_'+$(_this).attr('vre_id')+'" style="width:100%">'+
var text_width = $(_this).closest('.variabla').find('.vrednost_inline_vsota')[0].style.width;
var new_div = '<div id="variabla_new" class="variabla variabla_vsota after_'+$(_this).attr('vre_id')+'">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <div class="icons_holder">'+
@ -857,7 +860,7 @@ function inline_nova_vrednost (_this) {
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline" style="width:111px" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'<div id="vre_id_new" class="vrednost_inline vrednost_inline_vsota" style="width:'+text_width+'" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <input type="text" name="foo_" maxlength="8" size="5">'+
'</div>';

File diff suppressed because it is too large Load Diff

View File

@ -90,6 +90,27 @@ li.spr_tip_24{
} */
}
}
&.spacer{
&.double{
width: 0px;
padding: 0;
border-left: 1px $gray solid;
&.no-border{
border-left: 0;
}
}
}
&.grid_header.double{
padding: 8px 14px;
font-size: 14px;
}
}
// Vrstica za nov odgovor na dnu

View File

@ -8,148 +8,277 @@ and open the template in the editor.
Author : podkrizniku
*/
.ranking {
font-size: 14px;
width: 220px;
height: 25px;
padding: 5px 0 0 0;
margin: 15px auto 0 auto;
border: 1px solid #000;
background-color: $gray;
text-align: center;
overflow: hidden;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
.ranking_long {
font-size: 14px;
width: 220px;
height: 25px;
padding: 5px 0 0 0;
margin: 15px auto 0 auto;
border: 1px solid #000;
background-color: $gray;
text-align: center;
overflow: hidden;
font-size: 11px;
}
.ranking_frame {
font-size: 14px;
width: 230px;
height: 29px;
padding: 5px 0 0 0;
margin: 10px auto 0 auto;
border: 1px black dashed;
background-color: $gray;
text-indent: -20px;
text-align: left;
li.spr_tip_17{
.variable_holder .ranking_holder{
// Prestavljanje
&.design_0{
display: flex;
margin-top: 8px;
#half{
width: 50%;
padding-right: 16px;
margin-right: 16px;
border-right: 1px $gray solid;
.variabla{
margin-bottom: 16px;
.ranking {
overflow: hidden;
box-sizing: border-box;
flex-grow: 0;
width: calc(100% - 120px);
max-width: 250px;
min-height: 36px;
padding: 8px;
margin: 0 auto 0 auto;
font-size: 14px;
text-align: center;
background-color: $light-gray;
border: 1px solid $gray;
border-radius: 4px;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
.ranking_long {
overflow: hidden;
box-sizing: border-box;
max-width: 250px;
max-height: 36px;
padding: 8px;
margin: 0 auto 0 auto;
font-size: 11px;
text-align: center;
background-color: $light-gray;
border: 1px solid $gray;
border-radius: 4px;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
}
}
// Desna stran
#half2{
width: 49%;
.ranking_frame {
box-sizing: border-box;
width: 250px;
height: 36px;
padding: 8px;
margin: 0 auto 16px auto;
font-size: 14px;
text-align: center;
text-indent: -24px;
text-align: left;
background-color: $light-gray;
border: 1px dashed $gray;
border-radius: 4px;
}
}
}
// Ostevilcevanje
&.design_1{
.icons_holder{
position: absolute;
right: 12px;
}
}
// Premikanje
&.design_2{
margin-top: 8px;
.variabla{
margin-bottom: 16px;
.icons_holder{
position: absolute;
right: 12px;
}
.ranking {
overflow: hidden;
box-sizing: border-box;
flex-grow: 0;
width: calc(100% - 120px);
max-width: 250px;
min-height: 36px;
padding: 8px;
margin: 0 auto 0 auto;
font-size: 14px;
text-align: center;
background-color: $light-gray;
border: 1px solid $gray;
border-radius: 4px;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
}
}
// Hotspot
&.design_3{
.icons_holder{
position: absolute;
right: 12px;
}
}
.dragdrop_frame {
font-size: 14px;
width: 230px;
height: 100px;
padding: 5px 0 0 0;
margin: 10px auto 0 auto;
border: 1px black dashed;
background-color: $gray;
text-indent: -20px;
text-align: left;
}
.dragdrop_frame_grid {
font-size: 14px;
width: 230px;
height: 25px;
padding: 0 0 2px 0;
margin: 0px auto 10px auto;
border: 1px black dashed;
background-color: $gray;
text-indent: -20px;
text-align: left;
}
.dragdrop_frame_grid_box {
font-size: 14px;
width: 230px;
height: 30px;
padding: 0 0 2px 0;
margin: 10px auto 0px auto;
border-left: 1px black dashed !important;
border-right: 1px black dashed !important;
border-bottom: 1px black dashed !important;
text-indent: -20px;
text-align: left;
}
.drag_and_drop_box {
cursor: pointer;
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px solid #000;
height: 15px;
text-align: center;
overflow: hidden;
background-color: white;
cursor: pointer;
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px solid #000;
height: 15px;
text-align: center;
overflow: hidden;
background-color: white;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
.drag_and_drop {
top: -6px;
left: -6px;
}
.drag_and_drop_right {
top: -6px !important;
left: -6px !important;
}
.drag_and_drop_box_right {
top: 15px !important;
left: -6px !important;
}
.drag_and_drop_box_right_after_refresh {
left: -6px !important;
}
.drag_and_drop_box_right_over {
left: -6px !important;
}
.inline_labele_podrocij {
text-align: center !important;
}
table.inline_labele_podrocij {
td {
text-align: center !important;
}
}
/*radio with image*/
.custom_radio{
.custom_radio_answer {
padding: 0 1px;
}
}
.custom_radio.visual-radio-scale{
.custom_radio_answer {
padding: 0 3px;
}
&.checked .enka-vizualna-skala:before{
color: $blue;
}
}
.enka-vizualna-skala {
display: inline-block;
height: 20px;
width: 20px;
float: left;
}
}
}
.dragdrop_frame {
font-size: 14px;
width: 230px;
height: 100px;
padding: 5px 0 0 0;
margin: 10px auto 0 auto;
border: 1px black dashed;
background-color: $gray;
text-indent: -20px;
text-align: left;
}
.dragdrop_frame_grid {
font-size: 14px;
width: 230px;
height: 25px;
padding: 0 0 2px 0;
margin: 0px auto 10px auto;
border: 1px black dashed;
background-color: $gray;
text-indent: -20px;
text-align: left;
}
.dragdrop_frame_grid_box {
font-size: 14px;
width: 230px;
height: 30px;
padding: 0 0 2px 0;
margin: 10px auto 0px auto;
border-left: 1px black dashed !important;
border-right: 1px black dashed !important;
border-bottom: 1px black dashed !important;
text-indent: -20px;
text-align: left;
}
.drag_and_drop_box {
cursor: pointer;
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px solid #000;
height: 15px;
text-align: center;
overflow: hidden;
background-color: white;
cursor: pointer;
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px solid #000;
height: 15px;
text-align: center;
overflow: hidden;
background-color: white;
img {
display: block;
margin-left: auto;
margin-right: auto;
}
}
.drag_and_drop {
top: -6px;
left: -6px;
}
.drag_and_drop_right {
top: -6px !important;
left: -6px !important;
}
.drag_and_drop_box_right {
top: 15px !important;
left: -6px !important;
}
.drag_and_drop_box_right_after_refresh {
left: -6px !important;
}
.drag_and_drop_box_right_over {
left: -6px !important;
}
.inline_labele_podrocij {
text-align: center !important;
}
table.inline_labele_podrocij {
td {
text-align: center !important;
}
}
/*radio with image*/
.custom_radio{
.custom_radio_answer {
padding: 0 1px;
}
}
.custom_radio.visual-radio-scale{
.custom_radio_answer {
padding: 0 3px;
}
&.checked .enka-vizualna-skala:before{
color: $blue;
}
}
.enka-vizualna-skala {
display: inline-block;
height: 20px;
width: 20px;
float: left;
}

View File

@ -9,66 +9,57 @@ and open the template in the editor.
*/
.variabla_vsota {
padding: 0px 5px;
width: 25%;
width: calc(100% - 150px);
text-align: right;
.icons_holder{
position: absolute;
right: 12px;
}
input{
margin-left: 10px;
margin-top: 2px !important;
box-sizing: border-box;
width: 150px;
margin-left: 8px;
padding: 12px 8px;
color: #a9a9a9;
border: 1px solid $gray;
border-radius: 4px;
}
.vrednost_inline_vsota {
word-break:break-all;
flex-grow: 0 !important;
}
.variabla_vsota_inline{
word-break:break-all;
}
}
.vrednost_inline_vsota {
float: left;
box-sizing: border-box;
width: 200px;
max-width: 80%;
min-width: 160px;
padding: 2px 15px 2px 18px !important;
margin-left: 12px;
word-break:break-all;
}
.variabla_vsota_inline{
float: left;
max-width: 80%;
min-width: 160px;
padding: 2px 15px;
word-break:break-all;
}
/* Zadnja vrsticas pri urejanju vsote - "skupaj" */
table.variabla_vsota{
clear: both;
border-spacing: 0;
border-collapse: collapse;
display: block;
.variabla_vsota.sum{
position: relative;
width: auto;
display: flex;
align-items: center;
tr{
td.text{
border-top: 1px black solid;
.vrednost_inline_vsota {
padding: 4px 6px;
font-size: 14px;
}
.variabla_vsota_sum{
margin-left: 18px;
.variabla_vsota_border{
position: absolute;
top: 0;
left: 12px;
div{
width: 100%;
max-width: 100%;
box-sizing: border-box;
}
}
}
td.input{
border-top: 1px black solid;
width: calc(40% + 165px);
input{
margin-left: 8px;
}
}
border-top: 1px $gray solid;
}
}

View File

@ -9,7 +9,7 @@ li.spr_tip_21{
.variable_holder{
display: flex;
flex-direction: row;
flex-direction: column;
padding: 0 16px;
@ -20,28 +20,127 @@ li.spr_tip_21{
.vrednost_inline{
flex-grow: 0;
}
}
// Polja v tabeli - text
table{
.text_vrednost{
display: flex;
align-items: center;
tr{
td{
padding: 0;
border: 0;
width: 100%;
.grid_question{
display: flex;
align-items: center;
margin-right: 8px;
&:last-child{
margin-right: 0;
}
.vrednost_inline{
box-sizing: border-box;
padding: 4px 6px;
font-size: 14px;
}
textarea{
height: auto;
}
// Brez enote
&.position_0{
.vrednost_inline{
display: none;
}
&.multiple input[type="text"],
&.multiple textarea{
width: 90% !important;
}
}
// Enota spredaj
&.position_1{
.vrednost_inline{
margin-right: 4px;
}
flex-direction: row;
}
// Enota zgoraj
&.position_2{
flex-direction: column-reverse;
.vrednost_inline{
box-sizing: border-box;
padding: 4px 6px;
font-size: 14px;
margin-top: 4px;
}
&.multiple input[type="text"],
&.multiple textarea{
width: 90% !important;
}
}
// Enota spodaj
&.position_3{
flex-direction: column;
.vrednost_inline{
margin-bottom: 4px;
}
&.multiple input[type="text"],
&.multiple textarea{
width: 90% !important;
}
}
}
// Vodoravno ob vprasanju
&.orientation_0{
}
// Vodoravno pod vprasanjem
&.orientation_1{
}
// Navpicno
&.orientation_3{
flex-direction: column;
.grid_question{
width: 100%;
margin-bottom: 8px;
}
}
}
.variabla_limit{
padding: 0;
margin-top: 8px;
color: red;
font-size: 14px;
}
// Missing polja v tabeli
.text_vrednost_missing{
margin-top: 8px;
}
.icons_holder{
position: absolute;
right: 12px;
}
input[type="text"]{
box-sizing: border-box;
@ -54,183 +153,54 @@ li.spr_tip_21{
border-radius: 4px;
}
}
}
&.spr_tip_7,
&.spr_tip_8{
.variable_holder{
.number_vrednost{
display: flex;
flex-direction: row;
align-items: center;
/*.spremenljivka_content[tip="24"] {
.variable_holder {
overflow-x: auto;
}
}
.grid_header_table {
width: 100%;
text-align: center;
border-collapse: collapse;
thead{
tr{
td{
border: 0;
width: 100%;
margin-bottom: 8px;
&.grid_header {
height: 18px;
.variabla{
margin: 0 0 0 16px;
&:first-child{
margin-left: 0;
}
}
.variabla_limit{
min-width: 50px;
margin: 0 0 0 4px;
}
// Enota spredaj
&.enota_1{
.vrednost_inline{
margin-right: 4px;
}
}
// Enota zadaj
&.enota_2{
.vrednost_inline{
margin-left: 4px;
}
}
}
.calendar_icon{
&:before{
color: $blue;
}
}
}
}
tbody {
tr {
td {
padding-top: 3px;
padding-bottom: 3px;
border: 0;
}
&:nth-child(odd) {
background-color: $light-gray;
td {
background-color: $light-gray;
div[contenteditable=true] {
border: 1px solid transparent;
}
}
}
}
}
}
.grid_header {
font-weight: 500;
}
.grid_question {
width: 20%;
text-align: left;
padding-right: 1%;
}
.col_border {
border-left: 1px solid $gray;
}
.grid-plus-minus {
text-align: right;
visibility: hidden;
}
.sub-table {
display: none;
}
div.grid_inline {
min-width: 20px;
padding: 2px 0;
}
div.grid_inline_droppable_title {
height: 15px !important;
width: 230px;
padding: 2px 0 5 0;
margin: 0px auto 0px auto;
border-top: 1px black dashed !important;
border-left: 1px black dashed !important;
border-right: 1px black dashed !important;
text-align: center;
}
div.grid_inline_droppable_title_box {
height: 15px !important;
width: 230px;
padding: 2px 0 5 0;
margin: 0px auto 0px auto;
text-align: center;
}
li {
table.grid_header_table {
span.inline.show {
visibility: visible;
}
}
}
@mixin inlineMove {
span.inline_move {
position: absolute;
left: 30px;
}
}
div.spremenljivka_content[tip="6"] {
@include inlineMove;
}
div.spremenljivka_content[tip="16"] {
@include inlineMove;
}
div.spremenljivka_content[tip="19"] {
@include inlineMove;
}
div.spremenljivka_content[tip="20"] {
@include inlineMove;
}
div.spremenljivka_content[tip="24"] {
@include inlineMove;
}
table.grid_header_table {
span.inline_delete {
position: absolute;
visibility: hidden;
right: 5px;
margin-right: 57px;
margin-right: 0px;
}
span.inline_edit {
position: absolute;
visibility: hidden;
right: 7px;
margin-right: 57px;
}
span.inline_if_not {
position: absolute;
visibility: hidden;
right: 7px;
margin-right: 57px;
margin-right: 32px;
}
span.inline_if_follow {
position: absolute;
visibility: hidden;
right: 7px;
margin-right: 57px;
}
span.inline_hidden {
position: absolute;
visibility: hidden;
right: 7px;
margin-right: 57px;
margin-right: 14px;
}
span.correct {
position: absolute;
visibility: hidden;
right: 7px;
margin-right: 57px;
}
}
.trak_class {
border: 1px solid $gray;
cursor: pointer;
background: white !important;
}
.trak_class_input {
visibility: hidden !important;
display: block;
z-index: -1;
}
.radio-button-label {
cursor: pointer !important;
z-index: -2;
}
.trak_container_bg {
background-color: $gray !important;
}
table.trak_inline_nadnaslov {
td {
text-align: center !important;
}
}*/

View File

@ -20,6 +20,28 @@ li.spr{
min-height: 20px;
margin: 0 0 4px 0;
select{
border: 1px solid $dark-gray;
box-sizing: border-box;
border-radius: 2px;
cursor: pointer;
font-family: $font_family;
margin-top: 4px;
margin-right: 4px;
background-color: $white;
option {
color: $black;
&:disabled{
color: #A0A0A0;
}
}
}
.vrednost_inline{
box-sizing: border-box;
flex-grow: 1;