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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-01-28 12:43:03 +01:00
commit 9f61e51ee8
7 changed files with 41 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
admin/survey/SurveyAdminSettings.php
View File

@ -4262,68 +4262,31 @@ class SurveyAdminSettings {
function arhivi_survey() { function arhivi_survey() {
global $lang; global $lang;
// Uvoz/izvoz samo ankete - po novem je uvoz pri kreiranju ankete // Izvoz samo ankete
if($_GET['m'] == 'survey'){ if($_GET['m'] == 'survey'){
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'.$lang['srv_survey_archives_ie_title'].'</legend>'; echo '<legend>'.$lang['srv_survey_archives_ie_title'].'</legend>';
echo '<p class="italic">'.$lang['srv_survey_archives_note_survey'].'</p>'; echo '<p>'.$lang['srv_survey_archives_note_survey'].'</p>';
// Izvoz echo '<div class="button_holder top16 bottom0">';
echo '<p>'; echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?a=archive_download&anketa='.$this->anketa.'\';" >'.$lang['srv_survey_archives_export'].'</button>';
echo '<span class="bold">'.$lang['srv_survey_archives_export'].'</span>'; echo '</div>';
echo '<br />'.$lang['srv_survey_archives_export_text'];
echo '<span class="buttonwrapper floatLeft" style="margin-top:3px;" title="'.$lang['srv_survey_archives_export_save'].'"><a class="ovalbutton ovalbutton_orange" href="ajax.php?a=archive_download&anketa='.$this->anketa.'">'.$lang['srv_survey_archives_export_save'].'</a></span>';
echo '</p>';
echo '<br /><br />';
// Uvoz
/*echo '<p style="margin-bottom:20px;">';
echo '<span class="bold">'.$lang['srv_survey_archives_import'].'</span>';
echo '<br />'.$lang['srv_survey_archives_import_text'];
echo '<br /><span class="buttonwrapper floatLeft" style="margin-top:3px;" title="'.$lang['srv_survey_archives_import_import'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#restore\').toggle(); return false;">'.$lang['srv_survey_archives_import_import'].'</a></span>';
echo '<br />';
echo '<form style="display:none" id="restore" action="ajax.php?a=archive_restore" method="post" name="restorefrm" enctype="multipart/form-data" >
<span style="line-height:18px;">'.$lang['srv_arhiv_datoteka_save_txt2'].':
<input type="hidden" name="has_data" value="0" />
<input type="file" name="restore" onchange="document.restorefrm.submit();" /></span>
<br /><span class="italic">'.$lang['srv_arhiv_datoteka_restore_help'].'</span>
</form>';
echo '</p>';*/
echo '</fieldset>'; echo '</fieldset>';
} }
// Uvoz/izvoz ankete s podatki - po novem je uvoz pri kreiranju ankete
// Izvoz ankete s podatki
else{ else{
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'.$lang['srv_survey_archives_ie_data_title'].'</legend>'; echo '<legend>'.$lang['srv_survey_archives_ie_data_title'].'</legend>';
echo '<p class="italic">'.$lang['srv_survey_archives_note_survey_data'].'</p>'; echo '<p>'.$lang['srv_survey_archives_note_survey_data'].'</p>';
// Izvoz echo '<div class="button_holder top16 bottom0">';
echo '<p>'; echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?a=archive_download&anketa='.$this->anketa.'&data=true\';" >'.$lang['srv_survey_archives_export'].'</button>';
echo '<span class="bold">'.$lang['srv_survey_archives_export'].'</span>'; echo '</div>';
echo '<br />'.$lang['srv_survey_archives_export_text'];
echo '<span class="buttonwrapper floatLeft" style="margin-top:3px;" title="'.$lang['srv_survey_archives_export_save'].'"><a class="ovalbutton ovalbutton_orange" href="ajax.php?a=archive_download&anketa='.$this->anketa.'&data=true">'.$lang['srv_survey_archives_export_save'].'</a></span>';
echo '</p>';
echo '<br /><br />';
// Uvoz
/*echo '<p style="margin-bottom:20px;">';
echo '<span class="bold">'.$lang['srv_survey_archives_import'].'</span>';
echo '<br />'.$lang['srv_survey_archives_import_text'];
echo '<br /><span class="buttonwrapper floatLeft" style="margin-top:3px;" title="'.$lang['srv_survey_archives_import_import'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#restore_data\').toggle(); return false;">'.$lang['srv_survey_archives_import_import'].'</a></span>';
echo '<br />';
echo '<form style="display:none" id="restore_data" action="ajax.php?a=archive_restore" method="post" name="restoredatafrm" enctype="multipart/form-data" >
<span style="line-height:18px;">'.$lang['srv_arhiv_datoteka_save_txt2'].':
<input type="hidden" name="has_data" value="1" />
<input type="file" name="restore_data" onchange="document.restoredatafrm.submit();" /></span>
<br /><span class="italic">'.$lang['srv_arhiv_datoteka_restore_help'].'</span>
</form>';
echo '</p>';*/
echo '</fieldset>'; echo '</fieldset>';
} }
} }

18
admin/survey/classes/tracking/TrackingClass.php
View File

@ -148,7 +148,7 @@ class TrackingClass
echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>'; echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
echo '</div>'; echo '</div>';
echo '<table id="tracking">'; echo '<table id="tracking" class="fullwidth">';
// Prva vrstica // Prva vrstica
echo '<tr>'; echo '<tr>';
echo ' <th>' . $lang['date'] . '</th>'; echo ' <th>' . $lang['date'] . '</th>';
@ -161,7 +161,7 @@ class TrackingClass
$count = 0; $count = 0;
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
echo '<tr '.($count > 24 ? 'class="displayNone"' : '').'>'; echo '<tr '.($count > 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>';
$sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
$rowu = mysqli_fetch_array($sqlu); $rowu = mysqli_fetch_array($sqlu);
@ -212,7 +212,7 @@ class TrackingClass
echo ' <td>' . $row['ip'] . '</td>'; echo ' <td>' . $row['ip'] . '</td>';
echo ' <td>' . $recnum . '</td>'; echo ' <td>' . $recnum . '</td>';
echo ' <td><div class="postget_wrap">' . $row['get'] . '</div></td>'; echo ' <td><div class="postget_wrap">' . $row['get'] . '</div></td>';
echo ' <td><div class="postget_wrap">' . $row['post'] . '</div></td>'; echo ' <td><div class="postget_wrap">' . (($row['post'] != "") ? $row['post'] : '/') . '</div></td>';
echo '</tr>'; echo '</tr>';
@ -254,16 +254,18 @@ class TrackingClass
$sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
if(!empty(mysqli_fetch_array($sql))) { if(!empty(mysqli_fetch_array($sql))) {
echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>'; if($appendMerge == "")
echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
else
echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].', '.$lang['srv_survey_archives_tracking_survey_text_appendmerge'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
// Izvoz v Excel // Izvoz v Excel
echo '<div class="izvoz_nad_tabelo">'; echo '<div class="izvoz_nad_tabelo">';
echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>'; echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
echo '</div>'; echo '</div>';
echo '<table id="tracking">'; echo '<table id="tracking" class="fullwidth">';
// Prva vrstica // Prva vrstica
echo '<tr>'; echo '<tr>';
echo ' <th>' . $lang['date'] . '</th>'; echo ' <th>' . $lang['date'] . '</th>';
@ -276,7 +278,7 @@ class TrackingClass
$count = 0; $count = 0;
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
echo '<tr '.($count > 24 ? 'class="displayNone"' : '').'>'; echo '<tr '.($count > 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>';
$sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
$rowu = mysqli_fetch_array($sqlu); $rowu = mysqli_fetch_array($sqlu);
@ -286,7 +288,7 @@ class TrackingClass
echo ' <td>' . $row['ip'] . '</td>'; echo ' <td>' . $row['ip'] . '</td>';
echo ' <td>' . $statuses[$row['status']] . '</td>'; echo ' <td>' . $statuses[$row['status']] . '</td>';
echo ' <td><div class="postget_wrap">' . $row['get'] . '</div></td>'; echo ' <td><div class="postget_wrap">' . $row['get'] . '</div></td>';
echo ' <td><div class="postget_wrap">' . $row['post'] . '</div></td>'; echo ' <td><div class="postget_wrap">' . (($row['post'] != "") ? $row['post'] : '/') . '</div></td>';
echo '</tr>'; echo '</tr>';
$count++; $count++;

5
lang/1.php
View File

@ -4128,6 +4128,7 @@ $lang = array (
"srv_survey_archives_tracking" => "Spremembe", "srv_survey_archives_tracking" => "Spremembe",
"srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika",
"srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb", "srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb",
"srv_survey_archives_tracking_survey_text_appendmerge" => "povezanih z dodajanjem ali združevanjem podatkov",
"srv_survey_archives_tracking_survey_text1a" => "v vprašalniku", "srv_survey_archives_tracking_survey_text1a" => "v vprašalniku",
"srv_survey_archives_tracking_survey_text1b" => "v zavihku", "srv_survey_archives_tracking_survey_text1b" => "v zavihku",
"srv_survey_archives_tracking_survey_text1c" => "za vprašalnik", "srv_survey_archives_tracking_survey_text1c" => "za vprašalnik",
@ -4141,8 +4142,8 @@ $lang = array (
"srv_survey_archives_tracking_hierarchy_users" => "Spremembe uporabnikov", "srv_survey_archives_tracking_hierarchy_users" => "Spremembe uporabnikov",
"srv_survey_archives_tracking_last_changes" => "Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\">Excel datoteko</a>)", "srv_survey_archives_tracking_last_changes" => "Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\">Excel datoteko</a>)",
"srv_survey_archives_note" => "Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.", "srv_survey_archives_note" => "Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.",
"srv_survey_archives_note_survey" => "Shranjevanje in prenos arhivske datoteke za vprašalnik.", "srv_survey_archives_note_survey" => "S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
"srv_survey_archives_note_survey_data" => "Shranjevanje in prenos arhivske datoteke za vprašalnik in podatke.", "srv_survey_archives_note_survey_data" => "S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik in podatke. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
"srv_survey_archives_import" => "Uvoz", "srv_survey_archives_import" => "Uvoz",
"srv_survey_archives_import_text" => "Restavriranje vprašalnika iz arhivske datoteke", "srv_survey_archives_import_text" => "Restavriranje vprašalnika iz arhivske datoteke",
"srv_survey_archives_import_import" => "Restavriraj", "srv_survey_archives_import_import" => "Restavriraj",

5
lang/2.php
View File

@ -4111,6 +4111,7 @@ $lang = array (
"srv_survey_archives_tracking" => "Changes", "srv_survey_archives_tracking" => "Changes",
"srv_survey_archives_tracking_survey" => "Survey changes", "srv_survey_archives_tracking_survey" => "Survey changes",
"srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes", "srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes",
"srv_survey_archives_tracking_survey_text_appendmerge" => "related to adding or merging data",
"srv_survey_archives_tracking_survey_text1a" => "to the survey", "srv_survey_archives_tracking_survey_text1a" => "to the survey",
"srv_survey_archives_tracking_survey_text1b" => "on the page", "srv_survey_archives_tracking_survey_text1b" => "on the page",
"srv_survey_archives_tracking_survey_text1c" => "for the survey", "srv_survey_archives_tracking_survey_text1c" => "for the survey",
@ -4124,8 +4125,8 @@ $lang = array (
"srv_survey_archives_tracking_hierarchy_users" => "Users changes", "srv_survey_archives_tracking_hierarchy_users" => "Users changes",
"srv_survey_archives_tracking_last_changes" => "Last 25 changes (to view all changes <a href=\"ajax.php?a=user_tracking&d=download\">download Excel</a>)", "srv_survey_archives_tracking_last_changes" => "Last 25 changes (to view all changes <a href=\"ajax.php?a=user_tracking&d=download\">download Excel</a>)",
"srv_survey_archives_note" => "Save survey and data archive file to your computer.", "srv_survey_archives_note" => "Save survey and data archive file to your computer.",
"srv_survey_archives_note_survey" => "Save survey archive file to your computer.", "srv_survey_archives_note_survey" => "Click on the 'Export' button to download and save the archive file for the questionnaire. The file with the extension .1ka will be saved on your computer in the default downloads folder.",
"srv_survey_archives_note_survey_data" => "Save survey and data archive file to your computer.", "srv_survey_archives_note_survey_data" => "Click on the 'Export' button to download and save the archive file for the questionnaire and the data. The file with the extension .1ka will be saved on your computer in the default downloads folder.",
"srv_survey_archives_import" => "Import", "srv_survey_archives_import" => "Import",
"srv_survey_archives_import_text" => "Restore survey from archive file", "srv_survey_archives_import_text" => "Restore survey from archive file",
"srv_survey_archives_import_import" => "Restore", "srv_survey_archives_import_import" => "Restore",

5
public/css/admin_new.css
View File

@ -10707,7 +10707,7 @@ input.disabled {
fieldset { fieldset {
margin-bottom: 32px; margin-bottom: 32px;
padding: 32px; padding: 24px 32px 32px;
box-sizing: border-box; box-sizing: border-box;
margin-inline-start: 0; margin-inline-start: 0;
margin-inline-end: 0; margin-inline-end: 0;
@ -10916,6 +10916,9 @@ table tr {
table tr:last-of-type td, table tr:last-of-type th, table tr.show_as_last_row td, table tr.show_as_last_row th { table tr:last-of-type td, table tr:last-of-type th, table tr.show_as_last_row td, table tr.show_as_last_row th {
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
table.fullwidth {
width: 100%;
}
table#passwords_table, table#groups_table { table#passwords_table, table#groups_table {
min-width: 421px; min-width: 421px;
} }

2
resources/sass/admin_new/components/form/fieldset.scss
View File

@ -1,6 +1,6 @@
fieldset{ fieldset{
margin-bottom: 32px; margin-bottom: 32px;
padding: 32px; padding: 24px 32px 32px;
box-sizing: border-box; box-sizing: border-box;
margin-inline-start: 0; margin-inline-start: 0;

4
resources/sass/admin_new/components/table/table.scss
View File

@ -44,6 +44,10 @@ table {
} }
} }
&.fullwidth {
width: 100%;
}
&#passwords_table, &#passwords_table,
&#groups_table { &#groups_table {
min-width: 421px; min-width: 421px;