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

[Redizajn 1KA] - Podatki --> Izračuni --> Izračunane vrednosti - popup v1

Browse Source 
Manjka vsebina kalkulacije
This commit is contained in:
tejagerjovic 2022-04-26 05:40:55 +02:00
parent 2a95611d5d
commit 96a4be1782
7 changed files with 78 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
admin/survey/Branching.php
View File

@ -8751,9 +8751,7 @@ class Branching {
$variable = $row1['variable'].'['.$row1g['variable'].']'; $variable = $row1['variable'].'['.$row1g['variable'].']';
} }
if ($long_alert) $echo .= '<strong>';
$echo .= $variable; $echo .= $variable;
if ($long_alert) $echo .= '</strong>';
// konstante // konstante
} elseif ($row['spr_id'] == -1) { } elseif ($row['spr_id'] == -1) {
@ -8782,11 +8780,11 @@ class Branching {
if ( $calculation_check != 0) { if ( $calculation_check != 0) {
if ($calculation_check == 1) //if ($calculation_check == 1)
$echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_spremenljivka'].'</span>'; //$echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_spremenljivka'].'</span>';
elseif ($calculation_check == 2) //elseif ($calculation_check == 2)
$echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_spremenljivka'].'</span>'; //$echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_spremenljivka'].'</span>';
elseif ($calculation_check == 3) if ($calculation_check == 3)
$echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_oklepaji'].'</span>'; $echo .= '<br /><span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_oklepaji'].'</span>';
} }
@ -8801,27 +8799,26 @@ class Branching {
function calculation_editing ($condition, $vrednost=0) { function calculation_editing ($condition, $vrednost=0) {
global $lang; global $lang;
echo '<div class="popup_close"><a href="#" onClick="calculation_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
echo '<div id="calculation_editing_inner">'; echo '<div id="calculation_editing_inner podatki">';
$this->calculation_editing_inner($condition, $vrednost); $this->calculation_editing_inner($condition, $vrednost);
echo '</div>';
echo '<div id="bottom_space">'; echo '<div id="bottom_options">';
echo '<div class="setting_horizontal_wrapper">'; echo '<div class="setting_horizontal_wrapper">';
$row = Cache::srv_spremenljivka(-$condition); $row = Cache::srv_spremenljivka(-$condition);
if ($condition < 0) { if ($condition < 0) {
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<label for="variable_'.(-$condition).'">'.$lang['srv_variable'].'</label>'; echo '<label for="variable_'.(-$condition).'">'.$lang['srv_editcalculation_new'].':</label>';
echo '<input type="text" class="large" id="variable_'.(-$condition).'" value="'.$row['variable'].'" onkeyup="calculation_edit_variable(\''.-$condition.'\');" />'; echo '<input type="text" class="large" id="variable_'.(-$condition).'" value="'.$row['variable'].'" onkeyup="calculation_edit_variable(\''.-$condition.'\');" />';
echo '</div>'; echo '</div>';
} }
// Nastavitev števila decimalk // Nastavitev števila decimalk
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<label for="decimalna_'.(-$condition).'">'.$lang['srv_results_num_digits'].'</label>'; echo '<label for="decimalna_'.(-$condition).'">'.$lang['srv_results_num_digits'].':</label>';
echo ' <select class="dropdown large w130" id="decimalna_'.(-$condition).'" onChange="calculation_edit_decimalna(\''.-$condition.'\');">'; echo ' <select class="dropdown large w130" id="decimalna_'.(-$condition).'" onChange="calculation_edit_decimalna(\''.-$condition.'\');">';
for($i=0; $i<=10; $i++){ for($i=0; $i<=10; $i++){
echo ' <option value="'.$i.'" '.($row['decimalna'] == $i ? ' selected="selected"' : '').'>'.$i.'</option>'; echo ' <option value="'.$i.'" '.($row['decimalna'] == $i ? ' selected="selected"' : '').'>'.$i.'</option>';
@ -8842,23 +8839,20 @@ class Branching {
echo '</div>'; echo '</div>';
echo '<div id="condition_editing_close">'; echo '<div id="condition_editing_close podatki">';
// kalkulacija kot spremenljivka (lahko jo zbrisemo) echo '<div class="button_holder">';
// kalkulacija kot spremenljivka (lahko jo zbrisemo)
if ($condition < 0) { if ($condition < 0) {
echo '<span class="buttonwrapper spaceRight floatLeft">'; echo '<button class="medium white-blue" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;">'.$lang['srv_anketadelete_txt'].'</button>';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;"><span>'.$lang['srv_anketadelete_txt'].'</span></a>';
echo '</span>';
} }
echo '<span class="buttonwrapper spaceRight floatLeft">'; echo '<button class="medium white-blue" onclick="window.location.reload(); return false;">'.$lang['edit1338'].'</button>';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="calculation_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
echo '</span>'; echo '<button class="medium blue" onclick="popupClose(); return false;">'.$lang['srv_potrdi'].'</button>';
echo '</div>';
echo '<span class="buttonwrapper floatLeft">';
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="calculation_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
echo '</span>';
echo '</div>'; echo '</div>';
echo '<div id="arrows_more_calculation" onclick=" $(\'#calculation_editing_inner\').animate({ scrollTop: $(\'#calculation_editing_inner\').attr(\'scrollHeight\') }, 2000); "><img src="img_0/bullet_arrow_down.png" /> '.$lang['srv_more'].'</div>'; echo '<div id="arrows_more_calculation" onclick=" $(\'#calculation_editing_inner\').animate({ scrollTop: $(\'#calculation_editing_inner\').attr(\'scrollHeight\') }, 2000); "><img src="img_0/bullet_arrow_down.png" /> '.$lang['srv_more'].'</div>';
@ -8879,6 +8873,9 @@ class Branching {
}); });
$('#calculation_editing_inner').scroll(); $('#calculation_editing_inner').scroll();
</script><? </script><?
echo '</div>'; #calculation_editing_inner
} }
function calculation_editing_inner ($condition, $vrednost=0) { function calculation_editing_inner ($condition, $vrednost=0) {
@ -8886,17 +8883,12 @@ class Branching {
echo '<div class="calculation_editing_preview">'; echo '<div class="calculation_editing_preview">';
echo '<h2>'.$lang['srv_calc'].'</h2>'; echo '<h2><span class="blue faicon edit"></span>'.$lang['srv_calc'].'</h2>';
echo '<div id="calculation_editing_calculations">'; echo '<div id="calculation_editing_calculations">';
echo $this->calculations_display($condition, 1); echo $this->calculations_display($condition, 1);
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '<div class="calculation_editing_title">';
echo '<h2>'.$lang['srv_editcalculation'].'</h2>';
echo '</div>';
echo '<div class="calculation_editing_body">'; echo '<div class="calculation_editing_body">';
$sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red"); $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
if (mysqli_num_rows($sql) == 0) { if (mysqli_num_rows($sql) == 0) {
@ -8909,7 +8901,7 @@ class Branching {
echo '</div>'; echo '</div>';
echo '<p id="calculation_editing_operators" style="margin-left:62px; height:50px;">'.$lang['srv_add_cond'].': echo '<p class="bottom16" id="calculation_editing_operators">'.$lang['srv_add_cond'].':
<a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>, <a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
<a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>, <a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
<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.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,

1
lang/1.php
View File

@ -2570,6 +2570,7 @@ $lang = array (
"srv_addfilter" => "Dodaj filtriranje", "srv_addfilter" => "Dodaj filtriranje",
"srv_editcalculation" => "Uredi kalkulacijo", "srv_editcalculation" => "Uredi kalkulacijo",
"srv_editcalculation_missing" => "Neodgovor upoštevaj kot vrednost 0", "srv_editcalculation_missing" => "Neodgovor upoštevaj kot vrednost 0",
"srv_editcalculation_new" => "Ime nove spremenljivke",
"srv_edit_quota" => "Uredi kvoto", "srv_edit_quota" => "Uredi kvoto",
"cats_for_r_db_ttl" => "Prikazani filtri v r-bazi", "cats_for_r_db_ttl" => "Prikazani filtri v r-bazi",
"FinancialSite" => "Finančno spletno mesto", "FinancialSite" => "Finančno spletno mesto",

1
lang/2.php
View File

@ -2542,6 +2542,7 @@ $lang = array (
"srv_sar" => "Server", "srv_sar" => "Server",
"srv_addfilter" => "Add filter", "srv_addfilter" => "Add filter",
"srv_editcalculation" => "Edit calculation", "srv_editcalculation" => "Edit calculation",
"srv_editcalculation_new" => "Ime nove spremenljivke",
"srv_editcalculation_missing" => "Missings as value 0", "srv_editcalculation_missing" => "Missings as value 0",
"srv_edit_quota" => "Edit quota", "srv_edit_quota" => "Edit quota",
"cats_for_r_db_ttl" => "Shown filters in r-base", "cats_for_r_db_ttl" => "Shown filters in r-base",

17
public/css/admin_new.css
View File

@ -19795,6 +19795,9 @@ span.faicon.st-besede-popup {
margin-bottom: 40px; margin-bottom: 40px;
overflow: auto; overflow: auto;
} }
#calculation #calculation_editing_inner.podatki {
margin-bottom: 0;
}
#calculation .calculation_editing_body { #calculation .calculation_editing_body {
max-height: 40vh; max-height: 40vh;
overflow-y: auto; overflow-y: auto;
@ -19809,6 +19812,10 @@ span.faicon.st-besede-popup {
float: right; float: right;
margin: 20px 20px 20px 0; margin: 20px 20px 20px 0;
} }
#calculation #condition_editing_close.podatki {
margin: 0;
display: block;
}
#calculation #bottom_space { #calculation #bottom_space {
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -24125,6 +24132,14 @@ div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
color: #FFC700; color: #FFC700;
} }
div.subpage_calculation div#calculation div#calculation_editing_inner div#calculation_editing_calculations {
font-weight: 600;
font-size: 20px;
}
div.subpage_calculation div#calculation div#calculation_editing_inner p#calculation_editing_operators a {
text-decoration: none;
}
div.appendmerge_indent { div.appendmerge_indent {
margin: 16px 0 16px 16px; margin: 16px 0 16px 16px;
} }
@ -24424,9 +24439,11 @@ and open the template in the editor.
.setting_horizontal_wrapper { .setting_horizontal_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-bottom: 16px;
} }
.setting_horizontal_wrapper .setting_holder { .setting_horizontal_wrapper .setting_holder {
margin-right: 32px; margin-right: 32px;
width: 250px;
} }
#div_analiza_data:not(.anal_arch) .div_analiza_holder, #div_analiza_data:not(.anal_arch) .div_analiza_holder,

24
resources/sass/admin_new/pages/survey_data/calculations.scss
View File

@ -306,4 +306,26 @@ div.subpage_coding {
width: auto; width: auto;
z-index: 1000; z-index: 1000;
} }
} }
//Izračunane vrednosti - popup
div.subpage_calculation {
div#calculation {
div#calculation_editing_inner {
div#calculation_editing_calculations {
font-weight: $semi-bold;
font-size: 20px;
}
p#calculation_editing_operators {
a {
text-decoration: none;
}
}
}
}
}

2
resources/sass/admin_new/pages/survey_data/popups/calculations.scss
View File

@ -2,8 +2,10 @@
.setting_horizontal_wrapper { .setting_horizontal_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-bottom: 16px;
.setting_holder { .setting_holder {
margin-right: 32px; margin-right: 32px;
width: 250px;
} }
} }

9
resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss
View File

@ -49,6 +49,10 @@
right: 0; right: 0;
margin-bottom: 40px; margin-bottom: 40px;
overflow: auto; overflow: auto;
&.podatki {
margin-bottom: 0;
}
} }
.calculation_editing_body{ .calculation_editing_body{
@ -68,6 +72,11 @@
#condition_editing_close { #condition_editing_close {
float: right; float: right;
margin: 20px 20px 20px 0; margin: 20px 20px 20px 0;
&.podatki {
margin: 0;
display: block;
}
} }
#bottom_space { #bottom_space {
bottom: 0; bottom: 0;