From fa8a87b1ab4aa52f20b946198c621f37c3e39144 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Tue, 7 Jun 2022 02:00:04 +0200 Subject: [PATCH] [Redizajn 1KA] - Ni podatkov o izpolnjeni anketi - v1 --- admin/survey/classes/class.Common.php | 22 +++++- lang/1.php | 5 +- lang/2.php | 7 +- public/css/admin_new.css | 36 +++++++++ public/img/images/no_data.svg | 77 +++++++++++++++++++ .../admin_new/pages/survey_data/no_data.scss | 41 ++++++++++ .../pages/survey_data/survey_data.scss | 2 + 7 files changed, 186 insertions(+), 4 deletions(-) create mode 100644 public/img/images/no_data.svg create mode 100644 resources/sass/admin_new/pages/survey_data/no_data.scss diff --git a/admin/survey/classes/class.Common.php b/admin/survey/classes/class.Common.php index 1236203af..6024e10e9 100644 --- a/admin/survey/classes/class.Common.php +++ b/admin/survey/classes/class.Common.php @@ -2131,9 +2131,29 @@ class Common { // Izpise obvestilo, da ni podatkov static function noDataAlert() { global $lang; + global $anketa; echo '
'; - echo $lang['srv_data_no_data']; + + echo ''; + + echo '

'.$lang['srv_data_no_data'].'

'; + + echo '
'; + echo '

'.$lang['srv_data_no_data2'].'

'; + echo '
'; + + $auto = "'". 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki' . "'"; + $manual = "'". SurveyInfo::getSurveyLink() . '?preview=on' . "'"; + $share = "'". 'index.php?anketa='.$anketa.'&a=vabila' . "'"; + + echo '
'; + echo ''; + echo ''; + echo ''; + + echo '
'; + echo '
'; } diff --git a/lang/1.php b/lang/1.php index 143b4661a..10e9da554 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1907,6 +1907,7 @@ $lang = array ( "srv_anketa_is_not_active" => "NEAKTIVNA", "srv_anketa_is_finished" => "ZAKLJUČENA", "srv_anketa_href" => "HTML koda povezave", + "srv_anketa_share" => "Deli anketo z respondenti", "srv_anketa_href_text" => "Delite povezavo do ankete na vaši spletni strani.", "srv_anketa_href_count" => "HTML koda s števcem ogledov", "srv_anketa_href_count_text" => "Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ", @@ -4307,7 +4308,8 @@ $lang = array ( "srv_dashboard_new_units" => " Število nedodanih enot: ", "srv_dashboard_up_to_date" => "Datoteka s podatki je ažurna.", "srv_dashboard_paradata_date_warning" => "Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.", - "srv_data_no_data" => "V bazi ni podatkov o izpolnjenih anketah!", + "srv_data_no_data" => "V bazi še ni podatkov o izpolnjenih anketah!", + "srv_data_no_data2" => "Pridobite realne podatke in delite anketo s svojimi respondenti ali za vpogled v strani, ki za prikaz zahtevajo podatke uporabite testne podatke. ", "srv_data_no_data_filtred" => "Ni podatkov.", "srv_diferencial2" => "Tabela diferencial", "srv_classic" => "Klasična tabela", @@ -5346,6 +5348,7 @@ $lang = array ( "srv_testiranje_komentarji_anketa_title" => "Splošni komentarji", "srv_testiranje_komentarji_anketa_title2" => "Splošni komentarji na anketo", "srv_testiranje_vnosi" => "Avtomatski vnosi", + "srv_testiranje_vnosi2" => "Avtomatski testni vnos", "srv_testiranje_trajanje" => "Trajanje", "stopwords_explain_title" => "Omejevanje pogostih besed v iskalniku", "stopwords_explain_txt_a" => "Za večjo natančnost iskanih zadetkov, se pogoste besede pri iskanju znotraj vsebine zapisov (podstrani, novic, rubrik, priponk,..) ne upoštevajo.", diff --git a/lang/2.php b/lang/2.php index adfd9d70d..d0f901e70 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1900,6 +1900,7 @@ $lang = array ( "srv_anketa_is_not_active" => "NOT ACTIVE", "srv_anketa_is_finished" => "FINISHED", "srv_anketa_href" => "HTML code for link", + "srv_anketa_share" => "Share survey with respondents", "srv_anketa_href_text" => "Share the link to the survey on your website.", "srv_anketa_href_count" => "HTML code with view counter", "srv_anketa_href_count_text" => "Share the link to the survey on your website and keep track of the number of views of the survey link. ", @@ -4286,7 +4287,8 @@ $lang = array ( "srv_dashboard_new_units" => " Number of new units: ", "srv_dashboard_up_to_date" => "Data file is up to date.", "srv_dashboard_paradata_date_warning" => "Saving respondent dates (paradata) is turned off. Some statuses will not be displayed.", - "srv_data_no_data" => "There are no completed surveys!", + "srv_data_no_data" => "There are no completed surveys yet!", + "srv_data_no_data2" => "Get real data and share the survey with your respondents or use test data to see the pages that require data to be displayed.", "srv_data_no_data_filtred" => "No data", "srv_diferencial2" => "Semantic differential", "srv_classic" => "Classic table", @@ -5305,7 +5307,8 @@ $lang = array ( "srv_testiranje_diagnostika_lastnosti" => "Survey properties", "srv_testiranje_diagnostika_base" => "Base diagnostics", "srv_testiranje_komentarji" => "Comments", - "srv_testiranje_vnosi" => "Test responses", + "srv_testiranje_vnosi" => "Automatic responses", + "srv_testiranje_vnosi2" => "Automatic test response", "srv_testiranje_trajanje" => "Duration", "stopwords_explain_title" => "Restriction of common words in search", "stopwords_explain_txt_a" => "Common words are removed from search inside articles, web page content, attachments and other blocks of text.", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index ec2292bb6..22b39ba59 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -26779,6 +26779,42 @@ and open the template in the editor. width: 250px; } +div.no_data_alert { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; +} +div.no_data_alert img { + max-width: 466px; + margin-bottom: 32px; +} +div.no_data_alert h2 { + font-weight: 300; + font-size: 24px; + margin-block-start: 0; + margin-block-end: 0; + margin-bottom: 16px; +} +div.no_data_alert div#note { + max-width: 800px; + margin-bottom: 32px; + text-align: center; +} +div.no_data_alert div#buttons { + display: flex; + flex-direction: row; + gap: 32px; +} +div.no_data_alert div#buttons button::first-letter { + text-transform: uppercase; +} + +.printHide { + display: none !important; +} + #div_analiza_data:not(.anal_arch) .div_analiza_holder, #div_means_data .div_analiza_holder, #div_break_data .div_analiza_holder, diff --git a/public/img/images/no_data.svg b/public/img/images/no_data.svg new file mode 100644 index 000000000..73f374cbc --- /dev/null +++ b/public/img/images/no_data.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/sass/admin_new/pages/survey_data/no_data.scss b/resources/sass/admin_new/pages/survey_data/no_data.scss new file mode 100644 index 000000000..c38a9009a --- /dev/null +++ b/resources/sass/admin_new/pages/survey_data/no_data.scss @@ -0,0 +1,41 @@ +div.no_data_alert { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + + img { + max-width: 466px; + margin-bottom: 32px; + } + + h2 { + font-weight: $light; + font-size: 24px; + margin-block-start: 0; + margin-block-end: 0; + + margin-bottom: 16px; + } + + div#note { + max-width: 800px; + margin-bottom: 32px; + text-align: center; + } + + div#buttons { + display: flex; + flex-direction: row; + gap: 32px; + + button::first-letter { + text-transform: uppercase; + } + } +} + +.printHide{ + display: none !important; +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_data/survey_data.scss b/resources/sass/admin_new/pages/survey_data/survey_data.scss index 643002d25..9cdb38a02 100644 --- a/resources/sass/admin_new/pages/survey_data/survey_data.scss +++ b/resources/sass/admin_new/pages/survey_data/survey_data.scss @@ -10,3 +10,5 @@ @import "quick_list_data"; @import "popups/popups"; + +@import "no_data";