Compare commits

..

27 Commits

Author SHA1 Message Date
chfhtw b0f317951b Add lvv_favorites 2026-07-15 16:18:39 +02:00
chfhtw f65135be1e For each treemenu seperate favorites 2026-07-15 16:18:19 +02:00
chfhtw b8d86ba628 Use luxon date formatters in studvw student list 2026-07-15 14:48:55 +02:00
chfhtw 11cfa670d6 Add dynamic tabulatorcolumns to lvverwaltung 2026-07-15 11:05:37 +02:00
chfhtw a94fbeba14 Only call reloadTable if a table was loaded 2026-07-15 11:05:37 +02:00
chfhtw e01b816ee8 Add treemenudata routes to lvverwaltung 2026-07-15 11:05:36 +02:00
chfhtw 52c90111cc Add treemenu to lvverwaltung 2026-07-15 11:01:03 +02:00
chfhtw 0b1d0fbe4c Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen 2026-07-14 14:31:51 +02:00
chfhtw 85807f5b8c Allow treemenu entries to become draggables 2026-07-14 14:21:39 +02:00
chfhtw a1950d179b draggable directive: better handling of falsy values, better cleanup, remove attributes on falsy value/effect 2026-07-14 14:21:09 +02:00
chfhtw d134509c90 Remove unused routes 2026-07-13 13:13:06 +02:00
chfhtw 4424c7d748 Handle "incoming" menu entry (in inout and prestudent filters) 2026-07-13 13:03:23 +02:00
chfhtw d436d8cb20 Check permissions for prestudent menu entry 2026-07-13 13:02:40 +02:00
chfhtw b991bbd9a5 Allow extra columns for studvw student list 2026-07-08 11:00:20 +02:00
chfhtw 5bed848aae Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen 2026-07-08 09:43:58 +02:00
chfhtw c59b24ab4a App urls for studierendenverwaltung (neu: /studvw) 2026-07-03 12:16:30 +02:00
chfhtw 0b70153da0 throw 404 on endpoints with invalid studiengang 2026-07-02 15:32:20 +02:00
chfhtw 190d797d31 adapt routes and endpoints for getPrestudent, getStudent & getPerson 2026-07-02 14:36:30 +02:00
chfhtw 6428fccc48 Replace CoreRESTClient calls with $api calls in stv Studiensemester component and add logic to accept lowercase input (because it could come from the url) 2026-07-01 15:45:09 +02:00
chfhtw 483d8f733f adapt routes and endpoints 2026-06-30 14:21:32 +02:00
chfhtw 9cb5d0895d Rework Treemenu endpoint and libraries 2026-06-29 16:12:32 +02:00
chfhtw 4a283ebf5d rename menu => treemenu 2026-06-25 16:46:18 +02:00
chfhtw e27e64414a Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen 2026-06-25 16:34:09 +02:00
chfhtw c468d350f3 outsource config to better read it and make reuse easier 2026-05-13 14:16:14 +02:00
chfhtw a7cc07fe15 Add basic library and config for studvw 2026-05-11 09:31:08 +02:00
chfhtw e91f8e5ca4 Replace component and endpoint for Verband 2026-05-11 09:27:54 +02:00
chfhtw c765c3c40a allow object as argument for drop directive to enable dynamic specification of allowed dragtypes 2026-05-11 09:20:42 +02:00
47 changed files with 2893 additions and 1291 deletions
+12 -1
View File
@@ -8,4 +8,15 @@ $config['lvverwaltung_tags'] = [
];
*/
$config['lvverwaltung_tags'] = [];
$config['lvverwaltung_tags'] = [];
# Additional columns:
/*
$config["list_columns"] = [
'fieldname' => [
'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
// NOTE: 'default' & 'joins' like in stv.php config are currently not available here
]
];
*/
+48 -37
View File
@@ -75,52 +75,63 @@ $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
$route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
$route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
// Studierendenverwaltung App Routes
$route['studvw'] = 'studentenverwaltung/index';
$route['studvw/.*'] = 'studentenverwaltung/index';
// Old routes
$route['studentenverwaltung'] = 'redirect/301/studvw';
$route['studentenverwaltung/(:any)'] = 'redirect/301/studvw/stdsem/$1';
$route['studentenverwaltung/(:any)/(prestudent|student|person|search)/(:any)'] = 'redirect/301/studvw/stdsem/$1/$2/$3';
$route['studentenverwaltung/(:any)/prestudent/(:any)/tab/:any'] = 'redirect/301/studvw/stdsem/$1/prestudent/$2';
$route['studentenverwaltung/(:any)/search/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/search/$2/$3';
$route['studentenverwaltung/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/stg/$2';
// Studierendenverwaltung List Routes
$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/incoming/1'] = 'api/frontend/v1/stv/students/getIncoming/$1';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/outgoing/1'] = 'api/frontend/v1/stv/students/getOutgoing/$1';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/shared_studies/1'] = 'api/frontend/v1/stv/students/getGemeinsamestudien/$1';
// (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1';
// (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3';
$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2';
// (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4/$5';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2';
// (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3';
// (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsSpezialgruppe/$1/$2/$3/$4';
// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgformSpezialgruppe/$1/$3/$2/$4/$5';
// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/prestudent/(:any)'] = 'api/frontend/v1/stv/students/getPrestudent/$1/$2';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/student/(:any)'] = 'api/frontend/v1/stv/students/getStudent/$1/$2';
$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/person/(:any)'] = 'api/frontend/v1/stv/students/getPerson/$1/$2';
$route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/index';
// Lvverwaltung List Routes
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
// // (studiensemester_kurzbz)/uid/(uid)
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
// // (studiensemester_kurzbz)/prestudent/(prestudent_id)
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
// // (studiensemester_kurzbz)/person/(person_id)
$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
// load routes from extensions, also look for environment-specific configs
$subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
+21
View File
@@ -1,6 +1,27 @@
<?php
$config['number_displayed_past_studiensemester_default'] = 5;
# Additional columns:
/*
$config["list_columns"] = [
'fieldname' => [
'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
'default' => "SQL SELECT statement for value",
'joins' => [
// additional joins needed for the SELECT statement above
[
'tablename',
'join condition', // single fieldname for USING or full condition for ON
'LEFT|RIGHT', // optional - join type
'after_xxx|before_xxx|end' // optional - position in query
]
// ...
]
]
];
*/
$config['tabs'] =
[
'details' => [
+29
View File
@@ -0,0 +1,29 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (!defined('BASEPATH')) exit('No direct script access allowed');
$config['stv'] = [
"library" => "treemenu/StudVwLib",
"permissions" => ["admin:r", "assistenz:r"]
];
$config['lvv'] = [
"library" => "treemenu/LvVwLib",
"permissions" => ["admin:r", "assistenz:r"]
];
+65
View File
@@ -0,0 +1,65 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (!defined('BASEPATH')) exit('No direct script access allowed');
$config['root'] = [
'stg' => [
'prestudent' => [
'stdsem' => [
'interessenten' => [
'bewerbungnichtabgeschickt',
'bewerbungabgeschickt',
'zgv',
'statusbestaetigt' => [
'statusbestaetigtrtnichtangemeldet',
'statusbestaetigtrtangemeldet'
],
'reihungstestnichtangemeldet',
'reihungstestangemeldet'
],
'bewerber' => [
'bewerberrtnichtangemeldet',
'bewerberrtangemeldet' => [
'bewerberrtangemeldetteilgenommen',
'bewerberrtangemeldetnichtteilgenommen'
]
],
'aufgenommen',
'warteliste',
'absage',
'incoming'
]
],
'semester' => [
'group',
'verband' => [
'group'
]
]
],
'inout' => [
'incoming',
'outgoing',
'shared_studies'
]
];
// copy stg tree into stg/orgforms
$config['root']['stg']['orgform'] = $config['root']['stg'];
+44
View File
@@ -0,0 +1,44 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller redirects urls to another location. This is mainly used
* with the $routes config
*/
class Redirect extends CI_Controller
{
public function __construct()
{
parent::__construct();
}
/**
* Main function to handle all redirects.
*
* @param string $method - the redirect code (30x)
* @param array $params - the url to redirect to
*
* @return void
*/
public function _remap($method, $params)
{
redirect($params, 'location', $method);
}
}
@@ -20,8 +20,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the back-end
* Provides data to the ajax get calls about favorite verbände
* Listens to ajax post calls to change the favorite verbände data
* Provides data to the ajax get calls about favorite treemenu entries
* Listens to ajax post calls to change the favorite treemenu entries
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Favorites extends FHCAPI_Controller
@@ -29,7 +29,7 @@ class Favorites extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
'index' => self::PERM_LOGGED,
'get' => self::PERM_LOGGED,
'set' => self::PERM_LOGGED
]);
@@ -37,19 +37,19 @@ class Favorites extends FHCAPI_Controller
$this->load->model('system/Variable_model', 'VariableModel');
}
public function index()
public function get($app)
{
$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
$result = $this->VariableModel->getVariables(getAuthUID(), [$app . '_favorites']);
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
$this->terminateWithSuccess(null);
else
$this->terminateWithSuccess($data['stv_favorites'] ?? null);
$this->terminateWithSuccess($data[$app . '_favorites'] ?? null);
}
public function set()
public function set($app)
{
$this->load->library('form_validation');
@@ -60,7 +60,7 @@ class Favorites extends FHCAPI_Controller
$favorites = $this->input->post('favorites');
$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
$result = $this->VariableModel->setVariable(getAuthUID(), $app . '_favorites', $favorites);
$this->getDataOrTerminateWithError($result);
@@ -56,7 +56,9 @@ class Lehrveranstaltung extends FHCAPI_Controller
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz);
$studiengang_kz = $this->getStudiengangKz($stg_kz);
$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz);
$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
$tree = [];
@@ -75,8 +77,10 @@ class Lehrveranstaltung extends FHCAPI_Controller
$this->terminateWithSuccess($tree);
}
public function getByStg($studiensemester_kurzbz = null, $studiengang_kz = null, $semester = null)
public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
{
$studiengang_kz = $this->getStudiengangKz($stg_kz);
if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
@@ -260,14 +264,31 @@ class Lehrveranstaltung extends FHCAPI_Controller
}
}
protected function getStudiengangKz($studiengang_typ_kurzbz)
{
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$result = $this->StudiengangModel->loadWhere([
'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
]);
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
return null;
return current($data)->studiengang_kz;
}
private function getStudiensemesterKurzbz($studiensemester_kurzbz = null)
{
if (!is_null($studiensemester_kurzbz))
{
$studiensemester_result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere([
'LOWER(studiensemester_kurzbz)' => strtolower($studiensemester_kurzbz)
]);
if (isError($studiensemester_result) || !hasData($studiensemester_result))
$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
return getData($studiensemester_result)[0]->studiensemester_kurzbz;
}
@@ -0,0 +1,130 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \ReflectionMethod as ReflectionMethod;
/**
* This controller operates between (interface) the JS (GUI) and the back-end
* Provides data to the ajax get calls about menues
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Treemenu extends FHCAPI_Controller
{
public function __construct()
{
// Load Router
$router = load_class('Router');
// Load Config
$config = load_class('Config');
$config->load('treemenu');
// Get Treemenu name & config
$name = $router->method;
$conf = $config->item($name);
// Get Permissions from config
$permissions = $conf['permissions'] ?? self::PERM_ANONYMOUS;
// Call constructor
parent::__construct([
$name => $permissions
]);
// Load Library
$libraryName = $conf['library'] ?? null;
$this->load->library($libraryName, null, 'treemenulib');
}
/**
* @param string $method
* @param array $params (optional)
*
* @return void
*/
public function _remap($method, $params = [])
{
if (!$this->treemenulib)
show_404();
$this->addMeta('ci_method', $method);
$this->addMeta('ci_params', $params);
$params = $this->uri->uri_to_assoc(6); // 6 = start of $params
$config = $this->treemenulib->config;
foreach (array_keys($params) as $key) {
if (!isset($config[$key]) || !$config[$key])
show_404();
$config = $config[$key];
}
// Prepare aliases
$argumentaliases = [];
if (property_exists($this->treemenulib, 'path_to_argument'))
$argumentaliases = array_flip($this->treemenulib->path_to_argument);
$methodaliases = [];
if (property_exists($this->treemenulib, 'redirect_method'))
$methodaliases = $this->treemenulib->redirect_method;
$items = [];
foreach ($config as $uripart => $children) {
if (!is_array($children)) {
$uripart = $children;
$children = [];
}
$methodName = $uripart;
if (isset($methodaliases[$methodName])) {
$methodName = $methodaliases[$methodName];
} elseif (strpbrk($methodName, ' _-') !== false) {
$methodName = lcfirst(str_replace([' ', '_', '-'], '', ucwords($methodName, " \t\r\n\f\v_-")));
}
// Prepare arguments
$reflection = new ReflectionMethod($this->treemenulib, $methodName);
$arguments = [];
foreach ($reflection->getParameters() as $arg) {
if ($arg->name == 'path_template') {
$path = $params;
$path[$uripart] = '%s';
$arguments[] = $this->uri->assoc_to_uri($path);
} elseif ($arg->name == 'has_children') {
$arguments[] = $children;
} elseif ($arg->name == 'original_method') {
$arguments[] = $uripart;
} elseif (isset($argumentaliases[$arg->name]) && isset($params[$argumentaliases[$arg->name]])) {
$arguments[] = $params[$argumentaliases[$arg->name]];
} elseif (isset($params[$arg->name])) {
$arguments[] = $params[$arg->name];
} else {
$arguments[] = null;
}
}
// Call function from lib
$items = array_merge($items, call_user_func_array([$this->treemenulib, $methodName], $arguments));
}
$this->terminateWithSuccess($items);
}
}
@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
'getHeader' => ['vertrag/mitarbeiter:r'],
'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
]);
}
@@ -26,7 +26,9 @@ class Studiensemester extends FHCAPI_Controller
'getAll' => self::PERM_LOGGED,
'getAktNext' => self::PERM_LOGGED,
'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
'current' => self::PERM_LOGGED,
'set' => self::PERM_LOGGED
)
);
// Load model StudiensemesterModel
@@ -166,4 +168,39 @@ class Studiensemester extends FHCAPI_Controller
$this->terminateWithSuccess(array($studiensemester, $aktuell));
}
public function current()
{
$result = $this->StudiensemesterModel->getNearest();
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
$this->terminateWithError('Kein Studiensemester aktiv');
if (count($data) > 1)
$this->terminateWithError('Mehrere Studiensemester aktiv');
$this->terminateWithSuccess(current($data)->studiensemester_kurzbz);
}
public function set()
{
$this->load->library('AuthLib');
$this->load->library('form_validation');
$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$stdsem = $this->input->post('studiensemester_kurzbz');
$this->load->model('system/Variable_model', 'VariableModel');
$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
$this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess(true);
}
}
@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
}
elseif (
$val === ''
&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
)
{
$val = null;
@@ -247,47 +247,54 @@ class Students extends FHCAPI_Controller
}
public function getPrestudents(
$studiengang_kz,
$studiengang_typ_kurzbz,
$studiensemester_kurzbz = null,
$filter = null
) {
$this->addMeta('ci_method', __FUNCTION__);
$this->addMeta('ci_params', array(
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'filter' => $filter
));
$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
$this->fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz, $filter);
}
public function getPrestudentsOrgform(
$studiengang_kz,
$studiengang_typ_kurzbz,
$orgform_kurzbz,
$studiensemester_kurzbz = null,
$filter = null
) {
$this->addMeta('ci_method', __FUNCTION__);
$this->addMeta('ci_params', array(
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'filter' => $filter,
'orgform_kurzbz' => $orgform_kurzbz
));
$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
$this->fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
}
/**
* @param integer $studiengang_kz
* @param string $studiengang_typ_kurzbz
* @param string $studiensemester_kurzbz (optional)
* @param string $filter (optional)
* @param string $orgform_kurzbz (optional)
*
* @return void
*/
protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
protected function fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
{
$studiengang_kz = $this->getStudiengangKz($studiengang_typ_kurzbz);
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$orgform_kurzbz = $this->getOrgformKurzbz($orgform_kurzbz);
if ($studiengang_kz === null)
show_404();
$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
$selectRT = "
@@ -451,7 +458,7 @@ class Students extends FHCAPI_Controller
public function getStudents(
$studiensemester_kurzbz,
$studiengang_kz,
$studiengang_typ_kurzbz,
$semester = null,
$verband = null,
$gruppe = null
@@ -459,18 +466,18 @@ class Students extends FHCAPI_Controller
$this->addMeta('ci_method', __FUNCTION__);
$this->addMeta('ci_params', array(
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'semester' => $semester,
'verband' => $verband,
'gruppe' => $gruppe
));
$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, $verband, $gruppe, null, null);
}
public function getStudentsOrgform(
$studiensemester_kurzbz,
$studiengang_kz,
$studiengang_typ_kurzbz,
$orgform_kurzbz,
$semester = null,
$verband = null,
@@ -479,37 +486,37 @@ class Students extends FHCAPI_Controller
$this->addMeta('ci_method', __FUNCTION__);
$this->addMeta('ci_params', array(
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'orgform_kurzbz' => $orgform_kurzbz,
'semester' => $semester,
'verband' => $verband,
'gruppe' => $gruppe
));
$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbzstudiengang_typ_kurzbz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
}
public function getStudentsSpezialgruppe(
$studiensemester_kurzbz,
$studiengang_kz,
$studiengang_typ_kurzbz,
$semester,
$gruppe_kurzbz
) {
$this->addMeta('ci_method', __FUNCTION__);
$this->addMeta('ci_params', array(
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'semester' => $semester,
'gruppe_kurzbz' => $gruppe_kurzbz
));
$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, null, null, $gruppe_kurzbz, null);
}
public function getStudentsOrgformSpezialgruppe(
$studiensemester_kurzbz,
$orgform_kurzbz,
$studiengang_kz,
$studiengang_typ_kurzbz,
$semester,
$gruppe_kurzbz
) {
@@ -517,17 +524,17 @@ class Students extends FHCAPI_Controller
$this->addMeta('ci_params', array(
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'orgform_kurzbz' => $orgform_kurzbz,
'studiengang_kz' => $studiengang_kz,
'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
'semester' => $semester,
'gruppe_kurzbz' => $gruppe_kurzbz
));
$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
}
/**
* @param integer $studiengang_kz
* @param string $studiensemester_kurzbz
* @param string $studiengang_typ_kurzbz
* @param integer $semester (optional)
* @param string $verband (optional)
* @param integer $gruppe (optional)
@@ -538,13 +545,20 @@ class Students extends FHCAPI_Controller
*/
protected function fetchStudents(
$studiensemester_kurzbz,
$studiengang_kz,
$studiengang_typ_kurzbz,
$semester = null,
$verband = null,
$gruppe = null,
$gruppe_kurzbz = null,
$orgform_kurzbz = null
) {
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$studiengang_kz = $this->getStudiengangKz($studiengang_typ_kurzbz);
$orgform_kurzbz = $this->getOrgformKurzbz($orgform_kurzbz);
if ($studiengang_kz === null)
show_404();
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -611,6 +625,8 @@ class Students extends FHCAPI_Controller
'prestudent_id' => $prestudent_id,
));
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -655,6 +671,8 @@ class Students extends FHCAPI_Controller
'student_uid' => $student_uid,
));
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -689,6 +707,8 @@ class Students extends FHCAPI_Controller
'person_id' => $person_id,
));
$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -802,4 +822,55 @@ class Students extends FHCAPI_Controller
}
}
}
protected function getStudiengangKz($studiengang_typ_kurzbz)
{
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$result = $this->StudiengangModel->loadWhere([
'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
]);
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
return null;
return current($data)->studiengang_kz;
}
protected function getStudiensemesterKurzbz($studiensemester_kurzbz)
{
if ($studiensemester_kurzbz === null)
return null;
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$result = $this->StudiensemesterModel->loadWhere([
'LOWER(studiensemester_kurzbz) =' => strtolower($studiensemester_kurzbz)
]);
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
return $studiensemester_kurzbz;
return current($data)->studiensemester_kurzbz;
}
protected function getOrgformKurzbz($orgform_kurzbz)
{
if ($orgform_kurzbz === null)
return null;
$this->load->model('codex/Orgform_model', 'OrgformModel');
$result = $this->OrgformModel->loadWhere([
'LOWER(orgform_kurzbz) =' => strtolower($orgform_kurzbz)
]);
$data = $this->getDataOrTerminateWithError($result);
if (!$data)
return $orgform_kurzbz;
return current($data)->orgform_kurzbz;
}
}
@@ -1,78 +0,0 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
class Studiensemester extends Auth_Controller
{
public function __construct()
{
// TODO(chris): access!
parent::__construct([
'index' => self::PERM_LOGGED,
'now' => self::PERM_LOGGED,
'set' => self::PERM_LOGGED
]);
}
public function index()
{
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->StudiensemesterModel->addOrder('start');
$result = $this->StudiensemesterModel->load();
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
}
$this->outputJson($result);
}
public function now()
{
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$result = $this->StudiensemesterModel->getNearest();
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
$this->outputJson(getError($result));
}
$result = getData($result) ?: [];
if (count($result) != 1) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
$this->outputJsonError(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
} else {
$this->outputJsonSuccess(current($result)->studiensemester_kurzbz);
}
}
public function set()
{
$this->load->library('AuthLib');
$this->load->library('form_validation');
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
if ($this->form_validation->run() == false) {
$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
return $this->outputJsonError($this->form_validation->error_array());
}
$stdsem = $this->input->post('studiensemester');
$this->load->model('system/Variable_model', 'VariableModel');
$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson($result);
}
$this->outputJsonSuccess(true);
}
}
@@ -0,0 +1,60 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller generates javascript from snippets for tabulator columns
*/
class Tabulatorcolumns extends Auth_Controller
{
public function __construct()
{
parent::__construct([
'stv' => ['admin:r', 'assistenz:r'],
'lvverwaltung' => ['admin:r', 'assistenz:r']
]);
}
/**
* Render tabulator columns for config
*
* @param string $config
*
* @return void
*/
public function _remap($config)
{
$this->load->config($config);
$list_columns = $this->config->item('list_columns') ?: [];
$snippets = [
'jssnippets/tabulatorcolumns/' . $config . '.js'
];
foreach ($list_columns as $col) {
$snippets[] = $col['js'];
}
$this->output->set_content_type('application/javascript');
$this->load->view('jssnippets/tabulatorcolumns.js', [
'snippets' => $snippets
]);
}
}
+13 -2
View File
@@ -40,6 +40,8 @@ class StudentListLib
{
$this->_ci =& get_instance(); // get code igniter instance
$this->_ci->load->config('stv');
$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
if (isset($params['allowedStgs']))
@@ -111,7 +113,7 @@ class StudentListLib
) prest
WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
AND priorisierung <= tbl_prestudent.priorisierung
) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false); // TODO(chris): overwrite in fetchStudents
) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
$this->addSelect('mentor');
$this->addSelect('b.aktiv AS bnaktiv');
$this->addSelect('unruly');
@@ -119,7 +121,7 @@ class StudentListLib
// Add default JOINs
$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
$this->addJoin('public.tbl_person p', 'person_id');
$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); // TODO(chris): overwrite in fetchStudents
$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
$this->addJoin('public.tbl_prestudentstatus pls', '
pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL)
AND pls.prestudent_id=tbl_prestudent.prestudent_id
@@ -164,6 +166,15 @@ class StudentListLib
$this->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
}
// Add SELECTs and JOINs from config
$config = $this->_ci->config->item('list_columns') ?: [];
foreach ($config as $conf) {
$this->addSelect($conf['default']);
if (isset($conf['joins']))
foreach ($conf['joins'] as $join)
call_user_func_array([$this, 'addJoin'], $join);
}
}
//------------------------------------------------------------------------------------------------------------------
+199
View File
@@ -0,0 +1,199 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* LvVw Menu library
*/
class LvVwLib
{
protected $_ci = null;
public $config = [];
public function __construct()
{
// Get code igniter instance
$this->_ci =& get_instance();
// Load Tree-config
$this->config = [
'stg' => [
'semester' => [
'group',
'verband' => [
'group'
]
],
'orgform'
]
];
// Load Libraries
$this->_ci->load->library('treemenu/base/StgLib');
// Load Model
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
}
public function stg($path_template)
{
$permittedStgs = $this->getPermittedStudiengangKzs();
if (!$permittedStgs)
return [];
$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
'"type": "verband",' .
'"id": "lv/%1$s",' .
'"gruppe_kurzbz": null,' .
'"semester": null,' .
'"verband": null,' .
'"gruppe": null,' .
'"lehrverband": true,' .
'"stg_kz": "%1$s"' .
"}', studiengang_kz)] AS draggable", false);
return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
}
public function semester($path_template, $stg)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
'"type": "verband",' .
'"id": "lv/%1$s/%2$s",' .
'"gruppe_kurzbz": null,' .
'"semester": "%2$s",' .
'"verband": null,' .
'"gruppe": null,' .
'"lehrverband": true,' .
'"stg_kz": "%1$s"' .
"}', v.studiengang_kz, v.semester)] AS draggable", false);
return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz);
}
public function verband($path_template, $stg, $semester)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
'"type": "verband",' .
'"id": "lv/%1$s/%2$s/%3$s",' .
'"gruppe_kurzbz": null,' .
'"semester": "%2$s",' .
'"verband": "%3$s",' .
'"gruppe": null,' .
'"lehrverband": true,' .
'"stg_kz": "%1$s"' .
"}', v.studiengang_kz, v.semester, v.verband)] AS draggable", false);
$this->_ci->StudiengangModel->addGroupBy('v.studiengang_kz, v.semester');
return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester);
}
public function group($path_template, $stg, $semester, $verband)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
if ($verband === null) {
$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
'"type": "verband",' .
'"id": "grp/%1$s/%2$s/%3$s",' .
'"gruppe_kurzbz": "%3$s",' .
'"semester": "%2$s",' .
'"verband": null,' .
'"gruppe": null,' .
'"lehrverband": false,' .
'"stg_kz": "%1$s"' .
"}', studiengang_kz, semester, gruppe_kurzbz)] AS draggable", false);
return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester);
}
$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
'"type": "verband",' .
'"id": "lv/%1$s/%2$s/%3$s/%4$s",' .
'"gruppe_kurzbz": null,' .
'"semester": "%2$s",' .
'"verband": "%3$s",' .
'"gruppe": "%4$s",' .
'"lehrverband": true,' .
'"stg_kz": "%1$s"' .
"}', v.studiengang_kz, v.semester, v.verband, v.gruppe)] AS draggable", false);
return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband);
}
public function orgform($path_template, $stg)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
if (!$stg->mischform)
return [];
$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
}
protected function getPermittedStudiengangKzs()
{
$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
return $permittedStgs;
}
protected function getStgFromUrl($stg)
{
$permittedStgs = $this->getPermittedStudiengangKzs();
if (!$permittedStgs)
return null;
$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
$stg = $this->_ci->StudiengangModel->loadWhere([
'LOWER(CONCAT(typ, kurzbz)) =' => $stg
]);
if (!hasData($stg))
return null;
return current(getData($stg));
}
}
@@ -0,0 +1,255 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* StudVw Menu library
*/
class StudVwLib
{
protected $_ci = null;
public $config = [];
public $redirect_method = [
'interessenten' => 'filter',
'bewerbungnichtabgeschickt' => 'filter',
'bewerbungabgeschickt' => 'filter',
'zgv' => 'filter',
'statusbestaetigt' => 'filter',
'statusbestaetigtrtnichtangemeldet' => 'filter',
'statusbestaetigtrtangemeldet' => 'filter',
'reihungstestnichtangemeldet' => 'filter',
'reihungstestangemeldet' => 'filter',
'bewerber' => 'filter',
'bewerberrtnichtangemeldet' => 'filter',
'bewerberrtangemeldet' => 'filter',
'bewerberrtangemeldetteilgenommen' => 'filter',
'bewerberrtangemeldetnichtteilgenommen' => 'filter',
'aufgenommen' => 'filter',
'warteliste' => 'filter',
'absage' => 'filter',
'outgoing' => 'inout',
'shared_studies' => 'inout'
];
public function __construct()
{
// Get code igniter instance
$this->_ci =& get_instance();
// Load Tree-config
$this->_ci->load->config('treemenu/stg_base');
$this->config = $this->_ci->config->item('root');
// Load Libraries
$this->_ci->load->library('treemenu/base/StgLib');
// Load Model
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
}
public function stg($path_template)
{
$permittedStgs = $this->getPermittedStudiengangKzs();
if (!$permittedStgs)
return [];
return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
}
public function prestudent($path_template, $stg)
{
// Check permission
if ($this->getStgFromUrl($stg) === null)
return [];
return [
[
'path' => sprintf($path_template, '1'),
'name' => 'Prestudent',
'no_sem_reload' => true
]
];
}
public function stdsem($path_template, $stg)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
return $this->_ci->stglib->studiensemester($path_template, $stg->studiengang_kz);
}
public function semester($path_template, $stg, $orgform)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
if ($orgform !== null) {
$orgform = $this->getOrgform($orgform);
if ($orgform === null)
return [];
$orgform = $orgform->orgform_kurzbz;
}
return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz, $orgform);
}
public function verband($path_template, $stg, $semester, $orgform)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
if ($orgform !== null) {
$orgform = $this->getOrgform($orgform);
if ($orgform === null)
return [];
$orgform = $orgform->orgform_kurzbz;
}
$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester, $orgform);
}
public function group($path_template, $stg, $semester, $verband, $orgform)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
if ($orgform !== null) {
$orgform = $this->getOrgform($orgform);
if ($orgform === null)
return [];
$orgform = $orgform->orgform_kurzbz;
}
$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
if ($verband === null)
return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester, $orgform);
return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband, $orgform);
}
public function orgform($path_template, $stg)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
if (!$stg->mischform)
return [];
return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
}
public function incoming($has_children, $path_template, $stg)
{
if ($stg === null)
return $this->inout('incoming', $has_children, $path_template);
return $this->filter('incoming', $has_children, $path_template, $stg);
}
public function filter($original_method, $has_children, $path_template, $stg)
{
$stg = $this->getStgFromUrl($stg);
if ($stg === null)
return [];
$item = [
'path' => sprintf($path_template, '1'),
'name' => $original_method
];
if (!$has_children)
$item['leaf'] = true;
return [ $item ];
}
public function inout($original_method, $has_children, $path_template)
{
if (!$this->_ci->permissionlib->isBerechtigt('inout/uebersicht'))
return [];
$item = [
'path' => sprintf($path_template, '1'),
'name' => $original_method
];
if (!$has_children)
$item['leaf'] = true;
return [ $item ];
}
protected function getOrgform($orgform)
{
$this->_ci->load->model('codex/Orgform_model', 'OrgformModel');
$orgform = $this->_ci->OrgformModel->loadWhere([
'LOWER(orgform_kurzbz) =' => $orgform
]);
if (!hasData($orgform))
return null;
return current(getData($orgform));
}
protected function getPermittedStudiengangKzs()
{
$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
return $permittedStgs;
}
protected function getStgFromUrl($stg)
{
$permittedStgs = $this->getPermittedStudiengangKzs();
if (!$permittedStgs)
return null;
$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
$stg = $this->_ci->StudiengangModel->loadWhere([
'LOWER(CONCAT(typ, kurzbz)) =' => $stg
]);
if (!hasData($stg))
return null;
return current(getData($stg));
}
}
@@ -0,0 +1,313 @@
<?php
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* Stg Base library
*/
class StgLib
{
protected $_ci = null;
public function __construct()
{
// Get code igniter instance
$this->_ci =& get_instance();
}
public function studiengang($path_template, $permittedStgs = [])
{
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
$this->_ci->StudiengangModel->addDistinct();
$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", LOWER(CONCAT(typ, kurzbz))) AS path");
$this->_ci->StudiengangModel->addSelect(
"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
false
);
$this->_ci->StudiengangModel->addSelect("studiengang_kz AS title");
$this->_ci->StudiengangModel->addSelect("studiengang_kz AS search");
$this->_ci->StudiengangModel->addSelect('erhalter_kz');
$this->_ci->StudiengangModel->addSelect('typ');
$this->_ci->StudiengangModel->addSelect('kurzbz');
$this->_ci->StudiengangModel->addSelect('studiengang_kz');
$this->_ci->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
$this->_ci->StudiengangModel->addOrder('erhalter_kz');
$this->_ci->StudiengangModel->addOrder('typ');
$this->_ci->StudiengangModel->addOrder('kurzbz');
if ($permittedStgs)
$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
$result = $this->_ci->StudiengangModel->loadWhere(['v.aktiv' => true]);
return getData($result) ?: [];
}
public function semester($path_template, $studiengang_kz, $orgform_kurzbz = null)
{
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
$this->_ci->StudiengangModel->addDistinct();
$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", semester) AS path", false);
$this->_ci->StudiengangModel->addSelect("CONCAT(
UPPER(CONCAT(typ, kurzbz)),
'-',
semester,
(
SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END
FROM public.tbl_lehrverband
WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester
ORDER BY verband, gruppe LIMIT 1
)
) AS name", false);
$this->_ci->StudiengangModel->addSelect('semester');
$this->_ci->StudiengangModel->addSelect('v.studiengang_kz AS stg_kz');
$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
$this->_ci->StudiengangModel->addOrder('semester');
if ($orgform_kurzbz !== null) {
$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($orgform_kurzbz) . " AS orgform_kurzbz", false);
$this->_ci->StudiengangModel->addDistinct();
$this->_ci->StudiengangModel->db->group_start();
$this->_ci->StudiengangModel->db->where('v.semester', 0);
$this->_ci->StudiengangModel->db->or_where('v.orgform_kurzbz', $orgform_kurzbz);
$this->_ci->StudiengangModel->db->group_end();
}
$result = $this->_ci->StudiengangModel->loadWhere([
'studiengang_kz' => $studiengang_kz,
'v.aktiv' => true
]);
return getData($result) ?: [];
}
public function group($path_template, $studiengang_kz, $semester, $orgform_kurzbz = null)
{
$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
$this->_ci->GruppeModel->addDistinct();
$this->_ci->GruppeModel->addSelect("FORMAT(" . $this->_ci->GruppeModel->escape($path_template) . ", gruppe_kurzbz) AS path", false);
$this->_ci->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
$this->_ci->GruppeModel->addSelect('sort');
$this->_ci->GruppeModel->addSelect('gruppe_kurzbz');
$this->_ci->GruppeModel->addSelect($this->_ci->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->_ci->GruppeModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
$this->_ci->GruppeModel->addOrder('sort');
$this->_ci->GruppeModel->addOrder('gruppe_kurzbz');
$where = [
'studiengang_kz' => $studiengang_kz,
'semester' => $semester,
'lehre' => true,
'sichtbar' => true,
'aktiv' => true,
'direktinskription' => false
];
if ($orgform_kurzbz !== null)
$where['orgform_kurzbz'] = $orgform_kurzbz;
$result = $this->_ci->GruppeModel->loadWhere($where);
return getData($result) ?: [];
}
public function verband($path_template, $studiengang_kz, $semester, $orgform_kurzbz = null)
{
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", verband) AS path", false);
$this->_ci->StudiengangModel->addSelect("CONCAT(
UPPER(CONCAT(typ, kurzbz)),
'-',
semester,
verband,
(
SELECT
CASE
WHEN bezeichnung IS NULL OR bezeichnung=''
THEN ''::TEXT
ELSE CONCAT(' (', bezeichnung, ')')
END
FROM public.tbl_lehrverband
WHERE studiengang_kz=v.studiengang_kz
AND semester=v.semester
AND verband=v.verband
ORDER BY gruppe
LIMIT 1
)
) AS name", false);
$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($semester) . ' AS semester');
$this->_ci->StudiengangModel->addSelect('verband');
$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
$this->_ci->StudiengangModel->addOrder('verband');
$this->_ci->StudiengangModel->addGroupBy('path, name, verband');
$where = [
'v.studiengang_kz' => $studiengang_kz,
'v.semester' => $semester,
'v.verband !=' => '',
'v.aktiv' => true
];
if ($orgform_kurzbz !== null && $semester) // NOTE(chris): on semester 0 show all?
$where['v.orgform_kurzbz'] = $orgform_kurzbz;
$result = $this->_ci->StudiengangModel->loadWhere($where);
return getData($result) ?: [];
}
public function verbandsgroup($path_template, $studiengang_kz, $semester, $verband, $orgform_kurzbz = null)
{
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
$this->_ci->StudiengangModel->addDistinct();
$this->_ci->StudiengangModel->addSelect("FORMAT(
" . $this->_ci->StudiengangModel->escape($path_template) . ",
gruppe
) AS path", false);
$this->_ci->StudiengangModel->addSelect("CONCAT(
UPPER(CONCAT(typ, kurzbz)),
'-',
semester,
verband,
gruppe,
(
SELECT
CASE
WHEN bezeichnung IS NULL OR bezeichnung=''
THEN ''::TEXT
ELSE CONCAT(' (', bezeichnung, ')')
END
FROM public.tbl_lehrverband
WHERE studiengang_kz=v.studiengang_kz
AND semester=v.semester
AND verband=v.verband
AND gruppe=v.gruppe
ORDER BY gruppe
LIMIT 1
)
) AS name", false);
$this->_ci->StudiengangModel->addSelect('v.semester');
$this->_ci->StudiengangModel->addSelect('v.verband');
$this->_ci->StudiengangModel->addSelect('gruppe');
$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
$this->_ci->StudiengangModel->addOrder('gruppe');
$where = [
'v.studiengang_kz' => $studiengang_kz,
'v.semester' => $semester,
'v.verband' => $verband,
'v.gruppe !=' => '',
'v.aktiv' => true
];
if ($orgform_kurzbz !== null && $semester) // NOTE(chris): on semester 0 show all?
$where['v.orgform_kurzbz'] = $orgform_kurzbz;
$result = $this->_ci->StudiengangModel->loadWhere($where);
return getData($result) ?: [];
}
public function orgform($path_template, $studiengang_kz)
{
$this->_ci->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
$this->_ci->StudienordnungModel->addDistinct();
$this->_ci->StudienordnungModel->addSelect("FORMAT(
" . $this->_ci->StudienordnungModel->escape($path_template) . ",
LOWER(p.orgform_kurzbz)
) AS path");
$this->_ci->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
$this->_ci->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
$this->_ci->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
$result = $this->_ci->StudienordnungModel->loadWhere([
'aktiv' => true,
'studiengang_kz' => $studiengang_kz,
'p.orgform_kurzbz !=' => 'DDP'
]);
return getData($result) ?: [];
}
public function studiensemester($path_template, $studiengang_kz)
{
$number_displayed_past_studiensemester = null;
$this->_ci->load->model('system/Variable_model', 'VariableModel');
$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
if (isError($result))
return [];
$data = getData($result);
if ($data && isset($data['number_displayed_past_studiensemester'])) {
$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'];
} else {
$this->_ci->load->config('stv');
$number_displayed_past_studiensemester = $this->_ci->config->item('number_displayed_past_studiensemester_default');
}
$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->_ci->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
$this->_ci->StudiensemesterModel->addSelect("studiensemester_kurzbz AS name");
$this->_ci->StudiensemesterModel->addSelect("FORMAT(
" . $this->_ci->StudiensemesterModel->escape($path_template) . ",
LOWER(studiensemester_kurzbz)
) AS path", false);
$this->_ci->StudiensemesterModel->addSelect($this->_ci->StudiensemesterModel->escape($studiengang_kz) . " AS stg_kz", false);
$this->_ci->StudiensemesterModel->addOrder('ende');
$result = $this->_ci->StudiensemesterModel->load();
return getData($result) ?: [];
}
}
@@ -0,0 +1,19 @@
let result = [];
let current;
<?php foreach ($snippets as $path) { ?>
current = (tabulatorcolumns => {
<?php $this->load->view($path); ?>
})(result);
if (current) {
if (Array.isArray(current))
result = result.concat(current);
else
result.push(current);
}
<?php } ?>
export default result;
@@ -0,0 +1,266 @@
return [
{
title: 'kurzbz',
titlePhrase: 'lehre/kurzbz',
field: "lv_kurzbz",
headerFilterFuncParams: { field: 'lv_kurzbz' },
headerFilter: true,
formatter(cell,
formatterParams) {
const rowData = cell.getRow().getData();
const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
const lvkurzbz = (cell.getValue()).toUpperCase();
const parentspan = document.createElement('span');
const span = document.createElement('span');
span.classList.add('lv_table_icon', `icon-${iconKey}`);
span.title = iconKey || 'LV-Teil';
parentspan.appendChild(span);
parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
return parentspan;
},
cellClick(e,
cell) {
cell.getRow().treeToggle();
}
},
{
title: 'Tags',
field: 'tags',
tooltip: false,
headerFilter: "input",
headerFilterFunc: "tagHeaderFilter",
headerFilterFuncParams: { field: 'tags' },
formatter: "tagFormatter",
width: 150,
},
{
title: 'lehrveranstaltung_id',
titlePhrase: 'lehre/lehrveranstaltung_id',
field: "lehrveranstaltung_id",
headerFilterFuncParams: { field: 'lehrveranstaltung_id' },
headerFilter: true,
visible: false
},
{
title: 'bezeichnung',
titlePhrase: 'ui/bezeichnung',
field: "lv_bezeichnung",
headerFilter: true,
headerFilterFuncParams: { field: 'lv_bezeichnung' }
},
{
title: 'bezeichnungeng',
titlePhrase: 'lehre/bezeichnungeng',
field: "lv_bezeichnung_english",
headerFilter: true,
headerFilterFuncParams: { field: 'lv_bezeichnung_english' },
visible: false
},
{
title: 'studiengangskennzahlLehre',
titlePhrase: 'lehre/studiengangskennzahlLehre',
field: "lv_studiengang_kz",
headerFilter: true,
headerFilterFuncParams: { field: 'lv_studiengang_kz' },
visible: false
},
{
title: 'studiengang',
titlePhrase: 'lehre/studiengang',
field: "studiengang",
headerFilter: true,
headerFilterFuncParams: { field: 'studiengang' },
visible: false
},
{
title: 'semester',
titlePhrase: 'lehre/semester',
field: "semester",
headerFilter: true,
headerFilterFuncParams: { field: 'semester' }
},
{
title: 'sprache',
titlePhrase: 'global/sprache',
field: "sprache",
headerFilter: true,
headerFilterFuncParams: { field: 'sprache' },
visible: false
},
{
title: 'ects',
titlePhrase: 'lehre/ects',
field: "lv_ects",
headerFilter: true,
headerFilterFuncParams: { field: 'lv_ects' },
visible: false
},
{
title: 'semesterstunden',
titlePhrase: 'lehre/semesterstunden',
field: "semesterstunden",
headerFilter: true,
headerFilterFuncParams: { field: 'semesterstunden' },
visible: false
},
{
title: 'anmerkung',
titlePhrase: 'global/anmerkung',
field: "anmerkung",
headerFilter: true,
headerFilterFuncParams: { field: 'anmerkung' },
visible: false
},
{
title: 'lehre',
titlePhrase: 'lehre/lehre',
field: "lehre",
headerFilter: true,
headerFilterFuncParams: { field: 'lehre' },
formatter: 'ja_nein',
visible: false
},
{
title: 'aktiv',
titlePhrase: 'person/aktiv',
field: "aktiv",
headerFilter: true,
headerFilterFuncParams: { field: 'aktiv' },
formatter: 'ja_nein',
visible: false
},
{
title: 'organisationsform',
titlePhrase: 'lehre/organisationsform',
field: "orgform_kurzbz",
headerFilter: true,
headerFilterFuncParams: { field: 'orgform_kurzbz' }
},
{
title: 'studienplan_id',
titlePhrase: 'ui/studienplan_id',
field: "studienplan_id",
headerFilter: true,
headerFilterFuncParams: { field: 'studienplan_id' },
visible: false
},
{
title: 'studienplan',
titlePhrase: 'lehre/studienplan',
field: "studienplan_bezeichnung",
headerFilter: true,
headerFilterFuncParams: { field: 'studienplan_bezeichnung' },
visible: false
},
{
title: 'lehrtyp',
titlePhrase: 'lehre/lehrtyp',
field: "lehrtyp_kurzbz",
headerFilter: true,
headerFilterFuncParams: { field: 'lehrtyp_kurzbz' },
visible: false
},
{
title: 'lehrform',
titlePhrase: 'lehre/lehrform',
field: "lehrform_kurzbz",
headerFilter: true,
headerFilterFuncParams: { field: 'lehrform_kurzbz'} },
{
title: 'leplanstunden',
titlePhrase: 'lehre/leplanstunden',
field: "le_planstunden",
headerFilter: true,
headerFilterFuncParams: { field: 'le_planstunden' },
visible: false
},
{
title: 'lehreinheit_id',
titlePhrase: 'lehre/lehreinheit_id',
field: "lehreinheit_id",
headerFilter: true,
headerFilterFuncParams: { field: 'lehreinheit_id' },
visible: false
},
{
title: 'studiensemester',
titlePhrase: 'lehre/studiensemester',
field: "studiensemester_kurzbz",
headerFilter: true,
headerFilterFuncParams: { field: 'studiensemester_kurzbz' },
visible: false
},
{
title: 'unr',
titlePhrase: 'lehre/unr',
field: "unr",
headerFilter: true,
headerFilterFuncParams: { field: 'unr' },
visible: false
},
{
title: 'organisationseinheit',
titlePhrase: 'lehre/organisationseinheit',
field: "fachbereich",
headerFilter: true,
headerFilterFuncParams: { field: 'fachbereich' },
visible: false
},
{
title: 'stundenblockung',
titlePhrase: 'lehre/stundenblockung',
field: "stundenblockung",
headerFilter: true,
headerFilterFuncParams: { field: 'stundenblockung' },
visible: false
},
{
title: 'wochenrhythmus',
titlePhrase: 'lehre/wochenrhythmus',
field: "wochenrythmus",
headerFilter: true,
headerFilterFuncParams: { field: 'wochenrythmus' },
visible: false
},
{
title: 'startkw',
titlePhrase: 'lehre/startkw',
field: "start_kw",
headerFilter: true,
headerFilterFuncParams: { field: 'startkw' },
visible: false
},
{
title: 'raumtyp',
titlePhrase: 'lehre/raumtyp',
field: "raumtyp",
headerFilter: true,
headerFilterFuncParams: { field: 'raumtyp' },
visible: false
},
{
title: 'raumtypalternativ',
titlePhrase: 'lehre/raumtypalternativ',
field: "raumtypalternativ",
headerFilter: true,
headerFilterFuncParams: { field: 'raumtypalternativ' },
visible: false
},
{
title: 'gruppen',
titlePhrase: 'lehre/gruppen',
field: "gruppen",
headerFilter: true,
headerFilterFuncParams: { field: 'gruppen'} },
{
title: 'lehrende',
titlePhrase: 'lehre/lehrende',
field: "lektoren",
headerFilter: true,
headerFilterFuncParams: { field: ['lektoren', 'vorname', 'nachname'] }
},
];
@@ -0,0 +1,343 @@
return [
{
title: "UID",
titlePhrase: 'person/uid',
field: "uid",
headerFilter: true
},
{
title: "TitelPre",
titlePhrase: 'person/titelpre',
field: "titelpre",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Nachname",
titlePhrase: 'person/nachname',
field: "nachname",
headerFilter: true
},
{
title: "Vorname",
titlePhrase: 'person/vorname',
field: "vorname",
headerFilter: true
},
{
title: "Wahlname",
titlePhrase: 'person/wahlname',
field: "wahlname",
visible: false,
headerFilter: true
},
{
title: "Vornamen",
titlePhrase: 'person/vornamen',
field: "vornamen",
visible: false,
headerFilter: true
},
{
title: "TitelPost",
titlePhrase: 'person/titelpost',
field: "titelpost",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Ersatzkennzeichen",
titlePhrase: 'person/ersatzkennzeichen',
field: "ersatzkennzeichen",
headerFilter: true
},
{
title: "Geburtsdatum",
titlePhrase: 'person/geburtsdatum',
field: "gebdatum",
formatter: 'datetime',
formatterParams: {
inputFormat: "iso",
outputFormat: "dd.MM.yyyy",
invalidPlaceholder: "&nbsp;",
timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
},
headerFilter: 'input',
headerFilterFunc: 'dateinput'
},
{
title: "Geschlecht",
titlePhrase: 'person/geschlecht',
field: "geschlecht",
headerFilter: "list",
headerFilterParams: {
values: {
'm': 'männlich',
'w': 'weiblich',
'x': 'divers',
'u': 'unbekannt'
},
listOnEmpty: true,
autocomplete: true
}
},
{
title: "Sem.",
titlePhrase: 'lehre/sem',
field: "semester",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Verb.",
titlePhrase: 'lehre/verb',
field: "verband",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Grp.",
titlePhrase: 'lehre/grp',
field: "gruppe",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Studiengang",
titlePhrase: 'lehre/studiengang',
field: "studiengang",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Studiengang_kz",
titlePhrase: 'lehre/studiengang_kz',
field: "studiengang_kz",
visible: false,
headerFilter: true
},
{
title: "Personenkennzeichen",
titlePhrase: 'person/personenkennzeichen',
field: "matrikelnr",
headerFilter: true
},
{
title: "PersonID",
titlePhrase: 'person/person_id',
field: "person_id",
headerFilter: true
},
{
title: "Status",
titlePhrase: 'global/status',
field: "status",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Status Datum",
titlePhrase: 'profilUpdate/statusDate',
field: "status_datum",
visible: false,
formatter: 'datetime',
formatterParams: {
inputFormat: "iso",
outputFormat: "dd.MM.yyyy",
invalidPlaceholder: "&nbsp;",
timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
}
},
{
title: "Status Bestaetigung",
titlePhrase: 'global/status_bestaetigung',
field: "status_bestaetigung",
visible: false,
formatter: 'datetime',
formatterParams: {
inputFormat: "iso",
outputFormat: "dd.MM.yyyy",
invalidPlaceholder: "&nbsp;",
timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
},
headerFilter: 'input',
headerFilterFunc: 'dateinput'
},
{
title: "EMail (Privat)",
titlePhrase: 'person/email_private',
field: "mail_privat",
visible: false,
headerFilter: true
},
{
title: "EMail (Intern)",
titlePhrase: 'person/email_intern',
field: "mail_intern",
visible: false,
headerFilter: true
},
{
title: "Anmerkungen",
titlePhrase: 'stv/notes_person',
field: "anmerkungen",
visible: false,
headerFilter: true
},
{
title: "AnmerkungPre",
titlePhrase: 'stv/notes_prestudent',
field: "anmerkung",
visible: false,
headerFilter: true
},
{
title: "OrgForm",
titlePhrase: 'lehre/orgform',
field: "orgform_kurzbz",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "Aufmerksamdurch",
titlePhrase: 'person/aufmerksamDurch',
field: "aufmerksamdurch_kurzbz",
visible: false
},
{
title: "Gesamtpunkte",
titlePhrase: 'admission/gesamtpunkte',
field: "punkte",
visible: false
},
{
title: "Aufnahmegruppe",
titlePhrase: 'stv/aufnahmegruppe_kurzbz',
field: "aufnahmegruppe_kurzbz",
visible: false
},
{
title: "Dual",
titlePhrase: 'lehre/dual_short',
field: "dual",
visible: false,
formatter: 'tickCross',
formatterParams: {
tickElement: '<i class="fas fa-check text-success"></i>',
crossElement: '<i class="fas fa-times text-danger"></i>'
},
headerFilter: "tickCross",
headerFilterParams: {
"tristate": true,
elementAttributes: {
"value": "true"
}
},
headerFilterEmptyCheck(value) {
return value === null
}
},
{
title: "Matrikelnummer",
titlePhrase: 'person/matrikelnummer',
field: "matr_nr",
visible: false,
headerFilter: true
},
{
title: "Studienplan",
titlePhrase: 'lehre/studienplan',
field: "studienplan_bezeichnung",
headerFilter: "list",
headerFilterParams: {
valuesLookup: true,
listOnEmpty: true,
autocomplete: true,
sort: "asc"
}
},
{
title: "PreStudentInnenID",
titlePhrase: 'ui/prestudent_id',
field: "prestudent_id",
headerFilter: true
},
{
title: "Priorität",
titlePhrase: 'lehre/prioritaet',
field: "priorisierung_relativ"
},
{
title: "Mentor",
titlePhrase: 'stv/mentor',
field: "mentor",
visible: false
},
{
title: "Aktiv",
titlePhrase: 'person/aktiv',
field: "bnaktiv",
visible: false,
formatter: 'tickCross',
formatterParams: {
allowEmpty: true,
tickElement: '<i class="fas fa-check text-success"></i>',
crossElement: '<i class="fas fa-times text-danger"></i>'
},
headerFilter: "tickCross",
headerFilterParams: {
"tristate": true,
elementAttributes: {
"value": "true"
}
},
headerFilterEmptyCheck(value) {
return value === null
}
},
{
title: "Unruly",
field: "unruly",
visible: false
}
];
+15
View File
@@ -29,5 +29,20 @@ export default {
url: 'api/frontend/v1/organisation/studiensemester/getAll',
params: { order, start }
};
},
current() {
return {
method: 'get',
url: 'api/frontend/v1/organisation/studiensemester/current'
};
},
set(studiensemester_kurzbz) {
return {
method: 'post',
url: 'api/frontend/v1/organisation/studiensemester/set',
params: {
studiensemester_kurzbz
}
};
}
};
+47
View File
@@ -0,0 +1,47 @@
/**
* Copyright (C) 2026 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
export default {
get(config, path = '') {
return {
method: 'get',
url: '/api/frontend/v1/treemenu/' + config + '/' + path
};
},
data(config, path = '') {
return {
method: 'get',
url: '/api/frontend/v1/treemenudata/' + config + '/' + path
};
},
// TODO(chris): handle favorites per config
favorites: {
get(config) {
return {
method: 'get',
url: 'api/frontend/v1/favorites/get/' + config
};
},
set(config, favorites) {
return {
method: 'post',
url: 'api/frontend/v1/favorites/set/' + config,
params: { favorites }
};
}
}
};
+6 -67
View File
@@ -12,74 +12,13 @@ const router = VueRouter.createRouter({
component: LVVerwaltung
},
{
name: `byEmp`,
path: `/emp/:studiensemester_kurzbz/:emp/:stg?/:semester?`,
name: 'stdsem',
path: '/stdsem/:stdsem',
component: LVVerwaltung,
props: route => {
let {emp, stg, semester, studiensemester_kurzbz} = route.params;
if (emp === '')
emp = undefined;
if (stg === '')
stg = undefined;
if (studiensemester_kurzbz === '')
studiensemester_kurzbz = undefined;
return {
studiensemester_kurzbz: studiensemester_kurzbz,
emp: emp,
stg: stg,
semester: semester
};
},
beforeEnter: (to, from, next) => {
const { studiensemester_kurzbz } = to.params;
const isSemester = /^(SS|WS)\d{4}$/.test(studiensemester_kurzbz);
if (!isSemester)
return next({ path: '/' });
else
next();
}
},
/*{
name: `byFachbereich`,
path: `/fachbereich/:fachbereich/:emp?`,
component: LVVerwaltung
},*/
{
name: `byStg`,
path: '/stg/:studiensemester_kurzbz/:stg?/:semester?/',
component: LVVerwaltung,
props: route => {
let { studiensemester_kurzbz, stg, semester } = route.params;
if (semester === '')
semester = undefined;
if (studiensemester_kurzbz === '')
studiensemester_kurzbz = undefined;
if (stg === '')
stg = undefined;
return {
studiensemester_kurzbz: studiensemester_kurzbz,
stg: stg,
semester: semester,
};
},
beforeEnter: (to, from, next) => {
const studiensemester_kurzbz = to.params?.studiensemester_kurzbz
const isSemester = /^(SS|WS)\d{4}$/.test(studiensemester_kurzbz);
if (!isSemester)
return next({ path: '/' });
else
next();
}
children: [
{ name: 'emp', path: 'emp/:emp/:treemenu(.*)*' },
{ name: 'treemenu', path: ':treemenu(.*)*' }
]
},
{
path: '/:pathMatch(.*)*',
+24 -160
View File
@@ -24,167 +24,26 @@ import PluginsPhrasen from "../plugins/Phrasen.js";
const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
const router = VueRouter.createRouter({
history: VueRouter.createWebHistory(),
history: VueRouter.createWebHistory('/' + ciPath),
routes: [
{
name: 'index',
path: `/${ciPath}/studentenverwaltung`,
component: FhcStudentenverwaltung
},
{
name: 'studiensemester',
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz`,
path: '/studvw',
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
children: [
{
name: 'stdsem',
path: 'stdsem/:stdsem',
children: [
{ name: 'search', path: 'search/:query' },
{ name: 'searchtypes', path: 'search/:types/:query' },
{ name: 'prestudent', path: 'prestudent/:prestudent_id' },
{ name: 'student', path: 'student/:student_uid' },
{ name: 'person', path: 'person/:person_id' },
{ name: 'treemenu', path: ':treemenu(.*)*' }
]
}
next();
}
},
{
name: 'studiengang',
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/:studiengang`,
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_studiengang: route.params.studiengang,
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
const isStudiengang = /^[A-Z]{3}/.test(to.params.studiengang);
if (!isStudiengang) {
return next({
name: 'studiensemester',
params: {
studiensemester_kurzbz: to.params.studiensemester_kurzbz
}
});
}
next();
}
},
{
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id`,
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'prestudent',
url_prestudent_id: route.params.prestudent_id
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
},
{
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id/:tab`,
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'prestudent',
url_prestudent_id: route.params.prestudent_id,
url_tab: route.params.tab
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
},
{
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/student/:id`,
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'student',
url_student_id: route.params.id
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
},
{
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/person/:person_id`,
component: FhcStudentenverwaltung,
props: (route) => {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'person',
url_prestudent_id: route.params.person_id
};
},
beforeEnter: (to, from, next) => {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
},
{
name: 'search',
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/search/:searchstr`,
component: FhcStudentenverwaltung,
props(route) {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'search',
url_prestudent_id: route.params.searchstr
};
},
beforeEnter(to, from, next) {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
},
{
name: 'search_w_types',
path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/search/:types/:searchstr`,
component: FhcStudentenverwaltung,
props(route) {
return {
url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
url_mode: 'search',
url_prestudent_id: route.params.type + '/' + route.params.searchstr
};
},
beforeEnter(to, from, next) {
const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
if (!isSemester) {
return next({name: 'index'});
}
next();
}
]
},
{
path: '/:pathMatch(.*)*',
@@ -197,11 +56,16 @@ const router = VueRouter.createRouter({
router.afterEach((to, from, failure) => {
let title = 'Studierendenverwaltung FH-Complete';
if (to.params.studiengang) {
title = to.params.studiengang + ' ' + title;
if (to.params.treemenu) {
const index = to.params.treemenu.findIndex(
(e, i) => i%2 == 0 && e == 'stg'
);
if (index >= 0) {
title = to.params.treemenu[index + 1].toUpperCase() + ' ' + title;
}
}
if (to.params.studiensemester_kurzbz) {
title = to.params.studiensemester_kurzbz + ' ' + title;
if (to.params.stdsem) {
title = to.params.stdsem.toUpperCase() + ' ' + title;
}
document.title = title;
});
+363
View File
@@ -0,0 +1,363 @@
import TreemenuEntry from './Treemenu/Entry.js';
import dragClick from '../../directives/dragClick.js';
import ApiTreemenu from '../../api/factory/treemenu.js';
export default {
components: {
PvTreetable: primevue.treetable,
PvColumn: primevue.column,
TreemenuEntry
},
directives: {
dragClick
},
emits: [
'selectEntry',
'drop'
],
props: {
config: {
type: String,
required: true,
},
preselectedKey: {
type: Array,
default: null
}
},
data() {
return {
loading: true,
nodes: [],
selectedKey: [],
expandedKeys: {},
filters: {}, // TODO(chris): filter only 1st level?
favorites: {on: false, list: []}
}
},
computed: {
filteredNodes() {
if (this.favorites.on)
return this.nodes.filter(node => this.favorites.list.includes(node.data.path));
return this.nodes;
}
},
watch: {
preselectedKey(newVal, oldVal) {
if (newVal !== oldVal) {
this.setPreselection();
}
}
},
methods: {
reloadNodesWithProp(prop, nodes = undefined) {
if (!nodes)
nodes = this.nodes;
nodes.forEach(node => {
if (node.data[prop]) {
// reload
delete node.children;
this.onExpandTreeNode(node);
} else if (node.children) {
this.reloadNodesWithProp(prop, node.children);
}
});
},
findNodeByKey(key, arr) {
if (!arr)
arr = this.nodes;
let res = arr.filter(n => n.key == key);
if (res.length)
return res.pop();
res = arr.map(n => n.children ? this.findNodeByKey(key, n.children) : null).filter(a => a);
if (res.length)
return res.pop();
return null;
},
async onExpandTreeNode(node) {
if (!node.children) {
if (node.data.path) {
/**
* NOTE(chris): activeEl is for keyboard navigation to
* prevent the focus jumping down to the next parent
* instead of the current submenu entry (which is not yet
* loaded)
*/
let activeEl = null;
this.$nextTick(() => {
this.$nextTick(() => {
activeEl = document.activeElement;
});
});
this.loading = true;
return this.$api
.call(ApiTreemenu.get(this.config, node.data.path))
.then(result => {
const subNodes = result.data.map(this.mapResultToTreeData);
const realNode = this.findNodeByKey(node.key);
if (realNode)
realNode.children = subNodes;
else
node.children = subNodes; // NOTE(chris): fallback should never be the case
this.$nextTick(() => {
if (activeEl != document.activeElement)
return;
let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
if (!treeitem)
return;
treeitem = treeitem.closest('[role="row"]');
if (!treeitem)
return;
treeitem.dispatchEvent(new KeyboardEvent('keydown', {
code: 'ArrowDown',
key: 'ArrowDown'
}));
});
this.loading = false;
})
.catch(this.$fhcAlert.handleSystemError);
}
}
},
onSelectTreeNode(node) {
this.$emit('selectEntry', node.data);
},
mapNodesToNoSemReloadNodes(result, node) {
if (node.data.no_sem_reload)
result.push(node);
if (node.children)
result = node.children.reduce(this.mapNodesToNoSemReloadNodes, result);
return result;
},
mapResultToTreeData(el) {
const cp = {
key: ("" + el.path).replace(/\//g, '-'),
data: el,
label: el.name // TODO(chris): phrase
};
if (el.children)
cp.children = el.children.map(this.mapResultToTreeData);
else
cp.leaf = el.leaf || false;
return cp;
},
async setPreselection()
{
if (!this.preselectedKey || !this.preselectedKey.length)
{
this.selectedKey = null;
return;
}
if (!this.preselectedKey || !Array.isArray(this.preselectedKey))
return;
// [1, 2, 3, 4, ...] => ['1-2', '3-4', ...]
const parts = this.preselectedKey.reduce((r, c, i, a) => (i%2 && r.push(a[i-1] + '-' + c), r), []);
let currentKey = parts[0];
let currentNode = this.findNodeByKey(currentKey);
if (!currentNode)
return;
if(this.selectedKey)
{
const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
if (currentSelectedKey) {
if (currentSelectedKey == currentKey)
return;
/**
* Do not select a new entry if the current is a child of the new one.
* This happens if a child entry of a new stg is selected and the router
* tries to select the stg root entry (because subtrees do not have
* routes yet)
*/
const isChild = this.findNodeByKey(
currentSelectedKey,
currentNode.children || []
);
if (isChild)
return;
}
}
for (let i = 1; i < parts.length; i++)
{
this.expandedKeys[currentNode.key] = true;
await this.onExpandTreeNode(currentNode);
currentKey += '-' + parts[i];
currentNode = this.findNodeByKey(currentKey);
if (!currentNode)
{
return;
}
}
this.selectedKey = {[currentNode.key]: true};
this.onSelectTreeNode(currentNode);
},
async toggleTreeNode(node) {
if (this.expandedKeys[node.key]) {
delete this.expandedKeys[node.key];
} else if (!node.leaf) {
await this.onExpandTreeNode(node);
this.expandedKeys[node.key] = true;
}
},
filterFav() {
this.favorites.on = !this.favorites.on;
this.$api
.call(ApiTreemenu.favorites.set(
this.config,
JSON.stringify(this.favorites)
));
},
markFav(key) {
let index = this.favorites.list.indexOf(key.data.path + '');
if (index != -1) {
this.favorites.list.splice(index, 1);
} else {
this.favorites.list.push(key.data.path + '');
}
this.$api
.call(ApiTreemenu.favorites.set(
this.config,
JSON.stringify(this.favorites)
));
},
unsetFavFocus(e) {
if (e.target.dataset?.linkFavAdd !== undefined) {
e.target.tabIndex = -1;
} else {
let items = e.target.querySelectorAll('[data-link-fav-add]:not([tabindex="-1"])');
items.forEach(el => el.tabIndex = document.activeElement == el ? 0 : -1);
}
},
setFavFocus(e) {
if (e.target.dataset?.linkFavAdd !== undefined) {
e.target.tabIndex = 0;
} else {
let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
items.forEach(el => el.tabIndex = 0);
}
}
},
mounted() {
this.$api
.call(ApiTreemenu.get(this.config))
.then(result => {
this.nodes = result.data.map(el => {
el.root = true;
return this.mapResultToTreeData(el);
});
this.setPreselection();
this.loading = false;
})
.catch(this.$fhcAlert.handleSystemError);
this.$api
.call(ApiTreemenu.favorites.get(this.config))
.then(result => {
if (result.data) {
this.favorites = JSON.parse(result.data);
}
})
.catch(this.$fhcAlert.handleSystemError);
},
template: /* html */`
<pv-treetable
ref="tree"
v-model:expanded-keys="expandedKeys"
v-model:selection-keys="selectedKey"
class="menu p-treetable-sm"
:value="filteredNodes"
selection-mode="single"
scrollable
scroll-height="flex"
:filters="filters"
@node-expand="onExpandTreeNode"
@node-select="onSelectTreeNode"
@focusin="setFavFocus"
@focusout="unsetFavFocus"
>
<pv-column
field="name"
expander
class="text-break"
>
<template #header>
<div class="text-right">
<div class="p-input-icon-left">
<i class="pi pi-search"></i>
<input
type="text"
v-model="filters['global']"
class="form-control ps-5"
placeholder="Search"
>
</div>
</div>
</template>
<template #body="{ node }">
<treemenu-entry
:node="node"
:data-tree-item-key="node.key"
v-drag-click="() => toggleTreeNode(node)"
@drop="$emit('drop', $event)"
/>
</template>
</pv-column>
<pv-column
field="fav"
class="flex-shrink-0 flex-grow-0"
header-class="flex-shrink-0 flex-grow-0"
>
<template #header>
<a
v-if="favorites.on || favorites.list.length"
href="#"
@click.prevent="filterFav"
>
<i
:class="favorites.on ? 'fa-solid' : 'fa-regular'"
class="fa-star"
></i>
</a>
</template>
<template #body="{ node }">
<a
v-if="node.data.root"
href="#"
tabindex="-1"
data-link-fav-add
@click.prevent="markFav(node)"
@keydown.enter.stop.prevent="markFav(node)"
>
<i
:class="favorites.list.includes(node.data.path + '') ? 'fa-solid' : 'fa-regular'"
class="fa-star"
></i>
</a>
</template>
</pv-column>
<pv-column field="search" class="d-none"></pv-column>
</pv-treetable>`
};
@@ -0,0 +1,63 @@
import drop from '../../../directives/drop.js';
import draggable from '../../../directives/draggable.js';
export default {
directives: {
drop,
draggable
},
emits: [
'drop'
],
props: {
node: {
type: Object,
required: true
}
},
computed: {
name() {
if (Array.isArray(this.node.data.name))
return this.$p.t(this.node.data.name);
return this.node.data.name;
},
title() {
if (!this.node.data.title)
return this.name;
if (Array.isArray(this.node.data.title))
return this.$p.t(this.node.data.title);
return this.node.data.title;
},
dropConfig() {
if (!this.node.data?.droplink)
return null;
const allowed = [ ...this.node.data.droplink ];
const effect = allowed.shift();
return { effect, allowed };
},
dragConfig() {
if (!this.node.data?.draggable)
return null;
let config = [ ...this.node.data.draggable ];
const effect = config.shift();
const value = JSON.parse(config.shift());
return { effect, value };
}
},
template: /* html */`
<span
class="treemenu-entry d-flex align-items-center w-100 h-100"
:title="title"
v-drop:[dropConfig]="(evt, data) => $emit('drop', { drop: node.data, drag: data })"
v-draggable:[dragConfig?.effect]="dragConfig?.value"
>
{{ name }}
</span>`
};
@@ -433,7 +433,6 @@ export default {
:label="$p.t('wawi/ausgegebenam')"
name="ausgegebenam"
v-model="formData.ausgegebenam"
model-type="yyyy-MM-dd"
auto-apply
:enable-time-picker="false"
text-input
@@ -450,7 +449,6 @@ export default {
:label="$p.t('wawi/retouram')"
name="retouram"
v-model="formData.retouram"
model-type="yyyy-MM-dd"
auto-apply
:enable-time-picker="false"
text-input
@@ -551,7 +551,6 @@ export default {
container-class="mb-3 col-3"
type="DatePicker"
v-model="formData.datum_von"
model-type="yyyy-MM-dd"
name="datum_von"
:label="$p.t('ui/from') + ' *'"
auto-apply
@@ -567,7 +566,6 @@ export default {
container-class="mb-3 col-3"
type="DatePicker"
v-model="formData.datum_bis"
model-type="yyyy-MM-dd"
name="datum_bis"
:label="$p.t('global/bis')"
auto-apply
+106 -112
View File
@@ -1,7 +1,7 @@
import CoreSearchbar from "../searchbar/searchbar.js";
import VerticalSplit from "../verticalsplit/verticalsplit.js";
import AppMenu from "../AppMenu.js";
import StvVerband from "../Stv/Studentenverwaltung/Verband.js";
import BaseTreemenu from '../Base/Treemenu.js';
import StvStudiensemester from "../Stv/Studentenverwaltung/Studiensemester.js";
import LvTable from "./Setup/Table.js";
import LvTabs from "./Setup/Tabs.js";
@@ -19,7 +19,7 @@ export default {
CoreSearchbar,
VerticalSplit,
AppMenu,
StvVerband,
BaseTreemenu,
StvStudiensemester,
LvTable,
LvTabs,
@@ -29,12 +29,7 @@ export default {
lvRoot: String,
permissions: Object,
config: Object,
stg: { type: String, required: false },
semester: { type: [Number, String], required: false, default: null },
studiensemester_kurzbz: { type: String, required: false, default: null },
emp: { type: String, required: false, default: null }
},
provide() {
return {
currentSemester: Vue.computed(() => this.selectedStudiensemester),
@@ -50,32 +45,12 @@ export default {
permissionLektorEntfernen: this.permissions['lv-plan/lektorentfernen'],
}
},
mounted() {
this.updateFilter();
},
watch: {
stg() {
this.updateFilter();
},
semester() {
this.updateFilter();
},
selectedStudiensemester() {
this.updateFilter();
},
emp() {
this.updateFilter();
},
studiensemester_kurzbz(newVal) {
this.selectedStudiensemester = newVal ?? this.defaultSemester;
}
},
data() {
return {
selected: [],
studiengang: "",
filter: {},
selectedStudiensemester: this.studiensemester_kurzbz ?? this.defaultSemester,
//filter: {},
selectedStudiensemester: this.defaultSemester,
endpoint: ApiStudiengangTree,
dropdowns: {
studiensemester_array: [],
@@ -83,7 +58,7 @@ export default {
lehrform_array: [],
raumtyp_array: [],
},
selectedStudiengang: '',
//selectedStudiengang: '',
searchbaroptions: {
origin: 'lvverwaltung',
cssclass: "position-relative",
@@ -107,106 +82,119 @@ export default {
},
}
},
methods: {
updateFilter()
{
const filter = {
stg: this.stg,
emp: this.emp,
semester: this.semester,
studiensemester_kurzbz: this.selectedStudiensemester,
activeFilter: this.emp ? 'employee' : this.stg ? 'verband' : null
computed: {
filter() {
let filter = {
emp: this.$route.params.emp,
studiensemester_kurzbz: this.selectedStudiensemester
}
if (this.stg !== undefined)
{
this.selectedStudiengang = this.semester !== '' && this.semester
? `${this.stg}/${this.semester}`
: this.stg;
let index;
if (this.$route.params.treemenu) {
index = this.$route.params.treemenu.indexOf('stg');
if (index > -1)
filter.stg = this.$route.params.treemenu[index+1];
index = this.$route.params.treemenu.indexOf('semester');
if (index > -1)
filter.semester = this.$route.params.treemenu[index+1];
}
else
{
this.selectedStudiengang = '';
}
this.filter = filter;
},
filter.activeFilter = filter.emp ? 'employee' : filter.stg ? 'verband' : null;
return filter;
}
},
methods: {
handleRowClicked(data)
{
this.selected = data
},
onSelectEmployee(emp)
{
const { stg, semester } = this.filter;
let studiensemester_kurzbz = this.selectedStudiensemester;
const params = { emp };
if (stg)
params.stg = stg;
if (semester !== null)
params.semester = semester;
if (studiensemester_kurzbz)
params.studiensemester_kurzbz = studiensemester_kurzbz;
this.$router.push({ name: 'byEmp', params })
this.$router.push({
name: 'emp',
params: {
...this.$route.params,
emp
}
});
},
onSelectVerband({link})
onSelectVerband({ path: link })
{
let stg = null;
let semester = null;
let studiensemester_kurzbz = this.selectedStudiensemester;
if (typeof link === 'number')
stg = link;
else if (typeof link === 'string')
{
[stg, semester] = link.split('/');
}
const routeName = this.filter.emp ? 'byEmp' : 'byStg';
const params = { stg };
params.semester = '';
if (semester !== null)
params.semester = semester;
if (studiensemester_kurzbz)
params.studiensemester_kurzbz = studiensemester_kurzbz;
if (this.filter.emp)
params.emp = this.filter.emp;
this.$router.push({ name: routeName, params });
this.$router.push({
name: this.$route.name == 'emp' ? 'emp' : 'treemenu',
params: {
...this.$route.params,
treemenu: link.split('/')
}
});
this.selected = [];
},
resetEmployeeFilter()
{
const newParams = { ...this.filter, activeFilter: 'verband' };
if (newParams.stg === '')
this.$router.replace({ name: 'index' });
else
{
delete newParams.emp;
this.$router.replace({ name: 'byStg', params: newParams });
}
let params = { ...this.$route.params };
delete params.emp;
this.$router.replace({
name: params.treemenu ? 'treemenu' : 'stdsem',
params
});
},
resetStgFilter()
{
const newParams = { ...this.filter, activeFilter: 'emp' };
delete newParams.stg;
this.selectedStudiengang = '';
this.$router.replace({ name: 'byEmp', params: newParams });
let params = { ...this.$route.params };
let index = params.treemenu.indexOf('stg');
if (index > -1)
params.treemenu = params.treemenu.slice(0, index);
if (params.treemenu.length) {
this.$router.replace({
params: {
treemenu: params.treemenu
}
});
} else {
delete params.treemenu;
this.$router.replace({
name: params.emp ? 'emp' : 'stdsem',
params
});
}
},
searchfunction(params) {
return this.$api.call(ApiSearchbar.search(params));
searchfunction(params, config) {
return this.$api.call(ApiSearchbar.search(params), config);
},
studiensemesterChanged(newValue) {
const routeName = this.filter.activeFilter === 'employee' ? 'byEmp' : 'byStg';
const newParams = {...this.filter, studiensemester_kurzbz: newValue};
this.$router.push({ name: routeName, params: newParams });
studiensemesterChanged(stdsem) {
if (!stdsem) {
// no valid studiensemester in url
this.$router.replace({
params: {
stdsem: this.defaultSemester.toLowerCase()
}
});
return;
}
if (stdsem.toLowerCase() != this.selectedStudiensemester?.toLowerCase()) {
this.$router.push({
params: {
stdsem: stdsem.toLowerCase()
}
});
}
this.selectedStudiensemester = stdsem;
this.selected = [];
},
}
},
created() {
if (!this.$route.params.stdsem) {
this.$router.replace({
name: 'stdsem',
params: {
stdsem: this.defaultSemester.toLowerCase()
}
});
}
this.$p.loadCategory(['lehre', 'person', 'global'])
this.$api.call(ApiDetails.getStudiensemester())
@@ -239,7 +227,6 @@ export default {
})
.catch(this.$fhcAlert.handleSystemError);
},
template: /* html */`
<div class="stv">
<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
@@ -268,7 +255,7 @@ export default {
>
<span class="fa-solid fa-table-list"></span>
</button>
<core-searchbar :searchoptions="searchbaroptions" :searchfunction=searchfunction class="searchbar w-100"></core-searchbar>
<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
</header>
<div class="container-fluid overflow-hidden">
<div class="row h-100">
@@ -285,8 +272,15 @@ export default {
<div class="offcanvas-header justify-content-end px-1 d-md-none">
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
</div>
<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
<!--stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband-->
<div class="overflow-auto col h-0">
<base-treemenu
config="lvv"
:preselected-key="$route.params.treemenu"
@select-entry="onSelectVerband"
></base-treemenu>
</div>
<stv-studiensemester :studiensemester-kurzbz="$route.params.stdsem || defaultSemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
</nav>
<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
@@ -307,7 +301,7 @@ export default {
<i class="fa fa-xmark"></i>
</button>
<template v-if="filter.stg">
| Stg: {{ filter.stg }}
| Stg: {{ filter.stg.toUpperCase() }}
<button type="button"
class="btn btn-outline-secondary btn-action btn-sm ms-1"
:title="$p.t('ui', 'filterdelete')"
@@ -10,6 +10,9 @@ import { addTagInTable, deleteTagInTable, updateTagInTable } from "../../../../j
import ApiLv from "../../../api/lehrveranstaltung.js";
import ApiTag from "../../../api/lehrveranstaltung/tag.js";
import ApiLehreinheit from "../../../api/lehrveranstaltung/lehreinheit.js";
import ApiTreemenu from "../../../api/factory/treemenu.js";
import LvvColumns from '../../../../../index.ci.php/js/tabulatorcolumns/lvverwaltung';
export default {
name: "LVVerwaltungTable",
@@ -122,7 +125,7 @@ export default {
ajaxRequestFunc: async (url, config, params) => {
let realUrl = this.buildApiUrl();
if (realUrl)
return this.$api.call(ApiLv.getTable(this.buildApiUrl()));
return this.$api.call(this.buildApiUrl());
},
ajaxResponse: (url, params, response) => { return response?.data || [] },
dataTree: true,
@@ -190,91 +193,21 @@ export default {
];
},
columns: [
{
title: this.$p.t('lehre', 'kurzbz'),
field: "lv_kurzbz",
headerFilterFuncParams: {field: 'lv_kurzbz'},
headerFilter: true,
formatter: (cell, formatterParams) => {
const rowData = cell.getRow().getData();
const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
const lvkurzbz = (cell.getValue()).toUpperCase();
const parentspan = document.createElement('span');
const span = document.createElement('span');
span.classList.add('lv_table_icon', `icon-${iconKey}`);
span.title = iconKey || 'LV-Teil';
parentspan.appendChild(span);
parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
return parentspan
},
cellClick: (e, cell) => {
cell.getRow().treeToggle();
}
},
{
title: 'Tags',
field: 'tags',
tooltip: false,
headerFilter: "input",
headerFilterFunc: tagHeaderFilter,
headerFilterFuncParams: {field: 'tags'},
formatter: (cell) => tagFormatter(cell, this.$refs.tagComponent),
width: 150,
},
{
title: this.$p.t('lehre', 'lehrveranstaltung_id'),
field: "lehrveranstaltung_id",
headerFilterFuncParams: {field: 'lehrveranstaltung_id'},
headerFilter: true,
visible: false
},
{title: this.$p.t('ui', 'bezeichnung'), field: "lv_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung'}},
{title: this.$p.t('lehre', 'bezeichnungeng'), field: "lv_bezeichnung_english", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung_english'}, visible: false},
{
title: this.$p.t('lehre', 'studiengangskennzahlLehre'),
field: "lv_studiengang_kz",
headerFilter: true,
headerFilterFuncParams: {field: 'lv_studiengang_kz'},
visible: false
},
{title: this.$p.t('lehre', 'studiengang'), field: "studiengang", headerFilter: true, headerFilterFuncParams: {field: 'studiengang'}, visible: false},
{title: this.$p.t('lehre', 'semester'), field: "semester", headerFilter: true, headerFilterFuncParams: {field: 'semester'}},
{title: this.$p.t('global', 'sprache'), field: "sprache", headerFilter: true, headerFilterFuncParams: {field: 'sprache'}, visible: false},
{title: this.$p.t('lehre', 'ects'), field: "lv_ects", headerFilter: true, headerFilterFuncParams: {field: 'lv_ects'}, visible: false},
{title: this.$p.t('lehre', 'semesterstunden'), field: "semesterstunden", headerFilter: true, headerFilterFuncParams: {field: 'semesterstunden'}, visible: false},
{title: this.$p.t('global', 'anmerkung'), field: "anmerkung", headerFilter: true, headerFilterFuncParams: {field: 'anmerkung'}, visible: false},
{title: this.$p.t('lehre', 'lehre'), field: "lehre", headerFilter: true, headerFilterFuncParams: {field: 'lehre'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
{title: this.$p.t('person', 'aktiv'), field: "aktiv", headerFilter: true, headerFilterFuncParams: {field: 'aktiv'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
{title: this.$p.t('lehre', 'organisationsform'), field: "orgform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'orgform_kurzbz'}},
{title: this.$p.t('ui', 'studienplan_id'), field: "studienplan_id", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_id'}, visible: false},
{title: this.$p.t('lehre', 'studienplan'), field: "studienplan_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_bezeichnung'}, visible: false},
{title: this.$p.t('lehre', 'lehrtyp'), field: "lehrtyp_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrtyp_kurzbz'}, visible: false},
{title: this.$p.t('lehre', 'lehrform'), field: "lehrform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrform_kurzbz'}},
{title: this.$p.t('lehre', 'leplanstunden'), field: "le_planstunden", headerFilter: true, headerFilterFuncParams: {field: 'le_planstunden'}, visible: false},
{title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}, visible: false},
{title: this.$p.t('lehre', 'studiensemester'), field: "studiensemester_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'studiensemester_kurzbz'}, visible: false},
{title: this.$p.t('lehre', 'unr'), field: "unr", headerFilter: true, headerFilterFuncParams: {field: 'unr'}, visible: false},
{title: this.$p.t('lehre', 'organisationseinheit'), field: "fachbereich", headerFilter: true, headerFilterFuncParams: {field: 'fachbereich'}, visible: false},
{title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}, visible: false},
{title: this.$p.t('lehre', 'wochenrhythmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}, visible: false},
{title: this.$p.t('lehre', 'startkw'), field: "start_kw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}, visible: false},
{title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}, visible: false},
{title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}, visible: false},
{title: this.$p.t('lehre', 'gruppen'), field: "gruppen", headerFilter: true, headerFilterFuncParams: {field: 'gruppen'}},
{title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: ['lektoren', 'vorname', 'nachname']}},
],
columns: LvvColumns,
locale: true
}
}
},
created() {
Tabulator.extendModule("format", "formatters", {
tagHeaderFilter,
tagFormatter: cell => tagFormatter(cell, this.$refs.tagComponent),
ja_nein: cell => cell.getValue()
? this.toUpperCase(this.$p.t('ui', 'ja'))
: this.toUpperCase(this.$p.t('ui', 'nein'))
});
},
mounted() {
if (this.shouldAutoLoad())
{
@@ -295,7 +228,8 @@ export default {
if (this.shouldAutoLoad)
{
this.$refs.table.reloadTable();
if (this.$refs.table.tabulator)
this.$refs.table.reloadTable();
}
},
rowSelectionChanged(data) {
@@ -335,17 +269,20 @@ export default {
},
buildApiUrl()
{
if (this.filter.activeFilter === 'employee' && this.filter.emp)
{
const { emp, stg, studiensemester_kurzbz } = this.filter;
return this.$api.getUri(ApiLv.getByEmp(studiensemester_kurzbz, emp, stg));
if (!['emp', 'treemenu'].includes(this.$route.name))
return null;
let url = 'stdsem/' + this.$route.params.stdsem + '/';
if (this.$route.params.emp) {
url += 'emp/' + this.$route.params.emp;
}
if (this.filter.activeFilter === 'verband' && this.filter.stg)
{
const { stg, semester, studiensemester_kurzbz } = this.filter;
return this.$api.getUri(ApiLv.getByStg(studiensemester_kurzbz, stg, semester));
if (this.$route.params.treemenu) {
url += this.$route.params.treemenu.join('/');
}
return ApiTreemenu.data('lvverwaltung', url);
},
resetEmployeeFilter()
{
+77 -160
View File
@@ -26,6 +26,7 @@ import StvDetails from "./Studentenverwaltung/Details.js";
import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
import ApiSearchbar from "../../api/factory/searchbar.js";
import ApiTreemenu from "../../api/factory/treemenu.js";
import ApiStv from "../../api/factory/stv.js";
import ApiStvVerband from '../../api/factory/stv/verband.js';
import ApiStvConfig from '../../api/factory/stv/config.js';
@@ -52,12 +53,7 @@ export default {
cisRoot: String,
avatarUrl: String,
logoutUrl: String,
activeAddons: String, // semicolon separated list of active addons
url_studiensemester_kurzbz: String,
url_mode: String,
url_prestudent_id: String,
url_tab: String,
url_studiengang: String
activeAddons: String // semicolon separated list of active addons
},
provide() {
return {
@@ -140,7 +136,6 @@ export default {
mergeResults: 'person'
},
studiengangKz: undefined,
studiengangKuerzel: '',
studiensemesterKurzbz: this.defaultSemester,
selected_semester: undefined,
selected_orgform: undefined,
@@ -192,34 +187,52 @@ export default {
}
return extraItems;
},
listEndpoint() {
if (['index', 'stdsem'].includes(this.$route.name))
return null;
if (this.$route.params.query) {
return ApiStv.students.search({
searchstr: this.$route.params.query,
types: this.$route.params.types?.split('+') || []
}, this.$route.params.stdsem);
}
let url = 'stdsem/' + this.$route.params.stdsem + '/';
if (this.$route.params.treemenu) {
url += this.$route.params.treemenu.join('/');
return ApiTreemenu.data('stv', url);
}
const paramName = Object.keys(this.$route.params).find(k => k != 'stdsem');
if (paramName) {
url += this.$route.name + '/' + this.$route.params[paramName];
return ApiTreemenu.data('stv', url);
}
return null;
},
studiengangKuerzel() {
if (!this.lists?.stgs)
return '';
const stg = this.lists.stgs
.find(stg => stg.studiengang_kz == this.studiengangKz);
if (stg)
return (stg.typ + stg.kurzbz).toUpperCase();
return '';
}
},
watch: {
'url_studiensemester_kurzbz': function (newVal, oldVal) {
if (newVal !== oldVal) {
this.studiensemesterKurzbz = newVal;
if(this.$route.name === 'search')
{
this.handleSearchUrl();
}
else
{
this.$refs.stvList.updateUrl();
this.$refs.details.reload();
}
listEndpoint(n, o) {
if (n != o) {
this.$refs.stvList.updateUrl(n || []);
}
},
'url_studiengang': function (newVal, oldVal) {
if (newVal !== oldVal) {
this.checkUrlStudiengang();
}
},
'url_mode': function () {
this.handlePersonUrl();
},
url_prestudent_id() {
this.handlePersonUrl();
},
'appconfig.font_size'() {
// add to html class
const classList = Object.keys(this.$refs.config.setup.font_size.options);
@@ -272,160 +285,66 @@ export default {
);
},
onSelectVerband({ link, studiengang_kz, semester, orgform_kurzbz }) {
let urlpath = String(link);
if (!urlpath.match(/\/prestudent/))
{
urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
}
this.$refs.stvList.updateUrl(ApiStv.students.verband(urlpath));
this.studiengangKz = studiengang_kz;
this.selected_semester = semester;
this.selected_orgform = orgform_kurzbz;
const stg = this.lists.stgs.find((element) => {
return (element.studiengang_kz === this.studiengangKz);
});
if (stg)
{
this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase()
this.$router.push({
name: 'studiengang',
params: {
studiensemester_kurzbz: this.studiensemesterKurzbz,
studiengang: this.studiengangKuerzel
}
});
} else
{
this.studiengangKuerzel = '';
this.$router.push({
name: 'studiensemester',
params: {
studiensemester_kurzbz: this.studiensemesterKurzbz
}
});
}
},
studiensemesterChanged(v) {
this.studiensemesterKurzbz = v;
this.$router.push({
name: 'treemenu',
params: {
studiensemester_kurzbz: v
treemenu: link.split('/')
}
});
},
studiensemesterChanged(stdsem) {
if (!stdsem) {
// no valid studiensemester in url
this.$router.replace({
params: {
stdsem: this.defaultSemester.toLowerCase()
}
});
return;
}
if (stdsem.toLowerCase() != this.studiensemesterKurzbz?.toLowerCase()) {
this.$router.push({
params: {
stdsem: stdsem.toLowerCase()
}
});
}
this.studiensemesterKurzbz = stdsem;
},
reloadList() {
this.$refs.stvList.reload();
},
searchfunction(params, config) {
return this.$api.call(ApiSearchbar.searchStv(params), config);
},
handlePersonUrl() {
if (this.$route.params.id) {
this.$refs.stvList.updateUrl(
ApiStv.students.uid(this.$route.params.id, 'CURRENT_SEMESTER'),
true
);
} else if (this.$route.params.prestudent_id) {
this.$refs.stvList.updateUrl(
ApiStv.students.prestudent(this.$route.params.prestudent_id, 'CURRENT_SEMESTER'),
true
);
} else if (this.$route.params.person_id) {
this.$refs.stvList.updateUrl(
ApiStv.students.person(this.$route.params.person_id, 'CURRENT_SEMESTER'),
true
);
} else if (this.$route.params.searchstr) {
this.handleSearchUrl();
}
else
{
this.clearTabulator();
}
},
handleSearchUrl() {
const searchsettings = {
searchstr: this.$route.params.searchstr,
types: this.$route.params.types?.split('+') || []
};
// init into student list
this.$refs.stvList.updateUrl(
ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
);
// init into searchbar
this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
this.$refs.searchbar.searchsettings.types = searchsettings.types;
this.$nextTick(this.blurSearchbar);
},
clearTabulator() {
if(['index', 'studiensemester'].includes(this.$route.name))
{
if(this.$refs?.stvList?.$refs?.table?.tabulator)
{
this.$refs.stvList.$refs.table.tabulator.setData([]);
}
}
},
checkUrlStudiengang() {
if (this.url_studiengang) {
const stg = this.lists.stgs.find((element) => {
const kuerzel = (element.typ + element.kurzbz).toUpperCase();
return (this.url_studiengang === kuerzel);
});
if (stg) {
this.studiengangKz = stg.studiengang_kz;
this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
} else {
this.$router.replace({
name: 'studiensemester',
params: {
studiensemester_kurzbz: this.studiensemesterKurzbz
}
});
}
}
else
{
this.studiengangKz = undefined;
this.studiengangKuerzel = '';
this.clearTabulator();
}
},
onSearch(e) {
this.deleteCustomFilter();
const searchsettings = { ...this.$refs.searchbar.searchsettings };
if (searchsettings.searchstr.length >= 2) {
this.blurSearchbar();
this.deleteCustomFilter();
if (!searchsettings.types.length || searchsettings.types.length == this.$refs.searchbar.types.length) {
this.$router.push({
name: 'search',
params: {
studiensemester_kurzbz: this.studiensemesterKurzbz,
searchstr: searchsettings.searchstr
query: searchsettings.searchstr
}
});
} else {
this.$router.push({
name: 'search_w_types',
name: 'searchtypes',
params: {
studiensemester_kurzbz: this.studiensemesterKurzbz,
searchstr: searchsettings.searchstr,
query: searchsettings.searchstr,
types: searchsettings.types.join('+')
}
});
}
}
},
blurSearchbar() {
this.$refs.searchbar.$refs.input.blur();
this.$refs.searchbar.abort();
this.$refs.searchbar.hideresult();
},
handleCustomFilter(filter){
this.filter = filter;
},
@@ -434,15 +353,13 @@ export default {
}
},
created() {
if (!this.url_studiensemester_kurzbz) {
if (!this.$route.params.stdsem) {
this.$router.replace({
name: 'studiensemester',
name: 'stdsem',
params: {
studiensemester_kurzbz: this.defaultSemester
stdsem: this.defaultSemester.toLowerCase()
}
});
} else {
this.studiensemesterKurzbz = this.url_studiensemester_kurzbz;
}
this.$api
@@ -478,7 +395,6 @@ export default {
.then(result => {
this.lists.stgs = result.data;
this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
this.checkUrlStudiengang();
})
.catch(this.$fhcAlert.handleSystemError);
@@ -505,7 +421,8 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
},
mounted() {
this.handlePersonUrl();
if (this.listEndpoint)
this.$refs.stvList.updateUrl(this.listEndpoint);
},
template: /* html */`
<div class="stv" :class="{ 'sidebar-collapsed': sidebarCollapsed }">
@@ -636,13 +553,13 @@ export default {
<div class="offcanvas-header justify-content-end px-1 d-md-none">
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
</div>
<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
<stv-verband :preselected-key="$route.params.treemenu" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
<stv-studiensemester :studiensemester-kurzbz="$route.params.stdsem || defaultSemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
</nav>
<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
<vertical-split>
<template #top>
<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filter-active="handleCustomFilter"></stv-list>
</template>
<template #bottom>
<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
@@ -470,7 +470,6 @@ export default {
:label="$p.t('admission', 'anmeldundRtAm')"
type="DatePicker"
v-model="formData.anmeldedatum"
model-type="yyyy-MM-dd"
auto-apply
:enable-time-picker="false"
text-input
@@ -293,7 +293,6 @@ export default {
:label="$p.t('person', 'geburtsdatum')"
type="DatePicker"
v-model="data.gebdatum"
model-type="yyyy-MM-dd"
name="gebdatum"
:clearable="false"
no-today
@@ -103,7 +103,6 @@ export default {
<form-input
type="DatePicker"
v-model="formData.nachgereicht_am"
model-type="yyyy-MM-dd"
name="nachgereicht_am"
:label="$p.t('dokumente/nachreichungAm')"
auto-apply
@@ -467,7 +467,6 @@ export default {
:label="$p.t('ui', 'von')"
type="DatePicker"
v-model="formData.von"
model-type="yyyy-MM-dd"
auto-apply
:enable-time-picker="false"
text-input
@@ -502,7 +501,6 @@ export default {
:label="$p.t('global', 'bis')"
type="DatePicker"
v-model="formData.bis"
model-type="yyyy-MM-dd"
auto-apply
:enable-time-picker="false"
text-input
@@ -276,7 +276,6 @@ export default{
container-class="mb-3"
type="DatePicker"
v-model="formData.datum"
model-type="yyyy-MM-dd"
name="datum"
:label="$p.t('global/datum')"
auto-apply
@@ -292,7 +291,6 @@ export default{
container-class="mb-3"
type="DatePicker"
v-model="formData.bestaetigtam"
model-type="yyyy-MM-dd"
name="bestaetigtam"
:label="$p.t('lehre/bestaetigt_am')"
auto-apply
@@ -308,14 +306,13 @@ export default{
container-class="mb-3"
type="DatePicker"
v-model="formData.bewerbung_abgeschicktamum"
model-type="yyyy-MM-dd HH:mm:ss"
name="bewerbung_abgeschicktamum"
:label="$p.t('lehre/bewerbung_abgeschickt_am')"
auto-apply
:enable-time-picker="true"
format="dd.MM.yyyy HH:mm:ss"
:enable-time-picker="false"
format="dd.MM.yyyy"
text-input
preview-format="dd.MM.yyyy HH:mm:ss"
preview-format="dd.MM.yyyy"
:teleport="true"
:disabled="bisLocked || !hasPrestudentstatusPermission"
>
@@ -12,6 +12,11 @@ import { capitalize } from '../../../helpers/StringHelpers.js';
import draggable from '../../../directives/draggable.js';
import StvColumns from '../../../../../index.ci.php/js/tabulatorcolumns/stv';
import ModuleFilterFilters from '../../../tabulator/filter/filters.js';
Tabulator.extendModule("filter", "filters", ModuleFilterFilters);
export default {
name: "ListPrestudents",
components: {
@@ -51,92 +56,10 @@ export default {
'filterActive'
],
data() {
function dateFormatter(cell)
{
let val = cell.getValue();
if (!val)
return '&nbsp;';
let date = new Date(val);
return date.toLocaleDateString('de-AT', {
"day": "2-digit",
"month": "2-digit",
"year": "numeric"
});
}
return {
tabulatorOptions: {
columns:[
{title:"UID", field:"uid", headerFilter: true},
{title:"TitelPre", field:"titelpre", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Nachname", field:"nachname", headerFilter: true},
{title:"Vorname", field:"vorname", headerFilter: true},
{title:"Wahlname", field:"wahlname", visible:false, headerFilter: true},
{title:"Vornamen", field:"vornamen", visible:false, headerFilter: true},
{title:"TitelPost", field:"titelpost", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Ersatzkennzeichen", field:"ersatzkennzeichen", headerFilter: true},
{
title: "Geburtsdatum",
field: "gebdatum",
formatter: dateFormatter,
headerFilter: true,
headerFilterFunc(headerValue, rowValue) {
const matches = headerValue.match(/^(([0-9]{2})\.)?([0-9]{2})\.([0-9]{4})?$/);
let comparestr = headerValue;
if(matches !== null) {
const year = (matches[4] !== undefined) ? matches[4] : '';
const month = matches[3];
const day = (matches[2] !== undefined) ? matches[2] : '';
comparestr = year + '-' + month + '-' + day;
}
return rowValue.match(comparestr);
}
},
{title:"Geschlecht", field:"geschlecht", headerFilter: "list", headerFilterParams: {values:{'m':'männlich','w':'weiblich','x':'divers','u':'unbekannt'}, listOnEmpty:true, autocomplete:true}},
{title:"Sem.", field:"semester", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Verb.", field:"verband", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Grp.", field:"gruppe", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Studiengang", field:"studiengang", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Studiengang_kz", field:"studiengang_kz", visible:false, headerFilter: true},
{title:"Personenkennzeichen", field:"matrikelnr", headerFilter: true},
{title:"PersonID", field:"person_id", headerFilter: true},
{title:"Status", field:"status", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Status Datum", field:"status_datum", visible:false, formatter:dateFormatter},
{title:"Status Bestaetigung", field:"status_bestaetigung", visible:false, formatter:dateFormatter, headerFilter: true},
{title:"EMail (Privat)", field:"mail_privat", visible:false, headerFilter: true},
{title:"EMail (Intern)", field:"mail_intern", visible:false, headerFilter: true},
{title:"Anmerkungen", field:"anmerkungen", visible:false, headerFilter: true},
{title:"AnmerkungPre", field:"anmerkung", visible:false, headerFilter: true},
{title:"OrgForm", field:"orgform_kurzbz", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"Aufmerksamdurch", field:"aufmerksamdurch_kurzbz", visible:false},
{title:"Gesamtpunkte", field:"punkte", visible:false},
{title:"Aufnahmegruppe", field:"aufnahmegruppe_kurzbz", visible:false},
{title:"Dual", field:"dual", visible:false,
formatter:'tickCross', formatterParams: {
tickElement: '<i class="fas fa-check text-success"></i>',
crossElement: '<i class="fas fa-times text-danger"></i>'
},
headerFilter:"tickCross", headerFilterParams: {
"tristate":true, elementAttributes:{"value":"true"}
}, headerFilterEmptyCheck:function(value){return value === null}
},
{title:"Matrikelnummer", field:"matr_nr", visible:false, headerFilter: true},
{title:"Studienplan", field:"studienplan_bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
{title:"PreStudentInnenID", field:"prestudent_id", headerFilter: true},
{title:"Priorität", field:"priorisierung_relativ"},
{title:"Mentor", field:"mentor", visible:false},
{title:"Aktiv", field:"bnaktiv", visible:false,
formatter:'tickCross', formatterParams: {
allowEmpty:true,
tickElement: '<i class="fas fa-check text-success"></i>',
crossElement: '<i class="fas fa-times text-danger"></i>'
},
headerFilter:"tickCross", headerFilterParams: {
"tristate":true, elementAttributes:{"value":"true"}
}, headerFilterEmptyCheck:function(value){return value === null}
},
{title:"Unruly", field:"unruly", visible:false},
],
columns: StvColumns,
locale: true,
rowFormatter(row) {
if (row.getData().bnaktiv === false) {
row.getElement().classList.add('text-black','text-opacity-50','fst-italic');
@@ -292,7 +215,7 @@ export default {
return "StudentList_" + today + ".csv";
},
},
created: function() {
created() {
if(this.tagsEnabled) {
const coltags = {
title: 'Tags',
@@ -307,84 +230,7 @@ export default {
this.tabulatorOptions.columns.splice(2, 0, coltags);
}
},
watch: {
'$p.user_language.value'(n, o) {
if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
this.translateTabulator();
}
}
},
methods: {
translateTabulator() {
this.$p
.loadCategory(['global', 'person', 'lehre', 'ui', 'profilUpdate', 'admission', 'stv'])
.then(() => {
const translations = {
uid: capitalize(this.$p.t('person/uid')),
titelpre: capitalize(this.$p.t('person/titelpre')),
nachname: capitalize(this.$p.t('person/nachname')),
vorname: capitalize(this.$p.t('person/vorname')),
wahlname: capitalize(this.$p.t('person/wahlname')),
vornamen: capitalize(this.$p.t('person/vornamen')),
titelpost: capitalize(this.$p.t('person/titelpost')),
ersatzkennzeichen: capitalize(this.$p.t('person/ersatzkennzeichen')),
gebdatum: capitalize(this.$p.t('person/geburtsdatum')),
geschlecht: capitalize(this.$p.t('person/geschlecht')),
semester: capitalize(this.$p.t('lehre/sem')),
verband: capitalize(this.$p.t('lehre/verb')),
gruppe: capitalize(this.$p.t('lehre/grp')),
studiengang: capitalize(this.$p.t('lehre/studiengang')),
studiengang_kz: capitalize(this.$p.t('lehre/studiengang_kz')),
matrikelnr: capitalize(this.$p.t('person/personenkennzeichen')),
person_id: capitalize(this.$p.t('person/person_id')),
status: capitalize(this.$p.t('global/status')),
status_datum: capitalize(this.$p.t('profilUpdate/statusDate')),
status_bestaetigung: capitalize(this.$p.t('global/status_bestaetigung')),
mail_privat: capitalize(this.$p.t('person/email_private')),
mail_intern: capitalize(this.$p.t('person/email_intern')),
anmerkungen: capitalize(this.$p.t('stv/notes_person')),
anmerkung: capitalize(this.$p.t('stv/notes_prestudent')),
orgform_kurzbz: capitalize(this.$p.t('lehre/orgform')),
aufmerksamdurch_kurzbz: capitalize(this.$p.t('person/aufmerksamDurch')),
punkte: capitalize(this.$p.t('admission/gesamtpunkte')),
aufnahmegruppe_kurzbz: capitalize(this.$p.t('stv/aufnahmegruppe_kurzbz')),
dual: capitalize(this.$p.t('lehre/dual_short')),
matr_nr: capitalize(this.$p.t('person/matrikelnummer')),
studienplan_bezeichnung: capitalize(this.$p.t('lehre/studienplan')),
prestudent_id: capitalize(this.$p.t('ui/prestudent_id')),
priorisierung_relativ: capitalize(this.$p.t('lehre/prioritaet')),
mentor: capitalize(this.$p.t('stv/mentor')),
bnaktiv: capitalize(this.$p.t('person/aktiv'))
};
/** NOTE(chris):
* use this approach because updateDefinition
* on the Tabulator columns is way slower and
* freezes up the GUI.
*/
// Overwrite definition for column show/hide
this.$refs.table.tabulator.getColumns().forEach(col => {
const trans = translations[col.getField()];
if (!trans)
return;
col.getDefinition().title = trans;
});
// Overwrite node in dom
this.$refs.table.tabulator.element
.querySelectorAll('.tabulator-col[tabulator-field]')
.forEach(el => {
const field = el.getAttribute('tabulator-field');
if (!translations[field])
return;
const title = el.querySelector('.tabulator-col-title');
if (!title)
return;
title.innerText = translations[field];
});
});
},
reload() {
this.$refs.table.reloadTable();
},
@@ -622,7 +468,6 @@ export default {
new-btn-show
:new-btn-label="$p.t('stv/action_new')"
@click:new="actionNewPrestudent"
@table-built="translateTabulator"
:useSelectionSpan="false"
@headerFilterOn="handleHeaderFilter"
>
@@ -285,7 +285,6 @@ export default {
uid="stv-list-new-gebdatum"
name="gebdatum"
v-model="formDataPerson['gebdatum']"
model-type="yyyy-MM-dd"
:disabled="!!person"
@update:model-value="loadSuggestions"
text-input
@@ -1,4 +1,4 @@
import {CoreRESTClient} from '../../../RESTClient.js';
import ApiStudiensemester from '../../../api/factory/studiensemester.js';
export default {
emits: [
@@ -18,6 +18,11 @@ export default {
today: -1
};
},
computed: {
lowerCaseList() {
return this.list.map(i => i.toLowerCase());
}
},
methods: {
set(n) {
this.loading = true;
@@ -47,25 +52,18 @@ export default {
}
this.loading = true;
CoreRESTClient
.get('components/stv/studiensemester/now')
.then(result => CoreRESTClient.getData(result.data))
this.$api
.call(ApiStudiensemester.current())
.then(result => {
this.today = this.list.indexOf(result);
if (this.today >= 0) {
if (this.today != this.current)
this.set(this.today);
} else {
// TODO(chris): handle error (list might not be loaded yet)
}
this.today = this.list.indexOf(result.data);
if (this.today >= 0 && this.today != this.current)
this.set(this.today);
})
.catch(this.$fhcAlert.handleSystemError);
},
save(fallback) {
CoreRESTClient
.post('components/stv/studiensemester/set', {
studiensemester: this.list[this.current]
})
this.$api
.call(ApiStudiensemester.set(this.list[this.current]))
.then(() => {
this.loading = false;
this.$emit('update:studiensemesterKurzbz', this.list[this.current]);
@@ -73,27 +71,42 @@ export default {
.catch(error => {
this.current = fallback;
this.loading = false;
this.$fhcAlert.handleFormValidation(error);
this.$fhcAlert.handleSystemError(error);
});
},
index() {
let index = this.list.indexOf(this.studiensemesterKurzbz);
if (index >= 0)
return index;
// check if input is lower cases (because it came from an url)
index = this.lowerCaseList.indexOf(this.studiensemesterKurzbz);
if (index >= 0) {
this.$emit('update:studiensemesterKurzbz', this.list[index]);
return index;
}
this.$emit('update:studiensemesterKurzbz', null);
return -1;
}
},
watch: {
'studiensemesterKurzbz': function () {
this.current = this.list.indexOf(this.studiensemesterKurzbz);
studiensemesterKurzbz() {
if (!this.loading)
this.current = this.index(this.studiensemesterKurzbz);
}
},
created() {
CoreRESTClient
.get('components/stv/studiensemester')
.then(result => CoreRESTClient.getData(result.data) || [])
this.$api
.call(ApiStudiensemester.getAll())
.then(result => {
this.list = result.map(el => el.studiensemester_kurzbz);
this.list = result.data.map(el => el.studiensemester_kurzbz);
this.loading = false;
this.current = this.list.indexOf(this.studiensemesterKurzbz);
this.current = this.index(this.studiensemesterKurzbz);
})
.catch(this.$fhcAlert.handleSystemError);
},
template: `
template: /* html */`
<div class="stv-studiensemester">
<div class="btn-toolbar w-100 dropup" role="toolbar" aria-label="Studiensemester">
<div class="btn-group flex-grow-1 position-static" role="group" aria-label="Studiensemester einstellen">
@@ -1,17 +1,11 @@
import drop from '../../../directives/drop.js';
import dragClick from '../../../directives/dragClick.js';
import BaseTreemenu from '../../Base/Treemenu.js';
import ApiStvGroups from '../../../api/factory/stv/group.js';
import ApiStvDetails from '../../../api/factory/stv/details.js';
export default {
components: {
PvTreetable: primevue.treetable,
PvColumn: primevue.column
},
directives: {
drop,
dragClick
BaseTreemenu
},
inject: {
$reloadList: {
@@ -33,230 +27,22 @@ export default {
'selectVerband'
],
props: {
endpoint: {
type: Object,
required: true,
},
preselectedKey: {
type: String,
type: Array,
default: null
}
},
data() {
return {
loading: true,
nodes: [],
selectedKey: [],
expandedKeys: {},
filters: {}, // TODO(chris): filter only 1st level?
favorites: {on: false, list: []}
}
},
computed: {
filteredNodes() {
if (this.favorites.on)
return this.nodes.filter(node => this.favorites.list.includes(node.key));
return this.nodes;
},
noSemReloadNodes() {
return this.nodes.reduce(this.mapNodesToNoSemReloadNodes, []);
}
},
watch: {
'preselectedKey': function (newVal, oldVal) {
if (newVal !== oldVal) {
this.setPreselection();
}
},
'appConfig.number_displayed_past_studiensemester'(newVal, oldVal) {
if (oldVal !== undefined) {
this.noSemReloadNodes.forEach(node => {
delete node.children;
this.onExpandTreeNode(node);
});
if (oldVal !== undefined && this.$refs.menu) {
this.$refs.menu.reloadNodesWithProp('no_sem_reload');
}
}
},
methods: {
findNodeByKey(key, arr) {
if (!arr)
arr = this.nodes;
let res = arr.filter(n => n.key == key);
if (res.length)
return res.pop();
res = arr.map(n => n.children ? this.findNodeByKey(key, n.children) : null).filter(a => a);
if (res.length)
return res.pop();
return null;
},
async onExpandTreeNode(node) {
if (!node.children) {
if (node.data.link) {
let activeEl = null;
this.$nextTick(() => {
this.$nextTick(() => {
activeEl = document.activeElement;
});
});
this.loading = true;
return this.$api
.call(this.endpoint.get(node.data.link))
.then(result => result.data)
.then(result => {
const subNodes = result.map(this.mapResultToTreeData);
const realNode = this.findNodeByKey(node.key);
if (realNode)
realNode.children = subNodes;
else
node.children = subNodes; // NOTE(chris): fallback should never be the case
let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
treeitem = treeitem.closest('[role="row"]');
this.$nextTick(() => {
if (activeEl == document.activeElement)
treeitem.dispatchEvent(new KeyboardEvent('keydown', {
code: 'ArrowDown',
key: 'ArrowDown'
}));
});
this.loading = false;
})
.catch(this.$fhcAlert.handleSystemError);
}
}
},
onSelectTreeNode(node) {
if (node.data.link)
this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz, semester: node.data.semester, orgform_kurzbz: node.data.orgform_kurzbz});
},
mapNodesToNoSemReloadNodes(result, node) {
if (node.data.no_sem_reload)
result.push(node);
if (node.children)
result = node.children.reduce(this.mapNodesToNoSemReloadNodes, result);
return result;
},
mapResultToTreeData(el) {
const cp = {
key: ("" + el.link).replace('/', '-'),
data: el,
label: el.name
};
if (el.children)
cp.children = el.children.map(this.mapResultToTreeData);
else
cp.leaf = el.leaf || false;
return cp;
},
filterFav() {
this.favorites.on = !this.favorites.on;
this.$api
.call(this.endpoint.favorites.set(
JSON.stringify(this.favorites)
));
},
markFav(key) {
let index = this.favorites.list.indexOf(key.data.link + '');
if (index != -1) {
this.favorites.list.splice(index, 1);
} else {
this.favorites.list.push(key.data.link + '');
}
this.$api
.call(this.endpoint.favorites.set(
JSON.stringify(this.favorites)
));
},
unsetFavFocus(e) {
if (e.target.dataset?.linkFavAdd !== undefined) {
e.target.tabIndex = -1;
} else {
let items = e.target.querySelectorAll('[data-link-fav-add]:not([tabindex="-1"])');
items.forEach(el => el.tabIndex = document.activeElement == el ? 0 : -1);
}
},
setFavFocus(e) {
if (e.target.dataset?.linkFavAdd !== undefined) {
e.target.tabIndex = 0;
} else {
let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
items.forEach(el => el.tabIndex = 0);
}
},
async setPreselection()
{
if (!this.preselectedKey)
{
this.selectedKey = null;
return;
}
let rawKey = this.preselectedKey
if (!rawKey || typeof rawKey !== 'string')
return;
const parts = this.preselectedKey.split('/');
let currentKey = parts[0];
let currentNode = this.findNodeByKey(currentKey);
if (!currentNode)
return;
if(this.selectedKey)
{
const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
if (currentSelectedKey) {
if (currentSelectedKey == currentKey)
return;
/**
* Do not select a new entry if the current is a child of the new one.
* This happens if a child entry of a new stg is selected and the router
* tries to select the stg root entry (because subtrees do not have
* routes yet)
*/
const isChild = this.findNodeByKey(
currentSelectedKey,
currentNode.children || []
);
if (isChild)
return;
}
}
for (let i = 1; i < parts.length; i++)
{
this.expandedKeys[currentNode.key] = true;
await this.onExpandTreeNode(currentNode);
currentKey += '-' + parts[i];
currentNode = this.findNodeByKey(currentKey);
if (!currentNode)
{
return;
}
}
this.selectedKey = {[currentNode.key]: true};
this.onSelectTreeNode(currentNode);
},
async toggleTreeNode(node) {
if (this.expandedKeys[node.key]) {
delete this.expandedKeys[node.key];
} else if (!node.leaf) {
await this.onExpandTreeNode(node);
this.expandedKeys[node.key] = true;
}
if (node.path)
this.$emit('selectVerband', {link: node.path, studiengang_kz: node.stg_kz, semester: node.semester, orgform_kurzbz: node.orgform_kurzbz});
},
getStudentAjaxId(student) {
let res = student.id;
@@ -264,23 +50,22 @@ export default {
res += ' (' + student.vorname + ' ' + student.nachname + ')';
return res;
},
dropStudents(node, students) {
const data = node.data;
onDrop({ drag, drop }) {
let endpoint;
if (data.gruppe_kurzbz) {
endpoint = students.map(student => [
if (drop.gruppe_kurzbz) {
endpoint = drag.map(student => [
this.getStudentAjaxId(student),
ApiStvGroups.add(
student.id,
data.gruppe_kurzbz,
drop.gruppe_kurzbz,
this.currentSemester
)
]);
} else {
const { semester, verband, gruppe } = data;
const { semester, verband, gruppe } = drop;
const params = { semester, verband, gruppe };
endpoint = students.map(student => [
endpoint = drag.map(student => [
this.getStudentAjaxId(student),
ApiStvDetails.saveStudent(
student.id,
@@ -296,117 +81,14 @@ export default {
.catch(this.$fhcAlert.handleSystemError);
}
},
mounted() {
this.$api
.call(this.endpoint.get())
.then(result => {
this.nodes = result.data.map(el => {
el.root = true;
return this.mapResultToTreeData(el);
});
this.setPreselection();
this.loading = false;
})
.catch(this.$fhcAlert.handleSystemError);
this.$api
.call(this.endpoint.favorites.get())
.then(result => {
if (result.data) {
this.favorites = JSON.parse(result.data);
}
})
.catch(this.$fhcAlert.handleSystemError);
},
template: /* html */`
<div class="overflow-auto" tabindex="-1">
<pv-treetable
ref="tree"
class="stv-verband p-treetable-sm"
:value="filteredNodes"
@node-expand="onExpandTreeNode"
selection-mode="single"
v-model:expanded-keys="expandedKeys"
v-model:selection-keys="selectedKey"
@node-select="onSelectTreeNode"
scrollable
scroll-height="flex"
@focusin="setFavFocus"
@focusout="unsetFavFocus"
:filters="filters"
>
<pv-column
field="name"
expander
class="text-break"
>
<template #header>
<div class="text-right">
<div class="p-input-icon-left">
<i class="pi pi-search"></i>
<input
type="text"
v-model="filters['global']"
class="form-control ps-5"
placeholder="Search"
>
</div>
</div>
</template>
<template #body="{ node }">
<span
v-if="['semester', 'verband', 'gruppe', 'gruppe_kurzbz'].some(key => node.data.hasOwnProperty(key))"
:data-tree-item-key="node.key"
:title="node.data.studiengang_kz"
v-drag-click="() => toggleTreeNode(node)"
v-drop:link-strict.student-collection="(evt, students) => dropStudents(node, students)"
>
{{ node.data.name }}
</span>
<span
v-else
:data-tree-item-key="node.key"
:title="node.data.studiengang_kz"
v-drag-click="() => toggleTreeNode(node)"
>
{{ node.data.name }}
</span>
</template>
</pv-column>
<pv-column
field="fav"
class="flex-shrink-0 flex-grow-0"
header-class="flex-shrink-0 flex-grow-0"
>
<template #header>
<a
v-if="favorites.on || favorites.list.length"
href="#"
@click.prevent="filterFav"
>
<i
:class="favorites.on ? 'fa-solid' : 'fa-regular'"
class="fa-star"
></i>
</a>
</template>
<template #body="{ node }">
<a
v-if="node.data.root"
href="#"
tabindex="-1"
data-link-fav-add
@click.prevent="markFav(node)"
@keydown.enter.stop.prevent="markFav(node)"
>
<i
:class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'"
class="fa-star"
></i>
</a>
</template>
</pv-column>
<pv-column field="studiengang_kz" class="d-none"></pv-column>
</pv-treetable>
<base-treemenu
ref="menu"
config="stv"
:preselected-key="preselectedKey"
@select-entry="onSelectTreeNode"
@drop="onDrop"
/>
</div>`
};
+19 -2
View File
@@ -28,7 +28,7 @@ export default {
// i.e: for dragging multiple elements
// otherwise set draggable attribute
if (!binding.modifiers.capture) {
el.draggable = true;
updateAttributes(el);
}
const bcc = new BroadcastChannel('fhc-dnd');
@@ -78,11 +78,21 @@ export default {
el.fhcDraggableCleanup = () => {
el.removeEventListener('dragstart', onStart, binding.modifiers.capture);
el.removeEventListener('dragend', onEnd, true);
if (el.dataset.fhcDraggableValue) {
delete el.dataset.fhcDraggableValue;
}
if (el.dataset.fhcEffectAllowed) {
delete el.dataset.fhcEffectAllowed;
}
updateAttributes(el);
};
},
updated(el, binding) {
updateValue(el, binding.value);
updateEffectAllowed(el, binding.arg);
if (!binding.modifiers.capture) {
updateAttributes(el);
}
},
beforeUnmount(el) {
el.fhcDraggableCleanup();
@@ -92,7 +102,8 @@ export default {
// Helper functions
function updateValue(el, value) {
value = convertToValidDragObject(value);
if (value)
value = convertToValidDragObject(value);
if (value) {
el.dataset.fhcDraggableValue = JSON.stringify(value);
} else if (el.dataset.fhcDraggableValue) {
@@ -106,3 +117,9 @@ function updateEffectAllowed(el, effectAllowed) {
delete el.dataset.fhcEffectAllowed;
}
}
function updateAttributes(el) {
if (el.dataset.fhcEffectAllowed && el.dataset.fhcDraggableValue)
el.draggable = true;
else if (el.hasAttribute('draggable'))
el.removeAttribute('draggable');
}
+20
View File
@@ -16,6 +16,26 @@ const EFFECTS = [
export default {
mounted(el, binding) {
if (!binding.arg) {
binding.arg = 'none';
} else if (typeof binding.arg === 'object' && !Array.isArray(binding.arg)) {
// NOTE(chris): allow object as arg and map it to arg and
// modifiers to allow dynamic modifiers.
if (binding.arg.allowed) {
binding.modifiers = binding.arg.allowed.reduce((a, c) => {
a[c] = true;
return a;
}, {});
}
if (!binding.arg.effect)
binding.arg.effect = 'none';
if (binding.arg.strict)
binding.arg = binding.arg.effect + '-strict';
else
binding.arg = binding.arg.effect;
}
const allowedTypes = Object.keys(binding.modifiers);
allowedTypes.forEach(type => {
if (type.substr(-11) == '-collection') {
+54
View File
@@ -0,0 +1,54 @@
function dateinput(headerValue, rowValue, rowData, config) {
if (!luxon)
return this.like(headerValue, rowValue, rowData, config);
let inputFormat = config.inputFormat || 'iso';
let outputFormat = config.outputFormat || 'dd.MM.yyyy';
let value;
if (inputFormat == 'iso')
value = luxon.DateTime.fromISO(rowValue);
else
value = luxon.DateTime.fromFormat(rowValue, inputFormat);
let range = [];
range = headerValue.split(' - ');
if (range.length == 1) {
range = headerValue.split('-');
}
if (range.length == 2) {
range = range.map(r => {
r = r.trim();
if (r) {
let d = luxon.DateTime.fromFormat(r, outputFormat);
if (!d.isValid && inputFormat != 'iso' && inputFormat != outputFormat)
d = luxon.DateTime.fromFormat(r, inputFormat);
if (!d.isValid)
d = luxon.DateTime.fromISO(r);
if (d.isValid)
return d;
}
return null;
});
if (!range[0] && !range[1])
return true;
else if (!range[0])
return this['<='](range[1], value, rowData, config);
else if (!range[1])
return this['>='](range[0], value, rowData, config);
let smaller = this['<='](range[1], value, rowData, config);
let bigger = this['>='](range[0], value, rowData, config);
return smaller && bigger;
}
// fallback
return this.like(headerValue, value.toFormat(outputFormat), rowData, config);
}
export {
dateinput
};
export default {
dateinput
};
+1
View File
@@ -98,6 +98,7 @@ require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
require_once('dbupdate_3.4/76160_lvv_favorites.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -0,0 +1,16 @@
<?php
if (!defined('DB_NAME')) exit('No direct script access allowed');
// Add new name type in public.tbl_variablenname
if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'lvv_favorites';"))
{
if ($db->db_num_rows($result) == 0)
{
$qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('lvv_favorites', null);";
if (!$db->db_query($qry))
echo '<strong>public.tbl_variablenname '.$db->db_last_error().'</strong><br>';
else
echo 'public.tbl_variablenname: Added name "lvv_favorites"<br>';
}
}