blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-77537/Studvw_Feedback' into studvw_2026_05_rc_tags

Browse Source
This commit is contained in:
Harald Bamberger
2026-07-17 11:38:46 +02:00
parent 1f6c9e865b d4929c8e22
commit 6c25a3b262
13 changed files with 161 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/navigation.php
+1 -1
View File
@@ -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')
]
application/controllers/api/frontend/v1/stv/Tags.php
+3 -1
View File
@@ -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');
application/core/Tag_Controller.php
+1 -1
View File
@@ -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)
{
application/libraries/stv/StudentListLib.php
+1 -1
View File
@@ -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
application/models/codex/Bisio_model.php
+2 -1
View File
@@ -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 (