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

Redesign - popravki napak - rekodiranje, izvoz podatkov...

Browse Source
This commit is contained in:
pero1203 2022-05-23 09:54:19 +02:00
parent 9098a22f8a
commit eb09dbbc86
12 changed files with 1469 additions and 1451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdminSettings.php
View File

@ -4519,6 +4519,8 @@ class SurveyAdminSettings {
$sdf = SurveyDataFile::get_instance(); $sdf = SurveyDataFile::get_instance();
$sdf->init($this->anketa); $sdf->init($this->anketa);
$sdf->prepareFiles();
$headFileName = $sdf->getHeaderFileName(); $headFileName = $sdf->getHeaderFileName();
$dataFileName = $sdf->getDataFileName(); $dataFileName = $sdf->getDataFileName();
$dataFileStatus = $sdf->getStatus(); $dataFileStatus = $sdf->getStatus();

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

@ -231,10 +231,6 @@ class SurveyPostProcess {
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
//echo '<input type="submit" value="'.$lang['srv_coding_filter'].'" onclick="$(this).prop(\'disabled\', true); coding_filter($(\'#mass_coding_spr_id\').val()); return false;"> ('.$lang['srv_coding_spr2'].')</p>';
if ( count($variables)>0 )
echo '<p class="bottom16">('.$lang['srv_coding_spr2'].')</p>';
SurveyDataDisplay::displayVnosiHTML(); SurveyDataDisplay::displayVnosiHTML();

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

@ -33,6 +33,8 @@ class VariableView {
#inicializiramo class za datoteke #inicializiramo class za datoteke
self::$SDF = SurveyDataFile::get_instance(); self::$SDF = SurveyDataFile::get_instance();
self::$SDF->init($sid); self::$SDF->init($sid);
self::$SDF->prepareFiles($show_loading);
self::$headFileName = self::$SDF->getHeaderFileName(); self::$headFileName = self::$SDF->getHeaderFileName();
self::$dataFileName = self::$SDF->getDataFileName(); self::$dataFileName = self::$SDF->getDataFileName();

6
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
View File

@ -71,11 +71,11 @@ class SurveyAnalysisHelper {
echo '<div id="bottom_data_legend_missing" class="legend_box">'; echo '<div id="bottom_data_legend_missing" class="legend_box">';
echo '<div class="legend_title" onclick="$(\'#bottom_data_legend_detail_missing\').toggleClass(\'displayNone\');">'; echo '<div class="legend_title" onclick="$(\'#bottom_data_legend_detail_missing\').toggle(\'fast\');">';
echo '<span class="faicon fa-plus link-right"></span>'.$lang['srv_bottom_data_legend_note']; echo '<span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_note'];
echo '</div>'; echo '</div>';
echo '<div id="bottom_data_legend_detail_missing" class="legend_details displayNone">'; echo '<div id="bottom_data_legend_detail_missing" class="legend_details">';
echo ' <ul>'; echo ' <ul>';
echo ' <li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>'; echo ' <li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
echo ' <li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>'; echo ' <li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';

12
admin/survey/classes/surveyData/class.SurveyDataDisplay.php
View File

@ -234,7 +234,7 @@ class SurveyDataDisplay{
// Ce imamo urlhash gre za javno povezavo in nikoli ne prikazemo loading okna // Ce imamo urlhash gre za javno povezavo in nikoli ne prikazemo loading okna
$show_loading = (isset($_GET['urlhash'])) ? false : true; $show_loading = (isset($_GET['urlhash'])) ? false : true;
self::$SDF->prepareFiles($show_loading); self::$SDF->prepareFiles();
self::$headFileName = self::$SDF->getHeaderFileName(); self::$headFileName = self::$SDF->getHeaderFileName();
self::$dataFileName = self::$SDF->getDataFileName(); self::$dataFileName = self::$SDF->getDataFileName();
@ -860,7 +860,7 @@ class SurveyDataDisplay{
// Opcija "vsi" - ni na voljo ce je vec kot 1000 responsov (drugace lahko vse zasteka) // Opcija "vsi" - ni na voljo ce je vec kot 1000 responsov (drugace lahko vse zasteka)
if(self::$_RECORD_COUNT <= 1000){ if(self::$_RECORD_COUNT <= 1000){
$_select_records .= '<option '.(self::$_VARS[VAR_REC_ON_PAGE] == 'all' ? ' selected="selected"' : '').' value="all">'; $_select_records .= '<option '.(self::$_VARS[VAR_REC_ON_PAGE] == 'all' ? ' selected="selected"' : '').' value="all">';
$_select_records .= $lang['srv_vsi']; $_select_records .= $lang['all2'];
$_select_records .= '</option>'; $_select_records .= '</option>';
} }
@ -923,7 +923,7 @@ class SurveyDataDisplay{
// Opcija "vsi" - ni na voljo ce je vec kot 50 vprasanj (drugace lahko vse zasteka) // Opcija "vsi" - ni na voljo ce je vec kot 50 vprasanj (drugace lahko vse zasteka)
if(self::$_ALL_QUESTION_COUNT <= 50){ if(self::$_ALL_QUESTION_COUNT <= 50){
$_spr_on_page .= '<option '.(self::$_VARS[VAR_SPR_LIMIT] == 'all' ? ' selected="selected"' : '').' value="all">'; $_spr_on_page .= '<option '.(self::$_VARS[VAR_SPR_LIMIT] == 'all' ? ' selected="selected"' : '').' value="all">';
$_spr_on_page .= $lang['hour_all2']; $_spr_on_page .= $lang['srv_block_random_all'];
$_spr_on_page .= '</option>'; $_spr_on_page .= '</option>';
} }
@ -1168,11 +1168,7 @@ class SurveyDataDisplay{
echo '<div class="setting_line">'; echo '<div class="setting_line">';
echo ' <input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/>'; echo ' <input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/>';
echo ' <label for="dataIcons_edit">'.$lang['srv_dataIcons_edit']; echo ' <label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'].'</label>';
if (self::$displayEditIcons['dataIcons_edit'] == true) {
echo ' '.Help::display('srv_podatki_urejanje_inline');
}
echo ' </label>';
echo '</div>'; echo '</div>';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik

2
admin/survey/script/js-lang.php
View File

@ -126,6 +126,8 @@ lang('srv_novavrednost_drugo');
lang('srv_unlock_alert'); lang('srv_unlock_alert');
lang('srv_custom_report_first'); lang('srv_custom_report_first');
lang('srv_ask_delete'); lang('srv_ask_delete');
lang('srv_ask_delete_data');
lang('srv_ask_delete_multiple_data');
lang('srv_brisivrednostconfirm'); lang('srv_brisivrednostconfirm');
lang('srv_brisivrednost'); lang('srv_brisivrednost');
lang('srv_incremental_hs1'); lang('srv_incremental_hs1');

6
admin/survey/script/script_analiza.js
View File

@ -41,13 +41,13 @@ function analiza_init () {
}); });
// brisanje vnosa // brisanje vnosa
$('#dataTable td .delete_circle').live('click', function(event) { $('#dataTable td .delete').live('click', function(event) {
// polovimo user id // polovimo user id
var usr_id = $(this).parent().parent().find('.data_uid').html(); var usr_id = $(this).parent().parent().find('.data_uid').html();
var row = $(this).parent().parent(); var row = $(this).parent().parent();
var note = 'srv_ask_delete'; var note = 'srv_ask_delete_data';
// Preverimo ce je med njimi tudi kaksno vabilo - dodatno opozorilo // Preverimo ce je med njimi tudi kaksno vabilo - dodatno opozorilo
if($(this).parent().parent().find('.invitation_cell').length == 1){ if($(this).parent().parent().find('.invitation_cell').length == 1){
@ -1010,7 +1010,7 @@ function deleteMultipleData(){
var userArray = new Array; var userArray = new Array;
var note = 'srv_ask_delete'; var note = 'srv_ask_delete_multiple_data';
// Napolnimo array z checkanimi userji // Napolnimo array z checkanimi userji
$('#div_vnosi_data input:checked').each(function() { $('#div_vnosi_data input:checked').each(function() {

6
lang/1.php
View File

@ -225,7 +225,7 @@ $lang = array (
"show" => "Prikazan povsod", "show" => "Prikazan povsod",
"only_show_index" => "Samo na prvi strani", "only_show_index" => "Samo na prvi strani",
"not_show" => "Ni prikazan", "not_show" => "Ni prikazan",
"ask_delete_link" => "Ali ste prepri&#269;ani, da zelite izbrisati podstran", "ask_delete_link" => "Ali ste prepri&#269;ani, da želite izbrisati podstran",
"ask2_delete_link" => "Unicili boste tudi vse podnavigacije! Ce hocete uniciti zgolj to navigacijo, ne pa tudi tistih pod njo, jo najprej spremenite v nizji nivo. Res zelite uniciti tudi vse podnavigacije in njihove vsebine?", "ask2_delete_link" => "Unicili boste tudi vse podnavigacije! Ce hocete uniciti zgolj to navigacijo, ne pa tudi tistih pod njo, jo najprej spremenite v nizji nivo. Res zelite uniciti tudi vse podnavigacije in njihove vsebine?",
"ask_delete_news" => "Ali ste prepri&#269;ani, da zelite izbrisati novico?", "ask_delete_news" => "Ali ste prepri&#269;ani, da zelite izbrisati novico?",
"archive_restored" => "Arhiv nalozen.", "archive_restored" => "Arhiv nalozen.",
@ -2343,6 +2343,8 @@ $lang = array (
"srv_arhivi" => "Arhivi", "srv_arhivi" => "Arhivi",
"srv_progressbar" => "Prika&#382;i vrstico napredka (progress bar)", "srv_progressbar" => "Prika&#382;i vrstico napredka (progress bar)",
"srv_ask_delete" => "Ali ste prepricani, da želite trajno izbrisati?", "srv_ask_delete" => "Ali ste prepricani, da želite trajno izbrisati?",
"srv_ask_delete_multiple_data" => "Ali ste prepricani, da želite trajno izbrisati izbrane enote?",
"srv_ask_delete_data" => "Ali ste prepricani, da želite trajno izbrisati enoto?",
"srv_ask_delete_inv" => "Ali ste prepricani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.", "srv_ask_delete_inv" => "Ali ste prepricani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
"srv_crosstabs" => "Tabele", "srv_crosstabs" => "Tabele",
"srv_multicrosstabs" => "Multitabele", "srv_multicrosstabs" => "Multitabele",
@ -5970,7 +5972,7 @@ $lang = array (
"srv_data_emailstatus_1" => "Da", "srv_data_emailstatus_1" => "Da",
"srv_data_emailstatus_2" => "Napaka", "srv_data_emailstatus_2" => "Napaka",
"srv_bottom_data_legend_note" => 'Legenda manjkajočih (negativnih) vrednosti', "srv_bottom_data_legend_note" => 'Legenda manjkajočih (negativnih) vrednosti',
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank">Več>></a>', "srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank" class="read-more">Preberi več<span class="faicon arrow2_r"></span></a>',
"srv_bottom_data_legend_note_li1" => "'-1' neodgovorjeno vprašanje,", "srv_bottom_data_legend_note_li1" => "'-1' neodgovorjeno vprašanje,",
"srv_bottom_data_legend_note_li2" => "'-2' preskok zaradi pogoja (IF),", "srv_bottom_data_legend_note_li2" => "'-2' preskok zaradi pogoja (IF),",
"srv_bottom_data_legend_note_li3" => "'-3' prekinitev izpolnjevanja,", "srv_bottom_data_legend_note_li3" => "'-3' prekinitev izpolnjevanja,",

4
lang/2.php
View File

@ -2328,6 +2328,8 @@ $lang = array (
"srv_arhivi" => "Archives", "srv_arhivi" => "Archives",
"srv_progressbar" => "Show progress indicator", "srv_progressbar" => "Show progress indicator",
"srv_ask_delete" => "Do you want to permanently delete?", "srv_ask_delete" => "Do you want to permanently delete?",
"srv_ask_delete_multiple_data" => "Do you want to permanently delete selected units?",
"srv_ask_delete_data" => "Do you want to permanently delete selected unit?",
"srv_ask_delete_inv" => "Do you want to permanently delete?\n\nYou will delete also answers from invitations! This can cause invitations errors.", "srv_ask_delete_inv" => "Do you want to permanently delete?\n\nYou will delete also answers from invitations! This can cause invitations errors.",
"srv_crosstabs" => "Crosstabs", "srv_crosstabs" => "Crosstabs",
"srv_multicrosstabs" => "Multitables", "srv_multicrosstabs" => "Multitables",
@ -5865,7 +5867,7 @@ $lang = array (
"srv_data_emailstatus_1" => "Yes", "srv_data_emailstatus_1" => "Yes",
"srv_data_emailstatus_2" => "Error", "srv_data_emailstatus_2" => "Error",
"srv_bottom_data_legend_note" => 'Missing values legend', "srv_bottom_data_legend_note" => 'Missing values legend',
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/en/help/manuals/status-of-units-relevance-validity-and-missing-values" target="_blank">More>></a>', "srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/en/help/manuals/status-of-units-relevance-validity-and-missing-values" target="_blank" class="read-more">Read more<span class="faicon arrow2_r"></span></a>',
"srv_bottom_data_legend_note_li1" => "'-1' unanswered question,", "srv_bottom_data_legend_note_li1" => "'-1' unanswered question,",
"srv_bottom_data_legend_note_li2" => "'-2' skipped question (IF logic),", "srv_bottom_data_legend_note_li2" => "'-2' skipped question (IF logic),",
"srv_bottom_data_legend_note_li3" => "'-3' survey dropout,", "srv_bottom_data_legend_note_li3" => "'-3' survey dropout,",

2865
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

10
resources/sass/admin_new/basic/links.scss
View File

@ -19,4 +19,14 @@ a {
text-decoration: none; text-decoration: none;
font-weight: $extra-bold; font-weight: $extra-bold;
} }
&.read-more{
text-decoration: none;
.faicon:before{
padding-left: 8px;
font-size: 8px;
vertical-align: middle;
}
}
} }

1
resources/sass/admin_new/pages/survey_data/calculations.scss
View File

@ -59,7 +59,6 @@ div.subpage_coding {
div#analiza_data { div#analiza_data {
max-width: 932px; max-width: 932px;
overflow-x: scroll;
div.dataFullscreen{ div.dataFullscreen{
display: none; display: none;