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

[Redizajn 1KA] - Urejanje --> Arhiv --> Arhivi testnih vnosov - v3

Browse Source
This commit is contained in:
tejagerjovic 2022-02-16 18:58:57 +01:00
parent 483f18aa82
commit c7bc8fc01a
5 changed files with 1474 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
admin/survey/SurveyAdminSettings.php
View File

@ -4282,62 +4282,77 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_archive_test_data_text1'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_archive_test_data_text1a'].'</a>'.$lang['srv_archive_test_data_text2'].'<a href="' . $link . '&preview=on&testdata=on' . $preview_options . '" title="" target="_blank">'.$lang['srv_archive_test_data_text2a'].'</a>'.$lang['srv_archive_test_data_text3'].'</p>'; echo '<p class="bottom16">'.$lang['srv_archive_test_data_text1'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_archive_test_data_text1a'].'</a>'.$lang['srv_archive_test_data_text2'].'<a href="' . $link . '&preview=on&testdata=on' . $preview_options . '" title="" target="_blank">'.$lang['srv_archive_test_data_text2a'].'</a>'.$lang['srv_archive_test_data_text3'].'</p>';
// Avtomatski vnosi //Nimamo nobenih vnosov
$str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='2') GROUP BY day(time_insert)"; $str_testdata_any = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2') GROUP BY day(time_insert)";
$query_testdata = sisplet_query($str_testdata); $query_testdata_any = sisplet_query($str_testdata_any);
$table_exists = 0; list($testdata_any) = mysqli_fetch_row($query_testdata_any);
while ($testdata = mysqli_fetch_array($query_testdata)) { if ((int)$testdata_any == 0) {
// Izpišemo naslov in začetek tabele echo '<p class="top16">'.$lang['srv_archive_test_data_none1']. $surveyName . $lang['srv_archive_test_data_none2'] . $lang['srv_archive_test_data_none3'].'.</p>';
if($table_exists==0 && $testdata[cnt]!=0) { }
echo '<p class="bold">'.$lang['srv_archive_test_data_timeline_auto'].$surveyName.':</p>'; else { // Imamo vnose, izpišemo eno ali obe tabeli
echo '<table id="testni_vnosi">';
echo '<tr>'; // Avtomatski vnosi
echo '<th>'.$lang['srv_archive_test_data_date'].'</th>'; $str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='2') GROUP BY day(time_insert)";
echo '<th class="right">'.$lang['srv_archive_test_data_count'].'</th>'; $query_testdata = sisplet_query($str_testdata);
echo '</tr>'; $table_exists1 = 0;
while ($testdata = mysqli_fetch_array($query_testdata)) {
// Izpišemo naslov in začetek tabele
if($table_exists1==0 && $testdata[cnt]!=0) {
echo '<p class="bold">'.$lang['srv_archive_test_data_timeline_auto'].$surveyName.':</p>';
echo '<table id="testni_vnosi">';
echo '<tr>';
echo '<th>'.$lang['srv_archive_test_data_date'].'</th>';
echo '<th class="right">'.$lang['srv_archive_test_data_count'].'</th>';
echo '</tr>';
$table_exists=1; $table_exists1=1;
}
echo '<tr>';
echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>';
echo '<td class="right">'.$testdata[cnt].'</td>';
echo '</tr>';
} }
// if($table_exists1==1) {
echo '<tr>'; echo '</table>';
echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>'; }
echo '<td class="right">'.$testdata[cnt].'</td>'; else { // Izpišemo, da ni avtomatskih vnosov.
echo '</tr>'; echo '<p class="top16">'.$lang['srv_archive_test_data_none1']. $surveyName . $lang['srv_archive_test_data_none2'] . $lang['srv_archive_test_data_none_automatic'] . $lang['srv_archive_test_data_none3'].'.</p>';
} }
// Ročni vnosi
$str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1') GROUP BY day(time_insert)";
$query_testdata = sisplet_query($str_testdata);
$table_exists2 = 0;
while ($testdata = mysqli_fetch_array($query_testdata)) {
// Izpišemo naslov in začetek tabele
if($table_exists2==0 && $testdata[cnt]!=0) {
echo '<p class="bold top16">'.$lang['srv_archive_test_data_timeline_manual'].$surveyName.':</p>';
echo '<table id="testni_vnosi">';
echo '<tr>';
echo '<th>'.$lang['srv_archive_test_data_date'].'</th>';
echo '<th class="right">'.$lang['srv_archive_test_data_count'].'</th>';
echo '</tr>';
$table_exists2=1;
}
if($table_exists=1) {
echo '</table>';
}
// Ročni vnosi
$str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1') GROUP BY day(time_insert)";
$query_testdata = sisplet_query($str_testdata);
$table_exists = 0;
while ($testdata = mysqli_fetch_array($query_testdata)) {
// Izpišemo naslov in začetek tabele
if($table_exists==0 && $testdata[cnt]!=0) {
echo '<p class="bold top16">'.$lang['srv_archive_test_data_timeline_manual'].$surveyName.':</p>';
echo '<table id="testni_vnosi">';
echo '<tr>'; echo '<tr>';
echo '<th>'.$lang['srv_archive_test_data_date'].'</th>'; echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>';
echo '<th class="right">'.$lang['srv_archive_test_data_count'].'</th>'; echo '<td class="right">'.$testdata[cnt].'</td>';
echo '</tr>'; echo '</tr>';
$table_exists=1;
} }
// if($table_exists2==1) {
echo '<tr>'; echo '</table>';
echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>'; }
echo '<td class="right">'.$testdata[cnt].'</td>'; else { // Izpišemo, da ni ročnih vnosov.
echo '</tr>'; echo '<p class="top16">'.$lang['srv_archive_test_data_none1']. $surveyName . $lang['srv_archive_test_data_none2'] . $lang['srv_archive_test_data_none_manual'] . $lang['srv_archive_test_data_none3'].'.</p>';
} }
if($table_exists=1) {
echo '</table>';
} }
echo '</fieldset>'; echo '</fieldset>';
} }

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

@ -134,6 +134,13 @@ class SurveyStaticHtml
echo '</li>'; echo '</li>';
} }
# arhivi testnih vnosov
if ($this->survey_type > 1) {
echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
echo '</li>';
}
# arhivi objave # arhivi objave
if ($d->checkDostopSub('publish')) { if ($d->checkDostopSub('publish')) {
echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="active"' : '') . $_js_links[2] . '>'; echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="active"' : '') . $_js_links[2] . '>';
@ -175,18 +182,6 @@ class SurveyStaticHtml
} }
} }
# arhivi testnih vnosov
if ($this->survey_type > 1) {
$str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='" . $this->sid . "' AND (testdata='1' OR testdata='2') AND deleted='0'";
$query_testdata = sisplet_query($str_testdata);
list($testdata) = mysqli_fetch_row($query_testdata);
if ((int)$testdata > 0) {
echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
echo '</li>';
}
}
# arhivi sprememb # arhivi sprememb
if ($d->checkDostopSub('edit')) { if ($d->checkDostopSub('edit')) {
echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA ? ' class="navi_tracking active"' : ' class="navi_tracking"') . '>'; echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA ? ' class="navi_tracking active"' : ' class="navi_tracking"') . '>';

5
lang/1.php
View File

@ -6333,6 +6333,11 @@ $lang = array (
'srv_archive_test_data_date' => 'Datum testnih vnosov', 'srv_archive_test_data_date' => 'Datum testnih vnosov',
'srv_archive_test_data_timeline_manual' => 'Časovnica ročnih testnih vnosov za vprašalnik ', 'srv_archive_test_data_timeline_manual' => 'Časovnica ročnih testnih vnosov za vprašalnik ',
'srv_archive_test_data_timeline_auto' => 'Časovnica avtomatskih testnih vnosov za vprašalnik ', 'srv_archive_test_data_timeline_auto' => 'Časovnica avtomatskih testnih vnosov za vprašalnik ',
'srv_archive_test_data_none1' => 'V vprašalniku ',
'srv_archive_test_data_none2' => ' še ni ',
'srv_archive_test_data_none_manual' => 'ročnih ',
'srv_archive_test_data_none_automatic' => 'avtomatskih ',
'srv_archive_test_data_none3' => 'testnih vnosov',
'srv_inv_condition_filter' => 'Pogoji: ', 'srv_inv_condition_filter' => 'Pogoji: ',
'srv_inv_condition_no_filter' => 'Brez ', 'srv_inv_condition_no_filter' => 'Brez ',
'srv_inv_condition_new_filter' => 'Nov filter', 'srv_inv_condition_new_filter' => 'Nov filter',

5
lang/2.php
View File

@ -6231,6 +6231,11 @@ $lang = array (
'srv_archive_test_data_date' => 'Test entry date', 'srv_archive_test_data_date' => 'Test entry date',
'srv_archive_test_data_timeline_manual' => 'Timeline of manual test entries for questionnaire ', 'srv_archive_test_data_timeline_manual' => 'Timeline of manual test entries for questionnaire ',
'srv_archive_test_data_timeline_auto' => 'Timeline of automatic test entries for questionnaire ', 'srv_archive_test_data_timeline_auto' => 'Timeline of automatic test entries for questionnaire ',
'srv_archive_test_data_none1' => 'The questionnaire ',
'srv_archive_test_data_none2' => ' has no ',
'srv_archive_test_data_none_manual' => 'manual ',
'srv_archive_test_data_none_automatic' => 'automatic ',
'srv_archive_test_data_none3' => 'test data entries',
'srv_loop_edit_alert' => 'Alert! If you deselect values from loop, you will also delete all appropriate answers! Do you want to continue?', 'srv_loop_edit_alert' => 'Alert! If you deselect values from loop, you will also delete all appropriate answers! Do you want to continue?',
'srv_add_edit' => 'Add / Edit', 'srv_add_edit' => 'Add / Edit',
'srv_advanced_slideshow' => 'Prezentacija lahko deluje samo kot samostoni modul. Vsi ostali napredni moduli bodo onemogočeni. Ali želite nadaljevati?', 'srv_advanced_slideshow' => 'Prezentacija lahko deluje samo kot samostoni modul. Vsi ostali napredni moduli bodo onemogočeni. Ali želite nadaljevati?',

2792
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff