blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 02:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Rename Stundenplan to LvPlan):renames all methods and files from Stundenplan to LvPlan

Browse Source
This commit is contained in:
SimonGschnell
2025-06-10 11:46:19 +02:00
parent a786dec9c1
commit c080d1abb2
26 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/routes.php
+1 -1
View File
@@ -61,7 +61,7 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
$route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
$route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
$route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
$route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
// load routes from extensions
$subdir = 'application/config/extensions';
application/controllers/Cis/Stundenplan.php → application/controllers/Cis/LvPlan.php
+2 -2
View File
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
*
*/
class Stundenplan extends Auth_Controller
class LvPlan extends Auth_Controller
{
/**
* Constructor
@@ -30,6 +30,6 @@ class Stundenplan extends Auth_Controller
'uid'=>getAuthUID(),
);
$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Stundenplan']);
$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
}
}
application/controllers/api/frontend/v1/Stundenplan.php → application/controllers/api/frontend/v1/LvPlan.php
+21 -21
View File
@@ -20,7 +20,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
use CI3_Events as Events;
class Stundenplan extends FHCAPI_Controller
class LvPlan extends FHCAPI_Controller
{
/**
@@ -33,10 +33,10 @@ class Stundenplan extends FHCAPI_Controller
'getRoomplan' => self::PERM_LOGGED,
'Stunden' => self::PERM_LOGGED,
'Reservierungen' => self::PERM_LOGGED,
'StundenplanEvents' => self::PERM_LOGGED,
'LvPlanEvents' => self::PERM_LOGGED,
'getLehreinheitStudiensemester' => self::PERM_LOGGED,
'studiensemesterDateInterval' => self::PERM_LOGGED,
'getLvStundenplanForStudiensemester' => self::PERM_LOGGED,
'getLvPlanForStudiensemester' => self::PERM_LOGGED,
]);
$this->load->library('LogLib');
@@ -51,7 +51,7 @@ class Stundenplan extends FHCAPI_Controller
$this->load->library('form_validation');
//load models
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
@@ -61,12 +61,12 @@ class Stundenplan extends FHCAPI_Controller
// Public methods
/**
* fetches Stundenplan and Moodle events together
* fetches LvPlan and Moodle events together
* @access public
*
*/
public function StundenplanEvents(){
$this->load->library('StundenplanLib');
public function LvPlanEvents(){
$this->load->library('LvPlanLib');
// form validation
$this->load->library('form_validation');
@@ -81,10 +81,10 @@ class Stundenplan extends FHCAPI_Controller
$end_date = $this->input->get('end_date', TRUE);
$lv_id = $this->input->get('lv_id', TRUE);
$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
{
$stundenplan_events = array();
$lvplan_events = array();
}
// fetching moodle events
$moodle_events = [];
@@ -101,7 +101,7 @@ class Stundenplan extends FHCAPI_Controller
]
);
$result = array_merge($stundenplan_events,$moodle_events);
$result = array_merge($lvplan_events,$moodle_events);
// sort array with moodle events first
usort($result, function($a, $b){
if ($a->type === 'moodle' && $b->type !== 'moodle') {
@@ -123,16 +123,16 @@ class Stundenplan extends FHCAPI_Controller
$this->terminateWithSuccess($studiensemester);
}
public function getLvStundenplanForStudiensemester($studiensemester,$lvid){
$this->load->library('StundenplanLib');
public function getLvPlanForStudiensemester($studiensemester,$lvid){
$this->load->library('LvPlanLib');
$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);
$stundenplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
$this->terminateWithSuccess($stundenplan);
$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
$this->terminateWithSuccess($lvplan);
}
@@ -160,7 +160,7 @@ class Stundenplan extends FHCAPI_Controller
*/
public function getRoomplan()
{
$this->load->library('StundenplanLib');
$this->load->library('LvPlanLib');
// form validation
$this->load->library('form_validation');
$this->form_validation->set_data($_GET);
@@ -174,19 +174,19 @@ class Stundenplan extends FHCAPI_Controller
$start_date = $this->input->get('start_date', TRUE);
$end_date = $this->input->get('end_date', TRUE);
$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
$this->stundenplanlib->expand_object_information($roomplan_data);
$this->lvplanlib->expand_object_information($roomplan_data);
$this->terminateWithSuccess($roomplan_data);
}
// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
// 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('StundenplanLib');
$this->load->library('LvPlanLib');
//form validation
$this->load->library('form_validation');
$this->form_validation->set_data($_GET);
@@ -200,7 +200,7 @@ class Stundenplan extends FHCAPI_Controller
$start_date = $this->input->get('start_date', TRUE);
$end_date = $this->input->get('end_date', TRUE);
$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
$result = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($result);
}
application/controllers/api/frontend/v1/Studium.php
+5 -5
View File
@@ -39,7 +39,7 @@ class Studium extends FHCAPI_Controller
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
$this->load->model('organisation/Studienplan_model', 'LvPlanModel');
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
$this->load->model('codex/Orgform_model','OrgformModel');
@@ -143,8 +143,8 @@ class Studium extends FHCAPI_Controller
if(!$aktuelles_studienplan){
$aktuelles_studienplan = null;
}
if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($lvplan) use($parameter_studienplan){
return $lvplan->studienplan_id == $parameter_studienplan->studienplan_id;
}))){
$aktuelles_studienplan = $parameter_studienplan ;
}
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
}
private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
$this->load->library('StundenplanLib');
$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
$this->load->library('LvPlanLib');
$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
if(!$lektoren){
return [];
}
application/controllers/api/v1/ressource/Stundenplan.php → application/controllers/api/v1/ressource/LvPlan.php
+12 -12
View File
@@ -14,16 +14,16 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Stundenplan extends API_Controller
class LvPlan extends API_Controller
{
/**
* Stundenplan API constructor.
* LvPlan API constructor.
*/
public function __construct()
{
parent::__construct(array('Stundenplan' => 'basis/stundenplan:rw'));
// Load model StundenplanModel
$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
// Load model LvPlanModel
$this->load->model('ressource/stundenplan_model', 'LvPlanModel');
}
@@ -31,13 +31,13 @@ class Stundenplan extends API_Controller
/**
* @return void
*/
public function getStundenplan()
public function getLvPlan()
{
$stundenplanID = $this->get('stundenplan_id');
$lvPlanID = $this->get('stundenplan_id');
if (isset($stundenplanID))
if (isset($lvPlanID))
{
$result = $this->StundenplanModel->load($stundenplanID);
$result = $this->LvPlanModel->load($lvPlanID);
$this->response($result, REST_Controller::HTTP_OK);
}
@@ -50,17 +50,17 @@ class Stundenplan extends API_Controller
/**
* @return void
*/
public function postStundenplan()
public function postLvPlan()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['stundenplan_id']))
{
$result = $this->StundenplanModel->update($this->post()['stundenplan_id'], $this->post());
$result = $this->LvPlanModel->update($this->post()['stundenplan_id'], $this->post());
}
else
{
$result = $this->StundenplanModel->insert($this->post());
$result = $this->LvPlanModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplan extends API_Controller
}
}
private function _validate($stundenplan = NULL)
private function _validate($lvplan = NULL)
{
return true;
}
application/controllers/api/v1/ressource/Stundenplandev.php → application/controllers/api/v1/ressource/LvPlandev.php
+12 -12
View File
@@ -14,16 +14,16 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Stundenplandev extends API_Controller
class LvPlandev extends API_Controller
{
/**
* Stundenplandev API constructor.
* LvPlandev API constructor.
*/
public function __construct()
{
parent::__construct(array('Stundenplandev' => 'basis/stundenplandev:rw'));
// Load model StundenplandevModel
$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
// Load model LvPlandevModel
$this->load->model('ressource/stundenplandev_model', 'LvPlandevModel');
}
@@ -31,13 +31,13 @@ class Stundenplandev extends API_Controller
/**
* @return void
*/
public function getStundenplandev()
public function getLvPlandev()
{
$stundenplandevID = $this->get('stundenplandev_id');
$lvplandevID = $this->get('stundenplandev_id');
if (isset($stundenplandevID))
if (isset($lvplandevID))
{
$result = $this->StundenplandevModel->load($stundenplandevID);
$result = $this->LvPlandevModel->load($lvplandevID);
$this->response($result, REST_Controller::HTTP_OK);
}
@@ -50,17 +50,17 @@ class Stundenplandev extends API_Controller
/**
* @return void
*/
public function postStundenplandev()
public function postLvPlandev()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['stundenplandev_id']))
{
$result = $this->StundenplandevModel->update($this->post()['stundenplandev_id'], $this->post());
$result = $this->LvPlandevModel->update($this->post()['stundenplandev_id'], $this->post());
}
else
{
$result = $this->StundenplandevModel->insert($this->post());
$result = $this->LvPlandevModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplandev extends API_Controller
}
}
private function _validate($stundenplandev = NULL)
private function _validate($lvplandev = NULL)
{
return true;
}
application/controllers/components/Cis/Stundenplan.php → application/controllers/components/Cis/LvPlan.php
+4 -4
View File
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
*
*/
class Stundenplan extends Auth_Controller
class LvPlan extends Auth_Controller
{
/**
@@ -27,14 +27,14 @@ class Stundenplan extends Auth_Controller
*/
public function index()
{
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
if (isError($result))
return $this->outputJsonError(getError($result));
*/
$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID()));
$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID()));
$res = getData($res);
application/controllers/jobs/LVPlanJob.php
+4 -4
View File
@@ -39,7 +39,7 @@ class LVPlanJob extends JOB_Controller
$studiensemester_arr = array();
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
@@ -70,7 +70,7 @@ class LVPlanJob extends JOB_Controller
$fail = 0;
// get all schedule entries where group is missing
$result = $this->StundenplandevModel->getMissingDirectGroups($studiensemester);
$result = $this->LvPlandevModel->getMissingDirectGroups($studiensemester);
if(hasData($result))
{
foreach($result->retval as $row)
@@ -112,7 +112,7 @@ class LVPlanJob extends JOB_Controller
}
// add group to schedule
$result = $this->StundenplandevModel->insert(
$result = $this->LvPlandevModel->insert(
array(
'lehreinheit_id' => $row->lehreinheit_id,
'unr' => $unr,
@@ -159,7 +159,7 @@ class LVPlanJob extends JOB_Controller
public function mailUpdatedZeitwuensche()
{
// Load models
$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
$this->load->model('organisation/Studiensemester_model', 'StundiensemesterModel');
$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
application/libraries/StundenplanLib.php → application/libraries/LvPlanLib.php
+31 -31
View File
@@ -3,17 +3,17 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
class StundenplanLib{
class LvPlanLib{
private $_ci; // Code igniter instance
/**
* fetches stundenplan events from a UID and start/end date
* fetches LvPlan events from a UID and start/end date
* @access public
*
*/
public function getStundenplan($start_date, $end_date, $lv_id = null){
public function getLvPlan($start_date, $end_date, $lv_id = null){
$this->_ci =& get_instance();
@@ -21,7 +21,7 @@ class StundenplanLib{
$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', 'StundenplanModel');
$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class StundenplanLib{
return $function_error;
}
if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
if(isError($stundenplan_data))
$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
if(isError($lvplan_data))
{
return error(getData($stundenplan_data));
return error(getData($lvplan_data));
}
$stundenplan_data = getData($stundenplan_data) ?? [];
$function_error = $this->expand_object_information($stundenplan_data);
$lvplan_data = getData($lvplan_data) ?? [];
$function_error = $this->expand_object_information($lvplan_data);
if(!is_null($function_error)){
return $function_error;
}
// query lv itself in case its Stundenplan is being queried and it has no entries
// query lv itself in case its LvPlan 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 StundenplanLib{
return error(getData($lv_result));
}
$lv = getData($lv_result)[0];
return $stundenplan_data;
return $lvplan_data;
}
@@ -71,17 +71,17 @@ class StundenplanLib{
if($is_mitarbeiter)
{
$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
if(isError($stundenplan_data))
$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
if(isError($lvplan_data))
{
return error(getData($stundenplan_data));
return error(getData($lvplan_data));
}
$stundenplan_data = getData($stundenplan_data) ?? [];
$function_error = $this->expand_object_information($stundenplan_data);
$lvplan_data = getData($lvplan_data) ?? [];
$function_error = $this->expand_object_information($lvplan_data);
if(!is_null($function_error)){
return $function_error;
}
return $stundenplan_data;
return $lvplan_data;
} else {
// getting the gruppen_kurzbz of the student in the different studiensemester
$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class StundenplanLib{
}
$student_lehrverband = getData($student_lehrverband);
$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
if(!$stundenplan_query)
$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
if(!$lvplan_query)
{
return [];
}
$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
if(isError($stundenplan_data))
$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
if(isError($lvplan_data))
{
return error(getData($stundenplan_data));
return error(getData($lvplan_data));
}
$stundenplan_data = getData($stundenplan_data) ?? [];
$lvplan_data = getData($lvplan_data) ?? [];
$function_error = $this->expand_object_information($stundenplan_data);
$function_error = $this->expand_object_information($lvplan_data);
if(!is_null($function_error)){
return $function_error;
}
return success($stundenplan_data);
return success($lvplan_data);
}
}
@@ -147,7 +147,7 @@ class StundenplanLib{
public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
$this->_ci =& get_instance();
$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class StundenplanLib{
return error(getData($studiensemester));
}
$studiensemester = current(getData($studiensemester));
$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
SELECT DISTINCT uid
FROM campus.vw_stundenplan
WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class StundenplanLib{
// load lektor object
foreach ($item->lektor as $lv_lektor)
{
$this->_ci->StundenplanModel->addLimit(1);
$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
$this->_ci->LvPlanModel->addLimit(1);
$lektor_object = $this->_ci->LvPlanModel->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 StundenplanLib{
if($item->ort_kurzbz) {
$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
SELECT content_id
FROM public.tbl_ort
WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
application/models/ressource/Reservierung_model.php
+3 -3
View File
@@ -21,7 +21,7 @@ class Reservierung_model extends DB_Model
public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
{
$stundenplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
CASE
WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz
ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/'))
@@ -46,7 +46,7 @@ class Reservierung_model extends DB_Model
JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
$query_result= $this->execReadOnlyQuery("
SELECT
@@ -89,7 +89,7 @@ class Reservierung_model extends DB_Model
JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
WHERE res.uid = ? AND datum >= ? AND datum <= ?";
// $subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
// $subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
$subquery = $raum_reservierungen_query;
application/models/ressource/Stundenplan_model.php
+10 -10
View File
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
*/
$raum_stundenplan= $this->execReadOnlyQuery("
$raum_lvplan= $this->execReadOnlyQuery("
SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
", [$ort_kurzbz, $start_date, $end_date]);
return $raum_stundenplan;
return $raum_lvplan;
}
/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
/**
* groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
* @param string $stundenplanViewQuery the subquery used to group the result
* @param string $lvplanViewQuery the subquery used to group the result
*
* @return stdClass
*/
public function stundenplanGruppierung($stundenplanViewQuery)
public function lvPlanGruppierung($lvplanViewQuery)
{
$query_result = $this->execReadOnlyQuery("
SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
)) as organisationseinheit,
ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,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 (".$stundenplanViewQuery.") sp
FROM (".$lvplanViewQuery.") sp
JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
}
/**
* queries Stundenplan but for a whole lva, irrespective of who is requesting it
* queries LvPlan but for a whole lva, irrespective of who is requesting it
*
* @return void
*/
public function getStundenplanLVA($start_date, $end_date, $lv_id) {
public function getLvPlanLVA($start_date, $end_date, $lv_id) {
return $this->execReadOnlyQuery("
SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
}
/**
* queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
* queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
*
* @return void
*/
public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
return $this->execReadOnlyQuery("
SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
*
* @return mixed
*/
public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
$emptyCheck = function($toBeCheckedArray) use ($semester){
application/models/ressource/Stundenplandev_model.php
+2 -2
View File
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
}
/**
* Get Stundenplan data.
* Get LvPlan data.
*
* @param null $lehrveranstaltung_id
* @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
* @param false $nurBevorstehende If true, only future data is retrieved.
* @return array|false|stdClass|null
*/
public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
{
$params = array();