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

Ce se ne belezi parapodatek cas responsa, moramo pri vsakem refreshu generirati datoteko s podatki na novo

Browse Source
This commit is contained in:
pero1203 2021-03-30 11:10:24 +02:00
parent fc26824ad3
commit 24cb3fc692
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** @author: Gorazd Veselič /** @author: Gorazd Veselič
* *
* @Desc: za upravljanje z profili statusov za podatke in izvoze * @Desc: za upravljanje z profili statusov za podatke in izvoze
@ -1112,22 +1113,29 @@ class SurveyStatusProfiles
$values = self::getProfilesValues(); $values = self::getProfilesValues();
$collect_all_status = $values['all_status']; $collect_all_status = $values['all_status'];
#če ni ustreznih uporabnikov je privzeto vsi // če ni ustreznih uporabnikov je privzeto vsi
if (self::$allValidCount == 0) { if (self::$allValidCount == 0) {
$pid = 1; $pid = 1;
$disabledValid = ' disabled="disabled"'; $disabledValid = ' disabled="disabled"';
$disabledGray = ' gray'; $disabledGray = ' gray';
} else if (self::$allValidCount > 0 && $collect_all_status == 0) { }
if ( $pid == 1 ) { else if (self::$allValidCount > 0 && $collect_all_status == 0) {
/*if ( $pid == 1 ) {
#$pid = 2; #$pid = 2;
$pid = self::$survayDefaultUstrezni; $pid = self::$survayDefaultUstrezni;
} }*/
if((int)self::$allUserCount > 1000){
$disabledAll = ' disabled="disabled"'; $disabledAll = ' disabled="disabled"';
$disabledAllGray = ' gray'; $disabledAllGray = ' gray';
} }
}
echo '<label class="middle'.$disabledAllGray.'">'; echo '<label class="middle'.$disabledAllGray.'">';
echo '<input type="radio" id="statusAllUnit" name="statusOnlyValid" value="1"'.($pid == 1?' checked="checked"':'').$disabledAll.' onchange="changeOnlyValidRadio();" autocomplete="off">'; echo '<input type="radio" id="statusAllUnit" name="statusOnlyValid" value="1"'.($pid == 1?' checked="checked"':'').$disabledAll.' onchange="changeOnlyValidRadio();" autocomplete="off">';
echo $lang['srv_data_all_units'].'&nbsp;('.(int)self::$allUserCount.')';; echo $lang['srv_data_all_units'].'&nbsp;('.(int)self::$allUserCount.')';
echo '</label>'; echo '</label>';
echo '&nbsp;'; echo '&nbsp;';
@ -1136,11 +1144,11 @@ class SurveyStatusProfiles
echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="2"'.($pid==2?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">'; echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="2"'.($pid==2?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">';
echo $lang['srv_data_valid_units'].'&nbsp;('.(int)self::$allValidCount.')'; echo $lang['srv_data_valid_units'].'&nbsp;('.(int)self::$allValidCount.')';
echo '</label>'; echo '</label>';
} else { }
else {
echo '<label class="middle'.$disabledGray .'">'; echo '<label class="middle'.$disabledGray .'">';
echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="3"'.($pid==3?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">'; echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="3"'.($pid==3?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">';
echo $lang['srv_data_finished_units'].'&nbsp;('.(int)self::$allValidCount.')'; echo $lang['srv_data_finished_units'].'&nbsp;('.(int)self::$allValidCount.')';
} }
echo '&nbsp;'.Help::display('srv_data_only_valid'); echo '&nbsp;'.Help::display('srv_data_only_valid');

4
admin/survey/classes/surveyData/class.SurveyDataFile.php
View File

@ -60,9 +60,9 @@ class SurveyDataFile {
if($this->checked == false) { if($this->checked == false) {
// Ce ne belezimo parapodatka o datumu responsa, vedno pobrisemo datoteko // Ce ne belezimo parapodatka o datumu responsa, vedno pobrisemo datoteko
/*if(SurveySetting::getInstance()->getSurveyMiscSetting('survey_date') == 1) { if(SurveySetting::getInstance()->getSurveyMiscSetting('survey_date') == 1) {
$this->clearFiles(); $this->clearFiles();
}*/ }
$this->checkFile(); $this->checkFile();
} }