blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42: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/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');