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

Redesign - popravki status dashboarda

Browse Source
This commit is contained in:
pero1203 2022-02-16 08:58:49 +01:00
parent d122fff793
commit a8aaa305e8
6 changed files with 1473 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -254,7 +254,7 @@ class SurveyStaticHtml
$query_autogen_testdata = sisplet_query($str_autogen_testdata);
list($autogen_testdata) = mysqli_fetch_row($query_autogen_testdata);
echo '<div class="display_data_test_data_note">';
echo '<div class="top_note display_data_test_data_note">';
echo '<div class="title">';
echo ' <span class="faicon warning"></span> '.$lang['srv_testni_podatki_alert_title'];

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

@ -748,6 +748,16 @@ class SurveyStatistic {
}
else {
// Ce ne zbiramo parapodatkov casov resevanja izpisemo opozorilo
if($paradata_date == 1){
echo '<div class="top_note dashboard_paradata_note">';
echo ' <div class="title">';
echo ' <span class="faicon warning"></span> '.$lang['srv_warning'];
echo ' </div>';
echo $lang['srv_dashboard_paradata_date_warning'];
echo '</div>';
}
echo '<div class="dashboard_top_settings">';
echo ' <div class="dashboard_top_info">';
@ -758,10 +768,6 @@ class SurveyStatistic {
#preberemo podatke o datoteki
echo $SDF->getDataFileInfo();
// Ce ne zbiramo parapodatkov casov resevanja izpisemo opozorilo
if($paradata_date == 1)
echo ' <span>'.$lang['srv_dashboard_paradata_date_warning'].'</span>';
// Prikazemo filter na datum ce je vklopljen
if (SurveyTimeProfiles::getCurentProfileId() != STP_DEFAULT_PROFILE){
echo ' <div id="displayFilterNotes">';
@ -1347,6 +1353,49 @@ class SurveyStatistic {
echo '</tr>';
echo '</table>';
// Uporabnost respondentov
$sur = new SurveyUsableResp($this->surveyId, $generateDatafile=false);
if($sur->hasDataFile()){
$usability = $sur->calculateData();
echo '<table id="tbl_answ_usability">';
echo '<tr class="row1">';
echo '<td>'.$lang['srv_statistic_answer_state_usability'].' ('.$sur->bottom_usable_limit.'%/'.$sur->top_usable_limit.'%)</td>';
echo '<td>'.$lang['srv_statistic_answer_state_frequency'].'</td>';
echo '<td>'.$lang['srv_statistic_answer_state_percent'].'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_usableResp_usable_unit'].'</td>';
echo '<td>'.$usability['usable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['usable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_usableResp_partusable_unit'].'</td>';
echo '<td>'.$usability['partusable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['partusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '<tr><td>'.$lang['srv_usableResp_unusable_unit'].'</td>';
echo '<td>'.$usability['unusable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['unusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '</table>';
}
}
/** Funkcija prikaže statuse odgovorov
@ -1414,49 +1463,6 @@ class SurveyStatistic {
echo '</table>';
// Uporabnost respondentov
$sur = new SurveyUsableResp($this->surveyId, $generateDatafile=false);
if($sur->hasDataFile()){
$usability = $sur->calculateData();
echo '<table id="tbl_answ_usability">';
echo '<tr class="row1">';
echo '<td>'.$lang['srv_statistic_answer_state_usability'].' ('.$sur->bottom_usable_limit.'%/'.$sur->top_usable_limit.'%)</td>';
echo '<td>'.$lang['srv_statistic_answer_state_frequency'].'</td>';
echo '<td>'.$lang['srv_statistic_answer_state_percent'].'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_usableResp_usable_unit'].'</td>';
echo '<td>'.$usability['usable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['usable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_usableResp_partusable_unit'].'</td>';
echo '<td>'.$usability['partusable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['partusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '<tr><td>'.$lang['srv_usableResp_unusable_unit'].'</td>';
echo '<td>'.$usability['unusable'].'</td>';
if($usability['all'] > 0)
echo '<td>'.$this->formatNumber($usability['unusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').'</td>';
else
echo '<td>'.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').'</td>';
echo '</tr>';
echo '</table>';
}
// Breakoffi
$status3 = (isset($this->userByStatus['nonvalid']['3'])) ? $this->userByStatus['nonvalid']['3'] : 0;
$status4 = (isset($this->userByStatus['nonvalid']['4'])) ? $this->userByStatus['nonvalid']['4'] : 0;
@ -1690,10 +1696,6 @@ class SurveyStatistic {
echo '<td>'.$value_sum.'</td>';
echo '</tr>';
echo '<tr class="">';
echo '<td colspan="2">&nbsp;</td>';
echo '</tr>';
if (!($value_sum_nonvalid == 0 || $value_sum == 0 )) {
echo '<tr class="row_sum">';
echo '<td>' . $lang['srv_statistic_redirection_sum'] . '</td>';

2
lang/1.php
View File

@ -4211,7 +4211,7 @@ $lang = array (
"srv_dashboard_no_file" => "Datoteka s podatki še ne obstaja!",
"srv_dashboard_new_units" => " Število nedodanih enot: ",
"srv_dashboard_up_to_date" => "Datoteka s podatki je ažurna.",
"srv_dashboard_paradata_date_warning" => "Opozorilo! Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
"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_filtred" => "Ni podatkov.",
"srv_diferencial2" => "Tabela diferencial",

2
lang/2.php
View File

@ -4194,7 +4194,7 @@ $lang = array (
"srv_dashboard_no_file" => "Data file does not exist! ",
"srv_dashboard_new_units" => " Number of new units: ",
"srv_dashboard_up_to_date" => "Data file is up to date.",
"srv_dashboard_paradata_date_warning" => "Warning! Saving respondent dates (paradata) is turned off. Some statuses will not be displayed.",
"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_filtred" => "No data",
"srv_diferencial2" => "Semantic differential",

2804
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

11
resources/sass/admin_new/pages/survey_data/test_data_warning.scss
View File

@ -1,6 +1,6 @@
// Opozorilo na vrhu pri podatkih in analizah - anketa vsebuje testne podatke...
.display_data_test_data_note {
.top_note {
padding: 16px 32px;
margin-bottom: 32px;
@ -27,4 +27,13 @@
color: $yellow;
}
}
/*&.dashboard_paradata_note{
.title{
border-bottom: 0;
padding-bottom: 0;
margin-bottom: 0;
}
}*/
}