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

Podatki - geslo se izpise v tabeli kot parapodatek, ce so identifikatorji povezani

Browse Source
This commit is contained in:
pero1203 2022-10-17 11:51:09 +02:00
parent fdadf91093
commit 60f8fd3242
1 changed files with 284 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,6 @@ class SurveyDataDisplay{
static public function setUpFilter() { static public function setUpFilter() {
# nastavimo filter po statusih # nastavimo filter po statusih
if (self::$headFileName != null && self::$headFileName != '' && file_exists(self::$headFileName)) { if (self::$headFileName != null && self::$headFileName != '' && file_exists(self::$headFileName)) {
# kadar zbiramo sistemske, moramo obvezno zbirati tudi podatke, ne smemo pa full meta # kadar zbiramo sistemske, moramo obvezno zbirati tudi podatke, ne smemo pa full meta
@ -518,6 +517,7 @@ class SurveyDataDisplay{
self::$_VARS[VAR_METAFULL] = false; self::$_VARS[VAR_METAFULL] = false;
self::$_VARS[VAR_SHOW_DATE] = false; self::$_VARS[VAR_SHOW_DATE] = false;
} }
# filtriranje po statusih # filtriranje po statusih
self::$_CURRENT_STATUS_FILTER = SurveyStatusProfiles :: getStatusAsAWKString(); self::$_CURRENT_STATUS_FILTER = SurveyStatusProfiles :: getStatusAsAWKString();
@ -625,6 +625,7 @@ class SurveyDataDisplay{
self::$_REC_LIMIT = ''; self::$_REC_LIMIT = '';
} }
} }
if (self::$_VARS[VAR_DATA]) { if (self::$_VARS[VAR_DATA]) {
$tmp_svp_pv = SurveyVariablesProfiles :: getProfileVariables(self::$_PROFILE_ID_VARIABLE ); $tmp_svp_pv = SurveyVariablesProfiles :: getProfileVariables(self::$_PROFILE_ID_VARIABLE );
@ -640,17 +641,22 @@ class SurveyDataDisplay{
} }
} }
} }
self::$lineoffset=1; self::$lineoffset=1;
# če prikazujemo sistemske ne prikazujemo recnumber # če prikazujemo sistemske ne prikazujemo recnumber
if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL]) { if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL]) {
$svp_pv['recnum'] = 'recnum'; $svp_pv['recnum'] = 'recnum';
#$svp_pv['code'] = 'code';
self::$lineoffset++; self::$lineoffset++;
# za code ni ofseta }
#self::$lineoffset++;
if (self::$_VARS[VAR_META]) {
$svp_pv['code'] = 'code';
self::$lineoffset++;
} }
if (self::$_VARS[VAR_DATA] && count($tmp_svp_pv) > 0) { if (self::$_VARS[VAR_DATA] && count($tmp_svp_pv) > 0) {
foreach ($tmp_svp_pv AS $_svp_pv) { foreach ($tmp_svp_pv AS $_svp_pv) {
# če imamo sistemski email ali telefon, ime, priimek (v header je nastavljno "hide_system" = 1) # če imamo sistemski email ali telefon, ime, priimek (v header je nastavljno "hide_system" = 1)
@ -795,12 +801,10 @@ class SurveyDataDisplay{
# prilagodimo array profilov variabel # prilagodimo array profilov variabel
self::$_SVP_PV = $svp_pv; self::$_SVP_PV = $svp_pv;
if ($_tmp_filter != '') if ($_tmp_filter != ''){
{
self::$_VARIABLE_FILTER = $_tmp_filter; self::$_VARIABLE_FILTER = $_tmp_filter;
} }
} }
} }
/** Prikaže filtre za število podatkov.... /** Prikaže filtre za število podatkov....