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

Popravek popupa za kalkulacijo - dodana max visina in scroll pri overflow

Browse Source
This commit is contained in:
pero1203 2021-08-25 11:58:49 +02:00
parent 9854ad7096
commit 9ff1bb67eb
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/Branching.php
View File

@ -7936,19 +7936,22 @@ class Branching {
echo '</div>';
echo '</div>';
echo '<div class="condition_editing_body">';
echo '<div class="calculation_editing_title">';
echo '<h2>'.$lang['srv_editcalculation'].'</h2>';
echo '</div>';
echo '<div class="calculation_editing_body">';
$sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
if (mysqli_num_rows($sql) == 0) {
sisplet_query("INSERT INTO srv_calculation (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')");
$sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
}
while ($row = mysqli_fetch_array($sql)) {
$this->calculation_edit($row['id'], $vrednost);
}
echo '</div>';
echo '<p id="calculation_editing_operators" style="margin-left:62px; height:50px;">'.$lang['srv_add_cond'].':
<a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
@ -7956,7 +7959,6 @@ class Branching {
<a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
<a href="#" onclick="calculation_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
</p><br><br>';
}
/**

10
public/css/admin.css
View File

@ -9074,6 +9074,16 @@ body.waitlong #loading {
margin-bottom: 40px;
overflow: auto;
}
#calculation .calculation_editing_body {
max-height: 40vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
border: 1px #E6E6E6 solid;
}
#calculation .calculation_editing_body .tbl_condition_editing {
margin-bottom: 5px;
}
#calculation #condition_editing_close {
float: right;
margin: 20px 20px 20px 0;

15
resources/sass/admin/popup/settings.scss
View File

@ -205,6 +205,21 @@
margin-bottom: 40px;
overflow: auto;
}
.calculation_editing_body{
max-height: 40vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
border: 1px $fieldset_border solid;
.tbl_condition_editing{
margin-bottom: 5px;
}
}
#condition_editing_close {
float: right;
margin: 20px 20px 20px 0;