From d91789aee55e2ab8fcfce0c1f64cddd4517c60dc Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 11 Dec 2025 16:20:09 +0100 Subject: [PATCH 1/3] Aufruf Ausbildungsvertrag mit Param prestudent-id --- application/controllers/api/frontend/v1/stv/Dokumente.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php index 4f33405ae..8a69d28ab 100644 --- a/application/controllers/api/frontend/v1/stv/Dokumente.php +++ b/application/controllers/api/frontend/v1/stv/Dokumente.php @@ -590,8 +590,8 @@ class Dokumente extends FHCAPI_Controller $documents = [ buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null), - buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null), - buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null), + buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&prestudent_id=$prestudent_id", null,20, null), + buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&prestudent_id=$prestudent_id", null,21, null), buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null), buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null), From 34d6b2d97aa7ef2f22bfe7687d426b8815527073 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 12 Dec 2025 14:36:02 +0100 Subject: [PATCH 2/3] use only prestundent_id in Archive-functionality --- .../controllers/api/frontend/v1/Documents.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php index 2d2c410cf..2752bb1b3 100644 --- a/application/controllers/api/frontend/v1/Documents.php +++ b/application/controllers/api/frontend/v1/Documents.php @@ -452,6 +452,11 @@ class Documents extends FHCAPI_Controller $params .= '&vertrag_id[]=' . urlencode($id); } + //delete uid param for Ausbildungsvertrag + if($xsl == 'Ausbildungsver' || $xsl == "AusbVerEng") { + $params = $this->_cutUidParam($params); + } + if (!$vorlage->archivierbar) $this->terminateWithError($this->p->t("stv", "grades_error_archive")); @@ -486,4 +491,20 @@ class Documents extends FHCAPI_Controller ] ]; } + + + /** + * @param string $string + * + * @return String paramString without paramUid + */ + private function _cutUidParam($string) + { + $string = preg_replace('/uid=[^&]*&?/', '', $string); + + $params = trim($string, '&'); + $params = preg_replace('/&&+/', '&', $params); + + return $params; + } } From b967f83dd4d9f862226872cbfda1c67b46d28d7e Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 12 Dec 2025 15:05:37 +0100 Subject: [PATCH 3/3] skip adding uid to params for templates Ausbildungsver and AusbVerEng instead of deleting it afterwards --- .../controllers/api/frontend/v1/Documents.php | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php index 2752bb1b3..7b2fc4a15 100644 --- a/application/controllers/api/frontend/v1/Documents.php +++ b/application/controllers/api/frontend/v1/Documents.php @@ -442,6 +442,10 @@ class Documents extends FHCAPI_Controller 'betreuerart_kurzbz', 'studiensemester_kurzbz' ] as $key) { + if (in_array($xsl, array('Ausbildungsver', 'AusbVerEng')) && $key === 'uid') + { + continue; + } $value = $this->input->post_get($key); if ($value !== null) $params .= '&' . $key . '=' . urlencode($value); @@ -452,11 +456,6 @@ class Documents extends FHCAPI_Controller $params .= '&vertrag_id[]=' . urlencode($id); } - //delete uid param for Ausbildungsvertrag - if($xsl == 'Ausbildungsver' || $xsl == "AusbVerEng") { - $params = $this->_cutUidParam($params); - } - if (!$vorlage->archivierbar) $this->terminateWithError($this->p->t("stv", "grades_error_archive")); @@ -491,20 +490,4 @@ class Documents extends FHCAPI_Controller ] ]; } - - - /** - * @param string $string - * - * @return String paramString without paramUid - */ - private function _cutUidParam($string) - { - $string = preg_replace('/uid=[^&]*&?/', '', $string); - - $params = trim($string, '&'); - $params = preg_replace('/&&+/', '&', $params); - - return $params; - } }