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

Redesign - urejanje vprasalnika - popravki pogojev

Browse Source
This commit is contained in:
pero1203 2022-04-05 13:58:33 +02:00
parent 587e40392d
commit f11588f972
3 changed files with 141 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/survey/Branching.php
View File

@ -7720,7 +7720,7 @@ class Branching {
echo '<div class="clr"></div>'; echo '<div class="clr"></div>';
?><script> ?><script>
$('#div_condition_editing_inner').sortable({items: 'form', handle: 'img.move', stop: function () { $('#div_condition_editing_inner').sortable({items: 'form', handle: 'span.move', stop: function () {
condition_sort(<?=$if?>); condition_sort(<?=$if?>);
} }); } });
@ -7887,7 +7887,7 @@ class Branching {
// Move handle // Move handle
echo '<div class="move_holder">'; echo '<div class="move_holder">';
if ($row_count['count'] != 1 ) if ($row_count['count'] != 1 )
echo '<span class="faicon move_updown" title="'.$lang['srv_move'].'"></span>'; echo '<span class="faicon move_updown move" title="'.$lang['srv_move'].'"></span>';
echo '</div>'; echo '</div>';
@ -8136,7 +8136,7 @@ class Branching {
// span, ki se updata ob spremembi spremenljivke // span, ki se updata ob spremembi spremenljivke
echo '<div class="column operator">'; echo '<div class="column operator">';
echo '<span id="fill_vrednost_'.$condition.'">'; echo '<span id="fill_vrednost_'.$condition.'" class="fill_vrednost">';
if ($edit_fill_value == $condition) if ($edit_fill_value == $condition)
$edit_value = true; $edit_value = true;
@ -8213,7 +8213,7 @@ class Branching {
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="'.$row1['tip'].'" >'; echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="'.$row1['tip'].'" >';
// operator // operator
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r"; echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" class="dropdown medium operator" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
echo ' <option value="0"'.($row['operator']==0?' selected="selected"':'').'>=</option>'."\n\r"; echo ' <option value="0"'.($row['operator']==0?' selected="selected"':'').'>=</option>'."\n\r";
echo ' <option value="1"'.($row['operator']==1?' selected="selected"':'').'>&ne;</option>'."\n\r"; echo ' <option value="1"'.($row['operator']==1?' selected="selected"':'').'>&ne;</option>'."\n\r";
@ -8237,7 +8237,7 @@ class Branching {
// number in textbox, vsota imajo textovni input (ter compute in kvota) // number in textbox, vsota imajo textovni input (ter compute in kvota)
if ($row1['tip'] == 4 || $row1['tip'] == 21 || $row1['tip'] == 7 || $row1['tip'] == 22 || $row1['tip'] == 25 || $row1['tip'] == 18) if ($row1['tip'] == 4 || $row1['tip'] == 21 || $row1['tip'] == 7 || $row1['tip'] == 22 || $row1['tip'] == 25 || $row1['tip'] == 18)
{ {
echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" value="'.$row['text'].'" style="width:140px" >'; echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" class="medium" value="'.$row['text'].'">';
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
echo '$(document).ready(function() {' . echo '$(document).ready(function() {' .
@ -8409,7 +8409,7 @@ class Branching {
// tabela text, tabela stevilo // tabela text, tabela stevilo
} else { } else {
echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" value="'.$row['text'].'" style="width:140px" >'; echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" class="medium" value="'.$row['text'].'">';
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
echo '$(document).ready(function() {' . echo '$(document).ready(function() {' .
@ -8429,14 +8429,14 @@ class Branching {
// zato, da z JS vemo kaj poslat po AJAXu, ID vrednosti ali text // zato, da z JS vemo kaj poslat po AJAXu, ID vrednosti ali text
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="-1" />'."\n\r"; echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="-1" />'."\n\r";
echo $lang['srv_groups'].': <select name="modul_'.$condition.'" id="modul_'.$condition.'" class="dropdown medium" onchange="javascript:fill_ostanek(\''.$condition.'\');">'."\n\r"; echo $lang['srv_groups'].': <select name="modul_'.$condition.'" id="modul_'.$condition.'" class="dropdown medium" onchange="javascript:fill_ostanek(\''.$condition.'\');">'."\n\r";
for ($i=2; $i<=64; $i++) for ($i=2; $i<=64; $i++)
echo '<option value="'.$i.'"'.($row['modul']==$i?' selected="selected"':'').'>'.$i.'</option>'; echo '<option value="'.$i.'"'.($row['modul']==$i?' selected="selected"':'').'>'.$i.'</option>';
echo '</select>'."\n\r"; echo '</select>'."\n\r";
echo '<span id="'.$condition.'_ostanek">'; echo '<span id="'.$condition.'_ostanek" class="ostanek">';
$this->fill_ostanek($condition); $this->fill_ostanek($condition);
echo '</span>'."\n\r"; echo '</span>'."\n\r";
@ -8461,7 +8461,7 @@ class Branching {
echo ' <option value="5"'.($row['operator']==5?' selected':'').'>>=</option>'."\n\r"; echo ' <option value="5"'.($row['operator']==5?' selected':'').'>>=</option>'."\n\r";
echo '</select> '."\n\r"; echo '</select> '."\n\r";
echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" value="'.$row['text'].'" style="width:40px;" />'; echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" class="medium" value="'.$row['text'].'" />';
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
echo '$(document).ready(function() {' . echo '$(document).ready(function() {' .
@ -8493,7 +8493,7 @@ class Branching {
echo ' <option value="5"'.($row['operator']==5?' selected':'').'>>=</option>'."\n\r"; echo ' <option value="5"'.($row['operator']==5?' selected':'').'>>=</option>'."\n\r";
echo '</select> '."\n\r"; echo '</select> '."\n\r";
echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" value="'.$row['text'].'" style="width:40px;" />'; echo '<input type="text" name="text_'.$condition.'" id="text_'.$condition.'" class="medium" value="'.$row['text'].'" />';
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
echo '$(document).ready(function() {' . echo '$(document).ready(function() {' .
@ -8528,7 +8528,7 @@ class Branching {
$sql = sisplet_query("SELECT * FROM srv_condition WHERE id='$condition'"); $sql = sisplet_query("SELECT * FROM srv_condition WHERE id='$condition'");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
echo $lang['srv_group'].': <select name="ostanek_'.$condition.'" id="ostanek_'.$condition.'" style="width:40px" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r"; echo $lang['srv_group'].': <select name="ostanek_'.$condition.'" id="ostanek_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
for ($i=0; $i<$row['modul']; $i++) for ($i=0; $i<$row['modul']; $i++)
echo '<option value="'.$i.'"'.($row['ostanek']==$i?' selected="selected"':'').'>'.($i+1).'</option>'; echo '<option value="'.$i.'"'.($row['ostanek']==$i?' selected="selected"':'').'>'.($i+1).'</option>';

82
public/css/admin_new.css
View File

@ -16286,15 +16286,10 @@ and open the template in the editor.
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction { #branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction {
padding-left: 22px; padding-left: 22px;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select {
margin: 0;
width: auto;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder, #branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder, #branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder { #branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder {
cursor: pointer;
margin-right: 12px; margin-right: 12px;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before, #branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
@ -16311,19 +16306,82 @@ and open the template in the editor.
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 32px 0; padding: 32px 0;
font-size: 14px;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label {
font-size: 14px;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column, #branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column, #branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column { #branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column {
display: flex; display: flex;
align-items: baseline;
padding: 0 16px; padding: 0 16px;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon:before,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon:before,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon:before {
font-size: 14px;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.icon-grey_normal:before,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.icon-grey_normal:before,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.icon-grey_normal:before {
line-height: 22px;
color: #808080;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.add,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.add,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .faicon.add {
margin-right: 8px;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator, #branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator, #branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator { #branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator {
flex-grow: 1; flex-grow: 1;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek {
display: flex;
align-items: center;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select {
margin-right: 4px;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator {
width: 50px;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder, #branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder, #branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder { #branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder {
@ -16335,6 +16393,18 @@ and open the template in the editor.
font-size: 16px; font-size: 16px;
color: #1E88E5; color: #1E88E5;
} }
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select,
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select,
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select {
margin: 0;
width: auto;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text],
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text],
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text] {
margin: 0;
width: auto;
}
#branching li.if.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators, #branching li.if.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators,
#branching li.block.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators, #branching li.block.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators,
#branching li.loop.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators { #branching li.loop.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators {

59
resources/sass/admin_new/pages/survey_edit/conditions.scss
View File

@ -123,14 +123,11 @@ and open the template in the editor.
&.conjunction{ &.conjunction{
padding-left: 22px; padding-left: 22px;
select{
margin: 0;
width: auto;
}
} }
.move_holder{ .move_holder{
cursor: pointer;
margin-right: 12px; margin-right: 12px;
.faicon:before{ .faicon:before{
@ -147,14 +144,56 @@ and open the template in the editor.
padding: 32px 0; padding: 32px 0;
font-size: 14px;
background-color: $white; background-color: $white;
span,
label{
font-size: 14px;
}
.column{ .column{
display: flex; display: flex;
align-items: baseline;
padding: 0 16px; padding: 0 16px;
&.bracket{
.faicon{
&:before{
font-size: 14px;
}
&.icon-grey_normal:before{
line-height: 22px;
color: $very-dark-gray2;
}
&.add{
margin-right: 8px;
}
}
}
&.operator{ &.operator{
flex-grow: 1; flex-grow: 1;
.fill_vrednost,
.ostanek{
display: flex;
align-items: center;
input,
select{
margin-right: 4px;
&.operator{
width: 50px;
}
}
}
} }
} }
} }
@ -167,6 +206,16 @@ and open the template in the editor.
color: $blue; color: $blue;
} }
} }
select{
margin: 0;
width: auto;
}
input[type="text"]{
margin: 0;
width: auto;
}
} }
} }