diff --git a/admin/survey/classes/class.SurveyPostProcess.php b/admin/survey/classes/class.SurveyPostProcess.php index 11940a731..86f68e642 100644 --- a/admin/survey/classes/class.SurveyPostProcess.php +++ b/admin/survey/classes/class.SurveyPostProcess.php @@ -184,7 +184,7 @@ class SurveyPostProcess { SurveyAnalysis::Init($this->anketa); $freq = SurveyAnalysis::getFrequencys(); - echo '

'.$lang['src_coding_refresh'].'

'; + echo '

'.$lang['src_coding_refresh'].'

'; SurveyVariablesProfiles::Init($this->anketa, $global_user_id); @@ -192,12 +192,18 @@ class SurveyPostProcess { if (SurveyVariablesProfiles::getCurentProfileId() != -1) $variables = array(); - echo '

'.$lang['srv_hand_coding_text'] . '

'; - - echo '

'; - - echo '

'; - echo ''; + echo ''; + echo ''; + echo '

'; + echo '0?'checked':'').' onclick="return false;">'; + echo ''; + echo ' '; + echo '
'; + + echo ''; + //echo ' ('.$lang['srv_coding_spr2'].')

'; if ( count($variables)>0 ) - echo '('.$lang['srv_coding_spr2'].')'; - echo '

'; + echo '

('.$lang['srv_coding_spr2'].')

'; SurveyDataDisplay::displayVnosiHTML(); diff --git a/lang/1.php b/lang/1.php index db16f9be8..d4db56d4c 100644 --- a/lang/1.php +++ b/lang/1.php @@ -6214,7 +6214,7 @@ $lang = array ( 'srv_recoded_advancetNote_recoded4' => ' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.', 'srv_auto_coding_end_title' => 'Uspešno kodiranje', 'srv_auto_coding_end' => 'Uspešno ste kodirali %s vrednosti.

Za ogled rezultatov in nadaljnje popravke kliknite na %s', - 'srv_hand_coding_text' => 'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre Več >>', + 'srv_hand_coding_text' => 'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre. Več informacij.', 'srv_popup_title' => 'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)', 'srv_grid_add' => 'Dodaj možni odgovor', 'srv_grid_remove' => 'Odstrani odgovor', diff --git a/lang/2.php b/lang/2.php index d496befee..60c050d86 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6107,7 +6107,7 @@ $lang = array ( 'srv_recoded_advancetNote_recoded4' => ' has been recoded from another variables, so further recoding is not allowed.', 'srv_auto_coding_end_title' => 'Coding successful', 'srv_auto_coding_end' => 'You have coded %s values.

To view the results go to %s', - 'srv_hand_coding_text' => 'Click on a value in the table and code it in the pop-up window More >>', + 'srv_hand_coding_text' => 'Click on a value in the table and code it in the pop-up window. More information.', 'srv_popup_title' => 'Embed survey in pop-up', 'srv_grid_add' => 'Add possible answer', 'srv_grid_remove' => 'Remove answer', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 55d285b16..6ccf5d12f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -22843,6 +22843,596 @@ table#recode_table td.functions_column, table#recode_table th.functions_column { border-left: 1px solid #E5E5E5; } +div.subpage_coding .layout_right_item fieldset div#analiza_data { + max-width: 932px; + overflow-x: scroll; +} +div.subpage_coding #dataTableScroller, +div.subpage_coding #div_analiza_filtri_right { + display: none; +} +div.subpage_coding #vprasanje_recode_new { + position: absolute; + top: 40% !important; + height: auto; + min-height: 100px; + width: 350px; + padding: 10px; + font-size: 13px; + background-color: white; + border: 4px solid #1E88E5; + border-radius: 7px; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px; + box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); + -moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); + -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); +} +div.subpage_coding .coding-refresh { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + display: none; + position: fixed; + z-index: 1000; + left: calc(50% - 150px); + top: 20px; + text-align: center; + width: 300px; +} +div.subpage_coding .coding-refresh .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +div.subpage_coding .coding-refresh .popup_close:hover { + color: #333333; +} +div.subpage_coding .coding-refresh .popup_close a { + color: #777777; + text-decoration: none; +} +div.subpage_coding .coding-refresh .popup_close a:hover { + color: #333333; +} +div.subpage_coding .coding-refresh h2, +div.subpage_coding .coding-refresh .divPopUp_top { + width: 100%; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; + margin-block-start: 0; +} +div.subpage_coding .coding-refresh h2 span.faicon, +div.subpage_coding .coding-refresh h2 span.fa-brands, +div.subpage_coding .coding-refresh .divPopUp_top span.faicon, +div.subpage_coding .coding-refresh .divPopUp_top span.fa-brands { + margin-right: 6px; + color: #1E88E5; +} +div.subpage_coding .coding-refresh h2 span.faicon:before, +div.subpage_coding .coding-refresh h2 span.fa-brands:before, +div.subpage_coding .coding-refresh .divPopUp_top span.faicon:before, +div.subpage_coding .coding-refresh .divPopUp_top span.fa-brands:before { + font-size: 14px; +} +div.subpage_coding .coding-refresh p { + line-height: 20px; +} +div.subpage_coding .coding-refresh .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} +div.subpage_coding .coding-refresh .popup_main { + display: flex; + flex-direction: column; + border-bottom: 1px #C4C4C4 solid; +} +div.subpage_coding .coding-refresh .popup_main.with_menu { + flex-direction: row; +} +div.subpage_coding .coding-refresh .popup_main .popup_left { + box-sizing: border-box; + width: 216px; + min-width: 216px; + padding-right: 16px; + padding-bottom: 16px; + margin-right: 16px; + border-right: 1px #C4C4C4 solid; +} +div.subpage_coding .coding-refresh .popup_main .popup_left .list { + display: flex; + flex-direction: column; +} +div.subpage_coding .coding-refresh .popup_main .popup_left .list .list-item { + cursor: pointer; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 8px; + margin-bottom: 8px; + font-size: 14px; + border: 1px #E5E5E5 solid; + border-radius: 2px; + transition: 0.2s; +} +div.subpage_coding .coding-refresh .popup_main .popup_left .list .list-item.active, div.subpage_coding .coding-refresh .popup_main .popup_left .list .list-item:hover { + background-color: #F8F8F8; + border-color: #1E88E5; +} +div.subpage_coding .coding-refresh .popup_main .popup_left .list .list-item .profile_icons a { + margin-left: 8px; +} +div.subpage_coding .coding-refresh .popup_main .popup_left button { + display: flex; + align-items: center; + width: 100%; + font-weight: 400; +} +div.subpage_coding .coding-refresh .popup_main .popup_left button .faicon { + font-size: 12px; + line-height: 14px; +} +div.subpage_coding .coding-refresh .popup_main .popup_left button .faicon::before { + margin-right: 8px; + font-size: 14px; + color: #1E88E5; +} +div.subpage_coding .coding-refresh .popup_main .popup_right { + overflow-y: auto; + max-height: 70vh; + width: 100%; +} +div.subpage_coding .coding-refresh .popup_main .popup_right .popup_right_note { + margin-bottom: 16px; + font-size: 16px; +} +div.subpage_coding .coding-refresh .popup_main fieldset { + display: flex; + flex-direction: column; + padding: 16px 0 0 0; + margin-bottom: 16px; + border: 0; + border-top: 1px #E5E5E5 solid; +} +div.subpage_coding .coding-refresh .popup_main fieldset legend { + padding: 0 8px 0 0; + font-size: 14px; +} +div.subpage_coding .coding-refresh .popup_main span { + font-size: 14px; +} +div.subpage_coding .coding-refresh .popup_main .setting_line { + margin-bottom: 8px; + font-size: 14px; +} +div.subpage_coding .coding-refresh .popup_main .setting_line:last-of-type { + margin-bottom: 0; +} +div.subpage_coding .coding-refresh .popup_main .setting_line label, +div.subpage_coding .coding-refresh .popup_main .setting_line span { + font-size: 14px; +} +div.subpage_coding .coding-refresh .popup_main .settings_block { + display: flex; + flex-direction: column; + margin-bottom: 16px; +} +div.subpage_coding .coding-refresh .popup_main .settings_block label, +div.subpage_coding .coding-refresh .popup_main .settings_block span { + font-size: 14px; +} +div.subpage_coding .coding-refresh .button_holder { + justify-content: end !important; + margin: 20px 0 0 0; +} +div.subpage_coding .coding-refresh .button_holder button:last-child { + margin-right: 0; +} +div.subpage_coding .coding-refresh.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: "\f071"; + font-size: 14px; + color: #FFC700; +} +div.subpage_coding #coding { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + position: absolute; + min-width: 500px; + min-height: 100px; + display: none; +} +div.subpage_coding #coding .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +div.subpage_coding #coding .popup_close:hover { + color: #333333; +} +div.subpage_coding #coding .popup_close a { + color: #777777; + text-decoration: none; +} +div.subpage_coding #coding .popup_close a:hover { + color: #333333; +} +div.subpage_coding #coding h2, +div.subpage_coding #coding .divPopUp_top { + width: 100%; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; + margin-block-start: 0; +} +div.subpage_coding #coding h2 span.faicon, +div.subpage_coding #coding h2 span.fa-brands, +div.subpage_coding #coding .divPopUp_top span.faicon, +div.subpage_coding #coding .divPopUp_top span.fa-brands { + margin-right: 6px; + color: #1E88E5; +} +div.subpage_coding #coding h2 span.faicon:before, +div.subpage_coding #coding h2 span.fa-brands:before, +div.subpage_coding #coding .divPopUp_top span.faicon:before, +div.subpage_coding #coding .divPopUp_top span.fa-brands:before { + font-size: 14px; +} +div.subpage_coding #coding p { + line-height: 20px; +} +div.subpage_coding #coding .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} +div.subpage_coding #coding .popup_main { + display: flex; + flex-direction: column; + border-bottom: 1px #C4C4C4 solid; +} +div.subpage_coding #coding .popup_main.with_menu { + flex-direction: row; +} +div.subpage_coding #coding .popup_main .popup_left { + box-sizing: border-box; + width: 216px; + min-width: 216px; + padding-right: 16px; + padding-bottom: 16px; + margin-right: 16px; + border-right: 1px #C4C4C4 solid; +} +div.subpage_coding #coding .popup_main .popup_left .list { + display: flex; + flex-direction: column; +} +div.subpage_coding #coding .popup_main .popup_left .list .list-item { + cursor: pointer; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 8px; + margin-bottom: 8px; + font-size: 14px; + border: 1px #E5E5E5 solid; + border-radius: 2px; + transition: 0.2s; +} +div.subpage_coding #coding .popup_main .popup_left .list .list-item.active, div.subpage_coding #coding .popup_main .popup_left .list .list-item:hover { + background-color: #F8F8F8; + border-color: #1E88E5; +} +div.subpage_coding #coding .popup_main .popup_left .list .list-item .profile_icons a { + margin-left: 8px; +} +div.subpage_coding #coding .popup_main .popup_left button { + display: flex; + align-items: center; + width: 100%; + font-weight: 400; +} +div.subpage_coding #coding .popup_main .popup_left button .faicon { + font-size: 12px; + line-height: 14px; +} +div.subpage_coding #coding .popup_main .popup_left button .faicon::before { + margin-right: 8px; + font-size: 14px; + color: #1E88E5; +} +div.subpage_coding #coding .popup_main .popup_right { + overflow-y: auto; + max-height: 70vh; + width: 100%; +} +div.subpage_coding #coding .popup_main .popup_right .popup_right_note { + margin-bottom: 16px; + font-size: 16px; +} +div.subpage_coding #coding .popup_main fieldset { + display: flex; + flex-direction: column; + padding: 16px 0 0 0; + margin-bottom: 16px; + border: 0; + border-top: 1px #E5E5E5 solid; +} +div.subpage_coding #coding .popup_main fieldset legend { + padding: 0 8px 0 0; + font-size: 14px; +} +div.subpage_coding #coding .popup_main span { + font-size: 14px; +} +div.subpage_coding #coding .popup_main .setting_line { + margin-bottom: 8px; + font-size: 14px; +} +div.subpage_coding #coding .popup_main .setting_line:last-of-type { + margin-bottom: 0; +} +div.subpage_coding #coding .popup_main .setting_line label, +div.subpage_coding #coding .popup_main .setting_line span { + font-size: 14px; +} +div.subpage_coding #coding .popup_main .settings_block { + display: flex; + flex-direction: column; + margin-bottom: 16px; +} +div.subpage_coding #coding .popup_main .settings_block label, +div.subpage_coding #coding .popup_main .settings_block span { + font-size: 14px; +} +div.subpage_coding #coding .button_holder { + justify-content: end !important; + margin: 20px 0 0 0; +} +div.subpage_coding #coding .button_holder button:last-child { + margin-right: 0; +} +div.subpage_coding #coding.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: "\f071"; + font-size: 14px; + color: #FFC700; +} +div.subpage_coding #coding .new-spr { + position: absolute; + top: 3px; + right: 3px; + background-color: white; + padding: 5px; + text-align: right; +} +div.subpage_coding ul.recode_number_sort { + padding: 0px; + margin: 0px; +} +div.subpage_coding ul.recode_number_sort li { + list-style: none; + border: 1px solid #1E88E5; + margin: 7px 10px 7px 0px; + padding: 3px 0px; + width: 100%; +} +div.subpage_coding .recoding_variable_div { + padding: 8px 3px; +} +div.subpage_coding .ui-recode-placeholder { + background: #EAF9FE; + border: 1px dashed #333333; +} +div.subpage_coding .floatRecodeSpremenljivka { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + position: fixed; + min-height: 50px; + height: auto; + top: 40vh; + left: calc(50% + 360px); + min-width: 200px; + width: auto; + z-index: 1000; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_close:hover { + color: #333333; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_close a { + color: #777777; + text-decoration: none; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_close a:hover { + color: #333333; +} +div.subpage_coding .floatRecodeSpremenljivka h2, +div.subpage_coding .floatRecodeSpremenljivka .divPopUp_top { + width: 100%; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; + margin-block-start: 0; +} +div.subpage_coding .floatRecodeSpremenljivka h2 span.faicon, +div.subpage_coding .floatRecodeSpremenljivka h2 span.fa-brands, +div.subpage_coding .floatRecodeSpremenljivka .divPopUp_top span.faicon, +div.subpage_coding .floatRecodeSpremenljivka .divPopUp_top span.fa-brands { + margin-right: 6px; + color: #1E88E5; +} +div.subpage_coding .floatRecodeSpremenljivka h2 span.faicon:before, +div.subpage_coding .floatRecodeSpremenljivka h2 span.fa-brands:before, +div.subpage_coding .floatRecodeSpremenljivka .divPopUp_top span.faicon:before, +div.subpage_coding .floatRecodeSpremenljivka .divPopUp_top span.fa-brands:before { + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka p { + line-height: 20px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main { + display: flex; + flex-direction: column; + border-bottom: 1px #C4C4C4 solid; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main.with_menu { + flex-direction: row; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left { + box-sizing: border-box; + width: 216px; + min-width: 216px; + padding-right: 16px; + padding-bottom: 16px; + margin-right: 16px; + border-right: 1px #C4C4C4 solid; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left .list { + display: flex; + flex-direction: column; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left .list .list-item { + cursor: pointer; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 8px; + margin-bottom: 8px; + font-size: 14px; + border: 1px #E5E5E5 solid; + border-radius: 2px; + transition: 0.2s; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left .list .list-item.active, div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left .list .list-item:hover { + background-color: #F8F8F8; + border-color: #1E88E5; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left .list .list-item .profile_icons a { + margin-left: 8px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left button { + display: flex; + align-items: center; + width: 100%; + font-weight: 400; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left button .faicon { + font-size: 12px; + line-height: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_left button .faicon::before { + margin-right: 8px; + font-size: 14px; + color: #1E88E5; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_right { + overflow-y: auto; + max-height: 70vh; + width: 100%; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .popup_right .popup_right_note { + margin-bottom: 16px; + font-size: 16px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main fieldset { + display: flex; + flex-direction: column; + padding: 16px 0 0 0; + margin-bottom: 16px; + border: 0; + border-top: 1px #E5E5E5 solid; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main fieldset legend { + padding: 0 8px 0 0; + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main span { + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .setting_line { + margin-bottom: 8px; + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .setting_line:last-of-type { + margin-bottom: 0; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .setting_line label, +div.subpage_coding .floatRecodeSpremenljivka .popup_main .setting_line span { + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .settings_block { + display: flex; + flex-direction: column; + margin-bottom: 16px; +} +div.subpage_coding .floatRecodeSpremenljivka .popup_main .settings_block label, +div.subpage_coding .floatRecodeSpremenljivka .popup_main .settings_block span { + font-size: 14px; +} +div.subpage_coding .floatRecodeSpremenljivka .button_holder { + justify-content: end !important; + margin: 20px 0 0 0; +} +div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child { + margin-right: 0; +} +div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: "\f071"; + font-size: 14px; + color: #FFC700; +} + div.appendmerge_indent { margin: 16px 0 16px 16px; } diff --git a/resources/sass/admin_new/pages/survey_data/calculations.scss b/resources/sass/admin_new/pages/survey_data/calculations.scss index 0a2845d4b..1d6f0bbc1 100644 --- a/resources/sass/admin_new/pages/survey_data/calculations.scss +++ b/resources/sass/admin_new/pages/survey_data/calculations.scss @@ -46,5 +46,101 @@ table#recode_table { border-left: 1px solid $gray; } } +} +//Ročno rekodiranje +div.subpage_coding { + .layout_right_item { + fieldset { + div#analiza_data { + max-width: 932px; + overflow-x: scroll; + } + } + } + + #dataTableScroller, + #div_analiza_filtri_right { + display: none; + } + + //Skopiran styling za recode popup + + #vprasanje_recode_new { + position: absolute; + top: 40% !important; + height: auto; + min-height: 100px; + width: 350px; + padding: 10px; + font-size: 13px; + background-color: white; + border: 4px solid $blue; + border-radius: 7px; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px; + box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); + -moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); + -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8); + } + .coding-refresh { + @include popup_general(); + + display: none; + position: fixed; + z-index: 1000; + left: calc(50% - 150px); + top: 20px; + text-align: center; + + width: 300px; + } + #coding { + @include popup_general(); + + position: absolute; + + min-width: 500px; + min-height: 100px; + display: none; + + .new-spr { + position: absolute; + top: 3px; + right: 3px; + background-color: white; + padding: 5px; + text-align: right; + } + } + ul.recode_number_sort { + padding: 0px; + margin: 0px; + li { + list-style: none; + border: 1px solid $blue; + margin: 7px 10px 7px 0px; + padding: 3px 0px; + width: 100%; + } + } + .recoding_variable_div { + padding: 8px 3px; + } + .ui-recode-placeholder { + background: $light-blue; + border: 1px dashed $black; + } + .floatRecodeSpremenljivka { + @include popup_general(); + + position: fixed; + min-height: 50px; + height: auto; + top: 40vh; + left: calc(50% + 360px); + min-width: 200px; + width: auto; + z-index: 1000; + } } \ No newline at end of file