From 54a1c486c5863f645dc7373d17e2a44750b4d135 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Aug 2022 15:12:06 +0200 Subject: [PATCH] Infocenter: Anzeige inaktive ZGVs als disabled im Dropdown ZGV --- application/controllers/api/v1/codex/Zgv.php | 8 ++++ .../system/infocenter/InfoCenter.php | 1 + application/models/codex/Zgv_model.php | 12 ++++++ .../views/system/infocenter/zgvpruefungen.php | 37 +++++++++++++++---- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php index 670ffc190..3d1b64029 100644 --- a/application/controllers/api/v1/codex/Zgv.php +++ b/application/controllers/api/v1/codex/Zgv.php @@ -45,6 +45,14 @@ class Zgv extends API_Controller } } + /** + * @return zgv + */ + public function getAllZgv() + { + $this->response($this->Zgv_model->getAllZgv(), REST_Controller::HTTP_OK); + } + /** * @return void */ diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 76011dc04..939c9c0d9 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -159,6 +159,7 @@ class InfoCenter extends Auth_Controller $this->load->model('system/Message_model', 'MessageModel'); $this->load->model('system/Filters_model', 'FiltersModel'); $this->load->model('system/PersonLock_model', 'PersonLockModel'); + $this->load->model('codex/Zgv_model', 'ZgvModel'); // Loads libraries $this->load->library('PersonLogLib'); diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php index 1e1ba99ad..22566cdde 100644 --- a/application/models/codex/Zgv_model.php +++ b/application/models/codex/Zgv_model.php @@ -11,4 +11,16 @@ class Zgv_model extends DB_Model $this->dbTable = 'bis.tbl_zgv'; $this->pk = 'zgv_code'; } + + /** + * getAllForStyled Dropdown + */ + public function getAllZgv() + { + $allZgv = 'SELECT * FROM bis.tbl_zgv;'; + + return $this->execQuery($allZgv); + } + + } diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php index 253145557..e0cfdc933 100644 --- a/application/views/system/infocenter/zgvpruefungen.php +++ b/application/views/system/infocenter/zgvpruefungen.php @@ -128,7 +128,9 @@
+
+
+
prestudentstatus->ausbildungssemester)): ?> @@ -177,12 +180,14 @@
+
+ zgv_bez; ?>
@@ -196,17 +201,32 @@ p->t('infocenter', 'zgv') ?>
+ widgetlib->widget( - 'Zgv_widget', - array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code), - array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id) - ); ?> + + //dropdown als Werte vom ZgvModel, um nicht aktive Werte als disabled anzuzeigen + $alleZGV = $this->ZgvModel->getAllZgv(); + echo '"; + ?> +
+ + zgvort); else: @@ -334,7 +354,11 @@
-
+ + + + + prestudentUdfs)) { @@ -552,4 +576,3 @@ endforeach; // end foreach zgvpruefungen ?>
-