diff --git a/admin/survey/classes/class.SurveyParaAnalysis.php b/admin/survey/classes/class.SurveyParaAnalysis.php index fdcd78650..a6caebedd 100644 --- a/admin/survey/classes/class.SurveyParaAnalysis.php +++ b/admin/survey/classes/class.SurveyParaAnalysis.php @@ -566,6 +566,8 @@ class SurveyParaAnalysis{ $rows = $data; $baseColspan = 6; + + echo '

'.$lang['srv_para_label_breaks'].'

'; echo ''; @@ -653,7 +655,6 @@ class SurveyParaAnalysis{ #SurveyAnalysisHelper::getInstance()->displayMissingLegend(); $this->displayLink(); - echo '
'; } @@ -850,7 +851,6 @@ class SurveyParaAnalysis{ #SurveyAnalysisHelper::getInstance()->displayMissingLegend(); $this->displayLink(); - echo '
'; } function displayGraphDataAdvanced( ) { @@ -895,45 +895,50 @@ class SurveyParaAnalysis{ $this->displayFormula(); - echo '
'; - echo ''; + echo '
'; + + echo ''; // Dodatna stolpca zaradi izvoza za Katjo Lozar if($admin_type == '0'){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; + echo ''; if ($showQuestion) { - echo ''; + echo ''; } - echo ''; + //echo ''; foreach ($this->_missings AS $value => $text) { $cnt_miss++; - echo ""; + echo ""; + if ($cnt_miss == 3) + break; } foreach ($this->_unsets AS $value => $text) { $cnt_undefined++; - echo ""; + echo ""; } if ($show_delta) { - echo ""; + echo ""; } - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; if ($isNotStandardProfile) { - echo ""; + echo ""; } - echo ""; + echo ""; if ($showGraph) { - echo ''; + echo ''; } echo ''; + + foreach ($headerVariablesId AS $key => $headerVariableId) { $spr = $this->_HEADERS[$headerVariableId]; @@ -952,29 +957,27 @@ class SurveyParaAnalysis{ echo ''; if($admin_type == '0'){ - echo ''; - echo ''; + echo ''; + echo ''; } + + if (count($this->_missings) > 3) + $count_missing = 3; + else + $count_missing = count($this->_missings); if ($showQuestion) { - echo ''; - echo ''; } else { - echo ''; } - if ($showGraph) { - echo ''; - } echo ''; } else { @@ -996,72 +999,56 @@ class SurveyParaAnalysis{ echo ''; if($admin_type == '0'){ - echo ''; - echo ''; + echo ''; + echo ''; } if ($showQuestion) { - echo ''; - echo ''; } else { - echo ''; } - if ($showGraph) { - echo ''; - } echo ''; } else { #dodamo header za grupo + + echo ''; if($admin_type == '0'){ - echo ''; - echo ''; + echo ''; + echo ''; } if ($showQuestion) { - echo ''; - echo ''; } else { - echo ''; } - if ($showGraph) { - echo ''; - } echo ''; } } @@ -1097,34 +1084,36 @@ class SurveyParaAnalysis{ } $delta = $data_seq['delta']; */ - echo ''; + echo ''; if($admin_type == '0'){ - echo ''; - echo ''; + echo ''; + echo ''; } //echo ''; - echo ''; if ($showQuestion) { - echo ''; } - echo ''; + echo '';*/ + $cnt_miss = 0; foreach ($this->_missings AS $value => $text) { + $cnt_miss++; $missing = 0; if (isset($data_seq['values'][$value])) { $missing = $data_seq['values'][$value]; } echo ''; + if ($cnt_miss == 3) + break; } foreach ($this->_unsets AS $value => $text) { $unset = 0; @@ -1145,11 +1134,11 @@ class SurveyParaAnalysis{ } echo ""; if ($showGraph) { - echo "'; } @@ -1158,19 +1147,23 @@ class SurveyParaAnalysis{ if ($showPercent) { echo ''; - echo ''; + echo '';*/ + $cnt_miss = 0; foreach ($this->_missings AS $value => $text) { + $cnt_miss++; $val = 0; if ($percent_all > 0 && isset($data[$seq]['values'][$value])) { $val = ($data[$seq]['values'][$value] / $percent_all * 100); } - echo ''; + echo ''; + if ($cnt_miss == 3) + break; } foreach ($this->_unsets AS $value => $text) { @@ -1178,7 +1171,7 @@ class SurveyParaAnalysis{ if ($percent_all > 0 && isset($data[$seq]['values'][$value])) { $val = ($data[$seq]['values'][$value] / $percent_all * 100); } - echo ''; + echo ''; } echo ''; } @@ -1189,9 +1182,6 @@ class SurveyParaAnalysis{ } echo '
ID VPRASANJAID VARIABLEID VPRAŠANJAID VARIABLE'.$lang['srv_para_variable'].''.$lang['srv_para_variable'].''.$lang['srv_para_question'].''.$lang['srv_para_question'].''.$lang['srv_para_valid'].''.$lang['srv_para_valid'].'{$value}
(".$lang['srv_mv_'.$text].")
{$value}
(".$lang['srv_mv_'.$text].")
{$value}
(".$lang['srv_mv_'.$text].")
{$value} (".$lang['srv_mv_'.$text].")".$lang['']."Δ".$lang['']."Δ".$lang['srv_para_nonconceptual']."".$lang['srv_para_approp']."".$lang['srv_para_all_units']."".$lang['srv_para_nonconceptual']."".$lang['srv_para_approp']."".$lang['srv_para_all_units']."".$lang['srv_para_status']."".$lang['srv_para_status']."".$lang['srv_para_unaswered_short']. Help :: display('srv_item_nonresponse')."".$lang['srv_para_unaswered_short']. Help :: display('srv_item_nonresponse')."' . $lang['srv_para_unaswered_graph_title'] . '' . $lang['srv_para_unaswered_graph_title_br'] . '
'.$spr['spr_id'].''.$spr['spr_id'].''; - echo ''; + echo ''; echo '' . $spr['variable'] . ''; - echo ''; echo ''; + echo ''; echo $spr['naslov']; echo ''; - echo ''; + echo ''; echo '' . $spr['variable'] . ''; - echo ''; echo '
'.$spr['spr_id'].''.$spr['spr_id'].''; - echo ''; + echo ''; echo '' . $spr['variable'] . ''; - echo ''; echo ''; + echo ''; echo $spr['naslov']; echo ''; - echo ''; + echo ''; echo '' . $spr['variable'] . ''; - echo ''; echo '
'.$spr['spr_id'].''.$spr['spr_id'].''; + echo ''; if (count($grids) > 1) { - echo ''; echo '' . $grid['variable'] . ''; - echo ''; } else { - echo ''; echo '' . $spr['variable'] . ''; - echo ''; } echo ''; - echo $grid['naslov']; + echo ''; + echo (strlen($grid['naslov']) > 30 ? substr($grid['naslov'],0,30)."..." : $grid['naslov']); echo ''; + echo ''; if (count($grids) > 1) { - echo ''; echo '' . $grid['variable'] . ''; - echo ''; } else { - echo ''; echo '' . $spr['variable'] . ''; - echo ''; } echo '
'.$spr['spr_id'].''.$variable['vr_id'].''.$spr['spr_id'].''.$variable['vr_id'].' '; - echo ''; + echo ''; echo '' . $variable['variable'] . ''; - echo ''; echo ''; - echo $variable['naslov']; + echo ''; + echo (strlen($variable['naslov']) > 30 ? substr($variable['naslov'],0,30)."..." : $variable['naslov']); echo ''; + /*echo ''; echo (int)$data_seq['veljavni']; - echo ''.(int)$missing.'" . common::formatNumber($data_seq['ns'],2) . ""; + echo ""; if ($data_seq['ns'] > 0) { - echo '
'; + echo '
'; } else { - echo '
'; + echo '/'; } echo '
'; + /*echo ''; $val = 0; if ($percent_all > 0) { $val = $data[$seq]['veljavni'] / $percent_all * 100; } echo common::formatNumber($val,0,null,'%') ; - echo ''.common::formatNumber($val,0,null,'%').''.common::formatNumber($val,0,null,'%').''.common::formatNumber($val,0,null,'%').''.common::formatNumber($val,0,null,'%').'
'; SurveyAnalysisHelper::getInstance()->displayMissingLegend(); - - echo '
'; - } function getVariables() diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php index a262286da..66d183692 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php @@ -71,11 +71,11 @@ class SurveyAnalysisHelper { echo '
'; - echo '
'; - echo ' '.$lang['srv_bottom_data_legend_note'].''; + echo '
'; + echo ''.$lang['srv_bottom_data_legend_note']; echo '
'; - echo '
'; + echo '
'; echo '
    '; echo '
  • '.$lang['srv_bottom_data_legend_note_li1'].'
  • '; echo '
  • '.$lang['srv_bottom_data_legend_note_li2'].'
  • '; diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 80acc50f9..0cb3bb479 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -73,6 +73,8 @@ class CrossRoad { $second_action = NAVI_STATUS_OSNOVNI; $layout_width = 'wide'; + if ($_GET['m'] == 'advanced') + $layout_width = 'fullwidth'; $status = 4; diff --git a/lang/1.php b/lang/1.php index ede7f30ea..44d8f9a76 100644 --- a/lang/1.php +++ b/lang/1.php @@ -6713,6 +6713,7 @@ $lang = array ( 'srv_para_unaswered' => 'Neodgovor spremenljivk', 'srv_para_unaswered_short' => 'NS', 'srv_para_unaswered_graph_title' => 'Neodgovor spremenljivke (NS) - grafični prikaz', #'Grafični prikaz stopnje neodgovora spremenljivke (%)', + 'srv_para_unaswered_graph_title_br' => 'Neodgovor spremenljivke
    (NS) - grafični prikaz', 'srv_para_breaks' => 'Prekinitve', 'srv_para_breaks_delta' => 'Porast prekinitve', 'srv_para_breaks_value' => 'Stopnja prekinitev', diff --git a/lang/2.php b/lang/2.php index 508d45816..cc871c459 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6595,6 +6595,7 @@ $lang = array ( 'srv_para_unaswered' => 'Item nonresponse', 'srv_para_unaswered_short' => 'IN', 'srv_para_unaswered_graph_title' => 'Graphical representation of the Item nonresponse (%)', + 'srv_para_unaswered_graph_title_br' => 'Graphical representation of
    the Item nonresponse (%)', 'srv_para_breaks' => 'Brakoffs', 'srv_para_breaks_delta' => 'Breakoff increase', 'srv_para_breaks_value' => 'Breakoff rate', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 17dce0dae..f32004e16 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9461,6 +9461,10 @@ table td.right, table th.right { text-align: right; } +table td.left, +table th.left { + text-align: left; +} table td.wrap, table th.wrap { white-space: normal; @@ -11490,7 +11494,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more { div.page_nonresponse_graph div#surveyNonresponse div#dataSettingsCheckboxes { background-color: #F4F9FE; - width: 100vw; + width: 100%; height: 128px; position: absolute; left: 0; @@ -11551,6 +11555,7 @@ div.page_nonresponse_graph h2:after { div.page_nonresponse_graph table { width: 100%; white-space: nowrap; + font-size: 14px; } div.page_nonresponse_graph table td.graph_cell { width: 100%; @@ -11565,6 +11570,41 @@ div.page_nonresponse_graph table td.para_page_break { text-transform: uppercase; font-weight: 600; } +div.page_nonresponse_graph table.podrobno { + margin: 0 32px; + border: 1px solid #E5E5E5; + text-align: right; + width: calc(100% - 64px); +} +div.page_nonresponse_graph table.podrobno td.dashed, div.page_nonresponse_graph table.podrobno th.dashed { + border-top: 1px dashed #E5E5E5; + border-left: 1px solid #E5E5E5; + border-right: 1px solid #E5E5E5; +} +div.page_nonresponse_graph table.podrobno td:not(.dashed), div.page_nonresponse_graph table.podrobno th:not(.dashed) { + border-left: 1px solid #E5E5E5; + border-right: 1px solid #E5E5E5; + border-top: 1px solid #E5E5E5; + border-bottom: none; +} +div.page_nonresponse_graph table.podrobno td div.short, div.page_nonresponse_graph table.podrobno th div.short { + width: 160px; + white-space: normal; + text-overflow: wrap; +} +div.page_nonresponse_graph div#bottom_data_legend_missing { + background-color: #F8F8F8; + width: fit-content; + margin-left: 32px; + margin-top: 24px; + border: 1px solid #E5E5E5; + box-sizing: border-box; + padding: 8px 16px; +} +div.page_nonresponse_graph div#bottom_data_legend_missing div.legend_title { + color: #1E88E5; + cursor: pointer; +} div.drop_setting_margin { margin-top: 128px; diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index b6dafc3a5..b8970e6ba 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -16,6 +16,9 @@ table { &.right { text-align: right; } + &.left { + text-align: left; + } &.wrap { white-space: normal; diff --git a/resources/sass/admin_new/pages/survey_status/nonresponse.scss b/resources/sass/admin_new/pages/survey_status/nonresponse.scss index 2c57f8538..0a735c215 100644 --- a/resources/sass/admin_new/pages/survey_status/nonresponse.scss +++ b/resources/sass/admin_new/pages/survey_status/nonresponse.scss @@ -4,7 +4,7 @@ div.page_nonresponse_graph { div#dataSettingsCheckboxes { background-color: $medium-blue2; - width: 100vw; + width: 100%; height: 128px; position: absolute; @@ -80,6 +80,7 @@ div.page_nonresponse_graph { table { width: 100%; white-space: nowrap; + font-size: 14px; td.graph_cell { width: 100%; @@ -96,6 +97,53 @@ div.page_nonresponse_graph { text-transform: uppercase; font-weight: $semi-bold; } + + // Tabela podrobno + &.podrobno { + margin: 0 32px; + border: 1px solid $gray; + text-align: right; + + width: calc(100% - 64px); + + td, th { + &.dashed { + border-top: 1px dashed $gray; + border-left: 1px solid $gray; + border-right: 1px solid $gray; + } + + &:not(.dashed){ + border-left: 1px solid $gray; + border-right: 1px solid $gray; + border-top: 1px solid $gray; + border-bottom: none; + } + + div.short { + width: 160px; + white-space: normal; + text-overflow: wrap; + } + } + } + } + + //Legenda manjkajočih vrednosti + div#bottom_data_legend_missing { + background-color: $light-gray; + width: fit-content; + margin-left: 32px; + margin-top: 24px; + + border: 1px solid #E5E5E5; + box-sizing: border-box; + padding: 8px 16px; + + div.legend_title { + color: $blue; + cursor: pointer; + } } }