From 8fd69ccd263aaf4c103547cd0dfbb82cb3ca0d27 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 30 Aug 2022 09:41:45 +0200
Subject: [PATCH] Infocenter: Anzeige gesperrte Nationen als disabled im
 Dropdown ZGVNation

---
 .../system/infocenter/InfoCenter.php          |  1 +
 application/models/codex/Nation_model.php     | 14 ++++-
 application/models/codex/Zgv_model.php        |  2 +-
 .../views/system/infocenter/zgvpruefungen.php | 60 +++++++++----------
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 939c9c0d9..71fbe2bf8 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -160,6 +160,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('system/Filters_model', 'FiltersModel');
 		$this->load->model('system/PersonLock_model', 'PersonLockModel');
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
+		$this->load->model('codex/Nation_model', 'NationModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php
index 239639795..a66b77edb 100644
--- a/application/models/codex/Nation_model.php
+++ b/application/models/codex/Nation_model.php
@@ -3,7 +3,7 @@
 class Nation_model extends DB_Model
 {
 	/**
-	 * 
+	 *
 	 */
 	public function __construct()
 	{
@@ -11,4 +11,14 @@ class Nation_model extends DB_Model
 		$this->dbTable = 'bis.tbl_nation';
 		$this->pk = 'nation_code';
 	}
-}
\ No newline at end of file
+
+	/**
+	 * getAllForStyled Dropdown
+	 */
+	public function getAll()
+	{
+		$allNations = 'SELECT * FROM bis.tbl_nation	ORDER BY bis.tbl_nation.langtext ASC;';
+
+		return $this->execQuery($allNations);
+	}
+}
diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php
index 22566cdde..0206d1292 100644
--- a/application/models/codex/Zgv_model.php
+++ b/application/models/codex/Zgv_model.php
@@ -17,7 +17,7 @@ class Zgv_model extends DB_Model
 	 */
 	public function getAllZgv()
 	{
-		$allZgv = 'SELECT * FROM bis.tbl_zgv;';
+		$allZgv = 'SELECT * FROM bis.tbl_zgv ORDER BY zgv_bez ASC;';
 
 		return $this->execQuery($allZgv);
 	}
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index e0cfdc933..6f9ba93dd 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -128,9 +128,7 @@
 					<form action="javascript:void(0);" class="zgvform" id="zgvform_<?php echo $zgvpruefung->prestudent_id ?>">
 						<input type="hidden" name="prestudentid" value="<?php echo $zgvpruefung->prestudent_id ?>" class="prestudentidinput">
 						<div class="row">
-
 							<div class="col-lg-<?php echo $columns[0] ?>">
-
 								<div class="form-group">
 									<label><?php echo  ucfirst($this->p->t('global', 'letzterStatus')) . ':' ?></label>
 									<?php
@@ -148,7 +146,6 @@
 								</div>
 							</div>
 							<div class="col-lg-<?php echo $columns[2] ?>">
-
 								<div class="form-group form-inline">
 									<label><?php echo  ucfirst($this->p->t('lehre', 'ausbildungssemester')) . ':' ?></label>
 									<?php if (isset($zgvpruefung->prestudentstatus->ausbildungssemester)): ?>
@@ -180,14 +177,12 @@
 							</div>
 						</div>
 						<div class="row">
-
 							<div class="col-lg-<?php echo $columns[0] ?>">
 								<div class="form-group">
 									<div class="row">
 										<?php if ($infoonly): ?>
 										<div class="col-xs-8">
 										<label><?php echo  $this->p->t('infocenter', 'zgv') . ':' ?></label>
-
 											<?php echo $zgvpruefung->zgv_bez; ?>
 										</div>
 										<?php else: ?>
@@ -201,32 +196,28 @@
 											<a href="javascript:void(0)"><i class="fa fa-info-circle"></i> <?php echo  $this->p->t('infocenter', 'zgv') ?> <?php echo $studiengangkurzbz ?></a>
 										</div>
 									</div>
-
 									<?php if (!$infoonly)
 
 										//dropdown als Werte vom ZgvModel, um nicht aktive Werte als disabled anzuzeigen
 										$alleZGV = $this->ZgvModel->getAllZgv();
-										echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
+                   	echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
+                   	 $zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
 
-										$zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
-										echo '<option '. $selected.' value = "null">--Bitte Eintrag wählen--</option>';
+									 	echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
+										//echo '<option value = "null">--Bitte Eintrag wählen--</option>';
+                   	foreach ($alleZGV->retval as $zgv):
+                           	$zgv->aktiv == 'true' ? $style = '' : $style = 'disabled="disabled"';
+                           	$zgv->zgv_code == $zgvpruefung->zgv_code ? $selected = "selected" : $selected = "";
+                           	echo '<option '. $selected.' value= "'.$zgv->zgv_code.'" '.$style.'>'.$zgv->zgv_bez.'</option>';
+                   	endforeach;
+                   	echo "</select>";
 
-										foreach ($alleZGV->retval as $zgv):
-											$zgv->aktiv == 'true' ? $style = '' : $style = 'disabled="disabled"';
-											$zgv->zgv_code == $zgvpruefung->zgv_code ? $selected = "selected" : $selected = "";
-
-											echo '<option '. $selected.' value= "'.$zgv->zgv_code.'" '.$style.'>'.$zgv->zgv_bez.'</option>';
-										endforeach;
-										echo "</select>";
-										?>
-										
+                   	?>
 								</div>
 							</div>
 							<div class="col-lg-<?php echo $columns[1] ?>">
 								<div class="form-group">
 									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person', 'ort') . ':'?></label>
-
-
 									<?php if ($infoonly):
 										echo html_escape($zgvpruefung->zgvort);
 									else:
@@ -256,14 +247,21 @@
 							<div class="col-lg-<?php echo $columns[3] ?>">
 								<div class="form-group">
 									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person', 'nation') . ':'?></label>
-									<?php if ($infoonly)
-										echo $zgvpruefung->zgvnation_bez;
-									else
-										echo $this->widgetlib->widget(
-											'Nation_widget',
-											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvnation_code),
-											array('name' => 'zgvnation', 'id' => 'zgvnation_'.$zgvpruefung->prestudent_id)
-										); ?>
+
+									<?php if (!$infoonly)
+
+										//dropdown als Werte vom NationModel, um nicht aktive Werte als disabled anzuzeigen
+										$allNations = $this->NationModel->getAll();
+										echo '<select id= "zgvnation_'.$zgvpruefung->prestudent_id.'" name="zgvnation">';
+										$zgvpruefung->nation_code != '' ? $default = "selected" : $default = "";
+										echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
+										foreach ($allNations->retval as $nation):
+														$nation->sperre != 'true' ? $style = '' : $style = 'disabled="disabled"';
+														$nation->nation_code == $zgvpruefung->zgvnation ? $selected = "selected" : $selected = "";
+														echo '<option '. $selected.' value= "'.$nation->nation_code.'" '.$style.'>'.$nation->langtext.'</option>';
+										endforeach;
+										echo "</select>";
+										?>
 								</div>
 							</div>
 						</div>
@@ -354,11 +352,7 @@
 							</div>
 						</div>
 					<?php endif; ?>
-
-
-
-
-
+					<br />
 					<?php
 					if (isset($zgvpruefung->prestudentUdfs))
 					{