use date that seems more stable than one that depends on a config entry that may change over time and then change the date in previous documents

This commit is contained in:
Harald Bamberger
2024-07-09 11:38:16 +02:00
parent 2a537df687
commit 37fb9dd851
+8 -10
View File
@@ -78,15 +78,14 @@ if ($config['note_blacklist_wiederholung']) {
$query = " $query = "
SELECT stg.bezeichnung, tbl_orgform.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, ( SELECT stg.bezeichnung, tbl_orgform.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, (
SELECT pr.datum SELECT
FROM lehre.tbl_pruefung pr insertamum::date
JOIN lehre.tbl_note n USING (note) FROM
WHERE pr.student_uid = tbl_student.student_uid campus.tbl_studierendenantrag_status
AND pr.datum <= a.datum WHERE
AND pr.pruefungstyp_kurzbz IN ('kommPruef', 'zusKommPruef') studierendenantrag_id = a.studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Abgemeldet'
AND n.positiv=FALSE ORDER BY
" . $blacklist . " insertamum DESC
ORDER BY datum DESC
LIMIT 1 LIMIT 1
) AS abmeldedatum, (SELECT pt.text FROM system.tbl_phrase p JOIN system.tbl_phrasentext pt USING(phrase_id) WHERE p.category=" . $db->db_add_param('studierendenantrag', FHC_STRING) . " AND p.phrase=" . $db->db_add_param('grund_Wiederholung_deadline', FHC_STRING) . " AND pt.sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . " LIMIT 1) AS grund ) AS abmeldedatum, (SELECT pt.text FROM system.tbl_phrase p JOIN system.tbl_phrasentext pt USING(phrase_id) WHERE p.category=" . $db->db_add_param('studierendenantrag', FHC_STRING) . " AND p.phrase=" . $db->db_add_param('grund_Wiederholung_deadline', FHC_STRING) . " AND pt.sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . " LIMIT 1) AS grund
FROM FROM
@@ -110,7 +109,6 @@ if (!$db->db_query($query) || !$db->db_num_rows())
<?php while($row = $db->db_fetch_object()) { ?> <?php while($row = $db->db_fetch_object()) { ?>
<?php <?php
$abmeldedatum = new DateTime($row->abmeldedatum); $abmeldedatum = new DateTime($row->abmeldedatum);
$abmeldedatum->modify($config['wiederholung_job_deadline_date_modifier']);
?> ?>
<antrag> <antrag>
<name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name> <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>