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 @@
+
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')));
}
});