From 230ebcaf9aa23352bb46b59abc6692e92cc61cfb Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Mon, 20 Mar 2023 17:01:58 +0100 Subject: [PATCH 001/123] added table public.tbl_kennzeichen and kennzeichentyp for managing person Ids --- system/dbupdate_3.4.php | 1 + .../21620_neues_feld_zum_erfassen_des_ESI.php | 116 ++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php index bc8152a90..dcf882c43 100644 --- a/system/dbupdate_3.4.php +++ b/system/dbupdate_3.4.php @@ -32,6 +32,7 @@ require_once('dbupdate_3.4/26173_index_webservicelog.php'); require_once('dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php'); require_once('dbupdate_3.4/17512_fehlercode_constraints.php'); require_once('dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php'); +require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php'); // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen echo '

Pruefe Tabellen und Attribute!

'; diff --git a/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php b/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php new file mode 100644 index 000000000..a7d415b68 --- /dev/null +++ b/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php @@ -0,0 +1,116 @@ +db_query('SELECT 0 FROM public.tbl_kennzeichentyp WHERE 0 = 1')) +{ + $qry = 'CREATE TABLE public.tbl_kennzeichentyp ( + kennzeichentyp_kurzbz varchar(32) NOT NULL, + bezeichnung varchar(256) NOT NULL, + aktiv boolean NOT NULL DEFAULT TRUE + ); + + COMMENT ON TABLE public.tbl_kennzeichentyp IS \'Tabelle zur Verwaltung von Typen von externen Personenkennzeichen.\'; + COMMENT ON COLUMN public.tbl_kennzeichentyp.bezeichnung IS \'Voller Name des Kennzeichentyps.\'; + COMMENT ON COLUMN public.tbl_kennzeichentyp.aktiv IS \'Ob der Kennzeichentyp noch aktiv und verwendet wird.\'; + + ALTER TABLE public.tbl_kennzeichentyp ADD CONSTRAINT pk_tbl_kennzeichentyp PRIMARY KEY (kennzeichentyp_kurzbz)'; + + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichentyp: '.$db->db_last_error().'
'; + else + echo '
public.tbl_kennzeichentyp table created'; + + $qry = 'GRANT SELECT ON TABLE public.tbl_kennzeichentyp TO web;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichentyp: '.$db->db_last_error().'
'; + else + echo '
Granted privileges to web on public.tbl_kennzeichentyp'; + + $qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE public.tbl_kennzeichentyp TO vilesci;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichentyp: '.$db->db_last_error().'
'; + else + echo '
Granted privileges to vilesci on public.tbl_kennzeichentyp'; +} + +// SEQUENCE tbl_kennzeichen_id_seq +if ($result = $db->db_query("SELECT 0 FROM pg_class WHERE relname = 'tbl_kennzeichen_id_seq'")) +{ + if ($db->db_num_rows($result) == 0) + { + $qry = 'CREATE SEQUENCE public.tbl_kennzeichen_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;'; + + if(!$db->db_query($qry)) + echo 'public.tbl_kennzeichen_id_seq '.$db->db_last_error().'
'; + else + echo '
Created sequence: public.tbl_kennzeichen_id_seq'; + + // GRANT SELECT, UPDATE ON SEQUENCE public.tbl_kennzeichen_id_seq TO vilesci; + $qry = 'GRANT SELECT, UPDATE ON SEQUENCE public.tbl_kennzeichen_id_seq TO vilesci;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichen_id_seq '.$db->db_last_error().'
'; + else + echo '
Granted privileges to vilesci on public.tbl_kennzeichen_id_seq'; + + // GRANT SELECT, UPDATE ON SEQUENCE public.tbl_kennzeichen_id_seq TO fhcomplete; + $qry = 'GRANT SELECT, UPDATE ON SEQUENCE public.tbl_kennzeichen_id_seq TO fhcomplete;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichen_id_seq '.$db->db_last_error().'
'; + else + echo '
Granted privileges to fhcomplete on public.tbl_kennzeichen_id_seq'; + } +} + +// Creates table public.tbl_kennzeichen if it doesn't exist and grants privileges +if (!$result = @$db->db_query('SELECT 0 FROM public.tbl_kennzeichen WHERE 0 = 1')) +{ + $qry = 'CREATE TABLE public.tbl_kennzeichen ( + kennzeichen_id integer NOT NULL DEFAULT NEXTVAL(\'public.tbl_kennzeichen_id_seq\'), + person_id integer NOT NULL, + kennzeichentyp_kurzbz varchar(32) NOT NULL, + inhalt text NOT NULL, + aktiv boolean NOT NULL DEFAULT TRUE, + insertamum timestamp DEFAULT NOW(), + insertvon varchar(32), + updateamum timestamp, + updatevon varchar(32) + ); + + COMMENT ON TABLE public.tbl_kennzeichen IS \'Tabelle zum Speichern von externen Personenkennzeichen.\'; + COMMENT ON COLUMN public.tbl_kennzeichen.kennzeichentyp_kurzbz IS \'Typ des externen Personen Kennzeichens.\'; + COMMENT ON COLUMN public.tbl_kennzeichen.inhalt IS \'Das externe Kennzeichen.\'; + COMMENT ON COLUMN public.tbl_kennzeichen.aktiv IS \'Ob das Kennzeichen noch aktiv ist und verwendet wird.\'; + + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT pk_tbl_kennzeichen PRIMARY KEY (kennzeichen_id); + + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_person FOREIGN KEY (person_id) REFERENCES public.tbl_person(person_id) ON UPDATE CASCADE ON DELETE RESTRICT; + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_kennzeichentyp_kurzbz FOREIGN KEY (kennzeichentyp_kurzbz) REFERENCES public.tbl_kennzeichentyp(kennzeichentyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT; + + -- create unique constraint, no person can have the same kennzeichen twice + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT uk_kennzeichen_person_id_inhalt UNIQUE (person_id, kennzeichentyp_kurzbz, inhalt); + -- create unique index - person can only have one active kennzeichen of each type + CREATE UNIQUE INDEX kennzeichen_aktiv_constraint ON public.tbl_kennzeichen (person_id, kennzeichentyp_kurzbz) WHERE aktiv;'; + + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichen: '.$db->db_last_error().'
'; + else + echo '
public.tbl_kennzeichen table created'; + + $qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE public.tbl_kennzeichen TO web;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichen: '.$db->db_last_error().'
'; + else + echo '
Granted privileges to web on public.tbl_kennzeichen'; + + $qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE public.tbl_kennzeichen TO vilesci;'; + if (!$db->db_query($qry)) + echo 'public.tbl_kennzeichen: '.$db->db_last_error().'
'; + else + echo '
Granted privileges to vilesci on public.tbl_kennzeichen'; +} From cd6443d9c05a67c65d5b31623d1c1e726adefeb4 Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Wed, 22 Mar 2023 17:41:15 +0100 Subject: [PATCH 002/123] -added scheduler for generating and saving ESI -first version of generateESI job --- application/controllers/jobs/ESIJob.php | 169 ++++++++++++++++++ .../jobs/schedulers/ESIScheduler.php | 108 +++++++++++ .../models/person/Kennzeichen_model.php | 36 ++++ .../21620_neues_feld_zum_erfassen_des_ESI.php | 34 +++- 4 files changed, 345 insertions(+), 2 deletions(-) create mode 100644 application/controllers/jobs/ESIJob.php create mode 100644 application/controllers/jobs/schedulers/ESIScheduler.php create mode 100644 application/models/person/Kennzeichen_model.php diff --git a/application/controllers/jobs/ESIJob.php b/application/controllers/jobs/ESIJob.php new file mode 100644 index 000000000..74c5a925d --- /dev/null +++ b/application/controllers/jobs/ESIJob.php @@ -0,0 +1,169 @@ +load->model('Person_model', 'PersonModel'); + $this->load->model('Kennzeichen_model', 'KennzeichenModel'); + + // load libraries + //$this->load->library('extensions/FHC-Core-DVUH/DVUHIssueLib'); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Initialises generateESI job, handles job queue, logs infos/errors + */ + public function generateESI() + { + //$jobType = 'DVUHSendPruefungsaktivitaeten'; + $this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job start'); + + // Gets the latest jobs + $lastJobs = $this->getLastJobs(ESIScheduler::JOB_TYPE_GENERATE_ESI); + if (isError($lastJobs)) + { + $this->logError(getCode($lastJobs).': '.getError($lastJobs), ESIScheduler::JOB_TYPE_GENERATE_ESI); + } + else + { + $this->updateJobs( + getData($lastJobs), // Jobs to be updated + array(JobsQueueLib::PROPERTY_START_TIME), // Job properties to be updated + array(date('Y-m-d H:i:s')) // Job properties new values + ); + + $person_arr = $this->_getInputObjArray(getData($lastJobs)); + + foreach ($person_arr as $persobj) + { + if (!isset($persobj->person_id)) + $this->logError("Error when generating ESI: invalid parameters"); + else + { + $person_id = $persobj->person_id; + + // check if there already is an active ESI + $this->KennzeichenModel->addSelect('1'); + $activeKennzeichenRes = $this->KennzeichenModel->loadWhere( + array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'aktiv' => true) + ); + + if (hasData($activeKennzeichenRes)) + { + $this->logError("Active ESI for person Id $prestudent_id already exists"); + continue; + } + + // get Matrikelnr for person for which ESI should be generated + $this->PersonModel->addSelect('matr_nr'); + $personRes = $this->PersonModel->load($person_id); + + if (!hasData($personRes)) + { + $this->logError("Person with Id $person_id not found"); + continue; + } + + $matr_nr = getData($personRes)[0]->matr_nr; + + if (isEmptyString($matr_nr)) + { + $this->logError("Matrikelnummer for person with Id $person_id is empty"); + continue; + } + + $esi = self::ESI_PREFIX.$matrikelnr; + + // check if ESI was already used + $this->KennzeichenModel->addSelect('1'); + $existingKennzeichenRes = $this->KennzeichenModel->loadWhere( + array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'inhalt' => $esi) + ); + + if (hasData($existingKennzeichenRes)) + { + $this->logError("ESI $esi for person Id $prestudent_id already exists"); + continue; + } + + // if everything ok, save the esi for the person + $saveEsiResult = $this->Kennzeichen_model->insert( + array( + 'person_id' => $person_id, + 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, + 'inhalt' => $esi, + 'aktiv' => true + ) + ); + + if (isError($saveEsiResult)) + { + $this->logError("Error when sending ESI, person Id $person_id ".getError($saveEsiResult)); + } + elseif (hasData($saveEsiResult)) + { + // TODO everything ok + } + } + } + + // Update jobs properties values + $this->updateJobs( + getData($lastJobs), // Jobs to be updated + array(JobsQueueLib::PROPERTY_STATUS, JobsQueueLib::PROPERTY_END_TIME), // Job properties to be updated + array(JobsQueueLib::STATUS_DONE, date('Y-m-d H:i:s')) // Job properties new values + ); + + if (hasData($lastJobs)) $this->updateJobsQueue($jobType, getData($lastJobs)); + } + + $this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job stop'); + } + + // -------------------------------------------------------------------------------------------- + // Private methods + + /** + * Extracts input data from jobs. + * @param $jobs + * @return array with jobinput + */ + private function _getInputObjArray($jobs) + { + $mergedUsersArray = array(); + + if (count($jobs) == 0) return $mergedUsersArray; + + foreach ($jobs as $job) + { + $decodedInput = json_decode($job->input); + if ($decodedInput != null) + { + foreach ($decodedInput as $el) + { + $mergedUsersArray[] = $el; + } + } + } + return $mergedUsersArray; + } +} diff --git a/application/controllers/jobs/schedulers/ESIScheduler.php b/application/controllers/jobs/schedulers/ESIScheduler.php new file mode 100644 index 000000000..3ab858937 --- /dev/null +++ b/application/controllers/jobs/schedulers/ESIScheduler.php @@ -0,0 +1,108 @@ +load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Creates jobs queue entries for generateESI job. + * @param string $studiensemester_kurzbz semester for which ESIs should be generated + */ + public function generateESI($studiensemester_kurzbz = null) + { + // if no semester given, get current studiensemester + if (!isset($studiensemester_kurzbz)) + { + $semRes = $this->StudiensemesterModel->getAkt(); + + if (hasData($semRes)) + { + $studiensemester_kurzbz = getData($semRes)[0]->studiensemester_kurzbz; + } + } + + if (isset($studiensemester_kurzbz)) + { + $this->logInfo('Start job queue scheduler '.self::JOB_TYPE_GENERATE_ESI); + + $qry = " + SELECT + DISTINCT person_id + FROM + public.tbl_person pers + JOIN public.tbl_prestudent ps USING (person_id) + JOIN public.tbl_prestudentstatus pss USING (prestudent_id) + WHERE + pss.studiensemester_kurzbz = ? + AND pers.matr_nr IS NOT NULL + AND pss.status_kurzbz IN ? + AND NOT EXISTS ( -- has no ESI yet + SELECT 1 + FROM + public.tbl_kennzeichen + WHERE + person_id = pers.person_id + AND kennzeichentyp_kurzbz = ? + AND aktiv + ) + AND NOT EXISTS ( -- making sure it's not an incoming + SELECT 1 + FROM + public.tbl_prestudentstatus + WHERE + prestudent_id = ps.prestudent_id + AND status_kurzbz = 'Incoming' + )"; + + $db = new DB_Model(); + $jobInputResult = $db->execReadOnlyQuery($qry, array($studiensemester_kurzbz, $this->_active_status_kurzbz, self::KENNZEICHENTYP_KURZBZ)); + + // If an error occured then log it + if (isError($jobInputResult)) + { + $this->logError(getError($jobInputResult)); + } + elseif (hasData($jobInputResult)) // if persons found + { + // Add the new job to the jobs queue + $addNewJobResult = $this->addNewJobsToQueue( + self::JOB_TYPE_GENERATE_ESI, // job type + $this->generateJobs( // gnerate the structure of the new job + JobsQueueLib::STATUS_NEW, + json_encode(getData($jobInputResult)) + ) + ); + + // If error occurred return it + if (isError($addNewJobResult)) $this->logError(getError($addNewJobResult)); + } + } + else + { + $this->logError('Error when getting Studiensemester'); + } + + $this->logInfo('End job queue scheduler '.self::JOB_TYPE_GENERATE_ESI); + } +} diff --git a/application/models/person/Kennzeichen_model.php b/application/models/person/Kennzeichen_model.php new file mode 100644 index 000000000..7d00a68b4 --- /dev/null +++ b/application/models/person/Kennzeichen_model.php @@ -0,0 +1,36 @@ +dbTable = 'public.tbl_kennzeichen'; + $this->pk = 'kennzeichen_id'; + } + + /** + * + * @param + * @return object success or error + */ + public function _() + { + + } + + /** + * Get Zustelladress of given person. + * @param string $person_id + * @param string $select + * @return array + */ + //~ public function getZustellAdresse($person_id, $select = '*') + //~ { + //~ $this->addSelect($select); + //~ return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true)); + //~ } +} diff --git a/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php b/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php index a7d415b68..5b6b22918 100644 --- a/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php +++ b/system/dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php @@ -89,8 +89,10 @@ if (!$result = @$db->db_query('SELECT 0 FROM public.tbl_kennzeichen WHERE 0 = 1' ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT pk_tbl_kennzeichen PRIMARY KEY (kennzeichen_id); - ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_person FOREIGN KEY (person_id) REFERENCES public.tbl_person(person_id) ON UPDATE CASCADE ON DELETE RESTRICT; - ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_kennzeichentyp_kurzbz FOREIGN KEY (kennzeichentyp_kurzbz) REFERENCES public.tbl_kennzeichentyp(kennzeichentyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT; + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_person FOREIGN KEY (person_id) + REFERENCES public.tbl_person(person_id) ON UPDATE CASCADE ON DELETE RESTRICT; + ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT fk_kennzeichen_kennzeichentyp_kurzbz FOREIGN KEY (kennzeichentyp_kurzbz) + REFERENCES public.tbl_kennzeichentyp(kennzeichentyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT; -- create unique constraint, no person can have the same kennzeichen twice ALTER TABLE public.tbl_kennzeichen ADD CONSTRAINT uk_kennzeichen_person_id_inhalt UNIQUE (person_id, kennzeichentyp_kurzbz, inhalt); @@ -114,3 +116,31 @@ if (!$result = @$db->db_query('SELECT 0 FROM public.tbl_kennzeichen WHERE 0 = 1' else echo '
Granted privileges to vilesci on public.tbl_kennzeichen'; } + +// public.tbl_kennzeichentyp: add type esi +if ($result = $db->db_query("SELECT 1 FROM public.tbl_kennzeichentyp WHERE kennzeichentyp_kurzbz='esi'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO public.tbl_kennzeichentyp(kennzeichentyp_kurzbz, bezeichnung) VALUES('esi', 'European Student Identifier');"; + + if(!$db->db_query($qry)) + echo 'Kennzeichentyp: '.$db->db_last_error().'
'; + else + echo '
Neuer Kennzeichentyp esi in public.tbl_kennzeichentyp hinzugefügt'; + } +} + +// system.tbl_jobtypes: add type esi +if ($result = $db->db_query("SELECT 1 FROM system.tbl_jobtypes WHERE type='generateESI'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO system.tbl_jobtypes(type, description) VALUES('generateESI', 'Generate and save European Student Identifier');"; + + if(!$db->db_query($qry)) + echo 'Jobtyp: '.$db->db_last_error().'
'; + else + echo '
Neuer Jobtyp generateESI in system.tbl_jobtypes hinzugefügt'; + } +} From 903f3d2f378537d0f94be9dcd05d4beb8bb57e66 Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Thu, 23 Mar 2023 17:50:32 +0100 Subject: [PATCH 003/123] generateESI Job bugfixes (correct models, Ids in error logs), added insertvon --- application/controllers/jobs/ESIJob.php | 26 +++++++++++-------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/application/controllers/jobs/ESIJob.php b/application/controllers/jobs/ESIJob.php index 74c5a925d..c9a558a46 100644 --- a/application/controllers/jobs/ESIJob.php +++ b/application/controllers/jobs/ESIJob.php @@ -10,6 +10,7 @@ require_once('schedulers/ESIScheduler.php'); class ESIJob extends JQW_Controller { const ESI_PREFIX = 'urn:schac:personalUniqueCode:int:esi:at:'; + const INSERT_VON = 'generateEsiJob'; /** * Controller initialization @@ -19,11 +20,8 @@ class ESIJob extends JQW_Controller parent::__construct(); // load models - $this->load->model('Person_model', 'PersonModel'); - $this->load->model('Kennzeichen_model', 'KennzeichenModel'); - - // load libraries - //$this->load->library('extensions/FHC-Core-DVUH/DVUHIssueLib'); + $this->load->model('person/Person_model', 'PersonModel'); + $this->load->model('person/Kennzeichen_model', 'KennzeichenModel'); } //------------------------------------------------------------------------------------------------------------------ @@ -39,6 +37,7 @@ class ESIJob extends JQW_Controller // Gets the latest jobs $lastJobs = $this->getLastJobs(ESIScheduler::JOB_TYPE_GENERATE_ESI); + if (isError($lastJobs)) { $this->logError(getCode($lastJobs).': '.getError($lastJobs), ESIScheduler::JOB_TYPE_GENERATE_ESI); @@ -69,7 +68,7 @@ class ESIJob extends JQW_Controller if (hasData($activeKennzeichenRes)) { - $this->logError("Active ESI for person Id $prestudent_id already exists"); + $this->logError("Active ESI for person Id $person_id already exists"); continue; } @@ -91,7 +90,7 @@ class ESIJob extends JQW_Controller continue; } - $esi = self::ESI_PREFIX.$matrikelnr; + $esi = self::ESI_PREFIX.$matr_nr; // check if ESI was already used $this->KennzeichenModel->addSelect('1'); @@ -101,17 +100,18 @@ class ESIJob extends JQW_Controller if (hasData($existingKennzeichenRes)) { - $this->logError("ESI $esi for person Id $prestudent_id already exists"); + $this->logError("ESI $esi for person Id $person_id already exists"); continue; } // if everything ok, save the esi for the person - $saveEsiResult = $this->Kennzeichen_model->insert( + $saveEsiResult = $this->KennzeichenModel->insert( array( 'person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'inhalt' => $esi, - 'aktiv' => true + 'aktiv' => true, + 'insertvon' => self::INSERT_VON ) ); @@ -119,10 +119,6 @@ class ESIJob extends JQW_Controller { $this->logError("Error when sending ESI, person Id $person_id ".getError($saveEsiResult)); } - elseif (hasData($saveEsiResult)) - { - // TODO everything ok - } } } @@ -133,7 +129,7 @@ class ESIJob extends JQW_Controller array(JobsQueueLib::STATUS_DONE, date('Y-m-d H:i:s')) // Job properties new values ); - if (hasData($lastJobs)) $this->updateJobsQueue($jobType, getData($lastJobs)); + if (hasData($lastJobs)) $this->updateJobsQueue(ESIScheduler::JOB_TYPE_GENERATE_ESI, getData($lastJobs)); } $this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job stop'); From d9eb0f5704732ce05549ffeb4e24a149ca3c5a99 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Fri, 16 Jun 2023 11:30:03 +0200 Subject: [PATCH 004/123] - kennzeichen beim zusammenlegen uebernehmen --- .../models/person/Kennzeichen_model.php | 21 ----- vilesci/stammdaten/personen_wartung.php | 84 +++++++++++++++++++ 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/application/models/person/Kennzeichen_model.php b/application/models/person/Kennzeichen_model.php index 7d00a68b4..fe8a9ac62 100644 --- a/application/models/person/Kennzeichen_model.php +++ b/application/models/person/Kennzeichen_model.php @@ -12,25 +12,4 @@ class Kennzeichen_model extends DB_Model $this->pk = 'kennzeichen_id'; } - /** - * - * @param - * @return object success or error - */ - public function _() - { - - } - - /** - * Get Zustelladress of given person. - * @param string $person_id - * @param string $select - * @return array - */ - //~ public function getZustellAdresse($person_id, $select = '*') - //~ { - //~ $this->addSelect($select); - //~ return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true)); - //~ } } diff --git a/vilesci/stammdaten/personen_wartung.php b/vilesci/stammdaten/personen_wartung.php index ee95854ed..c77b81b2b 100644 --- a/vilesci/stammdaten/personen_wartung.php +++ b/vilesci/stammdaten/personen_wartung.php @@ -319,6 +319,90 @@ if (isset($personToDelete) && isset($personToKeep) && $personToDelete >= 0 && $p } } } + + if($result = @$db->db_query("SELECT 1 FROM public.tbl_kennzeichen LIMIT 1")) + { + $kennzeichen_has_personToKeep = array(); + $kennzeichen_has_personToDelete = array(); + + $kennzeichen_query = " + SELECT * + FROM public.tbl_kennzeichen + WHERE ( + person_id = " . $db->db_add_param($personToKeep, FHC_INTEGER) . " OR + person_id = " . $db->db_add_param($personToDelete, FHC_INTEGER) . " + ) + ORDER BY kennzeichentyp_kurzbz, aktiv DESC"; + + if ($result = $db->db_query($kennzeichen_query)) + { + while ($row = $db->db_fetch_object($result)) + { + if ($row->person_id === $personToKeep) + { + $kennzeichen_has_personToKeep[] = $row; + } + else if ($row->person_id === $personToDelete) + { + $kennzeichen_has_personToDelete[] = $row; + } + } + } + + if (!empty($kennzeichen_has_personToDelete)) + { + foreach ($kennzeichen_has_personToDelete as $kennzeichen_toDelete) + { + $kennzeichen_toKeep_Kurzbz = array_column($kennzeichen_has_personToKeep, 'kennzeichentyp_kurzbz'); + + if (in_array($kennzeichen_toDelete->kennzeichentyp_kurzbz, $kennzeichen_toKeep_Kurzbz)) + { + $kennzeichen_toKeep_Keys = array_keys($kennzeichen_toKeep_Kurzbz, $kennzeichen_toDelete->kennzeichentyp_kurzbz); + + foreach ($kennzeichen_toKeep_Keys as $key) + { + if (($kennzeichen_has_personToKeep[$key]->aktiv === 't' && $kennzeichen_toDelete->aktiv === 'f') || + ($kennzeichen_has_personToKeep[$key]->aktiv === 'f' && $kennzeichen_toDelete->aktiv === 't') || + ($kennzeichen_has_personToKeep[$key]->aktiv === 'f' && $kennzeichen_toDelete->aktiv === 'f')) + { + if ($kennzeichen_has_personToKeep[$key]->inhalt !== $kennzeichen_toDelete->inhalt) + { + $sql_query_upd1 .= "UPDATE public.tbl_kennzeichen SET person_id=" . $db->db_add_param($personToKeep, FHC_INTEGER) . " WHERE kennzeichen_id=" . $db->db_add_param($kennzeichen_toDelete->kennzeichen_id, FHC_INTEGER) . ";"; + $kennzeichen_has_personToKeep[] = $kennzeichen_toDelete; + continue 2; + } + else + { + if ($kennzeichen_toDelete->aktiv === 'f') + { + $sql_query_upd1 .= "DELETE FROM public.tbl_kennzeichen WHERE kennzeichen_id=" . $db->db_add_param($kennzeichen_toDelete->kennzeichen_id, FHC_INTEGER) . ";"; + $msg_warning[] = "Das nicht aktive Kennzeichen mit der ID '" . $kennzeichen_toDelete->kennzeichen_id . "' wurde gelöscht,
+ da es der gleiche Inhalt wie beim Kennzeichen mit der ID '". $kennzeichen_has_personToKeep[$key]->kennzeichen_id ."' ist."; + continue 2; + } + $msg_error[] = 'Beide Personen haben ein Kennzeichen mit dem gleichen Typ ('. $kennzeichen_toDelete->kennzeichentyp_kurzbz.') und den gleichen Inhalt. Können nicht zusammengelegt werden.
+ Sie müssen die Datensätze manuell bereinigen, bevor Sie die Personen zusammenlegen können.'; + $error = true; + break 2; + } + } + else if ($kennzeichen_has_personToKeep[$key]->aktiv === 't' && $kennzeichen_toDelete->aktiv === 't') + { + $msg_error[] = 'Beide Personen haben ein aktives Kennzeichen mit dem gleichen Typ ('. $kennzeichen_toDelete->kennzeichentyp_kurzbz.'). Können nicht zusammengelegt werden.
+ Sie müssen die Datensätze manuell bereinigen, bevor Sie die Personen zusammenlegen können.'; + $error = true; + break 2; + } + } + } + else + { + $sql_query_upd1 .= "UPDATE public.tbl_kennzeichen SET person_id=" . $db->db_add_param($personToKeep, FHC_INTEGER) . " WHERE kennzeichen_id=" . $db->db_add_param($kennzeichen_toDelete->kennzeichen_id, FHC_INTEGER) . ";"; + } + } + } + } + if ($error == false) { // Wenn bei einer der Personen das Foto gesperrt ist, dann die Sperre uebernehmen From 32459ccff8c343ae8b03940463a63c33058ec572 Mon Sep 17 00:00:00 2001 From: kindlm Date: Tue, 5 Dec 2023 14:38:07 +0100 Subject: [PATCH 005/123] Statistik Load TimeLimit auf 600 gesetzt Default Parameter bei Statistik aktualisiert --- include/statistik.class.php | 2 +- vilesci/stammdaten/statistik_details.php | 27 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/include/statistik.class.php b/include/statistik.class.php index d8bea89f9..6c0c6de9a 100644 --- a/include/statistik.class.php +++ b/include/statistik.class.php @@ -512,7 +512,7 @@ class statistik extends basis_db $this->csv=''; $this->json=array(); $this->countRows=0; - set_time_limit(120); + set_time_limit(600); if($this->sql!='') { diff --git a/vilesci/stammdaten/statistik_details.php b/vilesci/stammdaten/statistik_details.php index 1ba840c02..99b8caa6b 100644 --- a/vilesci/stammdaten/statistik_details.php +++ b/vilesci/stammdaten/statistik_details.php @@ -161,11 +161,30 @@ if(!$rechte->isBerechtigt('basis/statistik', null, 'suid')) $statistik->preferences = << Date: Wed, 6 Dec 2023 18:06:46 +0100 Subject: [PATCH 006/123] Suche Person in OE; OE in Rechteliste OE-Suche --- .../benutzerberechtigung_uebersicht.php | 284 +++++++++++++----- 1 file changed, 213 insertions(+), 71 deletions(-) diff --git a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php index 0be268b70..95ea75082 100644 --- a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php +++ b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php @@ -29,17 +29,20 @@ require_once('../../include/benutzer.class.php'); require_once('../../include/berechtigung.class.php'); require_once ('../../include/organisationseinheit.class.php'); require_once ('../../include/benutzerfunktion.class.php'); +require_once ('../../include/funktion.class.php'); echo ' Berechtigungen Uebersicht -'; + +'; include('../../include/meta/jquery.php'); include('../../include/meta/jquery-tablesorter.php'); echo ' + + + +
+

+ +
+ + \ No newline at end of file diff --git a/application/views/errors/json/html/error_db.php b/application/views/errors/json/html/error_db.php new file mode 100644 index 000000000..dce6a7572 --- /dev/null +++ b/application/views/errors/json/html/error_db.php @@ -0,0 +1,49 @@ +

', $msg); + +$msgs = []; + +$error = [ + 'heading' => $heading +]; + +/** NOTE(chris): extract Error Number and SQL + * @see: DB_driver.php:692 + */ +if (substr(current($msg), 0, 14) == 'Error Number: ') { + $code = substr(array_shift($msg), 14); + if ($code) + $error['code'] = (int)$code; + $msgs[] = array_shift($msg); + $error['sql'] = array_shift($msg); +} + +/** NOTE(chris): extract Line Number and Filename + * @see: DB_driver.php:1782 + * @see: DB_driver.php:1783 + */ +if (count($msg) >= 2) { + if (substr(end($msg), 0, 13) == 'Line Number: ' && substr(prev($msg), 0, 10) == 'Filename: ') { + $error['line'] = (int)substr(array_pop($msg), 13); + $error['filename'] = substr(array_pop($msg), 10); + } +} + +foreach ($msg as $m) + $msgs[] = $m; + + +if (count($msgs) == 1) + $error['message'] = current($msgs); +else + $error['messages'] = $msgs; + +$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_DB); +$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR); diff --git a/application/views/errors/json/html/error_exception.php b/application/views/errors/json/html/error_exception.php new file mode 100644 index 000000000..7984bd13e --- /dev/null +++ b/application/views/errors/json/html/error_exception.php @@ -0,0 +1,27 @@ + $message, + 'class' => get_class($exception), + 'filename' => $exception->getFile(), + 'line' => $exception->getLine() +]; + +if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true) { + $error['backtrace'] = []; + foreach (debug_backtrace() as $err) { + if (isset($err['file']) && strpos($err['file'], realpath(BASEPATH)) !== 0) { + $error['backtrace'][] = [ + 'file' => $err['file'], + 'line' => $err['line'], + 'function' => $err['function'] + ]; + } + } +} + +$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_EXCEPTION); +$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR); diff --git a/application/views/errors/json/html/error_general.php b/application/views/errors/json/html/error_general.php new file mode 100644 index 000000000..e69494463 --- /dev/null +++ b/application/views/errors/json/html/error_general.php @@ -0,0 +1,20 @@ +

', $msg); + +$error = [ + 'heading' => $heading +]; +if (count($msg) == 1) + $error['message'] = current($msg); +else + $error['messages'] = $msg; + +$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_GENERAL); +$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR); diff --git a/application/views/errors/json/html/error_php.php b/application/views/errors/json/html/error_php.php new file mode 100644 index 000000000..91f2abf3c --- /dev/null +++ b/application/views/errors/json/html/error_php.php @@ -0,0 +1,31 @@ + $message, + 'severity' => $severity, + 'filename' => $filepath, + 'line' => $line +]; + +if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true) { + $error['backtrace'] = []; + foreach (debug_backtrace() as $err) { + if (isset($err['file']) && strpos($err['file'], realpath(BASEPATH)) !== 0) { + $error['backtrace'][] = [ + 'file' => $err['file'], + 'line' => $err['line'], + 'function' => $err['function'] + ]; + } + } +} + +// TODO(chris): change type with severity +$g_result->addError($error, 'php'); + +if (((E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $severity) === $severity) { + $g_result->setStatus('error'); +} From 5e99ff9c8bc420912407cb9c38641aae51485a74 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 29 Jan 2024 14:29:39 +0100 Subject: [PATCH 039/123] - uebersicht erweitert - job angepasst --- system/filtersupdate.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/filtersupdate.php b/system/filtersupdate.php index cc9abfb98..a044a3616 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -378,7 +378,8 @@ $filters = array( {"name" : "FoerderfallId"}, {"name" : "LeistungsdatenId"}, {"name" : "startjahr"}, - {"name" : "endjahr"} + {"name" : "endjahr"}, + {"name" : "Uebermittelt"} ], "filters": [] } From ea9e58a640f662d443ce0ed0bc30855a34dbebd0 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jan 2024 10:41:45 +0100 Subject: [PATCH 040/123] Bugfix: Typo --- application/core/FHCAPI_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php index ea187a4b5..39cd853ac 100644 --- a/application/core/FHCAPI_Controller.php +++ b/application/core/FHCAPI_Controller.php @@ -155,7 +155,7 @@ class FHCAPI_Controller extends FHC_Controller { $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); $this->addError($errors, self::ERROR_TYPE_VALIDATION); - $this->setStatus(self::STATUS_FAILED); + $this->setStatus(self::STATUS_FAIL); exit(EXIT_ERROR); } From b010cbb35d1873a32bcce7d42a85bf9017b2a221 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jan 2024 10:42:12 +0100 Subject: [PATCH 041/123] FhcAlert: CSS --- public/css/Fhc.css | 17 ++++++++++++++++- public/js/plugin/FhcAlert.js | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/public/css/Fhc.css b/public/css/Fhc.css index 9342be5a3..7a209b661 100644 --- a/public/css/Fhc.css +++ b/public/css/Fhc.css @@ -1,6 +1,21 @@ -.text-prewrap { +.fhc-alert.p-toast-center { + width: 35rem; + max-width: 100vw; +} +.fhc-alert.p-toast-top-right { + max-width: calc(100vw - 40px); +} +.fhc-alert.p-toast-top-right .p-toast-detail, +.fhc-alert.p-toast-center .p-toast-message-text .card { + white-space: pre-wrap; +} + +.text-preline { white-space: pre-line; } +.text-prewrap { + white-space: pre-wrap; +} .btn-p-0 { padding: 0 .375rem; diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js index 079039aed..cb9c4c4e8 100644 --- a/public/js/plugin/FhcAlert.js +++ b/public/js/plugin/FhcAlert.js @@ -133,8 +133,8 @@ const helperApp = Vue.createApp({ helperAppContainer.parentElement.removeChild(helperAppContainer); }, template: ` - - + +