From 745ecf47111293f47aa1231473a14677102c3cab Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 30 Jun 2021 13:29:09 +0200
Subject: [PATCH] zgv pruefung unterscheiden zwischen bachelor und master

---
 .../system/infocenter/InfoCenter.php          |  4 +++-
 .../infocenter/infocenterZgvDetails.php       | 13 +++++++---
 public/js/infocenter/zgvUeberpruefung.js      | 24 ++++++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index deb388add..12d9a9c4d 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -242,6 +242,7 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData(getData($prestudentexists)[0]->person_id);
 		$prestudent_id = array('prestudent_id' => $prestudent_id);
 		$status = array('status' => getData($zgv)[0]->status);
+		$prestudent_data = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
 
 		$this->DokumentModel->addOrder('bezeichnung');
 		$dokumentdata = array('dokumententypen' => (getData($this->DokumentModel->load())));
@@ -250,7 +251,8 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudent_id,
 			$status,
-			$dokumentdata
+			$dokumentdata,
+			$prestudent_data
 		);
 
 		$origin_page = $this->input->get(self::ORIGIN_PAGE);
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index 1f50aa147..62fefbec8 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -59,6 +59,7 @@
 	<div id="page-wrapper">
 		<div class="container-fluid">
 			<input type="hidden" id="hiddenpersonid" value="<?php echo $stammdaten->person_id ?>">
+			<input type="hidden" id="studiengangtyp" value="<?php echo $studiengang_typ ?>">
 			<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 				<div class="col-lg-8">
 					<h3 class="page-header">
@@ -128,9 +129,15 @@
 								<button type="button" class="btn btn-default zgvAblehnen" id="zgvAblehnen_<?php echo $prestudent_id ?>">
 									<?php echo $this->p->t('infocenter', 'zgvNichtErfuellt') ?>
 								</button>
-								<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
-									<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
-								</button>
+								<?php
+								if ($studiengang_typ === 'm') :
+								?>
+									<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
+										<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
+									</button>
+								<?php
+								endif;
+								?>
 								<span class="zgvStatusText" id="zgvStatusText_<?php echo $prestudent_id ?>" data-info="need">
 								</span>
 							</div>
diff --git a/public/js/infocenter/zgvUeberpruefung.js b/public/js/infocenter/zgvUeberpruefung.js
index 0be4dfdad..6181083f2 100644
--- a/public/js/infocenter/zgvUeberpruefung.js
+++ b/public/js/infocenter/zgvUeberpruefung.js
@@ -2,6 +2,8 @@ $(document).ready(function ()
 {
 	var personid = $("#hiddenpersonid").val();
 
+	var studiengang = $('#studiengangtyp').val();
+
 	zgvUeberpruefung.checkAfterReload();
 
 	$('.zgvRueckfragen').click(function ()
@@ -18,12 +20,22 @@ $(document).ready(function ()
 	$('.zgvAkzeptieren').click(function (){
 		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
 
-		var data = {
-			'person_id' : personid,
-			'prestudent_id' : prestudentid,
-			'status' : 'accepted'
+		if (studiengang === 'b')
+		{
+			$('#inputStatus_' + prestudentid).val('accepted');
+			$('#notizModal_' + prestudentid).modal('show');
+			$('#notizModal_' + prestudentid + ' #inputNotizTitelModal').val('ZGV wurde erfüllt')
 		}
-		zgvUeberpruefung.zgvStatusUpdate(data);
+		else
+		{
+			var data = {
+				'person_id' : personid,
+				'prestudent_id' : prestudentid,
+				'status' : 'accepted'
+			}
+			zgvUeberpruefung.zgvStatusUpdate(data);
+		}
+
 	});
 
 	$('.zgvAblehnen').click(function (){
@@ -176,7 +188,7 @@ var zgvUeberpruefung = {
 	checkAfterReload: function()
 	{
 		$('.zgvStatusText').each(function() {
-			if($(this).data('info')) {
+			if ($(this).data('info')) {
 				zgvUeberpruefung.checkStatus(InfocenterDetails._getPrestudentIdFromElementId($(this).attr('id')));
 			}
 		});