may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Ni podatkov o izpolnjeni anketi - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-06-09 06:59:39 +02:00
parent f08194e63c
commit c2464548b1
8 changed files with 145 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
admin/survey/classes/class.Common.php
View File

@ -2129,7 +2129,7 @@ class Common {
}
// Izpise obvestilo, da ni podatkov
static function noDataAlert() {
static function noDataAlert($location='') {
global $lang;
global $anketa;
@ -2137,20 +2137,43 @@ class Common {
echo '<img src="/public/img/images/no_data.svg" />';
echo '<h2>'.$lang['srv_data_no_data'].'</h2>';
if($location == 'status') {
echo '<h2>'.$lang['srv_dashboard_no_data'].'</h2>';
}
else {
echo '<h2>'.$lang['srv_data_no_data'].'</h2>';
}
echo '<div id="note">';
echo '<p>'.$lang['srv_data_no_data2'].'</p>';
if($location == 'status') {
echo '<p>'.$lang['srv_data_no_data3'].'</p>';
}
else {
echo '<p>'.$lang['srv_data_no_data2'].'</p>';
}
echo '</div>';
$auto = 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki';
$manual = SurveyInfo::getSurveyLink() . '?preview=on&testdata=on';
$share = 'index.php?anketa='.$anketa.'&amp;a=vabila';
if($location == 'status') {
$buttonA = 'index.php?anketa='.$anketa.'&a=branching'; //urejanje
$buttonB = 'index.php?anketa='.$anketa.'&a=testiranje'; //testiranje
$textA = $lang['edit2'];
$textB = $lang['srv_testiranje'];
$textC = $lang['srv_vabila'];
}
else {
$buttonA = 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki'; //avtomatski testni vnos
$buttonB = SurveyInfo::getSurveyLink() . '?preview=on&testdata=on'; //ročni testni vnos
$textA = $lang['srv_testiranje_vnosi2'];
$textB = $lang['srv_archive_test_data_text2a'];
$textC = $lang['srv_anketa_share'];
}
$buttonC = 'index.php?anketa='.$anketa.'&amp;a=vabila'; //objava
echo '<div id="buttons">';
echo ' <a href="'.$auto.'"><button class="medium white-blue" onClick="window.location.href='.$auto.';return false;">'.$lang['srv_testiranje_vnosi2'].'</button></a>';
echo ' <a href="'.$manual.'"><button class="medium white-blue" onClick="window.open('.$manual.', \'_blank\');return false;">'.$lang['srv_archive_test_data_text2a'].'</button></a>';
echo ' <a href="'.$share.'"><button class="medium blue" onclick="window.location.href=;return false;">'.$lang['srv_anketa_share'].'</button></a>';
echo ' <a href="'.$buttonA.'"><button class="medium white-blue" onClick="window.location.href='.$buttonA.';return false;">'.$textA.'</button></a>';
echo ' <a href="'.$buttonB.'"><button class="medium white-blue" onClick="window.open('.$buttonB.', \'_blank\');return false;">'.$textB.'</button></a>';
echo ' <a href="'.$buttonC.'"><button class="medium blue">'.$textC.'</button></a>';
echo '</div>';
echo '</div>';

4
admin/survey/classes/class.SurveyStatistic.php
View File

@ -812,6 +812,10 @@ class SurveyStatistic {
echo '<div class="dashboard_box" name="div_statistic_info" id="div_statistic_info">';
$this->DisplayInfoView();
echo '</div>';
echo '<div class="dashboard_box">';
Common::noDataAlert('status');
echo '</div>';
}
// imamo vnose, prikažemo statistiko
else {

1
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -187,7 +187,6 @@ class SurveyAnalysis {
if ( self::$dataFileStatus == FILE_STATUS_NO_DATA || self::$dataFileStatus == FILE_STATUS_SRV_DELETED) {
if (self::$podstran != M_ANALYSIS_ARCHIVE)
Common::noDataAlert();
return false;
}

16
admin/survey/classes/surveyAnalysis/class.SurveyChart.php
View File

@ -347,8 +347,17 @@ class SurveyChart {
echo '</div>';
if (self::$dataFileStatus == FILE_STATUS_NO_DATA
|| self::$dataFileStatus == FILE_STATUS_NO_FILE
|| self::$dataFileStatus == FILE_STATUS_SRV_DELETED){
$noDataAlert ="noDataAlert";
} else {
$noDataAlert ="";
}
if (self::$isArchive != true && self::$publicChart != true) {
self::displayBottomSettings();
self::displayBottomSettings($noDataAlert);
}
@ -7104,11 +7113,12 @@ class SurveyChart {
}
// Nastavitve na dnu
static function displayBottomSettings(){
static function displayBottomSettings($noDataAlert = ""){
global $site_path;
global $lang;
echo '<div class="analysis_bottom_settings printHide">';
echo '<div class="analysis_bottom_settings printHide '.$noDataAlert.'">';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'"><span class="faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';

1
lang/1.php
View File

@ -4314,6 +4314,7 @@ $lang = array (
"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 š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_data3" => "Ker v bazi še ni enot, nekaterih informacij v zavihku 'Status' ni mogoče prikazati.",
"srv_data_no_data_filtred" => "Ni podatkov.",
"srv_diferencial2" => "Tabela diferencial",
"srv_classic" => "Klasi&#269;na tabela",

1
lang/2.php
View File

@ -4293,6 +4293,7 @@ $lang = array (
"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 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_data3" => "As there are no units in the database yet, some information cannot be displayed in the 'Status' tab.",
"srv_data_no_data_filtred" => "No data",
"srv_diferencial2" => "Semantic differential",
"srv_classic" => "Classic table",

40
public/css/admin_new.css
View File

@ -27102,6 +27102,46 @@ div.no_data_alert div#buttons button::first-letter {
text-transform: uppercase;
}
.analysis_bottom_settings.noDataAlert {
display: none;
}
div.dashboard_box div.no_data_alert {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
div.dashboard_box div.no_data_alert img {
width: 100%;
margin-bottom: 16px;
}
div.dashboard_box div.no_data_alert h2 {
font-weight: 300;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
margin-bottom: 16px;
}
div.dashboard_box div.no_data_alert div#note {
max-width: 800px;
margin-bottom: 32px;
text-align: center;
}
div.dashboard_box div.no_data_alert div#buttons {
display: flex;
flex-direction: row;
gap: 16px;
}
div.dashboard_box div.no_data_alert div#buttons button::first-letter {
text-transform: uppercase;
}
div.dashboard_box div.no_data_alert div#buttons button {
width: fit-content;
min-width: 0;
}
#div_analiza_data:not(.anal_arch) .div_analiza_holder,
#div_means_data .div_analiza_holder,
#div_break_data .div_analiza_holder,

54
resources/sass/admin_new/pages/survey_data/no_data.scss
View File

@ -35,3 +35,57 @@ div.no_data_alert {
}
}
}
//Skrijemo bottom nastavitve v grafih
.analysis_bottom_settings.noDataAlert {
display: none;
}
//Status
div.dashboard_box {
div.no_data_alert {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
img {
width: 100%;
margin-bottom: 16px;
}
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: 16px;
button::first-letter {
text-transform: uppercase;
}
button {
width: fit-content;
min-width: 0;
}
}
}
}