From 65ba94632151fcd7437979cb1bda357a6a096111 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 22 Jun 2022 09:39:53 +0200 Subject: [PATCH 01/10] Rework Studienplan->getStudienplanLehrveranstaltung for Templates & use it in Vilesci "Lehrveranstaltung" --- include/studienplan.class.php | 33 ++++++++++++++------- vilesci/lehre/lehrveranstaltung_details.php | 18 ++++------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/include/studienplan.class.php b/include/studienplan.class.php index 7e9963c0a..f180733fe 100644 --- a/include/studienplan.class.php +++ b/include/studienplan.class.php @@ -952,21 +952,34 @@ class studienplan extends basis_db /** * Laedt die Studienplaene zu denen eine Lehrveranstaltung zugeordnet ist */ - public function getStudienplanLehrveranstaltung($lehrveranstaltung_id, $studiensemester_kurzbz) + public function getStudienplanLehrveranstaltung($lehrveranstaltung_id, $studiensemester_kurzbz = null) { $qry= " SELECT - distinct tbl_studienplan.* + DISTINCT tbl_studienplan.* FROM - lehre.tbl_studienplan - JOIN lehre.tbl_studienplan_lehrveranstaltung USING(studienplan_id) + lehre.tbl_studienplan + JOIN lehre.tbl_studienplan_lehrveranstaltung + USING(studienplan_id) WHERE - tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)." - AND EXISTS ( - SELECT 1 FROM lehre.tbl_studienplan_semester - WHERE studienplan_id=tbl_studienplan.studienplan_id - AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)." - AND semester = tbl_studienplan_lehrveranstaltung.semester) + tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN ( + SELECT + lv.lehrveranstaltung_id + FROM + lehre.tbl_lehrveranstaltung AS lv + LEFT JOIN lehre.tbl_lehrveranstaltung AS t ON t.lehrveranstaltung_id=lv.lehrveranstaltung_template_id + WHERE + lv.lehrtyp_kurzbz<>'tpl' + AND (lv.lehrveranstaltung_id=" . $this->db_add_param($lehrveranstaltung_id, FHC_INTEGER) . " OR (lv.lehrveranstaltung_template_id=" . $this->db_add_param($lehrveranstaltung_id, FHC_INTEGER) . " AND t.lehrtyp_kurzbz='tpl')) + ) + AND EXISTS ( + SELECT 1 + FROM + lehre.tbl_studienplan_semester + WHERE studienplan_id=tbl_studienplan.studienplan_id". + ($studiensemester_kurzbz != null ? " + AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz) : "")." + AND semester = tbl_studienplan_lehrveranstaltung.semester) ORDER BY bezeichnung"; if($result = $this->db_query($qry)) diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php index 2b3b6a04c..ca683690a 100644 --- a/vilesci/lehre/lehrveranstaltung_details.php +++ b/vilesci/lehre/lehrveranstaltung_details.php @@ -29,6 +29,7 @@ require_once('../../include/lehrtyp.class.php'); require_once('../../include/lehrmodus.class.php'); require_once('../../include/benutzerberechtigung.class.php'); + require_once('../../include/studienplan.class.php'); if (!$db = new basis_db()) die('Es konnte keine Verbindung zum Server aufgebaut werden.'); @@ -508,19 +509,10 @@ } $htmlstr.='
Verwendung in folgenden Studienplänen: '; - $qry ="SELECT distinct tbl_studienplan.bezeichnung - FROM - lehre.tbl_studienplan_lehrveranstaltung - JOIN lehre.tbl_studienplan USING(studienplan_id) - WHERE lehrveranstaltung_id=".$db->db_add_param($lv->lehrveranstaltung_id).' - ORDER BY tbl_studienplan.bezeichnung desc'; - if($result = $db->db_query($qry)) - { - while($row = $db->db_fetch_object($result)) - { - $htmlstr.= $row->bezeichnung.'; '; - } - } + $stdplan = new studienplan(); + if ($stdplan->getStudienplanLehrveranstaltung($lv->lehrveranstaltung_id)) + foreach($stdplan->result as $result) + $htmlstr .= $result->bezeichnung . "; "; $htmlstr.=''; // Details Ende From 1a6b645693121af040e36f4552fa5cf3751d2f21 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 1 Aug 2022 10:49:17 +0200 Subject: [PATCH 02/10] pausefehlt bei 6.5 stunden hinzugefuegt --- include/zeitaufzeichnung.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zeitaufzeichnung.class.php b/include/zeitaufzeichnung.class.php index fd007d1ad..7f46d763a 100644 --- a/include/zeitaufzeichnung.class.php +++ b/include/zeitaufzeichnung.class.php @@ -940,7 +940,7 @@ or not exists $tagessaldo = $tagessaldo - $pausesumme; //check if blocking error - if (($tagessaldo > 19800 && $pausesumme < 1800) || ($tagessaldo > 18000 && $tagessaldo < 19800 && $pausesumme < $tagessaldo - 18000)) + if (($tagessaldo >= 19800 && $pausesumme < 1800) || ($tagessaldo > 18000 && $tagessaldo < 19800 && $pausesumme < $tagessaldo - 18000)) { $blockingError = true; } From 4cae13d2ee682ee728c438163be4bb1a3760bf41 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Wed, 14 Sep 2022 08:55:54 +0200 Subject: [PATCH 03/10] 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 04/10] 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 From 2ab548fc87ca4254d57ed7b418eb1fb27a627d05 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 26 Sep 2022 09:46:16 +0200 Subject: [PATCH 05/10] - absagegrund wird nun mitgespeichert - neue filter - studiengangsleitung kann bestaetigung nur noch ablehnen und nicht loeschen - neue cronjobs - neue formatierung - neue phrasen --- system/phrasesupdate.php | 212 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 206 insertions(+), 6 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 9e0a87b6e..f7cc6bc74 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -16426,13 +16426,13 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Wollen Sie die ausgewählte Maßnahme wirklich löschen?', + 'text' => 'Plan ablehnen', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Do you really want to delete the measure?', + 'text' => 'Reject plan', 'description' => '', 'insertvon' => 'system' ) @@ -16446,13 +16446,13 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Wollen Sie die Bestätigung wirklich widerrufen?', + 'text' => 'Bestätigung widerrufen', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Do you really want to cancel the confirmation?', + 'text' => 'Revoke confirmation', 'description' => '', 'insertvon' => 'system' ) @@ -16706,13 +16706,13 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Plan - abgelehnt', + 'text' => 'Maßnahmen - abgelehnt', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Plan - declined', + 'text' => 'Measures - declined', 'description' => '', 'insertvon' => 'system' ) @@ -16758,6 +16758,206 @@ array( ) ) ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'bestaetigungAblehnen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bestätigung ablehnen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Reject confirmation', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'grund', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Grund', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Reason', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'anmerkungstgl', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anmerkung - Studiengangsleitung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Note - Study course Director', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'mehrverplant', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '>=5 ECTS verplant', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '>=5 ECTS planned', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'wenigerverplant', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '<5 ECTS verplant', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '<5 ECTS planned', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'mehrbestaetigt', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '>=5 ECTS bestätigt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '>=5 ECTS confirmed', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'wenigerbestaetigt', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '<5 ECTS bestätigt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '<5 ECTS confirmed', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'alleAkzeptierenPlan', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Alle markierten Pläne akzeptieren', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Accept all marked plans', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'downloadBestaetigung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bestätigung herunterladen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Download confirmation', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'international', + 'category' => 'international', + 'phrase' => 'addMassnahme', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Maßnahme hinzufügen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Add measure', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'gruppenmanagement', From 8533454ad7d9547917284f600503e97124928fc0 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 28 Sep 2022 12:13:13 +0200 Subject: [PATCH 06/10] =?UTF-8?q?Defaulteintrag=20in=20Dropdown=20Lehrmodu?= =?UTF-8?q?s=20gem=C3=A4=C3=9F=20Configeintrag=20bei=20Anlegen=20neuer=20L?= =?UTF-8?q?V?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/vilesci.config-default.inc.php | 3 +++ vilesci/lehre/lehrveranstaltung_details.php | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php index 5285eef3b..19d1ba07e 100644 --- a/config/vilesci.config-default.inc.php +++ b/config/vilesci.config-default.inc.php @@ -263,4 +263,7 @@ define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize( // Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden define('ZEUGNISNOTE_NICHT_ANZEIGEN',serialize(array('iar', 'nz'))); + +//Default Lehrmodus +define ('DEFAULT_LEHRMODUS','regulaer'); ?> diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php index 2b3b6a04c..d63e9a8dd 100644 --- a/vilesci/lehre/lehrveranstaltung_details.php +++ b/vilesci/lehre/lehrveranstaltung_details.php @@ -292,8 +292,16 @@ - Lehrmodus* - '; + } + else + { + $htmlstr .= ''; - } - else - { - $htmlstr .= ''; $lehrmodus_arr = new lehrmodus(); $lehrmodus_arr->getAll(); @@ -311,7 +304,7 @@ { if ($lehrmodus->lehrmodus_kurzbz == $lv->lehrmodus_kurzbz) $sel = ' selected'; - else if (defined('DEFAULT_LEHRMODUS') && ($lehrmodus->lehrmodus_kurzbz == DEFAULT_LEHRMODUS) && ($lv->lehrmodus_kurzbz == '')) + else if (isset($_GET['neu']) && defined('DEFAULT_LEHRMODUS') && ($lehrmodus->lehrmodus_kurzbz == DEFAULT_LEHRMODUS) && ($lv->lehrmodus_kurzbz == '')) $sel = ' selected'; else $sel = ''; @@ -521,7 +514,7 @@ $htmlstr.='
Verwendung in folgenden Studienplänen: '; $stdplan = new studienplan(); if ($stdplan->getStudienplanLehrveranstaltung($lv->lehrveranstaltung_id)) - foreach($stdplan->result as $result) + foreach($stdplan->result as $result) $htmlstr .= $result->bezeichnung . "; "; $htmlstr.='';