diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php index fca05c0ee..46699149b 100644 --- a/admin/survey/classes/class.SurveyDiagnostics.php +++ b/admin/survey/classes/class.SurveyDiagnostics.php @@ -544,82 +544,35 @@ class SurveyDiagnostics //Ostale lastnosti ankete echo '
'; + + echo '
'; + echo '
'; + echo '
'.$lang['srv_diagnostic_4_element_9'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_5'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_5a'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_8'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_2'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_3'].':
'; + echo '
'.$lang['srv_diagnostic_4_element_4'].':
'; + echo '
'; + echo '
'; + echo '
'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['srv_page']: $lang['srv_diagnostics_strani']).'
'; + echo '
'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'
'; + echo '
'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_hidden_text3'] : $lang['srv_hidden_text4']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'
'; + echo '
'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() < 5 ? $lang['srv_spremenljivka3'] : $lang['srv_spremenljivka4']) )).'
'; + echo '
'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions < 5 ? $lang['srv_pogoj3'] : $lang['srv_pogoj4']) )).'
'; + echo '
'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks < 5 ? $lang['srv_blok3'] : $lang['srv_blok4']) )).'
'; + echo '
'.(int)$this->globina.'
'; + echo '
'; + echo '
'; #box + echo '
'; #lastnosti_right echo ''; #lastnosti_wrapper - - /////////////////////////////////////////////////////////////////////// Lastnosti staro - echo '
'; - - echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo '
'.$lang['srv_diagnostika_table_title4'].''.$lang['srv_diagnostika_table_title'].'
'.$lang['srv_diagnostic_1_element_5'].''; - echo $time.'  '; - if($lang['id'] == '1') - $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"'; - else - $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"'; - echo ''; - echo '
'.$lang['srv_diagnostic_4_element_9'].''.(int)SurveyInfo::getSurveyGroupCount().'
'.$lang['srv_diagnostic_4_element_5'].''.(int)$this->cnt_spremenljivka.'
'.$lang['srv_diagnostic_4_element_5a'].''.(int)$this->cnt_hidden.'
'.$lang['srv_diagnostic_4_element_8'].''.(int)SurveyInfo::getSurveyVariableCount().'
'.$lang['srv_diagnostic_4_element_2'].''.(int)$this->cnt_conditions.'
'.$lang['srv_diagnostic_4_element_3'].''.(int)$this->cnt_blocks.'
'.$lang['srv_diagnostic_4_element_4'].''.(int)$this->globina.'
'.$lang['srv_diagnostic_1_element_4'].''; - echo $kompleksnost.'  '; - - if($lang['id'] == '1') - $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"'; - else - $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"'; - - echo ''; - echo ''; - echo '
'; - echo '
'; - - - - echo '
'; // KOMENATRJI diff --git a/admin/survey/script/Chartjs.js b/admin/survey/script/Chartjs.js index 20b1f89ec..dbda4e8ad 100644 --- a/admin/survey/script/Chartjs.js +++ b/admin/survey/script/Chartjs.js @@ -16,7 +16,7 @@ function diagnosticsChart(place,display) { data: data, options: { events: [], //no hover labels,animations,... - cutout: 32, //slice width + cutout: 30, //slice width } }; diff --git a/lang/1.php b/lang/1.php index bc94f6aa6..7aeb94f63 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2183,6 +2183,9 @@ $lang = array ( "srv_visible_on" => "Vidno", "srv_visible_off" => "Skrito", "srv_hidden_text" => "Skrito", + "srv_hidden_text2" => "Skriti", + "srv_hidden_text3" => "Skrita", + "srv_hidden_text4" => "Skritih", "srv_system_text" => "Sistemsko", "srv_visible_dostop" => "Vprašanje je vidno", "srv_previewalert" => "Trenutno ste v predogledu ankete!
Odgovori se ne bodo shranili v bazo!", @@ -3538,8 +3541,10 @@ $lang = array ( "srv_bottom_archive" => "Arhiviranje", "srv_info_name" => "Ime ankete", "srv_info_note" => "Opomba", - "srv_info_questions" => "Vprašanj", + "srv_info_questions" => "Vprašanj", "srv_info_questions1" => "Vprašanj", + "srv_info_questions2" => "Vprašanji", + "srv_info_questions3" => "Vprašanja", "srv_info_variables" => "Spremenljivk", "srv_info_pages" => "Strani", "srv_info_answers" => "Odgovorov", @@ -4293,7 +4298,13 @@ $lang = array ( "srv_basic" => "Osnovno", "srv_advanced" => "Napredne možnosti", "srv_pogoj" => "Pogoj", + "srv_pogoj2" => "Pogoja", + "srv_pogoj3" => "Pogoji", + "srv_pogoj4" => "Pogojev", "srv_blok" => "Blok", + "srv_blok2" => "Bloka", + "srv_blok3" => "Bloki", + "srv_blok4" => "Blokov", "srv_calc" => "Kalkulacija", "srv_quota" => "Kvota", "srv_zanka" => "Zanka", @@ -4405,6 +4416,9 @@ $lang = array ( "srv_export_replace1" => "Znak:", "srv_export_replace2" => " v tekstu zamenjaj z:", "srv_spremenljivka" => "Spremenljivka", + "srv_spremenljivka2" => "Spremenljivki", + "srv_spremenljivka3" => "Spremenljivke", + "srv_spremenljivka4" => "Spremenljivk", "srv_vrednost" => "Vrednost", "srv_vrednost_default" => "Prednastavljena vrednost", "srv_your_base_lang" => "Vaš osnovni jezik je", @@ -5421,13 +5435,13 @@ $lang = array ( "srv_diagnostic_4_element_0" => 'Komentarji', "srv_diagnostic_4_element_1" => 'na anketo', "srv_diagnostic_4_element_1a" => 'respondentov na anketo', - "srv_diagnostic_4_element_2" => 'Število pogojev', - "srv_diagnostic_4_element_3" => 'Število blokov', + "srv_diagnostic_4_element_2" => 'Pogojev', + "srv_diagnostic_4_element_3" => 'Blokov', "srv_diagnostic_4_element_4" => 'Nivo gnezdenja', - "srv_diagnostic_4_element_9" => 'Število strani', - "srv_diagnostic_4_element_5" => 'Število vprašanj', - "srv_diagnostic_4_element_5a" => 'Število skritih vprašanj', - "srv_diagnostic_4_element_8" => 'Število spremenljivk', + "srv_diagnostic_4_element_9" => 'Strani', + "srv_diagnostic_4_element_5" => 'Vprašanj', + "srv_diagnostic_4_element_5a" => 'Skritih vprašanj', + "srv_diagnostic_4_element_8" => 'Spremenljivk', "srv_diagnostic_4_element_6" => 'na vprašanja', "srv_diagnostic_4_element_7" => 'respondetov na vprašanja', "srv_diagnostic_5_element_1" => 'Preverjanje pogojev, kalkulacij in zank', diff --git a/lang/2.php b/lang/2.php index 12a0b3d0a..3e0cacf74 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2170,6 +2170,9 @@ $lang = array ( "srv_visible_on" => "Visible", "srv_visible_off" => "Not visible", "srv_hidden_text" => "hidden", + "srv_hidden_text2" => "hidden", + "srv_hidden_text3" => "hidden", + "srv_hidden_text4" => "hidden", "srv_system_text" => "system", "srv_visible_dostop" => "Question is visible", "srv_previewalert" => "You are currently in survey preview mode! Answers will not be saved!", @@ -3508,7 +3511,9 @@ $lang = array ( "srv_info_name" => "Survey name", "srv_info_note" => "Note", "srv_info_questions" => "Questions", - "srv_info_questions1" => "N. of questions", + "srv_info_questions1" => "Questions", + "srv_info_questions2" => "Questions", + "srv_info_questions3" => "Questions", "srv_info_variables" => "Variables", "srv_info_pages" => "Pages", "srv_info_answers" => "Answers", @@ -4272,7 +4277,13 @@ $lang = array ( "srv_basic" => "Basic", "srv_advanced" => "Advanced options", "srv_pogoj" => "Condition", + "srv_pogoj2" => "Conditions", + "srv_pogoj3" => "Conditions", + "srv_pogoj4" => "Conditions", "srv_blok" => "Block", + "srv_blok2" => "Blocks", + "srv_blok3" => "Blocks", + "srv_blok4" => "Blocks", "srv_calc" => "Calculation", "srv_quota" => "Quota", "srv_zanka" => "Loop", @@ -4383,6 +4394,9 @@ $lang = array ( "srv_export_replace1" => "Character:", "srv_export_replace2" => " in text replaced by:", "srv_spremenljivka" => "Variable", + "srv_spremenljivka2" => "Variables", + "srv_spremenljivka3" => "Variables", + "srv_spremenljivka4" => "Variables", "srv_vrednost" => "Value", "srv_vrednost_default" => "Preset value", "srv_your_base_lang" => "Your basic language is", @@ -5402,13 +5416,13 @@ $lang = array ( "srv_diagnostic_4_element_0" => 'Comments', "srv_diagnostic_4_element_1" => 'Number of editor survey comments', "srv_diagnostic_4_element_1a" => 'Number of respondent survey comments', - "srv_diagnostic_4_element_2" => 'Number of conditions', - "srv_diagnostic_4_element_3" => 'Number of blocks', + "srv_diagnostic_4_element_2" => 'Conditions', + "srv_diagnostic_4_element_3" => 'Blocks', "srv_diagnostic_4_element_4" => 'Levels of nesting', - "srv_diagnostic_4_element_9" => 'Number of pages', - "srv_diagnostic_4_element_5" => 'Number of questions', - "srv_diagnostic_4_element_5a" => 'Number of hidden questions', - "srv_diagnostic_4_element_8" => 'Number of variables', + "srv_diagnostic_4_element_9" => 'Pages', + "srv_diagnostic_4_element_5" => 'Questions', + "srv_diagnostic_4_element_5a" => 'Hidden questions', + "srv_diagnostic_4_element_8" => 'Variables', "srv_diagnostic_4_element_6" => 'Number of editors in a questionnaire', "srv_diagnostic_4_element_7" => 'Number of respondents in a questionnaire', "srv_diagnostic_5_element_1" => 'Error in conditions, calculations and loops', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f8eb2e3f8..4c68862ed 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -24223,78 +24223,99 @@ div#srv_diagnostic div.lastnosti_wrapper { gap: 32px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle { width: 33%; display: flex; flex-direction: column; gap: 16px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box { border: 1px solid #E5E5E5; border-radius: 2px; padding: 16px; display: flex; flex-direction: column; box-sizing: border-box; - height: 160px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .title { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title { text-transform: uppercase; font-weight: 600; margin-bottom: 16px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph { display: flex; flex-direction: row; margin-top: -8px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .circle { - height: 100px; - width: 100px; +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle { + height: 88px; + width: 88px; margin-right: 16px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text { display: flex; flex-direction: column; justify-content: center; gap: 16px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text a { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a { text-decoration: none; font-size: 14px !important; white-space: nowrap; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time { font-size: 40px; margin-bottom: 12px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time span.time_text { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text { font-size: 14px !important; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a, -div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box a { +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a { text-decoration: none; font-size: 14px !important; white-space: nowrap; } +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right { + width: 33%; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box { + border: 1px solid #E5E5E5; + border-radius: 2px; + display: flex; + flex-direction: row; + box-sizing: border-box; + height: 100%; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section { + display: flex; + flex-direction: column; + box-sizing: border-box; + justify-content: space-between; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item { + font-size: 14px !important; + padding: 13px 16px; + white-space: nowrap; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item:not(:last-of-type) { + border-bottom: 1px solid #E5E5E5; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second { + width: 100%; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second .item { + font-weight: 600; + text-transform: lowercase; +} div#srv_diagnostic div.input_box { display: flex; width: 300px; diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss index a36782dbe..0b24d24a2 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss @@ -66,8 +66,7 @@ div#srv_diagnostic { gap: 32px; div.lastnosti_left, - div.lastnosti_middle, - div.lastnosti_right { + div.lastnosti_middle { width: 33%; display: flex; flex-direction: column; @@ -82,8 +81,6 @@ div#srv_diagnostic { flex-direction: column; box-sizing: border-box; - height: 160px; - .title { text-transform: uppercase; font-weight: $semi-bold; @@ -96,8 +93,8 @@ div#srv_diagnostic { margin-top: -8px; .circle { - height: 100px; - width: 100px; + height: 88px; + width: 88px; margin-right: 16px; } @@ -131,6 +128,48 @@ div#srv_diagnostic { } } } + + div.lastnosti_right { + width: 33%; + + .box { + border: 1px solid $gray; + border-radius: 2px; + + display: flex; + flex-direction: row; + box-sizing: border-box; + + height: 100%; + + .vertical_section { + display: flex; + flex-direction: column; + box-sizing: border-box; + justify-content: space-between; + + .item { + font-size: 14px !important; + padding: 13px 16px; + white-space:nowrap; + + &:not(:last-of-type) { + border-bottom: 1px solid $gray; + } + } + + &.second { + width: 100%; + + .item { + font-weight: $semi-bold; + text-transform: lowercase; + } + } + } + } + + } } div.input_box {