blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

stundenplan/lvplan use reverted classes and function names again

Browse Source
This commit is contained in:
Harald Bamberger
2025-06-17 11:05:31 +02:00
parent 3db82aea95
commit 4db21d9abb
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/LvPlan.php
+9 -9
View File
@@ -51,7 +51,7 @@ class LvPlan extends FHCAPI_Controller
$this->load->library('form_validation');
//load models
$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
@@ -66,7 +66,7 @@ class LvPlan extends FHCAPI_Controller
*
*/
public function LvPlanEvents(){
$this->load->library('LvPlanLib');
$this->load->library('StundenplanLib');
// form validation
$this->load->library('form_validation');
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
$end_date = $this->input->get('end_date', TRUE);
$lv_id = $this->input->get('lv_id', TRUE);
$res_lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
$res_lvplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
{
@@ -126,14 +126,14 @@ class LvPlan extends FHCAPI_Controller
}
public function getLvPlanForStudiensemester($studiensemester,$lvid){
$this->load->library('LvPlanLib');
$this->load->library('StundenplanLib');
$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
$timespan_start = new DateTime($studiensemester_result->start);
$timespan_ende = new DateTime($studiensemester_result->ende);
$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
$this->terminateWithSuccess($lvplan);
}
@@ -162,7 +162,7 @@ class LvPlan extends FHCAPI_Controller
*/
public function getRoomplan()
{
$this->load->library('LvPlanLib');
$this->load->library('StundenplanLib');
// form validation
$this->load->library('form_validation');
$this->form_validation->set_data($_GET);
@@ -179,7 +179,7 @@ class LvPlan extends FHCAPI_Controller
$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
$this->lvplanlib->expand_object_information($roomplan_data);
$this->stundenplanlib->expand_object_information($roomplan_data);
$this->terminateWithSuccess($roomplan_data);
@@ -188,7 +188,7 @@ class LvPlan extends FHCAPI_Controller
// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
public function Reservierungen($ort_kurzbz = null)
{
$this->load->library('LvPlanLib');
$this->load->library('StundenplanLib');
//form validation
$this->load->library('form_validation');
$this->form_validation->set_data($_GET);
@@ -202,7 +202,7 @@ class LvPlan extends FHCAPI_Controller
$start_date = $this->input->get('start_date', TRUE);
$end_date = $this->input->get('end_date', TRUE);
$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
$result = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($result);
}
application/controllers/api/frontend/v1/Studium.php
+2 -2
View File
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
}
private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
$this->load->library('LvPlanLib');
$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
$this->load->library('StundenplanLib');
$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
if(!$lektoren){
return [];
}
application/controllers/components/Cis/LvPlan.php
+3 -3
View File
@@ -27,14 +27,14 @@ class LvPlan extends Auth_Controller
*/
public function index()
{
$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
if (isError($result))
return $this->outputJsonError(getError($result));
*/
$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID()));
$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID()));
$res = getData($res);
application/libraries/LvPlanLib.php → application/libraries/StundenplanLib.php
+31 -31
View File
@@ -3,17 +3,17 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
class LvPlanLib{
class StundenplanLib{
private $_ci; // Code igniter instance
/**
* fetches LvPlan events from a UID and start/end date
* fetches Stundenplan events from a UID and start/end date
* @access public
*
*/
public function getLvPlan($start_date, $end_date, $lv_id = null){
public function getStundenplan($start_date, $end_date, $lv_id = null){
$this->_ci =& get_instance();
@@ -21,7 +21,7 @@ class LvPlanLib{
$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class LvPlanLib{
return $function_error;
}
if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
if(isError($lvplan_data))
$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
if(isError($stundenplan_data))
{
return error(getData($lvplan_data));
return error(getData($stundenplan_data));
}
$lvplan_data = getData($lvplan_data) ?? [];
$function_error = $this->expand_object_information($lvplan_data);
$stundenplan_data = getData($stundenplan_data) ?? [];
$function_error = $this->expand_object_information($stundenplan_data);
if(!is_null($function_error)){
return $function_error;
}
// query lv itself in case its LvPlan is being queried and it has no entries
// query lv itself in case its Stundenplan is being queried and it has no entries
$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
if(isError($lv_result))
@@ -63,7 +63,7 @@ class LvPlanLib{
return error(getData($lv_result));
}
$lv = getData($lv_result)[0];
return $lvplan_data;
return $stundenplan_data;
}
@@ -71,17 +71,17 @@ class LvPlanLib{
if($is_mitarbeiter)
{
$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
if(isError($lvplan_data))
$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
if(isError($stundenplan_data))
{
return error(getData($lvplan_data));
return error(getData($stundenplan_data));
}
$lvplan_data = getData($lvplan_data) ?? [];
$function_error = $this->expand_object_information($lvplan_data);
$stundenplan_data = getData($stundenplan_data) ?? [];
$function_error = $this->expand_object_information($stundenplan_data);
if(!is_null($function_error)){
return error($function_error);
}
return success($lvplan_data);
return success($stundenplan_data);
} else {
// getting the gruppen_kurzbz of the student in the different studiensemester
$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class LvPlanLib{
}
$student_lehrverband = getData($student_lehrverband);
$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
if(!$lvplan_query)
$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
if(!$stundenplan_query)
{
return error([]);
}
$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
if(isError($lvplan_data))
$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
if(isError($stundenplan_data))
{
return error(getData($lvplan_data));
return error(getData($stundenplan_data));
}
$lvplan_data = getData($lvplan_data) ?? [];
$stundenplan_data = getData($stundenplan_data) ?? [];
$function_error = $this->expand_object_information($lvplan_data);
$function_error = $this->expand_object_information($stundenplan_data);
if(!is_null($function_error)){
return $function_error;
}
return success($lvplan_data);
return success($stundenplan_data);
}
}
@@ -147,7 +147,7 @@ class LvPlanLib{
public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
$this->_ci =& get_instance();
$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class LvPlanLib{
return error(getData($studiensemester));
}
$studiensemester = current(getData($studiensemester));
$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
SELECT DISTINCT uid
FROM campus.vw_stundenplan
WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class LvPlanLib{
// load lektor object
foreach ($item->lektor as $lv_lektor)
{
$this->_ci->LvPlanModel->addLimit(1);
$lektor_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
$this->_ci->StundenplanModel->addLimit(1);
$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
SELECT mitarbeiter_uid, vorname, nachname, kurzbz
FROM public.tbl_mitarbeiter
JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
@@ -233,7 +233,7 @@ class LvPlanLib{
if($item->ort_kurzbz) {
$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
SELECT content_id
FROM public.tbl_ort
WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);