From 4cae13d2ee682ee728c438163be4bb1a3760bf41 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 14 Sep 2022 08:55:54 +0200
Subject: [PATCH] zgv und nation dropdowns gefixed

---
 .../system/infocenter/InfoCenter.php          |  14 ++-
 .../views/system/infocenter/zgvpruefungen.php | 101 ++++++++++++++----
 2 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 42b9c3cfa..9db3c4e84 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1987,11 +1987,23 @@ class InfoCenter extends Auth_Controller
 
 		$studienArtBerechtigung = array_column($this->getStudienArtBerechtigung(), 'typ');
 
+		$this->ZgvModel->addOrder('zgv_bez');
+		$allZGVs = getData($this->ZgvModel->load());
+
+		$this->ZgvModel->addOrder('zgvmas_bez');
+		$allZGVsMaster = getData($this->ZgvmasterModel->load());
+
+		$this->NationModel->addOrder('langtext');
+		$allNations = getData($this->NationModel->load());
+
 		$data = array (
 			'zgvpruefungen' => $zgvpruefungen,
 			'abwstatusgruende' => $abwstatusgruende,
 			'intstatusgruende' => $intstatusgruende,
-			'studienArtBerechtigung' => $studienArtBerechtigung
+			'studienArtBerechtigung' => $studienArtBerechtigung,
+			'all_zgvs' => $allZGVs,
+			'all_zgvs_master' => $allZGVsMaster,
+			'all_nations' => $allNations,
 		);
 
 		return $data;
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index f6e8a845b..48d2b4ea2 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -222,12 +222,25 @@
 											<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)
-										echo $this->widgetlib->widget(
-											'Zgv_widget',
-											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code),
-											array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id)
-										); ?>
+									<?php if (!$infoonly):
+									echo "<select id='zgv_" . $zgvpruefung->prestudent_id . "' name='zgv' class='form-control'>";
+										$selectedDefault = (is_null($zgvpruefung->zgv_code) ? 'selected' : '');
+										echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
+										foreach ($all_zgvs as $zgv)
+										{
+											$selected = ($zgvpruefung->zgv_code === $zgv->zgv_code) ? 'selected' : '';
+											$aktiv = '';
+											$style = '';
+											if (!$zgv->aktiv)
+											{
+												$aktiv = '--- nicht (länger) aktiv ---';
+												$style = 'bold';
+											}
+
+											echo "<option " . $selected . " value='" . $zgv->zgv_code . "' style='font-weight:". $style ."'>" . $zgv->zgv_bez . " " . $aktiv ."</option>";
+										}
+									echo "</select>";
+									endif;?>
 								</div>
 							</div>
 							<div class="col-lg-<?php echo $columns[1] ?>">
@@ -265,11 +278,26 @@
 									<?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)
-										); ?>
+									{
+										echo "<select id='zgvnation_" . $zgvpruefung->prestudent_id . "' name='zgvnation' class='form-control'>";
+										$selectedDefault = (is_null($zgvpruefung->zgvnation_code) ? 'selected' : '');
+										echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
+
+										foreach ($all_nations as $nation)
+										{
+											$selected = ($nation->nation_code === $zgvpruefung->zgvnation_code) ? 'selected' : '';
+											$sperre = '';
+											$style = '';
+											if ($nation->sperre == 'true')
+											{
+												$sperre = '--- Nation/Staat nicht existent ---';
+												$style = 'bold';
+											}
+											echo "<option " . $selected . " value='" . $nation->nation_code . "' style='font-weight:" . $style . "'>" . $nation->langtext . " " . $sperre ."</option>";
+										}
+										echo "</select>";
+									}
+									?>
 								</div>
 							</div>
 						</div>
@@ -282,11 +310,25 @@
 										if ($infoonly)
 											echo $zgvpruefung->zgvmas_bez;
 										else
-											echo $this->widgetlib->widget(
-												'Zgvmaster_widget',
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmas_code),
-												array('name' => 'zgvmas', 'id' => 'zgvmas_'.$zgvpruefung->prestudent_id)
-											); ?>
+										{
+											echo "<select id='zgvmas_" . $zgvpruefung->prestudent_id . "' name='zgvmas' class='form-control'>";
+											$selectedDefault = (is_null($zgvpruefung->zgvmas_code) ? 'selected' : '');
+											echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
+											foreach ($all_zgvs_master as $zgv)
+											{
+												$selected = ($zgvpruefung->zgvmas_code === $zgv->zgvmas_code) ? 'selected' : '';
+												$aktiv = '';
+												$style = '';
+												if (!$zgv->aktiv)
+												{
+													$aktiv = '--- nicht (länger) aktiv ---';
+													$style = 'bold';
+												}
+												echo "<option " . $selected . " value='" . $zgv->zgvmas_code . "' style='font-weight:" . $style . "'>" . $zgv->zgvmas_bez . " " . $aktiv ."</option>";
+											}
+											echo "</select>";
+										}
+										?>
 									</div>
 								</div>
 								<div class="col-lg-<?php echo $columns[1] ?>">
@@ -326,11 +368,28 @@
 										if ($infoonly)
 											echo $zgvpruefung->zgvmanation_bez;
 										else
-											echo $this->widgetlib->widget(
-												'Nation_widget',
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmanation_code),
-												array('name' => 'zgvmanation', 'id' => 'zgvmanation_'.$zgvpruefung->prestudent_id)
-											); ?>
+										{
+											echo "<select id='zgvmanation_" . $zgvpruefung->prestudent_id . "' name='zgvmanation' class='form-control'>";
+											$selectedDefault = (is_null($zgvpruefung->zgvmanation_code) ? 'selected' : '');
+											echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
+
+											foreach ($all_nations as $nation)
+											{
+												$selected = ($nation->nation_code === $zgvpruefung->zgvmanation_code) ? 'selected' : '';
+												$sperre = '';
+												$style = '';
+
+												if ($nation->sperre == 'true')
+												{
+													$sperre = '--- Nation/Staat nicht existent ---';
+													$style = 'bold';
+												}
+
+												echo "<option " . $selected . " value='" . $nation->nation_code . "' style='font-weight:" . $style . "'>" . $nation->langtext . " " . $sperre ."</option>";
+											}
+											echo "</select>";
+										}
+										?>
 									</div>
 								</div>
 							</div>