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

[Redizajn 1KA] Popupi: Podatki > Izračuni > Rekodiranje - Dodaj

Browse Source
This commit is contained in:
tejagerjovic 2022-05-05 23:29:31 +02:00
parent 8f285d1c4b
commit f44f2fd22f
5 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -495,7 +495,7 @@ class SurveyAdmin
// REKODIRANJE // REKODIRANJE
echo '<div id="question_recode" class="divPopUp"></div>'; echo '<div id="question_recode" class="divPopUp PopUpNarrow"></div>';
echo '<div id="question_recode_run_note" class="divPopUp"></div>'; echo '<div id="question_recode_run_note" class="divPopUp"></div>';

35
admin/survey/classes/class.RecodeValues.php
View File

@ -444,7 +444,7 @@ class RecodeValues {
echo '<li>'; echo '<li>';
echo '<span class="faicon move_updown moveY"></span>'; echo '<span class="faicon move_updown moveY"></span>';
printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">'; echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
foreach (self::$_operators AS $value => $operator) { foreach (self::$_operators AS $value => $operator) {
$selected = ($value == '0') ? ' selected="selected"' : ''; $selected = ($value == '0') ? ' selected="selected"' : '';
echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>'; echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@ -462,7 +462,7 @@ class RecodeValues {
echo '&nbsp;'.$lang['srv_recode_number_to']; echo '&nbsp;'.$lang['srv_recode_number_to'];
echo '<select name="recode_number_type[]" onChange="recode_number_type_changed(this);">'; echo '<select class="dropdown medium" name="recode_number_type[]" onChange="recode_number_type_changed(this);">';
foreach (self::$options AS $oKey => $option) { foreach (self::$options AS $oKey => $option) {
if ($option['variable'] == null && $oKey != '_0_') { if ($option['variable'] == null && $oKey != '_0_') {
echo '<option disabled="disabled">'.$option['naslov'].'</option>'; echo '<option disabled="disabled">'.$option['naslov'].'</option>';
@ -494,7 +494,7 @@ class RecodeValues {
echo '<li>'; echo '<li>';
echo '<span class="faicon move_updown moveY"></span>'; echo '<span class="faicon move_updown moveY"></span>';
printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">'; echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
foreach (self::$_operators AS $value => $operator) { foreach (self::$_operators AS $value => $operator) {
$selected = ($value == '0') ? ' selected="selected"' : ''; $selected = ($value == '0') ? ' selected="selected"' : '';
echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>'; echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@ -514,7 +514,7 @@ class RecodeValues {
# imamo rekodiranje v novo spremenljivko # imamo rekodiranje v novo spremenljivko
$recode['vred_id'] = '-1'; $recode['vred_id'] = '-1';
echo '<select name="recode_number_vrednost[]">'; echo '<select class="dropdown medium" name="recode_number_vrednost[]">';
if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
foreach ($new_spr_vrednosti AS $oKey => $option) { foreach ($new_spr_vrednosti AS $oKey => $option) {
if ($option['variable'] == null) { if ($option['variable'] == null) {
@ -667,12 +667,12 @@ class RecodeValues {
} }
$sugestedName = strip_tags(self::$cacheSpremenljivka['naslov'].' - recoded'); $sugestedName = strip_tags(self::$cacheSpremenljivka['naslov'].' - recoded');
echo'<div id="divRecodeSprOption">'; echo'<div id="divRecodeSprOption">';
echo '<label>'.$lang['srv_recode_to_spr'].'</label>'; echo '<label>'.$lang['srv_recode_to_spr'].':</label>';
if ( $_GET['t'] == 'charts' || $_POST['recIsCharts'] == 1 ) { if ( $_GET['t'] == 'charts' || $_POST['recIsCharts'] == 1 ) {
echo $lang['srv_recode_to_spr_same']; echo $lang['srv_recode_to_spr_same'];
} else { } else {
echo '<label><input type="radio" name="recode_type" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;">'.$lang['srv_recode_to_spr_same'].'</label>'; echo '<input type="radio" name="recode_type" id="recode_type0" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type0">'.$lang['srv_recode_to_spr_same'].'</label>';
echo '<label><input type="radio" name="recode_type" value="1" '.((int)$recode_type == 1 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;">'.$lang['srv_recode_to_spr_new'].'</label>'; echo '<input type="radio" name="recode_type" id="recode_type1" value="1" '.((int)$recode_type == 1 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type1">'.$lang['srv_recode_to_spr_new'].'</label>';
} }
echo '</div>'; echo '</div>';
if ((int)$recode_type == 1) { if ((int)$recode_type == 1) {
@ -680,12 +680,12 @@ class RecodeValues {
echo'<span id="divRecodeSprNew" class="floatRecodeSpremenljivka">'; echo'<span id="divRecodeSprNew" class="floatRecodeSpremenljivka">';
if ((int)$to_spr_id == 0) { if ((int)$to_spr_id == 0) {
echo '<div class="new-spr" style="text-align: right">'; echo '<div class="new-spr">';
echo $lang['srv_recode_to_spr_add_spr'].'<br/>'; //echo $lang['srv_recode_to_spr_add_spr'].'<br/>';
echo '<div id="coding_spr_new" >'; echo '<div id="coding_spr_new" >';
echo '<p>'.$lang['srv_recode_to_spr_name'].' <input type="text" id="rec_spremenljivka_naslov" name="spremenljivka_naslov" default="1" contenteditable="true" value="'.$sugestedName.'" style="width: 123px" />'; echo '<p class="top16">'.$lang['srv_recode_to_spr_name'].' <input type="text" class="text large" id="rec_spremenljivka_naslov" name="spremenljivka_naslov" default="1" contenteditable="true" value="'.$sugestedName.'"/>';
#echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;">'.$lang['add'].'</a>'; #echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;">'.$lang['add'].'</a>';
echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;""><span class="faicon add small" title="'.$lang['add'].'"></span></a>'; echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;""><span class="faicon add" title="'.$lang['add'].'"></span></a>';
echo '</p>'; echo '</p>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -708,7 +708,6 @@ class RecodeValues {
} }
echo '</span>'; echo '</span>';
} }
echo'<br class="clr" />';
} }
if ( $displayType == 1 ) { if ( $displayType == 1 ) {
if (count(self::$variables)> 0) { if (count(self::$variables)> 0) {
@ -753,7 +752,7 @@ class RecodeValues {
echo '<td>'; echo '<td>';
if ((int)$recode_type == 0) { if ((int)$recode_type == 0) {
# imamo klasično rekodiranje # imamo klasično rekodiranje
echo '<select name="MVFQ_'.$variable['variable'].'">'; echo '<select class="dropdown medium" name="MVFQ_'.$variable['variable'].'">';
foreach (self::$options AS $oKey => $option) { foreach (self::$options AS $oKey => $option) {
if ($option['variable'] == null) { if ($option['variable'] == null) {
@ -774,7 +773,7 @@ class RecodeValues {
if (!isset($recodedFrom[$vKey])) { if (!isset($recodedFrom[$vKey])) {
$recodedFrom[$vKey] = '-1'; $recodedFrom[$vKey] = '-1';
} }
echo '<select name="MVSNFQ_'.$vKey.'">'; echo '<select class="dropdown medium" name="MVSNFQ_'.$vKey.'">';
if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
foreach ($new_spr_vrednosti AS $oKey => $option) { foreach ($new_spr_vrednosti AS $oKey => $option) {
if ($option['variable'] == null) { if ($option['variable'] == null) {
@ -816,7 +815,7 @@ class RecodeValues {
echo '<li>'; echo '<li>';
echo '<span class="faicon move_updown moveY"></span>'; echo '<span class="faicon move_updown moveY"></span>';
printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">'; echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
foreach (self::$_operators AS $value => $operator) { foreach (self::$_operators AS $value => $operator) {
$selected = ($value == $recode['operator']) ? ' selected="selected"' : ''; $selected = ($value == $recode['operator']) ? ' selected="selected"' : '';
echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>'; echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@ -834,7 +833,7 @@ class RecodeValues {
echo '&nbsp;'.$lang['srv_recode_number_to']; echo '&nbsp;'.$lang['srv_recode_number_to'];
$is_missing_value = false; $is_missing_value = false;
echo '<select name="recode_number_type" onChange="recode_number_type_changed(this);">'; echo '<select class="dropdown medium" name="recode_number_type" onChange="recode_number_type_changed(this);">';
foreach (self::$options AS $oKey => $option) { foreach (self::$options AS $oKey => $option) {
if ($oKey == '_0_' || $oKey == '_1_' || $oKey == '_2_') { if ($oKey == '_0_' || $oKey == '_1_' || $oKey == '_2_') {
# privzeto izberemo prvi odgovor - veljavni, nato spodaj popravimo # privzeto izberemo prvi odgovor - veljavni, nato spodaj popravimo
@ -875,7 +874,7 @@ class RecodeValues {
echo '<li>'; echo '<li>';
echo '<span class="faicon move_updown moveY"></span>'; echo '<span class="faicon move_updown moveY"></span>';
printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">'; echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
foreach (self::$_operators AS $value => $operator) { foreach (self::$_operators AS $value => $operator) {
$selected = ($value == $recode['operator']) ? ' selected="selected"' : ''; $selected = ($value == $recode['operator']) ? ' selected="selected"' : '';
echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>'; echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@ -896,7 +895,7 @@ class RecodeValues {
$recodedFrom[$rKey] = '-1'; $recodedFrom[$rKey] = '-1';
} }
# imamo rekodiranje v novo spremenljivko # imamo rekodiranje v novo spremenljivko
echo '<select name="recode_number_vrednost[]">'; echo '<select class="dropdown medium" name="recode_number_vrednost[]">';
if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
foreach ($new_spr_vrednosti AS $oKey => $option) { foreach ($new_spr_vrednosti AS $oKey => $option) {
if ($option['variable'] == null) { if ($option['variable'] == null) {

8
admin/survey/classes/class.SurveyRecoding.php
View File

@ -269,11 +269,11 @@ class SurveyRecoding
$vmv->DisplayMissingValuesForQuestion(); $vmv->DisplayMissingValuesForQuestion();
#echo '</span>'; #echo '</span>';
echo '<div class="recodeButtonHolder buttons_holder">'; echo '<div class="button_holder">';
echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="saveQuestionRecode(); return false;">'.$lang['save'].'</a></div></span>'; echo '<button class="medium white-blue" onClick="cancelQuestionRecode(); return false;">'.$lang['edit1338'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancelQuestionRecode(); return false;"><span>'.$lang['srv_cancel'].'</span></a></div></span>'; echo '<button class="medium blue" onclick="saveQuestionRecode(); return false;">'.$lang['save'].'</button>';
echo '<br class="clr"/>';
echo '</div>'; echo '</div>';
} else { } else {
echo 'Napaka!'; echo 'Napaka!';
} }

4
public/css/admin_new.css
View File

@ -8352,6 +8352,10 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label {
color: #C4C4C4; color: #C4C4C4;
} }
#rec_spremenljivka_naslov {
margin-right: 4px;
}
/* /*
Header scss - top line, menu... Header scss - top line, menu...
*/ */

8
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -258,7 +258,7 @@ div#div_analiza_archive_name {
} }
/////PODATKI/////@ /////PODATKI/////
//Javna povezava //Javna povezava
#div_survey_links { #div_survey_links {
min-width: 600px; min-width: 600px;
@ -312,3 +312,9 @@ fieldset.statusProfileFieldset {
} }
} }
} }
//Izračuni
#rec_spremenljivka_naslov {
margin-right: 4px;
}