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

[Redizajn 1KA] - Status --> Neodgovor spremenljivke --> Spremenljivke - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-03-29 20:39:38 +02:00
parent 80a9cfe968
commit c0f27814c7
6 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
admin/survey/classes/class.SurveyParaAnalysis.php
View File

@ -805,6 +805,8 @@ class SurveyParaAnalysis{
} }
} }
*/ */
/*SORTIRANJE
$sort_type = SORT_ASC; $sort_type = SORT_ASC;
if (isset($_REQUEST['sort_type']) if (isset($_REQUEST['sort_type'])
&& ((int)$_REQUEST['sort_type'] == SORT_DESC || (int)$_REQUEST['sort_type'] == SORT_ASC)) { && ((int)$_REQUEST['sort_type'] == SORT_DESC || (int)$_REQUEST['sort_type'] == SORT_ASC)) {
@ -844,61 +846,32 @@ class SurveyParaAnalysis{
$rows = array_reverse($rows); $rows = array_reverse($rows);
} }
} }*/
$this->displayFormula(); $this->displayFormula();
echo '<h2>'.$lang['srv_para_label_variables'].'</h2>';
echo '<table id="tbl_para_analitics" class="graph'.($showGraph ? ' showGraph' : '').'">'; echo '<table id="tbl_para_analitics" class="graph'.($showGraph ? ' showGraph' : '').'">';
echo '<tr class="persist-header">';
echo '<th class="pointer" '; echo '<tr>';
if ($sort_field == 'variable') { echo '<th>' . $lang['srv_para_variable'] . '</th>';
if ($sort_type == SORT_DESC) {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
} else {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_DESC . "')\"";
}
} else {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
}
echo '>';
echo '<span class="floatLeft pointer">' . $lang['srv_para_variable'] . '</span>';
if ($sort_field == 'variable') {
echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
}
echo'</th>';
if ($showQuestion) { if ($showQuestion) {
echo '<th>'.$lang['srv_para_question'].'</th>'; echo '<th>'.$lang['srv_para_question'].'</th>';
} }
if ($show_delta) { if ($show_delta) {
echo '<th class="anl_w50" title="'.$lang[''].'">delta</th>'; echo '<th title="'.$lang[''].'">delta</th>';
} }
echo '<th class="anl_w50 pointer" title="'.$lang['srv_para_unaswered'].'"'; echo '<th>' . $lang['srv_para_unaswered_short'] . ' %</th>';
if ($sort_field == 'ns') {
if ($sort_type == SORT_DESC) {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
} else {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_DESC . "')\"";
}
} else {
echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
}
echo '>';
echo '<span>' . $lang['srv_para_unaswered_short'] . ' %</span>'; // . Help :: display('srv_item_nonresponse')
if ($sort_field == 'ns') {
echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
}
echo '</th>';
if ($showGraph) { if ($showGraph) {
echo '<th class="anl_bb" title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>'; echo '<th title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
} }
echo '</tr>'; echo '</tr>';
foreach ($rows AS $row) { foreach ($rows AS $row) {
echo '<tr class="'.$css_sublcass.'">'; echo '<tr>';
echo '<td >'; echo '<td>';
echo '<span class="anl_variabla">';
echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a>'; echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a>';
echo '</span>';
echo '</td>'; echo '</td>';
if ($showQuestion) { if ($showQuestion) {
echo '<td>'; echo '<td>';
@ -909,13 +882,12 @@ class SurveyParaAnalysis{
echo '<td>'.$row['delta'].'</td>'; echo '<td>'.$row['delta'].'</td>';
} }
echo '<td>'.common::formatNumber($row['ns']*100,1).'</td>'; echo '<td>'.common::formatNumber($row['ns']*100,1).'</td>';
#echo '<td>'.common::formatNumber($value,2).'</td>';
if ($showGraph) { if ($showGraph) {
echo '<td class="empty_cell">'; echo '<td class="graph_cell">';
if ($row['ns'] > 0) { if ($row['ns'] > 0) {
echo '<div class="para_analitics_bar" style="'.'width:'.($row['ns']*100).'%; text-align:right; padding-right:5px; color:green;"></div>'; echo '<div class="graph_full" style="'.'width:'.($row['ns']*100).'%;"></div>';
} else { } else {
echo '<div class="para_analitics_bar null_value" style="'.'width:1px"></div>'; echo '/';
} }
echo '</td>'; echo '</td>';
} }

2
lang/1.php
View File

@ -6704,7 +6704,7 @@ $lang = array (
'srv_para_show_rows_other' => 'Prikaži polja "drugo"', 'srv_para_show_rows_other' => 'Prikaži polja "drugo"',
'srv_para_show_rows_text' => 'Prikaži polja tipa "besedilo"', 'srv_para_show_rows_text' => 'Prikaži polja tipa "besedilo"',
'srv_para_variable' => 'Spremenljivka', 'srv_para_variable' => 'Spremenljivka',
'srv_para_question' => 'Vprašanje', 'srv_para_question' => 'Labela',
'srv_para_valid' => 'Veljavni', 'srv_para_valid' => 'Veljavni',
'srv_para_approp' => 'Ustrezni', 'srv_para_approp' => 'Ustrezni',
'srv_para_nonconceptual' => 'Prikazano', 'srv_para_nonconceptual' => 'Prikazano',

2
lang/2.php
View File

@ -6586,7 +6586,7 @@ $lang = array (
'srv_para_show_rows_other' => 'Show rows "other"', 'srv_para_show_rows_other' => 'Show rows "other"',
'srv_para_show_rows_text' => 'Show rows "text"', 'srv_para_show_rows_text' => 'Show rows "text"',
'srv_para_variable' => 'Variable', 'srv_para_variable' => 'Variable',
'srv_para_question' => 'Question', 'srv_para_question' => 'Label',
'srv_para_valid' => 'Valid', 'srv_para_valid' => 'Valid',
'srv_para_approp' => 'Appropriate', 'srv_para_approp' => 'Appropriate',
'srv_para_nonconceptual' => 'Exposed units', 'srv_para_nonconceptual' => 'Exposed units',

32
public/css/admin_new.css
View File

@ -11528,6 +11528,38 @@ div.page_nonresponse_graph div#surveyNonresponse div#dataSettingsCheckboxes .sec
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
div.page_nonresponse_graph h2 {
width: 100%;
overflow: hidden;
font-weight: 300;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
margin-bottom: 16px;
}
div.page_nonresponse_graph h2:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
box-sizing: border-box;
margin-right: -100%;
margin-left: 8px;
border-top: 1px solid #E5E5E5;
}
div.page_nonresponse_graph table {
width: 100%;
white-space: nowrap;
}
div.page_nonresponse_graph table td.graph_cell {
width: 100%;
}
div.page_nonresponse_graph table td.graph_cell div.graph_full {
background-color: #1E88E5;
height: 24px;
text-align: right;
}
div.drop_setting_margin { div.drop_setting_margin {
margin-top: 128px; margin-top: 128px;

2
resources/sass/admin/modules/diagnostic.scss
View File

@ -16,7 +16,7 @@ $background_color_1: #EFF2F7;
min-height: 500px; min-height: 500px;
H2 { h2 {
margin: 15px 0px 0px 0px; margin: 15px 0px 0px 0px;
padding: 0px; padding: 0px;
font-size: 15px; font-size: 15px;

40
resources/sass/admin_new/pages/survey_status/nonresponse.scss
View File

@ -52,8 +52,48 @@ div.page_nonresponse_graph {
} }
} }
} }
h2 {
width: 100%;
overflow: hidden;
font-weight: $light;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
margin-bottom: 16px;
&:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
box-sizing: border-box;
margin-right: -100%;
margin-left: 8px;
border-top: 1px solid $gray;
}
}
table {
width: 100%;
white-space: nowrap;
td.graph_cell {
width: 100%;
div.graph_full {
background-color: $blue;
height: 24px;
text-align: right;
}
}
}
} }
// Za premik vsebine pod dropdown nastavitve.
div.drop_setting_margin { div.drop_setting_margin {
margin-top: 128px; margin-top: 128px;
} }