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

[Redizajn 1KA] Popupi: Analize > Multitabele - Edit, plus, settings

Browse Source
This commit is contained in:
tejagerjovic 2022-05-06 01:12:24 +02:00
parent 61549173d7
commit 4de2b7891a
5 changed files with 126 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -490,7 +490,7 @@ class SurveyAdmin
echo '<div id="div_creport_settings_profiles" class="divPopUp"></div>';
// Creport
echo '<div id="div_mc_tables" class="divPopUp"></div>';
echo '<div id="div_mc_tables" class="divPopUp PopUpNarrow"></div>';

189
admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
View File

@ -230,7 +230,7 @@ class SurveyMultiCrosstabs {
$this->displayMCTablesPopups();
// Izris diva za nastavitve tabele
echo '<div id="mc_table_settings" class="mc_table_settings">';
echo '<div id="mc_table_settings" class="mc_table_settings divPopUp PopUpNarrow">';
$this->displayTableSettings();
echo '</div>';
@ -1415,23 +1415,23 @@ class SurveyMultiCrosstabs {
echo '<fieldset>';
echo '<legend>'.$lang['srv_multicrosstabs_settings_val'].'</legend>';
echo '<div class="setting_holder">';
// Prikaz numerusa
echo '<span class="clr"><input type="checkbox" id="numerus_'.$this->table_id.'" name="numerus" '.($this->table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" /><label for="numerus_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_numerus'].'</label></span>';
echo '<div class="setting_item">';
echo '<input type="checkbox" id="numerus_'.$this->table_id.'" name="numerus" '.($this->table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" /><label for="numerus_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_numerus'].'</label>';
echo '</div>';
// Prikaz procentov
echo '<span class="clr"><input type="checkbox" id="percent_'.$this->table_id.'" name="percent" '.($this->table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" /><label for="percent_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_percent'].'</label></span>';
echo '<div class="setting_item">';
echo '<input type="checkbox" id="percent_'.$this->table_id.'" name="percent" '.($this->table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" /><label for="percent_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_percent'].'</label>';
echo '</div>';
// Prikaz vsot
echo '<span class="clr"><input type="checkbox" id="sums_'.$this->table_id.'" name="sums" '.($this->table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" /><label for="sums_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_sum'].'</label></span>';
// Navedbe / enote
/*if($this->isCheckbox){
echo '<span class="clr" style="line-height: 20px;">';
echo '<label for="navVsEno0_'.$this->table_id.'"><input type="radio" id="navVsEno0_'.$this->table_id.'" name="navVsEno" '.($this->table_settings[$this->table_id]['navVsEno'] == 0 ? ' checked="checked"':'').' value="0" />'.$lang['srv_analiza_crosstab_navedbe'].'</label>';
echo ' <label for="navVsEno1_'.$this->table_id.'"><input type="radio" id="navVsEno1_'.$this->table_id.'" name="navVsEno" '.($this->table_settings[$this->table_id]['navVsEno'] == 1 ? ' checked="checked"':'').' value="1" />'.$lang['srv_analiza_crosstab_enote'].'</label>';
echo '</span>';
}*/
echo '<div class="setting_item">';
echo '<input type="checkbox" id="sums_'.$this->table_id.'" name="sums" '.($this->table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" /><label for="sums_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_sum'].'</label>';
echo '</div>';
echo '</div>';
echo '</fieldset>';
@ -1441,17 +1441,24 @@ class SurveyMultiCrosstabs {
// Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg)
$checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true;
echo '<span class="clr"><input type="checkbox" id="avgSetting_'.$this->table_id.'" name="avgSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'avgVar\');" /><label for="avgSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_avg'].'</label>';
echo '<span id="avgVar" class="spaceLeft" '.($checked ? '' : ' style="display: none;"').'><select id="avgVar_'.$this->table_id.'" name="avgVar">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<input type="checkbox" id="avgSetting_'.$this->table_id.'" name="avgSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'avgVar\');" /><label for="avgSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_avg'].'</label>';
echo '</div>';
echo '<div id="avgVar" class="setting_item" '.($checked ? '' : ' style="display: none;"').'>';
echo '<select class="dropdown medium" id="avgVar_'.$this->table_id.'" name="avgVar">';
echo '<option value="">'.$lang['srv_select_spr'].'...</option>';
foreach($this->variablesList AS $spr){
if( $spr['canChoose'] && ($spr['tip'] == 7 || (in_array($spr['tip'], array(1,3,6)) && $spr['skala'] == 0)) ){
echo '<option value="'.$spr['spr_id'].'-'.$spr['sequence'].'" '.($this->table_settings[$this->table_id]['avgVar'] == $spr['spr_id'].'-'.$spr['sequence'] ? ' selected="selected"' : '').'>('.$spr['variable'].') '.$this->snippet($spr['naslov'], 25).'</option>';
}
}
echo '</select></span>';
echo '</span>';
echo '</select>';
echo '</div>';
echo '</div>';
echo '</fieldset>';
@ -1460,17 +1467,24 @@ class SurveyMultiCrosstabs {
// Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox)
$checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true;
echo '<span class="clr"><input type="checkbox" id="delezSetting_'.$this->table_id.'" name="delezSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'delezVar\');" /><label for="delezSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_delez'].'</label>';
echo '<span id="delezVar" class="spaceLeft" '.($checked ? '' : ' style="display: none;"').'><select id="delezVar_'.$this->table_id.'" name="delezVar" onChange="setDelez(this.value);">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<input type="checkbox" id="delezSetting_'.$this->table_id.'" name="delezSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'delezVar\');" /><label for="delezSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_delez'].'</label>';
echo '</div>';
echo '<div id="delezVar" class="setting_item" '.($checked ? '' : ' style="display: none;"').'>';
echo '<select class="dropdown medium" id="delezVar_'.$this->table_id.'" name="delezVar" onChange="setDelez(this.value);">';
echo '<option value="">'.$lang['srv_select_spr'].'...</option>';
foreach($this->variablesList AS $spr){
if($spr['canChoose'] && in_array($spr['tip'], array(1,3,6,2,16))){
echo '<option value="'.$spr['spr_id'].'-'.$spr['sequence'].'" '.($this->table_settings[$this->table_id]['delezVar'] == $spr['spr_id'].'-'.$spr['sequence'] ? ' selected="selected"' : '').'>('.$spr['variable'].') '.$this->snippet($spr['naslov'], 25).'</option>';
}
}
echo '</select></span>';
echo '</span>';
echo '</select>';
echo '</div>';
echo '</div>';
echo '<div id="delez" '.($checked ? '' : ' style="display: none;"').'>';
$this->displayDelez($this->table_settings[$this->table_id]['delezVar']);
@ -1481,23 +1495,11 @@ class SurveyMultiCrosstabs {
echo '</form>';
// Gumbi na dnu
echo '<div id="mcSettingsButtons">';
echo '<span class="buttonwrapper spaceRight floatLeft">';
echo '<a class="ovalbutton ovalbutton_gray" onclick="closeMCSettings(\''.$this->table_id.'\');">';
echo '<span>'.$lang['srv_zapri'].'</span>';
echo '</a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight spaceLeft floatLeft">';
echo '<a class="ovalbutton ovalbutton_orange" onclick="saveMCSettings(\''.$this->table_id.'\');">';
echo '<span>'.$lang['srv_potrdi'].'</span>';
echo '</a>';
echo '</span>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="closeMCSettings(\''.$this->table_id.'\');">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="saveMCSettings(\''.$this->table_id.'\');">'.$lang['srv_potrdi'].'</button>';
echo '</div>';
}
// Prikazemo opcije variable (checkboxe) za delez
@ -1515,9 +1517,13 @@ class SurveyMultiCrosstabs {
else
$val = 0;
echo '<span class="clr">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<input type="checkbox" id="delez_'.$cnt.'" name="delez_'.$cnt.'" value="1" '.($val == 1 ? ' checked="checked"' : '').' /><label for="delez_'.$cnt.'"> '.$option.'</label>';
echo '</span>';
echo '</div>';
echo '</div>';
$cnt++;
}
@ -2181,37 +2187,35 @@ class SurveyMultiCrosstabs {
}
echo '</span>';
// Na dnu imamo gumba brisi in preimenuj
echo '<div style="float:left;">';
echo '<a href="#" onclick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</a><br/>'."\n";
echo '<a href="#" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</a>'."\n";
echo '</div>';
// Cas kreirranja tabele
// Cas kreiranja tabele
echo '<div style="float:right; text-align:right;">';
$time_created = strtotime($current_table['time_created']);
echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span><br />';
echo '</div>';
// Na dnu imamo gumba brisi in preimenuj
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</button>';
echo '<button class="medium blue" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</button>';
echo '</div>';
echo '</div>';
// cover Div
echo '<div id="dsp_cover_div"></div>'."\n";
echo '<div id="dsp_cover_div"></div>';
echo '<span class="clr"></span>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="use_mc_table(); return false;">'.$lang['srv_multicrosstabs_tables_use'].'</button>';
echo '<button class="medium white-blue" onClick="mc_table_action(\'show_new\'); return false;">'.$lang['srv_multicrosstabs_tables_add'].'</button>';
echo '<button class="medium blue" onclick="close_mc_tables(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo '</div>';
echo '<div style="position:absolute; bottom:15px; right:15px;">';
//echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="save_creport_profile(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="use_mc_table(); return false;"><span>'.$lang['srv_multicrosstabs_tables_use'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_multicrosstabs_tables_add'].'"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="mc_table_action(\'show_new\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_add'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="close_mc_tables(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '</div>';
}
function displayMCTablesPopups(){
@ -2221,28 +2225,51 @@ class SurveyMultiCrosstabs {
echo '<div id="newMCTable">';
echo '<h2>'.$lang['srv_new_table'].'</h2>';
echo '<div style="float:left; width:400px; text-align:right;">'.$lang['srv_multicrosstabs_tables_name'].': '."\n";
echo '<input id="newMCTableName" name="newMCTableName" type="text" value="" size="50" /></div>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'new\'); return false;"><span>'.$lang['save'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_new\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";
echo '<div class="floatRight clr" style="padding: 15px 5px 15px 0;"><a href="#" onClick="mc_table_action(\'goto_archive\');">'.$lang['srv_analiza_arhiv'].'</a></div>';
echo '</div>'."\n";
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_multicrosstabs_tables_name'].':</label>';
echo '<input id="newMCTableName" class="text large" name="newMCTableName" type="text" value="" />';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="mc_table_action(\'new\'); return false;">'.$lang['save'].'</button>';
echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_new\'); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="mc_table_action(\'goto_archive\');">'.$lang['srv_analiza_arhiv'].'</button>';
echo '</div>';
echo '</div>';
// div za preimenovanje
echo '<div id="renameMCTable">'.$lang['srv_multicrosstabs_tables_name'].': '."\n";
echo '<input id="renameMCTableName" name="renameMCTableName" type="text" size="45" />'."\n";
echo '<input id="renameMCTableId" type="hidden" value="' . $this->table_id . '" />'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'rename\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_rename_short'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_rename\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";
echo '</div>'."\n";
echo '<div id="renameMCTable">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_multicrosstabs_tables_name'].':</label>';
echo '<input id="renameMCTableName" name="renameMCTableName" class="text large" type="text" value="' . $this->table_id . '" />';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_rename\'); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="mc_table_action(\'rename\');">'.$lang['srv_multicrosstabs_tables_rename_short'].'</button>';
echo '</div>';
echo '</div>';
// div za brisanje
echo '<div id="deleteMCTable">'.$lang['srv_multicrosstabs_tables_delete_confirm'].': <span id="deleteMCTableName" style="font-weight:bold;"></span>?'."\n";
echo '<input id="deleteMCTableId" type="hidden" value="' . $this->table_id . '" />'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'delete\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_delete_short'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_delete\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";
echo '</div>'."\n";
echo '<div id="deleteMCTable">';
echo $lang['srv_multicrosstabs_tables_delete_confirm'].': <span id="deleteMCTableName" class="semi-bold"></span>?';
echo '<input id="deleteMCTableId" type="hidden" value="' . $this->table_id . '" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_delete\'); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="mc_table_action(\'delete\');">'.$lang['srv_multicrosstabs_tables_delete_short'].'</button>';
echo '</div>';
echo '</div>';
}
// Vrnemo vse tabele uporabnika

9
public/css/admin_new.css
View File

@ -8361,6 +8361,10 @@ div#inspect_div .setting_holder .horizontal {
flex-direction: row;
}
div#newMCTable .setting_holder input.text {
width: 100% !important;
}
/*
Header scss - top line, menu...
*/
@ -29353,6 +29357,7 @@ input#endDate {
left: calc(50% - 275px);
top: 40vh;
z-index: 999;
height: auto;
margin: 10px;
width: 550px;
}
@ -29536,6 +29541,7 @@ input#endDate {
left: calc(50% - 275px);
top: 40vh;
z-index: 999;
height: auto;
margin: 10px;
width: 550px;
}
@ -29719,6 +29725,7 @@ input#endDate {
left: calc(50% - 275px);
top: 40vh;
z-index: 999;
height: auto;
margin: 10px;
width: 550px;
}
@ -29891,8 +29898,6 @@ input#endDate {
/*tables list popup*/
#div_mc_tables {
display: none;
width: 350px;
height: 280px;
}
#div_mc_tables #mc_tables_left {
margin-bottom: 10px;

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

@ -322,7 +322,6 @@ fieldset.statusProfileFieldset {
//////ANALIZA//////
//Zoom
div#inspect_div {
.setting_holder {
@ -333,3 +332,12 @@ div#inspect_div {
}
}
}
//Multitabele
div#newMCTable {
.setting_holder {
input.text{
width: 100% !important;
}
}
}

4
resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
View File

@ -44,6 +44,7 @@
left: calc(50% - 275px);
top: 40vh;
z-index: 999;
height: auto;
margin: 10px;
width: 550px;
@ -70,9 +71,6 @@
#div_mc_tables {
display: none;
width: 350px;
height: 280px;
#mc_tables_left {
margin-bottom: 10px;
}