diff --git a/application/config/routes.php b/application/config/routes.php
index eba6688ff..3ed3c8323 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -64,6 +64,9 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
$route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
$route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
$route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
+//Routes for Lvplan Verband and page for dropdown Stg/Semester/Verband/Gruppe
+$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
+$route['Cis/OverviewLvPlan/.*'] = 'Cis/OverviewLvPlan/index/$1';
// Studierendenverwaltung List Routes
$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
diff --git a/application/controllers/Cis/OverviewLvPlan.php b/application/controllers/Cis/OverviewLvPlan.php
new file mode 100644
index 000000000..5fe9d9779
--- /dev/null
+++ b/application/controllers/Cis/OverviewLvPlan.php
@@ -0,0 +1,39 @@
+ ['basis/cis:r']
+ ]);
+
+ // Load Config
+ $this->load->config('calendar');
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+
+ $viewData = array(
+ 'uid'=>getAuthUID(),
+ 'timezone' => $this->config->item('timezone')
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OverviewLvPlan']);
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/Cis/StgOrgLvPlan.php b/application/controllers/Cis/StgOrgLvPlan.php
new file mode 100644
index 000000000..834d49d55
--- /dev/null
+++ b/application/controllers/Cis/StgOrgLvPlan.php
@@ -0,0 +1,39 @@
+ ['basis/cis:r']
+ ]);
+
+ // Load Config
+ $this->load->config('calendar');
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+
+ $viewData = array(
+ 'uid'=>getAuthUID(),
+ 'timezone' => $this->config->item('timezone')
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'StgOrgLvPlan']);
+ }
+}
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 28b48e3f1..8a73dcaa4 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -41,7 +41,12 @@ class LvPlan extends FHCAPI_Controller
'getLehreinheitStudiensemester' => self::PERM_LOGGED,
'studiensemesterDateInterval' => self::PERM_LOGGED,
'getLvPlanForStudiensemester' => self::PERM_LOGGED,
- 'getLv' => self::PERM_LOGGED
+ 'getLv' => self::PERM_LOGGED,
+ 'eventsStgOrg' => self::PERM_LOGGED,
+ 'fetchFerienEvents' => self::PERM_LOGGED,
+ 'getStudiengaenge' => self::PERM_LOGGED,
+ 'getLehrverband' => self::PERM_LOGGED,
+
]);
$this->load->library('LogLib');
@@ -83,7 +88,7 @@ class LvPlan extends FHCAPI_Controller
// form validation
$this->form_validation->set_rules('start_date', "start_date", "required");
$this->form_validation->set_rules('end_date', "end_date", "required");
-
+
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -100,7 +105,7 @@ class LvPlan extends FHCAPI_Controller
// fetching ferien events
$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-
+
$this->terminateWithSuccess(array_merge(
$lvplanEvents,
@@ -109,6 +114,49 @@ class LvPlan extends FHCAPI_Controller
));
}
+ /**
+ * fetches LvPlan for studiengang / semester / verband / gruppe
+ *
+ * @access public
+ */
+ public function eventsStgOrg()
+ {
+ $this->load->library('StundenplanLib');
+
+ // form validation
+ $this->form_validation->set_rules('start_date', "start_date", "required");
+ $this->form_validation->set_rules('end_date', "end_date", "required");
+ //$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
+
+ if (!$this->form_validation->run())
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ $stgOrgEvents = [];
+ $ferienEvents = [];
+ }
+
+ else
+ {
+ $start_date = $this->input->post('start_date', true);
+ $end_date = $this->input->post('end_date', true);
+ $stg_kz = $this->input->post('stg_kz', true);
+ $sem = $this->input->post('sem', true);
+ $verband = $this->input->post('verband', true);
+ $gruppe = $this->input->post('gruppe', true);
+
+ $result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
+ $stgOrgEvents = $this->getDataOrTerminateWithError($result);
+
+ $result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
+ $ferienEvents = $this->getDataOrTerminateWithError($result);
+ }
+
+ $this->terminateWithSuccess(array_merge(
+ $stgOrgEvents,
+ $ferienEvents
+ ));
+ }
+
/**
* fetches LvPlan and Ferien events together for the lv
*
@@ -137,7 +185,6 @@ class LvPlan extends FHCAPI_Controller
// fetching ferien events
$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-
$this->terminateWithSuccess(array_merge(
$lvplanEvents,
@@ -287,6 +334,48 @@ class LvPlan extends FHCAPI_Controller
return $this->terminateWithSuccess(current($result));
}
+ public function getStudiengaenge()
+ {
+ $this->load->model('organisation/Studiengang_model','StudiengangModel');
+
+ $this->StudiengangModel->addOrder('typ');
+ $this->StudiengangModel->addOrder('kurzbz');
+ $result = $this->StudiengangModel->loadWhere([
+ 'aktiv' => true
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+
+ public function getLehrverband($studiengang_kz, $semester=null, $verband=null)
+ {
+ $this->load->model('organisation/Lehrverband_model','LehrverbandModel');
+
+ $where = [
+ 'aktiv' => true,
+ 'studiengang_kz' => $studiengang_kz,
+ ];
+
+ if ($semester !== null && $semester !== 'null') {
+ $where['semester'] = $semester;
+ }
+ if ($verband !== null && $verband !== 'null') {
+ $where['verband'] = $verband;
+ }
+
+ $this->LehrverbandModel->addOrder('studiengang_kz');
+ $this->LehrverbandModel->addOrder('semester');
+ $this->LehrverbandModel->addOrder('verband');
+ $this->LehrverbandModel->addOrder('gruppe');
+ $result = $this->LehrverbandModel->loadWhere($where);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+
/**
* fetch moodle events
*
@@ -338,7 +427,7 @@ class LvPlan extends FHCAPI_Controller
$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
+
if ($currentStudiensemester) {
$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
@@ -347,7 +436,7 @@ class LvPlan extends FHCAPI_Controller
"studiensemester_kurzbz" => $studentsemester_kurzbz
]);
$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+
if ($studiengang)
$studiengang_kz = current($studiengang)->studiengang_kz;
else
@@ -357,7 +446,7 @@ class LvPlan extends FHCAPI_Controller
}
$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+
return $this->getDataOrTerminateWithError($ferienEvents);
}
}
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 7ed64da2c..5e4b4e453 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -445,6 +445,24 @@ class StundenplanLib
return success($ferienEventsFlattened);
}
+ public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
+ {
+ $this->_ci =& get_instance();
+
+ $this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+ $stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
+ if (isError($stundenplan_data))
+ return $stundenplan_data;
+ $stundenplan_data = getData($stundenplan_data) ?? [];
+
+ $function_error = $this->expandObjectInformation($stundenplan_data);
+ if ($function_error)
+ return $function_error;
+
+ return success($stundenplan_data);
+ }
+
// start of the private functions ########################################################################################################
// function used to sort an array of studiensemester strings
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 389be582d..168ba1bda 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -388,6 +388,84 @@ class Stundenplan_model extends DB_Model
ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
}
+
+ /**
+ * queries Stundenplan and filters by studiengang, semester, verband gruppe
+ *
+ * @return void
+ */
+ public function getStundenplanStudiengang($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe) {
+
+ $qry_params = [$start_date, $end_date, $stg_kz];
+
+ $qry = "
+ SELECT
+ 'lehreinheit' as type, beginn, ende, datum,
+ CONCAT(lehrfach,'-',lehrform) as topic,
+ array_agg(DISTINCT lektor) as lektor,
+ array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+ string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
+ array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
+ titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+ FROM
+ (
+ SELECT unr,datum,beginn, ende,
+ CASE
+ WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+ ELSE sp.lektor
+ END as lektor,
+ CASE
+ WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+ ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
+ END as gruppen_kuerzel,
+ (SELECT bezeichnung
+ FROM public.tbl_organisationseinheit
+ WHERE oe_kurzbz IN(
+ SELECT oe_kurzbz
+ FROM lehre.tbl_lehrveranstaltung
+ WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+ )) as organisationseinheit,
+ sp.ort_kurzbz, sp.studiengang_kz, sp.titel,sp.lehreinheit_id,sp.lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
+ FROM (
+ SELECT sp.*
+ FROM lehre.vw_stundenplan sp
+ WHERE
+ sp.datum >= ?
+ AND sp.datum <= ?
+ ) sp
+ JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+ WHERE studiengang_kz = ? ";
+
+ if($sem != NULL)
+ {
+ $qry_params[] = $sem;
+ $qry .= " AND (semester = ? OR semester IS NULL)";
+ }
+ if($verband != NULL)
+ {
+ $qry_params[] = $verband;
+ $qry .= " AND (verband = ? OR verband IS NULL OR verband = '0' OR verband = '')";
+ }
+ if($gruppe != NULL)
+ {
+ $qry_params[] = $gruppe;
+ $qry .= " AND (gruppe = ? OR gruppe IS NULL OR gruppe = '0' OR gruppe = '') ";
+ }
+ $qry.= " AND (
+ gruppe_kurzbz is null OR EXISTS(
+ SELECT 1
+ FROM
+ public.tbl_gruppe WHERE gruppe_kurzbz = sp.gruppe_kurzbz AND direktinskription = false
+ )
+ )";
+
+ $qry.= " ) as subquery
+
+ GROUP BY unr, datum, beginn, ende, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+ ORDER BY datum, beginn; ";
+
+ return $this->execReadOnlyQuery($qry, $qry_params);
+ }
/**
* NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 0b179c9ba..01c7253d6 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -92,5 +92,32 @@ export default {
method: 'get',
url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
};
- }
+ },
+ eventsStgOrg(start_date, end_date, stg_kz, sem, verband, gruppe) {
+ console.log("stg_Kz" + stg_kz + " sem " + sem + " vb " + verband + " gr " + gruppe);
+ return {
+ method: 'post',
+ url: '/api/frontend/v1/lvPlan/eventsStgOrg',
+ params: { start_date, end_date, stg_kz, sem, verband, gruppe }
+ };
+ },
+ getStudiengaenge(){
+ return {
+ method: 'get',
+ url: '/api/frontend/v1/lvPlan/getStudiengaenge'
+ }
+ },
+ getLehrverband(stg_kz, sem){
+ return {
+ method: 'get',
+ url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}`
+ }
+ },
+ getGruppe(stg_kz, sem, verband){
+ return {
+ method: 'get',
+ url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
+ }
+ },
+
};
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 190ed1a93..4a19695ae 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -16,6 +16,8 @@ import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent
import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
import Studium from "../../components/Cis/Studium/Studium.js";
+import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
+import OverviewLvPlan from "../../components/Cis/LvPlan/OverviewLvPlan.js";
import ApiRenderers from '../../api/factory/renderers.js';
import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -190,6 +192,26 @@ const router = VueRouter.createRouter({
};
}
},
+ {
+ path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?`,
+ name: 'StgOrgLvPlan',
+ component: StgOrgLvPlan,
+ props(route) {
+ return {
+ propsViewData: route.params
+ };
+ }
+ },
+ {
+ path: `/Cis/OverviewLvPlan`,
+ name: 'OverviewLvPlan',
+ component: OverviewLvPlan,
+ props(route) {
+ return {
+ propsViewData: route.params
+ };
+ }
+ },
{
path: `/Cis4`,
name: 'Cis4',
diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
new file mode 100644
index 000000000..4a7cdec60
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
@@ -0,0 +1,170 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+
+export default {
+ name: "OverviewLvPlan",
+ components: {
+ FormForm,
+ FormInput,
+ },
+ props: {
+ viewData: Object,
+ propsViewData: Object
+ },
+ data() {
+ return {
+ formData: {
+ stgkz: null,
+ semester: null,
+ verband: null,
+ gruppe: null,
+ },
+ listStg: [],
+ listSem: [],
+ listVerband: [],
+ listGroup: [],
+ dataLvStudiengang: {}
+ };
+ },
+ methods: {
+ loadLvPlan(){
+ if(!this.formData.stgkz){
+ this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
+ return;
+ }
+ this.$router.push({
+ name: "StgOrgLvPlan",
+ params: {
+ mode: "Week",
+ focus_date: this.currentDay,
+ stgkz: this.formData.stgkz,
+ sem: this.formData.semester,
+ verband: this.formData.verband,
+ gruppe: this.formData.gruppe,
+ }
+ });
+ },
+ loadListSem(){
+ this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+ this.loadListVerband();
+ },
+ loadListVerband(){
+ this.$api
+ .call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+ .then(result => {
+ const data = result.data;
+ const mappedData = data.map(item => item.verband);
+ this.listVerband = [...new Set(mappedData.filter(v =>
+ v !== null &&
+ v !== undefined &&
+ String(v).trim() !== ""
+ ))]
+ .sort();
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ this.loadListGroup();
+ },
+ loadListGroup(){
+ this.$api
+ .call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+ .then(result => {
+ const data = result.data;
+ const mappedData = data.map(item => item.gruppe);
+ this.listGroup = [...new Set(mappedData.filter(v =>
+ v !== null &&
+ v !== undefined &&
+ String(v).trim() !== ""))]
+ .sort();
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ }
+ },
+ computed: {
+ maxSemester(){
+ const currentStg = this.listStg.find(
+ item => item.studiengang_kz === this.formData.stgkz
+ );
+ return currentStg.max_semester;
+ },
+ currentDay() {
+ if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+ return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+ return this.propsViewData?.focus_date;
+ },
+ },
+ created(){
+ this.$api
+ .call(ApiLvPlan.getStudiengaenge())
+ .then(result => {
+ this. listStg = result.data;
+ })
+ .catch(this.$fhcAlert.handleSystemError);
+ },
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $p.t('LvPlan/headerLvPlanLvVerband') }}
+
{{currentStgBezeichnung}}
+ Semester: {{propsViewData.sem}}
+ Verband: {{propsViewData.verband}}
+ Gruppe: {{propsViewData.gruppe}}
+
+
+
{{ $p.t('LvPlan/noStgProvided') }}
+
+
+
+
+