From e96c961da53e048b74ab46fbe7233ba700ae7cd8 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 14:30:37 +0100 Subject: [PATCH 01/10] [Redizajn 1KA] - Urejanje --> Arhiv --> Arhivi vabil - v1 --- .../class.SurveyInvitationsNew.php | 99 +++++----- admin/survey/classes/tracking/CrossRoad.php | 3 + lang/1.php | 8 +- lang/2.php | 4 +- public/css/admin_new.css | 173 +++++++++++------- .../sass/admin_new/basic/typography.scss | 6 + .../popup/page_specific/archive.scss | 6 + .../admin_new/components/table/table.scss | 7 +- 8 files changed, 184 insertions(+), 122 deletions(-) diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 17869232f..9d59389da 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -3566,67 +3566,55 @@ class SurveyInvitationsNew { if (mysqli_num_rows($sql_query) > 0 || count($simple_recipents) > 0) { - echo '

'.$lang['srv_archive_invitation'].'

'; + echo '
'.$lang['srv_archive_invitation'].''; + + echo '

'.$lang['srv_archive_invitation_text'].'

'; + + echo '

'.$lang['srv_archive_invitation_text2'].'

'; + + echo '
'; + echo '
'; echo ''; echo ''; - echo ''; - echo ''; + echo ''; echo ''; echo ''; - #echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; - #echo ''; echo ''; + while ($row = mysqli_fetch_assoc($sql_query)) { echo ''; - // Datum - echo ''; - - // Ura - echo ''; + // Datum in ura + echo ''; // Email sporocilo - echo ''; // Subject - echo ''; - #echo ''; - - // Nacin posiljanja (email, posta, sms...) - echo ''; # uspešno poslani - echo ''; # neuspešno poslani - echo ''; echo ''; } echo ''; echo '
'.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_hour_send'].''.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_naslov'].''.$lang['srv_inv_archive_subject_text'].''.$lang['srv_inv_archive_body_text'].''.$lang['srv_inv_message_type'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_sender'].''.$lang['srv_inv_archive_comment'].' 
'.$row['ds'].''.$row['hs'].''.$row['ds'].' '.$row['hs'].''; + echo ''; echo ''.$row['naslov'].''; echo ''; + echo ''; echo $row['subject_text']; echo ''.$row['body_text'].''; - if ($row['tip'] == '0') - echo ''.$lang['srv_inv_message_noemailing_type1'].''; - elseif($row['tip'] == '1') - echo ''.$lang['srv_inv_message_noemailing_type2'].''; - elseif($row['tip'] == '2') - echo ''.$lang['srv_inv_message_noemailing_type3'].''; - else - echo ''.$lang['email'].''; - echo ''; + echo ''; if ((int)$row['cnt_succsess'] > 0 ) { - echo ''.$row['cnt_succsess'].''; + echo ''.$row['cnt_succsess'].''; } else { echo ''.$row['cnt_succsess'].''; } echo ''; + echo ''; if ((int)$row['cnt_error'] > 0 ) { - echo ''.$row['cnt_error'].''; + echo ''.$row['cnt_error'].''; } else { echo ''.$row['cnt_error'].''; } @@ -3647,13 +3635,16 @@ class SurveyInvitationsNew { # komentar echo ''; - echo ''.$row['comment']; + echo (($row['comment'] == "") ? '/' : $row['comment']); echo '
'; + + echo '
'; + echo '
'; # dodamo simpl pošiljanje if ( count($simple_recipents) > 0 ) { @@ -3693,19 +3684,15 @@ class SurveyInvitationsNew { echo ''; } - } else { - echo '
'; - echo ''.$lang['srv_archive_invitation'].''; + } else { //Če ni še nobenih poslanih vabil echo $lang['srv_invitation_note4'].''; - echo '
'; } - + echo '
'; echo ''; # id="div_archive_content">'; - echo '
'; } @@ -4685,9 +4672,11 @@ class SurveyInvitationsNew { echo ''; // id="arc_content" echo '
'; echo ''; @@ -6694,9 +6683,9 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; @@ -6872,9 +6861,9 @@ class SurveyInvitationsNew { echo '
'; echo ''; @@ -6917,9 +6906,10 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; @@ -6958,11 +6948,10 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index f5b53ed0a..748457ed0 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -267,6 +267,9 @@ class CrossRoad { $second_action = ($_GET['m'] == 'view_archive') ? NAVI_ARHIVI : 'invitations'; $layout_width = 'wide'; + + if ($_GET['m'] == 'view_archive') + $layout_menu = "menu_left"; $status = 5; diff --git a/lang/1.php b/lang/1.php index b446df29f..68606af4a 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4926,14 +4926,14 @@ $lang = array ( 'srv_inv_archive_heading' => "Arhivi pošiljanja", 'srv_inv_archive_date_send' => "Datum pošiljanja", 'srv_inv_archive_hour_send' => "Ura pošiljanja", - 'srv_inv_archive_subject_text' => "Naslov sporočila", - 'srv_inv_archive_naslov' => "Email sporočilo", + 'srv_inv_archive_subject_text' => "Zadeva sporočila", + 'srv_inv_archive_naslov' => "Ime sporočila", 'srv_inv_archive_subject' => "Naslov sporočila", 'srv_inv_archive_body_text' => "Vsebina sporočila", 'srv_inv_archive_cnt_succsess' => "Uspešno poslanih", 'srv_inv_archive_cnt_error' => "Napak", 'srv_inv_archive_comment' => "Komentar", - 'srv_inv_archive_sender' => "Poslal", + 'srv_inv_archive_sender' => "Poslal/-a", 'srv_inv_archive_email_address' => "Email prejemnika", 'srv_inv_archive_status' => "Status", 'srv_inv_archive_edit' => "Uredi", @@ -5762,6 +5762,8 @@ $lang = array ( "srv_deleteSurveyDataFile_success_note" => "Datoteka s podatki je bila uspešno izbrisana!", "srv_archive_survey" => "Arhivi vprašalnika", "srv_archive_invitation" => "Arhivi vabil", + "srv_archive_invitation_text" => "Vsako poslano email vabilo se avtomatsko shrani v spodnji seznam, kjer je navedena tudi statistika pošiljanja.", + "srv_archive_invitation_text2" => "Seznam poslanih email vabil", "srv_archive_analysis" => "Arhivi analiz", "srv_toolbox_if" => "Določite pogoje za prikaz vprašanja", "srv_toolbox_block" => "Bloki za strukturiranje daljših vprašalnikov", diff --git a/lang/2.php b/lang/2.php index 61e9eea25..510aada8e 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4898,7 +4898,7 @@ $lang = array ( 'srv_inv_archive_date_send' => "Sending date", 'srv_inv_archive_hour_send' => "Sending time", 'srv_inv_archive_subject_text' => "Message subject", - 'srv_inv_archive_naslov' => "Subject", + 'srv_inv_archive_naslov' => "Message name", 'srv_inv_archive_subject' => "Message title", 'srv_inv_archive_body_text' => "Message content", 'srv_inv_archive_cnt_succsess' => "Successfully sent", @@ -5662,6 +5662,8 @@ $lang = array ( "srv_deleteSurveyDataFile_success_note" => "Data file was successfully deleted.", "srv_archive_survey" => "Survey archive", "srv_archive_invitation" => "Invitation archive", + "srv_archive_invitation_text" => "Each sent email invitation is automatically saved in the list below, where you can also see the sending statistics.", + "srv_archive_invitation_text2" => "List of sent email invitations", "srv_archive_analysis" => "Analysis archive", "srv_data_emailstatus_0" => "No", "srv_data_emailstatus_1" => "Yes", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 01a4a5e80..6e26382f9 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5075,6 +5075,12 @@ p, span { font-style: italic; } +.as_link { + text-decoration: underline; + color: #1E88E5; + cursor: pointer; +} + .bold { font-weight: 800; } @@ -7685,20 +7691,28 @@ table { border-collapse: collapse; text-align: left; } -table td, table th { +table td, +table th { padding: 8px 16px; border-top: 1px solid #E5E5E5; vertical-align: middle; } -table td.center, table th.center { +table td.center, +table th.center { text-align: center; } -table td.right, table th.right { +table td.right, +table th.right { text-align: right; } -table td.wrap, table th.wrap { +table td.wrap, +table th.wrap { white-space: normal; } +table td.lead_column, +table th.lead_column { + border-right: 3px solid #E5E5E5; +} table th { font-weight: 600; background-color: #F8F8F8; @@ -9925,6 +9939,64 @@ dl.arch_email dd { height: 150px; } +#inv_view_arch_recipients { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + height: auto; + width: auto; +} +#inv_view_arch_recipients .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +#inv_view_arch_recipients .popup_close:hover { + color: #333333; +} +#inv_view_arch_recipients .popup_close a { + color: #777777; + text-decoration: none; +} +#inv_view_arch_recipients .popup_close a:hover { + color: #333333; +} +#inv_view_arch_recipients h2, +#inv_view_arch_recipients .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +#inv_view_arch_recipients p { + line-height: 20px; +} +#inv_view_arch_recipients .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +#inv_view_arch_recipients .button_holder button:last-child { + margin-right: 0; +} +#inv_view_arch_recipients.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: "\f071"; + font-size: 14px; + color: #FFC700; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -10789,23 +10861,23 @@ and open the template in the editor. } #branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before { /*content: "\f096";*/ - content: ""; + content: "\f0c8"; letter-spacing: 10px; } #branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { /*content: "\f10c";*/ - content: ""; + content: "\f111"; letter-spacing: 8px; } #branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before { /*content: "\f046";*/ - content: ""; + content: "\f14a"; color: #D3D3D3; letter-spacing: 8px; } #branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before { /*content: "\f192";*/ - content: ""; + content: "\f192"; color: #D3D3D3; } #branching span.faicon.delete_circle::before { @@ -10839,8 +10911,6 @@ and open the template in the editor. width: calc(100% - 401px - 304px); margin: 0 0 0 304px; background-color: white; - /* font awesom za admin */ - /* select, checked */ /* Okno za drop vprasanja, ko je anketa prazna */ } #branching ul { @@ -10944,53 +11014,6 @@ and open the template in the editor. cursor: move; margin-top: -2px; } -#branching #variable_holder input[type=checkbox].enka-admin-custom, -#branching #variable_holder input[type=radio].enka-admin-custom { - display: none !important; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before, -#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { - font-family: "Font Awesome 5 Free"; - display: inline-block; - font-size: 16px; - color: #D3D3D3; - font-weight: 400; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before, -#branching #variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before { - display: inline-block; - float: left; - padding-top: 4px; - padding-left: 4px; - font-weight: 400; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before { - /*content: "\f096";*/ - content: "\f0c8"; - letter-spacing: 10px; -} -#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { - /*content: "\f10c";*/ - content: "\f111"; - letter-spacing: 8px; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before { - /*content: "\f046";*/ - content: "\f14a"; - color: #D3D3D3; - letter-spacing: 8px; -} -#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before { - /*content: "\f192";*/ - content: "\f192"; - color: #D3D3D3; -} -#branching span.faicon.delete_circle::before { - font-size: 14px; -} -#branching span.faicon.add::before { - font-size: 14px; -} #branching .empty_vrivanje { display: flex; flex-direction: column; @@ -11020,12 +11043,38 @@ and open the template in the editor. background: 0 !important; background-color: #E5E5E5; } -#branching #bottom_icons_holder { - /*display: none;*/ +#branching #bottom_icons_holder .forma_bottom { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 100%; + height: auto; + padding: 64px 0 0 0; } - -.branchinghover { - background: url("../../../admin/survey/img_0/hover_background.png") repeat-x top left !important; +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner { + display: flex; + align-items: baseline; + padding: 0; + margin: 0; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner > span { + font-size: 14px; + color: #333333; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a { + display: flex; + align-items: baseline; + margin: 0 16px 0 0; + padding: 0; + font-size: 14px; + text-decoration: none; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a:hover { + text-decoration: none; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner .faicon { + margin-right: 8px; } .blockSwitch { diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index a3e9fe125..7c4db62ee 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -22,6 +22,12 @@ p,span { font-style: italic; } +.as_link { + text-decoration: underline; + color: $blue; + cursor: pointer; +} + .bold { font-weight: $extra-bold; } diff --git a/resources/sass/admin_new/components/popup/page_specific/archive.scss b/resources/sass/admin_new/components/popup/page_specific/archive.scss index e8df48c41..123ec770f 100644 --- a/resources/sass/admin_new/components/popup/page_specific/archive.scss +++ b/resources/sass/admin_new/components/popup/page_specific/archive.scss @@ -95,3 +95,9 @@ dl.arch_email { #email_archive_text { height: 150px; } +#inv_view_arch_recipients { + @include popup_general(); + + height: auto; + width: auto; +} diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index ef3ab9145..062057427 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -4,7 +4,8 @@ table { border-collapse: collapse; text-align: left; - td, th { + td, + th { padding: 8px 16px; border-top: 1px solid $gray; vertical-align: middle; @@ -19,6 +20,10 @@ table { &.wrap { white-space: normal; } + + &.lead_column { + border-right: 3px solid $gray; + } } th { From 3fa98a8432a0365afc9c3dcbe60c20b9fddf6751 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 15:24:25 +0100 Subject: [PATCH 02/10] =?UTF-8?q?[Redizajn=201KA]=20-=20Urejanje=20-->=20A?= =?UTF-8?q?rhiv=20-->=20Spremembe=20-->=20Spremembe=20vpra=C5=A1alnika=20-?= =?UTF-8?q?=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/classes/tracking/TrackingClass.php | 27 +++++++++++-------- .../classes/tracking/UserTrackingClass.php | 6 ++--- lang/1.php | 5 +++- lang/2.php | 5 +++- public/css/admin_new.css | 14 +++++++--- resources/sass/admin_new/basic/colors.scss | 1 + .../sass/admin_new/basic/icons/icons.scss | 3 +++ .../admin_new/pages/my_surveys/archives.scss | 4 +++ .../pages/my_surveys/my_surveys.scss | 3 ++- .../admin_new/pages/settings/moj_profil.scss | 5 ++-- 10 files changed, 50 insertions(+), 23 deletions(-) create mode 100644 resources/sass/admin_new/pages/my_surveys/archives.scss diff --git a/admin/survey/classes/tracking/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php index 5d5bd8a9f..d3721f110 100644 --- a/admin/survey/classes/tracking/TrackingClass.php +++ b/admin/survey/classes/tracking/TrackingClass.php @@ -120,9 +120,12 @@ class TrackingClass echo '
'; echo '' . $lang['srv_survey_archives_tracking_' . $this->sub] . ''; - // Izvoz v Excel - echo '

Download Excel

'; + echo '

'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

'; + // Izvoz v Excel + echo '
'; + echo ''.$lang['srv_export_excel'].''; + echo '
'; echo ''; @@ -197,12 +200,12 @@ class TrackingClass } else $recnum = 0; - echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ''; } @@ -233,7 +236,7 @@ class TrackingClass // Prva vrstica echo ''; echo ' '; - echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; @@ -242,20 +245,22 @@ class TrackingClass // Vrstice s podatki $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); + $count = 0; while ($row = mysqli_fetch_array($sql)) { - echo ''; + echo ' 24 ? 'class="displayNone"' : '').'>'; $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); $rowu = mysqli_fetch_array($sqlu); - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ''; + $count++; } } diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php index a4fe93fe3..e2608a876 100644 --- a/admin/survey/classes/tracking/UserTrackingClass.php +++ b/admin/survey/classes/tracking/UserTrackingClass.php @@ -65,10 +65,10 @@ class UserTrackingClass while ($row = mysqli_fetch_array($sql)) { echo ''; - echo ' '; + echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ''; } diff --git a/lang/1.php b/lang/1.php index 68606af4a..a942ca45f 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4095,6 +4095,9 @@ $lang = array ( "srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov", "srv_survey_archives_tracking" => "Spremembe", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", + "srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb v vprašalniku.", + "srv_survey_archives_tracking_survey_text2" => "Za vpogled v vse spremembe prenesite", + "srv_survey_archives_tracking_survey_text3" => "Excel datoteko", "srv_survey_archives_tracking_data" => "Spremembe podatkov", "srv_survey_archives_tracking_append" => "Append/Merge (uvozi)", "srv_survey_archives_tracking_hierarchy" => "Spremembe samoevalvacije v šolah", @@ -5576,7 +5579,7 @@ $lang = array ( "srv_data_delete_not_selected" => "Niste izbrali nobenega respondenta!", "srv_if_error" => "Dopolnite ali odstranite pogoj!", "srv_export_spss" => "Izvozi v spss", - "srv_export_excel" => "Izvozi v excel", + "srv_export_excel" => "Izvozi v Excel", "srv_export_txt" => "Izvozi v tekstovno datoteko", "srv_expaned_text" => "Priporočamo vam tudi uporabo skrčenega pogleda", "srv_library_q_added" => "Vprašanje uspešno dodano v knjižnico!", diff --git a/lang/2.php b/lang/2.php index 510aada8e..278aad624 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4076,6 +4076,9 @@ $lang = array ( "srv_survey_archives_ie_data_title" => "Survey and data import / export", "srv_survey_archives_tracking" => "Changes", "srv_survey_archives_tracking_survey" => "Survey changes", + "srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes to the survey.", + "srv_survey_archives_tracking_survey_text2" => "To see all the changes, download the", + "srv_survey_archives_tracking_survey_text3" => "Excel file", "srv_survey_archives_tracking_data" => "Data changes", "srv_survey_archives_tracking_append" => "Append/Merge (imports)", "srv_survey_archives_tracking_hierarchy" => "Changes in self-evaluation in schools", @@ -5532,7 +5535,7 @@ $lang = array ( "srv_data_delete_not_selected" => "You have not selected respondent!", "srv_if_error" => "Edit or remove condition!", "srv_export_spss" => "Export to spss", - "srv_export_excel" => "Export to excel", + "srv_export_excel" => "Export to Excel", "srv_export_txt" => "Export to text file", "srv_expaned_text" => "We recommend switching to collapsed view", "srv_library_q_added" => "Question added to library!", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index d1c02e3d1..012bdc7ee 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5196,6 +5196,10 @@ span.faicon.ultra_dark_gray, a.faicon.ultra_dark_gray { color: #555555; } +span.faicon.green, +a.faicon.green { + color: #00C437; +} span.faicon.fa-stack, a.faicon.fa-stack { height: 1em; @@ -10940,6 +10944,11 @@ and open the template in the editor. border-bottom: 1px #D3D3D3 solid; } +div.izvoz_nad_tabelo { + display: flex; + justify-content: flex-end; +} + /* Branching ikone, radio, checkboxi... */ @@ -14147,16 +14156,15 @@ div #user_info_segment .user_info { div #user_info_segment .user_info.text { margin-right: 50px; } -div .myprofile_postget_wrap { +div .postget_wrap { max-width: 320px; - min-width: 320px; overflow-wrap: break-word; white-space: normal; padding: 8px 0px; font-family: "Courier"; font-size: 12px; } -div .myprofile_date_wrap { +div .no_wrap { width: auto; white-space: nowrap; } diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss index 15503c997..1d9e36bd6 100644 --- a/resources/sass/admin_new/basic/colors.scss +++ b/resources/sass/admin_new/basic/colors.scss @@ -22,5 +22,6 @@ $light-gray: #F8F8F8; $yellow: #FFC700; $red: #FF0000; $light-red: #FFEFEF; +$green: #00C437; $light-green: #a8eea8; diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss index 3a3351e6b..8fb1f4573 100644 --- a/resources/sass/admin_new/basic/icons/icons.scss +++ b/resources/sass/admin_new/basic/icons/icons.scss @@ -52,6 +52,9 @@ a.faicon{ &.ultra_dark_gray { color: $ultra-dark-gray; } + &.green { + color: $green; + } //STACKING &.fa-stack { diff --git a/resources/sass/admin_new/pages/my_surveys/archives.scss b/resources/sass/admin_new/pages/my_surveys/archives.scss new file mode 100644 index 000000000..d51b847b3 --- /dev/null +++ b/resources/sass/admin_new/pages/my_surveys/archives.scss @@ -0,0 +1,4 @@ +div.izvoz_nad_tabelo { + display:flex; + justify-content: flex-end; +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss index ef918e580..a2392ebc9 100644 --- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss +++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss @@ -1,3 +1,4 @@ @import "top_buttons"; @import "top_filters"; -@import "survey_list"; \ No newline at end of file +@import "survey_list"; +@import "archives"; diff --git a/resources/sass/admin_new/pages/settings/moj_profil.scss b/resources/sass/admin_new/pages/settings/moj_profil.scss index 7e9329d1c..a5e7b8339 100644 --- a/resources/sass/admin_new/pages/settings/moj_profil.scss +++ b/resources/sass/admin_new/pages/settings/moj_profil.scss @@ -31,9 +31,8 @@ div { } - .myprofile_postget_wrap { + .postget_wrap { max-width: 320px; - min-width: 320px; overflow-wrap: break-word; white-space: normal; padding: 8px 0px; @@ -42,7 +41,7 @@ div { font-size: 12px; } - .myprofile_date_wrap { + .no_wrap { width: auto; white-space: nowrap; } From 9160e771511bbb475ad5b6fbbe9b84d78baa7f1e Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 16:06:20 +0100 Subject: [PATCH 03/10] [Redizajn 1KA] - Urejanje --> Arhiv --> Spremembe --> Spremembe podatkov - v1 --- .../survey/classes/tracking/TrackingClass.php | 202 ++++++++++-------- lang/1.php | 6 +- lang/2.php | 6 +- 3 files changed, 124 insertions(+), 90 deletions(-) diff --git a/admin/survey/classes/tracking/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php index d3721f110..1e344ff0f 100644 --- a/admin/survey/classes/tracking/TrackingClass.php +++ b/admin/survey/classes/tracking/TrackingClass.php @@ -120,15 +120,6 @@ class TrackingClass echo '
'; echo '' . $lang['srv_survey_archives_tracking_' . $this->sub] . ''; - echo '

'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

'; - - // Izvoz v Excel - echo '
'; - echo ''.$lang['srv_export_excel'].''; - echo '
'; - - echo '
' . datetime($row['datetime']) . '
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '' . $row['ip'] . '' . $recnum . '' . $row['get'] . '' . $row['post'] . '
' . $row['get'] . '
' . $row['post'] . '
' . $lang['date'] . 'User' . $lang['user'] . 'IPPodstranGET
' . datetime($row['datetime']) . '' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $statuses[$row['status']] . '' . $row['get'] . '' . $row['post'] . '
' . $row['get'] . '
' . $row['post'] . '
' . datetime($row['datetime']) . '
' . datetime($row['datetime']) . '
' . $row['ip'] . '
' . $row['get'] . '
' . $row['post'] . '
' . $row['get'] . '
' . $row['post'] . '
'; - // Tabela s podatki o spremembah podatkov if ($this->sub == 'data') { @@ -141,74 +132,96 @@ class TrackingClass OR (`get` LIKE \'%urejanje: "1"%\' AND status=\'4\') )'; - // Prva vrstica - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; - + // Vrstice s podatki $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); - while ($row = mysqli_fetch_array($sql)) { + + if(!empty(mysqli_fetch_array($sql))) { + + echo '

'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1b'].' \''.$lang['navigation_NAVI_RESULTS'].'\' - \''.$lang['navigation_NAVI_DATA'].'\' '.$lang['srv_survey_archives_tracking_survey_text1c'].'. '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

'; + + // Izvoz v Excel + echo '
'; + echo ''.$lang['srv_export_excel'].''; + echo '
'; + + echo '
' . $lang['date'] . 'UserIPRecnumGETPOST
'; + // Prva vrstica echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ''; - $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); - $rowu = mysqli_fetch_array($sqlu); + $count = 0; + while ($row = mysqli_fetch_array($sql)) { + echo ' 24 ? 'class="displayNone"' : '').'>'; - // Pri podatkih dobimo posebej podatke o editiranem respondentu - $usr_id = ''; - $cookie = ''; + $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); + $rowu = mysqli_fetch_array($sqlu); - // Preverimo ce imamo usr_id v GET-u - $get_array_temp = explode(', ', $row['get']); - foreach ($get_array_temp AS $get_val) { - $param = explode(': ', $get_val); - $get_array[$param[0]] = $param[1]; - } + // Pri podatkih dobimo posebej podatke o editiranem respondentu + $usr_id = ''; + $cookie = ''; - if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') { - $usr_id = trim($get_array['usr_id'], '"'); - } // Preverimo ce iammo slucajno cookie - elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') { - $cookie = trim($get_array['survey-' . $this->anketa], '"'); - } else { - // Preverimo ce imamo usr_id v POST-u - $post_array_temp = explode(', ', $row['post']); - foreach ($post_array_temp AS $post_val) { - $param = explode(': ', $post_val); - $post_array[$param[0]] = $param[1]; + // Preverimo ce imamo usr_id v GET-u + $get_array_temp = explode(', ', $row['get']); + foreach ($get_array_temp AS $get_val) { + $param = explode(': ', $get_val); + $get_array[$param[0]] = $param[1]; } - if (isset($post_array['usr_id']) && $post_array['usr_id'] != '') - $usr_id = trim($post_array['usr_id'], '"'); + if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') { + $usr_id = trim($get_array['usr_id'], '"'); + } // Preverimo ce iammo slucajno cookie + elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') { + $cookie = trim($get_array['survey-' . $this->anketa], '"'); + } else { + // Preverimo ce imamo usr_id v POST-u + $post_array_temp = explode(', ', $row['post']); + foreach ($post_array_temp AS $post_val) { + $param = explode(': ', $post_val); + $post_array[$param[0]] = $param[1]; + } + + if (isset($post_array['usr_id']) && $post_array['usr_id'] != '') + $usr_id = trim($post_array['usr_id'], '"'); + } + + if ($usr_id != '') { + $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'"); + $rowR = mysqli_fetch_array($sqlR); + + $recnum = $rowR['recnum']; + } elseif ($cookie != '') { + $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'"); + $rowR = mysqli_fetch_array($sqlR); + + $recnum = $rowR['recnum']; + } else + $recnum = 0; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo ''; + + $count++; } - - if ($usr_id != '') { - $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'"); - $rowR = mysqli_fetch_array($sqlR); - - $recnum = $rowR['recnum']; - } elseif ($cookie != '') { - $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'"); - $rowR = mysqli_fetch_array($sqlR); - - $recnum = $rowR['recnum']; - } else - $recnum = 0; - - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - - echo ''; } + else { + echo '

'.ucfirst($lang['srv_survey_archives_tracking_survey_text1b']).' \''.$lang['navigation_NAVI_RESULTS'].'\' - \''.$lang['navigation_NAVI_DATA'].'\' '.$lang['srv_survey_archives_tracking_survey_text1d'].'.

'; + + } + + } // Tabela s podatki o spremembah - vse oz. merge/append else { @@ -233,34 +246,47 @@ class TrackingClass else $appendMerge = ""; - // Prva vrstica - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; // Vrstice s podatki $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); - $count = 0; - while ($row = mysqli_fetch_array($sql)) { - echo ' 24 ? 'class="displayNone"' : '').'>'; + + if(!empty(mysqli_fetch_array($sql))) { - $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); - $rowu = mysqli_fetch_array($sqlu); - - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; + echo '

'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].'. '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

'; + // Izvoz v Excel + echo '
'; + echo ''.$lang['srv_export_excel'].''; + echo '
'; + + echo '
' . $lang['date'] . '' . $lang['user'] . 'IPRespondentGETPOST
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $recnum . '
' . $row['get'] . '
' . $row['post'] . '
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '' . $row['ip'] . '' . $recnum . '
' . $row['get'] . '
' . $row['post'] . '
' . $lang['date'] . '' . $lang['user'] . 'IPPodstranGETPOST
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $statuses[$row['status']] . '
' . $row['get'] . '
' . $row['post'] . '
'; + // Prva vrstica + echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ''; - $count++; + + $count = 0; + while ($row = mysqli_fetch_array($sql)) { + echo ' 24 ? 'class="displayNone"' : '').'>'; + + $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); + $rowu = mysqli_fetch_array($sqlu); + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo ''; + $count++; + } } } diff --git a/lang/1.php b/lang/1.php index a942ca45f..10c9932f7 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4095,7 +4095,11 @@ $lang = array ( "srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov", "srv_survey_archives_tracking" => "Spremembe", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", - "srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb v vprašalniku.", + "srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb", + "srv_survey_archives_tracking_survey_text1a" => "v vprašalniku", + "srv_survey_archives_tracking_survey_text1b" => "v zavihku", + "srv_survey_archives_tracking_survey_text1c" => "za vprašalnik", + "srv_survey_archives_tracking_survey_text1d" => "še ni bilo sprememb", "srv_survey_archives_tracking_survey_text2" => "Za vpogled v vse spremembe prenesite", "srv_survey_archives_tracking_survey_text3" => "Excel datoteko", "srv_survey_archives_tracking_data" => "Spremembe podatkov", diff --git a/lang/2.php b/lang/2.php index 278aad624..4de179873 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4076,7 +4076,11 @@ $lang = array ( "srv_survey_archives_ie_data_title" => "Survey and data import / export", "srv_survey_archives_tracking" => "Changes", "srv_survey_archives_tracking_survey" => "Survey changes", - "srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes to the survey.", + "srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes", + "srv_survey_archives_tracking_survey_text1a" => "to the survey", + "srv_survey_archives_tracking_survey_text1b" => "on the page", + "srv_survey_archives_tracking_survey_text1c" => "for the survey", + "srv_survey_archives_tracking_survey_text1d" => "there haven't been any changes yet.", "srv_survey_archives_tracking_survey_text2" => "To see all the changes, download the", "srv_survey_archives_tracking_survey_text3" => "Excel file", "srv_survey_archives_tracking_data" => "Data changes", From 66e0025d2105ecfda63c83f618c6e5397d786178 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 16:52:14 +0100 Subject: [PATCH 04/10] =?UTF-8?q?[Redizajn=201KA]=20-=20Urejanje=20-->=20A?= =?UTF-8?q?rhiv=20-->=20Spremembe=20-->=20Spremembe=20vpra=C5=A1alnika=20-?= =?UTF-8?q?=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/classes/tracking/TrackingClass.php | 14 +++++++------- public/css/admin_new.css | 1 - .../sass/admin_new/pages/settings/moj_profil.scss | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/admin/survey/classes/tracking/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php index 1e344ff0f..9d816ac00 100644 --- a/admin/survey/classes/tracking/TrackingClass.php +++ b/admin/survey/classes/tracking/TrackingClass.php @@ -150,8 +150,8 @@ class TrackingClass echo ''; echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; echo ' '; echo ''; @@ -206,7 +206,7 @@ class TrackingClass echo ' '; echo ' '; - echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; @@ -264,8 +264,8 @@ class TrackingClass echo ''; echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; echo ' '; echo ''; @@ -279,8 +279,8 @@ class TrackingClass echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; echo ' '; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 012bdc7ee..ea530c54e 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -14160,7 +14160,6 @@ div .postget_wrap { max-width: 320px; overflow-wrap: break-word; white-space: normal; - padding: 8px 0px; font-family: "Courier"; font-size: 12px; } diff --git a/resources/sass/admin_new/pages/settings/moj_profil.scss b/resources/sass/admin_new/pages/settings/moj_profil.scss index a5e7b8339..bcf430881 100644 --- a/resources/sass/admin_new/pages/settings/moj_profil.scss +++ b/resources/sass/admin_new/pages/settings/moj_profil.scss @@ -35,7 +35,6 @@ div { max-width: 320px; overflow-wrap: break-word; white-space: normal; - padding: 8px 0px; font-family: "Courier"; font-size: 12px; From 34f4b7105fe43ec0bdd879eb1c393b8f8edbe0b1 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 22:11:34 +0100 Subject: [PATCH 05/10] [Redizajn 1KA] - Podatki --> Izvoz --> SPSS Syntax - v1 --- admin/survey/SurveyAdmin.php | 4 +- admin/survey/SurveyAdminSettings.php | 48 +++++++++++++++++-- lang/1.php | 27 ++++++++--- lang/2.php | 25 ++++++++-- public/css/admin_new.css | 14 ++++++ .../pages/my_surveys/import_export.scss | 20 ++++++++ .../pages/my_surveys/my_surveys.scss | 2 + 7 files changed, 124 insertions(+), 16 deletions(-) create mode 100644 resources/sass/admin_new/pages/my_surveys/import_export.scss diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 5bf35d840..908aa9c39 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3019,7 +3019,9 @@ class SurveyAdmin $_GET['m'] = M_EXPORT_SPSS; } - echo '
    '; + echo '
      '; + + echo ''.$lang['srv_survey_archives'].''; # SPSS echo '
    • '; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index a8167e483..9893fe764 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4633,7 +4633,7 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
      '; + /**echo '
      '; echo '
        '; if($_GET['m'] != 'export_PDF'){ @@ -4657,7 +4657,7 @@ class SurveyAdminSettings { SurveyTimeProfiles::DisplayLink(false,true); echo '
      '; - echo '
      '; + echo '
      ';**/ //----- zakomentirano, ker se je pri izvotih prikazovalo dvojno @TG if($_GET['m'] != 'export_PDF'){ @@ -4745,8 +4745,48 @@ class SurveyAdminSettings { elseif ($_GET['m'] == M_EXPORT_SPSS) { echo '
      '.$lang['srv_lnk_spss'].''; - echo $lang['srv_izvoz_SPSS_faq']; - echo $lang['srv_izvoz_SPSS_note']; + echo '

      '.$lang['srv_izvoz_SPSS_faq'].'

      '; + echo '

      '.$lang['srv_izvoz_SPSS_note'].'

      '; + + + echo '

      '.$lang['srv_izvoz_step1'].'

      '; + echo '
      '; + echo '

      '.$lang['srv_izvoz_step1_SPSS'].'

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

      '.$lang['srv_izvoz_step2'].'

      '; + echo '
      '; + echo '

      '.$lang['srv_izvoz_step2a_SPSS'].'

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

      '.$lang['srv_izvoz_step2b_SPSS'].'

      '; + echo '
      '; + + echo '

      '.$lang['srv_izvoz_step3'].'

      '; + echo '
      '; + echo '
        '; + echo '
      • '.$lang['srv_izvoz_step3a_SPSS'].'
        • '; + echo '
      • '.$lang['srv_izvoz_step3b_SPSS'].'
        • '; + echo '
      • '.$lang['srv_izvoz_step3c_SPSS'].'
        • '; + echo '
      '; + echo '
      '; + + echo '

      '.$lang['srv_izvoz_step4'].'

      '; + echo '
      '; + echo '

      '.$lang['srv_izvoz_step4_SPSS'].'

      '; + echo '
      '; + + echo '

      '.$lang['srv_izvoz_step5'].'

      '; + echo '
      '; + echo '

      '.$lang['srv_izvoz_step5_SPSS'].'

      '; + echo '
      '; + + + echo '
      '; } elseif ($_GET['m'] == M_EXPORT_SAV) { diff --git a/lang/1.php b/lang/1.php index 10c9932f7..8f082f483 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1573,17 +1573,32 @@ $lang = array ( "srv_lnk_PDF/RTF" => "Zaporedni izpis vseh respodentov", "srv_lnk_txt" => "Tekstovna datoteka", "srv_lnk_data_view" => "Pregled", - "srv_lnk_data_edit" => "Urejanje", + "srv_lnk_data_edit" => "Urejanje", + "srv_izvoz_step1" => "1. korak:", + "srv_izvoz_step2" => "2. korak:", + "srv_izvoz_step3" => "3. korak:", + "srv_izvoz_step4" => "4. korak:", + "srv_izvoz_step5" => "5. korak:", "srv_izvoz_Excel_xls_note" => "

      Podatke v Excel (xls) izvozite s klikom na ukaz \"Izvoz v Excel\".

      V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.

      ", "srv_izvoz_Excel_xls_note_2" => "

      Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči Težave pri izvozu v Excel.

      ", "srv_izvoz_Excel_note" => "

      Podatke v CSV (comma separated values) izvozite s klikom na ukaz \"Izvoz v CSV\".

      V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.

      ", "srv_izvoz_Excel_note_2" => "

      Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči Težave pri izvozu v Excel.

      ", "srv_izvoz_Excel_settings" => "Nastavitve", - "srv_izvoz_SPSS_note" => "

      Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:

      1. korak:
      Naprej s klikom spodaj shranimo datoteko v izbrano mapo:
      Datoteka s podatki (.txt)

      2. korak:
      Nato v isto mapo shranimo še datoteko s sintakso:
      Datoteka s sintakso (.sps)
      Z dvojnim klikom na datoteko sedaj odpremo sintakso v programu SPSS/PASW.

      3. korak:
      V odprti datoteki s sintakso poiščemo DATA LIST vrstico (»primer: DATA LIST FILE=\"C:\anketa_podatki.txt\"«).
      Da bi povezali sintakso in podatke, namesto »C:« vpišemo lokacijo naše datoteke s podatki (zgled: če smo podatke shranili npr. v mapo Prenosi znotraj My Documents: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\").
       
      Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties)- Mesto (Location) in to lokacijo vpišemo namesto »C:«.

      4. korak:
      Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko – bazo podatkov (.sav), ki jo lahko shranimo.

      5. korak:
      Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo Range plus one optional discrete missing value; Low: -99; High: -1; v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:
        (-1) Ni odgovoril
        (-2) Preskok (if)
        (-3) Prekinjeno
        (-4) Naknadno vprašanje
        (-97) Neustrezno
        (-98) Zavrnil
        (-99) Ne vem.

      ", - "srv_izvoz_txt_note" => "

      Podatke lahko izvozite tudi v tekstovno ASCII datoteko

      ", - "srv_izvoz_SPSS_complex_note" => "

      Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.

      ", - "srv_izvoz_SPSS_faq" => "

      V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. Posebej priporočamo pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v FAQ. V primeru težav kontaktirajte Pomoč uporabnikom.

      ", - "srv_izvoz_SAV_note" => "

      Podatke v SPSS (SAV) izvozite s klikom na ukaz \"Izvoz v SPSS (SAV)\".

      Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov.

      Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.
      Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).

      ", + "srv_izvoz_SPSS_note" => "Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:", + "srv_izvoz_step1_SPSS" => "Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:", + "srv_izvoz_step1_SPSS_file" => "Datoteka s podatki TXT", + "srv_izvoz_step2a_SPSS" => "Nato v isto mapo shranimo še datoteko s sintakso (format .sps):", + "srv_izvoz_step2b_SPSS" => "Nato z dvojnim klikom na datoteko odpremo sintakso v programu SPSS/PASW.", + "srv_izvoz_step2_SPSS_file" => "Datoteka s sintakso SPS", + "srv_izvoz_step3a_SPSS" => "V datoteki s sintakso poiščemo DATA LIST vrstico (primer: »DATA LIST FILE=\C:\anketa_podatki.txt\"«).", + "srv_izvoz_step3b_SPSS" => "Za povezavo sintakse in podatkov namesto »C:« vpišemo natančno lokacijo naše datoteke s podatki (primer: Če smo podatke shranili v mapo 'Prenosi', ki se nahaja v mapi 'My Documents' vpišemo naslednje: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\").", + "srv_izvoz_step3c_SPSS" => "Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: Uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties) - Mesto (Location) in to lokacijo vpišemo namesto »C:«.", + "srv_izvoz_step4_SPSS" => "Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko - bazo podatkov (.sav), ki jo lahko shranimo.", + "srv_izvoz_step5_SPSS" => "Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo 'Range plus one optional discrete missing value; Low: -99; High: -1;' v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:
      (-1) Ni odgovoril
      (-2) Preskok (if)
      (-3) Prekinjeno
      (-4) Naknadno vprašanje
      (-97) Neustrezno
      (-98) Zavrnil
      (-99) Ne vem.", + "srv_izvoz_txt_note" => "Podatke lahko izvozite tudi v tekstovno ASCII datoteko", + "srv_izvoz_SPSS_complex_note" => "Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.", + "srv_izvoz_SPSS_faq" => "V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku Izvoz v SPSS. V primeru težav kontaktirajte Pomoč uporabnikom.", + "srv_izvoz_SAV_note" => "Podatke v SPSS (SAV) izvozite s klikom na ukaz \"Izvoz v SPSS (SAV)\".

      Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov.

      Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.
      Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).", "s_sortby_A" => "Sortiraj po ", "s_sortby_B" => "času", "s_sortby_C" => " / ", diff --git a/lang/2.php b/lang/2.php index 4de179873..60469934d 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1562,16 +1562,31 @@ $lang = array ( "srv_lnk_txt" => "Text file", "srv_lnk_data_view" => "Preview", "srv_lnk_data_edit" => "Editing", + "srv_izvoz_step1" => "Step 1:", + "srv_izvoz_step2" => "Step 2:", + "srv_izvoz_step3" => "Step 3:", + "srv_izvoz_step4" => "Step 4:", + "srv_izvoz_step5" => "Step 5:", "srv_izvoz_Excel_xls_note" => "

      Export data to Excel (xls) by clicking on the \"Export to Excel\" option.

      Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.

      ", "srv_izvoz_Excel_xls_note_2" => "

      Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this manual.

      ", "srv_izvoz_Excel_note" => "

      Export data to CSV (comma separated values) by clicking on the \"Export to CSV\" option.

      Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.

      ", "srv_izvoz_Excel_note_2" => "

      Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this manual.

      ", "srv_izvoz_Excel_settings" => "Settings", - "srv_izvoz_SPSS_note" => "

      Data can be exported to SPSS/PASW by following five short steps:

      1. step:
      Click on the link below and save the file into selected folder:
      Data file (.txt)

      2. step:
      Next, save the syntax file into the same folder:
      SPSS syntax file (.sps)
      Open the syntax file in the SPSS/PASW syntax editor.

      3. step:
      In the opened syntax file find the line beginning with DATA LIST (»example: DATA LIST FILE=\"C:\anketa_podatki.txt\"«).
      To link syntax and data, replace »C:« with location of the data file (example: if we exported data into Downloads folder within My Documents, the line will be: DATA LIST FILE=\"C:\My Documents\Downloads\anketa_podatki.txt\").
       
      The exact location of the data file can be find by clicking the right mouse button on the data file; in the menu that appears select Properties - Location and replace »C:« with this location.

      4. step:
      Run the syntax file by selecting Run menu in the syntax editor and then Run All. This will create an SPSS/PASW data file that can be saved in native SPSS format (.sav).

      5. step:
      After export we can define missing values. In SPSS/PASW we open the Variable View, find the column Missing and select Range plus one optional discrete missing value; Low: -99; High: -1; Default missing values in 1KA are:
        (-1) Not answered
        (-2) Skipped (condition)
        (-3) Drop-out
        (-4) Subsequently added question
        (-97) Not applicable
        (-98) Refused
        (-99) Don’t know.

      ", - "srv_izvoz_txt_note" => "

      Data can be exported in text ASCII file

      ", - "srv_izvoz_SPSS_complex_note" => "

      If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.

      ", - "srv_izvoz_SPSS_faq" => "

      In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. Specifically recommended for multiple tables. You can find more information about SPSS exports in MANUAL. In case of any problems please contact Help center.

      ", - "srv_izvoz_SAV_note" => "

      Export data in SPSS (SAV) by clicking the command \"Export to SPSS (SAV)\".

      If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).

      ", + "srv_izvoz_SPSS_note" => "Data can be exported to SPSS/PASW by following five short steps:", + "srv_izvoz_step1_SPSS" => "Click on the button below and save the file (.txt format) into the selected folder:", + "srv_izvoz_step1_SPSS_file" => "TXT data file", + "srv_izvoz_step2a_SPSS" => "Next, save the syntax file (.sps format) into the same folder:", + "srv_izvoz_step2b_SPSS" => "Open the syntax file in the SPSS/PASW syntax editor.", + "srv_izvoz_step2_SPSS_file" => "SPS syntax file", + "srv_izvoz_step3a_SPSS" => "In the opened syntax file, find the line beginning with DATA LIST (»example: DATA LIST FILE=\"C:\anketa_podatki.txt\"«).", + "srv_izvoz_step3b_SPSS" => "To link syntax and data, replace »C:« with location of the data file (example: if we exported data into the 'Downloads' folder within 'My Documents', the line will be: DATA LIST FILE=\"C:\My Documents\Downloads\anketa_podatki.txt\").", + "srv_izvoz_step3c_SPSS" => "The exact location of the data file can be find by clicking the right mouse button on the data file; in the menu that appears select 'Properties' - 'Location' and replace »C:« with this location.", + "srv_izvoz_step4_SPSS" => "Run the syntax file by selecting Run menu in the syntax editor and then Run All. This will create an SPSS/PASW data file that can be saved in native SPSS format (.sav).", + "srv_izvoz_step5_SPSS" => "After export we can define missing values. In SPSS/PASW we open the Variable View, find the column Missing and select 'Range plus one optional discrete missing value; Low: -99; High: -1.' Default missing values in 1KA are:
      (-1) Not answered
      (-2) Skipped (condition)
      (-3) Drop-out
      (-4) Subsequently added question
      (-97) Not applicable
      (-98) Refused
      (-99) Don't know.", + "srv_izvoz_txt_note" => "Data can be exported in text ASCII file", + "srv_izvoz_SPSS_complex_note" => "If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.", + "srv_izvoz_SPSS_faq" => "In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. We specifically recommended for multiple tables. You can find more information about SPSS exports in the SPSS Export manual. In case of any problems please contact Help center.", + "srv_izvoz_SAV_note" => "Export data in SPSS (SAV) by clicking the command \"Export to SPSS (SAV)\".

      If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).", "s_sortby_A" => "Sort by ", "s_sortby_B" => "date", "s_sortby_C" => " / ", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index ea530c54e..27bd40597 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10949,6 +10949,20 @@ div.izvoz_nad_tabelo { justify-content: flex-end; } +div.export_indent { + margin: 4px 0 16px 16px; +} +div.button_holder { + margin: 16px 0 0 0; +} + +li.no_bullet { + list-style-type: none; +} +li.top16 { + margin-top: 16px; +} + /* Branching ikone, radio, checkboxi... */ diff --git a/resources/sass/admin_new/pages/my_surveys/import_export.scss b/resources/sass/admin_new/pages/my_surveys/import_export.scss new file mode 100644 index 000000000..a26991bda --- /dev/null +++ b/resources/sass/admin_new/pages/my_surveys/import_export.scss @@ -0,0 +1,20 @@ +div { + + &.export_indent{ + margin: 4px 0 16px 16px; + } + + &.button_holder { + margin: 16px 0 0 0; + } +} + +li{ + &.no_bullet { + list-style-type: none; + } + + &.top16 { + margin-top: 16px; + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss index a2392ebc9..a3608e376 100644 --- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss +++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss @@ -1,4 +1,6 @@ @import "top_buttons"; @import "top_filters"; @import "survey_list"; + @import "archives"; +@import "import_export"; From 1d53a452212e74b6a3ed449d7cd343a1e59e6e43 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 22:18:23 +0100 Subject: [PATCH 06/10] [Redizajn 1KA] - Podatki --> Izvoz --> Tekstovna datoteka TXT - v1 --- admin/survey/SurveyAdminSettings.php | 6 +++++- lang/1.php | 3 ++- lang/2.php | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 9893fe764..65dc5d6c1 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4798,7 +4798,11 @@ class SurveyAdminSettings { elseif ($_GET['m'] == M_EXPORT_TXT) { echo '

      '.$lang['srv_lnk_txt'].''; - echo $lang['srv_izvoz_txt_note']; + echo $lang['srv_izvoz_txt_note']; + echo '
      '; + echo ''; + echo '
      '; + echo '
      '; } elseif ($_GET['m'] == 'export_PDF') { diff --git a/lang/1.php b/lang/1.php index 8f082f483..26b5a13a2 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1595,7 +1595,8 @@ $lang = array ( "srv_izvoz_step3c_SPSS" => "Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: Uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties) - Mesto (Location) in to lokacijo vpišemo namesto »C:«.", "srv_izvoz_step4_SPSS" => "Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko - bazo podatkov (.sav), ki jo lahko shranimo.", "srv_izvoz_step5_SPSS" => "Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo 'Range plus one optional discrete missing value; Low: -99; High: -1;' v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:
      (-1) Ni odgovoril
      (-2) Preskok (if)
      (-3) Prekinjeno
      (-4) Naknadno vprašanje
      (-97) Neustrezno
      (-98) Zavrnil
      (-99) Ne vem.", - "srv_izvoz_txt_note" => "Podatke lahko izvozite tudi v tekstovno ASCII datoteko", + "srv_izvoz_txt_note" => "Podatke lahko izvozite v tekstovno ASCII datoteko s klikom na spodnji ukaz:", + "srv_izvoz_txt_file" => "Izvoz v tekstovno datoteko", "srv_izvoz_SPSS_complex_note" => "Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.", "srv_izvoz_SPSS_faq" => "V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku Izvoz v SPSS. V primeru težav kontaktirajte Pomoč uporabnikom.", "srv_izvoz_SAV_note" => "Podatke v SPSS (SAV) izvozite s klikom na ukaz \"Izvoz v SPSS (SAV)\".

      Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov.

      Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.
      Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).", diff --git a/lang/2.php b/lang/2.php index 60469934d..ccc460939 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1583,7 +1583,8 @@ $lang = array ( "srv_izvoz_step3c_SPSS" => "The exact location of the data file can be find by clicking the right mouse button on the data file; in the menu that appears select 'Properties' - 'Location' and replace »C:« with this location.", "srv_izvoz_step4_SPSS" => "Run the syntax file by selecting Run menu in the syntax editor and then Run All. This will create an SPSS/PASW data file that can be saved in native SPSS format (.sav).", "srv_izvoz_step5_SPSS" => "After export we can define missing values. In SPSS/PASW we open the Variable View, find the column Missing and select 'Range plus one optional discrete missing value; Low: -99; High: -1.' Default missing values in 1KA are:
      (-1) Not answered
      (-2) Skipped (condition)
      (-3) Drop-out
      (-4) Subsequently added question
      (-97) Not applicable
      (-98) Refused
      (-99) Don't know.", - "srv_izvoz_txt_note" => "Data can be exported in text ASCII file", + "srv_izvoz_txt_note" => "Data can be exported in a text ASCII file by clicking the button below:", + "srv_izvoz_txt_file" => "Text file export", "srv_izvoz_SPSS_complex_note" => "If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.", "srv_izvoz_SPSS_faq" => "In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. We specifically recommended for multiple tables. You can find more information about SPSS exports in the SPSS Export manual. In case of any problems please contact Help center.", "srv_izvoz_SAV_note" => "Export data in SPSS (SAV) by clicking the command \"Export to SPSS (SAV)\".

      If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).", From 3606b27695f07ea475e4bdb6ac3be1e4e83c964c Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 22:42:58 +0100 Subject: [PATCH 07/10] [Redizajn 1KA] - Podatki --> Izvoz --> CSV - v1 --- admin/survey/SurveyAdminSettings.php | 39 ++++++++++++++++++++-------- admin/survey/script/script.js | 13 +++++++--- lang/1.php | 6 +++-- lang/2.php | 6 +++-- 4 files changed, 46 insertions(+), 18 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 65dc5d6c1..8d8745864 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4704,15 +4704,29 @@ class SurveyAdminSettings { echo '

      '.$lang['srv_lnk_excel'].''; - echo $lang['srv_izvoz_Excel_note']; - echo $lang['srv_izvoz_Excel_note_2']; + echo $lang['srv_izvoz_Excel_note_a']; + echo '
      '; + echo ''; + echo '
      '; + echo '

      '.$lang['srv_izvoz_Excel_note_b'].'

      '; - echo '

      '.$lang['srv_izvoz_Excel_settings'].'

      '; - echo '

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

      '; + echo '

      '.$lang['srv_izvoz_Excel_note_2'].'

      '; + + echo '
      '; + echo ''.$lang['srv_expor_excel_cell_delimiter'].''; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + + + echo '
      '; echo '

      '; echo '

      '; @@ -4728,10 +4742,13 @@ class SurveyAdminSettings { echo ''; echo '
      '; echo '

      '; + echo '
      '; - echo '

      '; - echo ''; - echo '

      '; + + echo '

      '; + echo ''; + echo ''; + echo '
      '; echo '
      '; diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 584fea6e8..2b3dc503f 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -3767,9 +3767,16 @@ function doExcelExport() { //return false; */ } -function excelExportChangeDelimit() { - $('#replace_export_delimit_semicolon').toggle(); - $('#replace_export_delimit_comma').toggle(); +function excelExportChangeDelimit($param) { + if ($param == 1) { + $('#replace_export_delimit_semicolon').removeClass('displayNone'); + $('#replace_export_delimit_comma').addClass('displayNone'); + } + else if ($param == 2) { + $('#replace_export_delimit_semicolon').addClass('displayNone'); + $('#replace_export_delimit_comma').removeClass('displayNone'); + } + return false; } diff --git a/lang/1.php b/lang/1.php index 26b5a13a2..860195d10 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1581,8 +1581,10 @@ $lang = array ( "srv_izvoz_step5" => "5. korak:", "srv_izvoz_Excel_xls_note" => "

      Podatke v Excel (xls) izvozite s klikom na ukaz \"Izvoz v Excel\".

      V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.

      ", "srv_izvoz_Excel_xls_note_2" => "

      Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči Težave pri izvozu v Excel.

      ", - "srv_izvoz_Excel_note" => "

      Podatke v CSV (comma separated values) izvozite s klikom na ukaz \"Izvoz v CSV\".

      V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.

      ", - "srv_izvoz_Excel_note_2" => "

      Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči Težave pri izvozu v Excel.

      ", + "srv_izvoz_Excel_note_a" => "Podatke v CSV (angl. comma separated values) izvozite s klikom na spodnji ukaz:", + "srv_izvoz_Excel_file" => "Izvoz v CSV", + "srv_izvoz_Excel_note_b" => "V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.", + "srv_izvoz_Excel_note_2" => "Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči Težave pri izvozu v Excel.", "srv_izvoz_Excel_settings" => "Nastavitve", "srv_izvoz_SPSS_note" => "Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:", "srv_izvoz_step1_SPSS" => "Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:", diff --git a/lang/2.php b/lang/2.php index ccc460939..7f813d3e1 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1569,8 +1569,10 @@ $lang = array ( "srv_izvoz_step5" => "Step 5:", "srv_izvoz_Excel_xls_note" => "

      Export data to Excel (xls) by clicking on the \"Export to Excel\" option.

      Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.

      ", "srv_izvoz_Excel_xls_note_2" => "

      Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this manual.

      ", - "srv_izvoz_Excel_note" => "

      Export data to CSV (comma separated values) by clicking on the \"Export to CSV\" option.

      Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.

      ", - "srv_izvoz_Excel_note_2" => "

      Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this manual.

      ", + "srv_izvoz_Excel_note_a" => "Export data to CSV (comma separated values) by clicking the button below:", + "srv_izvoz_Excel_file" => "CSV file export", + "srv_izvoz_Excel_note_b" => "Excel versions 2003 and older support the export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.", + "srv_izvoz_Excel_note_2" => "Warning! When exporting to Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this manual.", "srv_izvoz_Excel_settings" => "Settings", "srv_izvoz_SPSS_note" => "Data can be exported to SPSS/PASW by following five short steps:", "srv_izvoz_step1_SPSS" => "Click on the button below and save the file (.txt format) into the selected folder:", From ccf9f415c8a16b994a46cee60918501db809e9a8 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 23:09:45 +0100 Subject: [PATCH 08/10] [Redizajn 1KA] - Podatki --> Izvoz --> SPSS SAV - v1 --- admin/survey/SurveyAdminSettings.php | 7 ++++++- lang/1.php | 8 ++++++-- lang/2.php | 8 ++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 8d8745864..8d4d2b59c 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4809,7 +4809,12 @@ class SurveyAdminSettings { elseif ($_GET['m'] == M_EXPORT_SAV) { echo '
      '.$lang['srv_lnk_sav'].''; - echo $lang['srv_izvoz_SAV_note']; + echo $lang['srv_izvoz_SAV_note1']; + echo '
      '; + echo ''; + echo '
      '; + echo '

      '.$lang['srv_izvoz_SAV_note2a'].''.$lang['srv_izvoz_SAV_note2b'].''.$lang['srv_izvoz_SAV_note2c'].'

      '; + echo '
      '; } elseif ($_GET['m'] == M_EXPORT_TXT) { diff --git a/lang/1.php b/lang/1.php index 860195d10..5b95575ac 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1567,7 +1567,7 @@ $lang = array ( "export_all_excel" => "Izvozi vsa polja v Excel", "export_s_excel" => "Izvozi v Excel", "srv_lnk_excel" => "CSV", - "srv_lnk_excel_xls" => "Excel (xls)", + "srv_lnk_excel_xls" => "EXCEL (XLS)", "srv_lnk_spss" => "SPSS SYNTAX", "srv_lnk_sav" => "SPSS SAV", "srv_lnk_PDF/RTF" => "Zaporedni izpis vseh respodentov", @@ -1601,7 +1601,11 @@ $lang = array ( "srv_izvoz_txt_file" => "Izvoz v tekstovno datoteko", "srv_izvoz_SPSS_complex_note" => "Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.", "srv_izvoz_SPSS_faq" => "V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku Izvoz v SPSS. V primeru težav kontaktirajte Pomoč uporabnikom.", - "srv_izvoz_SAV_note" => "Podatke v SPSS (SAV) izvozite s klikom na ukaz \"Izvoz v SPSS (SAV)\".

      Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov.

      Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.
      Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).", + "srv_izvoz_SAV_note1" => "Podatke izvozite v SPSS SAV s klikom na spodnji ukaz:", + "srv_izvoz_SAV_file" => "Izvoz v SPSS SAV", + "srv_izvoz_SAV_note2a" => "Opozorilo! Izvoz ne omogoča izvoza label vrednosti odgovorov. Funkcionalnost je še v razvoju, zato so možne težave pri izvozu. Priporočamo uporabo ", + "srv_izvoz_SAV_note2b" => "izvoza SPSS SYNTAX", + "srv_izvoz_SAV_note2c" => ", ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).", "s_sortby_A" => "Sortiraj po ", "s_sortby_B" => "času", "s_sortby_C" => " / ", diff --git a/lang/2.php b/lang/2.php index 7f813d3e1..b95c69aab 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1555,7 +1555,7 @@ $lang = array ( "export_all_excel" => "Export all fields to Excel", "export_s_excel" => "Export to Excel", "srv_lnk_excel" => "CSV", - "srv_lnk_excel_xls" => "Excel (xls)", + "srv_lnk_excel_xls" => "EXCEL (XLS)", "srv_lnk_spss" => "SPSS SYNTAX", "srv_lnk_sav" => "SPSS SAV", "srv_lnk_PDF/RTF" => "Respondent results", @@ -1589,7 +1589,11 @@ $lang = array ( "srv_izvoz_txt_file" => "Text file export", "srv_izvoz_SPSS_complex_note" => "If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.", "srv_izvoz_SPSS_faq" => "In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. We specifically recommended for multiple tables. You can find more information about SPSS exports in the SPSS Export manual. In case of any problems please contact Help center.", - "srv_izvoz_SAV_note" => "Export data in SPSS (SAV) by clicking the command \"Export to SPSS (SAV)\".

      If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).", + "srv_izvoz_SAV_note1" => "Export data in SPSS (SAV) format by clicking the button below:", + "srv_izvoz_SAV_file" => "SPSS SAV export", + "srv_izvoz_SAV_note2a" => "Warning! This functionality does not support the export of answer value labels. If you encounter any problems, please use the ", + "srv_izvoz_SAV_note2b" => "SPSS SYNTAX export option", + "srv_izvoz_SAV_note2c" => ", which generates two separate files - syntax file (.SPS) and data file (.txt).", "s_sortby_A" => "Sort by ", "s_sortby_B" => "date", "s_sortby_C" => " / ", From cd43582961d9a5d046def96f525bf0f09b3590fb Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 23:12:51 +0100 Subject: [PATCH 09/10] [Redizajn 1KA] - Podatki --> Izvoz --> CSV - v2 --- admin/survey/SurveyAdminSettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 8d4d2b59c..e9e20704b 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4728,7 +4728,7 @@ class SurveyAdminSettings { echo '

      '; - echo '

      '; + /**echo '

      '; echo '

      '; echo ''; echo $lang['srv_export_replace1'].' '; @@ -4742,7 +4742,7 @@ class SurveyAdminSettings { echo ''; echo '
      '; echo '

      '; - echo '
      '; + echo ''**/ //zakomentirano - za odsranit nastavitev @TG echo '
      '; From f46d3225cbede458b53560faa930d74fed9aa2b4 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 13 Jan 2022 23:17:49 +0100 Subject: [PATCH 10/10] [Redizajn 1KA] - Podatki --> Izvoz --> SPSS Syntax - v2 --- admin/survey/SurveyAdmin.php | 24 ++++++++++++------------ admin/survey/SurveyAdminSettings.php | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 908aa9c39..9d3fa39b4 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3024,23 +3024,23 @@ class SurveyAdmin echo ''.$lang['srv_survey_archives'].''; # SPSS - echo '
    • '; + echo '
    • '; echo '' . $lang['srv_lnk_spss'] . '
      • '; # SPSS SAV - echo '
    • '; + echo '
    • '; echo '' . $lang['srv_lnk_sav'] . '
      • '; # EXCEL - XLS - echo '
    • '; + echo '
    • '; echo '' . $lang['srv_lnk_excel_xls'] . '
      • '; # EXCEL - CSV - echo '
    • '; + echo '
    • '; echo '' . $lang['srv_lnk_excel'] . '
      • '; # TXT - echo '
    • '; + echo '
    • '; echo '' . $lang['srv_lnk_txt'] . '
      • '; echo '
    '; @@ -3055,19 +3055,19 @@ class SurveyAdmin echo ''; @@ -3083,11 +3083,11 @@ class SurveyAdmin echo ''; @@ -3303,7 +3303,7 @@ class SurveyAdmin # Volitve global $mysql_database_name; if ($admin_type == 0 || $mysql_database_name == 'test1kasi') { - echo '
  • '; + echo '
  • '; echo 'checkUserAccess($what='voting') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . '
    • '; } diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index e9e20704b..dfbfb16e0 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -4770,7 +4770,7 @@ class SurveyAdminSettings { echo '
    '; echo '

    '.$lang['srv_izvoz_step1_SPSS'].'

    '; echo '
    '; - echo ''; + echo ''; echo '
    '; echo '
    '; @@ -4778,7 +4778,7 @@ class SurveyAdminSettings { echo '
    '; echo '

    '.$lang['srv_izvoz_step2a_SPSS'].'

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

    '.$lang['srv_izvoz_step2b_SPSS'].'

    '; echo '
    ';
' . $lang['date'] . '' . $lang['user'] . 'IPPodstranGETPOST
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $statuses[$row['status']] . '
' . $row['get'] . '
' . $row['post'] . '
' . $lang['date'] . '' . $lang['user'] . 'IPRespondentIPRespondentGETPOST
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $row['ip'] . '' . $recnum . '
' . $row['get'] . '
' . $row['post'] . '
' . $lang['date'] . '' . $lang['user'] . 'IPPodstranIPPodstranGETPOST
' . datetime($row['datetime']) . '
' . $rowu['name'] . ' ' . $rowu['surname'] . '
' . $row['ip'] . '' . $statuses[$row['status']] . '' . $row['ip'] . '' . $statuses[$row['status']] . '
' . $row['get'] . '
' . $row['post'] . '