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

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

Browse Source
This commit is contained in:
tejagerjovic 2022-02-16 01:43:28 +01:00
parent 1b732f4c5f
commit 9d30671c23
3 changed files with 88 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
admin/survey/SurveyAdminSettings.php
View File

@ -4267,28 +4267,79 @@ class SurveyAdminSettings {
function arhivi_testdata() {
global $lang;
$str_testdata = "SELECT count(*) as cnt, day(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);
while ($testdata = mysqli_fetch_array($query_testdata)) {
echo $testdata[cnt] . $testdata[time];
}
$str_testdata_auto = "SELECT count(*), add_date, add_uid FROM srv_testdata_archive WHERE ank_id='".$this->anketa."' GROUP BY add_date";
$query_testdata_auto = sisplet_query($str_testdata_auto);
$auto_testdata = array();
while (list($_cnt, $_date, $_uid) = mysqli_fetch_row($query_testdata_auto) ) {
$testdata_auto+=$_cnt;
$auto_testdata[] = $cnt;
}
echo '<fieldset>';
echo '<legend>'.$lang['srv_arhiv_testdata'].'</legend>';
echo $lang['srv_archive_test_data_count'].(int)$testdata;
if ($testdata_auto > 0) {
echo $lang['srv_archive_test_data_auto'].(int)$testdata_auto;
$link = SurveyInfo::getSurveyLink();
$surveyName = SurveyInfo::getInstance()->getSurveyTitle();
$preview_disableif = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disableif');
$preview_disablealert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disablealert');
$preview_displayifs = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayifs');
$preview_displayvariables = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayvariables');
$preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment');
$preview_options = '' . ($preview_disableif == 1 ? '&disableif=1' : '') . ($preview_disablealert == 1 ? '&disablealert=1' : '') . ($preview_displayifs == 1 ? '&displayifs=1' : '') . ($preview_displayvariables == 1 ? '&displayvariables=1' : '') . ($preview_hidecomment == 1 ? '&hidecomment=1' : '') . '';
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
echo '<p class="bold">'.$lang['srv_archive_test_data_timeline_auto'].$surveyName.':</p>';
$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)";
$query_testdata = sisplet_query($str_testdata);
$table_exists = 0;
while ($testdata = mysqli_fetch_array($query_testdata)) {
// Izpišemo začetek tabele
if($table_exists==0 && $testdata[cnt]!=0) {
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;
}
//
echo '<tr>';
echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>';
echo '<td class="right">'.$testdata[cnt].'</td>';
echo '</tr>';
}
if($table_exists=1) {
echo '</table>';
}
// Ročni vnosi
echo '<p class="bold top16">'.$lang['srv_archive_test_data_timeline_manual'].$surveyName.':</p>';
$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 začetek tabele
if($table_exists==0 && $testdata[cnt]!=0) {
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;
}
//
echo '<tr>';
echo '<td>'.date("d.m.Y",strtotime($testdata[time])).'</td>';
echo '<td class="right">'.$testdata[cnt].'</td>';
echo '</tr>';
}
if($table_exists=1) {
echo '</table>';
}
echo '</fieldset>';
}

11
lang/1.php
View File

@ -6322,8 +6322,15 @@ $lang = array (
'srv_dostop_users_removeselected' => 'Odstrani označene',
'srv_dataIcons_multiple' => 'Kombinirana tabela',
'srv_incremental_lock_message' => 'Poteka priprava podatkov za pregled in analize. Prosimo počakajte trenutek!',
'srv_archive_test_data_count' => 'Število testnih podatkov: ',
'srv_archive_test_data_auto' => '. Avtomatsko dodanih: ',
'srv_archive_test_data_text1' => 'Vsak testni vnos podatkov (',
'srv_archive_test_data_text1a' => '\'TESTIRANJE\' - \'Avtomatski vnosi\'',
'srv_archive_test_data_text2' => ' ali ',
'srv_archive_test_data_text2a' => 'ročni testni vnos',
'srv_archive_test_data_text3' => ') se avtomatsko shrani v spodnjo časovnico.',
'srv_archive_test_data_count' => 'Število 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_auto' => 'Časovnica avtomatskih testnih vnosov za vprašalnik ',
'srv_inv_condition_filter' => 'Pogoji: ',
'srv_inv_condition_no_filter' => 'Brez ',
'srv_inv_condition_new_filter' => 'Nov filter',

13
lang/2.php
View File

@ -4118,7 +4118,7 @@ $lang = array (
"srv_survey_archives_tracking_survey_text1a" => "to the survey",
"srv_survey_archives_tracking_survey_text1b" => "on the page",
"srv_survey_archives_tracking_survey_text1c" => "for the survey",
"srv_survey_archives_tracking_survey_text1d" => "there haven't been any changes yet.",
"srv_survey_archives_tracking_survey_text1d" => "there haven't been any changes yet",
"srv_survey_archives_tracking_survey_text2" => "To see all the changes, download the",
"srv_survey_archives_tracking_survey_text3" => "Excel file",
"srv_survey_archives_tracking_data" => "Data changes",
@ -6220,8 +6220,15 @@ $lang = array (
'srv_dostop_users_removeselected' => 'Remove selected',
'srv_dataIcons_multiple' => 'Multiple table',
'srv_incremental_lock_message' => 'We are preparing data for review and analysis. Please wait a moment!',
'srv_archive_test_data_count' => 'Test data count: ',
'srv_archive_test_data_auto' => '. Automaticaly addes: ',
'srv_archive_test_data_text1' => 'Each test data entry (',
'srv_archive_test_data_text1a' => '\'TEST\' - \'Test responses\'',
'srv_archive_test_data_text2' => ' or ',
'srv_archive_test_data_text2a' => 'manual test data entry',
'srv_archive_test_data_text3' => ') is automatically saved in the timeline below.',
'srv_archive_test_data_count' => 'Test entry count',
'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_auto' => 'Timeline of automatic test entries for questionnaire ',
'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_advanced_slideshow' => 'Prezentacija lahko deluje samo kot samostoni modul. Vsi ostali napredni moduli bodo onemogočeni. Ali želite nadaljevati?',