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/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 3bd08b7d1..48c50bb4a 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/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 f6e8a845b..2e6ea90d2 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 = ''; + $class = ''; + if (!$zgv->aktiv) + { + $aktiv = '(inaktiv)'; + $class = 'gesperrtoption'; + } + + 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 ""; + } + ?>
diff --git a/cis/private/lehre/lesson.php b/cis/private/lehre/lesson.php index 4d8c872a1..8ac751ba3 100644 --- a/cis/private/lehre/lesson.php +++ b/cis/private/lehre/lesson.php @@ -102,6 +102,7 @@ if (isset($_GET["handbuch"])){ + 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/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/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; } 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 diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 9e0a87b6e..8ac09cee0 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -8740,13 +8740,13 @@ Any unusual occurrences 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 18 Abs. 2 und 3).', + 'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'The plagiarism check has been carried out and confirms that the central content of the paper has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 18 Para. 2 and 3).', + 'text' => 'The plagiarism check has been carried out and confirms that the central content of the paper has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).', 'description' => '', 'insertvon' => 'system' ) @@ -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', diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php index 2b3b6a04c..ddce80c46 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.'); @@ -292,8 +293,9 @@ - Lehrmodus* - '; $lehrmodus_arr = new lehrmodus(); $lehrmodus_arr->getAll(); @@ -302,6 +304,8 @@ { if ($lehrmodus->lehrmodus_kurzbz == $lv->lehrmodus_kurzbz) $sel = ' selected'; + else if (isset($_GET['neu']) && defined('DEFAULT_LEHRMODUS') && ($lehrmodus->lehrmodus_kurzbz == DEFAULT_LEHRMODUS) && ($lv->lehrmodus_kurzbz == '')) + $sel = ' selected'; else $sel = ''; $htmlstr .= ''; @@ -508,19 +512,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 diff --git a/vilesci/stammdaten/variablen_details.php b/vilesci/stammdaten/variablen_details.php index 1a9cd6056..b367dee1b 100644 --- a/vilesci/stammdaten/variablen_details.php +++ b/vilesci/stammdaten/variablen_details.php @@ -117,7 +117,7 @@ if(isset($_POST["schick"])) $variable=new variable(); if($variable->load($uid, $name)) - $varialbe->new = false; + $variable->new = false; else $variable->new = true;