zgv ueberpruefung bug fixes

application/views/system/infocenter/infocenterZgvDetails.php

@@ -128,7 +128,7 @@
 								<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
 									<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
 								</button>
-								<span class="zgvStatusText_" id="zgvStatusText_<?php echo $prestudent_id ?>">
+								<span class="zgvStatusText" id="zgvStatusText_<?php echo $prestudent_id ?>" data-info="need">
 								</span>
 							</div>
 						</div> <!-- ./panel -->

application/views/system/infocenter/infocenterZgvUeberpruefungData.php

@@ -35,7 +35,7 @@ $filterWidgetArray = array(
     'app' => 'infocenter',
     'datasetName' => 'zgvUeberpruefung',
     'filter_id' => $this->input->get('filter_id'),
-    'requiredPermissions' => 'infocenter',
+    'requiredPermissions' => 'lehre/zgvpruefung',
     'datasetRepresentation' => 'tablesorter',
     'additionalColumns' => array('Details'),
     'hideOptions' => true,

application/views/system/infocenter/zgvpruefungen.php

@@ -308,6 +308,10 @@
 							</div>
 							<!-- show only master zgv if master studiengang - end -->
 						<?php endif; ?>
+					<?php if ($infoonly) : ?>
+						<span class="zgvStatusText" id="zgvStatusText_<?php echo $zgvpruefung->prestudent_id ?>" <?php (!(isset($zgvpruefung->statusZGV))) ?: print_r('data-info="need"')?>>
+						</span>
+					<?php endif; ?>
 					</form>
 					<?php if (!$infoonly): ?>
 						<div class="row">
@@ -315,10 +319,10 @@
 								<button type="button" class="btn btn-default zgvUebernehmen" id="zgvUebernehmen_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php echo $this->p->t('infocenter', 'letzteZgvUebernehmen') ?>
 								</button>
-								<button class="btn btn-default zgvRueckfragen" id="zgvRueckfragen_<?php echo $zgvpruefung->prestudent_id ?>" <?php (!(isset($zgvpruefung->statusZGV))) ?: print_r('disabled')?>>
+								<button class="btn btn-default zgvRueckfragen" id="zgvRueckfragen_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php echo $this->p->t('infocenter', 'zgvRueckfragen') ?>
 								</button>
-								<span class="zgvStatusText" id="zgvStatusText_<?php echo $zgvpruefung->prestudent_id ?>">
+								<span class="zgvStatusText" id="zgvStatusText_<?php echo $zgvpruefung->prestudent_id ?>" <?php (!(isset($zgvpruefung->statusZGV))) ?: print_r('data-info="need"')?>>
 								</span>
 							</div>
 							<div class="col-xs-4 text-right">

public/js/infocenter/infocenterDetails.js

@@ -893,6 +893,8 @@ var InfocenterDetails = {
 				}
 			}
 		);
+
+		zgvUeberpruefung.checkAfterReload();
 	},
 	_refreshMessages: function()
 	{

public/js/infocenter/zgvUeberpruefung.js

@@ -2,17 +2,7 @@ $(document).ready(function ()
 {
 	var personid = $("#hiddenpersonid").val();
 
-	if ($('#zgvpruefungen').length)
+	zgvUeberpruefung.checkAfterReload();
-	{
-		$('#zgvpruefungen .zgvRueckfragen').each(function() {
-			if($(this).is(':disabled')) {
-				zgvUeberpruefung.checkStatus(InfocenterDetails._getPrestudentIdFromElementId($(this).attr('id')));
-			}
-		});
-	} else
-	{
-		zgvUeberpruefung.checkStatus();
-	}
 
 	$('.zgvRueckfragen').click(function ()
 	{
@@ -86,6 +76,7 @@ var zgvUeberpruefung = {
 						$('#zgvBearbeitungButtons_' + prestudent_id +' button').each(function() {
 							$(this).attr('disabled', false);
 						});
+
 						var status = FHC_AjaxClient.getData(data);
 
 						switch (status)
@@ -141,6 +132,7 @@ var zgvUeberpruefung = {
 							InfocenterDetails.setPersonOnHold(response.person_id, formatedDate);
 						}
 
+						InfocenterDetails._refreshLog();
 						FHC_DialogLib.alertSuccess(response.msg);
 					} else if(FHC_AjaxClient.isError(data))
 						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
@@ -155,6 +147,7 @@ var zgvUeberpruefung = {
 
 	zgvStatusUpdate: function(data)
 	{
+		var prestudent_id = data.prestudent_id;
 		FHC_AjaxClient.ajaxCallPost(
 			CALLED_PATH + '/zgvStatusUpdate',
 			data,
@@ -163,7 +156,7 @@ var zgvUeberpruefung = {
 				{
 					if (FHC_AjaxClient.hasData(data))
 					{
-						zgvUeberpruefung.checkStatus();
+						zgvUeberpruefung.checkStatus(prestudent_id);
 						var response = FHC_AjaxClient.getData(data)
 
 						if (response.openZgv === false)
@@ -181,9 +174,12 @@ var zgvUeberpruefung = {
 		);
 	},
 
-	getPrestudentId: function()
+	checkAfterReload: function()
 	{
-		var id = $('.zgvBearbeitungButtons .zgvAkzeptierenPruefung').attr('id');
+		$('.zgvStatusText').each(function() {
-		return InfocenterDetails._getPrestudentIdFromElementId(id);
+			if($(this).data('info')) {
+				zgvUeberpruefung.checkStatus(InfocenterDetails._getPrestudentIdFromElementId($(this).attr('id')));
+			}
+		});
 	}
 }