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

Redesign - popravki tabele s podatki

Browse Source
This commit is contained in:
pero1203 2022-03-07 23:31:34 +01:00
parent 7f22f32512
commit a14436b745
8 changed files with 1717 additions and 1503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,12 +69,12 @@ class LibraryBranching {
// Tab vprasanja // Tab vprasanja
echo '<div id="tab_0" class="tab '.($this->tab == 0 ? 'active' : '').'" onClick="displayLibraryTab(\'0\'); return false;">'; echo '<div id="tab_0" class="tab '.($this->tab == 0 ? 'active' : '').'" onClick="displayLibraryTab(\'0\'); return false;">';
echo $lang['srv_vprasanja']; echo $lang['srv_library_survey_tab_questions'];
echo '</div>'; echo '</div>';
// Tab ankete // Tab ankete
echo '<div id="tab_1" class="tab '.($this->tab == 1 ? 'active' : '').'" onClick="displayLibraryTab(\'1\'); return false;">'; echo '<div id="tab_1" class="tab '.($this->tab == 1 ? 'active' : '').'" onClick="displayLibraryTab(\'1\'); return false;">';
echo $lang['srv_ankete']; echo $lang['srv_library_survey_tab_surveys'];
echo '</div>'; echo '</div>';
echo '<input type="hidden" name="active_tab" id="active_tab" value="'.$this->tab.'">'; echo '<input type="hidden" name="active_tab" id="active_tab" value="'.$this->tab.'">';

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

@ -844,7 +844,7 @@ class SurveyDataDisplay{
//$_tmp_limit = array(10,50,100,250,500,1000,2500,5000,10000); //$_tmp_limit = array(10,50,100,250,500,1000,2500,5000,10000);
$_tmp_limit = array(10,50,100,250,500); $_tmp_limit = array(10,50,100,250,500);
$_select_records = '<select id="rec_on_page'.$position.'" onchange="setDataView(\''.VAR_REC_ON_PAGE.'\',$(\'select#rec_on_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_rec_on_page'].'">'; $_select_records = '<select id="rec_on_page'.$position.'" class="dropdown" onchange="setDataView(\''.VAR_REC_ON_PAGE.'\',$(\'select#rec_on_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_rec_on_page'].'">';
foreach ($_tmp_limit AS $limit) { foreach ($_tmp_limit AS $limit) {
if ($limit < self::$_RECORD_COUNT) { if ($limit < self::$_RECORD_COUNT) {
$_select_records .= '<option '.(self::$_VARS[VAR_REC_ON_PAGE] == $limit ? ' selected="selected"' : '').' value="'.$limit.'">'; $_select_records .= '<option '.(self::$_VARS[VAR_REC_ON_PAGE] == $limit ? ' selected="selected"' : '').' value="'.$limit.'">';
@ -868,7 +868,7 @@ class SurveyDataDisplay{
if (self::$_VARS[VAR_REC_ON_PAGE] != 'all' && self::$_TOTAL_PAGES > 1) { if (self::$_VARS[VAR_REC_ON_PAGE] != 'all' && self::$_TOTAL_PAGES > 1) {
echo '<label>'; echo '<label>';
echo $lang['page']; echo $lang['page'].':';
echo '</label>'; echo '</label>';
// puscica levo // puscica levo
@ -876,7 +876,7 @@ class SurveyDataDisplay{
echo '<a title="'.$lang['previous_page'].'" href="#" onclick="setDataView(\''.VAR_CUR_REC_PAGE.'\',\''.(self::$_VARS[VAR_CUR_REC_PAGE]-1).'\');"><span class="faicon arrow2_l"></span></a>'; echo '<a title="'.$lang['previous_page'].'" href="#" onclick="setDataView(\''.VAR_CUR_REC_PAGE.'\',\''.(self::$_VARS[VAR_CUR_REC_PAGE]-1).'\');"><span class="faicon arrow2_l"></span></a>';
} }
$_records_page = '<select id="cur_rec_page'.$position.'" onchange="setDataView(\''.VAR_CUR_REC_PAGE.'\',$(\'select#cur_rec_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_rec_current_page'].'">'; $_records_page = '<select id="cur_rec_page'.$position.'" class="dropdown" onchange="setDataView(\''.VAR_CUR_REC_PAGE.'\',$(\'select#cur_rec_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_rec_current_page'].'">';
for ($i=1; $i<=self::$_TOTAL_PAGES; $i++) { for ($i=1; $i<=self::$_TOTAL_PAGES; $i++) {
$_records_page .= '<option'.(self::$_VARS[VAR_CUR_REC_PAGE]==$i ? ' selected="selected"' : '' ) $_records_page .= '<option'.(self::$_VARS[VAR_CUR_REC_PAGE]==$i ? ' selected="selected"' : '' )
. ' value="'.$i.'" >'; . ' value="'.$i.'" >';
@ -907,7 +907,7 @@ class SurveyDataDisplay{
//$_spr_limit = array(5=>'5',10=>'10',20=>'20',30=>'30',50=>'50',100=>'100','all'=>$lang['hour_all2']); //$_spr_limit = array(5=>'5',10=>'10',20=>'20',30=>'30',50=>'50',100=>'100','all'=>$lang['hour_all2']);
$_spr_limit = array(5=>'5',10=>'10',20=>'20',30=>'30',50=>'50'); $_spr_limit = array(5=>'5',10=>'10',20=>'20',30=>'30',50=>'50');
$_spr_on_page = '<select id="spr_on_page'.$position.'" onchange="setDataView(\''.VAR_SPR_LIMIT.'\',$(\'select#spr_on_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_spr_on_page'].'">'; $_spr_on_page = '<select id="spr_on_page'.$position.'" class="dropdown" onchange="setDataView(\''.VAR_SPR_LIMIT.'\',$(\'select#spr_on_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_spr_on_page'].'">';
foreach ($_spr_limit AS $key => $label) { foreach ($_spr_limit AS $key => $label) {
if ($key < self::$_ALL_QUESTION_COUNT) { if ($key < self::$_ALL_QUESTION_COUNT) {
$_spr_on_page .= '<option '.(self::$_VARS[VAR_SPR_LIMIT] == $key ? ' selected="selected"' : '').' value="'.$key.'">'; $_spr_on_page .= '<option '.(self::$_VARS[VAR_SPR_LIMIT] == $key ? ' selected="selected"' : '').' value="'.$key.'">';
@ -939,9 +939,9 @@ class SurveyDataDisplay{
if ($spr_pages > 1) { if ($spr_pages > 1) {
$_spr_page = '<select id="cur_spr_page'.$position.'" onchange="setDataView(\''.VAR_SPR_PAGE.'\',$(\'select#cur_spr_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_spr_current_page'].'">'; $_spr_page = '<select id="cur_spr_page'.$position.'" class="dropdown" onchange="setDataView(\''.VAR_SPR_PAGE.'\',$(\'select#cur_spr_page'.$position.' option:selected\').val());" title="'.$lang['srv_data_pagination_spr_current_page'].'">';
echo '<label>'; echo '<label>';
echo $lang['page']; echo $lang['page'].':';
echo '</label>'; echo '</label>';
// puscica levo // puscica levo
@ -973,81 +973,77 @@ class SurveyDataDisplay{
public static function displayLeftFilters() { public static function displayLeftFilters() {
global $lang, $site_url; global $lang, $site_url;
// število zapisov na stran
echo '<ul class="">';
echo '<li>'.$lang['srv_show'].':</li>';
// ustreznost // ustreznost
if (self::$canDisplayRelevance) { if (self::$canDisplayRelevance) {
echo '<li>'; echo '<div class="setting_line">';
if (self::$_VARS[VAR_SHOW_SYSTEM] != true) { if (self::$_VARS[VAR_SHOW_SYSTEM] != true) {
echo '<label for="var_relevance"><input type="checkbox" onchange="setDataView(\''. VAR_RELEVANCE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_RELEVANCE] ? ' checked="checked"' : '').' id="var_relevance" />'.$lang['srv_displaydata_relevance'].'</label>'; echo '<input type="checkbox" onchange="setDataView(\''. VAR_RELEVANCE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_RELEVANCE] ? ' checked="checked"' : '').' id="var_relevance" /><label for="var_relevance">'.$lang['srv_displaydata_relevance'].'</label>';
} }
else { else {
echo '<label for="var_relevance" class="gray"><input type="checkbox" disabled="disabled" />'.$lang['srv_displaydata_relevance'].'</label>'; echo '<input type="checkbox" disabled="disabled" /><label for="var_relevance" class="gray">'.$lang['srv_displaydata_relevance'].'</label>';
} }
echo '</li>'; echo '</div>';
} }
// email prikazujemo skupaj z ustreznost // email prikazujemo skupaj z ustreznost
if ((int)self::$survey['email'] == 1 && (int)self::$survey['user_base'] == 1) { if ((int)self::$survey['email'] == 1 && (int)self::$survey['user_base'] == 1) {
echo '<li>'; echo '<div class="setting_line">';
if (self::$_VARS[VAR_SHOW_SYSTEM] != true ) { if (self::$_VARS[VAR_SHOW_SYSTEM] != true ) {
echo '<label for="var_email"><input type="checkbox" onchange="setDataView(\''. VAR_EMAIL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_EMAIL] ? ' checked="checked"' : '').' id="var_email" />'.$lang['srv_displaydata_invitation'].'</label>'; echo '<input type="checkbox" onchange="setDataView(\''. VAR_EMAIL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_EMAIL] ? ' checked="checked"' : '').' id="var_email" /><label for="var_email">'.$lang['srv_displaydata_invitation'].'</label>';
} }
else { else {
echo '<label for="var_email" class="gray"><input type="checkbox" disabled="disabled" id="var_email" />'.$lang['srv_displaydata_invitation'].'</label>'; echo '<input type="checkbox" disabled="disabled" id="var_email" /><label for="var_email" class="gray">'.$lang['srv_displaydata_invitation'].'</label>';
} }
echo '</li>'; echo '</div>';
} }
// podatki // podatki
echo '<li>'; echo '<div class="setting_line">';
echo ' <input type="checkbox" onclick="setDataView(\''.VAR_DATA.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_DATA] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="data" /><label for="data" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_data'].'</label>'; echo ' <input type="checkbox" onclick="setDataView(\''.VAR_DATA.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_DATA] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="data" /><label for="data" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_data'].'</label>';
echo '</li>'; echo '</div>';
// Preverimo ce je vklopljen modul za volitve - potem nimamo identifikatorjev // Preverimo ce je vklopljen modul za volitve - potem nimamo identifikatorjev
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
// Parapodatki // Parapodatki
echo '<li>'; echo '<div class="setting_line">';
echo ' <input type="checkbox" onclick="setDataView(\''.VAR_METAFULL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_METAFULL] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="fullmeta" /><label for="fullmeta" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_meta'].'</label>'; echo ' <input type="checkbox" onclick="setDataView(\''.VAR_METAFULL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_METAFULL] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="fullmeta" /><label for="fullmeta" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_meta2'].'</label>';
echo '</li>'; echo '</div>';
// če imamo sistemske podatke katere moramo prikazovati ločeno - IDENTIFIKATORJI // če imamo sistemske podatke katere moramo prikazovati ločeno - IDENTIFIKATORJI
if(!isset(self::$_HEADERS['_settings']['count_system_data_variables']) || (isset(self::$_HEADERS['_settings']['count_system_data_variables']) && (int)self::$_HEADERS['_settings']['count_system_data_variables'] > 0)) { if(!isset(self::$_HEADERS['_settings']['count_system_data_variables']) || (isset(self::$_HEADERS['_settings']['count_system_data_variables']) && (int)self::$_HEADERS['_settings']['count_system_data_variables'] > 0)) {
echo '<li>'; echo '<div class="setting_line">';
echo ' <label><input type="checkbox" onclick="setDataView(\''.VAR_SHOW_SYSTEM.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_SYSTEM] ? ' checked="checked"' : '').' id="showsystem" />'.$lang['srv_displaydata_system_data'].'</label>'; echo ' <input type="checkbox" onclick="setDataView(\''.VAR_SHOW_SYSTEM.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_SYSTEM] ? ' checked="checked"' : '').' id="showsystem" /><label for="showsystem">'.$lang['srv_displaydata_system_data'].'</label>';
echo '</li>'; echo '</div>';
} }
// Po novem vedno prikazemo checkbox identifikatorji - samo je odkljukan in disablan // Po novem vedno prikazemo checkbox identifikatorji - samo je odkljukan in disablan
else{ else{
echo '<li>'; echo '<div class="setting_line">';
echo ' <label class="gray"><input type="checkbox" checked="checked" disabled="disabled" id="showsystem" />'.$lang['srv_displaydata_system_data'].'</label>'; echo ' <input type="checkbox" checked="checked" disabled="disabled" id="showsystem" /><label for="showsystem" class="gray">'.$lang['srv_displaydata_system_data'].'</label>';
echo '</li>'; echo '</div>';
} }
// datum // datum
echo '<li>'; echo '<div class="setting_line">';
echo '<label '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'><input type="checkbox" onclick="setDataView(\''.VAR_SHOW_DATE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_DATE] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showdate" />'.$lang['srv_data_date'].'</label>'; echo ' <input type="checkbox" onclick="setDataView(\''.VAR_SHOW_DATE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_DATE] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showdate" /><label for="showdate" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_data_date2'].'</label>';
echo '</li>'; echo '</div>';
} }
// zaporedna številka // zaporedna številka
echo '<li>'; echo '<div class="setting_line">';
echo '<label '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'><input type="checkbox" onclick="setDataView(\''.VAR_SHOW_NO.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_NO] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showno" />'.$lang['srv_recnum'].'</label>'; echo ' <input type="checkbox" onclick="setDataView(\''.VAR_SHOW_NO.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_NO] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showno" /><label for="showno" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_recnum_long'].'</label>';
echo '</li>'; echo '</div>';
// pomoč - ? // Labela
echo '<li>'.Help :: display('displaydata_checkboxes').'</li>'; echo '<div class="setting_line">';
echo '</ul>'; echo ' <input type="checkbox" id="dataIcons_labels" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_labels'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_labels">'.$lang['srv_dataIcons_labels'].'</label>';
echo '</div>';
} }
// Search po tabeli s podatki // Search po tabeli s podatki
@ -1058,9 +1054,9 @@ class SurveyDataDisplay{
echo '<div id="data_search_filter">'; echo '<div id="data_search_filter">';
echo '<label>'.$lang['srv_find'].':</label> <input id="data_search_value" type="text" onchange="data_search_filter(); return false;" value="'.$search.'">'; echo '<input id="data_search_value" type="text" onchange="data_search_filter(); return false;" value="'.$search.'" placeholder="'.$lang['search'].'">';
if($search != ''){ if($search != ''){
echo '<span class="bold red spaceLeft">'.$lang['srv_displayData_search'].' "'.$search.'"!</span>'; echo '<span class="search_filtered">'.$lang['srv_displayData_search'].' "'.$search.'"!</span>';
} }
echo '</div>'; echo '</div>';
@ -1125,7 +1121,7 @@ class SurveyDataDisplay{
echo '<div class="dataSettingsBasic">'; echo '<div class="dataSettingsBasic">';
$arrow = (isset($_SESSION['sid_' . self::$sid]['dataIcons_settings'])) ? $_SESSION['sid_' . self::$sid]['dataIcons_settings'] : 0; $arrow = (isset($_SESSION['sid_' . self::$sid]['dataIcons_settings'])) ? $_SESSION['sid_' . self::$sid]['dataIcons_settings'] : 0;
echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'data\');"><span class="faicon ' . ($arrow == 1 ? ' dropup_blue' : 'dropdown_blue') . '"></span> ' . $lang['srv_extra_settings'] . '</div>'; echo ' <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleDataCheckboxes(\'data\');"><span class="faicon plus"></span>'.$lang['srv_displaydata_columns'].'</button>';
echo '</div>'; echo '</div>';
@ -1143,58 +1139,67 @@ class SurveyDataDisplay{
// Dodatne nastavitve, ki se razprejo // Dodatne nastavitve, ki se razprejo
echo '<div id="dataSettingsCheckboxes" '.(self::$displayEditIconsSettings ? '' : ' style="display:none;"').'>'; echo '<div id="dataSettingsCheckboxes" '.(self::$displayEditIconsSettings ? '' : ' style="display:none;"').'>';
echo ' <div class="dataSettingsCheckboxes_holder">';
echo '<div id="toggleDataCheckboxes2" onClick="toggleDataCheckboxes(\'data\');"><span class="faicon close icon-orange" style="padding-bottom:2px;"></span> '.$lang['srv_data_settings_checkboxes2'].'</div>';
if(self::$dataFileStatus != FILE_STATUS_NO_DATA){ if(self::$dataFileStatus != FILE_STATUS_NO_DATA){
echo '<div id="dataSetingsLinks" class="data noBorder">'; echo '<div class="setting_line title">';
echo $lang['srv_dataTable_settings_show'];
echo '</div>';
self::displayLeftFilters(); self::displayLeftFilters();
echo '</div>'; // konec diva za paginacijo
} }
if (self :: $is_social_network == false || self::$_VARS[VAR_CIRCLES] == 0) { if (self :: $is_social_network == false || self::$_VARS[VAR_CIRCLES] == 0) {
echo '<div class="clr" id="dataIconSetingsLinks" >'.$lang['srv_dataIcons_note'].'&nbsp;&nbsp;'; echo '<div class="setting_line title">';
echo $lang['srv_dataTable_settings_shortcuts'];
echo '</div>';
echo '<div class="setting_line">';
echo '<input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'].'</label>'; 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'];
if (self::$displayEditIcons['dataIcons_edit'] == true) { if (self::$displayEditIcons['dataIcons_edit'] == true) {
echo ' '.Help::display('srv_podatki_urejanje_inline'); echo ' '.Help::display('srv_podatki_urejanje_inline');
} }
echo ' </label>';
echo '</div>';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
$userAccess = UserAccess::getInstance($global_user_id); $userAccess = UserAccess::getInstance($global_user_id);
if(!$userAccess->checkUserAccess($what='data_export')) { if(!$userAccess->checkUserAccess($what='data_export')) {
echo '<input type="checkbox" id="dataIcons_write" onclick="popupUserAccess(\'data_export\'); return false;"'
.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' ' echo '<div class="setting_line">';
.' /><label for="dataIcons_write" ' echo ' <input type="checkbox" id="dataIcons_write" onclick="popupUserAccess(\'data_export\'); return false;" '.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').'>';
.(!$userAccess->checkUserAccess($what='data_export') ? 'class="user_access_locked"' : '').'>' echo ' <label for="dataIcons_write" '.(!$userAccess->checkUserAccess($what='data_export') ? 'class="user_access_locked"' : '').'>'.$lang['srv_dataIcons_write'].'</label>';
.$lang['srv_dataIcons_write'].'</label>'; echo '</div>';
} }
else { else {
echo '<input type="checkbox" id="dataIcons_write" onchange="changeDataIcons(); return false;"' echo '<div class="setting_line">';
.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' ' echo ' <input type="checkbox" id="dataIcons_write" onchange="changeDataIcons(); return false;" '.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').'>';
.' /><label for="dataIcons_write" ' echo ' <label for="dataIcons_write">'.$lang['srv_dataIcons_write'].'</label>';
.'>'.$lang['srv_dataIcons_write'].'</label>'; echo '</div>';
} }
if (self::$_VARS[VAR_SHOW_SYSTEM] == false ) { if (self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
echo '<input type="checkbox" id="dataIcons_quick_view" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_quick_view'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_quick_view">'.$lang['srv_dataIcons_quick_view'].'</label>'; echo '<div class="setting_line">';
echo '&nbsp;&nbsp;'; echo ' <input type="checkbox" id="dataIcons_quick_view" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_quick_view'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_quick_view">'.$lang['srv_dataIcons_quick_view'].'</label>';
echo '<input type="checkbox" id="dataIcons_labels" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_labels'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_labels">'.$lang['srv_dataIcons_labels'].'</label>'; echo '</div>';
if ( self::showMultiple() ) { if ( self::showMultiple() ) {
echo '&nbsp;&nbsp;'; echo '<div class="setting_line">';
echo '<input type="checkbox" id="dataIcons_multiple" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_multiple'] == true ? ' checked="checekd"' : '').' /><label for="dataIcons_multiple">'.$lang['srv_dataIcons_multiple'].'</label>'; echo ' <input type="checkbox" id="dataIcons_multiple" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_multiple'] == true ? ' checked="checekd"' : '').' /><label for="dataIcons_multiple">'.$lang['srv_dataIcons_multiple'].'</label>';
echo '</div>';
} }
} else { }
echo '<input type="checkbox" id="dataIcons_quick_view" disabled="disabled" /><label for="dataIcons_quick_view" class="gray">'.$lang['srv_dataIcons_quick_view'].'</label>'; else {
echo '&nbsp;&nbsp;'; echo '<div class="setting_line">';
echo '<input type="checkbox" id="dataIcons_labels" disabled="disabled" /><label for="dataIcons_labels" class="gray">'.$lang['srv_dataIcons_labels'].'</label>'; echo ' <input type="checkbox" id="dataIcons_quick_view" disabled="disabled" /><label for="dataIcons_quick_view" class="gray">'.$lang['srv_dataIcons_quick_view'].'</label>';
echo '</div>';
if ( self::showMultiple() ) { if ( self::showMultiple() ) {
echo '&nbsp;&nbsp;'; echo '<div class="setting_line">';
echo '<input type="checkbox" id="dataIcons_multiple" disabled="disabled" /><label for="dataIcons_multiple" class="gray">'.$lang['srv_dataIcons_multiple'].'</label>'; echo ' <input type="checkbox" id="dataIcons_multiple" disabled="disabled" /><label for="dataIcons_multiple" class="gray">'.$lang['srv_dataIcons_multiple'].'</label>';
echo '</div>';
} }
} }
@ -1221,7 +1226,6 @@ class SurveyDataDisplay{
$prefix = ','; $prefix = ',';
} }
$sstring .=')'; $sstring .=')';
} }
} }
@ -1233,10 +1237,14 @@ class SurveyDataDisplay{
self::displayOnlyCMS(); self::displayOnlyCMS();
echo '</span>'; echo '</span>';
} }
echo '</div>';
} }
// Gumb zapri dodatne nastavitve
echo '<div class="button_holder">';
echo ' <button class="small blue" onClick="toggleDataCheckboxes(\'data\');">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo ' </div>';
echo '</div>'; echo '</div>';
@ -1758,7 +1766,7 @@ class SurveyDataDisplay{
if ($stolpci > 0 ) { if ($stolpci > 0 ) {
if (self::$displayEditIcons['dataIcons_edit'] == true) { if (self::$displayEditIcons['dataIcons_edit'] == true) {
// checkbox za brisanje vecih vrstic hkrati // checkbox za brisanje vecih vrstic hkrati
echo '<td class="data_edit" title="'.$lang['srv_view_data_row_select'].'"><input type="checkbox" class="delete_data_row" /></td>'; echo '<td class="data_edit" title="'.$lang['srv_view_data_row_select'].'"><input type="checkbox" id="delete_data_row_'.$cntLines.'" class="delete_data_row" /><label for="delete_data_row_'.$cntLines.'"></label></td>';
echo '<td class="data_edit"><span class="faicon delete_circle icon-orange_link" title="'.$lang['srv_delete_data_row'].'"/></span></td>'; echo '<td class="data_edit"><span class="faicon delete_circle icon-orange_link" title="'.$lang['srv_delete_data_row'].'"/></span></td>';
echo '<td class="data_edit"><span class="faicon edit_square icon-as_link" title="'.$lang['srv_edit_data_row'].'" /></span></td>'; echo '<td class="data_edit"><span class="faicon edit_square icon-as_link" title="'.$lang['srv_edit_data_row'].'" /></span></td>';
echo '<td class="data_edit"><span class="faicon edit smaller icon-as_link" title="'.$lang['srv_edit_data_row_quick'].'" /></span></td>'; echo '<td class="data_edit"><span class="faicon edit smaller icon-as_link" title="'.$lang['srv_edit_data_row_quick'].'" /></span></td>';
@ -2433,7 +2441,7 @@ class SurveyDataDisplay{
if ($stolpci > 0 ) { if ($stolpci > 0 ) {
if (self::$displayEditIcons['dataIcons_edit'] == true) { if (self::$displayEditIcons['dataIcons_edit'] == true) {
// checkbox za brisanje vecih vrstic hkrati // checkbox za brisanje vecih vrstic hkrati
echo '<td class="data_edit" title="'.$lang['srv_view_data_row_select'].'"><input type="checkbox" class="delete_data_row" /></td>'; echo '<td class="data_edit" title="'.$lang['srv_view_data_row_select'].'"><input type="checkbox" id="delete_data_row_'.$cntLines.'" class="delete_data_row" /><label for="delete_data_row_'.$cntLines.'"></label></td>';
echo '<td class="data_edit"><span class="faicon delete_circle icon-orange_link" title="'.$lang['srv_delete_data_row'].'"/></span></td>'; echo '<td class="data_edit"><span class="faicon delete_circle icon-orange_link" title="'.$lang['srv_delete_data_row'].'"/></span></td>';
echo '<td class="data_edit"><span class="faicon edit_square icon-as_link" title="'.$lang['srv_edit_data_row'].'" /></span></td>'; echo '<td class="data_edit"><span class="faicon edit_square icon-as_link" title="'.$lang['srv_edit_data_row'].'" /></span></td>';
echo '<td class="data_edit"><span class="faicon edit smaller icon-as_link" title="'.$lang['srv_edit_data_row_quick'].'" /></span></td>'; echo '<td class="data_edit"><span class="faicon edit smaller icon-as_link" title="'.$lang['srv_edit_data_row_quick'].'" /></span></td>';
@ -2977,7 +2985,7 @@ class SurveyDataDisplay{
} }
// recnum // recnum
echo '<tr><td class="left">'.$lang['srv_recnum'].':</td>'; echo '<tr><td class="left">'.$lang['srv_recnum_long'].':</td>';
echo '<td class="right">'.($rowu['recnum'] ? $rowu['recnum'] : '&nbsp;').'</td></tr>'; echo '<td class="right">'.($rowu['recnum'] ? $rowu['recnum'] : '&nbsp;').'</td></tr>';
// Pri volitvah nimamo parapodatkov // Pri volitvah nimamo parapodatkov

4
admin/survey/script/script.js
View File

@ -4642,13 +4642,13 @@ function toggleAdvancedModule(what, reload){
function toggleDataCheckboxes(podstran){ function toggleDataCheckboxes(podstran){
if($('#dataSettingsCheckboxes').css('display') == 'none'){ if($('#dataSettingsCheckboxes').css('display') == 'none'){
$("#dataSettingsCheckboxes").slideDown("slow"); $("#dataSettingsCheckboxes").fadeIn("medium");
var showSettings = 1; var showSettings = 1;
$(".dropdown_blue").switchClass("dropdown_blue", "dropup_blue"); $(".dropdown_blue").switchClass("dropdown_blue", "dropup_blue");
} }
else{ else{
$("#dataSettingsCheckboxes").slideUp("slow"); $("#dataSettingsCheckboxes").fadeOut("medium");
var showSettings = 0; var showSettings = 0;
$(".dropup_blue").switchClass("dropup_blue", "dropdown_blue"); $(".dropup_blue").switchClass("dropup_blue", "dropdown_blue");

22
lang/1.php
View File

@ -2367,6 +2367,8 @@ $lang = array (
"srv_concl_link_datapiping" => "V url lahko vključite tudi vrednosti odgovorov s sintakso <b>#IME_VPRAŠANJA#</b><br />(npr. https://www.1ka.si?q1=#Q1#)", "srv_concl_link_datapiping" => "V url lahko vključite tudi vrednosti odgovorov s sintakso <b>#IME_VPRAŠANJA#</b><br />(npr. https://www.1ka.si?q1=#Q1#)",
"srv_library" => "Knji&#382;nica", "srv_library" => "Knji&#382;nica",
"srv_library_survey_title" => "Knjižnica vprašanj", "srv_library_survey_title" => "Knjižnica vprašanj",
"srv_library_survey_tab_questions" => "Samostojna vprašanja",
"srv_library_survey_tab_surveys" => "Vprašanja v anketah",
"srv_library_survey_add" => "Dodaj v anketo", "srv_library_survey_add" => "Dodaj v anketo",
"srv_library_item_counter" => "Št. izbranih vprašanj", "srv_library_item_counter" => "Št. izbranih vprašanj",
"srv_library_folder_add" => "Dodaj podmapo", "srv_library_folder_add" => "Dodaj podmapo",
@ -2435,8 +2437,8 @@ $lang = array (
"srv_created" => "Ustvarjeno", "srv_created" => "Ustvarjeno",
"srv_anketarestore" => "Aktiviraj arhivsko verzijo vprašalnika", "srv_anketarestore" => "Aktiviraj arhivsko verzijo vprašalnika",
"srv_anketarestoredata" => "Aktiviraj arhiv podatkov", "srv_anketarestoredata" => "Aktiviraj arhiv podatkov",
"srv_show_inserts" => "Enote", "srv_show_inserts" => "Enote na stran:",
"srv_show_questions" => "Vprašanja", "srv_show_questions" => "Vprašanja na stran:",
"srv_allpages" => "Vse strani", "srv_allpages" => "Vse strani",
"srv_move" => "Premakni", "srv_move" => "Premakni",
"srv_call_start" => "Za&#269;ni s klicanjem telefonskih &#154;tevilk", "srv_call_start" => "Za&#269;ni s klicanjem telefonskih &#154;tevilk",
@ -4368,11 +4370,13 @@ $lang = array (
"srv_invitation_recipients" => "Prejemniki", "srv_invitation_recipients" => "Prejemniki",
"srv_invitation_preview" => "Predogled", "srv_invitation_preview" => "Predogled",
"srv_invitation_send" => "Pošlji e-maile", "srv_invitation_send" => "Pošlji e-maile",
"srv_displaydata_relevance" => "Ustreznost", "srv_displaydata_columns" => "Prikaz stolpcev",
"srv_displaydata_relevance" => "Ustreznost enote (DA/NE)",
"srv_displaydata_invitation" => "Vabilo", "srv_displaydata_invitation" => "Vabilo",
"srv_displaydata_data" => "Podatke", "srv_displaydata_data" => "Odgovori respondentov",
"srv_displaydata_status" => "Status", "srv_displaydata_status" => "Status",
"srv_displaydata_meta" => "Para podatki", "srv_displaydata_meta" => "Para podatki",
"srv_displaydata_meta2" => "Parapodatki respondentov",
"srv_displaydata_system_data" => "Identifikatorji", "srv_displaydata_system_data" => "Identifikatorji",
"srv_displaydata_pdf_type" => "Dolg izpis odgovorov v PDF", "srv_displaydata_pdf_type" => "Dolg izpis odgovorov v PDF",
"srv_displaydata_type" => "Izpis PDF/RTF", "srv_displaydata_type" => "Izpis PDF/RTF",
@ -5433,11 +5437,13 @@ $lang = array (
"reg_can_social" => 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.', "reg_can_social" => 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.',
"login_or_register" => 'Prijava ali registracija', "login_or_register" => 'Prijava ali registracija',
"srv_not_default_setting" => '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«', "srv_not_default_setting" => '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«',
"srv_dataIcons_write" => 'Izpisi', "srv_dataIcons_write" => 'Izvoz posamezne ankete',
"srv_dataIcons_labels" => 'Labele', "srv_dataIcons_labels" => 'Labele',
"srv_dataIcons_note" => 'Ikone:', "srv_dataIcons_note" => 'Ikone:',
"srv_dataIcons_quick_view" => 'Vpogled', "srv_dataIcons_quick_view" => 'Vpogled v posamezno anketo',
"srv_dataIcons_edit" => 'Urejanje', "srv_dataIcons_edit" => 'Urejanje posamezne ankete',
"srv_dataTable_settings_show" => 'V tabeli naj bodo prikazani:',
"srv_dataTable_settings_shortcuts" => 'Bljižnice za:',
"login_for_existing" => 'Prijava za obstoje&#269;e uporabnike', "login_for_existing" => 'Prijava za obstoje&#269;e uporabnike',
"login_for_existing2" => 'Obstoje&#269;i uporabniki', "login_for_existing2" => 'Obstoje&#269;i uporabniki',
"simplified_social_login" => 'Poenostavljena prijava preko socialnih omre&#382;ij', "simplified_social_login" => 'Poenostavljena prijava preko socialnih omre&#382;ij',
@ -5522,6 +5528,7 @@ $lang = array (
"srv_data_lurker" => "Prazna", "srv_data_lurker" => "Prazna",
"srv_data_test" => "Testni", "srv_data_test" => "Testni",
"srv_data_date" => "Datum", "srv_data_date" => "Datum",
"srv_data_date2" => "Datum izpolnjevanja ankete",
"srv_library_edit" => "Urejanje knjižnice", "srv_library_edit" => "Urejanje knjižnice",
"srv_library_edit_add" => "Dodaj to anketo v mojo knjižnico", "srv_library_edit_add" => "Dodaj to anketo v mojo knjižnico",
"srv_library_q_txt" => "Za prenos vprašanj (ali blokov) uporabite povleci in spusti", "srv_library_q_txt" => "Za prenos vprašanj (ali blokov) uporabite povleci in spusti",
@ -6586,6 +6593,7 @@ $lang = array (
'srv_izberite_identifikator' => 'Izberite polje, po katerem želite izvesti združevanje (ključ):', 'srv_izberite_identifikator' => 'Izberite polje, po katerem želite izvesti združevanje (ključ):',
'srv_show' => 'Prikaži', 'srv_show' => 'Prikaži',
'srv_recnum' => 'Zap. št.', 'srv_recnum' => 'Zap. št.',
'srv_recnum_long' => 'Zaporedna številka respondenta',
'srv_recnum2' => 'Recnum', 'srv_recnum2' => 'Recnum',
'srv_aapor' => 'AAPOR kalkulacije', 'srv_aapor' => 'AAPOR kalkulacije',
'srv_languages_statistics' => 'Statistika jezikov', 'srv_languages_statistics' => 'Statistika jezikov',

20
lang/2.php
View File

@ -2352,6 +2352,8 @@ $lang = array (
"srv_concl_link_datapiping" => "URL can also contain values of responded questions with sintax <b>#QUESTION_NAME#</b><br />(e.g. https://www.1ka.si?q1=#Q1#)", "srv_concl_link_datapiping" => "URL can also contain values of responded questions with sintax <b>#QUESTION_NAME#</b><br />(e.g. https://www.1ka.si?q1=#Q1#)",
"srv_library" => "Library", "srv_library" => "Library",
"srv_library_survey_title" => "Questions library", "srv_library_survey_title" => "Questions library",
"srv_library_survey_tab_questions" => "Single questions",
"srv_library_survey_tab_surveys" => "Questions in surveys",
"srv_library_survey_add" => "Add to survey", "srv_library_survey_add" => "Add to survey",
"srv_library_item_counter" => "No. of selected questions", "srv_library_item_counter" => "No. of selected questions",
"srv_library_folder_add" => "Add folder", "srv_library_folder_add" => "Add folder",
@ -2416,8 +2418,8 @@ $lang = array (
"srv_created" => "Created", "srv_created" => "Created",
"srv_anketarestore" => "Activate survey", "srv_anketarestore" => "Activate survey",
"srv_anketarestoredata" => "Activate data archive", "srv_anketarestoredata" => "Activate data archive",
"srv_show_inserts" => "Units", "srv_show_inserts" => "Units per page:",
"srv_show_questions" => "Questions", "srv_show_questions" => "Questions per page:",
"srv_allpages" => "All pages", "srv_allpages" => "All pages",
"srv_move" => "Move", "srv_move" => "Move",
"srv_call_start" => "Start calling telephone numbers", "srv_call_start" => "Start calling telephone numbers",
@ -4350,11 +4352,13 @@ $lang = array (
"srv_invitation_recipients" => "Recipients", "srv_invitation_recipients" => "Recipients",
"srv_invitation_preview" => "Preview", "srv_invitation_preview" => "Preview",
"srv_invitation_send" => "Send e-mails", "srv_invitation_send" => "Send e-mails",
"srv_displaydata_columns" => "Show columns",
"srv_displaydata_relevance" => "Eligible", "srv_displaydata_relevance" => "Eligible",
"srv_displaydata_invitation" => "Invitation", "srv_displaydata_invitation" => "Invitation",
"srv_displaydata_data" => "Data", "srv_displaydata_data" => "Respondent data",
"srv_displaydata_status" => "Status", "srv_displaydata_status" => "Status",
"srv_displaydata_meta" => "Paradata", "srv_displaydata_meta" => "Paradata",
"srv_displaydata_meta2" => "Respondent paradata",
"srv_displaydata_system_data" => "Identifiers", "srv_displaydata_system_data" => "Identifiers",
"srv_displaydata_pdf_type" => "Long answers in PDF", "srv_displaydata_pdf_type" => "Long answers in PDF",
"srv_displaydata_type" => "Answer type", "srv_displaydata_type" => "Answer type",
@ -5397,11 +5401,13 @@ $lang = array (
"reg_can_social" => 'You can also register or login using your social network username.', "reg_can_social" => 'You can also register or login using your social network username.',
"login_or_register" => 'Login or register', "login_or_register" => 'Login or register',
"srv_not_default_setting" => '»You have selected your own settings that differ from the default 1KA settings«', "srv_not_default_setting" => '»You have selected your own settings that differ from the default 1KA settings«',
"srv_dataIcons_write" => 'Print', "srv_dataIcons_write" => 'Export survey',
"srv_dataIcons_labels" => 'Labels', "srv_dataIcons_labels" => 'Labels',
"srv_dataIcons_note" => 'Icons', "srv_dataIcons_note" => 'Icons',
"srv_dataIcons_quick_view" => 'Quick view', "srv_dataIcons_quick_view" => 'Quick view survey',
"srv_dataIcons_edit" => 'Edit', "srv_dataIcons_edit" => 'Edit survey',
"srv_dataTable_settings_show" => 'Show in table:',
"srv_dataTable_settings_shortcuts" => 'Shortcuts for:',
"login_for_existing" => 'Login for existing users', "login_for_existing" => 'Login for existing users',
"login_for_existing2" => 'Existing users', "login_for_existing2" => 'Existing users',
"simplified_social_login" => 'Simplified social network login', "simplified_social_login" => 'Simplified social network login',
@ -5486,6 +5492,7 @@ $lang = array (
"srv_data_lurker" => "Empty", "srv_data_lurker" => "Empty",
"srv_data_test" => "Test", "srv_data_test" => "Test",
"srv_data_date" => "Date", "srv_data_date" => "Date",
"srv_data_date2" => "Response date",
"srv_library_edit" => "Edit library", "srv_library_edit" => "Edit library",
"srv_library_edit_add" => "Add this survey to my library", "srv_library_edit_add" => "Add this survey to my library",
"srv_library_q_txt" => "To add questions (blocks) use drag and drop", "srv_library_q_txt" => "To add questions (blocks) use drag and drop",
@ -6473,6 +6480,7 @@ $lang = array (
'srv_izberite_identifikator' => 'Select the key:', 'srv_izberite_identifikator' => 'Select the key:',
'srv_show' => 'Show', 'srv_show' => 'Show',
'srv_recnum' => 'Rec. num.', 'srv_recnum' => 'Rec. num.',
'srv_recnum_long' => 'Respondent record number',
'srv_recnum2' => 'Recnum', 'srv_recnum2' => 'Recnum',
'srv_aapor' => 'AAPOR calculations', 'srv_aapor' => 'AAPOR calculations',
'srv_languages_statistics' => 'Languages statistics', 'srv_languages_statistics' => 'Languages statistics',

2895
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

21
resources/sass/admin_new/pages/survey_data/data_table.scss
View File

@ -58,6 +58,14 @@
color: $blue; color: $blue;
} }
} }
label{
margin: 0;
&:before{
letter-spacing: 0;
}
}
} }
&.data_uid{ &.data_uid{
@ -81,6 +89,15 @@
&.cell_paradata{ &.cell_paradata{
background: #F4F9FE; background: #F4F9FE;
} }
span.sort_holder{
position: absolute;
margin-left: -12px;
}
}
&.row3 th{
cursor: pointer;
} }
} }
@ -95,6 +112,10 @@
max-height: 40px; max-height: 40px;
font-size: 14px; font-size: 14px;
span{
font-size: 14px;
}
} }
} }
} }

86
resources/sass/admin_new/pages/survey_data/data_table_settings.scss
View File

@ -6,7 +6,7 @@
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 16px; margin-bottom: 16px;
padding: 8px 16px; padding: 6px 16px;
background: $light-gray; background: $light-gray;
border: 1px solid $gray; border: 1px solid $gray;
@ -19,10 +19,46 @@
padding-right: 8px; padding-right: 8px;
border-right: 1px $dark-gray solid; border-right: 1px $dark-gray solid;
button.white-blue{
height: 28px;
width: 140px;
padding: 0;
line-height: 12px;
font-size: 14px;
font-weight: 400;
color: $black;
border-radius: 2px;
.faicon:before{
margin-right: 8px;
font-size: 12px;
color: $blue;
}
}
} }
#data_search_filter{ #data_search_filter{
input{
padding: 7px 14px;
margin: 0;
height: 28px;
width: 200px;
font-size: 14px;
}
.search_filtered{
margin-left: 16px;
color: red;
font-size: 14px;
font-weight: 600;
}
} }
#vnosi_paginacija{ #vnosi_paginacija{
@ -30,6 +66,27 @@
position: absolute; position: absolute;
right: 16px; right: 16px;
select{
height: 28px;
margin: 0;
}
label{
margin-right: 8px;
margin-left: 16px;
}
.faicon.arrow2_l{
margin-right: 8px;
}
.faicon.arrow2_r{
margin-left: 8px;
}
#div_paginacija_vprasanj{
margin-left: 16px;
}
} }
#dataSettingsCheckboxes{ #dataSettingsCheckboxes{
@ -40,6 +97,33 @@
top: 41px; top: 41px;
border-radius: 2px; border-radius: 2px;
.dataSettingsCheckboxes_holder{
display: flex;
flex-direction: column;
.setting_line{
margin-bottom: 12px;
font-size: 14px;
&.title{
font-weight: 600;
text-transform: uppercase;
}
label{
font-size: 14px;
}
}
.button_holder{
padding: 8px 0 0 0;
margin: 0;
border-top: 1px $gray solid;
}
}
} }
} }