diff --git a/application/config/navigation.php b/application/config/navigation.php index 0a7c0131f..cd71b02ca 100644 --- a/application/config/navigation.php +++ b/application/config/navigation.php @@ -385,7 +385,7 @@ $config['navigation_menu']['apps'] = [ ], 'lav' => [ 'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'), - 'description' => 'Lehraufträge', + 'description' => 'Lehrauftragsverwaltung', #'icon' => 'person-chalkboard', 'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r') ] diff --git a/application/controllers/api/frontend/v1/stv/Tags.php b/application/controllers/api/frontend/v1/stv/Tags.php index e5af9becc..bd5c61953 100644 --- a/application/controllers/api/frontend/v1/stv/Tags.php +++ b/application/controllers/api/frontend/v1/stv/Tags.php @@ -15,7 +15,9 @@ class Tags extends Tag_Controller 'addTag' => self::BERECHTIGUNG_KURZBZ, 'updateTag' => self::BERECHTIGUNG_KURZBZ, 'doneTag' => self::BERECHTIGUNG_KURZBZ, - 'deleteTag' => self::BERECHTIGUNG_KURZBZ + 'deleteTag' => self::BERECHTIGUNG_KURZBZ, + 'getAllTags' => self::BERECHTIGUNG_KURZBZ, + 'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ, ]); $this->config->load('stv'); diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php index fb14563ba..c4c5afa88 100644 --- a/application/core/Tag_Controller.php +++ b/application/core/Tag_Controller.php @@ -7,7 +7,7 @@ class Tag_Controller extends FHCAPI_Controller { private $_uid; - const BERECHTIGUNG_KURZBZ = 'admin:rw'; + const BERECHTIGUNG_KURZBZ = ['admin:rw']; public function __construct($permissions) { diff --git a/application/libraries/stv/StudentListLib.php b/application/libraries/stv/StudentListLib.php index a00f92822..432b75bd4 100644 --- a/application/libraries/stv/StudentListLib.php +++ b/application/libraries/stv/StudentListLib.php @@ -72,7 +72,7 @@ class StudentListLib $this->addSelect('pls.bestaetigtam AS status_bestaetigung'); $this->addSelect(" CASE - WHEN pls.status_kurzbz = 'Interessent' + WHEN pls.status_kurzbz IN ('Interessent','Aufgenommener','Bewerber','Wartender') THEN pls.ausbildungssemester ELSE s.semester END AS semester_berechnet diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php index 055b8e4ea..9a9fd37fb 100644 --- a/application/models/codex/Bisio_model.php +++ b/application/models/codex/Bisio_model.php @@ -60,6 +60,7 @@ class Bisio_model extends DB_Model JOIN public.tbl_prestudentstatus pss ON (ps.prestudent_id = pss.prestudent_id) JOIN public.tbl_studiensemester ss ON (pss.studiensemester_kurzbz = ss.studiensemester_kurzbz) WHERE ss.studiensemester_kurzbz = ? + AND nation_code <> 'A' AND ( tbl_bisio.von <= ss.ende AND ( @@ -83,7 +84,7 @@ class Bisio_model extends DB_Model JOIN public.tbl_prestudentstatus pss ON (ps.prestudent_id = pss.prestudent_id) JOIN public.tbl_studiensemester ss ON (pss.studiensemester_kurzbz = ss.studiensemester_kurzbz) WHERE ss.studiensemester_kurzbz = ? - --AND pss.status_kurzbz = 'Student' + AND nation_code <> 'A' AND ( tbl_bisio.von <= ss.ende AND ( diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index 8beafe25f..870a58bdf 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -96,6 +96,13 @@ html.fs_huge { overflow: visible !important; } +/* to enable scrolling for many student entries*/ +.stv-details-abschlusspruefung-student-names { + max-height: 80px; + overflow-y: auto; + overflow-x: hidden; +} + .p-dropdown-item{ z-index: 1201 !important; } diff --git a/public/css/tags.css b/public/css/tags.css index f424b6699..3b3377d5d 100644 --- a/public/css/tags.css +++ b/public/css/tags.css @@ -46,7 +46,6 @@ background-color: #ffA500ff; } - .tag_braun { background-color: #6d4c41; } @@ -72,6 +71,26 @@ color: black; } +.tag_turquoise { + background-color: #89cccf; + color: black; +} + +.tag_bordeaux { + background-color: #7B1B38; + color: white; +} + +.tag_olive { + background-color: #868d07; + color: white; +} + +.tag_beige { + background-color: #E4D5B4; + color: black; +} + .tag_done { text-decoration: line-through; } diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 3509761e3..84e462df3 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -59,10 +59,6 @@ export default { from: 'configStvTagsEnabled', default: false }, - currentSemester: { - from: 'currentSemester', - required: true - }, lists: { from: 'lists', required: true @@ -293,8 +289,10 @@ export default { this.semesterDates.ende ); - this.$refs.tagWrapper.innerHTML = ''; - this.$refs.tagWrapper.appendChild(container); + if(this.headerData.length == 1) { + this.$refs.tagWrapper.innerHTML = ''; + this.$refs.tagWrapper.appendChild(container); + } }, getAllTags(prestudent_id){ return this.$api @@ -437,6 +435,12 @@ export default { {{headerData[0].verband}} | {{$p.t('lehre', 'gruppe')}} {{headerData[0].gruppe}} + | Einstiegssemester {{headerData[0].semester_berechnet}} +