From dc5ca70645bb92047975e3e96f2881474db1410c Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 13:55:13 +0200
Subject: [PATCH 1/8] Create zgvdoktor.rdf.php

ZGV Doktor und zgv_erfuellt
---
 rdf/zgvdoktor.rdf.php | 79 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 rdf/zgvdoktor.rdf.php

diff --git a/rdf/zgvdoktor.rdf.php b/rdf/zgvdoktor.rdf.php
new file mode 100644
index 000000000..dc0b38ff7
--- /dev/null
+++ b/rdf/zgvdoktor.rdf.php
@@ -0,0 +1,79 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+// header für no cache
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+// content type setzen
+header("Content-type: application/xhtml+xml");
+
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/basis_db.class.php');
+
+$rdf_url='http://www.technikum-wien.at/zgvdoktor';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:ZGVDOKTOR="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+        	<ZGVDOKTOR:code></ZGVDOKTOR:code>
+        	<ZGVDOKTOR:bezeichnung>-- keine Auswahl --</ZGVDOKTOR:bezeichnung>
+        	<ZGVDOKTOR:kurzbz>-- keine Auswahl --</ZGVDOKTOR:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+';
+}
+$qry = 'SELECT * FROM bis.tbl_zgvdoktor ORDER BY zgvdoktor_code';
+$db = new basis_db();
+
+if($db->db_query($qry))
+{
+	while($row = $db->db_fetch_object())
+	{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->zgvdoktor_code; ?>"  about="<?php echo $rdf_url.'/'.$row->zgvdoktor_code; ?>" >
+        	<ZGVDOKTOR:code><![CDATA[<?php echo $row->zgvdoktor_code;  ?>]]></ZGVDOKTOR:code>
+        	<ZGVDOKTOR:bezeichnung><![CDATA[<?php echo $row->zgvdoktor_bez; ?>]]></ZGVDOKTOR:bezeichnung>
+        	<ZGVDOKTOR:kurzbz><![CDATA[<?php echo $row->zgvdoktor_kurzbz; ?>]]></ZGVDOKTOR:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file

From 713374f4d867ef1404807f79d20d2f40e53ec81c Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 13:59:16 +0200
Subject: [PATCH 2/8] ZGV Doktor und zgv_erfuellt

---
 rdf/student.rdf.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 3771f7d5e..ae2016aea 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -126,14 +126,16 @@ function checkfilter($row, $filter2, $buchungstyp = null)
 	elseif($filter2=='zgvohnedatum')
 	{
 		//Alle Personen die den ZGV Typ eingetragen haben aber noch kein Datum
-		$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum
+		$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum,zgvdoktor_code, zgvdoktordatum
 			FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($row->prestudent_id);
 		if($db->db_query($qry))
 		{
 			if($row_filter = $db->db_fetch_object())
 			{
 				if(($row_filter->zgv_code!='' && $row_filter->zgvdatum=='')
-				|| ($row_filter->zgvmas_code!='' && $row_filter->zgvmadatum==''))
+				|| ($row_filter->zgvmas_code!='' && $row_filter->zgvmadatum=='')
+				|| ($row_filter->zgvdoktor_code!='' && $row_filter->zgvdoktordatum=='')
+				)
 					return true;
 				else
 					return false;
@@ -352,11 +354,18 @@ function draw_prestudent($row)
 			<STUDENT:zgvdatum><![CDATA['.$datum_obj->convertISODate($row->zgvdatum).']]></STUDENT:zgvdatum>
 			<STUDENT:zgvdatum_iso><![CDATA['.$row->zgvdatum.']]></STUDENT:zgvdatum_iso>
 			<STUDENT:zgvnation><![CDATA['.$row->zgvnation.']]></STUDENT:zgvnation>
+			<STUDENT:zgv_erfuellt><![CDATA['.$row->zgv_erfuellt.']]></STUDENT:zgv_erfuellt>														  
 			<STUDENT:zgvmas_code><![CDATA['.$row->zgvmas_code.']]></STUDENT:zgvmas_code>
 			<STUDENT:zgvmaort><![CDATA['.$row->zgvmaort.']]></STUDENT:zgvmaort>
 			<STUDENT:zgvmadatum><![CDATA['.$datum_obj->convertISODate($row->zgvmadatum).']]></STUDENT:zgvmadatum>
 			<STUDENT:zgvmadatum_iso><![CDATA['.$row->zgvmadatum.']]></STUDENT:zgvmadatum_iso>
 			<STUDENT:zgvmanation><![CDATA['.$row->zgvmanation.']]></STUDENT:zgvmanation>
+			<STUDENT:zgvmas_erfuellt><![CDATA['.$row->zgvmas_erfuellt.']]></STUDENT:zgvmas_erfuellt>
+			<STUDENT:zgvdoktor_code><![CDATA['.$row->zgvdoktor_code.']]></STUDENT:zgvdoktor_code>
+			<STUDENT:zgvdoktorort><![CDATA['.$row->zgvdoktorort.']]></STUDENT:zgvdoktorort>
+			<STUDENT:zgvdoktordatum><![CDATA['.$datum_obj->convertISODate($row->zgvdoktordatum).']]></STUDENT:zgvdoktordatum>
+			<STUDENT:zgvdoktordatum_iso><![CDATA['.$row->zgvdoktordatum.']]></STUDENT:zgvdoktordatum_iso>
+			<STUDENT:zgvdoktornation><![CDATA['.$row->zgvdoktornation.']]></STUDENT:zgvdoktornation>																																			<STUDENT:zgvdoktor_erfuellt><![CDATA['.$row->zgvdoktor_erfuellt.']]></STUDENT:zgvdoktor_erfuellt>							 
 			<STUDENT:ausstellungsstaat><![CDATA['.$row->ausstellungsstaat.']]></STUDENT:ausstellungsstaat>
 			<STUDENT:aufnahmeschluessel><![CDATA['.$row->aufnahmeschluessel.']]></STUDENT:aufnahmeschluessel>
 			<STUDENT:facheinschlberuf><![CDATA['.($row->facheinschlberuf?'true':'false').']]></STUDENT:facheinschlberuf>

From ced3f0f97858f6e9f168e40f1d8d4c8d1648ad58 Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 14:04:43 +0200
Subject: [PATCH 3/8] ZGV Doktor und zgv_erfuellt

---
 rdf/prestudent.rdf.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
index bc7c17036..b7b8aa6d9 100644
--- a/rdf/prestudent.rdf.php
+++ b/rdf/prestudent.rdf.php
@@ -68,11 +68,19 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
 				<PRESTD:zgvdatum_iso><![CDATA[<?php echo $prestd->zgvdatum;  ?>]]></PRESTD:zgvdatum_iso>
                 <PRESTD:zgvdatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdatum);  ?>]]></PRESTD:zgvdatum>
                 <PRESTD:zgvnation><![CDATA[<?php echo $prestd->zgvnation;  ?>]]></PRESTD:zgvnation>
+				<PRESTD:zgv_erfuellt><![CDATA[<?php echo $prestd->zgv_erfuellt;  ?>]]></PRESTD:zgv_erfuellt>
                 <PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code;  ?>]]></PRESTD:zgvmas_code>
 				<PRESTD:zgvmaort><![CDATA[<?php echo $prestd->zgvmaort;  ?>]]></PRESTD:zgvmaort>
 				<PRESTD:zgvmadatum_iso><![CDATA[<?php echo $prestd->zgvmadatum;  ?>]]></PRESTD:zgvmadatum_iso>
                 <PRESTD:zgvmadatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvmadatum);  ?>]]></PRESTD:zgvmadatum>
                 <PRESTD:zgvmanation><![CDATA[<?php echo $prestd->zgvmanation;  ?>]]></PRESTD:zgvmanation>
+				<PRESTD:zgvmas_erfuellt><![CDATA[<?php echo $prestd->zgvmas_erfuellt;  ?>]]></PRESTD:zgvmas_erfuellt>
+				<PRESTD:zgvdoktor_code><![CDATA[<?php echo $prestd->zgvdoktor_code;  ?>]]></PRESTD:zgvdoktor_code>
+				<PRESTD:zgvdoktorort><![CDATA[<?php echo $prestd->zgvdoktorort;  ?>]]></PRESTD:zgvdoktorort>
+				<PRESTD:zgvdoktordatum_iso><![CDATA[<?php echo $prestd->zgvdoktordatum;  ?>]]></PRESTD:zgvdoktordatum_iso>
+                <PRESTD:zgvdoktordatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdoktordatum);  ?>]]></PRESTD:zgvdoktordatum>
+                <PRESTD:zgvdoktornation><![CDATA[<?php echo $prestd->zgvdoktornation;  ?>]]></PRESTD:zgvdoktornation>
+				<PRESTD:zgvdoktor_erfuellt><![CDATA[<?php echo $prestd->zgvdoktor_erfuellt;  ?>]]></PRESTD:zgvdoktor_erfuellt>
                 <PRESTD:aufnahmeschluessel><![CDATA[<?php echo $prestd->aufnahmeschluessel;  ?>]]></PRESTD:aufnahmeschluessel>
 				<PRESTD:facheinschlberuf><![CDATA[<?php echo ($prestd->facheinschlberuf?'true':'false');  ?>]]></PRESTD:facheinschlberuf>
 				<PRESTD:reihungstest_id><![CDATA[<?php echo $prestd->reihungstest_id;  ?>]]></PRESTD:reihungstest_id>

From cf0957f8a494126561095503d1f8f618cf9b82db Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 14:10:37 +0200
Subject: [PATCH 4/8] ZGV Doktor und zgv_erfuellt

---
 content/student/studentdetailoverlay.xul.php | 64 ++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 18e69874e..7771c17cb 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -294,6 +294,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						<column flex="5"/>
 						<column flex="1"/>
 						<column flex="5"/>
+						<column flex="1"/>
+						<column flex="1"/>							 
 					</columns>
 					<rows>
 						<row>
@@ -332,6 +334,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									</template>
 								</menulist>
 							</hbox>
+							<!-- ZGV erfuellt -->
+							<?php
+							$is_hidden = (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN) ? 'false' : 'true';
+							?>							
+							<label value="ZGV erfüllt" control="student-prestudent-checkbox-zgverfuellt" hidden="<?php echo $is_hidden?>"/>
+							<hbox>
+								<checkbox id="student-prestudent-checkbox-zgverfuellt" checked="true" disabled="true" hidden="<?php echo $is_hidden?>"/>
+							</hbox>						  
 						</row>
 						<row>
 							<label value="ZGV Master" control="student-prestudent-menulist-zgvmastercode"/>
@@ -367,6 +377,60 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 									</template>
 								</menulist>
+							</hbox>													
+		   							<!-- ZGV Master erfuellt -->
+							<?php
+							$is_hidden = (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN) ? 'false' : 'true';
+							?>			
+							<label value="ZGV Master erfüllt" control="student-prestudent-checkbox-zgvmaserfuellt" hidden="<?php echo $is_hidden?>"/>
+							<hbox>
+								<checkbox id="student-prestudent-checkbox-zgvmaserfuellt" checked="true" disabled="true" hidden="<?php echo $is_hidden?>"/>
+							</hbox>
+						</row>
+						<!-- ZGV Doktor --> 
+						<?php
+							$is_hidden = (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN) ? 'false' : 'true';
+							?>
+						<row hidden="<?php echo $is_hidden?>">
+						<label value="ZGV Doktor" control="student-prestudent-menulist-zgvdoktorcode"/>
+							<menulist id="student-prestudent-menulist-zgvdoktorcode" disabled="true"
+									datasources="<?php echo APP_ROOT ?>rdf/zgvdoktor.rdf.php?optional=true" flex="1"
+									ref="http://www.technikum-wien.at/zgvdoktor/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/zgvdoktor/rdf#code"
+												label="rdf:http://www.technikum-wien.at/zgvdoktor/rdf#kurzbz"
+												uri="rdf:*"/>
+									</menupopup>
+								</template>
+							</menulist>
+						<label value="ZGV Doktor Ort" control="student-prestudent-textbox-zgvdoktorort"/>
+							<textbox id="student-prestudent-textbox-zgvdoktorort" disabled="true" maxlength="64"/>
+						<label value="ZGV Doktor Datum" control="student-prestudent-textbox-zgvdoktordatum"/>
+							<hbox>
+								<box class='Datum' id="student-prestudent-textbox-zgvdoktordatum" disabled="true"/>
+							</hbox>
+						<label value="ZGV Doktor Nation" control="student-prestudent-menulist-zgvdoktornation"/>
+							<hbox>
+								<menulist id="student-prestudent-menulist-zgvdoktornation" disabled="true"
+										datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+										ref="http://www.technikum-wien.at/nation/liste" >
+									<template>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+													uri="rdf:*"/>
+										</menupopup>
+									</template>
+								</menulist>
+							</hbox>
+									<!-- ZGV Doktor erfuellt -->
+							<?php
+							$is_hidden = (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN) ? 'false' : 'true';
+							?>			
+							<label value="ZGV Doktor erfüllt" control="student-prestudent-checkbox-zgvdoktorerfuellt" hidden="<?php echo $is_hidden?>"/>
+							<hbox>
+								<checkbox id="student-prestudent-checkbox-zgvdoktorerfuellt" checked="true" disabled="true" hidden="<?php echo $is_hidden?>"/>
 							</hbox>
 						</row>
 					</rows>

From 8423b3e30af659d28ef2bf45d368987e26681d46 Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 14:21:10 +0200
Subject: [PATCH 5/8] ZGV Doktor und zgv_erfuellt

---
 content/student/studentoverlay.js.php | 56 ++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index f034ae473..fa142d8fa 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1137,10 +1137,18 @@ function StudentAuswahl()
 	zgvort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvort" ));
 	zgvnation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvnation" ));
 	zgvdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdatum" ));
+	zgv_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_erfuellt" ));											   
 	zgvmaster_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_code" ));
 	zgvmasterort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmaort" ));
 	zgvmasternation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmanation" ));
-	zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" ));
+	zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" )); 
+	zgvmas_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_erfuellt" ));
+	zgvdoktor_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktor_code" ));
+	zgvdoktorort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktorort" ));
+	zgvdoktornation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktornation" ));
+	zgvdoktordatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktordatum" ));
+	zgvdoktor_erfuellt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdoktor_erfuellt" ));
+									  
 	aufnahmeschluessel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmeschluessel" ));
 	facheinschlberuf = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#facheinschlberuf" ));
 	bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
@@ -1157,10 +1165,26 @@ function StudentAuswahl()
 	document.getElementById('student-prestudent-textbox-zgvort').value=zgvort;
     MenulistSelectItemOnValue('student-prestudent-menulist-zgvnation', zgvnation);
 	document.getElementById('student-prestudent-textbox-zgvdatum').value=zgvdatum;
+	if(zgv_erfuellt=='t')
+		document.getElementById('student-prestudent-checkbox-zgverfuellt').checked=true;
+	else
+		document.getElementById('student-prestudent-checkbox-zgverfuellt').checked=false;									  
 	document.getElementById('student-prestudent-menulist-zgvmastercode').value=zgvmaster_code;
 	document.getElementById('student-prestudent-textbox-zgvmasterort').value=zgvmasterort;
     MenulistSelectItemOnValue('student-prestudent-menulist-zgvmasternation', zgvmasternation);
 	document.getElementById('student-prestudent-textbox-zgvmasterdatum').value=zgvmasterdatum;
+	if(zgvmas_erfuellt=='t')
+		document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked=true;
+	else
+	document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked=false; 
+	document.getElementById('student-prestudent-menulist-zgvdoktorcode').value=zgvdoktor_code;
+	document.getElementById('student-prestudent-textbox-zgvdoktorort').value=zgvdoktorort;
+    MenulistSelectItemOnValue('student-prestudent-menulist-zgvdoktornation', zgvdoktornation);
+	document.getElementById('student-prestudent-textbox-zgvdoktordatum').value=zgvdoktordatum;
+	if(zgvdoktor_erfuellt=='t')
+		document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').checked=true;
+	else
+	document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').checked=false;
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value=aufnahmeschluessel;
 	if(facheinschlberuf=='true')
 		document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked=true;
@@ -1694,10 +1718,18 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-textbox-zgvort').disabled=val;
 	document.getElementById('student-prestudent-menulist-zgvnation').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvdatum').disabled=val;
+	document.getElementById('student-prestudent-checkbox-zgverfuellt').disabled=val;											   
 	document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvmasterort').disabled=val;
 	document.getElementById('student-prestudent-menulist-zgvmasternation').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvmasterdatum').disabled=val;
+	document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').disabled=val;
+	document.getElementById('student-prestudent-menulist-zgvdoktorcode').disabled=val;
+	document.getElementById('student-prestudent-textbox-zgvdoktorort').disabled=val;
+	document.getElementById('student-prestudent-menulist-zgvdoktornation').disabled=val;
+	document.getElementById('student-prestudent-textbox-zgvdoktordatum').disabled=val;
+	document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').disabled=val;
+			   
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
 	document.getElementById('student-prestudent-checkbox-facheinschlberuf').disabled=val;
 	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
@@ -1763,10 +1795,18 @@ function StudentPrestudentSave()
 	zgvort = document.getElementById('student-prestudent-textbox-zgvort').value;
 	zgvnation = document.getElementById('student-prestudent-menulist-zgvnation').value;
 	zgvdatum = document.getElementById('student-prestudent-textbox-zgvdatum').value;
+	zgv_erfuellt = document.getElementById('student-prestudent-checkbox-zgverfuellt').checked;											   
 	zgvmaster_code = document.getElementById('student-prestudent-menulist-zgvmastercode').value;
 	zgvmasterort = document.getElementById('student-prestudent-textbox-zgvmasterort').value;
 	zgvmasternation = document.getElementById('student-prestudent-menulist-zgvmasternation').value;
 	zgvmasterdatum = document.getElementById('student-prestudent-textbox-zgvmasterdatum').value;
+	zgvmas_erfuellt = document.getElementById('student-prestudent-checkbox-zgvmaserfuellt').checked;
+	zgvdoktor_code = document.getElementById('student-prestudent-menulist-zgvdoktorcode').value;
+	zgvdoktorort = document.getElementById('student-prestudent-textbox-zgvdoktorort').value;
+	zgvdoktornation = document.getElementById('student-prestudent-menulist-zgvdoktornation').value;
+	zgvdoktordatum = document.getElementById('student-prestudent-textbox-zgvdoktordatum').value;
+	zgvdoktor_erfuellt = document.getElementById('student-prestudent-checkbox-zgvdoktorerfuellt').checked;
+							  
 	aufnahmeschluessel = document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value;
 	facheinschlberuf = document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked;
 	bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked;
@@ -1790,7 +1830,11 @@ function StudentPrestudentSave()
 		alert('ZGVMaster Datum ist ungueltig');
 		return false;
 	}
-
+	if(zgvdoktordatum!='' && !CheckDatum(zgvdoktordatum))
+	{
+		alert('ZGVDoktor Datum ist ungueltig');
+		return false;
+	}
 	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
 	var req = new phpRequest(url,'','');
 
@@ -1809,10 +1853,18 @@ function StudentPrestudentSave()
 	req.add('zgvort', zgvort);
 	req.add('zgvnation', zgvnation);
 	req.add('zgvdatum', ConvertDateToISO(zgvdatum));
+	req.add('zgv_erfuellt', zgv_erfuellt);											   
 	req.add('zgvmas_code', zgvmaster_code);
 	req.add('zgvmaort', zgvmasterort);
 	req.add('zgvmanation', zgvmasternation);
 	req.add('zgvmadatum', ConvertDateToISO(zgvmasterdatum));
+	req.add('zgvmas_erfuellt', zgvmas_erfuellt);
+	req.add('zgvdoktor_code', zgvdoktor_code);
+	req.add('zgvdoktorort', zgvdoktorort);
+	req.add('zgvdoktornation', zgvdoktornation);
+	req.add('zgvdoktordatum', ConvertDateToISO(zgvdoktordatum));
+	req.add('zgvdoktor_erfuellt', zgvdoktor_erfuellt);
+							  
 	req.add('aufnahmeschluessel', aufnahmeschluessel);
 	req.add('facheinschlberuf', facheinschlberuf);
 	req.add('bismelden', bismelden);

From ed43b03e378fa057bbd5d3245a586528e147bcc7 Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 14:33:03 +0200
Subject: [PATCH 6/8] ZGV Doktor und zgv_erfuellt

---
 content/student/studentDBDML.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 79e330c7f..6aa407c5e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -365,6 +365,7 @@ if(!$error)
 			$error = true;
 			$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
 		}
+
 		//Studentendaten speichern
 		if(!$error)
 		{
@@ -384,7 +385,8 @@ if(!$error)
 				$return = false;
 				$errormsg = 'Geburtsdatum ist nicht korrekt.';
 				$error = true;
-			}
+			}			
+
 			if(!$error)
 			{
 				$student->uid = $_POST['uid'];
@@ -624,10 +626,17 @@ if(!$error)
 				$prestudent->zgvort = $_POST['zgvort'];
 				$prestudent->zgvdatum = $_POST['zgvdatum'];
 				$prestudent->zgvnation = $_POST['zgvnation'];
+				$prestudent->zgv_erfuellt = $_POST['zgv_erfuellt']; 									   
 				$prestudent->zgvmas_code = $_POST['zgvmas_code'];
 				$prestudent->zgvmaort = $_POST['zgvmaort'];
 				$prestudent->zgvmadatum = $_POST['zgvmadatum'];
 				$prestudent->zgvmanation = $_POST['zgvmanation'];
+				$prestudent->zgvmas_erfuellt = $_POST['zgvmas_erfuellt'];										  
+				$prestudent->zgvdoktor_code = $_POST['zgvdoktor_code'];
+				$prestudent->zgvdoktorort = $_POST['zgvdoktorort'];
+				$prestudent->zgvdoktordatum = $_POST['zgvdoktordatum'];
+				$prestudent->zgvdoktornation = $_POST['zgvdoktornation'];
+				$prestudent->zgvdoktor_erfuellt = $_POST['zgvdoktor_erfuellt'];
 				$prestudent->aufnahmeschluessel = $_POST['aufnahmeschluessel'];
 				$prestudent->facheinschlberuf = ($_POST['facheinschlberuf']=='true'?true:false);
 				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
@@ -2308,7 +2317,7 @@ if(!$error)
 			{
 				if ($dokument_kurzbz === 'Sonst' && $sonst !== 0)
 					continue;
-
+									 
 				if($dokument_kurzbz!='')
 				{
 					$dok = new dokument();
@@ -2321,6 +2330,7 @@ if(!$error)
 					$dok->new = true;
 					if ($dokument_kurzbz === 'Sonst')
 						$sonst++;
+				  
 
 					if(!$dok->save())
 					{
@@ -2515,7 +2525,6 @@ if(!$error)
 			$dokumente = explode(';',$_POST['dokumente']);
 			$errormsg = '';
 			$sonst = 0;
-
 			foreach ($dokumente as $dokument_kurzbz)
 			{
 				if ($dokument_kurzbz === 'Sonst' && $sonst !== 0)

From 624b910edd9c396d47142d7508d3a2dd7783a8ac Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:30:37 +0200
Subject: [PATCH 7/8] ZGV Doktor und zgv_erfuellt

---
 include/prestudent.class.php | 76 ++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 17 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index eb8767883..8ff3a8724 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -44,10 +44,12 @@ class prestudent extends person
 	public $zgvort;
 	public $zgvdatum;
 	public $zgvnation;
+	public $zgv_erfuellt;											   
 	public $zgvmas_code;
 	public $zgvmaort;
 	public $zgvmadatum;
 	public $zgvmanation;
+	public $zgvmas_erfuellt;												  
 	public $ausstellungsstaat;
 	public $aufnahmeschluessel;
 	public $facheinschlberuf;
@@ -68,6 +70,7 @@ class prestudent extends person
 	public $zgvdoktorort;
 	public $zgvdoktordatum;
 	public $zgvdoktornation;
+	public $zgvdoktor_erfuellt;						
 	public $gsstudientyp_kurzbz='Intern';
 	public $aufnahmegruppe_kurzbz;
 	public $priorisierung = null;
@@ -137,10 +140,12 @@ class prestudent extends person
 				$this->zgvort = $row->zgvort;
 				$this->zgvdatum = $row->zgvdatum;
 				$this->zgvnation = $row->zgvnation;
+				$this->zgv_erfuellt = $row->zgv_erfuellt;									  
 				$this->zgvmas_code = $row->zgvmas_code;
 				$this->zgvmaort = $row->zgvmaort;
 				$this->zgvmadatum = $row->zgvmadatum;
 				$this->zgvmanation = $row->zgvmanation;
+				$this->zgvmas_erfuellt = $row->zgvmas_erfuellt;										 
 				$this->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$this->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$this->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -161,6 +166,7 @@ class prestudent extends person
 				$this->zgvdoktorort = $row->zgvdoktorort;
 				$this->zgvdoktordatum = $row->zgvdoktordatum;
 				$this->zgvdoktornation = $row->zgvdoktornation;
+				$this->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;										 
 				$this->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
 				$this->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$this->priorisierung = $row->priorisierung;
@@ -220,6 +226,11 @@ class prestudent extends person
 			$this->errormsg = 'ZGV Master Ort darf nicht länger als 64 Zeichen sein.';
 			return false;
 		}
+		if(mb_strlen($this->zgvdoktorort)>64)
+		{
+			$this->errormsg = 'ZGV Doktor Ort darf nicht länger als 64 Zeichen sein.';
+			return false;
+		}
 
 		return true;
 	}
@@ -245,12 +256,13 @@ class prestudent extends person
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
 			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id,
-					studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvnation,
-					zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, aufnahmeschluessel, facheinschlberuf,
+					studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvnation, zgv_erfuellt,
+					zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, zgvmas_erfuellt, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, 
+					zgvdoktornation,aufnahmeschluessel, facheinschlberuf,
 					reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte,
 					rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon,
 					updateamum, updatevon, anmerkung, dual, ausstellungsstaat, mentor,
-					gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung) VALUES('.
+					gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung,zgvdoktor_erfuellt) VALUES('.
 					$this->db_add_param($this->aufmerksamdurch_kurzbz).",".
 					$this->db_add_param($this->person_id).",".
 					$this->db_add_param($this->studiengang_kz).",".
@@ -260,10 +272,16 @@ class prestudent extends person
 					$this->db_add_param($this->zgvort).",".
 					$this->db_add_param($this->zgvdatum).",".
 					$this->db_add_param($this->zgvnation).",".
+					$this->db_add_param($this->zgv_erfuellt).",".							  
 					$this->db_add_param($this->zgvmas_code).",".
 					$this->db_add_param($this->zgvmaort).",".
 					$this->db_add_param($this->zgvmadatum).",".
 					$this->db_add_param($this->zgvmanation).",".
+					$this->db_add_param($this->zgvmas_erfuellt).",".
+				    $this->db_add_param($this->zgvdoktor_code).",".
+			        $this->db_add_param($this->zgvdoktorort).",".
+			        $this->db_add_param($this->zgvdoktordatum).",".
+                    $this->db_add_param($this->zgvdoktornation).",".				
 					$this->db_add_param($this->aufnahmeschluessel).",".
 					$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
 					$this->db_add_param($this->reihungstest_id).",".
@@ -284,7 +302,8 @@ class prestudent extends person
 					$this->db_add_param($this->mentor).",".
 					$this->db_add_param($this->gsstudientyp_kurzbz).",".
 					$this->db_add_param($this->aufnahmegruppe_kurzbz).",".
-					$this->db_add_param($this->priorisierung).");";
+					$this->db_add_param($this->priorisierung).",".
+					$this->db_add_param($this->zgvdoktor_erfuellt).");";
 		}
 		else
 		{
@@ -298,10 +317,16 @@ class prestudent extends person
 					' zgvort='.$this->db_add_param($this->zgvort).",".
 					' zgvdatum='.$this->db_add_param($this->zgvdatum).",".
 					' zgvnation='.$this->db_add_param($this->zgvnation).",".
+					' zgv_erfuellt='.$this->db_add_param($this->zgv_erfuellt).",".											   
 					' zgvmas_code='.$this->db_add_param($this->zgvmas_code).",".
 					' zgvmaort='.$this->db_add_param($this->zgvmaort).",".
 					' zgvmadatum='.$this->db_add_param($this->zgvmadatum).",".
 					' zgvmanation='.$this->db_add_param($this->zgvmanation).",".
+					' zgvmas_erfuellt='.$this->db_add_param($this->zgvmas_erfuellt).",".
+				    ' zgvdoktor_code='.$this->db_add_param($this->zgvdoktor_code).",".
+			        ' zgvdoktorort='.$this->db_add_param($this->zgvdoktorort).",".
+			        ' zgvdoktordatum='.$this->db_add_param($this->zgvdoktordatum).",".
+                    ' zgvdoktornation='.$this->db_add_param($this->zgvdoktornation).",".					
 					' aufnahmeschluessel='.$this->db_add_param($this->aufnahmeschluessel).",".
 					' facheinschlberuf='.$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
 					' reihungstest_id='.$this->db_add_param($this->reihungstest_id).",".
@@ -320,7 +345,8 @@ class prestudent extends person
 					' dual='.$this->db_add_param($this->dual, FHC_BOOLEAN).",".
 					' ausstellungsstaat='.$this->db_add_param($this->ausstellungsstaat).",".
 					' aufnahmegruppe_kurzbz='.$this->db_add_param($this->aufnahmegruppe_kurzbz).",".
-					' priorisierung='.$this->db_add_param($this->priorisierung).' '.
+					' priorisierung='.$this->db_add_param($this->priorisierung).",".
+					' zgvdoktor_erfuellt='.$this->db_add_param($this->zgvdoktor_erfuellt).' '.
 					" WHERE prestudent_id=".$this->db_add_param($this->prestudent_id).";";
 		}
 
@@ -796,10 +822,12 @@ class prestudent extends person
 			case "zgv":
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
-				if($stg_obj->typ=='m')
-					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null";
+			    if($stg_obj->typ=='m')
+					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null AND a.zgvmas_erfuellt = 't'";
+				elseif($stg_obj->typ=='p')
+					$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null AND a.zgvdoktor_erfuellt = 't'";
 				else
-					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null";
+					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";	
 				break;
 			case "reihungstestangemeldet":
 				$qry.="
@@ -896,10 +924,17 @@ class prestudent extends person
 				$ps->zgvort = $row->zgvort;
 				$ps->zgvdatum = $row->zgvdatum;
 				$ps->zgvnation = $row->zgvnation;
+				$ps->zgv_erfuellt = $row->zgv_erfuellt;						   
 				$ps->zgvmas_code = $row->zgvmas_code;
 				$ps->zgvmaort = $row->zgvmaort;
 				$ps->zgvmadatum = $row->zgvmadatum;
 				$ps->zgvmanation = $row->zgvmanation;
+				$ps->zgvmas_erfuellt = $row->zgvmas_erfuellt;
+				$ps->zgvdoktor_code = $row->zgvdoktor_code;
+				$ps->zgvdoktorort = $row->zgvdoktorort;
+				$ps->zgvdoktordatum = $row->zgvdoktordatum;
+				$ps->zgvdoktornation = $row->zgvdoktornation;
+				$ps->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;									 
 				$ps->ausstellungsstaat = $row->ausstellungsstaat;
 				$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
@@ -1418,10 +1453,12 @@ class prestudent extends person
 				$obj->zgvort = $row->zgvort;
 				$obj->zgvdatum = $row->zgvdatum;
 				$obj->zgvnation = $row->zgvnation;
+				$obj->zgv_erfuellt = $row->zgv_erfuellt;							
 				$obj->zgvmas_code = $row->zgvmas_code;
 				$obj->zgvmaort = $row->zgvmaort;
 				$obj->zgvmadatum = $row->zgvmadatum;
 				$obj->zgvmanation = $row->zgvmanation;
+				$obj->zgvmas_erfuellt = $row->zgvmas_erfuellt;								  
 				$obj->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$obj->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$obj->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -1441,11 +1478,12 @@ class prestudent extends person
 				$obj->zgvdoktor_code = $row->zgvdoktor_code;
 				$obj->zgvdoktorort = $row->zgvdoktorort;
 				$obj->zgvdoktordatum = $row->zgvdoktordatum;
-				$obj->zgvdoktornation = $row->zgvdoktornation;
+				$obj->zgvdoktornation = $row->zgvdoktornation;									  
 				$obj->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$obj->priorisierung = $row->priorisierung;
-
+				$obj->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
+				
 				$this->result[] = $obj;
 			}
 			return true;
@@ -1468,7 +1506,7 @@ class prestudent extends person
 		(
 			'bachelor' => array(),
 			'master' => array(),
-			//'doktor' => array(),
+			'doktor' => array(),
 		);
 		$attribute = array
 		(
@@ -2065,11 +2103,11 @@ class prestudent extends person
 			$log->sql = $qry;
 			$log->sqlundo = 'INSERT INTO public.tbl_prestudent(
 				prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
-				zgv_code, zgvort, zgvdatum, zgvnation, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,
+				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
 				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
 				punkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id_prestudent,
 				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
-				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung) VALUES('.
+				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung,zgvdoktor_erfuellt) VALUES('.
 				$this->db_add_param($this->prestudent_id).','.
 				$this->db_add_param($this->aufmerksamdurch_kurzbz).','.
 				$this->db_add_param($this->studiengang_kz).','.
@@ -2079,10 +2117,12 @@ class prestudent extends person
 				$this->db_add_param($this->zgvort).','.
 				$this->db_add_param($this->zgvdatum).','.
 				$this->db_add_param($this->zgvnation).','.
+				$this->db_add_param($this->zgv_erfuellt).','.								 
 				$this->db_add_param($this->zgvmas_code).','.
 				$this->db_add_param($this->zgvmaort).','.
 				$this->db_add_param($this->zgvmadatum).','.
 				$this->db_add_param($this->zgvmanation).','.
+				$this->db_add_param($this->zgvmas_erfuellt).','.									
 				$this->db_add_param($this->aufnahmeschluessel).','.
 				$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).','.
 				$this->db_add_param($this->anmeldungreihungstest).','.
@@ -2105,7 +2145,8 @@ class prestudent extends person
 				$this->db_add_param($this->zgvdoktornation).','.
 				$this->db_add_param($this->gsstudientyp_kurzbz).','.
 				$this->db_add_param($this->aufnahmegruppe_kurzbz).','.
-				$this->db_add_param($this->priorisierung).');';
+				$this->db_add_param($this->priorisierung).','.
+				$this->db_add_param($this->zgvdoktor_erfuellt).');';
 
 			if($log->save(true))
 			{
@@ -2216,9 +2257,9 @@ class prestudent extends person
 				WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
 				AND priorisierung <= ".$this->db_add_param($priorisierungAbsolut, FHC_INTEGER);
 
-		if ($result = $this->db_query($qry))
+		if($result = $this->db_query($qry))
 		{
-			if ($row = $this->db_fetch_object($result))
+			if($row = $this->db_fetch_object($result))
 			{
 				return $row->prio_relativ;
 			}
@@ -2233,8 +2274,9 @@ class prestudent extends person
 			$this->errormsg = 'Fehler beim Laden der Daten';
 			return false;
 		}
-	}
+  
 
+	}
 	/**
 	 * Prueft, ob eine Person einen aktuellen PreStudentstatus-Eintrag besitzt, der die ZGV Master ersetzt
 	 * @param int $person_id ID der zu überprüfenden Person.

From a6d83ef321ed4fdb0f777a2866426a63b825d0cc Mon Sep 17 00:00:00 2001
From: Monika70 <46781283+Monika70@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:39:36 +0200
Subject: [PATCH 8/8] ZGV Doktor und zgv_erfuellt

---
 system/dbupdate_3.3.php | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 7e0aefe09..ba6852747 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -2567,7 +2567,6 @@ if(!@$db->db_query("SELECT zeitaufzeichnungspflichtig FROM bis.tbl_bisverwendung
 				. "<br>Fix angestellte Mitarbeiter auf true gesetzt, alle anderen auf false";
 }
 
-
 // Spalte Priorisierung für tbl_prestudent
 if(!$result = @$db->db_query("SELECT priorisierung FROM public.tbl_prestudent LIMIT 1"))
 {
@@ -2579,6 +2578,40 @@ if(!$result = @$db->db_query("SELECT priorisierung FROM public.tbl_prestudent LI
 			echo '<br>public.tbl_prestudent: Spalte priorisierung hinzugefuegt';
 }
 
+// Spalte zgv_erfuellt für tbl_prestudent
+if(!$result = @$db->db_query("SELECT zgv_erfuellt FROM public.tbl_prestudent LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_prestudent ADD COLUMN zgv_erfuellt boolean default false;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_prestudent: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.tbl_prestudent: Spalte zgv_erfuellt hinzugefuegt';
+}
+
+// Spalte zgvmas_erfuellt für tbl_prestudent
+if(!$result = @$db->db_query("SELECT zgvmas_erfuellt FROM public.tbl_prestudent LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_prestudent ADD COLUMN zgvmas_erfuellt boolean default false;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_prestudent: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.tbl_prestudent: Spalte zgvmas_erfuellt hinzugefuegt';
+}
+
+// Spalte zgvdoktor_erfuellt für tbl_prestudent
+if(!$result = @$db->db_query("SELECT zgvdoktor_erfuellt FROM public.tbl_prestudent LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_prestudent ADD COLUMN zgvdoktor_erfuellt boolean default false;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_prestudent: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.tbl_prestudent: Spalte zgvdoktor_erfuellt hinzugefuegt';
+}
+
+
 // Spalte lieferant in tbl_firma
 if(!$result = @$db->db_query("SELECT lieferant FROM public.tbl_firma LIMIT 1"))
 {
@@ -5145,7 +5178,7 @@ $tabellen=array(
 	"public.tbl_preoutgoing_lehrveranstaltung" => array("preoutgoing_lehrveranstaltung_id","preoutgoing_id","bezeichnung","ects","endversion","insertamum","insertvon","updateamum","updatevon","wochenstunden","unitcode"),
 	"public.tbl_preoutgoing_preoutgoing_status" => array("status_id","preoutgoing_status_kurzbz","preoutgoing_id","datum","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_preoutgoing_status" => array("preoutgoing_status_kurzbz","bezeichnung"),
-	"public.tbl_prestudent"  => array("prestudent_id","aufmerksamdurch_kurzbz","person_id","studiengang_kz","berufstaetigkeit_code","ausbildungcode","zgv_code","zgvort","zgvdatum","zgvmas_code","zgvmaort","zgvmadatum","aufnahmeschluessel","facheinschlberuf","reihungstest_id","anmeldungreihungstest","reihungstestangetreten","rt_gesamtpunkte","rt_punkte1","rt_punkte2","bismelden","anmerkung","dual","insertamum","insertvon","updateamum","updatevon","ext_id","ausstellungsstaat","rt_punkte3", "zgvdoktor_code", "zgvdoktorort", "zgvdoktordatum","mentor","zgvnation","zgvmanation","zgvdoktornation","gsstudientyp_kurzbz","aufnahmegruppe_kurzbz","udf_values","priorisierung"),
+	"public.tbl_prestudent"  => array("prestudent_id","aufmerksamdurch_kurzbz","person_id","studiengang_kz","berufstaetigkeit_code","ausbildungcode","zgv_code","zgvort","zgvdatum","zgvmas_code","zgvmaort","zgvmadatum","aufnahmeschluessel","facheinschlberuf","reihungstest_id","anmeldungreihungstest","reihungstestangetreten","rt_gesamtpunkte","rt_punkte1","rt_punkte2","bismelden","anmerkung","dual","insertamum","insertvon","updateamum","updatevon","ext_id","ausstellungsstaat","rt_punkte3", "zgvdoktor_code", "zgvdoktorort", "zgvdoktordatum","mentor","zgvnation","zgvmanation","zgvdoktornation","gsstudientyp_kurzbz","aufnahmegruppe_kurzbz","udf_values","priorisierung","zgv_erfuellt","zgvmas_erfuellt","zgvdoktor_erfuellt"),
 	"public.tbl_prestudentstatus"  => array("prestudent_id","status_kurzbz","studiensemester_kurzbz","ausbildungssemester","datum","orgform_kurzbz","insertamum","insertvon","updateamum","updatevon","ext_id","studienplan_id","bestaetigtam","bestaetigtvon","fgm","faktiv", "anmerkung","bewerbung_abgeschicktamum","rt_stufe","statusgrund_id"),
 	"public.tbl_raumtyp"  => array("raumtyp_kurzbz","beschreibung","kosten"),
 	"public.tbl_reihungstest"  => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet","max_teilnehmer","oeffentlich","studiensemester_kurzbz","aufnahmegruppe_kurzbz","stufe","anmeldefrist"),
@@ -5299,4 +5332,4 @@ if (!$result=@$db->db_query($sql_query))
 		}
 if($error==false)
 	echo '<br>Gegenpruefung fehlerfrei';
-?>
+?>
\ No newline at end of file