From 4cae13d2ee682ee728c438163be4bb1a3760bf41 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Wed, 14 Sep 2022 08:55:54 +0200 Subject: [PATCH 1/2] 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 @@ p->t('infocenter', 'zgv') ?> - widgetlib->widget( - 'Zgv_widget', - array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code), - array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id) - ); ?> + prestudent_id . "' name='zgv' class='form-control'>"; + $selectedDefault = (is_null($zgvpruefung->zgv_code) ? 'selected' : ''); + echo ""; + 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 ""; + } + echo ""; + endif;?>
@@ -265,11 +278,26 @@ 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 ""; + } + ?>
@@ -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 ""; + } + ?>
@@ -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 ""; + } + ?>
From f0cec85d8f9215ab188f6c4a8161f23a8dbe6e1c Mon Sep 17 00:00:00 2001 From: ma0048 Date: Wed, 14 Sep 2022 11:57:23 +0200 Subject: [PATCH 2/2] style anpassungen und funktionen geloescht --- application/controllers/api/v1/codex/Zgv.php | 8 ----- .../controllers/api/v1/codex/Zgvmaster.php | 8 ----- application/models/codex/Nation_model.php | 10 ------ application/models/codex/Zgv_model.php | 12 ------- application/models/codex/Zgvmaster_model.php | 10 ------ .../views/system/infocenter/zgvpruefungen.php | 32 +++++++++---------- public/css/infocenter/infocenterDetails.css | 4 +++ 7 files changed, 20 insertions(+), 64 deletions(-) diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php index 3d1b64029..670ffc190 100644 --- a/application/controllers/api/v1/codex/Zgv.php +++ b/application/controllers/api/v1/codex/Zgv.php @@ -45,14 +45,6 @@ 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/api/v1/codex/Zgvmaster.php b/application/controllers/api/v1/codex/Zgvmaster.php index 7775724c2..ff737dd7f 100644 --- a/application/controllers/api/v1/codex/Zgvmaster.php +++ b/application/controllers/api/v1/codex/Zgvmaster.php @@ -45,14 +45,6 @@ class Zgvmaster extends API_Controller } } - /** - * @return zgvmaster - */ - public function getAllZgvmaster() - { - $this->response($this->Zgvmaster_model->getAllZgvmaster(), REST_Controller::HTTP_OK); - } - /** * @return void */ diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php index a66b77edb..ee38c9051 100644 --- a/application/models/codex/Nation_model.php +++ b/application/models/codex/Nation_model.php @@ -11,14 +11,4 @@ class Nation_model extends DB_Model $this->dbTable = 'bis.tbl_nation'; $this->pk = 'nation_code'; } - - /** - * 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 0206d1292..1e1ba99ad 100644 --- a/application/models/codex/Zgv_model.php +++ b/application/models/codex/Zgv_model.php @@ -11,16 +11,4 @@ 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 ORDER BY zgv_bez ASC;'; - - return $this->execQuery($allZgv); - } - - } diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php index 0f6305532..38f8a0dcb 100644 --- a/application/models/codex/Zgvmaster_model.php +++ b/application/models/codex/Zgvmaster_model.php @@ -11,14 +11,4 @@ class Zgvmaster_model extends DB_Model $this->dbTable = 'bis.tbl_zgvmaster'; $this->pk = 'zgvmas_code'; } - - /** - * getAllForStyled Dropdown - */ - public function getAllZgvmaster() - { - $allZgvMaster = 'SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_bez ASC;'; - - return $this->execQuery($allZgvMaster); - } } diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php index 48d2b4ea2..2e6ea90d2 100644 --- a/application/views/system/infocenter/zgvpruefungen.php +++ b/application/views/system/infocenter/zgvpruefungen.php @@ -230,14 +230,14 @@ { $selected = ($zgvpruefung->zgv_code === $zgv->zgv_code) ? 'selected' : ''; $aktiv = ''; - $style = ''; + $class = ''; if (!$zgv->aktiv) { - $aktiv = '--- nicht (länger) aktiv ---'; - $style = 'bold'; + $aktiv = '(inaktiv)'; + $class = 'gesperrtoption'; } - echo ""; + echo ""; } echo ""; endif;?> @@ -287,13 +287,13 @@ { $selected = ($nation->nation_code === $zgvpruefung->zgvnation_code) ? 'selected' : ''; $sperre = ''; - $style = ''; + $class = ''; if ($nation->sperre == 'true') { - $sperre = '--- Nation/Staat nicht existent ---'; - $style = 'bold'; + $sperre = '(gesperrt)'; + $class = 'gesperrtoption'; } - echo ""; + echo ""; } echo ""; } @@ -318,13 +318,13 @@ { $selected = ($zgvpruefung->zgvmas_code === $zgv->zgvmas_code) ? 'selected' : ''; $aktiv = ''; - $style = ''; + $class = ''; if (!$zgv->aktiv) { - $aktiv = '--- nicht (länger) aktiv ---'; - $style = 'bold'; + $aktiv = '(inaktiv)'; + $class = 'gesperrtoption'; } - echo ""; + echo ""; } echo ""; } @@ -377,15 +377,15 @@ { $selected = ($nation->nation_code === $zgvpruefung->zgvmanation_code) ? 'selected' : ''; $sperre = ''; - $style = ''; + $class = ''; if ($nation->sperre == 'true') { - $sperre = '--- Nation/Staat nicht existent ---'; - $style = 'bold'; + $sperre = '(gesperrt)'; + $class = 'gesperrtoption'; } - echo ""; + echo ""; } echo ""; } diff --git a/public/css/infocenter/infocenterDetails.css b/public/css/infocenter/infocenterDetails.css index 2f2debc00..cf81d073b 100644 --- a/public/css/infocenter/infocenterDetails.css +++ b/public/css/infocenter/infocenterDetails.css @@ -104,3 +104,7 @@ display: inline-block } } + +.gesperrtoption { + color: gray; +} \ No newline at end of file