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

V seznamu mojih anket prikazemo stevilo ustreznih odgovorov in ne vseh

Browse Source
This commit is contained in:
pero1203 2021-09-20 09:26:38 +02:00
parent 62a7a4d871
commit 397ff03e00
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3074,7 +3074,6 @@ class SurveyList {
# poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $meta_surveys_ids).")" $stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $meta_surveys_ids).")"
#. " AND (updated = '0' OR (updated = '1' AND TIME_TO_SEC(TIMEDIFF(NOW(),last_updated)) < ".SRV_LIST_UPDATE_TIME_LIMIT.")) AND ( last_updated IS NOT NULL)";
. " AND updated = '0' AND last_updated IS NOT NULL"; . " AND updated = '0' AND last_updated IS NOT NULL";
$sqlSurveyList = sisplet_query($stringSurveyList); $sqlSurveyList = sisplet_query($stringSurveyList);
while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) { while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
@ -3088,7 +3087,6 @@ class SurveyList {
# poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $this->surveys_ids).")" $stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $this->surveys_ids).")"
#. " AND (updated = '0' OR (updated = '1' AND TIME_TO_SEC(TIMEDIFF(NOW(),last_updated)) < ".SRV_LIST_UPDATE_TIME_LIMIT.")) AND ( last_updated IS NOT NULL)";
. " AND updated = '0' AND last_updated IS NOT NULL"; . " AND updated = '0' AND last_updated IS NOT NULL";
$sqlSurveyList = sisplet_query($stringSurveyList); $sqlSurveyList = sisplet_query($stringSurveyList);
while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) { while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
@ -3106,10 +3104,6 @@ class SurveyList {
. ' IF(ISNULL(sla1.lib_glb),0,sla1.lib_glb) AS lib_glb,' . ' IF(ISNULL(sla1.lib_glb),0,sla1.lib_glb) AS lib_glb,'
. ' IF(ISNULL(sla2.lib_usr),0,sla2.lib_usr) AS lib_usr,' . ' IF(ISNULL(sla2.lib_usr),0,sla2.lib_usr) AS lib_usr,'
// Po novem ne joinamo s tabelo "users", ker je lahko query pocasen in zaklene tabelo - potem pa vse zasteka (dodano preventivno)
//. ' sa.edit_uid, us1.name AS e_name, us1.surname AS e_surname, us1.email AS e_email,'
//. ' sa.insert_uid, us2.name AS i_name, us2.surname AS i_surname, us2.email AS i_email,'
. " us3.vnos_time_first AS v_time_first, us3.vnos_time_last AS v_time_last," . " us3.vnos_time_first AS v_time_first, us3.vnos_time_last AS v_time_last,"
. ' IF(ISNULL(us3.answers),0,us3.answers) as answers,' . ' IF(ISNULL(us3.answers),0,us3.answers) as answers,'
. ' IF(ISNULL(g.variables),0,g.variables) as variables,' . ' IF(ISNULL(g.variables),0,g.variables) as variables,'
@ -3122,15 +3116,12 @@ class SurveyList {
. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_usr FROM srv_library_anketa as sla WHERE sla.uid = '".$this->g_uid."' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id ) . " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_usr FROM srv_library_anketa as sla WHERE sla.uid = '".$this->g_uid."' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id )
AS sla2 ON sla2.ank_id = sa.id" AS sla2 ON sla2.ank_id = sa.id"
//. ' LEFT OUTER JOIN users AS us1 ON us1.id = sa.edit_uid' . ' LEFT OUTER JOIN ( SELECT us3.ank_id, COUNT(us3.ank_id) as answers, MIN( us3.time_insert ) as vnos_time_first, MAX( us3.time_insert ) as vnos_time_last, preview FROM srv_user as us3 WHERE us3.ank_id IN ('.implode(',', $to_update).') AND us3.preview = \'0\' AND us3.deleted=\'0\' AND us3.testdata=\'0\' AND (us3.last_status=\'5\' OR us3.last_status=\'6\') GROUP BY us3.ank_id )
//. ' LEFT OUTER JOIN users AS us2 ON us2.id = sa.insert_uid'
. ' LEFT OUTER JOIN ( SELECT us3.ank_id, COUNT(us3.ank_id) as answers, MIN( us3.time_insert ) as vnos_time_first, MAX( us3.time_insert ) as vnos_time_last, preview FROM srv_user as us3 WHERE us3.ank_id IN ('.implode(',', $to_update).') AND us3.preview = \'0\' AND us3.deleted=\'0\' GROUP BY us3.ank_id )
AS us3 ON us3.ank_id = sa.id' AS us3 ON us3.ank_id = sa.id'
. ' LEFT OUTER JOIN ( SELECT g.ank_id, COUNT(s.gru_id) as variables FROM srv_grupa g, srv_spremenljivka s WHERE g.id = s.gru_id AND g.ank_id IN ('.implode(',', $to_update).') GROUP BY g.ank_id ) . ' LEFT OUTER JOIN ( SELECT g.ank_id, COUNT(s.gru_id) as variables FROM srv_grupa g, srv_spremenljivka s WHERE g.id = s.gru_id AND g.ank_id IN ('.implode(',', $to_update).') GROUP BY g.ank_id )
AS g ON g.ank_id = sa.id' AS g ON g.ank_id = sa.id'
//spodaj dodaj AND us5.lurker=\'0\'
. ' LEFT OUTER JOIN ( SELECT us5.ank_id, COUNT(us5.ank_id) as approp, preview FROM srv_user as us5 WHERE last_status IN (' . $this->appropriateStatus . ') AND us5.ank_id IN ('.implode(',', $to_update).') AND us5.preview =\'0\' AND us5.deleted=\'0\' GROUP BY us5.ank_id ) . ' LEFT OUTER JOIN ( SELECT us5.ank_id, COUNT(us5.ank_id) as approp, preview FROM srv_user as us5 WHERE last_status IN (' . $this->appropriateStatus . ') AND us5.ank_id IN ('.implode(',', $to_update).') AND us5.preview =\'0\' AND us5.deleted=\'0\' GROUP BY us5.ank_id )
AS us5 ON us5.ank_id = sa.id' AS us5 ON us5.ank_id = sa.id'
@ -3155,12 +3146,6 @@ class SurveyList {
$values = array(); $values = array();
while ( $row = mysqli_fetch_assoc($sqlUpdateList)) { while ( $row = mysqli_fetch_assoc($sqlUpdateList)) {
/*$row[i_name] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[i_name]);
$row[i_surname] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[i_surname]);
$row[i_email] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[i_email]);
$row[e_name] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[e_name]);
$row[e_surname] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[e_surname]);
$row[e_email] = mysqli_real_escape_string($GLOBALS['connect_db'], $row[e_email]);*/
$row['i_name'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_name']); $row['i_name'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_name']);
$row['i_surname'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_surname']); $row['i_surname'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_surname']);

5
sql/update2.sql
View File

@ -9539,3 +9539,8 @@ UPDATE misc SET value='21.07.29' WHERE what="version";
##ALTER TABLE users ADD aai_id VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT '' AFTER email; ##ALTER TABLE users ADD aai_id VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT '' AFTER email;
UPDATE misc SET value='21.08.30' WHERE what="version"; UPDATE misc SET value='21.08.30' WHERE what="version";
## Moramo refreshati seznam mojih anket, ker ne prikazujemo vec stevila vseh responsov ampak samo veljavnih
UPDATE srv_survey_list SET updated='1';
UPDATE misc SET value='21.09.20' WHERE what="version";