diff --git a/.gitignore b/.gitignore
index 96af3e5dc..84957a801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ documents/
vendor/
/nbproject/
+.vscode
+composer.phar
/.idea/
.settings
.project
diff --git a/application/config/anrechnung.php b/application/config/anrechnung.php
index 768ec3197..6713ef37d 100644
--- a/application/config/anrechnung.php
+++ b/application/config/anrechnung.php
@@ -1,6 +1,6 @@
TRUE,
+ 'referenzbeispiele_ects' => TRUE,
+ 'voraussetzungen' => TRUE,
+ 'nachweisdokumente' => TRUE,
+ 'herkunft_kenntnisse' => TRUE
+];
diff --git a/application/config/cis.php b/application/config/cis.php
new file mode 100644
index 000000000..82655f244
--- /dev/null
+++ b/application/config/cis.php
@@ -0,0 +1,9 @@
+.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['migratecontract_oe_default'] = 'TODO_OE_DEFAULT';
+
+$config['migratecontract_matching_ba1_vertragsart'] = array(
+ '101'=>'dvbund',
+ '102'=>'dvanderengk',
+ '103'=>'echterdv',
+ '104'=>'studentischehilfskr',
+ '105'=>'externerlehrender',
+ '106'=>'dvanderenbet',
+ '107'=>'werkvertrag',
+ '108'=>'studentischehilfskr',
+ '109'=>'ueberlassungsvertrag',
+ '110'=>'echterfreier',
+ '111'=>'echterdv' //All-In
+);
\ No newline at end of file
diff --git a/application/config/navigation.php b/application/config/navigation.php
index 3680930d0..2327513ad 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -1,6 +1,12 @@
array(
'fhcomplete' => array(
@@ -50,11 +56,17 @@ $config['navigation_header'] = array(
'requiredPermissions' => 'basis/vilesci:r',
'children' => array(
'cis' => array(
- 'link' => CIS_ROOT,
+ 'link' => $root,
'icon' => '',
'description' => 'CIS',
'sort' => 10
),
+ 'lehrveranstaltungen' => array(
+ 'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+ 'icon' => '',
+ 'description' => 'Lehrveranstaltungen',
+ 'sort' => 15
+ ),
'reihungstest' => array(
'link' => site_url('organisation/Reihungstest'),
'description' => 'Reihungstests',
@@ -217,7 +229,7 @@ $config['navigation_menu']['organisation/Reihungstest/index'] = array(
'target' => '_blank'
),
'auswertung' => array(
- 'link' => CIS_ROOT.'/cis/testtool/admin/auswertung.php',
+ 'link' => $root.'/cis/testtool/admin/auswertung.php',
'description' => 'Auswertung',
'icon' => 'list-alt',
'sort' => 1,
@@ -287,6 +299,15 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
)
);
+$config['navigation_menu']['lehre/lvplanung/LvTemplateUebersicht/index'] = array(
+ 'lvTemplateUebersicht' => array(
+ 'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+ 'description' => 'LV Template Übersicht',
+ 'icon' => '',
+ 'sort' => 1
+ )
+);
+
$config['navigation_menu']['system/issues/Issues/*'] = array(
'fehlerzustaendigkeiten' => array(
'link' => site_url('system/issues/IssuesZustaendigkeiten'),
@@ -304,5 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
'target' => '_blank',
'requiredPermissions' => array('admin:rw')
),
-);
-
+);
\ No newline at end of file
diff --git a/application/config/routes.php b/application/config/routes.php
index 15da5698f..eb4c267ce 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -50,7 +50,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| Examples: my-controller/index -> my_controller/index
| my-controller/my-method -> my_controller/my_method
*/
-$route['default_controller'] = 'Vilesci';
+$route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
$route['translate_uri_dashes'] = FALSE;
// Class name conflicts
@@ -61,6 +61,8 @@ $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';
+
// load routes from extensions
$subdir = 'application/config/extensions';
$dirlist = scandir($subdir);
@@ -81,5 +83,4 @@ if ($dirlist)
}
}
}
-}
-
+}
\ No newline at end of file
diff --git a/application/config/stv.php b/application/config/stv.php
new file mode 100644
index 000000000..31ce3f521
--- /dev/null
+++ b/application/config/stv.php
@@ -0,0 +1,76 @@
+ [
+ //all fields can be configured to be hidden, see class attribute stv-details-details-name for name
+ 'hiddenFields' => [],
+ 'hideUDFs' => false
+ ],
+
+ 'prestudent' => [
+
+ //all fields can be configured to be hidden, see class attribute stv-details-prestudent-name for name
+ 'hiddenFields' => [
+
+ //propably used by FH-Communities
+ 'aufnahmeschluessel', 'standort_code', 'facheinschlaegigBerufstaetig'
+
+ ],
+ 'hideUDFs' => false
+ ],
+ 'finalexam' => [
+ 'documents' => [
+ 'pruefungsprotokoll' => [
+ 'de' => [
+ 'Bakk' => 'PrProtBA',
+ 'Master' => 'PrProtMA',
+ ],
+ 'en' => [
+ 'Bakk' => 'PrProtBAEng',
+ 'Master' => 'PrProtMAEng',
+ ],
+ ],
+ 'pruefungszeugnis' => [
+ 'de' => [
+ 'Bakk' => 'Bakkzeugnis',
+ 'Master' => 'Diplomzeugnis',
+ ],
+ 'en' => [
+ 'Bakk' => 'BakkzeugnisEng',
+ 'Master' => 'DiplomzeugnisEng',
+ ],
+ ],
+ 'urkunde' => [
+ 'de' => [
+ 'Bakk' => 'Bakkurkunde',
+ 'Master' => 'Diplomurkunde',
+ ],
+ 'en' => [
+ 'Bakk' => 'BakkurkundeEng',
+ 'Master' => 'DiplomurkundeEng',
+ ],
+ ],
+ ],
+ ]
+ ];
+
+// List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
+$fieldsZgvDoktor = ['zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', 'zgvdoktor_erfuellt', 'zgvdoktor_code'];
+
+// List of fields to show when ZGV_ERFUELLT_ANZEIGEN is defined
+$fieldsZgvErfuellt = ['zgv_erfuellt', 'zgvmas_erfuellt','zgvdoktor_erfuellt'];
+
+//order important: to show zgf_erfuellt_doktor just in case visibility of doktor is true
+if (!defined('ZGV_ERFUELLT_ANZEIGEN') || !ZGV_ERFUELLT_ANZEIGEN) {
+ $config['tabs']['prestudent']['hiddenFields'] = array_merge(
+ $config['tabs']['prestudent']['hiddenFields'], $fieldsZgvErfuellt
+ );
+}
+
+if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
+ $config['tabs']['prestudent']['hiddenFields'] = array_merge(
+ $config['tabs']['prestudent']['hiddenFields'],
+ $fieldsZgvDoktor
+ );
+}
diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
new file mode 100644
index 000000000..59dab1568
--- /dev/null
+++ b/application/controllers/Cis/Auth.php
@@ -0,0 +1,77 @@
+load->helper('form');
+ $this->load->helper('hlp_authentication');
+
+ // Loads phrases system
+ $this->loadPhrases([
+ 'global'
+ ]);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function login()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('username', 'Username', 'required|trim|callback_validation');
+ $this->form_validation->set_rules('password', 'Password', 'required|trim');
+
+
+ if ($this->form_validation->run())
+ {
+ redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
+ }
+ else
+ {
+ $this->load->view('Cis/Login');
+ }
+ }
+
+ /**
+ * @return boolean
+ */
+ public function validation()
+ {
+ $username = $this->input->post('username');
+ $password = $this->input->post('password');
+
+ $this->load->library('AuthLib', [false]); // without authentication otherwise loooooop!
+
+ $login = $this->authlib->loginLDAP($username, $password);
+ if (isSuccess($login))
+ return true;
+ $this->form_validation->set_message('validation', 'Incorrect username/password.');
+ return false;
+ }
+
+ /**
+ * @return void
+ */
+ public function logout()
+ {
+ $this->load->library('AuthLib');
+ $this->authlib->logout();
+ redirect('/Cis/Auth/login', 'refresh');
+ }
+}
diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
new file mode 100644
index 000000000..c5a6684d3
--- /dev/null
+++ b/application/controllers/Cis/Documents.php
@@ -0,0 +1,192 @@
+ [self::PERM_LOGGED],
+ 'student' => ['admin:r'],
+ 'download' => [self::PERM_LOGGED]
+ ]);
+
+ $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+ $this->loadPhrases([
+ 'global',
+ 'tools'
+ ]);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+ return $this->showDocuments(getAuthUID());
+ }
+
+ /**
+ * @param string $uid Administratoren dürfen die UID als Parameter übergeben um die Dokumente von anderen Personen anzuzeigen
+ * @return void
+ */
+ public function student($uid)
+ {
+ return $this->showDocuments($uid);
+ }
+
+ /**
+ * @param string $uid
+ * @return void
+ */
+ protected function showDocuments($uid)
+ {
+ $this->load->model('crm/Konto_model', 'KontoModel');
+ $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+ $stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
+ if (isError($stati))
+ return $this->load->view('errors/html/error_db.php', [
+ 'heading' => 'Database Error',
+ 'message' => getError($stati)
+ ]);
+ $stati = getData($stati);
+ if (!$stati)
+ return $this->load->view('errors/html/error_general.php', [
+ 'heading' => 'User ist kein Student',
+ 'message' => 'Es konnten keine Studiensemester gefunden werden in denen der User als Student inskripiert ist'
+ ]);
+
+ $stgs = [];
+ $stsemArray = [];
+ $buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
+ $person_ids = [];
+ foreach ($stati as $status) {
+ $person_ids[] = $status->person_id;
+
+ if(!in_array($status->studiensemester_kurzbz, $stsemArray)) {
+ $stsemArray[] = $status->studiensemester_kurzbz;
+ }
+
+ if (!isset($stgs[$status->studiengang_kz])) {
+ $stg = $this->StudiengangModel->load($status->studiengang_kz);
+ if (isError($stg))
+ return $this->load->view('errors/html/error_db.php', [
+ 'heading' => 'Database Error',
+ 'message' => getError($stg)
+ ]);
+ $stg = getData($stg);
+ if (!$stg)
+ return $this->load->view('errors/html/error_db.php', [
+ 'heading' => 'Database Error',
+ 'message' => 'No Studiengang found for studiengang_kz ' . $status->studiengang_kz
+ ]);
+ $stgs[$status->studiengang_kz] = current($stg);
+ $stgs[$status->studiengang_kz]->studiensemester = [];
+ }
+ if (!isset($stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz])) {
+ $stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz] = new stdClass();
+ $stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean)getData(
+ $this->KontoModel->checkStudienbeitragFromPrestudent(
+ $status->prestudent_id,
+ $status->studiensemester_kurzbz,
+ $buchungstypen
+ )
+ );
+ }
+ }
+ $person_ids = array_unique($person_ids);
+
+ $selfservice = null;
+ if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
+ $this->load->model('crm/Akte_model', 'AkteModel');
+ $selfservice = [];
+ foreach ($person_ids as $person_id) {
+ $result = $this->AkteModel->getArchiv($person_id, null, true);
+ if (isError($result))
+ return $this->load->view('errors/html/error_db.php', [
+ 'heading' => 'Database Error',
+ 'message' => getError($result)
+ ]);
+ $selfservice = array_merge($selfservice, getData($result) ?: []);
+ }
+ }
+
+
+ $this->load->view('Cis/Documents', [
+ 'stsemArray' => $stsemArray,
+ 'stgs' => $stgs,
+ 'uid' => $uid,
+ 'studienbuchblatt' => defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN,
+ 'studienerfolgsbestaetigung' => defined('CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN') && CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN,
+ 'selfservice' => $selfservice
+ ]);
+ }
+
+ /**
+ * @param integer $akte_id
+ * @param string $uid (optional) Administratoren dürfen die UID als Parameter übergeben um die Dokumente von anderen Personen anzuzeigen
+ *
+ * @return void
+ */
+ public function download($akte_id, $uid = null)
+ {
+ if (!is_numeric($akte_id))
+ return show_404();
+
+ $this->load->model('crm/Akte_model', 'AkteModel');
+ $result = $this->AkteModel->load($akte_id);
+ if (isError($result))
+ return show_error(getError($result));
+ $akte = getData($result);
+ if (!$akte)
+ return show_404();
+ $akte = current($akte);
+
+ $admin_access = false;
+ if ($uid !== null && $this->permissionlib->isBerechtigt('admin')) {
+ $stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
+ if (hasData($stati)) {
+ $person_ids = array_map(function ($status) {
+ return $status->person_id;
+ }, getData($stati));
+ $person_ids = array_unique($person_ids);
+ if (count($person_ids) == 1 && current($person_ids) == $akte->person_id) {
+ $admin_access = true;
+ }
+ }
+ }
+
+ if (!$admin_access && ($akte->person_id != getAuthPersonId() || !$akte->stud_selfservice))
+ return show_error('Forbidden', 403);
+
+ // NOTE(chris): Log bei einem Download vom Becheid
+ if (isset($akte->dokument_kurzbz) && ($akte->dokument_kurzbz === 'Bescheid' || $akte->dokument_kurzbz === 'BescheidEng')) {
+ $this->load->model('system/Webservicelog_model', 'WebservicelogModel');
+ $this->WebservicelogModel->insert([
+ 'webservicetyp_kurzbz' => 'content',
+ 'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : null,
+ 'beschreibung' => 'Bescheidbestaetigungsdownload',
+ 'request_data' => $_SERVER['QUERY_STRING'],
+ 'execute_time' => date('c'),
+ 'execute_user' => getAuthUID()
+ ]);
+ }
+
+ $this->output->set_content_type($akte->mimetype);
+ $this->output->set_output(base64_decode($akte->inhalt));
+ }
+}
diff --git a/application/controllers/system/TestVBform.php b/application/controllers/Cis/InfoTerminal.php
similarity index 58%
rename from application/controllers/system/TestVBform.php
rename to application/controllers/Cis/InfoTerminal.php
index 9923bf05b..13dea1367 100644
--- a/application/controllers/system/TestVBform.php
+++ b/application/controllers/Cis/InfoTerminal.php
@@ -3,30 +3,28 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
- * Test VBform Vue Component
+ *
*/
-class TestVBform extends Auth_Controller
+class InfoTerminal extends Auth_Controller
{
/**
* Constructor
*/
public function __construct()
{
- parent::__construct(
- array(
- 'index' => 'system/developer:r'
- )
- );
+ parent::__construct([
+ 'index' => ['basis/cis:r'],
+ ]);
}
// -----------------------------------------------------------------------------------------------------------------
// Public methods
/**
- * Everything has a beginning
+ * @return void
*/
public function index()
{
- $this->load->view('system/logs/testVBform.php');
+ $this->load->view('Cis/InfoTerminal.php', []);
}
}
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
new file mode 100644
index 000000000..49a938553
--- /dev/null
+++ b/application/controllers/Cis/MyLv.php
@@ -0,0 +1,41 @@
+ ['basis/cis:r'],
+ 'Info' => [self::PERM_LOGGED]
+ ]);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+
+ $viewData = array(
+
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
+ }
+
+ public function Info($studien_semester,$lvid)
+ {
+ $this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
+ }
+}
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
new file mode 100644
index 000000000..8c3088bd7
--- /dev/null
+++ b/application/controllers/Cis/Profil.php
@@ -0,0 +1,742 @@
+ ['basis/cis:r'],
+ 'foto_sperre_function' => ['basis/cis:r'],
+ 'getView' => ['basis/cis:r'],
+ 'View' => ['basis/cis:r'],
+ 'isMitarbeiter' => ['basis/cis:r'],
+ 'isStudent' => ['basis/cis:r'],
+ 'getZustellAdresse' => ['basis/cis:r'],
+ 'getZustellKontakt' => ['basis/cis:r'],
+ 'getAllNationen' => ['basis/cis:r'],
+ 'getGemeinden' => ['basis/cis:r'],
+
+ ]);
+
+ $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->load->model('person/Adresse_model', 'AdresseModel');
+ $this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+ $this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+ $this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+ $this->load->model('person/Kontakt_model', 'KontaktModel');
+ $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+ $this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+
+ //? put the uid and pid inside the controller for reusability
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+
+ /**
+ * index loads the Profil view
+ * @access public
+ * @return void
+ */
+ public function index()
+ {
+ $viewData = array(
+
+ );
+ $this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
+ }
+
+ /**
+ * redirects to the index function (needed to allow calling this URI)
+ * @access public
+ * @return void
+ */
+ public function View($uid)
+ {
+ $viewData = array ('uid' => $uid);
+
+ $this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
+ }
+
+ /**
+ * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+ * @access public
+ * @param $uid the userID used to check if it is a mitarbeiter
+ * @return boolean
+ */
+ public function isStudent($uid)
+ {
+ $result = $this->StudentModel->isStudent($uid);
+ if (isError($result)) {
+ show_error("error when calling Student_model function isStudent with uid " . $uid);
+ }
+ $result = getData($result);
+ echo json_encode($result);
+ }
+
+ /**
+ * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+ * @access public
+ * @param $uid the userID used to check if it is a mitarbeiter
+ * @return boolean
+ */
+ public function isMitarbeiter($uid)
+ {
+ $result = $this->MitarbeiterModel->isMitarbeiter($uid);
+ if (isError($result)) {
+ show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid);
+ }
+ $result = getData($result);
+ echo json_encode($result);
+ }
+
+ /**
+ * gets the adressen that are marked as zustell from the currenlty logged in user
+ * @access public
+ * @return array a list of adresse_id's
+ */
+ public function getZustellAdresse()
+ {
+ $this->AdresseModel->addSelect(["adresse_id"]);
+ $adressen_res = $this->AdresseModel->loadWhere(['person_id' => $this->pid, 'zustelladresse' => true]);
+ $adressen_res = hasData($adressen_res) ? getData($adressen_res) : null;
+ $adressen_res = array_map(function ($item) {
+ return $item->adresse_id;
+ }, $adressen_res);
+ echo json_encode($adressen_res);
+ }
+
+ /**
+ * gets the kontakte that are marked as zustell from the currenlty logged in user
+ * @access public
+ * @return array a list of kontakt_id's
+ */
+ public function getZustellKontakt()
+ {
+ $this->KontaktModel->addSelect(["kontakt_id"]);
+ $kontakt_res = $this->KontaktModel->loadWhere(['person_id' => $this->pid, 'zustellung' => true]);
+ $kontakt_res = hasData($kontakt_res) ? getData($kontakt_res) : null;
+ $kontakt_res = array_map(function ($item) {
+ return $item->kontakt_id;
+ }, $kontakt_res);
+ echo json_encode($kontakt_res);
+ }
+
+ /**
+ * function that returns the data used for the corresponding view
+ * the client side parses the @param $uid and calls this function to get the data to the correct view
+ * @access public
+ * @param boolean $uid the userID used to identify which information should be retrieved for which view
+ * @return stdClass all the data corresponding to a view of a user
+ */
+ public function getView($uid)
+ {
+ $res = new stdClass();
+
+ // if parsing the URL did not found a UID then the UID of the logged in user is used
+ if ($uid == "Profil" || $uid == $this->uid) {
+ $isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+ if (isError($isMitarbeiter)) {
+ show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
+ }
+ $isMitarbeiter = getData($isMitarbeiter);
+ if ($isMitarbeiter) {
+ $res->view = "MitarbeiterProfil";
+ $res->data = $this->mitarbeiterProfil();
+ $res->data->pid = $this->pid;
+ } else {
+ $res->view = "StudentProfil";
+ $res->data = $this->studentProfil();
+ $res->data->pid = $this->pid;
+ }
+ }
+ // UID is availabe when accessing Profil/View/:uid
+ else {
+ $this->PersonModel->addSelect(["person_id"]);
+ $pid = $this->PersonModel->getByUid($uid);
+ if (isError($pid)) {
+ show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
+ }
+ $pid = hasData($pid) ? getData($pid)[0] : null;
+ if (!$pid) {
+ show_error("Person with UID: " . $uid . " does not exist");
+ }
+ $isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+ if (isError($isMitarbeiter)) {
+ show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
+ }
+ $isMitarbeiter = getData($isMitarbeiter);
+ if ($isMitarbeiter) {
+ $res->view = "ViewMitarbeiterProfil";
+ $res->data = $this->viewMitarbeiterProfil($uid);
+
+ } else {
+ $res->view = "ViewStudentProfil";
+ $res->data = $this->viewStudentProfil($uid);
+ }
+ }
+ echo json_encode($res);
+ }
+
+ /**
+ * update column foto_sperre in public.tbl_person
+ * @access public
+ * @param boolean $value new value for the column
+ * @return boolean the new value added to the column in public.tbl_person
+ */
+ public function foto_sperre_function($value)
+ {
+ $res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
+ if (isError($res)) {
+ show_error("error while trying to update table public.tbl_person");
+ }
+ $this->PersonModel->addSelect("foto_sperre");
+ $res = $this->PersonModel->load($this->pid);
+ if (isError($res)) {
+ show_error("error while trying to query table public.tbl_person");
+ }
+ $res = hasData($res) ? getData($res)[0] : null;
+ echo json_encode($res);
+ }
+
+ /**
+ * gets all nations in the table bis.tbl_nation
+ *
+ * @access public
+ * @return array all the nations in table bis.tbl_nation
+ */
+ public function getAllNationen()
+ {
+ $this->load->model('codex/Nation_model', "NationModel");
+ $this->NationModel->addSelect(["nation_code as code", "langtext"]);
+ $nation_res = $this->NationModel->load();
+ if (isError($nation_res)) {
+ show_error("error while trying to query table codex.tbl_nation");
+ }
+ $nation_res = hasData($nation_res) ? getData($nation_res) : null;
+ echo json_encode($nation_res);
+ }
+
+ /**
+ * gets specific gemeinden which are related to the ZIP and the Nation passed in the body of the get request
+ * @access public
+ * @var $_GET function uses GET request payload
+ * @return boolean the new value added to the column in public.tbl_person
+ */
+ public function getGemeinden()
+ {
+ /** @var $nation value parsed out of the body of the get request */
+ $nation = $this->input->get('nation', true);
+ /** @var $zip value parsed out of the body of the get request and converted to a php integer with json_decode */
+ $zip = json_decode($this->input->get('zip', true));
+
+ $this->load->model('codex/Gemeinde_model', "GemeindeModel");
+ $this->GemeindeModel->addDistinct();
+ $this->GemeindeModel->addSelect(["name"]);
+ if ($nation == "A") {
+ if (isset($zip) && $zip > 999 && $zip < 32000) {
+
+ $gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+ if (isError($gemeinde_res)) {
+ show_error("error while trying to query bis.tbl_gemeinde");
+ }
+ $gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+ $gemeinde_res = array_map(function ($obj) {
+ return $obj->name;
+ }, $gemeinde_res);
+ echo json_encode($gemeinde_res);
+
+ } else {
+ echo json_encode(error("ortschaftskennziffer code was not valid"));
+ }
+ } else {
+ echo json_encode(error("Nation was not 'A' (Austria)"));
+ }
+ }
+
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+ /**
+ * function that returns the data used for viewing another mitarbeiter profile
+ * @access private
+ * @param integer $uid the userID to retrieve the mitarbeiter data
+ * @return stdClass restricted mitarbeiter data
+ */
+ private function viewMitarbeiterProfil($uid)
+ {
+ $mailverteiler_res = $this->getMailverteiler($uid);
+ $benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+ $benutzer_res = $this->getBenutzerAlias($uid);
+ $person_res = $this->getPersonInfo($uid);
+ $mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+ $telefon_res = $this->getTelefonInfo($uid);
+
+ $res = new stdClass();
+ $res->username = $uid;
+
+ //? Person Info
+ foreach ($person_res as $key => $val) {
+ $res->$key = $val;
+ }
+
+ //? Mitarbeiter Info
+ foreach ($mitarbeiter_res as $key => $val) {
+ $res->$key = $val;
+
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $uid . "@" . DOMAIN;
+ $extern_email = array();
+ $extern_email["type"] = "alias";
+ $extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+ $res->emails = array($intern_email, $extern_email);
+
+ $res->funktionen = $benutzer_funktion_res;
+ $res->mailverteiler = $mailverteiler_res;
+ $res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+ return $res;
+ }
+
+ /**
+ * function that returns the data used for viewing another student profile
+ * @access private
+ * @param integer $uid the userID to retrieve the student data
+ * @return stdClass restricted student data
+ */
+ private function viewStudentProfil($uid)
+ {
+ $mailverteiler_res = $this->getMailverteiler($uid);
+ $person_res = $this->getPersonInfo($uid);
+ $student_res = $this->getStudentInfo($uid);
+ $matr_res = $this->getMatrikelNummer($uid);
+
+ $res = new stdClass();
+ $res->username = $uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Student Information
+ foreach ($student_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $uid . "@" . DOMAIN;
+
+ $res->emails = [$intern_email];
+ $res->matrikelnummer = $matr_res->matr_nr;
+ $res->mailverteiler = $mailverteiler_res;
+
+ return $res;
+ }
+
+ /**
+ * function that returns the data used for the mitarbeiter profile
+ * @access private
+ * @return stdClass mitarbeiter data
+ */
+ private function mitarbeiterProfil()
+ {
+
+ $zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+ $adresse_res = $this->getAdressenInfo($this->pid);
+ $kontakte_res = $this->getKontaktInfo($this->pid);
+ $mailverteiler_res = $this->getMailverteiler($this->uid);
+ $person_res = $this->getPersonInfo($this->uid, true);
+ $benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+ $betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+ $profilUpdates = $this->getProfilUpdates($this->uid);
+ $telefon_res = $this->getTelefonInfo($this->uid);
+ $mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
+
+ $res = new stdClass();
+ $res->username = $this->uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Mitarbeiter Information
+ foreach ($mitarbeiter_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ $res->adressen = $adresse_res;
+ $res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+ $res->kontakte = $kontakte_res;
+ $res->mittel = $betriebsmittelperson_res;
+ $res->mailverteiler = $mailverteiler_res;
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $this->uid . "@" . DOMAIN;
+ $extern_email = array();
+ $extern_email["type"] = "alias";
+ $extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+ $res->emails = [$intern_email, $extern_email];
+
+ $res->funktionen = $benutzer_funktion_res;
+ $res->standort_telefon = $telefon_res;
+ $res->profilUpdates = $profilUpdates;
+
+ return $res;
+ }
+
+ /**
+ * function that returns the data used for the student profile
+ * @access private
+ * @return stdClass student data
+ */
+ private function studentProfil()
+ {
+ $betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+ $kontakte_res = $this->getKontaktInfo($this->pid);
+ $zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+ $adresse_res = $this->getAdressenInfo($this->pid);
+ $mailverteiler_res = $this->getMailverteiler($this->uid);
+ $person_res = $this->getPersonInfo($this->uid, true);
+ $zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+ $student_res = $this->getStudentInfo($this->uid);
+ $matr_res = $this->getMatrikelNummer($this->uid);
+ $profilUpdates = $this->getProfilUpdates($this->uid);
+
+ $res = new stdClass();
+ $res->username = $this->uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Student Information
+ foreach ($student_res as $key => $value) {
+ $res->$key = trim($value);
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $this->uid . "@" . DOMAIN;
+
+ $res->emails = [$intern_email];
+ $res->adressen = $adresse_res;
+ $res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+ $res->kontakte = $kontakte_res;
+ $res->mittel = $betriebsmittelperson_res;
+ $res->matrikelnummer = $matr_res->matr_nr;
+ $res->zuttritsgruppen = $zutrittsgruppe_res;
+ $res->mailverteiler = $mailverteiler_res;
+ $res->profilUpdates = $profilUpdates;
+
+ return $res;
+ }
+
+ /**
+ * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+ * @access private
+ * @param integer $uid the userID used to retrieve the mailverteiler
+ * @return array returns the mailvertailer corresponding to a userID
+ */
+ private function getMailverteiler($uid)
+ {
+ $this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+ $this->PersonModel->addJoin('tbl_benutzer', 'person_id');
+ $this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+ $this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+ $mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+ if (isError($mailverteiler_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
+ }
+ $mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+ $mailverteiler_res = array_map(function ($element) {
+ $element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+ return $element;
+ }, $mailverteiler_res);
+ return $mailverteiler_res;
+ }
+
+ /**
+ * gets all the Benutzerfunktionen of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to retrieve the Benutzerfunktionen
+ * @return array returns the Benutzerfunktionen corresponding to a userID
+ */
+ private function getBenutzerFunktion($uid)
+ {
+ $this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+ $this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+ $benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+ if (isError($benutzer_funktion_res)) {
+ show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
+ }
+ $benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+ return $benutzer_funktion_res;
+ }
+
+ /**
+ * gets all the Betriebsmittel of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to retrieve the Betriebsmittel
+ * @return array returns the Betriebsmittel corresponding to a userID
+ */
+ private function getBetriebsmittelInfo($pid)
+ {
+ $this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+ //? betriebsmittel are not needed in a view
+ $betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+ if (isError($betriebsmittelperson_res)) {
+ show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
+ }
+ $betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+ return $betriebsmittelperson_res;
+ }
+
+ /**
+ * gets the alias of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to get the alias
+ * @return string the alias of the userID
+ */
+ private function getBenutzerAlias($uid)
+ {
+ $this->BenutzerModel->addSelect(["alias"]);
+ $benutzer_res = $this->BenutzerModel->load([$uid]);
+ if (isError($benutzer_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
+ } else {
+ $benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+ }
+
+ return $benutzer_res;
+ }
+
+ /**
+ * gets the person information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the person information
+ * @param integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+ * @return array all the person informaion corresponding to a userID
+ */
+ private function getPersonInfo($uid, $geburtsInfo = null)
+ {
+ $selectClause = ["foto", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+ /** @param integer $geburtsInfo */
+ if ($geburtsInfo) {
+ array_push($selectClause, "gebort");
+ array_push($selectClause, "gebdatum");
+ array_push($selectClause, "foto_sperre");
+ }
+ $this->BenutzerModel->addSelect($selectClause);
+ $this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+ $person_res = $this->BenutzerModel->load([$uid]);
+ if (isError($person_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
+ } else {
+ $person_res = hasData($person_res) ? getData($person_res)[0] : null;
+ }
+
+ return $person_res;
+ }
+
+ /**
+ * gets the mitarbeiter information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the mitarbeiter information
+ * @return array all the mitarbeiter informaion corresponding to a userID
+ */
+ private function getMitarbeiterInfo($uid)
+ {
+ $this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+ $this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+ $mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+ if (isError($mitarbeiter_res)) {
+ show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
+ } else {
+ $mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
+ }
+
+ return $mitarbeiter_res;
+ }
+
+ /**
+ * gets the telefon information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the telefon information
+ * @return array all the telefon informaion corresponding to a userID
+ */
+ private function getTelefonInfo($uid)
+ {
+ $this->MitarbeiterModel->addSelect(["kontakt"]);
+ $this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+ $this->MitarbeiterModel->addLimit(1);
+ $telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+ if (isError($telefon_res)) {
+ show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
+ }
+ $telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+ return $telefon_res;
+ }
+
+ /**
+ * gets the student information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the student information
+ * @return array all the student informaion corresponding to a userID
+ */
+ private function getStudentInfo($uid)
+ {
+ $this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+ $this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+ $student_res = $this->StudentModel->load([$uid]);
+ if (isError($student_res)) {
+ show_error("was not able to query the table public.tbl_student:" . getData($student_res));
+ }
+ $student_res = hasData($student_res) ? getData($student_res)[0] : null;
+ return $student_res;
+ }
+
+ /**
+ * gets the profil updates corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the profil updates
+ * @return array all the profil updates corresponding to a userID
+ */
+ private function getProfilUpdates($uid)
+ {
+ $profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+ if (isError($profilUpdates)) {
+ show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
+ }
+ $profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+ return $profilUpdates;
+ }
+
+ /**
+ * gets the Matrikelnummer corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the Matrikelnummer
+ * @return integer the Matrikelnummer corresponding to a userID
+ */
+ private function getMatrikelNummer($uid)
+ {
+ $this->BenutzerModel->addSelect(["matr_nr"]);
+ $this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+ $matr_res = $this->BenutzerModel->load([$uid]);
+ if (isError($matr_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
+ }
+ $matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+ return $matr_res;
+ }
+
+ /**
+ * gets the Zutrittsgruppen corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the Zutrittsgruppen
+ * @return array all the Zutrittsgruppen corresponding to a userID
+ */
+ private function getZutrittsgruppen($uid)
+ {
+ $this->BenutzergruppeModel->addSelect(['bezeichnung']);
+ $this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+ $zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+ if (isError($zutrittsgruppe_res)) {
+ show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
+ }
+ $zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+ return $zutrittsgruppe_res;
+ }
+
+ /**
+ * gets the address information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the address information
+ * @return array all the address information corresponding to a userID
+ */
+ private function getAdressenInfo($pid)
+ {
+ $adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+ $adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
+ $adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+ $adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
+ if (isError($adresse_res)) {
+ show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
+ }
+ $adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+ return $adresse_res;
+ }
+
+ /**
+ * gets the kontakt information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the kontakt information
+ * @return array all the kontakt information corresponding to a userID
+ */
+ private function getKontaktInfo($pid)
+ {
+ $this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+ $this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+ $this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+ $this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+ $kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
+ if (isError($kontakte_res)) {
+ show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
+ }
+ $kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+ return $kontakte_res;
+ }
+
+ /**
+ * gets the date of issue of the FH access card corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the date of issue of the FH access card
+ * @return string the date of issue of the FH access card corresponding to a userID
+ */
+ private function getZutrittskarteDatum($uid)
+ {
+ $zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+ if (isError($zutrittskarte_ausgegebenam)) {
+ show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
+ }
+ $zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+
+ //? formats date from 01-01-2000 to 01.01.2000
+ $zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+ return $zutrittskarte_ausgegebenam;
+ }
+
+
+}
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
new file mode 100644
index 000000000..c47b7540b
--- /dev/null
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -0,0 +1,814 @@
+ ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+ 'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+ 'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+ 'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+ 'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+ 'show' => ['basis/cis:r'],
+
+ 'insertProfilRequest' => ['basis/cis:rw'],
+ 'updateProfilRequest' => ['basis/cis:rw'],
+ 'deleteProfilRequest' => ['basis/cis:rw'],
+ 'selectProfilRequest' => ['basis/cis:r'],
+ 'insertFile' => ['basis/cis:rw'],
+ 'getProfilRequestFiles' => ['basis/cis:r'],
+ 'getStatus' => ['basis/cis:r'],
+ 'getTopic' => ['basis/cis:r'],
+ ]);
+
+ $this->load->config('cis');
+
+ $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+ $this->load->model('person/Kontakt_model', 'KontaktModel');
+ $this->load->model('person/Adresse_model', 'AdresseModel');
+ $this->load->model('person/Adressentyp_model', 'AdressenTypModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->load->model('system/Sprache_model', 'SpracheModel');
+ $this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
+ $this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');
+
+ // Load language phrases
+ $this->loadPhrases(
+ array(
+ 'ui',
+ 'global',
+ 'person',
+ 'profil',
+ 'profilUpdate'
+ )
+ );
+
+ $this->load->library('DmsLib');
+ $this->load->library('PermissionLib');
+
+ //? put the uid and pid inside the controller for reusability
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+
+ // setup the ProfilUpdate states
+ $this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
+ $status_kurzbz = $this->ProfilUpdateStatusModel->load();
+ if (hasData($status_kurzbz)) {
+ list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
+
+ self::$STATUS_PENDING = $status_pending->status_kurzbz;
+ self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
+ self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
+ }
+ // setup the ProfilUpdate topics
+ $this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
+ $topic_kurzbz = $this->ProfilUpdateTopicModel->load();
+
+ if (hasData($topic_kurzbz)) {
+ foreach (getData($topic_kurzbz) as $topic) {
+ self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
+ }
+ }
+ }
+
+
+ public function index()
+ {
+ $this->load->view('Cis/ProfilUpdate');
+ }
+
+ public function id($profil_update_id = null)
+ {
+ $this->load->view('Cis/ProfilUpdate', ['profil_update_id' => $profil_update_id]);
+ }
+
+ public function getStatus()
+ {
+ echo json_encode([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
+ }
+
+ public function getTopic()
+ {
+ echo json_encode(self::$TOPICS);
+ }
+
+ private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
+ {
+ if($this->config->item('cis_send_profil_update_mails') === false)
+ {
+ return;
+ }
+
+ $this->load->helper('hlp_sancho_helper');
+ $email = $uid . "@" . DOMAIN;
+
+
+ function languageQuery($language)
+ {
+ return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+ }
+ $this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
+ $status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+ if (isError($status_translation)) {
+ show_error($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
+ }
+ $status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
+ if (isset($status_translation)) {
+ $mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+ if (!$mail_res) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+ }
+ }
+
+ }
+
+
+ private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
+ {
+ if($this->config->item('cis_send_profil_update_mails') === false)
+ {
+ return;
+ }
+
+ $this->load->helper('hlp_sancho_helper');
+ $emails = [];
+
+ $isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
+ if (isError($isMitarbeiter_res)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+ }
+ $isMitarbeiter_res = getData($isMitarbeiter_res);
+
+ //! if the $uid is a mitarbeiter and student, only the hr is notified by email
+ if ($isMitarbeiter_res) {
+ //? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+ //? use constant variable MAIL_GST to mail to the personalverwaltung
+ $this->MitarbeiterModel->addSelect([TRUE]);
+ $this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+ //? check if the the userID is a mitarbeiter and if the benutzer is active
+ $res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
+ if (isError($res)) {
+ show_error("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
+ }
+ if (hasData($res)) {
+ array_push($emails, MAIL_GST);
+ } else {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+ }
+ } else {
+ //? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
+ $isStudent_res = $this->StudentModel->isStudent($uid);
+ if (isError($isStudent_res)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
+ }
+ $isStudent_res = getData($isStudent_res);
+ if ($isStudent_res) {
+ //? Send email to the Studiengangsassistentinnen
+ $this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+ $this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+ $this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+ $this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+ $this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+ //* check if the benutzer itself is active
+ //* check if the student status is Student or Diplomand (active students)
+ $this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
+ $res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
+ if (isError($res)) {
+ show_error(getData($res));
+ } else {
+ $res = hasData($res) ? getData($res) : [];
+ foreach ($res as $emailObj) {
+ array_push($emails, $emailObj->email);
+ }
+ }
+ }
+ }
+ $mail_res = [];
+ //? sending email
+ foreach ($emails as $email) {
+ array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
+ }
+ foreach ($mail_res as $m_res) {
+ if (!$m_res) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+ }
+ }
+
+ }
+
+
+ public function show($dms_id)
+ {
+
+ $profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
+ $profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
+
+ //? checks if an profil update exists with the dms_id requested from the user
+ if ($profil_update) {
+ $is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
+ $is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
+
+ if (
+ $this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
+ $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
+ $this->uid == $profil_update->uid
+ ) {
+ // Get file to be downloaded from DMS
+ $newFilename = $this->uid . "/document_" . $dms_id;
+ $download = $this->dmslib->download($dms_id);
+ if (isError($download))
+ return $download;
+
+ // Download file
+ $this->outputFile(getData($download));
+
+
+ } else {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+ return;
+ }
+
+ } else {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
+ return;
+ }
+
+ }
+
+
+ public function insertFile($replace)
+ {
+ $replace = json_decode($replace);
+
+ if (!count($_FILES)) {
+ echo json_encode([]);
+ return;
+ }
+
+ //? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+ if (isset($replace)) {
+ $this->ProfilUpdateModel->addSelect(["attachment_id"]);
+ $profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+ if (isError($profilUpdate)) {
+ return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
+ }
+ //? get the attachmentID
+ $dms_id = hasData($profilUpdate) ? getData($profilUpdate)[0]->attachment_id : null;
+
+ //? delete old dms_file of Profil Update
+ $this->deleteOldVersionFile($dms_id);
+ }
+
+
+ $files = $_FILES['files'];
+ $file_count = count($files['name']);
+
+ $res = [];
+
+ for ($i = 0; $i < $file_count; $i++) {
+ $_FILES['files']['name'] = $files['name'][$i];
+ $_FILES['files']['type'] = $files['type'][$i];
+ $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+ $_FILES['files']['error'] = $files['error'][$i];
+ $_FILES['files']['size'] = $files['size'][$i];
+
+ $dms = [
+ "kategorie_kurzbz" => "profil_aenderung",
+ "version" => 0,
+ "name" => $_FILES['files']['name'],
+ "mimetype" => $_FILES['files']['type'],
+ "beschreibung" => $this->uid . " Profil Änderung",
+ "insertvon" => $this->uid,
+ "insertamum" => "NOW()",
+ ];
+
+ $tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+
+ $tmp_res = hasData($tmp_res) ? getData($tmp_res) : null;
+ array_push($res, $tmp_res);
+ }
+
+ echo json_encode($res);
+ }
+
+
+ public function selectProfilRequest()
+ {
+ $_GET = json_decode($this->input->raw_input_stream, true);
+ $uid = $this->input->get('uid');
+ $id = $this->input->get('id');
+ $whereClause = ['uid' => $this->uid];
+
+ if (isset($uid))
+ $whereClause['uid'] = $uid;
+ if (isset($id))
+ $whereClause['id'] = $id;
+
+ $res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+ $res = hasData($res) ? getData($res) : null;
+ echo json_encode($res);
+
+ }
+
+
+ public function getProfilRequestFiles()
+ {
+ $id = json_decode($this->input->raw_input_stream);
+
+ $this->ProfilUpdateModel->addSelect(["attachment_id"]);
+ $attachmentID = $this->ProfilUpdateModel->load([$id]);
+ if (isError($attachmentID)) {
+ return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
+ }
+ //? get the attachmentID
+ $dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
+
+ //? get the name to the file
+ $this->DmsVersionModel->addSelect(["name", "dms_id"]);
+ $attachment = $this->DmsVersionModel->load([$dms_id, 0]);
+ if (isError($attachment)) {
+ return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
+ }
+ $attachment = hasData($attachment) ? getData($attachment) : null;
+ //? returns {name:..., dms_id:...}
+ echo json_encode($attachment);
+ }
+
+ public function insertProfilRequest()
+ {
+
+ $json = json_decode($this->input->raw_input_stream);
+
+ $payload = $json->payload;
+ $identifier = property_exists($json->payload, "kontakt_id") ? "kontakt_id" : (property_exists($json->payload, "adresse_id") ? "adresse_id" : null);
+
+ $data = ["topic" => $json->topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
+
+ //? insert fileID in the dataset if sent with post request
+ if (isset($json->fileID)) {
+ $data['attachment_id'] = $json->fileID;
+
+ }
+
+ //? loops over all updateRequests from a user to validate if the new request is valid
+ $res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
+ if (isError($res)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
+ }
+ $res = hasData($res) ? getData($res) : null;
+
+ //? the user cannot delete a zustelladresse/kontakt
+ if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+ return;
+ }
+
+ //? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+ if (isset($payload->delete) && $identifier == "adresse_id") {
+ $adr = $this->AdresseModel->load($payload->$identifier);
+ $adr = getData($adr)[0];
+ if ($adr->heimatadresse) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+ return;
+ }
+ }
+
+ if ($res) {
+ $pending_changes = array_filter($res, function ($element) {
+ return $element->status == (self::$STATUS_PENDING ?: "Pending");
+ });
+
+ foreach ($pending_changes as $update_request) {
+ $existing_change = $update_request->requested_change;
+
+ //? the user can add as many new kontakte/adressen as he likes
+ if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
+ //? the kontakt_id / adresse_id of a change has to be unique
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
+ return;
+ }
+
+ //? if it is not updating any kontakt/adresse, the topic has to be unique
+ elseif (!$identifier && $update_request->topic == $json->topic) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
+ return;
+ }
+ }
+ }
+
+ $insertID = $this->ProfilUpdateModel->insert($data);
+
+ if (isError($insertID)) {
+ show_error(getData($insertID));
+ } else {
+ $insertID = hasData($insertID) ? getData($insertID) : null;
+
+ //? sends emails to the correspondents of the $uid
+ $this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $json->topic);
+ echo json_encode(success($insertID));
+ }
+ }
+
+ public function updateProfilRequest()
+ {
+ $json = json_decode($this->input->raw_input_stream);
+
+ $updateData = ["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
+ if (isset($json->fileID)) {
+ $updateData['attachment_id'] = json_decode($json->fileID);
+ }
+ $updateID = $this->ProfilUpdateModel->update([$json->ID], $updateData);
+ //? insert fileID in the dataset if sent with post request
+
+ if (isError($updateID)) {
+ //catch error
+ } else {
+ $updateID = hasData($updateID) ? getData($updateID)[0] : null;
+ //TODO: should an email be sent to the responsable people when the user changes his profil update
+ echo json_encode(success($updateID));
+ }
+ }
+
+ public function deleteProfilRequest()
+ {
+
+ $json = json_decode($this->input->raw_input_stream);
+ $delete_res = $this->ProfilUpdateModel->delete([$json]);
+ echo json_encode($delete_res);
+ }
+
+
+ public function getProfilUpdateWithPermission($status = null)
+ {
+ // early return if no status has been passed as argument
+ if (!isset($status)) {
+ echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+ return;
+ }
+
+ // get the sprache of the user
+ $sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
+ $sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
+
+ if (isset($sprachenIndex) && isset($status)) {
+ // get the corresponding status kurz_bz primary key out of the translation
+ $status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
+ $status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
+ $res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
+
+ echo json_encode($res);
+ }
+ }
+
+
+
+ private function getOE_from_student($student_uid)
+ {
+
+ //? returns the oe_einheit eines Studenten
+ $query = "SELECT public.tbl_studiengang.oe_kurzbz
+ FROM public.tbl_student
+ JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+ WHERE public.tbl_student.student_uid = ?;";
+
+ $res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+ if (!isSuccess($res)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
+ }
+ $res = hasData($res) ? getData($res) : [];
+ $res = array_map(
+ function ($item) {
+ return $item->oe_kurzbz;
+ },
+ $res
+ );
+ return $res;
+ }
+
+
+ public function acceptProfilRequest()
+ {
+ $_POST = json_decode($this->input->raw_input_stream, true);
+ $id = $this->input->post('profil_update_id', true);
+ $uid = $this->input->post('uid', true);
+
+ //? fetching person_id using UID
+ $personID = $this->PersonModel->getByUid($uid);
+ $personID = hasData($personID) ? getData($personID)[0]->person_id : null;
+ $status_message = $this->input->post('status_message', true);
+ $topic = $this->input->post('topic', true);
+
+ //! somehow the xss check converted boolean false to empty string
+ $requested_change = $this->input->post('requested_change');
+
+ //! check for required information
+ if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
+ return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
+ }
+
+ $is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+ $is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+
+ //? check if the permissions are set correctly
+ if (
+ $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+ $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+ ) {
+
+ if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
+ $insertID = $this->handleAdresse($requested_change, $personID);
+ $insertID = hasData($insertID) ? getData($insertID) : null;
+ if (isset($insertID)) {
+ $requested_change['adresse_id'] = $insertID;
+ $update_res = $this->updateRequestedChange($id, $requested_change);
+ if (isError($update_res)) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
+ return;
+ }
+ }
+
+ } else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
+ $insertID = $this->handleKontakt($requested_change, $personID);
+ $insertID = hasData($insertID) ? getData($insertID) : null;
+ if (isset($insertID)) {
+ $requested_change['kontakt_id'] = $insertID;
+ $update_res = $this->updateRequestedChange($id, $requested_change);
+ if (isError($update_res)) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
+ return;
+ }
+ }
+
+
+ } else {
+ switch ($topic) {
+ // mapping phrasen to database columns to make the update with the correct column names
+ case self::$TOPICS['Titel']:
+ $topic = "titelpre";
+ break;
+ case self::$TOPICS['Postnomen']:
+ $topic = "titelpost";
+ break;
+ case self::$TOPICS['Vorname']:
+ $topic = "vorname";
+ break;
+ case self::$TOPICS['Nachname']:
+ $topic = "nachname";
+ break;
+ default:
+ show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
+ return;
+ }
+
+ $result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
+ if (isError($result)) {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
+ return;
+ }
+ }
+ $this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
+
+ echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
+ } else {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+ }
+
+
+ }
+
+ public function denyProfilRequest()
+ {
+
+ $_POST = json_decode($this->input->raw_input_stream, true);
+ $id = $this->input->post('profil_update_id', true);
+ $uid = $this->input->post('uid', true);
+ $topic = $this->input->post('topic', true);
+ $status_message = $this->input->post('status_message', true);
+
+ $is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+ $is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+
+ if (
+ $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+ $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+ ) {
+ $this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
+ echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
+ } else {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+ }
+
+
+ }
+
+ private function updateRequestedChange($id, $requested_change)
+ {
+ return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
+ }
+
+ private function setStatusOnUpdateRequest($id, $status, $status_message)
+ {
+ return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
+ }
+
+ private function deleteOldVersionFile($dms_id)
+ {
+ if (!isset($dms_id)) {
+ return;
+ }
+
+ //? collect all the results of the deleted versions in an array
+ $res = array();
+
+ //? delete all the different versions of the dms_file
+ $dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+ $dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
+ if (isset($dmsVersions)) {
+ $zwischen_res = array_map(function ($item) {
+ return $item->version;
+ }, $dmsVersions);
+ foreach ($zwischen_res as $version) {
+ array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
+ }
+ } else {
+ echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
+ }
+
+ //? returns a result for each deleted dms_file
+ return $res;
+ }
+
+
+ private function handleKontakt($requested_change, $personID)
+ {
+ $kontakt_id = $requested_change["kontakt_id"];
+ //? removes the kontakt_id because we don't want to update the kontakt_id in the database
+ unset($requested_change["kontakt_id"]);
+
+
+ //! ADD
+ if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+ //? removes add flag
+ unset($requested_change['add']);
+ $requested_change['person_id'] = $personID;
+ $requested_change['insertamum'] = "NOW()";
+ $requested_change['insertvon'] = getAuthUID();
+ $insertID = $this->KontaktModel->insert($requested_change);
+ $insert_kontakt_id = $insertID;
+ if (isError($insert_kontakt_id)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
+ }
+ $insert_kontakt_id = hasData($insert_kontakt_id) ? getData($insert_kontakt_id) : null;
+ if ($insert_kontakt_id) {
+ $this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
+ }
+
+
+ }
+ //! DELETE
+ elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+ $this->KontaktModel->delete($kontakt_id);
+ }
+ //! UPDATE
+ else {
+ $requested_change['updateamum'] = "NOW()";
+ $requested_change['updatevon'] = getAuthUID();
+
+ $update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
+
+ if (isError($update_kontakt_id)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
+ }
+ $update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
+ if ($update_kontakt_id) {
+ $this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
+ }
+ }
+ return isset($insertID) ? $insertID : null;
+ }
+
+ private function handleAdresse($requested_change, $personID)
+ {
+
+ $this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+ $adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
+ $adr_kurzbz = hasData($adr_kurzbz) ? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
+ //? replace the address_typ with its correct kurzbz foreign key
+ $requested_change['typ'] = $adr_kurzbz;
+
+ $adresse_id = $requested_change["adresse_id"];
+ //? removes the adresse_id because we don't want to update the kontakt_id in the database
+ unset($requested_change["adresse_id"]);
+
+
+ //! ADD
+ if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+
+ //? removes add flag
+ unset($requested_change['add']);
+ $requested_change['insertamum'] = "NOW()";
+ $requested_change['insertvon'] = getAuthUID();
+ $requested_change['person_id'] = $personID;
+ //TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
+ $insertID = $this->AdresseModel->insert($requested_change);
+ $insert_adresse_id = $insertID;
+ if (isError($insert_adresse_id)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
+ }
+ $insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
+ if ($insert_adresse_id) {
+ $this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
+ }
+
+ }
+ //! DELETE
+ elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+ $this->AdresseModel->delete($adresse_id);
+ }
+ //! UPDATE
+ else {
+ $requested_change['updateamum'] = "NOW()";
+ $requested_change['updatevon'] = getAuthUID();
+ $update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+ if (isError($update_adresse_id)) {
+ show_error($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+ }
+ $update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
+ if ($update_adresse_id) {
+ $this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
+ }
+ }
+ return isset($insertID) ? $insertID : null;
+ }
+
+
+ private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+ {
+ if ($zustellung) {
+ $this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+ $this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
+ $zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+ if (!isSuccess($zustellKontakteArray)) {
+ return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
+ }
+ $zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
+
+ if ($zustellung && count($zustellKontakteArray) > 0) {
+ $zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
+ return $kontakt->kontakt_id != $kontakt_id;
+ });
+ foreach ($zustellKontakteArray as $kontakt) {
+ $this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
+ }
+
+ }
+ }
+ }
+
+ private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+ {
+ if ($zustellung) {
+ $this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
+ $this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
+ $zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+ if (!isSuccess($zustellAdressenArray)) {
+ return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
+ }
+ $zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
+
+ if ($zustellung && count($zustellAdressenArray) > 0) {
+
+ $zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
+
+ return $adresse->adresse_id != $adresse_id;
+ });
+ foreach ($zustellAdressenArray as $adresse) {
+ $this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
+ }
+
+ }
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
new file mode 100644
index 000000000..bebc844ab
--- /dev/null
+++ b/application/controllers/Cis/Pub.php
@@ -0,0 +1,167 @@
+ ['basis/cis:r']
+ )
+ );
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @param string $source [person|akte]
+ * @param integer $id
+ * @return void
+ */
+ public function bild($source, $id)
+ {
+ $this->load->model('person/Person_model', 'PersonModel');
+
+ $person_id_user = '';
+ $serverzugriff = false;
+
+ // Wenn das Bild direkt aufgerufen wird, ist eine Authentifizierung erforderlich
+ // Wenn es vom Server selbst aufgerufen wird, ist keine Auth. notwendig
+ // (z.B. fuer die Erstellung von PDFs)
+ if ($_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
+ // Wenn Session gesetzt ist, keine Abfrage, da diese Personen noch keine UID haben
+
+ if (isset($_SESSION['incoming/user'])) { // Von Incomingtool
+ $result = $this->PersonModel->loadWhere([
+ 'zugangscode' => $_SESSION['incoming/user']
+ ]);
+ if (hasData($result))
+ $person_id_user = current(getData($result))->person_id;
+ } elseif (isset($_SESSION['prestudent/user'])) { // Von Prestudententool
+ $result = $this->PersonModel->loadWhere([
+ 'zugangscode' => $_SESSION['prestudent/user']
+ ]);
+ if (hasData($result))
+ $person_id_user = current(getData($result))->person_id;
+ } elseif (isset($_SESSION['bewerbung/personId'])) { // Von Bewerbungstool
+ $person_id_user = $_SESSION['bewerbung/personId'];
+ } else {
+ $person_id_user = getAuthPersonId();
+ }
+ } else {
+ $serverzugriff = true;
+ }
+
+ // Default Bild (Dummy Profilbild)
+ $cTmpHEX = base64_encode(file_get_contents(FHCPATH . 'skin/images/profilbild_dummy.jpg'));
+
+ if ($source == 'person' && $id) {
+ $foto_gesperrt = false;
+ // Person laden und Fotosperre überprüfen
+ $result = $this->PersonModel->load($id);
+ if (hasData($result)) {
+ $person = current(getData($result));
+ if ($person->foto_sperre) {
+ // Wenn der User selbst darauf zugreift darf er das Bild sehen
+ $foto_gesperrt = ($person_id_user != $id);
+ } elseif (!$person_id_user && !$serverzugriff) {
+ $foto_gesperrt = true;
+ }
+
+ if ($person->foto && !$foto_gesperrt) {
+ $cTmpHEX = base64_decode($person->foto);
+ }
+ }
+ }
+ if($source == 'akte' && $id != '')
+ {
+ $this->load->model('crm/Akte_model', 'AkteModel');
+
+ $this->AkteModel->addJoin('public.tbl_person', 'person_id');
+ $result = $this->AkteModel->loadWhere([
+ 'person_id' => $id,
+ 'dokument_kurzbz' => 'Lichtbil'
+ ]);
+
+ if (hasData($result)) {
+ $foto_gesperrt = false;
+
+ $akte = current(getData($result));
+ if ($akte->foto_sperre) {
+ // Wenn der User selbst darauf zugreift darf er das Bild sehen
+ $foto_gesperrt = ($person_id_user != $id);
+ } elseif (!$person_id_user && !$serverzugriff) {
+ $foto_gesperrt = true;
+ }
+
+ // Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
+ if (!$akte->inhalt && $akte->dms_id) {
+ $this->load->model('content/Dms_model', 'DmsModel');
+ $this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+ $this->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+ $this->DmsModel->addOrder('version', 'DESC');
+ $this->DmsModel->addLimit(1);
+ $result = $this->DmsModel->load($akte->dms_id);
+
+ if (!hasData($result))
+ die('Kein Dokument vorhanden');
+
+ $dms = current(getData($result));
+
+ $filename = DMS_PATH . $dms->filename;
+
+ $this->DmsVersionModel->update([
+ 'dms_id' => $dms->dms_id,
+ 'version' => $dms->version
+ ], [
+ 'letzterzugriff' => date('c')
+ ]);
+
+ if (file_exists($filename)) {
+ $handle = fopen($filename, "r");
+ if ($handle) {
+ while (!feof($handle)) {
+ $akte->inhalt .= fread($handle, 8192);
+ }
+ fclose($handle);
+ } else {
+ echo 'Fehler: Datei konnte nicht geoeffnet werden';
+ }
+ } else {
+ echo 'Die Datei existiert nicht';
+ }
+ }
+
+ if ($akte->inhalt && !$foto_gesperrt) {
+ $cTmpHEX = $akte->inhalt;
+ }
+ }
+ }
+
+ // die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
+ // von pdfs kommen kann.
+
+ $im = @imagecreatefromstring(base64_decode($cTmpHEX));
+ if ($im) {
+ @ob_clean();
+ header("Content-type: image/jpeg");
+ exit(imagejpeg($im));
+ } else {
+ // bei manchen Bildern funktioniert die konvertierung nicht
+ // diese werden dann einfach so angezeigt.
+ @ob_clean();
+ header("Content-type: image/gif");
+ exit($cTmpHEX);
+ }
+ }
+}
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
new file mode 100644
index 000000000..71e01be8b
--- /dev/null
+++ b/application/controllers/Cis/Stundenplan.php
@@ -0,0 +1,35 @@
+ ['basis/cis:r']
+ ]);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+
+ $viewData = array(
+ 'uid'=>getAuthUID(),
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Stundenplan']);
+ }
+}
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
new file mode 100644
index 000000000..c0ca8d503
--- /dev/null
+++ b/application/controllers/Cis4.php
@@ -0,0 +1,41 @@
+ 'basis/cis:r'
+ )
+ );
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+ $this->load->model('person/Person_model','PersonModel');
+ $personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+ $viewData = array(
+ 'uid' => getAuthUID(),
+ 'name' => $personData->vorname,
+ 'person_id' => $personData->person_id
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'FhcDashboard']);
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
new file mode 100644
index 000000000..a9ff13c53
--- /dev/null
+++ b/application/controllers/CisVue/Cms.php
@@ -0,0 +1,96 @@
+ 'basis/cis:r',
+ 'getNews' => 'basis/cis:r',
+ 'getNewsRowCount' => 'basis/cis:r',
+ 'getRoomInformation' => 'basis/cis:r',
+ 'news' => 'basis/cis:r'
+ )
+ );
+
+ // Loads Libraries
+ $this->load->library('CmsLib');
+
+ // Loads phrases system
+ $this->loadPhrases([
+ 'global'
+ ]);
+
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @param int $content_id
+ * @param int $version
+ * @param string $sprache
+ * @param boolean $sichtbar
+ *
+ * @return void
+ */
+ public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
+ {
+ // return early if the content_id for the content is missing
+ if (!isset($content_id))
+ $this->terminateWithError("content_id is missing");
+
+ $content = $this->ContentModel->load($content_id);
+ if (isError($content))
+ $this->terminateWithError(getError($content));
+
+ $content = getData($content);
+ if (NULL === $content)
+ $this->terminateWithError("Content not found");
+
+ $content = current($content);
+
+ $viewData = array(
+ 'content_id' => $content_id,
+ 'template_kurzbz' => $content->template_kurzbz,
+ 'version' => $version,
+ 'sichtbar' => $sichtbar
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Content']);
+ }
+
+ /**
+ * @param boolean $infoscreen
+ * @param string | null $studiengang_kz
+ * @param int | null $semester
+ * @param boolean $mischen
+ * @param string $titel
+ * @param boolean $edit
+ * @param boolean $sichtbar
+ *
+ * @return void
+ */
+ public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+ {
+ $viewData = array();
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
+ }
+
+ public function getRoomInformation($ort_kurzbz){
+ $viewData = array(
+ 'ort_kurzbz' => $ort_kurzbz
+ );
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'CmsRoom']);
+ }
+}
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
new file mode 100644
index 000000000..ee830cb8b
--- /dev/null
+++ b/application/controllers/CisVue/Dashboard.php
@@ -0,0 +1,43 @@
+ 'dashboard/benutzer:r'
+ )
+ );
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @return void
+ */
+ public function index()
+ {
+
+ $this->load->model('person/Person_model','PersonModel');
+ $personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+ $viewData = array(
+ 'uid' => getAuthUID(),
+ 'name' => $personData->vorname,
+ 'person_id' => $personData->person_id
+ );
+
+ $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/Documents.php b/application/controllers/Documents.php
new file mode 100644
index 000000000..47aae7ed1
--- /dev/null
+++ b/application/controllers/Documents.php
@@ -0,0 +1,294 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller handles output and access to documents.
+ * It creates a XML file, transforms it with the XSL-FO Vorlage from the
+ * database and generates a PDF file with unoconv or docsbox.
+ * This file is then outputted as download.
+ *
+ * It is the CodeIgniter version of content/pdfExport.php when not using the
+ * get paremeters: "archivdokument" and "archive".
+ * Use exportSigned() instead of providing the "sign" get parameter and
+ * export() otherwise.
+ */
+class Documents extends Auth_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'export' => self::PERM_LOGGED,
+ 'exportSigned' => self::PERM_LOGGED
+ ]);
+
+ // Load Phrases
+ $this->loadPhrases([
+ 'stv'
+ ]);
+ }
+
+ /**
+ * Download a not signed document.
+ *
+ * @param string $xml
+ * @param string $xsl
+ *
+ * @return void
+ */
+ public function export($xml, $xsl)
+ {
+ return $this->_export($xml, $xsl);
+ }
+
+ /**
+ * Download a signed document.
+ *
+ * @param string $xml
+ * @param string $xsl
+ *
+ * @return void
+ */
+ public function exportSigned($xml, $xsl)
+ {
+ return $this->_export($xml, $xsl, getAuthUID());
+ }
+
+ /**
+ * Helper function for export() and exportSigned()
+ *
+ * @param string $xml
+ * @param string $xsl
+ * @param string $sign_user (optional)
+ *
+ * @return void
+ */
+ protected function _export($xml, $xsl, $sign_user = null)
+ {
+ $xsl_oe_kurzbz = null;
+ $version = $this->input->post_get('version') ?: null;
+
+ // Get the OE or STG of the document
+ $xsl_oe_kurzbz = $this->input->post_get('xsl_oe_kurzbz')
+ ?: $this->input->post_get('xsl_stg_kz')
+ ?: $this->input->post_get('stg_kz');
+ if (is_null($xsl_oe_kurzbz)) {
+ $uid = $this->input->post_get('uid');
+ if ($uid) {
+ $uid = current(explode(';', $uid));
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$uid]);
+ if (!isError($result) && hasData($result))
+ $xsl_oe_kurzbz = current(getData($result))->studiengang_kz;
+ }
+ }
+ if (is_null($xsl_oe_kurzbz)) {
+ $prestudent_id = $this->input->post_get('prestudent_id');
+ if ($prestudent_id) {
+ $prestudent_id = current(explode(';', $prestudent_id));
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $result = $this->PrestudentModel->load($prestudent_id);
+ if (!isError($result) && hasData($result))
+ $xsl_oe_kurzbz = current(getData($result))->studiengang_kz;
+ }
+ }
+ if (is_null($xsl_oe_kurzbz))
+ $xsl_oe_kurzbz = 0;
+
+ // Access rights
+ if ($xsl == 'AccountInfo') {
+ $this->load->model('resource/Mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $uids = $this->input->post_get('uid');
+ if ($uids) {
+ $uids = explode(';', $uids);
+ foreach ($uids as $uid) {
+ $result = $this->MitarbeiterModel->load($uid);
+ if (!isError($result) && hasData($result)) {
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('mitarbeiter', 'suid', 0))
+ return $this->_outputAuthError([$this->router->method => ['admin:rw', 'mitarbeiter:rw']]);
+ } else {
+ $result = $this->StudentModel->load([$uid]);
+ if (!isError($result) && hasData($result)) {
+ $student = current(getData($result));
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz)
+ && !$this->permissionlib->isBerechtigt('admin', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz)
+ && !$this->permissionlib->isBerechtigt('assistenz', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('support', 'suid', 0))
+ return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw', 'support:rw']]);
+ }
+ }
+ }
+ }
+ } else {
+ $this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+
+ $result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
+ if (isError($result))
+ return show_error(getError($result));
+ if (!hasData($result))
+ return show_404();
+
+ $access_rights = current(getData($result))->berechtigung;
+ if (!$access_rights)
+ return show_404();
+ $allowed = false;
+ foreach ($access_rights as $access_right) {
+ if ($this->permissionlib->isBerechtigt($access_right)) {
+ $allowed = true;
+ break;
+ }
+ }
+ if (!$allowed)
+ return $this->_outputAuthError([$this->router->method => $access_rights]);
+ }
+
+ // Output format
+ $outputformat = $this->input->post_get('output') ?: 'pdf';
+ if ($outputformat != 'pdf'
+ // An der FHTW darf das Studienblatt und das Prüfungsprotokoll auch in anderen Formaten exportiert werden
+ && !(CAMPUS_NAME == 'FH Technikum Wien'
+ && ($xsl == 'Studienblatt'
+ || $xsl == 'StudienblattEng'
+ || $xsl == 'PrProtBA'
+ || $xsl == 'PrProtBAEng'
+ || $xsl == 'PrProtMA'
+ || $xsl == 'PrProtMAEng'
+ )
+ )
+ && !$this->permissionlib->isBerechtigt('system/change_outputformat', null, $xsl_oe_kurzbz)
+ ) {
+ $outputformat = 'pdf';
+ }
+
+ // XML Params
+ $params = 'xmlformat=xml';
+ foreach ([
+ 'uid',
+ 'stg_kz',
+ 'person_id',
+ 'id',
+ 'prestudent_id',
+ 'buchungsnummern',
+ 'ss',
+ 'abschlusspruefung_id',
+ 'typ',
+ 'all',
+ 'preoutgoing_id',
+ 'lvid',
+ 'projekt_kurzbz',
+ 'von',
+ 'bis',
+ 'stundevon',
+ 'stundebis',
+ 'sem',
+ 'lehreinheit',
+ 'mitarbeiter_uid',
+ 'studienordnung_id',
+ 'fixangestellt',
+ 'standort',
+ 'abrechnungsmonat',
+ 'form',
+ 'projektarbeit_id',
+ 'betreuerart_kurzbz',
+ 'studiensemester_kurzbz'
+ ] as $key) {
+ $value = $this->input->post_get($key);
+ if ($value !== null)
+ $params .= '&' . $key . '=' . urlencode($value);
+ }
+ $value = $this->input->post_get('vertrag_id');
+ if ($value !== null) {
+ foreach ($value as $id)
+ $params .= '&vertrag_id[]=' . urlencode($id);
+ }
+
+ $this->load->library('DocumentExportLib');
+ $this->load->model('system/Vorlage_model', 'VorlageModel');
+
+ $result = $this->VorlageModel->load($xsl);
+ if (isError($result))
+ return show_error(getError($result));
+ if (!hasData($result))
+ show_404();
+
+ $vorlage = current(getData($result));
+ if ($sign_user && !$vorlage->signierbar)
+ return show_error($this->p->t("stv", "grades_error_sign"));
+
+
+ // Filename
+ $filename = ($vorlage->bezeichnung ?: $vorlage->vorlage_kurzbz);
+ switch ($xsl) {
+ case 'LV_Informationen':
+ $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+ $result = $this->StudiengangModel->load($this->input->post_get('stg_kz'));
+ if (!isError($result) && hasData($result))
+ $filename .= '_' . sanitizeProblemChars(current(getData($result))->kurzbzlang);
+
+ $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+ $result = $this->StudiensemesterModel->load($this->input->post_get('ss'));
+ if (!isError($result) && hasData($result))
+ $filename .= '_' . sanitizeProblemChars(current(getData($result))->studiensemester_kurzbz);
+ break;
+ case 'Honorarvertrag':
+ $uid = str_replace(';', '', $this->input->post_get('uid') ?: '');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
+ $result = $this->BenutzerModel->load([$uid]);
+ if (!isError($result) && hasData($result)) {
+ $user = current(getData($result));
+ $filename .= '_' . sanitizeProblemChars($user->nachname) . '_' . sanitizeProblemChars($user->vorname);
+ }
+ break;
+ case 'Studienordnung':
+ $filename = 'Studienordnung-Studienplan-';
+
+ $this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+ $result = $this->StudienordnungModel->load($this->input->post_get('studienordnung_id'));
+ if (!isError($result) && hasData($result)) {
+ $so = current(getData($result));
+ $filename .= sprintf("%'.04d", $so->studiengang_kz) . '-' . $so->studiengangkurzbzlang;
+ }
+ break;
+ default:
+ $uid = str_replace(';', '', $this->input->post_get('uid') ?: '');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
+ $result = $this->BenutzerModel->load([$uid]);
+ if (!isError($result) && hasData($result)) {
+ $user = current(getData($result));
+ $filename .= '_' . sanitizeProblemChars($user->nachname);
+ }
+ break;
+ }
+
+ // XML Data
+ $result = $this->documentexportlib->getDataURL($xml, $params);
+ if (isError($result))
+ return show_error(getError($result));
+
+ $data = getData($result);
+
+ // Output
+ $this->documentexportlib->showContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+ }
+}
diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 0c27f3aba..2ce19c58a 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -2,11 +2,17 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
-class Studentenverwaltung extends FHC_Controller
+class Studentenverwaltung extends Auth_Controller
{
public function __construct()
{
- parent::__construct();
+ $permissions = [];
+ $router = load_class('Router');
+ $permissions[$router->method] = ['admin:r', 'assistenz:r'];
+ parent::__construct($permissions);
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
}
/**
@@ -14,20 +20,18 @@ class Studentenverwaltung extends FHC_Controller
*/
public function _remap()
{
- $this->load->library('AuthLib');
- $this->load->library('PermissionLib');
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
$this->load->view('Studentenverwaltung', [
'permissions' => [
'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
'student/alias' => $this->permissionlib->isBerechtigt('student/alias'),
'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'),
+ 'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
'admin' => $this->permissionlib->isBerechtigt('admin'),
'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
- 'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung')
-
+ 'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
+ 'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
+ 'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
],
'variables' => [
'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
diff --git a/application/controllers/Test.php b/application/controllers/Test.php
deleted file mode 100644
index 2a7aa4e4e..000000000
--- a/application/controllers/Test.php
+++ /dev/null
@@ -1,16 +0,0 @@
-antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
- $lvs = $this->getDataOrTerminateWithError($result) ?: [];
+ if (isError($result))
+ return $result;
+ $lvs = $result->retval;
$rdf_url = 'http://www.technikum-wien.at/antragnote';
diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
new file mode 100644
index 000000000..e0ffb4df5
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -0,0 +1,145 @@
+.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Ampeln extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'open' => self::PERM_LOGGED,
+ 'all' => self::PERM_LOGGED,
+ 'confirm' => self::PERM_LOGGED,
+ 'alleAmpeln' => self::PERM_LOGGED,
+ ]);
+
+ $this->load->model('content/Ampel_model', 'AmpelModel');
+ $this->load->model('system/Sprache_model', 'SpracheModel');
+
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * confirms ampel and inserts ampel_id in public.tbl_ampel_benutzer_bestaetigt
+ * @access public
+ *
+ */
+ public function confirm($ampel_id)
+ {
+ $this->load->library('form_validation');
+ $this->form_validation->set_data(['ampel_id'=> $ampel_id]);
+ $this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ // load Ampel_benutzer_bestaetigt_model to confirm the ampel
+ $this->load->model('content/Ampel_Benutzer_Bestaetigt_model', 'AmpelBenutzerBestaetigtModel');
+ $insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
+
+ $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+
+ $this->terminateWithSuccess($insert_into_result);
+ }
+
+ /**
+ * queries active and not confirmed ampeln by the user
+ * @access public
+ *
+ */
+ public function open()
+ {
+ $userAmpeln = array();
+
+ // fetch active ampeln
+ $activeAmpeln = $this->AmpelModel->openActive($this->uid, false);
+
+ $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
+
+ foreach ($activeAmpeln as $ampel) {
+ // only include non confirmed active ampeln in the result
+ if (!$ampel->bestaetigt) {
+ // check if the user was assigned to the ampel
+ $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
+
+ $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
+
+ if($zugeteilt) $userAmpeln[] = $ampel;
+ }
+ }
+
+ $this->terminateWithSuccess($userAmpeln);
+ }
+
+ /**
+ * queries all ampeln of the user
+ * @access public
+ *
+ */
+ public function all()
+ {
+ $userAmpeln = array();
+
+ $ampel_result = $this->AmpelModel->active(false, $this->uid);
+
+ $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+
+ foreach ($ampel_result as $ampel) {
+ // check if the ampel was assigned to the user
+ $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
+
+ $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
+
+ if ($zugeteilt) $userAmpeln[] = $ampel;
+ }
+
+ $this->terminateWithSuccess($userAmpeln);
+ }
+
+ /**
+ * queries all ampeln that were assigned to the user until start of first work day
+ * @access public
+ *
+ */
+ public function alleAmpeln()
+ {
+
+ //fetch all ampeln
+ $alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
+
+ $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
+
+ $alle_ampeln = array_map(function ($ampel) {
+ // check if ampel is confirmed by user
+ $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id, $this->uid);
+ $ampel->bestaetigt = $confirmedByUser;
+ return $ampel;
+ }, $alle_ampeln);
+
+ $this->terminateWithSuccess($alle_ampeln);
+ }
+}
+
diff --git a/application/controllers/api/frontend/v1/AuthInfo.php b/application/controllers/api/frontend/v1/AuthInfo.php
new file mode 100644
index 000000000..1362aee18
--- /dev/null
+++ b/application/controllers/api/frontend/v1/AuthInfo.php
@@ -0,0 +1,52 @@
+.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class AuthInfo extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getAuthUID' => self::PERM_LOGGED,
+ ]);
+
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * returns the uid of the currently logged in user
+ * @access public
+ *
+ */
+ public function getAuthUID()
+ {
+ $this->terminateWithSuccess(['uid'=>$this->uid]);
+ }
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
new file mode 100644
index 000000000..3e646bb51
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -0,0 +1,138 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Bookmark extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getBookmarks' => self::PERM_LOGGED,
+ 'delete' => self::PERM_LOGGED,
+ 'insert' => self::PERM_LOGGED,
+ 'update' => self::PERM_LOGGED,
+ ]);
+
+ $this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
+
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+
+ /**
+ * gets the bookmarks associated to a user
+ * @access public
+ * @return void
+ */
+ public function getBookmarks()
+ {
+ $this->BookmarkModel->addOrder("bookmark_id");
+ $bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
+
+ $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+
+ $this->terminateWithSuccess($bookmarks);
+ }
+
+ /**
+ * deletes bookmark from associated user
+ * @access public
+ * @return void
+ */
+ public function delete($bookmark_id)
+ {
+ $bookmark = $this->BookmarkModel->load($bookmark_id);
+
+ $bookmark = current($this->getDataOrTerminateWithError($bookmark));
+
+ // only delete bookmark if the user is the owner of the bookmark
+ if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){
+
+ $delete_result = $this->BookmarkModel->delete($bookmark_id);
+
+ $delete_result = $this->getDataOrTerminateWithError($delete_result);
+
+ $this->terminateWithSuccess($delete_result);
+ }else{
+ $this->_outputAuthError(['delete' => ['admin:rw']]);
+ }
+ }
+
+ /**
+ * inserts new bookmark into the bookmark table
+ * @access public
+ * @return void
+ */
+ public function insert()
+ {
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+ $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $url = $this->input->post('url',true);
+ $title = $this->input->post('title',true);
+ $tag = $this->input->post('tag', true);
+
+ $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);
+
+ $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+
+ $this->terminateWithSuccess($insert_into_result);
+
+ }
+
+ /**
+ * updates bookmark in the bookmark table
+ * @access public
+ * @return void
+ */
+ public function update($bookmark_id)
+ {
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+ $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $url = $this->input->post('url',true);
+ $title = $this->input->post('title',true);
+
+ $now = new DateTime();
+ $now = $now->format('Y-m-d H:i:s');
+
+ $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);
+
+ $update_result = $this->getDataOrTerminateWithError($update_result);
+
+ $this->terminateWithSuccess($update_result);
+
+ }
+}
+
diff --git a/application/controllers/api/frontend/v1/Cis4FhcApi.php b/application/controllers/api/frontend/v1/Cis4FhcApi.php
new file mode 100644
index 000000000..372e4bfaa
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Cis4FhcApi.php
@@ -0,0 +1,58 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Cis4FhcApi extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getViewData' => self::PERM_LOGGED,
+ ]);
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * fetches ViewData
+ */
+ public function getViewData()
+ {
+ $this->load->model('person/Person_model','PersonModel');
+ $personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+ $viewData = array(
+ 'uid' => getAuthUID(),
+ 'name' => $personData->vorname,
+ 'person_id' => $personData->person_id
+ );
+
+ $this->terminateWithSuccess($viewData);
+ }
+
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/CisMenu.php b/application/controllers/api/frontend/v1/CisMenu.php
new file mode 100644
index 000000000..4f4f2573e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/CisMenu.php
@@ -0,0 +1,58 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class CisMenu extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getMenu' => self::PERM_LOGGED,
+ ]);
+
+
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * fetches the menu for CIS from the database based on the userLanguage
+ */
+ public function getMenu()
+ {
+ $this->load->model('content/Content_model', 'ContentModel');
+ $this->load->config('cis');
+ $cis4_content_id =$this->config->item('cis_menu_root_content_id');
+ $result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
+ $result = $this->getDataOrTerminateWithError($result);
+ $menu = $result->childs ?? [];
+ $this->terminateWithSuccess($menu);
+ }
+
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
new file mode 100644
index 000000000..b8937a1f4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -0,0 +1,207 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Cms extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ // NOTE(chris): additional permission checks will be done in SearchBarLib
+ parent::__construct([
+ 'ContentID' => self::PERM_LOGGED,
+ 'getOrtKurzbzContent' => self::PERM_LOGGED,
+ 'content' => self::PERM_LOGGED,
+ 'news' => self::PERM_LOGGED,
+ 'getNewsRowCount' => self::PERM_LOGGED,
+ 'getNews' => self::PERM_LOGGED,
+
+ ]);
+
+ $this->load->model('content/News_model', 'NewsModel');
+
+ // setting up the papgination_size
+ $this->page_size = 10;
+
+ $this->load->library('CmsLib');
+
+ // Loads phrases system
+ $this->loadPhrases([
+ 'global'
+ ]);
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * fetches the content with the content_id and additional parameters
+ */
+ public function content()
+ {
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('content_id','Content ID','required|is_natural');
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ // getting the get parameters
+ $content_id = $this->input->get("content_id",TRUE);
+ $version = $this->input->get("version",TRUE);
+ $sprache = $this->input->get("sprache",TRUE);
+ $sichtbar = $this->input->get("sichtbar",TRUE);
+
+ $content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+ $content = $this->getDataOrTerminateWithError($content);
+
+ $this->terminateWithSuccess($content);
+ }
+
+ /**
+ * Gets a JSON body via HTTP POST and provides the parameters
+ */
+ public function ContentID()
+ {
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('ort_kurzbz', 'Ort', 'required');
+ if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $ort_kurzbz = $this->input->get('ort_kurzbz',TRUE);
+
+ $content_id = $this->OrtModel->getContentID($ort_kurzbz);
+
+ $content_id = current($this->getDataOrTerminateWithError($content_id))->content_id;
+
+ $this->terminateWithSuccess($content_id);
+ }
+
+ public function news()
+ {
+
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('limit','Limit','required|is_natural_no_zero');
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $this->load->model('content/news_model', 'NewsModel');
+
+ $limit = $this->input->get('limit',TRUE);
+
+ //query the news
+ $news = $this->NewsModel->getAll($limit);
+
+ //get the data or terminate with error
+ $news = $this->getDataOrTerminateWithError($news);
+ // array that keeps track of which news don't have a betreff and have to be removed from the news array
+ $newsToRemove = array();
+ // collect the content of the news
+ foreach($news as $index=>$news_element){
+
+ $this->NewsModel->resetQuery();
+ $content = $this->cmslib->getContent($news_element->content_id);
+ if(isError($content))
+ {
+ // removes the news from the news array, so that the response does not include a invalid news
+ array_push($newsToRemove,$index);
+ //add the error to the api response? visual feedback
+ //$this->addError(print_r($content->retval,true));
+ continue;
+ }
+ $content = getData($content);
+ $news_element->content_obj = $content;
+ }
+
+ //removes all news that don't have a betreff
+ foreach($newsToRemove as $removeNewsIndex)
+ {
+ unset($news[$removeNewsIndex]);
+ }
+
+ $withContent = function($news) {
+ return $news->content_obj != null;
+ };
+ $newsWithContent = array_filter($news, $withContent);
+ $this->terminateWithSuccess($newsWithContent);
+
+ }
+
+ public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+ {
+ list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+ $all = $edit;
+
+ $this->load->model('content/News_model','NewsModel');
+
+ $num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+
+ $num_rows = $this->getDataOrTerminateWithError($num_rows);
+
+ $this->terminateWithSuccess($num_rows);
+
+ }
+
+
+ public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+ {
+ //form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('page','Page','required|is_natural');
+ $this->form_validation->set_rules('page_size', 'PageSize', 'is_natural');
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ // getting the GET parameters
+ $page = intval($this->input->get('page', true));
+ $page_size = intval($this->input->get('page_size', true));
+ $sprache = $this->input->get('sprache', true);
+ if(!$sprache)
+ {
+ $sprache = getUserLanguage();
+ }
+
+ // default value for the page_size is 10
+ $page_size = $page_size ?? 10;
+
+ $news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size, $sprache);
+ $news = $this->getDataOrTerminateWithError($news);
+
+ $this->addMeta('phrases', json_decode($this->p->getJson()));
+ $this->terminateWithSuccess($news);
+
+ }
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
new file mode 100644
index 000000000..60010e14d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -0,0 +1,422 @@
+.
+ */
+
+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 documents
+ * Listens to ajax post calls to change the documents data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ *
+ * This controller handles output and access to documents.
+ * It checks permissions to render documents in an alternative format
+ * or it creates a XML file, transforms it with the XSL-FO Vorlage from the
+ * database and generates a PDF file with unoconv or docsbox.
+ * This file is then archivated in the database.
+ *
+ * The last part is the CodeIgniter version of content/pdfExport.php when not
+ * using the get paremeter: "archivdokument" but using the get parameter:
+ * "archive".
+ * Use archiveSigned() instead of providing the "sign" get parameter and
+ * archive() otherwise.
+ */
+class Documents extends FHCAPI_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'permissionAlternativeFormat' => self::PERM_LOGGED,
+ 'archive' => ['admin:rw', 'assistenz:rw'],
+ 'archiveSigned' => ['admin:rw', 'assistenz:rw']
+ ]);
+
+ // Load Phrases
+ $this->loadPhrases([
+ 'stv'
+ ]);
+ }
+
+ /**
+ * Checks if the current user has permission to render documents in an
+ * alternative format.
+ *
+ * @param string $oe_kurzbz Or studiengang_kz
+ *
+ * @return void
+ */
+ public function permissionAlternativeFormat($oe_kurzbz)
+ {
+ $this->terminateWithSuccess($this->permissionlib->isBerechtigt('system/change_outputformat', null, $oe_kurzbz));
+ }
+
+ /**
+ * Download a not signed document.
+ *
+ * @param string $xml (optional)
+ * @param string $xsl (optional)
+ *
+ * @return void
+ */
+ public function archive($xml = null, $xsl = null)
+ {
+ return $this->_archive($xml, $xsl);
+ }
+
+ /**
+ * Download a signed document.
+ *
+ * @param string $xml (optional)
+ * @param string $xsl (optional)
+ *
+ * @return void
+ */
+ public function archiveSigned($xml = null, $xsl = null)
+ {
+ return $this->_archive($xml, $xsl, getAuthUID());
+ }
+
+ /**
+ * Helper function for archive() and archiveSigned()
+ *
+ * @param string $xml
+ * @param string $xsl
+ * @param string $sign_user (optional)
+ *
+ * @return void
+ */
+ public function _archive($xml, $xsl, $sign_user = null)
+ {
+ if (!$xml || !$xsl) {
+ $this->load->library('form_validation');
+ if (!$xml) {
+ $xml = $this->input->post_get('xml');
+ $this->form_validation->set_rules('xml', 'xml', 'required');
+ }
+ if (!$xsl) {
+ $xsl = $this->input->post_get('xsl');
+ $this->form_validation->set_rules('xsl', 'xsl', 'required');
+ }
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $xsl_oe_kurzbz = null;
+ $version = $this->input->post_get('version') ?: null;
+
+ // Get the OE or STG of the document
+ $xsl_oe_kurzbz = $this->input->post_get('xsl_oe_kurzbz')
+ ?: $this->input->post_get('xsl_stg_kz')
+ ?: $this->input->post_get('stg_kz');
+ if (is_null($xsl_oe_kurzbz)) {
+ $uid = $this->input->post_get('uid');
+ if ($uid) {
+ $uid = current(explode(';', $uid));
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$uid]);
+ if (!isError($result) && hasData($result))
+ $xsl_oe_kurzbz = current(getData($result))->studiengang_kz;
+ }
+ }
+ if (is_null($xsl_oe_kurzbz)) {
+ $prestudent_id = $this->input->post_get('prestudent_id');
+ if ($prestudent_id) {
+ $prestudent_id = current(explode(';', $prestudent_id));
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $result = $this->PrestudentModel->load($prestudent_id);
+ if (!isError($result) && hasData($result))
+ $xsl_oe_kurzbz = current(getData($result))->studiengang_kz;
+ }
+ }
+ if (is_null($xsl_oe_kurzbz))
+ $xsl_oe_kurzbz = 0;
+
+ // Vorlage
+ $this->load->model('system/Vorlage_model', 'VorlageModel');
+
+ $result = $this->VorlageModel->load($xsl);
+ $vorlage = current($this->getDataOrTerminateWithError($result));
+ if (!$vorlage)
+ show_404();
+
+ // Akte Data
+ $akteData = [
+ 'dokument_kurzbz' => $vorlage->dokument_kurzbz ?: 'Zeugnis',
+ 'mimetype' => 'application/pdf',
+ 'erstelltam' => date('Y-m-d'),
+ 'gedruckt' => true,
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID(),
+ 'uid' => $this->input->post_get('uid') ?: '',
+ 'archiv' => true,
+ 'signiert' => !!$sign_user,
+ 'stud_selfservice' => $vorlage->stud_selfservice
+ ];
+ $studiengang_kz = null;
+ if ($akteData['uid']) {
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->StudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+ $result = $this->StudentModel->load([$akteData['uid']]);
+ $student = current($this->getDataOrTerminateWithError($result));
+
+ $ss = $this->input->post_get('ss');
+
+ if ($ss !== null) {
+ $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
+ $result = $this->PrestudentstatusModel->getLastStatus($student->prestudent_id, $ss);
+ $status = current($this->getDataOrTerminateWithError($result));
+ if (!$status)
+ $this->terminateWithError($this->p->t("stv", "grades_error_prestudentstatus"));
+ $semester = $status->ausbildungssemester;
+
+ $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+ $this->StudentlehrverbandModel->addJoin('public.tbl_benutzer', 'uid = student_uid');
+ $this->StudentlehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+ $result = $this->StudentlehrverbandModel->load([
+ 'studiensemester_kurzbz' => $ss,
+ 'student_uid' => $akteData['uid']
+ ]);
+ $res = current($this->getDataOrTerminateWithError($result));
+
+ $studiengang_kz = $res->studiengang_kz;
+ $akteData['person_id'] = $res->person_id;
+ switch ($xsl) {
+ case 'Ausbildungsver':
+ case 'AusbVerEng':
+ $akteData['titel'] = mb_substr($xsl .
+ "_" .
+ strtoupper($res->typ) .
+ strtoupper($res->kurzbz) .
+ "_" .
+ $semester .
+ "_" .
+ $ss, 0, 64);
+ $akteData['bezeichnung'] = mb_substr($vorlage->bezeichnung . " " . $student->kuerzel, 0, 64);
+ break;
+ case 'LVZeugnisEng':
+ case 'LVZeugnis':
+ case 'Zertifikat':
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+ $result = $this->LehrveranstaltungModel->load($this->input->post_get('lvid'));
+ $lv = current($this->getDataOrTerminateWithError($result));
+ $akteData['dokument_kurzbz'] = $xsl;
+ $akteData['titel'] = mb_substr($xsl .
+ "_" .
+ strtoupper($res->typ) .
+ strtoupper($res->kurzbz) .
+ "_" .
+ $semester .
+ '_' .
+ $ss .
+ '_' .
+ str_replace(' ', '_', $lv->bezeichnung), 0, 60);
+ $akteData['bezeichnung'] = mb_substr($xsl .
+ " " .
+ strtoupper($res->typ) .
+ strtoupper($res->kurzbz) .
+ " " .
+ $semester .
+ ". Semester" .
+ ' ' .
+ $ss .
+ ' ' .
+ $lv->bezeichnung, 0, 64);
+ break;
+ case 'SZeugnis':
+ $akteData['titel'] = mb_substr($vorlage->bezeichnung . " " . $student->kuerzel, 0, 64);
+ $akteData['bezeichnung'] = mb_substr($vorlage->bezeichnung . " " . $student->kuerzel, 0, 64);
+ break;
+ default:
+ $akteData['titel'] = mb_substr($xsl .
+ "_" .
+ strtoupper($res->typ) .
+ strtoupper($res->kurzbz) .
+ "_" .
+ $semester .
+ "_" .
+ $ss, 0, 64);
+ $akteData['bezeichnung'] = mb_substr($xsl .
+ " " .
+ strtoupper($res->typ) .
+ strtoupper($res->kurzbz) .
+ " " .
+ $semester .
+ ". Semester" .
+ ' ' .
+ $ss, 0, 64);
+ break;
+ }
+ } else {
+ $studiengang_kz = $student->studiengang_kz;
+ $akteData['person_id'] = $student->person_id;
+ $akteData['titel'] = $vorlage->bezeichnung . '_' . $student->kuerzel;
+ $akteData['bezeichnung'] = mb_substr($vorlage->bezeichnung . " " . $student->kuerzel, 0, 64);
+ }
+ } else {
+ $prestudent_id = $this->input->post_get('prestudent_id');
+ if ($prestudent_id) {
+ $this->load->model('crm/prestudent_model', 'PrestudentModel');
+ $this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+ $result = $this->PrestudentModel->load($prestudent_id);
+ $prestudent = current($this->getDataOrTerminateWithError($result));
+
+ $studiengang_kz = $prestudent->studiengang_kz;
+ $akteData['person_id'] = $prestudent->person_id;
+ $akteData['titel'] = mb_substr($xsl . "_" . $prestudent->kuerzel, 0, 64);
+ $akteData['bezeichnung'] = mb_substr($vorlage->bezeichnung . " " . $prestudent->kuerzel, 0, 64);
+ }
+ }
+
+ // Access rights
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz)
+ && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
+ return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+ if ($xsl == 'AccountInfo') {
+ $this->load->model('resource/Mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $uids = $this->input->post_get('uid');
+ if ($uids) {
+ $uids = explode(';', $uids);
+ foreach ($uids as $uid) {
+ $result = $this->MitarbeiterModel->load($uid);
+ if (!isError($result) && hasData($result)) {
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('mitarbeiter', 'suid', 0))
+ return $this->_outputAuthError([$this->router->method => ['admin:rw', 'mitarbeiter:rw']]);
+ } else {
+ $result = $this->StudentModel->load([$uid]);
+ if (!isError($result) && hasData($result)) {
+ $student = current(getData($result));
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz)
+ && !$this->permissionlib->isBerechtigt('admin', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz)
+ && !$this->permissionlib->isBerechtigt('assistenz', 'suid', 0)
+ && !$this->permissionlib->isBerechtigt('support', 'suid', 0))
+ return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw', 'support:rw']]);
+ }
+ }
+ }
+ }
+ } else {
+ $this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+
+ $result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
+ $access_rights = current($this->getDataOrTerminateWithError($result));
+ if (!$access_rights || !$access_rights->berechtigung)
+ return show_404();
+
+ $allowed = false;
+ foreach ($access_rights->berechtigung as $access_right) {
+ if ($this->permissionlib->isBerechtigt($access_right)) {
+ $allowed = true;
+ break;
+ }
+ }
+ if (!$allowed)
+ return $this->_outputAuthError([$this->router->method => $access_rights]);
+ }
+
+ // Output format
+ $outputformat = $this->input->post_get('output') ?: 'pdf';
+ if ($outputformat != 'pdf'
+ // An der FHTW darf das Studienblatt und das Prüfungsprotokoll auch in anderen Formaten exportiert werden
+ && !(CAMPUS_NAME == 'FH Technikum Wien'
+ && ($xsl == 'Studienblatt'
+ || $xsl == 'StudienblattEng'
+ || $xsl == 'PrProtBA'
+ || $xsl == 'PrProtBAEng'
+ || $xsl == 'PrProtMA'
+ || $xsl == 'PrProtMAEng'
+ )
+ )
+ && !$this->permissionlib->isBerechtigt('system/change_outputformat', null, $xsl_oe_kurzbz)
+ ) {
+ $outputformat = 'pdf';
+ }
+
+ // XML Params
+ $params = 'xmlformat=xml';
+ foreach ([
+ 'uid',
+ 'stg_kz',
+ 'person_id',
+ 'id',
+ 'prestudent_id',
+ 'buchungsnummern',
+ 'ss',
+ 'abschlusspruefung_id',
+ 'typ',
+ 'all',
+ 'preoutgoing_id',
+ 'lvid',
+ 'projekt_kurzbz',
+ 'von',
+ 'bis',
+ 'stundevon',
+ 'stundebis',
+ 'sem',
+ 'lehreinheit',
+ 'mitarbeiter_uid',
+ 'studienordnung_id',
+ 'fixangestellt',
+ 'standort',
+ 'abrechnungsmonat',
+ 'form',
+ 'projektarbeit_id',
+ 'betreuerart_kurzbz',
+ 'studiensemester_kurzbz'
+ ] as $key) {
+ $value = $this->input->post_get($key);
+ if ($value !== null)
+ $params .= '&' . $key . '=' . urlencode($value);
+ }
+ $value = $this->input->post_get('vertrag_id');
+ if ($value !== null) {
+ foreach ($value as $id)
+ $params .= '&vertrag_id[]=' . urlencode($id);
+ }
+
+ if (!$vorlage->archivierbar)
+ $this->terminateWithError($this->p->t("stv", "grades_error_archive"));
+
+ if ($sign_user && !$vorlage->signierbar)
+ $this->terminateWithError($this->p->t("stv", "grades_error_sign"));
+
+
+ $this->load->library('DocumentExportLib');
+
+ // XML Data
+ $result = $this->documentexportlib->getDataURL($xml, $params);
+ $data = $this->getDataOrTerminateWithError($result);
+ $this->documentexportlib->addArchiveToData($data);
+
+ // Output
+ $result = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+
+ $content = $this->getDataOrTerminateWithError($result);
+ $akteData['titel'] .= '.pdf';
+ $akteData['inhalt'] = base64_encode($content);
+
+ $this->load->model('crm/Akte_model', 'AkteModel');
+ $result = $this->AkteModel->insert($akteData);
+ $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(true);
+ }
+}
diff --git a/application/controllers/api/frontend/v1/Filter.php b/application/controllers/api/frontend/v1/Filter.php
index 45838fc5f..b195e0012 100644
--- a/application/controllers/api/frontend/v1/Filter.php
+++ b/application/controllers/api/frontend/v1/Filter.php
@@ -113,7 +113,7 @@ class Filter extends FHCAPI_Controller
*/
public function applyFilterFields()
{
- $this->form_validation->set_rules('filterFields', 'filterFields', 'required');
+ $this->form_validation->set_rules('filterFields[]', 'filterFields', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
new file mode 100644
index 000000000..f079a5b37
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -0,0 +1,103 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Lehre extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'lvStudentenMail' => self::PERM_LOGGED,
+ 'LV' => self::PERM_LOGGED,
+ 'Pruefungen' => self::PERM_LOGGED,
+ ]);
+
+
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * constructs the emails of the groups from a lehrveranstaltung
+ */
+ public function lvStudentenMail()
+ {
+ $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+
+ // return early if the required parameter is missing
+ if(!isset($lehreinheit_id))
+ {
+ $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+ }
+
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+
+ $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+
+ //convert array of objects into array of strings
+ $studentenMails = array_map(function($element){
+ return $element->mail;
+ }, $studentenMails);
+
+ $this->terminateWithSuccess($studentenMails);
+ }
+
+ public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
+
+ $result = current($this->getDataOrTerminateWithError($result));
+
+ $this->terminateWithSuccess($result);
+ }
+
+ /**
+ * fetches all Pruefungen of a student for a specific lehrveranstaltung
+ * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
+ * @param mixed $lehrveranstaltung_id
+ * @return void
+ */
+ public function Pruefungen($lehrveranstaltung_id)
+ {
+ $this->load->model('education/Pruefung_model', 'PruefungModel');
+
+ $result = $this->PruefungModel->getByStudentAndLv(getAuthUID(), $lehrveranstaltung_id, getUserLanguage());
+
+ $result = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($result);
+ }
+
+
+
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
new file mode 100644
index 000000000..393c4d5c3
--- /dev/null
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -0,0 +1,534 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+use CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class LvMenu extends FHCAPI_Controller
+{
+
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getLvMenu' => self::PERM_LOGGED
+ ]);
+
+ $this->load->model("ressource/Mitarbeiter_model");
+ $this->load->model("education/Lehreinheit_model");
+ $this->load->model("education/Lehrveranstaltung_model");
+ $this->load->model("organisation/Studiengang_model");
+ $this->load->model("accounting/Vertrag_model");
+ $this->load->model("system/Variable_model");
+ $this->load->model("person/Benutzergruppe_model");
+ $this->load->model("education/Lvangebot_model");
+ $this->load->model("ressource/Lehretools_model");
+
+ $this->load->library("PermissionLib", null, 'PermissionLib');
+
+ $this->load->library("PhrasesLib");
+ $this->loadPhrases(array('global', 'lehre'));
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+
+ /**
+ * alternative function to get multiple lvMenus with a single http request
+ */
+ public function getMultipleLvMenu($lvMenuOptionList){
+ $result =[];
+ foreach($lvMenuOptionList as $lvMenuOptions){
+ $lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+ if(isError($lvMenu)){
+ // TODO: some lvMenu threw an error, handle error here
+ }
+ $result[$lvMenuOptions['lvid']]=$lvMenu;
+ }
+ $this->terminateWithSuccess($result);
+ }
+
+ /**
+ *
+ */
+ public function getLvMenu($lvid, $studiensemester_kurzbz)
+ {
+
+ // return early if parameters are missing
+ if(!isset($lvid) || !isset($studiensemester_kurzbz))
+ $this->terminateWithError('Missing parameters', self::ERROR_TYPE_GENERAL);
+
+ // get the sprache
+ $sprache = getUserLanguage();
+
+ // get the user
+ if (!$user=getAuthUID())
+ $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
+
+ // check if is_lector
+ $is_lector = false;
+ $mares = $this->Mitarbeiter_model->isMitarbeiter($user);
+ if(hasData($mares))
+ {
+ $is_lector = getData($mares);
+ }
+
+ // definition of user_is_allowed_to_upload
+ $user_is_allowed_to_upload=false;
+ $angezeigtes_stsem = $studiensemester_kurzbz;
+
+ // load lehrveranstaltung
+ $lvres = $this->Lehrveranstaltung_model->load($lvid);
+ if(!hasData($lvres))
+ {
+ $this->terminateWithError('LV ' . $lvid . ' not found.');
+ }
+ $lv = (getData($lvres))[0];
+ $this->addMeta('lvInfo',$lv);
+ // define studiengang_kz / semester / lehrverzeichnis
+ $studiengang_kz = $lv->studiengang_kz;
+ $semester = $lv->semester;
+ $short = $lv->lehreverzeichnis;
+ // return empty menu for studiengang_kz = 0
+ if($studiengang_kz == 0){
+ $this->terminateWithSuccess("organisatorische_einheit");
+ }
+
+ // load studiengang
+ $stgres = $this->Studiengang_model->load(strval($studiengang_kz));
+ if(!hasData($stgres))
+ {
+ $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
+ }
+ $stg = (getData($stgres))[0];
+ $kurzbz = strtoupper($stg->typ . $stg->kurzbz);
+
+ $short_name = $lv->bezeichnung;
+ $short_short_name = $lv->lehreverzeichnis;
+
+ // angemeldet
+ $angemeldet = true;
+ if(defined('CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN && !$is_lector)
+ {
+ $angemeldet = false;
+
+ $lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
+ $lvid, $user, $angezeigtes_stsem
+ );
+
+ if(hasData($lesres) && count(getData($lesres)) > 0)
+ $angemeldet = true;
+ }
+
+ // lehrfach
+ $lehrfach_id='';
+
+ if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
+ {
+ // Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
+ // wird zusätzlich das Lehrfach der Lehreinheit angezeigt.
+ if($is_lector )
+ {
+ $result = $this->Lehreinheit_model->getLehrfachIdMitarbeiter($angezeigtes_stsem,$user,$lvid);
+ }
+ else
+ {
+ $result = $this->Lehreinheit_model->getLehrfachIdStudierender($angezeigtes_stsem,$user,$lvid);
+ }
+
+ // Wenn die LV mehrere verschiedenen Lehrfaecher hat, und der User zu mehreren davon zugeteilt ist
+ // wird das Lehrfach nicht angezeigt damit es nicht zu verwirrungen kommt.
+ if( ($lehrfaecher = getData($result)) && count($lehrfaecher)==1 && ($lehrfach = $lehrfaecher[0]))
+ {
+ $lehrfach_id=$lehrfach->lehrfach_id;
+ }
+ }
+
+ // lektor der lv
+ $lektor_der_lv=false;
+
+ $leinfores = $this->Lehreinheit_model->getLehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id);
+ $db_result = hasData($leinfores) ? getData($leinfores) : array();
+
+ foreach($db_result as $row_lector)
+ {
+
+ // Lektor wird erst angezeigt wenn der Auftrag erteilt wurde
+ if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
+ && CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+ {
+ if (!$this->Vertrag_model->isVertragErteiltLV($lvid, $angezeigtes_stsem, $row_lector->uid))
+ {
+ continue;
+ }
+ }
+
+
+ if($user == $row_lector->uid)
+ {
+ $lektor_der_lv=true;
+ $user_is_allowed_to_upload=true;
+ }
+
+ // style of the link
+ if($row_lector->lvleiter === true)
+ $style='style="font-weight: bold"';
+ else
+ $style='';
+
+ }
+
+ //Berechtigungen auf Fachbereichsebene
+ $lehrfach_oe_kurzbz_arr = array();
+ $fbres = $this->Lehrveranstaltung_model->getBerechtigungenAufFachberechsebene($lvid, $angezeigtes_stsem);
+ $fbs = (hasData($fbres)) ? getData($fbres) : array();
+ foreach($fbs as $row)
+ {
+ $lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
+ if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz)
+ || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
+ {
+ $user_is_allowed_to_upload=true;
+ }
+ }
+
+ // FH-Core Menu Logic
+ // ##########################################################################################
+
+ $menu = array();
+
+ $this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
+
+ $this->fhc_menu_feedback($menu, $angemeldet, $lvid);
+
+ $this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
+
+ $this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
+
+ $this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
+
+ $this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
+
+ $this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
+
+ $this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
+
+
+ // Addons Menu Logic
+ // ##########################################################################################
+
+ $params = [
+ 'sprache'=>$sprache,
+ //'p'=>$p,
+ 'ci_p'=> $this->p,
+ //'db'=>$db,
+ 'user'=>$user,
+ 'is_lector'=>$is_lector,
+ 'user_is_allowed_to_upload'=>$user_is_allowed_to_upload,
+ //'rechte'=>$rechte,
+ 'angezeigtes_stsem'=>$angezeigtes_stsem,
+ //'lehreinheit'=>$lehreinheit,
+ 'lv_obj'=>$lv,
+ 'lv'=>$lv,
+ 'lvid'=>$lvid,
+ 'studiengang_kz'=>$studiengang_kz,
+ 'semester'=>$semester,
+ 'short'=>$short,
+ 'stg_obj'=>$stg,
+ 'kurzbz'=>$kurzbz,
+ 'short_name'=>$short_name,
+ 'short_short_name'=>$short_short_name,
+ //'dir_name'=>$dir_name,
+ 'angemeldet'=>$angemeldet,
+ 'lehrfach_id'=>$lehrfach_id,
+ 'lektor_der_lv'=>$lektor_der_lv,
+ 'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
+ ];
+
+ Events::trigger('lvMenuBuild',
+ // passing $menu per reference
+ function & () use (&$menu) {
+ return $menu;
+ },
+ $params
+ );
+
+ // Menu sortieren
+ // ##########################################################################################
+
+ foreach ($menu as $key => $row){
+
+ // removes menu points that are not needed in the c4 lvUebersicht
+ if( !array_key_exists('c4_link',$row) || !array_key_exists('c4_icon',$row)){
+ unset($menu[$key]);
+ continue;
+ }
+
+ // fills pos array to sort the menu
+ $pos[$key] = $row['position'];
+
+ }
+
+ array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
+
+ // HTTP response
+ // ##########################################################################################
+
+ $this->terminateWithSuccess($menu);
+
+ }
+
+ private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){
+
+ // LVINFO
+ if(!defined('CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN)
+ {
+ $c4_linkList=array();
+
+ // Bearbeiten Button anzeigen wenn Lektor der LV und bearbeiten fuer Lektoren aktiviert ist
+ // Oder Berechtigung zum Bearbeiten eingetragen ist
+ if((!defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && $lektor_der_lv)
+ || (defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT==true && $lektor_der_lv)
+ || $this->PermissionLib->isBerechtigt('lehre/lvinfo',$studiengang_kz)
+ || $this->PermissionLib->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
+ )
+ {
+ $c4_linkList[]= [$this->p->t('lehre', 'lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
+ }
+ elseif ($is_lector)
+ {
+ $c4_linkList[]= ["Bearbeiten der LV-Infos derzeit gesperrt",'#'];
+ }
+
+ $menu[]=array
+ (
+ 'id'=>'core_menu_lvinfo',
+ 'position'=>'10',
+ 'name'=>$this->p->t('lehre', 'lehrveranstaltungsinformation'),
+ 'icon'=>'../../../skin/images/button_lvinfo.png',
+ 'link'=>'',
+ 'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
+ 'c4_link'=>'',
+ 'c4_linkList'=>$c4_linkList
+ );
+ }
+ }
+
+ private function fhc_menu_feedback(&$menu, $angemeldet, $lvid){
+ //FEEDBACK
+ if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
+ {
+ $menu[]=array
+ (
+ 'id'=>'core_menu_feedback',
+ 'position'=>'60',
+ 'name'=>$this->p->t('lehre', 'feedback'),
+ 'c4_icon'=> base_url('skin/images/button_feedback.png'),
+ 'c4_link'=> base_url('feedback.php?lvid='.$lvid),
+ );
+ }
+ }
+
+ private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem){
+ //Gesamtnote
+ if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
+ {
+ if($lv_obj->benotung)
+ {
+ $menu[]=array
+ (
+ 'id'=>'core_menu_gesamtnote',
+ 'position'=>'80',
+ 'name'=>$this->p->t('lehre', 'gesamtnote'),
+ 'c4_icon'=> base_url('skin/images/button_endnote.png'),
+ 'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+ //'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+ );
+ }
+ else
+ {
+ $menu[]=array
+ (
+ 'id'=>'core_menu_gesamtnote',
+ 'position'=>'80',
+ 'name'=>$this->p->t('lehre', 'gesamtnote'),
+ 'c4_icon'=>base_url('skin/images/button_endnote.png'),
+ 'c4_link'=>'#',
+ 'c4_linkList'=>[[$this->p->t('lehre', 'noteneingabedeaktiviert'),'#']],
+ );
+ }
+ }
+ }
+
+
+
+ private function fhc_menu_emailStudierende(&$menu, $user, $angemeldet, $lvid, $angezeigtes_stsem){
+ // Email an Studierende
+ if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
+ {
+ $mailto='mailto:';
+ $c4_linkList=array();
+
+ $studentMailsRes = $this->Lehrveranstaltung_model->getStudentEMail($lvid, $angezeigtes_stsem);
+
+ // get the data of the database result and map the array of objects to their object property
+ $studentMails = $this->getDataOrTerminateWithError($studentMailsRes, 'No student mails found');
+
+
+ $nomail='';
+ $variablesres = $this->Variable_model->getVariables($user);
+ $variables = (hasData($variablesres)) ? getData($variablesres) : array();
+
+ foreach ($studentMails as $row)
+ {
+ if($row->gruppe_kurzbz != '')
+ {
+ $bngrp_uids = $this->Benutzergruppe_model->getUids($row->gruppe_kurzbz, $angezeigtes_stsem);
+ if(count($bngrp_uids) > 0)
+ {
+ if(!$row->mailgrp)
+ {
+ $nomail = $row->gruppe_kurzbz . ' ';
+ }
+ else
+ {
+ $mailto .= mb_strtolower($row->gruppe_kurzbz . '@'
+ . DOMAIN . $variables['emailadressentrennzeichen']);
+ }
+ }
+ }
+ else
+ {
+ $mailto .= mb_strtolower($row->stg_typ . $row->stg_kurzbz
+ . $row->semester . trim($row->verband) . trim($row->gruppe)
+ . '@' . DOMAIN . $variables['emailadressentrennzeichen']);
+ }
+ }
+
+ if($nomail != '')
+ {
+ $c4_linkList[] = array(
+ $this->p->t('lehre', 'keinMailverteiler', array('nomail' => $nomail)),
+ '#'
+ );
+ $link_onclick = 'alert(\''.$this->p->t('lehre', 'keinMailverteiler', array('nomail' => $nomail)) . '\');';
+ }
+ else
+ {
+ $link_onclick = '';
+ }
+
+
+ $menu[]=array
+ (
+ 'id'=>'core_menu_mailanstudierende',
+ 'position'=>'100',
+ 'name'=>$this->p->t('lehre', 'mail'),
+ 'c4_icon'=>base_url('skin/images/button_feedback.png'),
+ 'c4_icon2' => 'fa-regular fa-envelope',
+ 'c4_link'=>$mailto,
+ 'c4_linkList'=>$c4_linkList,
+ 'link_onclick'=>$link_onclick
+ );
+ }
+ }
+
+
+
+ private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem){
+ if(!defined('CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN)
+ {
+ if(!$is_lector)
+ {
+ $gruppen = $this->Lvangebot_model->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
+ if(count($gruppen) > 0)
+ {
+ $menu[]=array
+ (
+ 'id'=>'core_menu_abmeldung',
+ 'position'=>'120',
+ 'name'=>$this->p->t('lehre', 'abmelden'),
+ 'c4_icon'=>base_url('skin/images/button_studiupload.png'),
+ 'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
+ );
+
+ }
+ }
+ }
+ }
+
+ private function fhc_menu_lehretools(&$menu, $lvid, $angezeigtes_stsem, $sprache){
+ //Anzeigen von zusaetzlichen Lehre-Tools
+ $lehretools = $this->Lehretools_model->getTools($lvid, $angezeigtes_stsem, $sprache);
+ foreach($lehretools as $row)
+ {
+ $menu[] = array(
+ 'id' => 'core_menu_lehretools_' . $row->lehre_tools_id,
+ 'position' => '1000',
+ 'name' => $row->bezeichnung,
+ 'c4_icon' => base_url('cms/dms.php?id='.$row->logo_dms_id),
+ 'c4_link' => $row->basis_url,
+ );
+ }
+ }
+
+ private function fhc_menu_anrechnungStudent(&$menu, $lvid, $angezeigtes_stsem){
+ // Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
+ if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+ && $this->PermissionLib->isBerechtigt('student/anrechnung_beantragen'))
+ {
+ $menu[]=array
+ (
+ 'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse',
+ 'position' => '128',
+ 'name' => $this->p->t('lehre', 'anrechnung'),
+ 'c4_icon' => base_url('skin/images/button_listen.png'),
+ 'c4_icon2' => 'fa-regular fa-folder-open',
+ 'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
+ );
+ }
+ }
+
+ private function fhc_menu_anrechnungLector(&$menu, $angezeigtes_stsem){
+ // Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
+ if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+ && $this->PermissionLib->isBerechtigt('lehre/anrechnung_empfehlen'))
+ {
+ $menu[]=array
+ (
+ 'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
+ 'position' => '128',
+ 'name' => $this->p->t('lehre', 'anrechnungen'),
+ 'c4_icon'=> base_url('skin/images/button_listen.png'),
+ 'c4_icon2' => 'fa-regular fa-folder-open',
+ 'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
+ );
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
new file mode 100644
index 000000000..8c4059824
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -0,0 +1,95 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Ort extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ // NOTE(chris): additional permission checks will be done in SearchBarLib
+ parent::__construct([
+ 'ContentID' => self::PERM_LOGGED,
+ 'getOrtKurzbzContent' => self::PERM_LOGGED,
+ ]);
+
+ $this->load->model('ressource/Ort_model', 'OrtModel');
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * Gets a JSON body via HTTP POST and provides the parameters
+ */
+ public function ContentID()
+ {
+ // if error
+ //$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+
+ $ort_kurzbz = $this->input->get('ort_kurzbz',TRUE);
+
+ if(!$ort_kurzbz){
+ $this->terminateWithError("missing ort_kurzbz parameter", self::ERROR_TYPE_GENERAL);
+ }
+
+ $result = $this->OrtModel->getContentID($ort_kurzbz);
+
+ if(isError($result)){
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+
+ $result = hasData($result) ? current(getData($result)) : null;
+
+ $this->terminateWithSuccess($result->content_id ?? NULL);
+ }
+
+ /**
+ * @param int $version
+ * @param string $sprache
+ * @param boolean $sichtbar
+ *
+ * @return $content
+ */
+ public function getOrtKurzbzContent($version = null, $sprache = null, $sichtbar = true)
+ {
+ $content_id = $this->input->get("content_id",TRUE);
+
+ $this->load->library('CmsLib');
+
+ $content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+ if (isError($content))
+ $this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+
+ $content = hasData($content) ? getData($content) : null;
+
+ $this->terminateWithSuccess($content);
+ }
+}
+
diff --git a/application/controllers/api/frontend/v1/Phrasen.php b/application/controllers/api/frontend/v1/Phrasen.php
index 472308d2b..7cc652c71 100644
--- a/application/controllers/api/frontend/v1/Phrasen.php
+++ b/application/controllers/api/frontend/v1/Phrasen.php
@@ -28,8 +28,13 @@ class Phrasen extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
- 'loadModule' => self::PERM_ANONYMOUS
+ 'loadModule' => self::PERM_ANONYMOUS,
+ 'setLanguage' => self::PERM_ANONYMOUS,
+ 'getLanguage' => self::PERM_ANONYMOUS,
+ 'getAllLanguages' => self::PERM_ANONYMOUS,
]);
+
+ $this->load->helper('hlp_language');
}
//------------------------------------------------------------------------------------------------------------------
@@ -43,4 +48,48 @@ class Phrasen extends FHCAPI_Controller
$this->load->library('PhrasesLib', [$module], 'pj');
$this->terminateWithSuccess(json_decode($this->pj->getJSON()));
}
-}
+
+ public function setLanguage()
+ {
+ $postParams = $this->getPostJSON();
+ $language = $postParams->language;
+ $categories = $postParams->categories;
+
+ setUserLanguage($language);
+
+ $this->load->library('PhrasesLib', array($categories, $language), 'p');
+
+ $phrases = $this->p->setPhrases($categories, $language);
+ $this->terminateWithSuccess($phrases);
+ }
+
+ // gets the langauge of the currently logged in user session and otherwhise the system language
+ public function getLanguage()
+ {
+ $lang = getUserLanguage();
+ $this->terminateWithSuccess($lang);
+ }
+
+ // gets all languages that are set as active in the database
+ public function getAllLanguages()
+ {
+ $this->load->model('system/Sprache_model', 'SprachenModel');
+
+ // Add order clause by index and select the sprache,bezeichnung and index column
+ $this->SprachenModel->addOrder('index');
+ $this->SprachenModel->addSelect('sprache, bezeichnung, index');
+
+ // Retrieves from public.tbl_sprache
+ $langs = $this->SprachenModel->loadWhere(array('content' => true));
+ $langs = $this->getDataOrTerminateWithError($langs);
+ $langs = array_map(function($lang){
+ $data = new stdClass();
+ $data->sprache = $lang->sprache;
+ $data->bezeichnung = $lang->bezeichnung[($lang->index-1)];
+ return $data;
+ }, $langs);
+
+ $this->terminateWithSuccess($langs);
+ }
+
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
new file mode 100644
index 000000000..c52d8bae5
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -0,0 +1,695 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Profil extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getView' => self::PERM_LOGGED,
+ 'fotoSperre' => self::PERM_LOGGED,
+ 'getGemeinden' => self::PERM_LOGGED,
+ 'getAllNationen' => self::PERM_LOGGED,
+ 'isMitarbeiter' => self::PERM_LOGGED,
+
+ ]);
+
+ $this->load->library('PermissionLib');
+
+ $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->load->model('person/Adresse_model', 'AdresseModel');
+ $this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+ $this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+ $this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+ $this->load->model('person/Kontakt_model', 'KontaktModel');
+ $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+ $this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+
+ //? put the uid and pid inside the controller for reusability
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+
+ /**
+ * function that returns the data used for the corresponding view
+ * the client side parses the @param $uid and calls this function to get the data to the correct view
+ * @access public
+ * @param boolean $uid the userID used to identify which information should be retrieved for which view
+ * @return stdClass all the data corresponding to a view of a user
+ */
+ public function getView($uid)
+ {
+ $res = new stdClass();
+ $editAllowed = getAuthUID() == $uid || $this->permissionlib->isBerechtigt('admin');
+
+ // if parsing the URL did not found a UID then the UID of the logged in user is used
+ if ($uid == "Profil" || $uid == $this->uid) {
+ $isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+ if (isError($isMitarbeiter)) {
+ show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
+ }
+ $isMitarbeiter = getData($isMitarbeiter);
+ if ($isMitarbeiter) {
+ $res->view = "MitarbeiterProfil";
+ $res->data = $this->mitarbeiterProfil();
+ $res->data->pid = $this->pid;
+ } else {
+ $res->view = "StudentProfil";
+ $res->data = $this->studentProfil();
+ $res->data->pid = $this->pid;
+ }
+ // editing your own profil - true
+ $editAllowed = true;
+ }
+ // UID is availabe when accessing Profil/View/:uid
+ else {
+ $this->PersonModel->addSelect(["person_id"]);
+ $pid = $this->PersonModel->getByUid($uid);
+ if (isError($pid)) {
+ show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
+ }
+ $pid = hasData($pid) ? getData($pid)[0] : null;
+ if (!$pid) {
+ show_error("Person with UID: " . $uid . " does not exist");
+ }
+ $isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+ if (isError($isMitarbeiter)) {
+ show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
+ }
+ $isMitarbeiter = getData($isMitarbeiter);
+ if ($isMitarbeiter) {
+ $res->view = "ViewMitarbeiterProfil";
+ $res->data = $this->viewMitarbeiterProfil($uid);
+
+ } else {
+ $res->view = "ViewStudentProfil";
+ $res->data = $this->viewStudentProfil($uid);
+ }
+ }
+ $res->data->editAllowed = $editAllowed;
+ $this->terminateWithSuccess($res);
+ }
+
+ /**
+ * update column foto_sperre in public.tbl_person
+ * @access public
+ * @param boolean $value new value for the column
+ * @return boolean the new value added to the column in public.tbl_person
+ */
+ public function fotoSperre($value)
+ {
+ if(!isset($value)){
+ $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+ }
+
+ $res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
+ if (isError($res)) {
+ show_error("error while trying to update table public.tbl_person");
+ }
+ $this->PersonModel->addSelect("foto_sperre");
+ $res = $this->PersonModel->load($this->pid);
+ if (isError($res)) {
+ show_error("error while trying to query table public.tbl_person");
+ }
+
+ $res = $this->getDataOrTerminateWithError($res);
+
+ $this->terminateWithSuccess(current($res));
+ }
+
+ /**
+ * gets all nations in the table bis.tbl_nation
+ *
+ * @access public
+ * @return array all the nations in table bis.tbl_nation
+ */
+ public function getAllNationen()
+ {
+ // load the nationen from the database
+ $this->load->model('codex/Nation_model', "NationModel");
+ $this->NationModel->addSelect(["nation_code as code", "langtext"]);
+ $nation_res = $this->NationModel->load();
+
+ if (isError($nation_res)) {
+ $this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
+ }
+
+ $nation_res = $this->getDataOrTerminateWithError($nation_res);
+
+ $this->terminateWithSuccess($nation_res);
+ }
+
+ public function getGemeinden($nation, $zip)
+ {
+ if(!isset($nation) || !isset($zip)){
+ echo json_encode(error("Missing parameters"));
+ return;
+ }
+
+ $this->load->model('codex/Gemeinde_model', "GemeindeModel");
+
+
+ $gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
+
+ if (isError($gemeinde_res)) {
+ $this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
+ }
+ $gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
+
+ /* $gemeinde_res = array_map(function ($obj) {
+ return $obj->ortschaftsname;
+ }, $gemeinde_res); */
+
+ $this->terminateWithSuccess($gemeinde_res);
+
+ }
+
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+ /**
+ * function that returns the data used for viewing another mitarbeiter profile
+ * @access private
+ * @param integer $uid the userID to retrieve the mitarbeiter data
+ * @return stdClass restricted mitarbeiter data
+ */
+ private function viewMitarbeiterProfil($uid)
+ {
+ $mailverteiler_res = $this->getMailverteiler($uid);
+ $benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+ $benutzer_res = $this->getBenutzerAlias($uid);
+ $person_res = $this->getPersonInfo($uid);
+ $mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+ $telefon_res = $this->getTelefonInfo($uid);
+
+ $res = new stdClass();
+ $res->username = $uid;
+
+ //? Person Info
+ foreach ($person_res as $key => $val) {
+ $res->$key = $val;
+ }
+
+ //? Mitarbeiter Info
+ foreach ($mitarbeiter_res as $key => $val) {
+ $res->$key = $val;
+
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $uid . "@" . DOMAIN;
+ $extern_email = array();
+ $extern_email["type"] = "alias";
+ $extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+ $res->emails = array($intern_email, $extern_email);
+
+ $res->funktionen = $benutzer_funktion_res;
+ $res->mailverteiler = $mailverteiler_res;
+ $res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+ return $res;
+ }
+
+ /**
+ * function that returns the data used for viewing another student profile
+ * @access private
+ * @param integer $uid the userID to retrieve the student data
+ * @return stdClass restricted student data
+ */
+ private function viewStudentProfil($uid)
+ {
+ $mailverteiler_res = $this->getMailverteiler($uid);
+ $person_res = $this->getPersonInfo($uid);
+ $student_res = $this->getStudentInfo($uid);
+ $matr_res = $this->getMatrikelNummer($uid);
+
+ $res = new stdClass();
+ $res->username = $uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Student Information
+ foreach ($student_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $uid . "@" . DOMAIN;
+
+ $res->emails = [$intern_email];
+ $res->matrikelnummer = $matr_res->matr_nr;
+ $res->mailverteiler = $mailverteiler_res;
+
+ return $res;
+ }
+
+ /**
+ * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+ * @access public
+ * @param $uid the userID used to check if it is a mitarbeiter
+ * @return boolean
+ */
+ public function isMitarbeiter($uid)
+ {
+
+ if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+
+
+ $result = $this->MitarbeiterModel->isMitarbeiter($uid);
+
+ if (isError($result)) {
+ $this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
+ }
+
+ $result = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($result);
+ }
+
+ /**
+ * function that returns the data used for the mitarbeiter profile
+ * @access private
+ * @return stdClass mitarbeiter data
+ */
+ private function mitarbeiterProfil()
+ {
+
+ $zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+ $adresse_res = $this->getAdressenInfo($this->pid);
+ $kontakte_res = $this->getKontaktInfo($this->pid);
+ $mailverteiler_res = $this->getMailverteiler($this->uid);
+ $person_res = $this->getPersonInfo($this->uid, true);
+ $benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+ $betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+ $profilUpdates = $this->getProfilUpdates($this->uid);
+ $telefon_res = $this->getTelefonInfo($this->uid);
+ $mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
+
+ $res = new stdClass();
+ $res->username = $this->uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Mitarbeiter Information
+ foreach ($mitarbeiter_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ $res->adressen = $adresse_res;
+ $res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+ $res->kontakte = $kontakte_res;
+ $res->mittel = $betriebsmittelperson_res;
+ $res->mailverteiler = $mailverteiler_res;
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $this->uid . "@" . DOMAIN;
+ $extern_email = array();
+ $extern_email["type"] = "alias";
+ $extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+ $res->emails = [$intern_email, $extern_email];
+
+ $res->funktionen = $benutzer_funktion_res;
+ $res->standort_telefon = $telefon_res;
+ $res->profilUpdates = $profilUpdates;
+
+ return $res;
+ }
+
+ /**
+ * function that returns the data used for the student profile
+ * @access private
+ * @return stdClass student data
+ */
+ private function studentProfil()
+ {
+ $betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+ $kontakte_res = $this->getKontaktInfo($this->pid);
+ $zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+ $adresse_res = $this->getAdressenInfo($this->pid);
+ $mailverteiler_res = $this->getMailverteiler($this->uid);
+ $person_res = $this->getPersonInfo($this->uid, true);
+ $zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+ $student_res = $this->getStudentInfo($this->uid);
+ $matr_res = $this->getMatrikelNummer($this->uid);
+ $profilUpdates = $this->getProfilUpdates($this->uid);
+
+ $res = new stdClass();
+ $res->username = $this->uid;
+
+ //? Person Information
+ foreach ($person_res as $key => $value) {
+ $res->$key = $value;
+ }
+
+ //? Student Information
+ foreach ($student_res as $key => $value) {
+ $res->$key = trim($value);
+ }
+
+ $intern_email = array();
+ $intern_email["type"] = "intern";
+ $intern_email["email"] = $this->uid . "@" . DOMAIN;
+
+ $res->emails = [$intern_email];
+ $res->adressen = $adresse_res;
+ $res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+ $res->kontakte = $kontakte_res;
+ $res->mittel = $betriebsmittelperson_res;
+ $res->matrikelnummer = $matr_res->matr_nr;
+ $res->zuttritsgruppen = $zutrittsgruppe_res;
+ $res->mailverteiler = $mailverteiler_res;
+ $res->profilUpdates = $profilUpdates;
+
+ return $res;
+ }
+
+
+ /**
+ * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+ * @access private
+ * @param integer $uid the userID used to retrieve the mailverteiler
+ * @return array returns the mailvertailer corresponding to a userID
+ */
+ private function getMailverteiler($uid)
+ {
+ $this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+ $this->PersonModel->addJoin('tbl_benutzer', 'person_id');
+ $this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+ $this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+ $mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+ if (isError($mailverteiler_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
+ }
+ $mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+ $mailverteiler_res = array_map(function ($element) {
+ $element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+ return $element;
+ }, $mailverteiler_res);
+ return $mailverteiler_res;
+ }
+
+ /**
+ * gets all the Benutzerfunktionen of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to retrieve the Benutzerfunktionen
+ * @return array returns the Benutzerfunktionen corresponding to a userID
+ */
+ private function getBenutzerFunktion($uid)
+ {
+ $this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+ $this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+ $benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+ if (isError($benutzer_funktion_res)) {
+ show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
+ }
+ $benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+ return $benutzer_funktion_res;
+ }
+
+ /**
+ * gets all the Betriebsmittel of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to retrieve the Betriebsmittel
+ * @return array returns the Betriebsmittel corresponding to a userID
+ */
+ private function getBetriebsmittelInfo($pid)
+ {
+ $this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+ //? betriebsmittel are not needed in a view
+ $betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+ if (isError($betriebsmittelperson_res)) {
+ show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
+ }
+ $betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+ return $betriebsmittelperson_res;
+ }
+
+ /**
+ * gets the alias of a corresponding user
+ * @access private
+ * @param integer $uid the userID used to get the alias
+ * @return string the alias of the userID
+ */
+ private function getBenutzerAlias($uid)
+ {
+ $this->BenutzerModel->addSelect(["alias"]);
+ $benutzer_res = $this->BenutzerModel->load([$uid]);
+ if (isError($benutzer_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
+ } else {
+ $benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+ }
+
+ return $benutzer_res;
+ }
+
+ /**
+ * gets the person information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the person information
+ * @param integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+ * @return array all the person informaion corresponding to a userID
+ */
+ private function getPersonInfo($uid, $geburtsInfo = null)
+ {
+ $selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+ /** @param integer $geburtsInfo */
+ if ($geburtsInfo) {
+ array_push($selectClause, "gebort");
+ array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
+ }
+ $this->BenutzerModel->addSelect($selectClause);
+ $this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+ $person_res = $this->BenutzerModel->load([$uid]);
+ if (isError($person_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
+ } else {
+ $person_res = hasData($person_res) ? getData($person_res)[0] : null;
+ }
+
+ if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
+ {
+ $dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+ $person_res->foto = $dummy_foto;
+ }
+
+ return $person_res;
+ }
+
+ /**
+ * gets the mitarbeiter information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the mitarbeiter information
+ * @return array all the mitarbeiter informaion corresponding to a userID
+ */
+ private function getMitarbeiterInfo($uid)
+ {
+ $this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+ $this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+ $mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+ if (isError($mitarbeiter_res)) {
+ show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
+ } else {
+ $mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
+ }
+
+ return $mitarbeiter_res;
+ }
+
+ /**
+ * gets the telefon information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the telefon information
+ * @return array all the telefon informaion corresponding to a userID
+ */
+ private function getTelefonInfo($uid)
+ {
+ $this->MitarbeiterModel->addSelect(["kontakt"]);
+ $this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+ $this->MitarbeiterModel->addLimit(1);
+ $telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+ if (isError($telefon_res)) {
+ show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
+ }
+ $telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+ return $telefon_res;
+ }
+
+ /**
+ * gets the student information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the student information
+ * @return array all the student informaion corresponding to a userID
+ */
+ private function getStudentInfo($uid)
+ {
+ $this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+ $this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+ $student_res = $this->StudentModel->load([$uid]);
+ if (isError($student_res)) {
+ show_error("was not able to query the table public.tbl_student:" . getData($student_res));
+ }
+ $student_res = hasData($student_res) ? getData($student_res)[0] : null;
+ return $student_res;
+ }
+
+ /**
+ * gets the profil updates corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the profil updates
+ * @return array all the profil updates corresponding to a userID
+ */
+ private function getProfilUpdates($uid)
+ {
+ $profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+ if (isError($profilUpdates)) {
+ show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
+ }
+ $profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+ return $profilUpdates;
+ }
+
+ /**
+ * gets the Matrikelnummer corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the Matrikelnummer
+ * @return integer the Matrikelnummer corresponding to a userID
+ */
+ private function getMatrikelNummer($uid)
+ {
+ $this->BenutzerModel->addSelect(["matr_nr"]);
+ $this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+ $matr_res = $this->BenutzerModel->load([$uid]);
+ if (isError($matr_res)) {
+ show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
+ }
+ $matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+ return $matr_res;
+ }
+
+ /**
+ * gets the Zutrittsgruppen corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the Zutrittsgruppen
+ * @return array all the Zutrittsgruppen corresponding to a userID
+ */
+ private function getZutrittsgruppen($uid)
+ {
+ $this->BenutzergruppeModel->addSelect(['bezeichnung']);
+ $this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+ $zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+ if (isError($zutrittsgruppe_res)) {
+ show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
+ }
+ $zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+ return $zutrittsgruppe_res;
+ }
+
+ /**
+ * gets the address information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the address information
+ * @return array all the address information corresponding to a userID
+ */
+ private function getAdressenInfo($pid)
+ {
+ $adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+ $adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
+ $adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+ $adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
+ if (isError($adresse_res)) {
+ show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
+ }
+ $adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+ return $adresse_res;
+ }
+
+ /**
+ * gets the kontakt information corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the kontakt information
+ * @return array all the kontakt information corresponding to a userID
+ */
+ private function getKontaktInfo($pid)
+ {
+ $this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+ $this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+ $this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+ $this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+ $kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
+ if (isError($kontakte_res)) {
+ show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
+ }
+ $kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+ return $kontakte_res;
+ }
+
+ /**
+ * gets the date of issue of the FH access card corresponding to a user
+ * @access private
+ * @param integer $uid the userID used to get the date of issue of the FH access card
+ * @return string the date of issue of the FH access card corresponding to a userID
+ */
+ private function getZutrittskarteDatum($uid)
+ {
+ $zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+ if (isError($zutrittskarte_ausgegebenam)) {
+ show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
+ }
+ $zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+
+ //? formats date from 01-01-2000 to 01.01.2000
+ $zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+ return $zutrittskarte_ausgegebenam;
+ }
+}
+
diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
new file mode 100644
index 000000000..827654d21
--- /dev/null
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -0,0 +1,837 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class ProfilUpdate extends FHCAPI_Controller
+{
+
+ public static $STATUS_PENDING = NULL;
+ public static $STATUS_ACCEPTED = NULL;
+ public static $STATUS_REJECTED = NULL;
+
+ public static $TOPICS = [];
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getStatus' => self::PERM_LOGGED,
+ 'getTopic' => self::PERM_LOGGED,
+ 'getProfilRequestFiles' => self::PERM_LOGGED,
+ 'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+ 'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+ 'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+ 'selectProfilRequest' => self::PERM_LOGGED,
+ 'insertProfilRequest' => self::PERM_LOGGED,
+ 'updateProfilRequest' => self::PERM_LOGGED,
+ 'deleteProfilRequest' => self::PERM_LOGGED,
+ 'insertFile' => self::PERM_LOGGED,
+ 'show' => self::PERM_LOGGED,
+ ]);
+
+ $this->load->config('cis');
+
+ // Load language phrases
+ $this->loadPhrases(
+ array(
+ 'ui',
+ 'global',
+ 'person',
+ 'profil',
+ 'profilUpdate'
+ )
+ );
+
+ $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+ $this->load->model('person/Kontakt_model', 'KontaktModel');
+ $this->load->model('person/Adresse_model', 'AdresseModel');
+ $this->load->model('person/Adressentyp_model', 'AdressenTypModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $this->load->model('system/Sprache_model', 'SpracheModel');
+ $this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
+ $this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');
+
+ $this->load->library('DmsLib');
+ $this->load->library('PermissionLib');
+
+ //? put the uid and pid inside the controller for reusability
+ $this->uid = getAuthUID();
+ $this->pid = getAuthPersonID();
+
+ // setup the ProfilUpdate states
+ $this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
+ $status_kurzbz = $this->ProfilUpdateStatusModel->load();
+ if (hasData($status_kurzbz)) {
+ list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
+
+ self::$STATUS_PENDING = $status_pending->status_kurzbz;
+ self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
+ self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
+ }
+ // setup the ProfilUpdate topics
+ $this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
+ $topic_kurzbz = $this->ProfilUpdateTopicModel->load();
+
+ if (hasData($topic_kurzbz)) {
+ foreach (getData($topic_kurzbz) as $topic) {
+ self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
+ }
+ }
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ public function getStatus()
+ {
+ $this->terminateWithSuccess([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
+ }
+
+
+ public function getTopic()
+ {
+ if(!count(self::$TOPICS)){
+ $this->terminateWithError('No topics found');
+ }
+ $this->terminateWithSuccess(self::$TOPICS);
+ }
+
+ public function show($dms_id)
+ {
+
+ $profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
+ $profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
+
+ //? checks if an profil update exists with the dms_id requested from the user
+ if ($profil_update) {
+ $is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
+ $is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
+
+ if (
+ $this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
+ $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
+ $this->uid == $profil_update->uid
+ ) {
+ // Get file to be downloaded from DMS
+ $download = $this->dmslib->download($dms_id);
+ $download = $this->getDataOrTerminateWithError($download);
+ // Download file
+ $this->outputFile($download);
+
+
+ } else {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+ }
+
+ } else {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
+ }
+
+ }
+
+ public function selectProfilRequest()
+ {
+
+ $uid = $this->input->get('uid',true);
+ $id = $this->input->get('id',true);
+ $whereClause = ['uid' => $this->uid];
+
+ if (isset($uid))
+ $whereClause['uid'] = $uid;
+ if (isset($id))
+ $whereClause['id'] = $id;
+
+ $res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+ $res = $this->getDataOrTerminateWithError($res);
+ $this->terminateWithSuccess($res);
+
+ }
+
+ public function insertProfilRequest()
+ {
+
+ $payload = $this->input->post('payload');
+ $topic = $this->input->post('topic',true);
+ $fileID = $this->input->post('fileID',true);
+
+ if(!isset($payload) || !isset($topic)){
+ $this->terminateWithError("required parameters are missing");
+ }
+
+ $identifier = array_key_exists("kontakt_id", $payload) ? "kontakt_id" : (array_key_exists("adresse_id", $payload) ? "adresse_id" : null);
+
+ $data = ["topic" => $topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
+
+ //? insert fileID in the dataset if sent with post request
+ if (isset($fileID)) {
+ $data['attachment_id'] = $fileID;
+ }
+
+ //? loops over all updateRequests from a user to validate if the new request is valid
+ $res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
+ $res = $this->getDataOrTerminateWithError($res);
+
+ //? the user cannot delete a zustelladresse/kontakt
+ if (isset($payload["delete"]) && $payload[$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"]) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
+ }
+
+ //? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+ if (isset($payload["delete"]) && $identifier == "adresse_id") {
+ $adr = $this->AdresseModel->load($payload[$identifier]);
+ $adr = $this->getDataOrTerminateWithError($adr)[0];
+ if ($adr->heimatadresse) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
+ }
+ }
+
+ if ($res) {
+ $pending_changes = array_filter($res, function ($element) {
+ return $element->status == (self::$STATUS_PENDING ?: "Pending");
+ });
+ foreach ($pending_changes as $update_request) {
+ $existing_change = $update_request->requested_change;
+ //? the user can add as many new kontakte/adressen as he likes
+ if (!isset($payload["add"]) && property_exists($existing_change, $identifier) && array_key_exists($identifier,$payload) && $existing_change->$identifier == $payload[$identifier]) {
+ //? the kontakt_id / adresse_id of a change has to be unique
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error'));
+ }
+
+ //? if it is not updating any kontakt/adresse, the topic has to be unique
+ elseif (!$identifier && $update_request->topic == $topic) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic]));
+ }
+ }
+ }
+
+ $insertID = $this->ProfilUpdateModel->insert($data);
+
+ if (isError($insertID)) {
+ $this->terminateWithError(getError($insertID));
+ } else {
+
+ $insertID = hasData($insertID) ? getData($insertID) : null;
+ //? sends emails to the correspondents of the $uid
+ $this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $topic);
+ $this->terminateWithSuccess(success($insertID));
+ }
+ }
+
+ public function updateProfilRequest()
+ {
+ $topic = $this->input->post('topic', true);
+ $payload = $this->input->post('payload', true);
+ $ID = $this->input->post('ID', true);
+ $fileID = $this->input->post('fileID', true);//optional
+
+ if(!isset($topic) || !isset($payload) || !isset($ID)){
+ $this->terminateWithError("required parameters are missing");
+ }
+
+ $updateData = ["requested_change" => json_encode($payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
+ if (isset($fileID)) {
+ $updateData['attachment_id'] = json_decode($fileID);
+ }
+ $updateID = $this->ProfilUpdateModel->update([$ID], $updateData);
+ //? insert fileID in the dataset if sent with post request
+
+ if (isError($updateID)) {
+ $this->terminateWithError(getError($updateID));
+ }
+
+ $updateID = $this->getDataOrTerminateWithError($updateID)[0];
+
+ $this->terminateWithSuccess(success($updateID));
+ }
+
+ public function deleteProfilRequest()
+ {
+
+ $requestID = $this->input->post('requestID', true);
+ $result = $this->ProfilUpdateModel->delete([$requestID]);
+ if (isError($result)) {
+ $this->terminateWithError(getError($result));
+ }
+ $this->terminateWithSuccess($result);
+ }
+
+ public function getProfilRequestFiles($id)
+ {
+ if(!$id){
+ $this->terminateWithError("parameter id is missing");
+ }
+
+ $this->ProfilUpdateModel->addSelect(["attachment_id"]);
+ $attachmentID = $this->ProfilUpdateModel->load([$id]);
+ if (isError($attachmentID)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'),self::ERROR_TYPE_GENERAL);
+ }
+ //? get the attachmentID
+ $dms_id = $this->getDataOrTerminateWithError($attachmentID)[0]->attachment_id;
+
+ //? get the name to the file
+ $this->DmsVersionModel->addSelect(["name", "dms_id"]);
+ $attachment = $this->DmsVersionModel->load([$dms_id, 0]);
+ if (isError($attachment)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error'),self::ERROR_TYPE_GENERAL);
+ }
+ $attachment = $this->getDataOrTerminateWithError($attachment);
+ //? returns {name:..., dms_id:...}
+ $this->terminateWithSuccess($attachment);
+ }
+
+ public function denyProfilRequest()
+ {
+ $id = $this->input->post('profil_update_id', true);
+ $uid = $this->input->post('uid', true);
+ $topic = $this->input->post('topic', true);
+ $status_message = $this->input->post('status_message', true); //optional
+
+ if(!isset($id) || !isset($uid) || !isset($topic)){
+ $this->terminateWithError("parameter id, uid, topic or status_message is missing");
+ }
+
+ $is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+ $is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+
+ $is_student = $this->StudentModel->isStudent($uid);
+ $is_student = $this->getDataOrTerminateWithError($is_student);
+
+ if (
+ $is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
+ $is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid")
+ ) {
+ $this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
+ $this->terminateWithSuccess($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
+ } else {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'),self::ERROR_TYPE_GENERAL);
+ }
+ }
+
+ public function acceptProfilRequest()
+ {
+ $id = $this->input->post('profil_update_id', true);
+ $uid = $this->input->post('uid', true);
+ $topic = $this->input->post('topic', true);
+ $requested_change = $this->input->post('requested_change');
+ $status_message = $this->input->post('status_message', true); //optional
+
+ //? fetching person_id using UID
+ $personID = $this->PersonModel->getByUid($uid);
+ $personID = $this->getDataOrTerminateWithError($personID)[0]->person_id;
+
+ //! check for required information
+ if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error'));
+ }
+
+ $is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+ $is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+
+ $is_student = $this->StudentModel->isStudent($uid);
+ $is_student = $this->getDataOrTerminateWithError($is_student);
+
+
+ //? check if the permissions are set correctly
+ if (
+ $is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
+ $is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid")
+ ) {
+
+ if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
+ $insertID = $this->handleAdresse($requested_change, $personID);
+ $insertID = getData($insertID);
+ if (isset($insertID)) {
+ $requested_change['adresse_id'] = $insertID;
+ $update_res = $this->updateRequestedChange($id, $requested_change);
+ if (isError($update_res)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID]));
+ }
+ }
+
+ } else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
+ $insertID = $this->handleKontakt($requested_change, $personID);
+ $insertID = getData($insertID);
+ if (isset($insertID)) {
+ $requested_change['kontakt_id'] = $insertID;
+ $update_res = $this->updateRequestedChange($id, $requested_change);
+ if (isError($update_res)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID]));
+ }
+ }
+
+
+ } else {
+ switch ($topic) {
+ // mapping phrasen to database columns to make the update with the correct column names
+ case self::$TOPICS['Titel']:
+ $topic = "titelpre";
+ break;
+ case self::$TOPICS['Postnomen']:
+ $topic = "titelpost";
+ break;
+ case self::$TOPICS['Vorname']:
+ $topic = "vorname";
+ break;
+ case self::$TOPICS['Nachname']:
+ $topic = "nachname";
+ break;
+ default:
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
+ }
+
+ $result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
+ if (isError($result)) $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_insert_error'));
+
+ }
+ $this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
+
+ $this->terminateWithSuccess($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
+ } else {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+ }
+
+
+ }
+
+ public function insertFile($replace)
+ {
+ $replace = json_decode($replace);
+
+ if (!count($_FILES)) {
+ $this->terminateWithError("No file available for upload");
+ }
+
+ //? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+ if (isset($replace)) {
+
+ $this->ProfilUpdateModel->addSelect(["attachment_id"]);
+ $profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+ if (isError($profilUpdate)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
+ }
+ //? get the attachmentID
+ $dms_id = $this->getDataOrTerminateWithError($profilUpdate)[0]->attachment_id;
+
+ //? delete old dms_file of Profil Update
+ $deleteOldFile_result = $this->deleteOldVersionFile($dms_id);
+ if(!$deleteOldFile_result){
+ $this->terminateWithError("error while deleting the old file");
+ }
+ }
+
+
+ $files = $_FILES['files'];
+ $file_count = count($files['name']);
+
+ $res = [];
+
+ for ($i = 0; $i < $file_count; $i++) {
+ $_FILES['files']['name'] = $files['name'][$i];
+ $_FILES['files']['type'] = $files['type'][$i];
+ $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+ $_FILES['files']['error'] = $files['error'][$i];
+ $_FILES['files']['size'] = $files['size'][$i];
+
+ $dms = [
+ "kategorie_kurzbz" => "profil_aenderung",
+ "version" => 0,
+ "name" => $_FILES['files']['name'],
+ "mimetype" => $_FILES['files']['type'],
+ "beschreibung" => $this->uid . " Profil Änderung",
+ "insertvon" => $this->uid,
+ "insertamum" => "NOW()",
+ ];
+
+ $tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+
+ if(isError($tmp_res)){
+ $this->addError(getError($tmp_res));
+ }
+
+ $tmp_res = $this->getDataOrTerminateWithError($tmp_res);
+ array_push($res, $tmp_res);
+ }
+
+ $this->terminateWithSuccess($res);
+ }
+
+ public function getProfilUpdateWithPermission($status = null)
+ {
+ // early return if no status has been passed as argument
+ if (!isset($status)) {
+ echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+ return;
+ }
+
+ // get the sprache of the user
+ $sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
+ $sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
+
+ if (isset($sprachenIndex) && isset($status)) {
+ // get the corresponding status kurz_bz primary key out of the translation
+ $status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
+ $status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
+ $res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
+
+ echo json_encode($res);
+ }
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+
+ private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
+ {
+ if($this->config->item('cis_send_profil_update_mails') === false)
+ {
+ return;
+ }
+
+ $this->load->helper('hlp_sancho_helper');
+ $emails = [];
+
+ $is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+ if (isError($is_mitarbeiter)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+ }
+ $is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+
+ //! if the $uid is a mitarbeiter and student, only the hr is notified by email
+ if ($is_mitarbeiter) {
+ //? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+ //? use constant variable MAIL_GST to mail to the personalverwaltung
+ $this->MitarbeiterModel->addSelect([TRUE]);
+ $this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+ //? check if the the userID is a mitarbeiter and if the benutzer is active
+ $res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
+ if (isError($res)) {
+ $this->terminateWithError("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
+ }
+ if (hasData($res)) {
+ array_push($emails, MAIL_GST);
+ } else {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+ }
+ } else {
+ //? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
+ $is_student = $this->StudentModel->isStudent($uid);
+ if (isError($is_student)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
+ }
+ $is_student = $this->getDataOrTerminateWithError($is_student);
+ if ($is_student) {
+ //? Send email to the Studiengangsassistentinnen
+ $this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+ $this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+ $this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+ $this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+ $this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+ //* check if the benutzer itself is active
+ //* check if the student status is Student or Diplomand (active students)
+ $this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
+ $res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
+ if (isError($res)) {
+ $this->terminateWithError(getError($res));
+ } else {
+ $res = $this->getDataOrTerminateWithError($res);
+ foreach ($res as $emailObj) {
+ array_push($emails, $emailObj->email);
+ }
+ }
+ }
+ }
+ $mail_res = [];
+ //? sending email
+ foreach ($emails as $email) {
+ array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
+ }
+ foreach ($mail_res as $m_res) {
+ if (!$m_res) {
+ $this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+ }
+ }
+
+ }
+
+ private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
+ {
+ if($this->config->item('cis_send_profil_update_mails') === false)
+ {
+ return;
+ }
+
+ $this->load->helper('hlp_sancho_helper');
+ $email = $uid . "@" . DOMAIN;
+
+
+ function languageQuery($language)
+ {
+ return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+ }
+
+ $this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
+
+ $status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+
+ if (isError($status_translation)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
+ }
+
+ $status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
+
+ if (isset($status_translation)) {
+ $mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+ if (!$mail_res) {
+ $this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+ }
+ }
+ }
+
+ private function setStatusOnUpdateRequest($id, $status, $status_message)
+ {
+ return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
+ }
+
+ private function updateRequestedChange($id, $requested_change)
+ {
+ return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
+ }
+
+ private function deleteOldVersionFile($dms_id)
+ {
+ // starting the transaction
+ $this->db->trans_start();
+
+
+ if (!isset($dms_id)) {
+ return;
+ }
+
+ //? delete the file from the profilUpdate first
+ $profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
+ if(isError($profilUpdateFileDelete)){
+ $this->terminateWithError(getError($profilUpdateFileDelete));
+ }
+
+ //? delete all the different versions of the dms_file
+ $dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+ $dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
+
+
+
+ $dms_versions = array_map(function ($item) {
+ return $item->version;
+ }, $dmsVersions);
+
+
+ $test_array = array();
+ foreach ($dms_versions as $version) {
+
+ $delete_result = $this->dmslib->removeVersion($dms_id, $version);
+ array_push($test_array, $delete_result);
+
+ if(isError($delete_result)){
+ $this->addError(getError($delete_result));
+ }
+ }
+
+ // transaction complete
+ $this->db->trans_complete();
+
+ if ($this->db->trans_status() === FALSE)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+
+ }
+
+
+ private function getOE_from_student($student_uid)
+ {
+ //? returns the oe_einheit eines Studenten
+ $query = "SELECT public.tbl_studiengang.oe_kurzbz
+ FROM public.tbl_student
+ JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+ WHERE public.tbl_student.student_uid = ?;";
+
+ $res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+ $res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
+ $res = array_map(
+ function ($item) {
+ return $item->oe_kurzbz;
+ },
+ $res
+ );
+ return $res;
+ }
+
+ private function handleAdresse($requested_change, $personID)
+ {
+ $this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+ $adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
+ $adr_kurzbz = $this->getDataOrTerminateWithError($adr_kurzbz)[0]->adressentyp_kurzbz;
+
+ //? replace the address_typ with its correct kurzbz foreign key
+ $requested_change['typ'] = $adr_kurzbz;
+
+ $adresse_id = $requested_change["adresse_id"];
+
+ //? removes the adresse_id because we don't want to update the kontakt_id in the database
+ unset($requested_change["adresse_id"]);
+
+ //! ADD
+ if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+
+ //? removes add flag
+ unset($requested_change['add']);
+ $requested_change['insertamum'] = "NOW()";
+ $requested_change['insertvon'] = getAuthUID();
+ $requested_change['person_id'] = $personID;
+ //TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
+ $insertID = $this->AdresseModel->insert($requested_change);
+ $insert_adresse_id = $insertID;
+ $insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
+ if ($insert_adresse_id) {
+ $this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
+ }
+ }
+ //! DELETE
+ elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+ $result = $this->AdresseModel->delete($adresse_id);
+ if (isError($result)) {
+ $this->terminateWithError(getError($result));
+ }
+ }
+ //! UPDATE
+ else {
+ $requested_change['updateamum'] = "NOW()";
+ $requested_change['updatevon'] = getAuthUID();
+ $update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+ $update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+ $this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
+
+ }
+ return $insertID ?? null;
+ }
+
+ private function handleKontakt($requested_change, $personID)
+ {
+ $kontakt_id = $requested_change["kontakt_id"];
+ //? removes the kontakt_id because we don't want to update the kontakt_id in the database
+ unset($requested_change["kontakt_id"]);
+
+ //! ADD
+ if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+ //? removes add flag
+ unset($requested_change['add']);
+ $requested_change['person_id'] = $personID;
+ $requested_change['insertamum'] = "NOW()";
+ $requested_change['insertvon'] = getAuthUID();
+ $insertID = $this->KontaktModel->insert($requested_change);
+ $insert_kontakt_id = $insertID;
+ $insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
+ if ($insert_kontakt_id) {
+ $this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
+ }
+ }
+ //! DELETE
+ elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+ $result = $this->KontaktModel->delete($kontakt_id);
+ if (isError($result)) {
+ $this->terminateWithError(getError($result));
+ }
+ }
+ //! UPDATE
+ else {
+ $requested_change['updateamum'] = "NOW()";
+ $requested_change['updatevon'] = getAuthUID();
+ $update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
+ $update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
+ if ($update_kontakt_id) {
+ $this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
+ }
+ }
+ return isset($insertID) ? $insertID : null;
+ }
+
+ private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+ {
+ if ($zustellung) {
+ $this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
+ $this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
+ $zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+ if (isError($zustellAdressenArray)) {
+ $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
+ }
+ $zustellAdressenArray = $this->getDataOrTerminateWithError($zustellAdressenArray);
+
+ if (count($zustellAdressenArray) > 0) {
+
+ $zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
+
+ return $adresse->adresse_id != $adresse_id;
+ });
+
+ // remove the zustelladresse from all other zustelladressen
+ foreach ($zustellAdressenArray as $adresse) {
+ $this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
+ }
+
+ }
+ }
+ }
+
+ private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+ {
+ if ($zustellung) {
+ $this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+ $this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
+ $zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+ if (!isSuccess($zustellKontakteArray)) {
+ return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
+ }
+ $zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
+
+ if ($zustellung && count($zustellKontakteArray) > 0) {
+ $zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
+ return $kontakt->kontakt_id != $kontakt_id;
+ });
+ foreach ($zustellKontakteArray as $kontakt) {
+ $this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
+ }
+
+ }
+ }
+ }
+
+}
+
+
diff --git a/application/controllers/api/frontend/v1/Studgang.php b/application/controllers/api/frontend/v1/Studgang.php
new file mode 100644
index 000000000..82aebb666
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Studgang.php
@@ -0,0 +1,65 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class Studgang extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+ parent::__construct([
+ 'getStudiengangInfo'=> self::PERM_LOGGED,
+
+ ]);
+
+ $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+ $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+
+ // Loads phrases system
+ $this->loadPhrases([
+ 'global'
+ ]);
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ public function getStudiengangInfo(){
+ $isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+ $isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
+ if($isMitarbeiter) {
+ $this->terminateWithSuccess(null);
+ }
+
+ // fetches the Studiengang Information which is used next to the news
+ $studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews();
+ $studiengangInfo= $this->getDataOrTerminateWithError($studiengangInfo);
+ $this->terminateWithSuccess($studiengangInfo);
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+
+
+}
+
diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
new file mode 100644
index 000000000..2ec02fea9
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -0,0 +1,618 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Stundenplan extends FHCAPI_Controller
+{
+
+ /**
+ * Object initialization
+ */
+ public function __construct()
+ {
+
+ parent::__construct([
+ 'getRoomplan' => self::PERM_LOGGED,
+ 'Stunden' => self::PERM_LOGGED,
+ 'Reservierungen' => self::PERM_LOGGED,
+ 'getStundenplan' => self::PERM_LOGGED,
+ 'getLehreinheitStudiensemester' => self::PERM_LOGGED,
+ 'studiensemesterDateInterval' => self::PERM_LOGGED,
+ ]);
+
+ $this->load->library('LogLib');
+ $this->loglib->setConfigs(array(
+ 'classIndex' => 5,
+ 'functionIndex' => 5,
+ 'lineIndex' => 4,
+ 'dbLogType' => 'API', // required
+ 'dbExecuteUser' => 'RESTful API'
+ ));
+
+ $this->load->library('form_validation');
+
+ //load models
+ $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+ $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ //TODO: delete this function if we don't use the old calendar export endpoints anymore
+ public function studiensemesterDateInterval($date){
+ $this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+ $studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
+ $studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
+ $this->terminateWithSuccess($studiensemester);
+ }
+
+
+ /**
+ * fetches Stunden layout from database
+ * @access public
+ *
+ */
+ public function Stunden()
+ {
+ $this->load->model('ressource/Stunde_model', 'StundeModel');
+
+ $stunden = $this->StundeModel->load();
+
+ $stunden = $this->getDataOrTerminateWithError($stunden);
+
+ $this->terminateWithSuccess($stunden);
+ }
+
+ /**
+ * fetches room events from a certain date
+ * @access public
+ *
+ */
+ public function getRoomplan()
+ {
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+ $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() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ // storing the get parameter in local variables
+ $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+ $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->getDataOrTerminateWithError($roomplan_data);
+
+ $this->expand_object_information($roomplan_data);
+
+ $this->terminateWithSuccess($roomplan_data);
+
+ }
+
+ /**
+ * fetches stundenplan events from a UID and start/end date
+ * @access public
+ *
+ */
+
+ public function getStundenplan(){
+
+ $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+ $this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+ $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+ $this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+
+ // form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $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() === FALSE)
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ // storing the get parameter in local variables
+ $start_date = $this->input->get('start_date', TRUE);
+ $end_date = $this->input->get('end_date', TRUE);
+ $lv_id = $this->input->get('lv_id', TRUE);
+
+ $student_uid = getAuthUID();
+ if(is_null($student_uid))
+ {
+ $this->terminateWithError("No UID");
+ }
+
+ $semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
+ $this->sortStudienSemester($semester_range);
+ $this->applyLoadUeberSemesterHaelfte($semester_range);
+
+ if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+
+ $stundenplan_data = $this->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+ $stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+ $this->expand_object_information($stundenplan_data);
+
+ // query lv itself in case its Stundenplan is being queried and it has no entries
+ $this->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
+ $lv = getData($this->LehrveranstaltungModel->load($lv_id))[0];
+ $this->addMeta('lv', $lv);
+ $this->terminateWithSuccess($stundenplan_data);
+
+ }
+
+ $is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
+ if($is_mitarbeiter)
+ {
+
+ $stundenplan_data = $this->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+ $stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+ $this->expand_object_information($stundenplan_data);
+ $this->terminateWithSuccess($stundenplan_data);
+ } else {
+ // getting the gruppen_kurzbz of the student in the different studiensemester
+ $benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
+
+ // getting the student_lehrverbaende of the student in the different studiensemester
+ $student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
+
+ $stundenplan_query = $this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+ if(!$stundenplan_query)
+ {
+ $this->terminateWithSuccess([]);
+ }
+ $stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+ $stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+
+ $this->expand_object_information($stundenplan_data);
+
+ $this->returnObj['$stundenplan_query'] = $stundenplan_query;
+ $this->returnObj['$student_lehrverband'] = $student_lehrverband;
+ $this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+ $this->terminateWithSuccess($stundenplan_data);
+ }
+
+ }
+
+ // gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+ public function Reservierungen($ort_kurzbz = null)
+ {
+ //form validation
+ $this->load->library('form_validation');
+ $this->form_validation->set_data($_GET);
+ $this->form_validation->set_rules('start_date', "StartDate", "required");
+ $this->form_validation->set_rules('end_date', "EndDate", "required");
+ if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+
+ // storing the get parameter in local variables
+ $start_date = $this->input->get('start_date', TRUE);
+ $end_date = $this->input->get('end_date', TRUE);
+
+ $is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+ if($is_mitarbeiter)
+ {
+ $reservierungen = $this->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+ } else {
+ // querying the reservierungen
+ $reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+ }
+
+ $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+ $this->expand_object_information($reservierungen);
+ $this->terminateWithSuccess($reservierungen);
+
+ }
+
+ public function getLehreinheitStudiensemester($lehreinheit_id){
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+ $this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
+ $result = $this->LehreinheitModel->load($lehreinheit_id);
+ $result = current($this->getDataOrTerminateWithError($result))->studiensemester_kurzbz;
+ $this->terminateWithSuccess($result);
+ }
+
+ // ################# Private Functions
+
+ private function expand_object_information($data){
+
+ foreach ($data as $item)
+ {
+
+ $lektor_obj_array = array();
+ $gruppe_obj_array = array();
+
+ // load lektor object
+ foreach ($item->lektor as $lv_lektor)
+ {
+ $this->StundenplanModel->addLimit(1);
+ $lektor_object = $this->StundenplanModel->execReadOnlyQuery("
+ SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+ FROM public.tbl_mitarbeiter
+ JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+ JOIN public.tbl_person person ON person.person_id = benutzer.person_id
+ WHERE kurzbz = ?", [$lv_lektor]);
+ if (isError($lektor_object)) {
+ $this->show_error(getError($lektor_object));
+ }
+ $lektor_object = $this->getDataOrTerminateWithError($lektor_object);
+ if(count($lektor_object) == 0)
+ {
+ $this->terminateWithError("No lektor object");
+ }
+ $lektor_object = current($lektor_object);
+ // only provide needed information of the mitarbeiter object
+ $lektor_obj_array[] = $lektor_object;
+ }
+
+ // load gruppe object
+ foreach ($item->gruppe as $lv_gruppe)
+ {
+ $lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+ $lv_gruppe_array = explode(",", $lv_gruppe);
+ list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+ $lv_gruppe_object = new stdClass();
+ $lv_gruppe_object->gruppe = $gruppe;
+ $lv_gruppe_object->verband = $verband;
+ $lv_gruppe_object->semester = $semester;
+ $lv_gruppe_object->studiengang_kz = $studiengang_kz;
+ $lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+ $gruppe_obj_array[] = $lv_gruppe_object;
+ }
+
+ if($item->ort_kurzbz) {
+
+ $ort_content_object = $this->StundenplanModel->execReadOnlyQuery("
+ SELECT content_id
+ FROM public.tbl_ort
+ WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
+ if (isError($ort_content_object)) {
+ $this->show_error(getError($ort_content_object));
+ }
+ $ort_content_object = getData($ort_content_object)[0];
+ if($ort_content_object) {
+ $item->ort_content_id = $ort_content_object->content_id;
+ }
+
+
+ }
+
+ $item->gruppe = $gruppe_obj_array;
+ $item->lektor = $lektor_obj_array;
+
+ }
+ }
+
+ // function used to sort an array of studiensemester strings
+ private function sortStudienSemester(&$semester_range){
+ usort(
+ $semester_range,
+ function($first,$second)
+ {
+ $sem_first = null;
+ $year_first = null;
+ $match_first = null;
+
+ $sem_second = null;
+ $year_second = null;
+ $match_second = null;
+
+ preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+ preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+
+ $sem_first = $match_first[1];
+ $year_first = intval($match_first[2]);
+
+ $sem_second = $match_second[1];
+ $year_second = intval($match_second[2]);
+
+ if($year_first < $year_second)
+ {
+ return -1;
+ }
+ else if($year_first > $year_second)
+ {
+ return 1;
+ }
+ else if($year_first == $year_second && $sem_first > $sem_second)
+ {
+ return 1;
+ }
+ else if($year_first == $year_second && $sem_first < $sem_second)
+ {
+ return -1;
+ }
+ return 0;
+ }
+ );
+ }
+
+
+
+ private function fetchBenutzerGruppenFromStudiensemester($semester_range){
+ $student_uid = getAuthUID();
+ $benutzer_gruppen = [];
+ // for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+ /*
+ [
+ ['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+ ['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+ ['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+ ]
+ */
+ foreach($semester_range as $semester_key => $semester_array)
+ {
+ $benutzer_gruppen[$semester_key] = [];
+ // each semester could have ajoint semesters that need to be checked
+ foreach($semester_array as $semester=>$semester_date_range)
+ {
+ // for each active semester query the benutzer_gruppen associated to the semester
+ $benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+ SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+ $benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+ array_push(
+ $benutzer_gruppen[$semester_key],
+ array_map(
+ function($item)
+ {
+ return "'".$item->gruppe_kurzbz. "'";
+ },
+ $benutzer_query_result
+ )
+ );
+ }
+ }
+
+ // merge the gruppen of each studiensemester together for the original studiensemester
+ /*
+ [
+ ['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+ ['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+ ['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+ ]
+ */
+ $benutzer_gruppen = array_map(
+ function($gruppe)
+ {
+ $merged_gruppe = [];
+ foreach($gruppe as $gruppen_array)
+ {
+ $merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+ }
+ return $merged_gruppe;
+ },
+ $benutzer_gruppen
+ );
+
+ return $benutzer_gruppen;
+ }
+
+ private function fetchStudentlehrverbandFromStudiensemester($semester_range){
+ $student_uid = getAuthUID();
+ $student_lehrverband = [];
+ // for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+ /*
+ [
+ ['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+ ['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+ ['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+ ]
+ */
+ foreach($semester_range as $semester_key => $semester_array)
+ {
+ $student_lehrverband[$semester_key] = [];
+ foreach($semester_array as $semester=>$semester_date_range)
+ {
+ // for each active semester query the student_lehrverband associated to the semester
+ $lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+ SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+ $lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+ array_push($student_lehrverband[$semester_key], array_map(
+ function ($item)
+ {
+ $result = new stdClass();
+ $result->studiengang_kz = $item->studiengang_kz;
+ $result->semester = $item->semester;
+ $result->verband = $item->verband;
+ $result->gruppe = $item->gruppe;
+ return $result;
+ },
+ $lehrverband_query_result));
+ }
+ }
+
+ // merge the studentlehrverband of each studiensemester together for the original studiensemester
+ /*
+ [
+ ['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+ ['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+ ['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+ ]
+ */
+ $student_lehrverband = array_map(
+ function($studentlehrverband)
+ {
+ $merged_studentlehrverband = [];
+ foreach($studentlehrverband as $studentlehrverband_array)
+ {
+ $merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+ }
+ return $merged_studentlehrverband;
+ },
+ $student_lehrverband
+ );
+
+ return $student_lehrverband;
+ }
+
+ private function applyLoadUeberSemesterHaelfte(&$semester_range){
+ /*
+ @var($semester_collection)
+ convert the array of studiensemester into an associative array with the studiensemester as the key
+ and the values of each key are the studiensemester needed for the query associated to that studiensemester
+ example:
+
+ #INPUT:
+ ['WS2023','SS2024','WS2024']
+ #OUTPUT:
+ [
+ 'WS2023' => ['SS2023','WS2023']
+ 'SS2024' => ['WS2023','SS2024']
+ 'WS2024' => ['SS2024','WS2024']
+ ]
+ */
+ $semester_collection = [];
+ foreach($semester_range as $studiensemester)
+ {
+ $previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
+ $previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+ if (count($previous_studiensemester) == 0) {
+ $this->terminateWithError("No previous semester");
+ }
+ $previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+ $semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+ }
+
+ /*
+ @var($studienSemesterDateRanges)
+ fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+ based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range
+ or the semester with the full date range and the previous semester with the half date range:
+
+ #INPUT:
+ [
+ 'WS2023' => ['SS2023','WS2023']
+ 'SS2024' => ['WS2023','SS2024']
+ 'WS2024' => ['SS2024','WS2024']
+ ]
+ #OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+ ~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+ [
+ "SS2024": [
+ "WS2023": [
+ "start"=> "2024-02-03",
+ "ende"=> "2024-08-31"
+ ],
+ "SS2024": [
+ "start"=> "2024-02-03",
+ "ende"=> "2024-08-31"
+ ]
+ ]
+ ]
+ ~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+ [
+ "SS2024": [
+ "WS2023": [
+ "start"=> "2024-02-03",
+ "ende"=> "2024-05-17"
+ ],
+ "SS2024": [
+ "start"=> "2024-02-03",
+ "ende"=> "2024-08-31"
+ ]
+ ]
+ ]
+ */
+ $studienSemesterDateRanges=[];
+ foreach($semester_collection as $semester_original => $semester_adjoint)
+ {
+ $semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+ $semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende));
+
+ // initialize empty arrays to add key value pairs
+ $studienSemesterDateRanges[$semester_original] = [];
+
+ // check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+ $match = null;
+ preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+ if(count($match) >0)
+ {
+ $one_month = new DateInterval('P1M');
+ $one_day = DateInterval::createFromDateString('1 days');
+ $summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+ $summer_studiensemester_end_date->add($one_month);
+ $summer_studiensemester_end_date->sub($one_day);
+ $semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+ }
+ if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+ {
+ foreach($semester_adjoint as $adjoint)
+ {
+ $studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+ }
+ }
+ else
+ {
+ //TODO: half of a DateInterval might not be correctly calculated
+ // calculate the half of the studiensemester
+ $studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+ $studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+ $studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+ $half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+ $half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+ $studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+
+ $first_half = new stdClass();
+ $first_half->start = $semester_start_ende->start;
+ $first_half->ende = $studiensemester_half;
+
+ $studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+ $studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+ }
+ $semester_range = $studienSemesterDateRanges;
+ }
+ }
+
+ private function studienSemesterErmitteln($start_date,$end_date){
+
+ // gets all studiensemester from the student from start_date to end_date
+ $semester_range = $this->StudiensemesterModel->getByDateRange($start_date,$end_date);
+ $semester_range = array_map(
+ function($sem)
+ {
+ return $sem->studiensemester_kurzbz;
+ },
+ $this->getDataOrTerminateWithError($semester_range)
+ );
+
+ // if no studiensemester is found for the given timespan, get the nearest studiensemester
+ if(count($semester_range) == 0)
+ {
+ $aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+ $aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+ if (count($aktuelle_studiensemester) == 0) {
+ $this->terminateWithError("No aktuelles semester");
+ }
+ $aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+ // push aktuelles semester in active semester array
+ array_push($semester_range, $aktuelle_studiensemester);
+
+ }
+ return $semester_range;
+ }
+
+}
diff --git a/application/controllers/api/frontend/v1/Udf.php b/application/controllers/api/frontend/v1/Udf.php
index 99ed2a10d..4bdc613e0 100644
--- a/application/controllers/api/frontend/v1/Udf.php
+++ b/application/controllers/api/frontend/v1/Udf.php
@@ -31,11 +31,10 @@ class Udf extends FHCAPI_Controller
*/
public function __construct()
{
- // TODO(chris): permissions
// NOTE: UdfLib has its own permissions checks
parent::__construct([
- 'load' => 'admin:r',#self::PERM_LOGGED,
- 'save' => 'admin:r'#self::PERM_LOGGED
+ 'load' => self::PERM_LOGGED,
+ 'save' => self::PERM_LOGGED
]);
// Libraries
@@ -73,10 +72,7 @@ class Udf extends FHCAPI_Controller
$result = $this->udflib->getFieldArray($this->TargetModel, $id);
- #$fields = $this->getDataOrTerminateWithError($result);
- if (isError($result))
- $this->terminateWithError(getError($result));
- $fields = $result->retval;
+ $fields = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($fields);
}
@@ -94,10 +90,7 @@ class Udf extends FHCAPI_Controller
$result = $this->udflib->getCiValidations($this->TargetModel, $this->input->post());
- #$fieldValidations = $this->getDataOrTerminateWithError($result);
- if (isError($result))
- $this->terminateWithError(getError($result));
- $fieldvalidations = $result->retval;
+ $fieldValidations = $this->getDataOrTerminateWithError($result);
$this->form_validation->set_rules($fieldvalidations);
@@ -117,9 +110,7 @@ class Udf extends FHCAPI_Controller
$result = $this->TargetModel->update($id, $fields);
- #$this->getDataOrTerminateWithError($result);
- if (isError($result))
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess(array_fill_keys(array_keys($fields), ''));
}
diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
new file mode 100644
index 000000000..8e9d931f2
--- /dev/null
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -0,0 +1,387 @@
+ ['admin:r', 'assistenz:r'],
+ 'addNewBetriebsmittel' => self::PERM_LOGGED,
+ 'updateBetriebsmittel' => self::PERM_LOGGED,
+ 'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+ 'deleteBetriebsmittel' => self::PERM_LOGGED,
+ 'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
+ 'loadInventarliste' => ['admin:r', 'assistenz:r']
+ ]);
+
+ //Load Models
+ $this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+ $this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
+ // Additional Permission Checks
+ if ($this->router->method == 'addNewBetriebsmittel') {
+ $this->person_id = current(array_slice($this->uri->rsegments, 2));
+
+ $this->checkPermissionsForPerson(
+ $this->person_id,
+ ['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+ ['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+ );
+ } elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
+ $betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
+ $result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
+ if (!hasData($result))
+ show_404();
+ $this->person_id = current(getData($result))->person_id;
+
+ $this->checkPermissionsForPerson(
+ $this->person_id,
+ ['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+ ['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+ );
+ }
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ $this->load->library('form_validation');
+
+ // Load language phrases
+ $this->loadPhrases([
+ 'ui',
+ 'wawi'
+ ]);
+ }
+
+ public function getAllBetriebsmittel($type_id, $id)
+ {
+ $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: []));
+ }
+
+ protected function validateNewOrUpdate()
+ {
+ $this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired')
+ ]);
+
+ $this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
+ ]);
+
+ $this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired')
+ ]);
+
+ if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
+ $this->form_validation->set_rules('retouram', 'Retour am', [
+ 'is_valid_date',
+ ['is_not_before_ausgegebenam', function ($value) {
+ return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
+ }]
+ ], [
+ 'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
+ ]);
+ } else {
+ $this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
+ }
+
+ $this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
+
+ if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
+ // Inventar
+ $this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
+ } elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
+ // Zutrittskarte
+ if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
+ $this->form_validation->set_rules('nummer', 'Nummer', 'required', [
+ 'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+ ]);
+ $this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
+ 'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+ ]);
+ } else {
+ if ($this->input->post('nummer') === null) {
+ $result = $this->BetriebsmittelpersonModel->loadViewWhere([
+ 'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+ 'nummer2' => $this->input->post('nummer2'),
+ 'person_id !=' => $this->person_id,
+ 'retouram IS NULL' => null
+ ]);
+ if (hasData($result))
+ $this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
+ 'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+ ]);
+ } else {
+ $result = $this->BetriebsmittelpersonModel->loadViewWhere([
+ 'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+ 'nummer' => $this->input->post('nummer'),
+ 'person_id !=' => $this->person_id,
+ 'retouram IS NULL' => null
+ ]);
+ if (hasData($result))
+ $this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
+ 'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+ ]);
+ }
+ }
+ }
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ public function addNewBetriebsmittel($person_id)
+ {
+ $this->form_validation->set_rules('uid', 'UID', [
+ ['uid_in_person', function ($value) use ($person_id) {
+ if ($value === null)
+ return true;
+ $this->load->model('person/Benutzer_model', 'BenutzerModel');
+ $result = $this->BenutzerModel->loadWhere([
+ 'uid' => $value,
+ 'person_id' => $person_id
+ ]);
+
+ return hasData($result);
+ }]
+ ], [
+ 'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
+ ]);
+ $this->validateNewOrUpdate();
+
+ $betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+ $nummer = $this->input->post('nummer');
+ $nummer2 = $this->input->post('nummer2');
+ $beschreibung = $this->input->post('beschreibung');
+ $betriebsmittel_id = $this->input->post('betriebsmittel_id');
+ $anmerkung = $this->input->post('anmerkung');
+ $kaution = $this->input->post('kaution');
+ $ausgegebenam = $this->input->post('ausgegebenam');
+ $retouram = $this->input->post('retouram');
+ $uid = $this->input->post('uid');
+
+ // NOTE(chris): transform_kartennummer
+ if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+ $nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+ $this->db->trans_start();
+
+ if ($betriebsmitteltyp != 'Inventar') {
+ $this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+ if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+ $result = $this->BetriebsmittelModel->loadWhere([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer2' => $nummer2
+ ]);
+ } else {
+ $result = $this->BetriebsmittelModel->loadWhere([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer' => $nummer
+ ]);
+ }
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if ($data) {
+ $data = current($data);
+ if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+ $result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+ 'nummer' => $nummer,
+ 'nummer2' => $nummer2,
+ 'beschreibung' => $beschreibung,
+ 'updateamum' => date('c'),
+ 'updatevon' => getAuthUID()
+ ]);
+ $this->getDataOrTerminateWithError($result);
+ }
+ $betriebsmittel_id = $data->betriebsmittel_id;
+ } else {
+ $result = $this->BetriebsmittelModel->insert([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer' => $nummer,
+ 'nummer2' => $nummer2,
+ 'beschreibung' => $beschreibung,
+ 'reservieren' => false,
+ 'ort_kurzbz' => null,
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID(),
+ ]);
+ $betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+ }
+ }
+
+ $result = $this->BetriebsmittelpersonModel->insert([
+ 'person_id' => $person_id,
+ 'betriebsmittel_id' => $betriebsmittel_id,
+ 'anmerkung' => $anmerkung,
+ 'kaution' => $kaution,
+ 'ausgegebenam' => $ausgegebenam,
+ 'retouram' => $retouram,
+ 'uid' => $uid,
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID()
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->db->trans_complete();
+
+ $this->terminateWithSuccess(true);
+ }
+
+ public function updateBetriebsmittel($betriebsmittelperson_id)
+ {
+ $this->validateNewOrUpdate();
+
+ $betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+ $nummer = $this->input->post('nummer');
+ $nummer2 = $this->input->post('nummer2');
+ $beschreibung = $this->input->post('beschreibung');
+ $betriebsmittel_id = $this->input->post('betriebsmittel_id');
+ $anmerkung = $this->input->post('anmerkung');
+ $kaution = $this->input->post('kaution');
+ $ausgegebenam = $this->input->post('ausgegebenam');
+ $retouram = $this->input->post('retouram');
+
+ // NOTE(chris): transform_kartennummer
+ if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+ $nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+ $this->db->trans_start();
+
+ if ($betriebsmitteltyp != 'Inventar') {
+ $found = false;
+ if ($nummer !== null && $betriebsmittel_id !== null) {
+ $result = $this->BetriebsmittelModel->load($betriebsmittel_id);
+ $data = $this->getDataOrTerminateWithError($result);
+ if ($data && current($data)->nummer == $nummer) {
+ $found = true;
+ }
+ }
+
+ if (!$found) {
+ $this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+ if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+ $result = $this->BetriebsmittelModel->loadWhere([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer2' => $nummer2
+ ]);
+ } else {
+ $result = $this->BetriebsmittelModel->loadWhere([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer' => $nummer
+ ]);
+ }
+ $data = $this->getDataOrTerminateWithError($result);
+ }
+
+ if ($data) {
+ $data = current($data);
+ if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+ $result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+ 'nummer' => $nummer,
+ 'nummer2' => $nummer2,
+ 'beschreibung' => $beschreibung,
+ 'updateamum' => date('c'),
+ 'updatevon' => getAuthUID()
+ ]);
+ $this->getDataOrTerminateWithError($result);
+ }
+ $betriebsmittel_id = $data->betriebsmittel_id;
+ } else {
+ $result = $this->BetriebsmittelModel->insert([
+ 'betriebsmitteltyp' => $betriebsmitteltyp,
+ 'nummer' => $nummer,
+ 'nummer2' => $nummer2,
+ 'beschreibung' => $beschreibung,
+ 'reservieren' => false,
+ 'ort_kurzbz' => null,
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID(),
+ ]);
+ $betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+ }
+ }
+
+ $result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
+ 'betriebsmittel_id' => $betriebsmittel_id,
+ 'anmerkung' => $anmerkung,
+ 'kaution' => $kaution,
+ 'ausgegebenam' => $ausgegebenam,
+ 'retouram' => $retouram,
+ 'updateamum' => date('c'),
+ 'updatevon' => getAuthUID()
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->db->trans_complete();
+
+ $this->terminateWithSuccess(true);
+ }
+
+ public function loadBetriebsmittel($betriebsmittelperson_id)
+ {
+ $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
+
+ if (isError($result)) {
+ $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+
+ if (!hasData($result)) {
+ $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+ }
+
+ return $this->terminateWithSuccess(current(getData($result)));
+ }
+
+ public function deleteBetriebsmittel($betriebsmittelperson_id)
+ {
+ $result = $this->BetriebsmittelpersonModel->delete(
+ array('betriebsmittelperson_id' => $betriebsmittelperson_id,
+ )
+ );
+
+ if (isError($result)) {
+ return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+ if (!hasData($result)) {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+ }
+ $this->terminateWithSuccess(current(getData($result)));
+ }
+
+ public function getTypenBetriebsmittel()
+ {
+ $this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
+
+ $this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+ $result = $this->BetriebsmitteltypModel->load(); // load All
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ return $this->terminateWithSuccess(getData($result) ?: []);
+ }
+
+ public function loadInventarliste($searchString)
+ {
+ $result = $this->BetriebsmittelModel->loadInventarliste($searchString);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+}
+
+
diff --git a/application/controllers/api/frontend/v1/checkperson/CheckPerson.php b/application/controllers/api/frontend/v1/checkperson/CheckPerson.php
new file mode 100644
index 000000000..321893610
--- /dev/null
+++ b/application/controllers/api/frontend/v1/checkperson/CheckPerson.php
@@ -0,0 +1,141 @@
+.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class CheckPerson extends FHCAPI_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+ 'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+ 'checkUnruly' => array('basis/mitarbeiter:r', 'student/antragfreigabe:r', 'student/studierendenantrag:r', 'infocenter:r'),
+ 'checkDuplicate' => array('infocenter:r'),
+ ]);
+
+ $this->_ci =& get_instance();
+ $this->_ci->load->model('person/Person_model', 'PersonModel');
+ }
+
+ public function updatePersonUnrulyStatus()
+ {
+ $data = json_decode($this->input->raw_input_stream, true);
+
+ $person_id = $data['person_id'];
+ $unruly = $data['unruly'];
+
+ $result = $this->_ci->PersonModel->updateUnruly($person_id, $unruly);
+
+ if(isError($result)) {
+ $this->terminateWithError($result);
+ } else if (isSuccess($result)) {
+ $this->terminateWithSuccess($result);
+ }
+
+ }
+
+ public function checkDuplicate() {
+
+ $person_id = $this->input->post('person_id');
+
+ $result = $this->_ci->PersonModel->checkDuplicate($person_id);
+
+ if (isSuccess($result))
+ $this->terminateWithSuccess($result);
+ else
+ $this->terminateWithError('Error when searching for person');
+
+ }
+
+ // performs strict check over vorname, nachname, gebdatum
+ public function checkUnruly() {
+
+ $vorname = $this->input->post('vorname');
+ $nachname = $this->input->post('nachname');
+ $gebdatum = $this->input->post('gebdatum');
+
+ $result = $this->_ci->PersonModel->checkUnruly($vorname, $nachname, $gebdatum);
+
+ if (isSuccess($result))
+ $this->terminateWithSuccess($result);
+ else
+ $this->terminateWithError('Error when searching for person');
+ }
+
+ // filters nachname on similarity and vorname/gebdatum are optional
+ public function filterPerson() {
+ $payload = json_decode($this->input->raw_input_stream, TRUE);
+
+ $nachnameString = '';
+ $vornameString = '';
+ $filterUnruly = true;
+ $birthdateString = '';
+
+ if(array_key_exists( 'nachname', $payload) ) {
+ $nachnameString = $payload['nachname'];
+ }
+
+ if(array_key_exists('vorname', $payload)) {
+ $vornameString = $payload['vorname'];
+ }
+
+ if(array_key_exists('unruly', $payload)){
+ $filterUnruly = $payload['unruly'];
+ }
+
+ if(array_key_exists('gebdatum', $payload)) {
+ // TODO: enable if gebdatum filter for unrulys is desired
+// $birthdateString = $payload['gebdatum'];
+ }
+
+ $parametersArray = array($nachnameString);
+ $where ="p.nachname~* ? ";
+ if (mb_strlen($nachnameString) == 2)
+ {
+ $where = "p.nachname=? ";
+ }
+
+ if(isset($vornameString) && $vornameString != '')
+ {
+ $where.= " AND p.vorname~*?";
+ $parametersArray[] = $vornameString;
+ }
+
+ if(isset($birthdateString) && $birthdateString != '')
+ {
+ $where.=" AND p.gebdatum=?";
+ $parametersArray[] = $birthdateString;
+ }
+
+ if(isset($filterUnruly))
+ {
+ $where.=" AND p.unruly=?";
+ $parametersArray[] = $filterUnruly;
+ }
+
+ $result = $this->_ci->PersonModel->checkUnrulyWhere($where, $parametersArray);
+
+ if (isSuccess($result))
+ $this->terminateWithSuccess($result);
+ else
+ $this->terminateWithError('Error when searching for person');
+
+
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php
new file mode 100644
index 000000000..636c8e3f3
--- /dev/null
+++ b/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php
@@ -0,0 +1,65 @@
+ array(
+ 'lehre/lehrveranstaltung:rw'
+ )
+ ));
+
+ // Load model LehrveranstaltungModel
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+ }
+
+ /**
+ * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes of given Berechtigung,
+ * that are assigned to a template. This data structure can be used for nested tabulators' data tree.
+ *
+ * @param null|string $studiensemester_kurzbz
+ * @param null|string $berechtigung
+ * @return array|stdClass|null
+ */
+ public function getTemplateLvTree()
+ {
+ $studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+ $berechtigung = $this->input->get('berechtigung');
+
+ if ($berechtigung)
+ {
+ $oe_permissions = $this->permissionlib->getOE_isEntitledFor($berechtigung);
+ if(!$oe_permissions) $oe_permissions = [];
+
+ $result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz, $oe_permissions);
+ }
+ else
+ {
+ $result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz);
+ }
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: []));
+ }
+}
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 2cf1f2519..e67f953d6 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -9,6 +9,14 @@ class NotizPerson extends Notiz_Controller
public function __construct()
{
parent::__construct([
+ 'getUid' => ['admin:r', 'assistenz:r'],
+ 'getNotizen' => ['admin:r', 'assistenz:r'],
+ 'loadNotiz' => ['admin:r', 'assistenz:r'],
+ 'addNewNotiz' => ['admin:rw', 'assistenz:rw'],
+ 'updateNotiz' => ['admin:rw', 'assistenz:rw'],
+ 'deleteNotiz' => ['admin:rw', 'assistenz:rw'],
+ 'loadDokumente' => ['admin:r', 'assistenz:r'],
+ 'getMitarbeiter' => ['admin:r', 'assistenz:r'],
'isBerechtigt' => ['admin:r', 'assistenz:r'],
]);
}
@@ -17,17 +25,26 @@ class NotizPerson extends Notiz_Controller
{
if($typeId != "person_id")
{
- return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
}
//TODO define permission
- if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+ if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
{
- $result = $this->p->t('lehre','error_keineSchreibrechte');
-
+ $result = $this->p->t('lehre', 'error_keineSchreibrechte');
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
return $this->outputJsonSuccess(true);
}
-}
\ No newline at end of file
+
+ public function loadDokumente()
+ {
+ $notiz_id = $this->input->post('notiz_id');
+
+ // TODO(chris): make CI variant of endpoint
+ $this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
+
+ return parent::loadDokumente();
+ }
+}
diff --git a/application/controllers/api/frontend/v1/organisation/StudiengangEP.php b/application/controllers/api/frontend/v1/organisation/StudiengangEP.php
new file mode 100644
index 000000000..463243f57
--- /dev/null
+++ b/application/controllers/api/frontend/v1/organisation/StudiengangEP.php
@@ -0,0 +1,57 @@
+ self::PERM_LOGGED
+ )
+ );
+ // Load model StudiengangModel
+ $this->load->model('organisation/studiengang_model', 'StudiengangModel');
+ }
+
+ /**
+ * @return void
+ */
+ public function getStudiengangByKz()
+ {
+ $studiengang_kz = intval($this->input->get('studiengang_kz'));
+
+ $this->StudiengangModel->addSelect('studiengang_kz, kurzbz, kurzbzlang, '
+ . 'typ, bezeichnung, english, aktiv, orgform_kurzbz, sprache, '
+ . 'oe_kurzbz');
+ $result = $this->StudiengangModel->load($studiengang_kz);
+
+ if (isError($result))
+ {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $stg = null;
+ if(hasData($result))
+ {
+ $stg = (getData($result))[0];
+ }
+ $this->terminateWithSuccess($stg);
+ }
+}
diff --git a/application/controllers/api/frontend/v1/organisation/Studienjahr.php b/application/controllers/api/frontend/v1/organisation/Studienjahr.php
new file mode 100644
index 000000000..cdbb524c7
--- /dev/null
+++ b/application/controllers/api/frontend/v1/organisation/Studienjahr.php
@@ -0,0 +1,80 @@
+ self::PERM_LOGGED,
+ 'getNext' => self::PERM_LOGGED
+ )
+ );
+ // Load model StudiensemesterModel
+ $this->load->model('organisation/studienjahr_model', 'StudienjahrModel');
+ }
+
+ /**
+ * Get all Studienjahre.
+ *
+ * @param null|string $order Sorting order for the Studienjahr, 'asc' or 'desc'. Defaults to 'asc'.
+ * @param null|string $start Starting Studienjahre with given studienjahr_kurzbz
+ */
+ public function getAll()
+ {
+ $order = $this->input->get('order');
+ $start = $this->input->get('studienjahr_kurzbz');
+
+ if (strcasecmp($order, 'DESC') == 0) {
+ $this->StudienjahrModel->addOrder('studienjahr_kurzbz', 'DESC');
+ } else {
+ $this->StudienjahrModel->addOrder('studienjahr_kurzbz', 'ASC');
+ }
+
+ if ($start) {
+ $result = $this->StudienjahrModel->loadWhere([
+ 'studienjahr_kurzbz >= ' => $start
+ ]);
+ } else {
+ $result = $this->StudienjahrModel->load();
+ }
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: []));
+ }
+
+ public function getNext()
+ {
+ $this->StudienjahrModel->addJoin('public.tbl_studiensemester', 'studienjahr_kurzbz');
+ $this->StudienjahrModel->addOrder('start');
+ $this->StudienjahrModel->addLimit(1);
+
+ $result = $this->StudienjahrModel->loadWhere(['start >' => 'NOW()']);
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess(current(getData($result)));
+ }
+}
diff --git a/application/controllers/api/frontend/v1/organisation/Studiensemester.php b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
new file mode 100644
index 000000000..bb56ea71a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
@@ -0,0 +1,155 @@
+ self::PERM_LOGGED,
+ 'getAktNext' => self::PERM_LOGGED,
+ 'getStudienjahrByStudiensemester' => self::PERM_LOGGED
+ )
+ );
+ // Load model StudiensemesterModel
+ $this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+ }
+
+ /**
+ * Get all Studiensemester.
+ *
+ * @param null|string $order Sorting order for the Studiensemester, 'asc' or 'desc'. Defaults to 'asc'.
+ * @param null|string $start Start date of the displayed Studiensemester in the format 'YYYY-MM-DD'.
+ * If provided, only Studiensemester starting from this date onwards will be returned.
+ * eg. '2020-09-01' will start with WS2020.
+ */
+ public function getAll()
+ {
+ $order = $this->input->get('order');
+ $start = $this->input->get('start');
+
+ if (strcasecmp($order, 'DESC') == 0)
+ {
+ $this->StudiensemesterModel->addOrder('ende', 'DESC');
+ }
+ else
+ {
+ $this->StudiensemesterModel->addOrder('ende', 'ASC');
+ }
+
+ if ($start)
+ {
+ $result = $this->StudiensemesterModel->loadWhere([
+ 'start >= ' => $start
+ ]);
+ }
+ else
+ {
+ $result = $this->StudiensemesterModel->load();
+ }
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: []));
+ }
+
+ /**
+ * @return void
+ */
+ public function getAktNext()
+ {
+ $semester = $this->input->get('semester');
+
+ $result = null;
+
+ if (!is_numeric($semester))
+ {
+ $result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
+ }
+
+ if (!hasData($result))
+ {
+ $this->StudiensemesterModel->addOrder('ende');
+ $this->StudiensemesterModel->addLimit(1);
+
+ $whereArray = array('ende >=' => 'NOW()');
+
+ if (is_numeric($semester))
+ {
+ if ($semester % 2 == 0)
+ {
+ $ss = 'SS';
+ }
+ else
+ {
+ $ss = 'WS';
+ }
+
+ $whereArray['SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) ='] = $ss;
+ }
+
+ $result = $this->StudiensemesterModel->loadWhere($whereArray);
+ }
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: ''));
+ }
+
+ /**
+ * Get Studienjahr by Studiensemester.
+ * input param semester: studiensemester_kurzbz
+ */
+ public function getStudienjahrByStudiensemester()
+ {
+ $semester = $this->input->get('semester');
+
+ $studienjahrObj = null;
+
+ if (!is_numeric($semester))
+ {
+ $this->StudiensemesterModel->addSelect('studienjahr_kurzbz');
+ $result = $this->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz =' => $semester));
+ }
+
+ if (hasData($result))
+ {
+ $studienjahr = getData($result)[0]->studienjahr_kurzbz;
+ $startstudienjahr = substr($studienjahr, 0, 4);
+ $endstudienjahr = substr($studienjahr, 0, 2) . substr($studienjahr, -2);
+
+ $studienjahrObj = new StdClass();
+
+ $studienjahrObj->studienjahr_kurzbz = $studienjahr;
+ $studienjahrObj->startstudienjahr = $startstudienjahr;
+ $studienjahrObj->endstudienjahr= $endstudienjahr;
+ }
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+ }
+
+ $this->terminateWithSuccess((getData(success($studienjahrObj))));
+ }
+}
diff --git a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
index 875b6484c..aada1f436 100644
--- a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
@@ -184,4 +184,4 @@ class Abmeldung extends FHCAPI_Controller
$this->terminateWithSuccess($data);
}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/studstatus/Leitung.php b/application/controllers/api/frontend/v1/studstatus/Leitung.php
index 2699a3dbb..87099ad74 100644
--- a/application/controllers/api/frontend/v1/studstatus/Leitung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Leitung.php
@@ -53,7 +53,8 @@ class Leitung extends FHCAPI_Controller
// Load language phrases
$this->loadPhrases([
- 'studierendenantrag'
+ 'studierendenantrag',
+ 'lehre'
]);
}
diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
new file mode 100644
index 000000000..daaf043b5
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -0,0 +1,420 @@
+ ['admin:r', 'assistenz:r'],
+ 'loadAbschlusspruefung' => ['admin:r', 'assistenz:r'],
+ 'insertAbschlusspruefung' => ['admin:rw', 'assistenz:rw'],
+ 'updateAbschlusspruefung' => ['admin:rw', 'assistenz:rw'],
+ 'deleteAbschlusspruefung' => ['admin:rw', 'assistenz:rw'],
+ 'getTypenAbschlusspruefung' => ['admin:rw', 'assistenz:rw'],
+ 'getNoten' => ['admin:rw', 'assistenz:rw'],
+ 'getTypenAntritte' => ['admin:rw', 'assistenz:rw'],
+ 'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
+ 'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
+ 'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+ 'getPruefer' => ['admin:rw', 'assistenz:rw'],
+ 'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
+ 'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
+ ]);
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ $this->load->library('form_validation');
+
+ // Load language phrases
+ $this->loadPhrases([
+ 'ui',
+ 'person',
+ 'abschlusspruefung'
+ ]);
+
+ // Load models
+ $this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel');
+ }
+
+ public function getAbschlusspruefung($student_uid)
+ {
+ $result = $this->AbschlusspruefungModel->getAbschlusspruefungForPrestudent($student_uid);
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+
+ $this->terminateWithSuccess((getData($result) ?: []));
+ }
+
+ public function loadAbschlusspruefung()
+ {
+ $abschlusspruefung_id = $this->input->post('id');
+
+ $this->AbschlusspruefungModel->addSelect('lehre.tbl_abschlusspruefung.*');
+ $this->AbschlusspruefungModel->addSelect("
+ CASE
+ WHEN pruefer1 IS NOT NULL
+ THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
+ ELSE NULL
+ END AS p1
+ ");
+ $this->AbschlusspruefungModel->addSelect("
+ CASE
+ WHEN pruefer2 IS NOT NULL
+ THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
+ ELSE NULL
+ END AS p2
+ ");
+ $this->AbschlusspruefungModel->addSelect("
+ CASE
+ WHEN pruefer3 IS NOT NULL
+ THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
+ ELSE NULL
+ END AS p3
+ ");
+ $this->AbschlusspruefungModel->addSelect("
+ CASE
+ WHEN vorsitz IS NOT NULL
+ THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
+ ELSE NULL
+ END AS pv
+ ");
+ $this->AbschlusspruefungModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = lehre.tbl_abschlusspruefung.vorsitz)', 'LEFT');
+ $this->AbschlusspruefungModel->addJoin('public.tbl_person pv', 'ON (pv.person_id = ben.person_id)', 'LEFT');
+ $this->AbschlusspruefungModel->addJoin('public.tbl_person p1', 'ON (p1.person_id = lehre.tbl_abschlusspruefung.pruefer1)', 'LEFT');
+ $this->AbschlusspruefungModel->addJoin('public.tbl_person p2', 'ON (p2.person_id = lehre.tbl_abschlusspruefung.pruefer2)', 'LEFT');
+ $this->AbschlusspruefungModel->addJoin('public.tbl_person p3', 'ON (p3.person_id = lehre.tbl_abschlusspruefung.pruefer3)', 'LEFT');
+ $result = $this->AbschlusspruefungModel->loadWhere(
+ array('abschlusspruefung_id' => $abschlusspruefung_id)
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(current($data));
+ }
+
+ public function getTypenAbschlusspruefung()
+ {
+ $this->load->model('education/Pruefungstyp_model', 'PruefungstypModel');
+
+ $result = $this->PruefungstypModel->loadWhere(
+ array('abschluss' => true)
+ );
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getTypenAntritte()
+ {
+ $this->load->model('education/Pruefungsantritt_model', 'PruefungsantrittModel');
+
+ $result = $this->PruefungsantrittModel->load();
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getBeurteilungen()
+ {
+ $this->load->model('education/Abschlussbeurteilung_model', 'AbschlussbeurteilungModel');
+
+ $result = $this->AbschlussbeurteilungModel->load();
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getAkadGrade()
+ {
+ $studiengang_kz= $this->input->post('studiengang_kz');
+
+
+ $this->load->model('education/Akadgrad_model', 'AkadgradModel');
+
+ $result = $this->AkadgradModel->loadWhere(
+ array('studiengang_kz' => $studiengang_kz)
+ );
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getTypStudiengang()
+ {
+ $studiengang_kz= $this->input->post('studiengang_kz');
+
+/* if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
+ 'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }*/
+
+
+ $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+ $result = $this->StudiengangModel->loadWhere(
+ array('studiengang_kz' => $studiengang_kz)
+ );
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $typStudiengang = current($data)->typ;
+
+ $this->terminateWithSuccess($typStudiengang);
+ }
+
+ public function getMitarbeiter($searchString)
+ {
+ $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+ $result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
+
+ if (isError($result)) {
+ $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+ $this->terminateWithSuccess($result ?: []);
+ }
+
+ public function getPruefer($searchString)
+ {
+ $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+ $result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
+
+ if (isError($result)) {
+ $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+
+ $this->terminateWithSuccess($result ?: []);
+ }
+
+ public function getNoten()
+ {
+ $this->load->model('education/Note_model', 'NoteModel');
+
+ $this->NoteModel->addOrder('note', 'ASC');
+ $result = $this->NoteModel->load();
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ return $this->terminateWithSuccess(getData($result) ?: []);
+ }
+
+ public function insertAbschlusspruefung()
+ {
+ $this->load->library('form_validation');
+
+ $student_uid = $this->input->post('uid');
+
+ if(!$student_uid)
+ {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+ }
+
+ $formData = $this->input->post('formData');
+
+ $_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
+ $_POST['akadgrad_id']= $formData['akadgrad_id'];
+ $_POST['vorsitz'] = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] : $formData['vorsitz'];
+ $_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+ $_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+ $_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+ $_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
+ $_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
+ $_POST['datum']= $formData['datum'];
+ $_POST['sponsion']= $formData['sponsion'];
+ $_POST['anmerkung'] = $formData['anmerkung'];
+ $_POST['protokoll']= $formData['protokoll'];
+ $_POST['note'] = $formData['note'];
+
+ $this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+ ]);
+
+ $this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad'])
+ ]);
+
+ $this->form_validation->set_rules('datum', 'Datum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum'])
+ ]);
+
+ $this->form_validation->set_rules('sponsion', 'Sponsion', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Sponsion'])
+ ]);
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $result = $this->AbschlusspruefungModel->insert([
+ 'student_uid' => $student_uid,
+ 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+ 'akadgrad_id' => $this->input->post('akadgrad_id'),
+ 'vorsitz' => $this->input->post('vorsitz'),
+ 'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
+ 'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
+ 'datum' => $this->input->post('datum'), //TODO(Manu) check if minute format like FAS
+ 'sponsion' => $this->input->post('sponsion'),
+ 'pruefer1' => $this->input->post('pruefer1'),
+ 'pruefer2' => $this->input->post('pruefer2'),
+ 'pruefer3' => $this->input->post('pruefer3'),
+ 'protokoll' => $this->input->post('protokoll'),
+ 'note' => $this->input->post('note'),
+ 'anmerkung' => $this->input->post('anmerkung'),
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID()
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function updateAbschlusspruefung()
+ {
+ $this->load->library('form_validation');
+
+ $abschlusspruefung_id = $this->input->post('id');
+
+ if(!$abschlusspruefung_id)
+ {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Abschlussprüfung ID']), self::ERROR_TYPE_GENERAL);
+ }
+
+ $formData = $this->input->post('formData');
+ $_POST['student_uid'] = $formData['student_uid'];
+ $_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
+ $_POST['akadgrad_id']= $formData['akadgrad_id'];
+ $_POST['vorsitz'] = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] : $formData['vorsitz'];
+ $_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+ $_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+ $_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+ $_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
+ $_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
+ $_POST['datum']= $formData['datum'];
+ $_POST['sponsion']= $formData['sponsion'];
+ $_POST['anmerkung'] = $formData['anmerkung'];
+ $_POST['protokoll']= $formData['protokoll'];
+ $_POST['note'] = $formData['note'];
+
+ $this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+ ]);
+
+ $this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad'])
+ ]);
+
+ $this->form_validation->set_rules('datum', 'Datum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum'])
+ ]);
+
+ $this->form_validation->set_rules('sponsion', 'Sponsion', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Sponsion'])
+ ]);
+
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $result = $this->AbschlusspruefungModel->update(
+ [
+ 'abschlusspruefung_id' => $abschlusspruefung_id
+ ],
+ [
+ 'student_uid' => $this->input->post('student_uid'),
+ 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+ 'akadgrad_id' => $this->input->post('akadgrad_id'),
+ 'vorsitz' => $this->input->post('vorsitz'),
+ 'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
+ 'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
+ 'datum' => $this->input->post('datum'),
+ 'sponsion' => $this->input->post('sponsion'),
+ 'pruefer1' => $this->input->post('pruefer1'),
+ 'pruefer2' => $this->input->post('pruefer2'),
+ 'pruefer3' => $this->input->post('pruefer3'),
+ 'protokoll' => $this->input->post('protokoll'),
+ 'note' => $this->input->post('note'),
+ 'anmerkung' => $this->input->post('anmerkung'),
+ 'insertamum' => date('c'),
+ 'insertvon' => getAuthUID()
+ ]
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function deleteAbschlusspruefung()
+ {
+ $abschlusspruefung_id = $this->input->post('id');
+
+ $result = $this->AbschlusspruefungModel->delete(
+ array('abschlusspruefung_id' => $abschlusspruefung_id)
+ );
+
+ if (isError($result))
+ {
+ return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+ if (!hasData($result))
+ {
+ $this->outputJson($result);
+ }
+ return $this->terminateWithSuccess(current(getData($result)) ? : null);
+ }
+
+ public function checkForExistingExams()
+ {
+ $warning = false;
+ $output = [];
+
+ $student_uids = $this->input->post('uids');
+
+ if (empty($student_uids)) {
+ throw new InvalidArgumentException("Keine UID(s) übergeben.");
+ }
+
+ if( !is_array($student_uids) )
+ {
+ $student_uids = array($student_uids);
+ }
+
+ foreach ($student_uids as $uid)
+ {
+ $result = $this->AbschlusspruefungModel->loadWhere(
+ array('student_uid' => $uid)
+ );
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ if (!hasData($result))
+ {
+ $warning = true;
+ $output[] = $uid;
+ }
+ }
+ if($warning)
+ {
+ $uids = is_array($output) ? implode(", ", $output) : $output;
+ return $this->terminateWithError($this->p->t('abschlusspruefung', 'error_studentOhneFinalExam', ['id'=> $uids]), self::ERROR_TYPE_GENERAL);
+ }
+ $this->terminateWithSuccess('step3');
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Address.php b/application/controllers/api/frontend/v1/stv/Address.php
index 7685fcd04..324e306f3 100644
--- a/application/controllers/api/frontend/v1/stv/Address.php
+++ b/application/controllers/api/frontend/v1/stv/Address.php
@@ -45,7 +45,7 @@ class Address extends FHCAPI_Controller
$this->terminateWithSuccess($data);
}
- public function getPlaces($plz)
+ public function getPlaces($plz = null)
{
$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
@@ -53,7 +53,7 @@ class Address extends FHCAPI_Controller
$this->form_validation->set_data(['address.plz' => $plz]);
- $this->form_validation->set_rules('address.plz', 'PLZ', 'numeric|less_than[10000]');
+ $this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric|less_than[10000]');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
deleted file mode 100644
index cb6c4a3aa..000000000
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ /dev/null
@@ -1,324 +0,0 @@
- ['admin:r', 'assistenz:r'],
- 'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
- 'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
- 'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
- 'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
- 'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
- 'loadInventarliste' => ['admin:r', 'assistenz:r']
- ]);
-
- //Load Models
- $this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
- $this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-
- // Load Libraries
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
- $this->load->library('form_validation');
-
- // Load language phrases
- $this->loadPhrases([
- 'ui'
- ]);
- }
-
- public function getAllBetriebsmittel($uid, $person_id)
- {
- //uid
- //$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid');
-
- //person_id
- $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person');
-
- if (isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- $this->terminateWithSuccess((getData($result) ?: []));
- }
-
- public function addNewBetriebsmittel()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
- 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
- ]);
-
- $this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
- ]);
-
- $this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
- ]);
-
-
- if ($this->form_validation->run() == false)
- {
- $this->terminateWithValidationErrors($this->form_validation->error_array());
- }
-
- $uid_user = getAuthUID();
- $betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
- $nummer = $this->input->post('nummer');
- $nummer2 = $this->input->post('nummer2');
- $inventarData = $this->input->post('inventarData');
- $beschreibung = $this->input->post('beschreibung');
- $kaution = $this->input->post('kaution');
- $anmerkung = $this->input->post('anmerkung');
- $ausgegebenam = $this->input->post('ausgegebenam');
- $retouram = $this->input->post('retouram');
- $person_id = $this->input->post('person_id');
- $uid = $this->input->post('uid');
-
- if($inventarData)
- {
- $betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
- $betriebsmittel_id = $inventarData['betriebsmittel_id'];
- }
-
- if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
- {
- return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
- }
-
- if($retouram && $retouram < $ausgegebenam)
- {
- return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
- }
-
- if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
- {
- return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
- }
-
-
- // Start DB transaction
- $this->db->trans_begin();
-
- $betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
-
- if(!$inventarData)
- {
- $result = $this->BetriebsmittelModel->insert(
- [
- 'betriebsmitteltyp' => $betriebsmitteltyp,
- 'nummer' => $nummer,
- 'nummer2' => $nummer2,
- 'beschreibung' => $beschreibung,
- 'anmerkung' => $anmerkung,
- 'insertvon' => $uid_user,
- 'insertamum' => date('c')
- ]
- );
- if($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- $betriebsmittel_id = $result->retval;
- }
-
- $result = $this->BetriebsmittelpersonModel->insert(
- [
- 'betriebsmittel_id' => $betriebsmittel_id,
- 'person_id' => $person_id,
- 'kaution' => $kaution,
- 'anmerkung' => $anmerkung,
- 'ausgegebenam' => $ausgegebenam,
- 'retouram ' => $retouram,
- 'insertvon' => $uid_user,
- 'insertamum' => date('c'),
- 'uid' => $uid
- ]
- );
-
- if($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- $this->db->trans_commit();
- return $this->terminateWithSuccess(true);
- }
-
- public function updateBetriebsmittel()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $uid_user = getAuthUID();
-
- $betriebsmittel_id = $this->input->post('betriebsmittel_id');
- $betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
- $betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
- $nummer = $this->input->post('nummer');
- $nummer2 = $this->input->post('nummer2');
- $beschreibung = $this->input->post('beschreibung');
- $kaution = $this->input->post('kaution');
- $anmerkung = $this->input->post('anmerkung');
- $ausgegebenam = $this->input->post('ausgegebenam');
- $retouram = $this->input->post('retouram');
- $person_id = $this->input->post('person_id');
- $uid = $this->input->post('uid');
-
- $this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
- 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
- ]);
-
- $this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
- ]);
-
- $this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
- ]);
-
-
- if ($this->form_validation->run() == false)
- {
- $this->terminateWithValidationErrors($this->form_validation->error_array());
- }
-
- if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
- {
- return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
- }
-
- if($retouram && $retouram < $ausgegebenam)
- {
- return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
- }
-
-
- // Start DB transaction
- $this->db->trans_begin();
-
- $result = $this->BetriebsmittelpersonModel->update(
- [
- 'betriebsmittelperson_id' => $betriebsmittelperson_id,
-
- ],
- [
- 'person_id' => $person_id,
- 'uid' => $uid,
- 'kaution' => $kaution,
- 'anmerkung' => $anmerkung,
- 'ausgegebenam' => $ausgegebenam,
- 'retouram ' => $retouram,
- 'updatevon' => $uid_user,
- 'updateamum' => date('c')
- ]
- );
-
- if($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- $result = $this->BetriebsmittelModel->update(
- [
- 'betriebsmittel_id' => $betriebsmittel_id
- ],
- [
- 'betriebsmitteltyp' => $betriebsmitteltyp,
- 'nummer' => $nummer,
- 'nummer2' => $nummer2,
- 'beschreibung' => $beschreibung,
- 'anmerkung' => $anmerkung,
- 'updatevon' => $uid_user,
- 'updateamum' => date('c')
- ]
- );
- if($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- $this->db->trans_commit();
- return $this->terminateWithSuccess(true);
- }
-
- public function loadBetriebsmittel()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
- $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
-
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- if (!hasData($result))
- {
- $this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
- }
-
- $this->terminateWithSuccess(current(getData($result)));
- }
-
- public function deleteBetriebsmittel()
- {
-
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
- $result = $this->BetriebsmittelpersonModel->delete(
- array('betriebsmittelperson_id' => $betriebsmittelperson_id,
- )
- );
-
- if (isError($result))
- {
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if (!hasData($result))
- {
- return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(current(getData($result)));
- }
-
- public function getTypenBetriebsmittel()
- {
- $this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
-
- $this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
- $result = $this->BetriebsmitteltypModel->load(); // load All
-
- if (isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess(getData($result) ?: []);
- }
-
- public function loadInventarliste($searchString)
- {
- $result = $this->BetriebsmittelModel->loadInventarliste($searchString);
- if (isError($result)) {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- $this->terminateWithSuccess($result ?: []);
- }
-}
-
-
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d97c1a86b..42de1b02f 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -33,8 +33,8 @@ class Config extends FHCAPI_Controller
{
// TODO(chris): permissions
parent::__construct([
- 'student' => self::PERM_LOGGED,
- 'students' => self::PERM_LOGGED
+ 'student' => ['admin:r', 'assistenz:r'],
+ 'students' => ['admin:r', 'assistenz:r']
]);
@@ -44,16 +44,23 @@ class Config extends FHCAPI_Controller
'person',
'lehre',
'stv',
- 'konto'
+ 'konto',
+ 'abschlusspruefung'
]);
+
+ // Load Config
+ $this->load->config('stv');
}
public function student()
{
$result = [];
+ $config = $this->config->item('tabs');
+
$result['details'] = [
'title' => $this->p->t('stv', 'tab_details'),
- 'component' => './Stv/Studentenverwaltung/Details/Details.js'
+ 'component' => './Stv/Studentenverwaltung/Details/Details.js',
+ 'config' => $config['details']
];
$result['notes'] = [
'title' => $this->p->t('stv', 'tab_notes'),
@@ -61,13 +68,18 @@ class Config extends FHCAPI_Controller
];
$result['contact'] = [
'title' => $this->p->t('stv', 'tab_contact'),
- 'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
+ 'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
+ 'config' => [
+ 'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
+ || $this->permissionlib->isBerechtigt('student/bankdaten')
+ ]
];
$result['prestudent'] = [
'title' => $this->p->t('stv', 'tab_prestudent'),
- 'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
+ 'component' => './Stv/Studentenverwaltung/Details/Prestudent.js',
+ 'config' => $config['prestudent']
];
- $result['multistatus'] = [
+ $result['status'] = [
'title' => 'Status',
'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
];
@@ -89,7 +101,31 @@ class Config extends FHCAPI_Controller
];
$result['grades'] = [
'title' => $this->p->t('stv', 'tab_grades'),
- 'component' => './Stv/Studentenverwaltung/Details/Noten.js'
+ 'component' => './Stv/Studentenverwaltung/Details/Noten.js',
+ 'showOnlyWithUid' => true,
+ 'config' => [
+ 'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
+ 'edit' => 'both', // Possible values: both|header|inline
+ 'delete' => 'both', // Possible values: both|header|inline
+ 'documents' => 'both', // Possible values: both|header|inline
+ 'documentslist' => $this->gradesDocumentsList()
+ ]
+ ];
+
+ $result['exam'] = [
+ 'title' => $this->p->t('stv', 'tab_exam'),
+ 'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
+ ];
+
+ $result['finalexam'] = [
+ 'title' => $this->p->t('stv', 'tab_finalexam'),
+ 'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+ 'config' => $config['finalexam']
+ ];
+
+ $result['mobility'] = [
+ 'title' => $this->p->t('stv', 'tab_mobility'),
+ 'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
];
Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -102,6 +138,7 @@ class Config extends FHCAPI_Controller
public function students()
{
$result = [];
+ $config = $this->config->item('tabs');
$result['banking'] = [
'title' => $this->p->t('stv', 'tab_banking'),
'component' => './Stv/Studentenverwaltung/Details/Konto.js',
@@ -114,7 +151,7 @@ class Config extends FHCAPI_Controller
'additionalCols' => []
]
];
- $result['multistatus'] = [
+ $result['status'] = [
'title' => 'Status',
'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
'config' => [
@@ -125,6 +162,11 @@ class Config extends FHCAPI_Controller
'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
]
];
+ $result['finalexam'] = [
+ 'title' => $this->p->t('stv', 'tab_finalexam'),
+ 'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+ 'config' => $config['finalexam']
+ ];
Events::trigger('stv_conf_students', function & () use (&$result) {
return $result;
@@ -224,4 +266,186 @@ class Config extends FHCAPI_Controller
]
] + $this->kontoColumns();
}
+
+ /**
+ * Helper function to generate the default documentslist config for the
+ * grades tab.
+ *
+ * The resulting array consists of elements which are associative arrays
+ * that can have the following entries:
+ * title (required) on the first level this can be HTML code.
+ * permissioncheck (optional) an URL to an FHCAPI endpoint which returns
+ * true or false.
+ * link (optional) an URL that will be called if "action" and
+ * "children" are not defined.
+ * action (optional) an associative array that describes an
+ * POST action that will be called if "children" is
+ * not defined.
+ * It can have the following entries:
+ * - url (required) an URL to an FHCAPI endpoint.
+ * - post (optional) an associative array with the POST data to
+ * be sent.
+ * - response (optional) a string that will be displayed on success.
+ * children (optional) an array of child elements
+ *
+ * All strings that start with { and end with } in the URLs and the
+ * actions post parameter will be replaced with the corresponding
+ * attribute of the current dataset (e.G: {uid} will be replaced with the
+ * uid of the current dataset)
+ *
+ * @return array
+ */
+ protected function gradesDocumentsList()
+ {
+ $permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
+
+ $title_ger = $this->p->t("global", "deutsch");
+ $title_eng = $this->p->t("global", "englisch");
+ $title_ff = $this->p->t("stv", "document_certificate");
+ $title_lv = $this->p->t("stv", "document_coursecertificate");
+
+ $link_ff = "documents/export/" .
+ "zertifikat.rdf.php/" .
+ "Zertifikat" .
+ "?stg_kz={studiengang_kz_lv}" .
+ "&uid={uid}" .
+ "&ss={studiensemester_kurzbz}" .
+ "&lvid={lehrveranstaltung_id}";
+ $link_lv_ger = "documents/export/" .
+ "lehrveranstaltungszeugnis.rdf.php/" .
+ "LVZeugnis" .
+ "?stg_kz={studiengang_kz}" .
+ "&uid={uid}" .
+ "&ss={studiensemester_kurzbz}" .
+ "&lvid={lehrveranstaltung_id}";
+ $link_lv_eng = "documents/export/" .
+ "lehrveranstaltungszeugnis.rdf.php/" .
+ "LVZeugnisEng" .
+ "?stg_kz={studiengang_kz}" .
+ "&uid={uid}" .
+ "&ss={studiensemester_kurzbz}" .
+ "&lvid={lehrveranstaltung_id}";
+
+ $archive_url = "api/frontend/v1/documents/archiveSigned";
+ $archive_response = $this->p->t("stv", "document_signed_and_archived");
+ $archive_post_ff = [
+ "xml" => "zertifikat.rdf.php",
+ "xsl" => "Zertifikat",
+ "stg_kz" => "{studiengang_kz_lv}",
+ "uid" => "{uid}",
+ "ss" => "{studiensemester_kurzbz}",
+ "lvid" => "{lehrveranstaltung_id}"
+ ];
+ $archive_post_lv_ger = [
+ "xml" => "lehrveranstaltungszeugnis.rdf.php",
+ "xsl" => "LVZeugnis",
+ "stg_kz" => "{studiengang_kz}",
+ "uid" => "{uid}",
+ "ss" => "{studiensemester_kurzbz}",
+ "lvid" => "{lehrveranstaltung_id}"
+ ];
+ $archive_post_lv_eng = [
+ "xml" => "lehrveranstaltungszeugnis.rdf.php",
+ "xsl" => "LVZeugnisEng",
+ "stg_kz" => "{studiengang_kz}",
+ "uid" => "{uid}",
+ "ss" => "{studiensemester_kurzbz}",
+ "lvid" => "{lehrveranstaltung_id}"
+ ];
+
+ $list = [
+ [
+ 'title' => '',
+ 'children' => [
+ [
+ 'title' => $title_ff,
+ 'link' => site_url($link_ff)
+ ],
+ [
+ 'title' => $title_lv,
+ 'children' => [
+ [
+ 'title' => $title_ger,
+ 'link' => site_url($link_lv_ger),
+ 'children' => [
+ [
+ 'title' => 'PDF',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_ger)
+ ],
+ [
+ 'title' => 'DOC',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_ger . "&output=doc")
+ ],
+ [
+ 'title' => 'ODT',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_ger . "&output=odt")
+ ]
+ ]
+ ],
+ [
+ 'title' => $title_eng,
+ 'link' => site_url($link_lv_eng),
+ 'children' => [
+ [
+ 'title' => 'PDF',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_eng)
+ ],
+ [
+ 'title' => 'DOC',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_eng . "&output=doc")
+ ],
+ [
+ 'title' => 'ODT',
+ 'permissioncheck' => $permissioncheck,
+ 'link' => site_url($link_lv_eng . "&output=odt")
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ],
+ [
+ 'title' => '',
+ 'children' => [
+ [
+ 'title' => $title_ff,
+ 'action' => [
+ 'url' => site_url($archive_url),
+ 'post' => $archive_post_ff,
+ 'response' => $archive_response
+ ]
+ ],
+ [
+ 'title' => $title_lv,
+ 'children' => [
+ [
+ 'title' => $title_ger,
+ 'action' => [
+ 'url' => site_url($archive_url),
+ 'post' => $archive_post_lv_ger,
+ 'response' => $archive_response
+ ]
+ ],
+ [
+ 'title' => $title_eng,
+ 'action' => [
+ 'url' => site_url($archive_url),
+ 'post' => $archive_post_lv_eng,
+ 'response' => $archive_response
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+
+ return $list;
+ }
}
diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
new file mode 100644
index 000000000..b8fe6f3d7
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -0,0 +1,71 @@
+.
+ */
+
+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
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Favorites extends FHCAPI_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'index' => self::PERM_LOGGED,
+ 'set' => self::PERM_LOGGED
+ ]);
+
+ // Load models
+ $this->load->model('system/Variable_model', 'VariableModel');
+
+ // TODO(chris): variable table might be to small to store favorites!
+ }
+
+ public function index()
+ {
+ $result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if (!$data)
+ $this->terminateWithSuccess(null);
+ else
+ $this->terminateWithSuccess($data['stv_favorites'] ?? null);
+ }
+
+ public function set()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $favorites = $this->input->post('favorites');
+
+ $result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
+
+ $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(true);
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Grades.php b/application/controllers/api/frontend/v1/stv/Grades.php
new file mode 100644
index 000000000..61d797495
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Grades.php
@@ -0,0 +1,685 @@
+.
+ */
+
+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 grades
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Grades extends FHCAPI_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'list' => 'student/noten:r',
+ 'getCertificate' => 'student/noten:r',
+ 'getTeacherProposal' => 'student/noten:r',
+ 'getRepeaterGrades' => 'student/noten:r',
+ 'updateCertificate' => ['admin:w', 'assistenz:w'],
+ 'deleteCertificate' => ['admin:w', 'assistenz:w'],
+ 'copyTeacherProposalToCertificate' => 'student/noten:w',
+ 'copyRepeaterGradeToCertificate' => 'student/noten:w',
+ 'getGradeFromPoints' => 'student/noten:r'
+ ]);
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+ // Load Phrases
+ $this->loadPhrases([
+ 'stv',
+ 'person',
+ 'lehre'
+ ]);
+ }
+
+ /**
+ * List all possible grades
+ * (Entries in lehre.tbl_note)
+ *
+ * @return void
+ */
+ public function list()
+ {
+ $this->load->model('codex/Note_model', 'NoteModel');
+
+ $this->NoteModel->addOrder('note');
+
+ $result = $this->NoteModel->load();
+
+ $grades = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($grades);
+ }
+
+ /**
+ * List grades for the certificate of a prestudent.
+ * (Entries in lehre.tbl_zeugnisnote)
+ *
+ * @param string $prestudent_id
+ * @param string|null $all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+ *
+ * @return void
+ */
+ public function getCertificate($prestudent_id, $all = null)
+ {
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ $student = $this->getDataOrTerminateWithError($result);
+ if (!$student)
+ $this->terminateWithSuccess([]);
+
+
+ $student_uid = current($student)->student_uid;
+
+ $studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+
+
+ $result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
+
+ $grades = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($grades);
+ }
+
+ /**
+ * List grades of a prestudent that teachers gave.
+ * (Entries in campus.tbl_lvgesamtnote)
+ *
+ * @param string $prestudent_id
+ * @param string|null $all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+ *
+ * @return void
+ */
+ public function getTeacherProposal($prestudent_id, $all = null)
+ {
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+
+ $result = $this->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ $student = $this->getDataOrTerminateWithError($result);
+ if (!$student)
+ $this->terminateWithSuccess([]);
+
+
+ $student_uid = current($student)->student_uid;
+
+ $studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+
+
+ $result = $this->LvgesamtnoteModel->getLvGesamtNoten(null, $student_uid, $studiensemester_kurzbz);
+
+ $grades = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($grades);
+ }
+
+ /**
+ * List grades of a prestudent that an assistant marked as already done
+ * or as not allowed because of the repeating of a semester.
+ *
+ * @param string $prestudent_id
+ * @param string|null $all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+ *
+ * @return void
+ */
+ public function getRepeaterGrades($prestudent_id, $all = null)
+ {
+ $this->load->library('AntragLib');
+
+ $studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : false;
+
+
+ $result = $this->antraglib->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
+
+ $grades = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($grades);
+ }
+
+ /**
+ * Update or Insert a grade for the certificate of a prestudent.
+ * (Entry in lehre.tbl_zeugnisnote)
+ *
+ * @return void
+ */
+ public function updateCertificate()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
+ $this->form_validation->set_rules("student_uid", $this->p->t('person', 'student'), "required");
+ $this->form_validation->set_rules("studiensemester_kurzbz", $this->p->t('lehre', 'studiensemester'), "required");
+ $this->form_validation->set_rules('note', $this->p->t('lehre', 'note'), 'required|numeric');
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ $student_uid = $this->input->post('student_uid');
+ $lehrveranstaltung_id = $this->input->post('lehrveranstaltung_id');
+ $note = $this->input->post('note');
+ $authUID = getAuthUID();
+ $now = date('c');
+
+ // NOTE(chris): Stg Permissions
+ if (!$this->hasPermissionUpdate($lehrveranstaltung_id, $student_uid))
+ return $this->_outputAuthError([$this->router->method => ['admin', 'assistenz']]);
+
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->ZeugnisnoteModel->load([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ]);
+ $current = $this->getDataOrTerminateWithError($result);
+
+ if ($current) {
+ $result = $this->ZeugnisnoteModel->update([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ], [
+ 'note' => $note,
+ 'benotungsdatum' => $now,
+ 'updateamum' => $now,
+ 'updatevon' => $authUID
+ ]);
+ } else {
+ $result = $this->ZeugnisnoteModel->insert([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id,
+ 'note' => $note,
+ 'benotungsdatum' => $now,
+ 'insertamum' => $now,
+ 'insertvon' => $authUID
+ ]);
+ }
+ $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(true);
+ }
+
+ /**
+ * Delete a grade from the certificate of a prestudent.
+ * (Entry in lehre.tbl_zeugnisnote)
+ *
+ * @return void
+ */
+ public function deleteCertificate()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
+ $this->form_validation->set_rules("student_uid", $this->p->t('person', 'student'), "required");
+ $this->form_validation->set_rules("studiensemester_kurzbz", $this->p->t('lehre', 'studiensemester'), "required");
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ $student_uid = $this->input->post('student_uid');
+ $lehrveranstaltung_id = $this->input->post('lehrveranstaltung_id');
+
+ // NOTE(chris): Stg Permissions
+ if (!$this->hasPermissionDelete($lehrveranstaltung_id, $student_uid))
+ return $this->_outputAuthError([$this->router->method => ['admin', 'assistenz']]);
+
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->ZeugnisnoteModel->delete([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ]);
+ $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(true);
+ }
+
+ /**
+ * Copy a grade that teachers gave to the certificate of a prestudent.
+ * (Entry in campus.tbl_lvgesamtnote to an entry in lehre.tbl_zeugnisnote)
+ *
+ * @return void
+ */
+ public function copyTeacherProposalToCertificate()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
+ $this->form_validation->set_rules("student_uid", $this->p->t('person', 'student'), "required");
+ $this->form_validation->set_rules("studiensemester_kurzbz", $this->p->t('lehre', 'studiensemester'), "required");
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $lehrveranstaltung_id = $this->input->post('lehrveranstaltung_id');
+ $student_uid = $this->input->post('student_uid');
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ $authUID = getAuthUID();
+
+ // NOTE(chris): Stg Permissions
+ if (!$this->hasPermissionCopy($lehrveranstaltung_id, $student_uid))
+ return $this->_outputAuthError([$this->router->method => 'student/noten']);
+
+ $this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+
+ $result = $this->LvgesamtnoteModel->load([
+ 'student_uid' => $student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ]);
+ $teacherGrade = $this->getDataOrTerminateWithError($result);
+
+ if (!$teacherGrade)
+ show_404();
+
+ $teacherGrade = current($teacherGrade);
+
+ $data = [
+ 'note' => $teacherGrade->note,
+ 'punkte' => $teacherGrade->punkte,
+ 'uebernahmedatum' => date('c'),
+ 'benotungsdatum' => $teacherGrade->benotungsdatum,
+ 'bemerkung' => $teacherGrade->bemerkung
+ ];
+
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $this->ZeugnisnoteModel->addJoin('lehre.tbl_note n', 'note');
+ $result = $this->ZeugnisnoteModel->load([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ]);
+ $certificateGrade = $this->getDataOrTerminateWithError($result);
+
+ if ($certificateGrade) {
+ $certificateGrade = current($certificateGrade);
+
+ if (!$certificateGrade->lkt_ueberschreibbar)
+ $this->terminateWithError($this->p->t("stv", "grades_error_overwrite"));
+
+ // NOTE(chris): update
+ $data['updateamum'] = $data['uebernahmedatum'];
+ $data['updatevon'] = $authUID;
+
+ $this->ZeugnisnoteModel->update([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $student_uid,
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id
+ ], $data);
+ } else {
+ // NOTE(chris): insert
+ $data['insertamum'] = $data['uebernahmedatum'];
+ $data['insertvon'] = $authUID;
+ $data['lehrveranstaltung_id'] = $lehrveranstaltung_id;
+ $data['student_uid'] = $student_uid;
+ $data['studiensemester_kurzbz'] = $studiensemester_kurzbz;
+
+ $this->ZeugnisnoteModel->insert($data);
+
+ if (defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN')
+ && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN) {
+ $result = $this->addTestsForGrade(
+ $studiensemester_kurzbz,
+ $student_uid,
+ $lehrveranstaltung_id,
+ $teacherGrade->note,
+ $teacherGrade->punkte
+ );
+ $this->getDataOrTerminateWithError($result);
+ }
+ }
+
+
+ $this->terminateWithSuccess(true);
+ }
+
+ /**
+ * Copy a grade that was marked by an assistant as already done or not
+ * allowed because of the repeating of a semester to the certificate of a
+ * prestudent.
+ *
+ * @return void
+ */
+ public function copyRepeaterGradeToCertificate()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules("studierendenantrag_lehrveranstaltung_id", "studierendenantrag_lehrveranstaltung_id", "required|integer");
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $id = $this->input->post('studierendenantrag_lehrveranstaltung_id');
+ $authUID = getAuthUID();
+
+ $this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
+
+ $this->StudierendenantraglehrveranstaltungModel->addSelect("tbl_studierendenantrag_lehrveranstaltung.*");
+ $this->StudierendenantraglehrveranstaltungModel->addSelect("student_uid");
+ $this->StudierendenantraglehrveranstaltungModel->addJoin("campus.tbl_studierendenantrag", "studierendenantrag_id");
+ $this->StudierendenantraglehrveranstaltungModel->addJoin("public.tbl_student", "prestudent_id", "LEFT");
+
+ $result = $this->StudierendenantraglehrveranstaltungModel->load($id);
+ $repeaterGrade = $this->getDataOrTerminateWithError($result);
+
+ if (!$repeaterGrade)
+ show_404();
+
+ $repeaterGrade = current($repeaterGrade);
+
+ // NOTE(chris): Stg Permissions
+ if (!$this->hasPermissionCopy($repeaterGrade->lehrveranstaltung_id, $repeaterGrade->student_uid))
+ return $this->_outputAuthError([$this->router->method => 'student/noten']);
+
+ $data = [
+ 'note' => $repeaterGrade->note,
+ 'uebernahmedatum' => date('c'),
+ 'benotungsdatum' => $repeaterGrade->insertamum,
+ 'bemerkung' => $repeaterGrade->anmerkung
+ ];
+
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->ZeugnisnoteModel->load([
+ $repeaterGrade->studiensemester_kurzbz,
+ $repeaterGrade->student_uid,
+ $repeaterGrade->lehrveranstaltung_id
+ ]);
+ $certificateGrade = $this->getDataOrTerminateWithError($result);
+
+ if ($certificateGrade) {
+ // NOTE(chris): update
+ $data['updateamum'] = $data['uebernahmedatum'];
+ $data['updatevon'] = $authUID;
+
+ $this->ZeugnisnoteModel->update([
+ $repeaterGrade->studiensemester_kurzbz,
+ $repeaterGrade->student_uid,
+ $repeaterGrade->lehrveranstaltung_id
+ ], $data);
+ } else {
+ // NOTE(chris): insert
+ $data['insertamum'] = $data['uebernahmedatum'];
+ $data['insertvon'] = $authUID;
+ $data['lehrveranstaltung_id'] = $repeaterGrade->lehrveranstaltung_id;
+ $data['student_uid'] = $repeaterGrade->student_uid;
+ $data['studiensemester_kurzbz'] = $repeaterGrade->studiensemester_kurzbz;
+
+ $this->ZeugnisnoteModel->insert($data);
+ }
+
+
+ $this->terminateWithSuccess(true);
+ }
+
+ /**
+ * Loads the grade from the points using the gradingkey
+ *
+ * @return void
+ */
+ public function getGradeFromPoints()
+ {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
+ $this->form_validation->set_rules("points", $this->p->t("stv", "grades_points"), "required|numeric");
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+ $this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel');
+
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+ $result = $this->NotenschluesselaufteilungModel->getNote(
+ $this->input->post('points'),
+ $this->input->post('lehrveranstaltung_id'),
+ $studiensemester_kurzbz
+ );
+
+ $note = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($note);
+ }
+
+ /**
+ * Helper function that adds tests for a student
+ * (Entries in lehre.tbl_pruefung)
+ *
+ * @param string $studiensemester_kurzbz
+ * @param string $student_uid
+ * @param integer $lehrveranstaltung_id
+ * @param integer $note
+ * @param numeric $punkte
+ *
+ * @return stdClass
+ */
+ protected function addTestsForGrade($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $note, $punkte)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ // Get Lehreinheit
+ $result = $this->LehrveranstaltungModel->getLeByStudent($student_uid, $studiensemester_kurzbz, $lehrveranstaltung_id);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->p->t("stv", "grades_error_lehreinheit_id"));
+ $le = current(getData($result));
+
+ // Prepare
+ $this->load->model('education/LePruefung_model', 'LePruefungModel');
+ $data = [
+ "student_uid" => $student_uid,
+ "lehreinheit_id" => $le->lehreinheit_id,
+ "datum" => date('Y-m-d'),
+ "pruefungstyp_kurzbz" => "Termin1",
+ "note" => $note
+ ];
+
+ if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+ $data["punkte"] = $punkte;
+
+ // Get Anwesenheit
+ $this->load->model('education/Anwesenheit_model', 'AnwesenheitModel');
+ $result = $this->AnwesenheitModel->loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id);
+ if (isError($result))
+ return $result;
+ $anwesenheit = getData($result);
+
+ if ($anwesenheit && (float)current($anwesenheit)->prozent < FAS_ANWESENHEIT_ROT) {
+ // Get Anwesenheitsbefreiung
+ $this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+ $result = $this->BenutzerfunktionModel->getBenutzerFunktionByUidInStdsem($student_uid, $studiensemester_kurzbz, 'awbefreit');
+
+ if (isError($result))
+ return $result;
+
+ $anwesenheitsbefreit = hasData($result);
+
+ // Wenn nicht Anwesenheitsbefreit und Anwesenheit unter einem bestimmten Prozentsatz fällt dann wird ein Pruefungsantritt abgezogen
+ if (!$anwesenheitsbefreit) {
+ $data2 = $data;
+ $data2["note"] = 7;
+ if (isset($data2["punkte"]))
+ unset($data2["punkte"]);
+
+ $result = $this->LePruefungModel->insert($data2);
+
+ if (isError($result))
+ return $result;
+
+ $data["pruefungstyp_kurzbz"] = "Termin2";
+ }
+ }
+
+ return $this->LePruefungModel->insert($data);
+ }
+
+ /**
+ * Helper function to check permissions for updateCertificate()
+ *
+ * @param integer $lehrveranstaltung_id
+ * @param string $student_uid
+ *
+ * @return boolean
+ */
+ protected function hasPermissionUpdate($lehrveranstaltung_id, $student_uid)
+ {
+ if ($lehrveranstaltung_id === null || $student_uid === null)
+ return true;
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+
+ $result = $this->StudentModel->load([$student_uid]);
+ if (isError($result) || !hasData($result))
+ return false;
+
+ $student = current(getData($result));
+
+ if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz))
+ return true;
+ if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz))
+ return true;
+
+ $this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+ $result = $this->StudienplanModel->getAllOesForLv($lehrveranstaltung_id);
+ if (isError($result))
+ return false;
+
+ $oes = getData($result) ?: [];
+
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getStg($lehrveranstaltung_id);
+ if (isError($result))
+ return false;
+
+ if (hasData($result))
+ $oes[] = current(getData($result));
+
+ foreach ($oes as $oe) {
+ if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz))
+ return true;
+ if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz))
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Helper function to check permissions for deleteCertificate()
+ *
+ * @param integer $lehrveranstaltung_id
+ * @param string $student_uid
+ *
+ * @return boolean
+ */
+ protected function hasPermissionDelete($lehrveranstaltung_id, $student_uid)
+ {
+ if ($lehrveranstaltung_id === null || $student_uid === null)
+ return true;
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+
+ $result = $this->StudentModel->load([$student_uid]);
+ if (isError($result) || !hasData($result))
+ return false;
+
+ $student = current(getData($result));
+
+ if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz))
+ return true;
+ if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz))
+ return true;
+
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+ if (isError($result) || !hasData($result))
+ return false;
+
+ $oe = current(getData($result));
+
+ if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz))
+ return true;
+ if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz))
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Helper function to check permissions for
+ * copyTeacherProposalToCertificate() and copyRepeaterGradeToCertificate()
+ *
+ * @param integer $lehrveranstaltung_id
+ * @param string $student_uid
+ *
+ * @return boolean
+ */
+ protected function hasPermissionCopy($lehrveranstaltung_id, $student_uid)
+ {
+ if ($lehrveranstaltung_id === null || $student_uid === null)
+ return true;
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+
+ $result = $this->StudentModel->load([$student_uid]);
+ if (isError($result) || !hasData($result))
+ return false;
+
+ $student = current(getData($result));
+
+ if ($this->permissionlib->isBerechtigt('student/noten', 'suid', $student->studiengang_kz))
+ return true;
+
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+ if (isError($result) || !hasData($result))
+ return false;
+
+ $oe = current(getData($result));
+
+ if ($this->permissionlib->isBerechtigt('student/noten', 'suid', $oe->oe_kurzbz))
+ return true;
+
+ return false;
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 517388b39..bcd38853c 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -10,25 +10,25 @@ class Kontakt extends FHCAPI_Controller
{
parent::__construct([
'getAdressen' => ['admin:r', 'assistenz:r'],
- 'addNewAddress' => ['admin:r', 'assistenz:r'],
- 'addNewContact' => ['admin:r', 'assistenz:r'],
- 'addNewBankverbindung' => ['admin:r', 'assistenz:r'],
- 'updateAddress' => ['admin:r', 'assistenz:r'],
- 'updateContact' => ['admin:r', 'assistenz:r'],
- 'updateBankverbindung' => ['admin:r', 'assistenz:r'],
+ 'addNewAddress' => ['admin:rw', 'assistenz:rw'],
+ 'addNewContact' => ['admin:rw', 'assistenz:rw'],
+ 'addNewBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
+ 'updateAddress' => ['admin:rw', 'assistenz:rw'],
+ 'updateContact' => ['admin:rw', 'assistenz:rw'],
+ 'updateBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
'loadAddress' => ['admin:r', 'assistenz:r'],
'loadContact' => ['admin:r', 'assistenz:r'],
- 'loadBankverbindung' => ['admin:r', 'assistenz:r'],
- 'deleteAddress' => ['admin:r', 'assistenz:r'],
- 'deleteContact' => ['admin:r','assistenz:r'],
- 'deleteBankverbindung' => ['admin:r','assistenz:r'],
+ 'loadBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
+ 'deleteAddress' => ['admin:rw', 'assistenz:rw'],
+ 'deleteContact' => ['admin:rw','assistenz:rw'],
+ 'deleteBankverbindung' => ['mitarbeiter/bankdaten:rw','astudent/bankdaten:rw'],
'getAdressentypen' => ['admin:r', 'assistenz:r'],
'getKontakttypen' => ['admin:r', 'assistenz:r'],
'getFirmen' => ['admin:r', 'assistenz:r'],
'getStandorte' => ['admin:r', 'assistenz:r'],
+ 'getStandorteByFirma' => ['admin:r', 'assistenz:r'],
'getKontakte' => ['admin:r', 'assistenz:r'],
- 'getBankverbindung' => ['admin:r', 'assistenz:r'],
-
+ 'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r']
]);
// Load Libraries
@@ -37,15 +37,113 @@ class Kontakt extends FHCAPI_Controller
// Load language phrases
$this->loadPhrases([
- 'ui'
+ 'ui',
+ 'person'
]);
- }
+ // Load models
+ $this->load->model('person/Adresse_model', 'AdresseModel');
+ $this->load->model('organisation/standort_model', 'StandortModel');
+ $this->load->model('ressource/firma_model', 'FirmaModel');
+ $this->load->model('person/Kontakt_model', 'KontaktModel');
+
+ // Extra Permissionchecks
+ $permsMa = [];
+ $permsStud = [];
+ switch ($this->router->method) {
+ case 'getBankverbindung':
+ case 'loadBankverbindung':
+ $permsMa = ['mitarbeiter/bankdaten:r'];
+ $permsStud = ['student/bankdaten:r'];
+ break;
+ case 'addNewBankverbindung':
+ case 'updateBankverbindung':
+ case 'deleteBankverbindung':
+ $permsMa = ['mitarbeiter/bankdaten:rw'];
+ $permsStud = ['student/bankdaten:rw'];
+ break;
+ case 'getAdressen':
+ case 'getKontakte':
+ case 'loadAddress':
+ case 'loadContact':
+ $permsMa = $permsStud = ['admin:r', 'assistenz:r'];
+ break;
+ case 'addNewAddress':
+ case 'addNewContact':
+ case 'updateAddress':
+ case 'updateContact':
+ case 'deleteAddress':
+ case 'deleteContact':
+ $permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
+ break;
+ }
+ if ($this->router->method == 'getAdressen'
+ || $this->router->method == 'getKontakte'
+ || $this->router->method == 'getBankverbindung'
+ || $this->router->method == 'addNewAddress'
+ || $this->router->method == 'addNewContact'
+ || $this->router->method == 'addNewBankverbindung'
+ ) {
+ $person_id = current(array_slice($this->uri->rsegments, 2));
+
+ if (is_null($person_id) || !ctype_digit((string)$person_id))
+ $this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+ $this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+ } elseif ($this->router->method == 'loadAddress'
+ || $this->router->method == 'loadContact'
+ || $this->router->method == 'loadBankverbindung'
+ || $this->router->method == 'updateAddress'
+ || $this->router->method == 'updateContact'
+ || $this->router->method == 'updateBankverbindung'
+ || $this->router->method == 'deleteAddress'
+ || $this->router->method == 'deleteContact'
+ || $this->router->method == 'deleteBankverbindung'
+ ) {
+ if($this->input->post('address_id'))
+ $id = $this->input->post('address_id');
+ if($this->input->post('adresse_id'))
+ $id = $this->input->post('adresse_id');
+ if($this->input->post('bankverbindung_id'))
+ $id = $this->input->post('bankverbindung_id');
+ if($this->input->post('kontakt_id'))
+ $id = $this->input->post('kontakt_id');
+
+ $model = 'person/Adresse_model';
+ if ($this->router->method == 'loadContact'
+ || $this->router->method == 'updateContact'
+ || $this->router->method == 'deleteContact'
+ ) {
+ $model = 'person/Kontakt_model';
+ } elseif ($this->router->method == 'loadBankverbindung'
+ || $this->router->method == 'updateBankverbindung'
+ || $this->router->method == 'deleteBankverbindung'
+ ) {
+ $model = 'person/Bankverbindung_model';
+ }
+
+ if (!isset($id) || !ctype_digit((string)$id))
+ $this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+ $this->load->model($model, 'TempModel');
+ $result = $this->TempModel->load($id);
+ $data = $this->getDataOrTerminateWithError($result);
+ if (!$result)
+ show_404();
+
+ $person_id = current($data)->person_id;
+
+ $this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+ }
+ }
public function getAdressen($person_id)
{
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- $this->AdresseModel->addSelect('public.tbl_adresse.*');
+ $this->AdresseModel->addSelect("public.tbl_adresse.*,
+ (CASE
+ WHEN public.tbl_adresse.updateamum >= public.tbl_adresse.insertamum
+ THEN public.tbl_adresse.updateamum
+ ELSE public.tbl_adresse.insertamum
+ END) AS lastUpdate");
$this->AdresseModel->addSelect('t.*');
$this->AdresseModel->addSelect('f.firma_id');
$this->AdresseModel->addSelect('f.name as firmenname');
@@ -63,20 +161,32 @@ class Kontakt extends FHCAPI_Controller
public function addNewAddress($person_id)
{
- $_POST = json_decode($this->input->raw_input_stream, true);
+ $this->form_validation->set_data(['address.plz' => $_POST['plz']]);
- $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
- 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+ $this->form_validation->set_rules('address.plz', 'PLZ', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
]);
+ if(isset($_POST['nation']) && $_POST['nation'] == 'A')
+ {
+ $this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
+ ]);
+ }
+
+ if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && $_POST['nation'] == 'A')
+ {
+ $this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+ 'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+ ]);
+ }
+
if ($this->form_validation->run() == false)
{
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
$uid = getAuthUID();
$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
@@ -115,23 +225,38 @@ class Kontakt extends FHCAPI_Controller
]
);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
- public function updateAddress($address_id)
+ public function updateAddress()
{
- $uid = getAuthUID();
- $_POST = json_decode($this->input->raw_input_stream, true);
+ $address_id = $this->input->post('adresse_id');
- $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
- 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+ $this->form_validation->set_data(['address.plz' => $_POST['plz']]);
+
+ $uid = getAuthUID();
+
+ $this->form_validation->set_rules('address.plz', 'PLZ', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
]);
+ if(isset($_POST['nation']) && $_POST['nation'] == 'A')
+ {
+ $this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
+ ]);
+ }
+
+ if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && $_POST['nation'] == 'A')
+ {
+ $this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+ 'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+ ]);
+ }
+
if ($this->form_validation->run() == false)
{
$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -141,13 +266,17 @@ class Kontakt extends FHCAPI_Controller
if(!$address_id)
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
}
if(isset($_POST['firma']))
{
$firma_id = $_POST['firma']['firma_id'];
}
+ elseif(isset($_POST['firma_id']))
+ {
+ $firma_id = $_POST['firma_id'];
+ }
else
$firma_id = null;
@@ -184,15 +313,15 @@ class Kontakt extends FHCAPI_Controller
]
);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
- public function loadAddress($adresse_id)
+ public function loadAddress()
{
+ $adresse_id = $this->input->post('address_id');
+
$this->load->model('person/Adresse_model', 'AdresseModel');
$this->AdresseModel->addSelect('public.tbl_adresse.*');
@@ -213,14 +342,28 @@ class Kontakt extends FHCAPI_Controller
if (!hasData($result))
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
}
$this->terminateWithSuccess(current(getData($result)) ? : null);
}
- public function deleteAddress($adresse_id)
+ public function deleteAddress()
{
+ $adresse_id = $this->input->post('address_id');
+
$this->load->model('person/Adresse_model', 'AdresseModel');
+ $result = $this->AdresseModel->load([
+ 'adresse_id'=> $adresse_id,
+ ]);
+ if(isError($result))
+ {
+ return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ $result = current(getData($result));
+
+ if($result->heimatadresse)
+
+ $this->terminateWithError($this->p->t('person', 'error_deleteHomeAdress'), self::ERROR_TYPE_GENERAL);
$result = $this->AdresseModel->delete(
array('adresse_id' => $adresse_id)
@@ -232,9 +375,9 @@ class Kontakt extends FHCAPI_Controller
}
if (!hasData($result))
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
}
- //return $this->outputJsonSuccess(current(getData($result)));
+
return $this->terminateWithSuccess(current(getData($result)) ? : null);
}
@@ -250,8 +393,11 @@ class Kontakt extends FHCAPI_Controller
$this->terminateWithSuccess(getData($result) ?: []);
}
- public function getFirmen($searchString)
+ public function getFirmen($searchString = null)
{
+ if (is_null($searchString))
+ $this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
$this->load->model('ressource/firma_model', 'FirmaModel');
$result = $this->FirmaModel->searchFirmen($searchString);
@@ -261,29 +407,44 @@ class Kontakt extends FHCAPI_Controller
$this->terminateWithSuccess($result ?: []);
}
- public function getStandorte($searchString)
+ public function getStandorte($searchString = null)
{
+ if (is_null($searchString))
+ $this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
$this->load->model('organisation/standort_model', 'StandortModel');
$result = $this->StandortModel->searchStandorte($searchString);
- if (isError($result)) {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- $this->terminateWithSuccess($result ?: []);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getStandorteByFirma($firma_id = null)
+ {
+ if (is_null($firma_id) || !ctype_digit((string)$firma_id))
+ $this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+ $this->load->model('organisation/standort_model', 'StandortModel');
+
+ $result = $this->StandortModel->getStandorteByFirma($firma_id);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
public function getKontakte($person_id)
{
- $this->load->model('person/Kontakt_model', 'KontaktModel');
- $this->load->model('organisation/standort_model', 'StandortModel');
- $this->KontaktModel->addSelect("*,
- TO_CHAR (CASE
- WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum
- THEN public.tbl_kontakt.updateamum
- ELSE public.tbl_kontakt.insertamum
- END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+ $this->KontaktModel->addSelect("public.tbl_kontakt.*,
+ (CASE
+ WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum
+ THEN public.tbl_kontakt.updateamum
+ ELSE public.tbl_kontakt.insertamum
+ END) AS lastUpdate, st.bezeichnung, f.name");
$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
+ $this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
$result = $this->KontaktModel->loadWhere(
array('person_id' => $person_id)
);
@@ -302,18 +463,22 @@ class Kontakt extends FHCAPI_Controller
$result = $this->KontakttypModel->load();
if (isError($result)) {
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- } else {
+ }
+ else
+ {
$this->terminateWithSuccess(getData($result) ?: []);
}
}
- public function loadContact($kontakt_id)
+ public function loadContact()
{
+ $kontakt_id = $this->input->post('kontakt_id');
$this->load->model('person/Kontakt_model', 'KontaktModel');
- $this->KontaktModel->addSelect('public.tbl_kontakt.*');
+ $this->KontaktModel->addSelect('*, public.tbl_kontakt.*');
$this->KontaktModel->addSelect('st.kurzbz');
$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+ $this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
$this->KontaktModel->addLimit(1);
@@ -325,24 +490,26 @@ class Kontakt extends FHCAPI_Controller
}
if (!hasData($result))
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
}
- // $this->outputJsonSuccess(current(getData($result)));
$this->terminateWithSuccess(current(getData($result)));
}
public function addNewContact($person_id)
{
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
- 'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+ {
+ $this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
+ 'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
]);
+ }
else
+ {
$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
]);
+ }
if ($this->form_validation->run() == false)
{
@@ -351,19 +518,13 @@ class Kontakt extends FHCAPI_Controller
$this->load->model('person/Kontakt_model', 'KontaktModel');
- if(isset($_POST['standort']))
- {
- $standort_id = $_POST['standort']['standort_id'];
- }
- else
- $standort_id = null;
-
$uid = getAuthUID();
$kontakttyp = $this->input->post('kontakttyp');
$anmerkung = $this->input->post('anmerkung');
$kontakt = $this->input->post('kontakt');
$ext_id = $this->input->post('ext_id');
+ $standort_id = $this->input->post('standort_id');
$result = $this->KontaktModel->insert(
[
@@ -383,47 +544,45 @@ class Kontakt extends FHCAPI_Controller
{
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
- return $this->outputJsonSuccess(true);
+ $this->terminateWithSuccess($result);
}
- public function updateContact($kontakt_id)
+ public function updateContact()
{
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
+ $kontakt_id = $this->input->post('kontakt_id');
$this->load->model('person/Kontakt_model', 'KontaktModel');
if(!$kontakt_id)
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
}
if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
- 'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+ {
+ $this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
+ 'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
]);
+ }
else
+ {
$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
]);
+ }
if ($this->form_validation->run() == false)
{
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
- if(isset($_POST['standort']))
- {
- $standort_id = $_POST['standort']['standort_id'];
- }
- else
- $standort_id = null;
-
$uid = getAuthUID();
$kontakttyp = $this->input->post('kontakttyp');
$anmerkung = $this->input->post('anmerkung');
$kontakt = $this->input->post('kontakt');
$ext_id = $this->input->post('ext_id');
$person_id = $this->input->post('person_id');
+ $standort_id = $this->input->post('standort_id');
$result = $this->KontaktModel->update(
[
@@ -442,15 +601,14 @@ class Kontakt extends FHCAPI_Controller
]
);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
- public function deleteContact($kontakt_id)
+ public function deleteContact()
{
+ $kontakt_id = $this->input->post('kontakt_id');
$this->load->model('person/Kontakt_model', 'KontaktModel');
$result = $this->KontaktModel->delete(
@@ -463,12 +621,11 @@ class Kontakt extends FHCAPI_Controller
}
elseif (!hasData($result))
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
}
return $this->terminateWithSuccess(current(getData($result)) ? : null);
}
-
public function getBankverbindung($person_id)
{
$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
@@ -487,15 +644,12 @@ class Kontakt extends FHCAPI_Controller
public function addNewBankverbindung($person_id)
{
- $this->load->library('form_validation');
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
$this->form_validation->set_rules('iban', 'IBAN', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
]);
$this->form_validation->set_rules('typ', 'TYP', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
]);
if ($this->form_validation->run() == false)
@@ -511,8 +665,11 @@ class Kontakt extends FHCAPI_Controller
$name = $this->input->post('name');
$anschrift = $this->input->post('anschrift');
$bic = $this->input->post('bic');
- $blz = $this->input->post('blz ');
+ $blz = $this->input->post('blz');
$kontonr = $this->input->post('kontonr');
+ $iban = $this->input->post('iban');
+ $typ = $this->input->post('typ');
+ $verrechnung = $this->input->post('verrechnung');
$result = $this->BankverbindungModel->insert(
[
@@ -520,27 +677,27 @@ class Kontakt extends FHCAPI_Controller
'name' => $name,
'anschrift' => $anschrift,
'bic' => $bic,
- 'iban' => $_POST['iban'],
+ 'iban' => $iban,
'blz' => $blz,
'kontonr' => $kontonr,
'insertvon' => 'uid',
'insertamum' => date('c'),
- 'typ' => $_POST['typ'],
- 'verrechnung' => $_POST['verrechnung'],
+ 'typ' => $typ,
+ 'verrechnung' => $verrechnung,
'ext_id' => $ext_id,
'oe_kurzbz' => $oe_kurzbz,
'orgform_kurzbz' => $orgform_kurzbz
]
);
- if (isError($result))
- {
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
- public function loadBankverbindung($bankverbindung_id)
+ public function loadBankverbindung()
{
+ $bankverbindung_id = $this->input->post('bankverbindung_id');
+
$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
$this->BankverbindungModel->addSelect('*');
@@ -557,21 +714,19 @@ class Kontakt extends FHCAPI_Controller
if (!hasData($result))
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
}
$this->terminateWithSuccess(current(getData($result)));
}
public function updateBankverbindung($bankverbindung_id)
{
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
$this->form_validation->set_rules('iban', 'IBAN', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
]);
$this->form_validation->set_rules('typ', 'TYP', 'required', [
- 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
]);
if ($this->form_validation->run() == false)
@@ -583,7 +738,7 @@ class Kontakt extends FHCAPI_Controller
if(!$bankverbindung_id)
{
- return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
}
$uid = getAuthUID();
@@ -610,15 +765,15 @@ class Kontakt extends FHCAPI_Controller
]
);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
- public function deleteBankverbindung($bankverbindung_id)
+ public function deleteBankverbindung()
{
+ $bankverbindung_id = $this->input->post('bankverbindung_id');
+
$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
$result = $this->BankverbindungModel->delete(
@@ -631,80 +786,15 @@ class Kontakt extends FHCAPI_Controller
}
if (!hasData($result))
{
- $this->outputJson($result);
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
}
return $this->terminateWithSuccess(current(getData($result)) ? : null);
}
-/* public function plz_required($value)
+ public function validateLocationCombination()
{
- if (empty($value)) {
- $this->form_validation->set_message('plz_required', $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
- return false;
- }
- else
- {
- return true;
- }
- }*/
+ $this->load->model('codex/Gemeinde_model', 'GemeindeModel');
-/* public function kontakt_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('kontakt_required', $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function iban_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('iban_required', $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function typ_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('typ_required', $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
- return false;
- }
- else
- {
- return true;
- }
- }*/
-
-/* public function plz_numeric($value)
- {
- if (!is_numeric($value)) {
- $this->form_validation->set_message('plz_numeric', $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
- return false;
- }
- else
- {
- return true;
- }
- }*/
-
- public function kontakt_valid_email($email)
- {
- if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
- $this->form_validation->set_message('kontakt_valid_email', $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
- return false;
- }
- else
- {
- return true;
- }
+ return $this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']);
}
}
diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index a4344889c..ac36b5d8f 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -246,11 +246,11 @@ class Konto extends FHCAPI_Controller
if (isError($id)) {
$this->addError(getError($id), self::ERROR_TYPE_DB);
} else {
- $data = $this->KontoModel->withAdditionalInfo()->load(getData($id));
- if (isError($data))
- $this->addError(getError($data), self::ERROR_TYPE_DB);
+ $kontodata = $this->KontoModel->withAdditionalInfo()->load(getData($id));
+ if (isError($kontodata))
+ $this->addError(getError($kontodata), self::ERROR_TYPE_DB);
else
- $result[] = current(getData($data));
+ $result[] = current(getData($kontodata));
}
}
diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
index eceaf8c8c..1c0c25db7 100644
--- a/application/controllers/api/frontend/v1/stv/Lists.php
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -33,7 +33,8 @@ class Lists extends FHCAPI_Controller
'getSprachen' => self::PERM_LOGGED,
'getGeschlechter' => self::PERM_LOGGED,
'getAusbildungen' => self::PERM_LOGGED,
- 'getOrgforms' => self::PERM_LOGGED
+ 'getOrgforms' => self::PERM_LOGGED,
+ 'getStati' => self::PERM_LOGGED
]);
}
@@ -87,6 +88,7 @@ class Lists extends FHCAPI_Controller
$this->GeschlechtModel->addOrder('geschlecht');
$this->GeschlechtModel->addSelect('*');
+ #$this->GeschlechtModel->addTranslatedSelect("bezeichnung_mehrsprachig", "bezeichnung");
$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
$result = $this->GeschlechtModel->load();
@@ -118,4 +120,28 @@ class Lists extends FHCAPI_Controller
$this->terminateWithSuccess($data);
}
+
+ public function getStati()
+ {
+ $lang = getUserLanguage();
+ $this->load->model('crm/Status_model', 'StatusModel');
+
+ $this->StatusModel->addSelect('*');
+ #$this->StatusModel->addTranslatedSelect('bezeichnung_mehrsprachig', 'bezeichnung');
+ $this->StatusModel->addSelect(
+ 'bezeichnung_mehrsprachig[(
+ SELECT index
+ FROM public.tbl_sprache
+ WHERE sprache=' . $this->StatusModel->escape($lang) . '
+ LIMIT 1
+ )] AS bezeichnung',
+ false
+ );
+ #$this->StatusModel->addOrder('ext_id');
+
+ $result = $this->StatusModel->load();
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
}
diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php
new file mode 100644
index 000000000..2ab0ac682
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Mobility.php
@@ -0,0 +1,528 @@
+ ['admin:r', 'assistenz:r'],
+ 'loadMobility' => ['admin:r', 'assistenz:r'],
+ 'insertMobility' => ['admin:rw', 'assistenz:rw'],
+ 'updateMobility' => ['admin:rw', 'assistenz:rw'],
+ 'deleteMobility' => ['admin:rw', 'assistenz:rw'],
+ 'getProgramsMobility' => ['admin:r', 'assistenz:r'],
+ 'getLVList' => ['admin:r', 'assistenz:r'],
+ 'getAllLehreinheiten' => ['admin:r', 'assistenz:r'],
+ 'getLvsandLesByStudent' => ['admin:r', 'assistenz:r'],
+ 'getPurposes' => ['admin:r', 'assistenz:r'],
+ 'getSupports' => ['admin:r', 'assistenz:r'],
+ 'getListPurposes' => ['admin:r', 'assistenz:r'],
+ 'getListSupports' => ['admin:r', 'assistenz:r'],
+ 'deleteMobilityPurpose' => ['admin:r', 'assistenz:r'],
+ 'addMobilityPurpose' => ['admin:r', 'assistenz:r'],
+ 'deleteMobilitySupport' => ['admin:r', 'assistenz:r'],
+ 'addMobilitySupport' => ['admin:r', 'assistenz:r'],
+ ]);
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ $this->load->library('form_validation');
+
+ // Load language phrases
+ $this->loadPhrases([
+ 'ui',
+ 'mobility'
+ ]);
+
+ // Load models
+ $this->load->model('codex/Bisio_model', 'BisioModel');
+ }
+
+ public function getMobilitaeten($student_uid)
+ {
+ $this->BisioModel->addSelect("*");
+ $this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+ $this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+ $this->BisioModel->addOrder('von', 'DESC');
+ $this->BisioModel->addOrder('bis', 'DESC');
+ $this->BisioModel->addOrder('bisio_id', 'DESC');
+ $result = $this->BisioModel->loadWhere(
+ array('student_uid' => $student_uid)
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getProgramsMobility()
+ {
+ $this->load->model('codex/Mobilitaetsprogramm_model', 'MobilitaetsprogrammModel');
+
+ $result = $this->MobilitaetsprogrammModel->load();
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function insertMobility()
+ {
+ $this->load->library('form_validation');
+ $authUID = getAuthUID();
+
+ $student_uid = $this->input->post('uid');
+
+ if(!$student_uid)
+ {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+ }
+
+ $formData = $this->input->post('formData');
+
+ $_POST['von'] = (isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+ $_POST['bis'] = (isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+ $_POST['nation_code'] = (isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+ $_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+ $_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+ $_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+ $_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+ $_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+ $this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+ ]);
+ $this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+ ]);
+ $this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+ ]);
+ $this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+ ]);
+
+ $this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+ ]);
+
+ $this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+ ]);
+
+ $this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+ ]);
+
+ $this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+ ]);
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $ort = (isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
+ $universitaet = (isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
+ $localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
+ $localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
+
+ $result = $this->BisioModel->insert([
+ 'student_uid' => $student_uid,
+ 'von' => $_POST['von'],
+ 'bis' => $_POST['bis'],
+ 'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+ 'nation_code' => $_POST['nation_code'],
+ 'herkunftsland_code' => $_POST['herkunftsland_code'],
+ 'lehreinheit_id' => $_POST['lehreinheit_id'],
+ 'ort' => $ort,
+ 'universitaet' => $universitaet,
+ 'ects_erworben' => $_POST['ects_erworben'] ,
+ 'ects_angerechnet' => $_POST['ects_angerechnet'],
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID,
+ ]);
+
+ $bisio_id = $this->getDataOrTerminateWithError($result);
+
+ //check if localData (purposes)
+ if(count($localPurposes) > 0){
+ foreach ($localPurposes as $zweck){
+ $zweck = (int)$zweck;
+ $this->addMobilityPurpose($bisio_id, $zweck);
+ }
+ }
+
+ //check if localData (supports)
+ if(count($localSupports) > 0){
+ foreach ($localSupports as $support){
+ $this->addMobilitySupport($bisio_id, $support);
+ }
+ }
+
+ $this->terminateWithSuccess($bisio_id);
+ }
+
+ public function loadMobility($bisio_id)
+ {
+ $this->BisioModel->addSelect("*");
+ $this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+ $this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+ $result = $this->BisioModel->loadWhere(
+ array('bisio_id' => $bisio_id)
+ );
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(current($data));
+ }
+
+ public function updateMobility()
+ {
+
+ $this->load->library('form_validation');
+ $authUID = getAuthUID();
+
+ $student_uid = $this->input->post('uid');
+
+ if(!$student_uid)
+ {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+ }
+ $formData = $this->input->post('formData');
+
+ $_POST['von'] = (isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+ $_POST['bis'] = (isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+ $_POST['nation_code'] = (isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+ $_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+ $_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+ $_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+ $_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+ $_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+ $this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+ ]);
+ $this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+ ]);
+ $this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+ ]);
+ $this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+ ]);
+
+ $this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+ ]);
+
+ $this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+ ]);
+
+ $this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+ ]);
+
+ $this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+ ]);
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $result = $this->BisioModel->update(
+ [
+ 'bisio_id' => $formData['bisio_id']
+ ],
+ [
+ 'student_uid' => $student_uid,
+ 'von' => $_POST['von'],
+ 'bis' => $_POST['bis'],
+ 'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+ 'nation_code' => $_POST['nation_code'],
+ 'herkunftsland_code' => $_POST['herkunftsland_code'],
+ 'lehreinheit_id' => $_POST['lehreinheit_id'],
+ 'ort' => $formData['ort'],
+ 'universitaet' => $formData['universitaet'],
+ 'ects_erworben' => $_POST['ects_erworben'] ,
+ 'ects_angerechnet' => $_POST['ects_angerechnet'],
+ 'updateamum' => date('c'),
+ 'updatevon' => $authUID,
+ ]
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess(current($data));
+ }
+
+ public function deleteMobility($bisio_id)
+ {
+ //check if extension table exists
+ $result = $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
+ $data = $this->getDataOrTerminateWithError($result);
+
+ //if table exists check if existing entry
+ if(!empty($data))
+ {
+ $this->BisioModel->addSelect("count(*)");
+ $this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.bisio_id = bis.tbl_bisio.bisio_id)', 'LEFT');
+
+ $resultCheckMo = $this->BisioModel->loadWhere(
+ array('mo.bisio_id' => $bisio_id)
+ );
+
+ $resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
+ $count = current($resultCheckMo)->count;
+
+ $existsInExtension = $count > 0 ? true : false;
+
+ if($existsInExtension)
+ $this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
+ }
+
+ $result = $this->BisioModel->delete(
+ array('bisio_id' => $bisio_id)
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getLVList($studiengang_kz)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudiengangkz($studiengang_kz);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getAllLehreinheiten()
+ {
+ $lv_id = $this->input->post('lv_id');
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ $result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getLvsandLesByStudent($student_uid)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $lv_ids = array();
+ $allData = array();
+
+ foreach ($data as $lehrveranstaltung) {
+ $lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
+ }
+
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ foreach ($lv_ids as $id)
+ {
+ $result = $this->LehreinheitModel->getLesFromLvIds($id);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if (is_array($data)) {
+ $allData = array_merge($allData, $data);
+ }
+ }
+
+ return $this->terminateWithSuccess($allData);
+ }
+
+ public function getPurposes($bisio_id)
+ {
+ $bisio_id = (int)$bisio_id;
+
+ $this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+ $this->BisiozweckModel->addSelect("*");
+ $this->BisiozweckModel->addJoin('bis.tbl_zweck zw', 'ON (zw.zweck_code = bis.tbl_bisio_zweck.zweck_code)');
+
+ $result = $this->BisiozweckModel->loadWhere(
+ array('bisio_id' => $bisio_id)
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getSupports($bisio_id)
+ {
+ $bisio_id = (int)$bisio_id;
+
+ $this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+ $this->BisioaufenthaltfoerderungModel->addSelect("*");
+ $this->BisioaufenthaltfoerderungModel->addJoin('bis.tbl_aufenthaltfoerderung af', 'ON (af.aufenthaltfoerderung_code = bis.tbl_bisio_aufenthaltfoerderung.aufenthaltfoerderung_code)');
+
+ $result = $this->BisioaufenthaltfoerderungModel->loadWhere(
+ array('bisio_id' => $bisio_id)
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getListPurposes()
+ {
+ $this->load->model('codex/Zweck_model', 'ZweckModel');
+
+ $result = $this->ZweckModel->load();
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getListSupports()
+ {
+ $this->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
+
+ $result = $this->AufenthaltfoerderungModel->load();
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function addMobilityPurpose($bisio_id, $local_purpose = null)
+ {
+ $zweck_code = $this->input->post('zweck_code');
+
+ if($local_purpose){
+ $zweck_code = $local_purpose;
+ }
+
+ $this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+ if(!$local_purpose)
+ {
+ $check = $this->BisiozweckModel->loadWhere(
+ [
+ 'bisio_id' => $bisio_id,
+ 'zweck_code' => $zweck_code,
+ ]
+ );
+ if (hasData($check))
+ {
+ $this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+ }
+ }
+
+ $result = $this->BisiozweckModel->insert(
+ array(
+ 'bisio_id' => $bisio_id,
+ 'zweck_code' => $zweck_code
+ )
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if($local_purpose)
+ {
+ return $data;
+ }
+
+ return $this->terminateWithSuccess(current($data));
+ }
+
+ public function deleteMobilityPurpose($bisio_id)
+ {
+ $zweck_code = $this->input->post('zweck_code');
+
+ $this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+
+ $result = $this->BisiozweckModel->delete(
+ array(
+ 'bisio_id' => $bisio_id,
+ 'zweck_code' => $zweck_code
+ )
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess(current($data));
+ }
+
+ public function addMobilitySupport($bisio_id, $local_support = null)
+ {
+ $aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+ if($local_support){
+ $aufenthaltfoerderung_code = $local_support;
+ }
+
+ $this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+ if(!$local_support)
+ {
+ $check = $this->BisioaufenthaltfoerderungModel->loadWhere(
+ [
+ 'bisio_id' => $bisio_id,
+ 'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code,
+ ]
+ );
+ if (hasData($check))
+ {
+ $this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+ }
+ }
+
+ $result = $this->BisioaufenthaltfoerderungModel->insert(
+ array(
+ 'bisio_id' => $bisio_id,
+ 'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+ )
+ );
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if($local_support)
+ {
+ return $data;
+ }
+
+ return $this->terminateWithSuccess(current($data));
+ }
+
+ public function deleteMobilitySupport($bisio_id)
+ {
+ $aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+ $this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+ $result = $this->BisioaufenthaltfoerderungModel->delete(
+ array(
+ 'bisio_id' => $bisio_id,
+ 'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+ )
+ );
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess(current($data));
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 426408863..19e568f33 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -11,9 +11,9 @@ class Notiz extends Notiz_Controller
parent::__construct([
'getUid' => ['admin:r', 'assistenz:r'],
'getNotizen' => ['admin:r', 'assistenz:r'],
- 'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+ 'loadNotiz' => ['admin:r', 'assistenz:r'], // TODO(manu): self::PERM_LOGGED
+ 'addNewNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
+ 'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
'deleteNotiz' => ['admin:r', 'assistenz:r'],
'loadDokumente' => ['admin:r', 'assistenz:r'],
'getMitarbeiter' => ['admin:r', 'assistenz:r']
diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index d0606a5bb..0b06b9667 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -10,19 +10,34 @@ class Prestudent extends FHCAPI_Controller
{
parent::__construct([
'get' => ['admin:r', 'assistenz:r'],
- 'updatePrestudent' => ['admin:w', 'assistenz:w'],
+ 'updatePrestudent' => ['admin:rw', 'assistenz:rw'],
'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
- 'getBezeichnungZGV' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getBezeichnungDZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getBezeichnungMZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getAusbildung' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getAufmerksamdurch' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getBerufstaetigkeit' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getTypenStg' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getStudiensemester' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getStudienplaene' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+ 'getBezeichnungZGV' => ['admin:r', 'assistenz:r'],
+ 'getBezeichnungDZgv' => ['admin:r', 'assistenz:r'],
+ 'getBezeichnungMZgv' => ['admin:r', 'assistenz:r'],
+ 'getAusbildung' => ['admin:r', 'assistenz:r'],
+ 'getAufmerksamdurch' => ['admin:r', 'assistenz:r'],
+ 'getBerufstaetigkeit' => ['admin:r', 'assistenz:r'],
+ 'getTypenStg' => ['admin:r', 'assistenz:r'],
+ 'getBisstandort' => ['admin:r', 'assistenz:r'],
+ 'getStudienplaene' => ['admin:r', 'assistenz:r'],
+ 'getStudiengang' => ['admin:r', 'assistenz:r']
]);
+ if ($this->router->method == 'updatePrestudent') {
+ $prestudent_id = current(array_slice($this->uri->rsegments, 2));
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+ } elseif ($this->router->method == 'get'
+ || $this->router->method == 'getStudienplaene'
+ || $this->router->method == 'getStudiengang'
+ ) {
+ $prestudent_id = current(array_slice($this->uri->rsegments, 2));
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+ } elseif ($this->router->method == 'getHistoryPrestudents') {
+ $person_id = current(array_slice($this->uri->rsegments, 2));
+ $this->checkPermissionsForPerson($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']);
+ }
+
// Load Libraries
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -52,30 +67,21 @@ class Prestudent extends FHCAPI_Controller
public function updatePrestudent($prestudent_id)
{
- $this->load->library('form_validation');
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $prestudent_id,
- ]);
- if(isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $result = current(getData($result));
-
- $stg = $result->studiengang_kz;
-
- if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
- }
+ // UDF
+ $this->load->library('UDFLib');
+
+ $result = $this->udflib->getCiValidations($this->PrestudentModel, $this->input->post());
+ $udf_field_validations = $this->getDataOrTerminateWithError($result);
//Form validation
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules($udf_field_validations);
+
$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
- 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
+ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung'])
]);
if ($this->form_validation->run() == false)
@@ -83,8 +89,6 @@ class Prestudent extends FHCAPI_Controller
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
- $deltaData = $_POST;
-
$uid = getAuthUID();
$array_allowed_props_prestudent = [
@@ -121,10 +125,18 @@ class Prestudent extends FHCAPI_Controller
'standort_code'
];
+ // add UDFs
+ $result = $this->udflib->getDefinitionForModel($this->PrestudentModel);
+
+ $definitions = $this->getDataOrTerminateWithError($result);
+
+ foreach ($definitions as $def)
+ $array_allowed_props_prestudent[] = $def['name'];
+
$update_prestudent = array();
foreach ($array_allowed_props_prestudent as $prop)
{
- $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
+ $val = $this->input->post($prop);
if ($val !== null || $prop == 'foerderrelevant') {
$update_prestudent[$prop] = $val;
}
@@ -133,28 +145,17 @@ class Prestudent extends FHCAPI_Controller
$update_prestudent['updateamum'] = date('c');
$update_prestudent['updatevon'] = $uid;
- //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
- function utf8_decode_if_string($value)
- {
- if (is_string($value)) {
- return utf8_decode($value);
- } else {
- return $value;
- }
- }
- $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
-
if (count($update_prestudent))
{
$result = $this->PrestudentModel->update(
$prestudent_id,
- $update_prestudent_encoded
+ $update_prestudent
);
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
+ $this->getDataOrTerminateWithError($result);
+
return $this->terminateWithSuccess(true);
}
+ return $this->terminateWithSuccess(false);
}
public function getHistoryPrestudents($person_id)
@@ -265,44 +266,46 @@ class Prestudent extends FHCAPI_Controller
return $this->terminateWithSuccess(getData($result) ?: []);
}
- public function getStudiensemester()
+ public function getBisstandort()
{
- $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+ $this->load->model('codex/Bisstandort_model', 'BisstandortModel');
- $this->StudiensemesterModel->addOrder('start', 'DESC');
- $this->StudiensemesterModel->addLimit(20);
-
- $result = $this->StudiensemesterModel->load();
+ $result = $this->BisstandortModel->load();
if (isError($result)) {
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
return $this->terminateWithSuccess(getData($result) ?: []);
}
- //TODO(manu) multi
public function getStudienplaene($prestudent_id)
+ {
+ $this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+ $result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * Gets details for the Studiengang of the Prestudent
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function getStudiengang($prestudent_id)
{
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->loadWhere(
- array('prestudent_id' => $prestudent_id)
- );
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
+ $this->PrestudentModel->addSelect('stg.*');
- $result = current(getData($result));
- $studiengang_kz = $result->studiengang_kz;
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
- $this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+ $result = $this->PrestudentModel->load($prestudent_id);
- $this->StudienplanModel->addOrder('studienplan_id', 'DESC');
+ $stg = $this->getDataOrTerminateWithError($result);
- $result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
-
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess(getData($result) ?: []);
+ $this->terminateWithSuccess(current($stg));
}
}
diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
new file mode 100644
index 000000000..e205c85b8
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -0,0 +1,577 @@
+.
+ */
+
+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 addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Pruefung extends FHCAPI_Controller
+{
+ public function __construct()
+ {
+ parent::__construct([
+ 'getPruefungen' => ['admin:r', 'assistenz:r'],
+ 'loadPruefung' => ['admin:r', 'assistenz:r'],
+ 'getTypenPruefungen' => ['admin:r', 'assistenz:r'],
+ 'getLehreinheiten' => ['admin:r', 'assistenz:r'],
+ 'getAllLehreinheiten' => ['admin:r', 'assistenz:r'],
+ 'getLvsByStudent' => ['admin:r', 'assistenz:r'],
+ 'getLvsandLesByStudent' => ['admin:r', 'assistenz:r'],
+ 'getLvsAndMas' => ['admin:r', 'assistenz:r'],
+ 'getMitarbeiterLv' => ['admin:r', 'assistenz:r'],
+ 'getNoten' => ['admin:r', 'assistenz:r'],
+ 'checkZeugnisnoteLv' => ['admin:r', 'assistenz:r'],
+ 'checkTermin1' => ['admin:r', 'assistenz:r'],
+ 'insertPruefung' => self::PERM_LOGGED,
+ 'updatePruefung' =>self::PERM_LOGGED,
+ 'deletePruefung' =>self::PERM_LOGGED,
+ ]);
+
+ //Load Models
+ $this->load->model('education/LePruefung_model', 'PruefungModel');
+
+ //version with postParameter
+ if ($this->router->method == 'insertPruefung')
+ {
+ $student_uid = $this->input->post('student_uid');
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$student_uid]);
+ $student = $this->getDataOrTerminateWithError($result);
+
+ $prestudent_id = current($student)->prestudent_id;
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:w', 'assistenz:w']);
+ }
+
+ // parameter from uri
+ if ($this->router->method == 'updatePruefung' || $this->router->method == 'deletePruefung')
+ {
+ $pruefung_id = current(array_slice($this->uri->rsegments, 2));
+
+ $result = $this->PruefungModel->load($pruefung_id);
+ $pruefung = $this->getDataOrTerminateWithError($result);
+ $student_uid = current($pruefung)->student_uid;
+
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$student_uid]);
+ $student = $this->getDataOrTerminateWithError($result);
+ $prestudent_id = current($student)->prestudent_id;
+
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+ }
+
+ if ($this->router->method == 'loadPruefung')
+ {
+ $pruefung_id = current(array_slice($this->uri->rsegments, 2));
+
+ $result = $this->PruefungModel->load($pruefung_id);
+ $pruefung = $this->getDataOrTerminateWithError($result);
+
+
+ $student_uid = current($pruefung)->student_uid;
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$student_uid]);
+ $student = $this->getDataOrTerminateWithError($result);
+ $prestudent_id = current($student)->prestudent_id;
+
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+ }
+
+ if ($this->router->method == 'getPruefungen')
+ {
+ $student_uid = current(array_slice($this->uri->rsegments, 2));
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $result = $this->StudentModel->load([$student_uid]);
+ $student = $this->getDataOrTerminateWithError($result);
+ $prestudent_id = current($student)->prestudent_id;
+
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+ }
+
+ // Load language phrases
+ $this->loadPhrases([
+ 'global', 'ui','lehre'
+ ]);
+ }
+
+ public function getPruefungen($student_uid, $studiensemester_kurzbz = null)
+ {
+ $result = $this->PruefungModel->getPruefungenByStudentuid($student_uid);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function loadPruefung($pruefung_id)
+ {
+ $this->PruefungModel->addSelect('tbl_pruefung.datum');
+ $this->PruefungModel->addSelect("TO_CHAR(tbl_pruefung.datum::timestamp, 'DD.MM.YYYY') AS format_datum");
+ $this->PruefungModel->addSelect('tbl_pruefung.anmerkung');
+ $this->PruefungModel->addSelect('tbl_pruefung.pruefungstyp_kurzbz');
+ $this->PruefungModel->addSelect('tbl_pruefung.pruefung_id');
+ $this->PruefungModel->addSelect('tbl_pruefung.lehreinheit_id');
+ $this->PruefungModel->addSelect('tbl_pruefung.student_uid');
+ $this->PruefungModel->addSelect('tbl_pruefung.mitarbeiter_uid');
+ $this->PruefungModel->addSelect('tbl_pruefung.punkte');
+ $this->PruefungModel->addSelect('tbl_pruefung.note');
+
+ $this->PruefungModel->addSelect('tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung');
+ $this->PruefungModel->addSelect('tbl_lehrveranstaltung.lehrveranstaltung_id');
+ $this->PruefungModel->addSelect('tbl_lehrveranstaltung.semester');
+ $this->PruefungModel->addSelect('tbl_lehrveranstaltung.lehrform_kurzbz');
+ $this->PruefungModel->addSelect('tbl_note.bezeichnung as note_bezeichnung');
+ $this->PruefungModel->addSelect('tbl_pruefungstyp.beschreibung as typ_beschreibung');
+ $this->PruefungModel->addSelect('tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz');
+
+ $this->PruefungModel->addJoin('lehre.tbl_lehreinheit', 'lehre.tbl_pruefung.lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id');
+ $this->PruefungModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+ $this->PruefungModel->addJoin('lehre.tbl_note', 'note');
+ $this->PruefungModel->addJoin('lehre.tbl_pruefungstyp', 'pruefungstyp_kurzbz');
+
+
+ $this->PruefungModel->addLimit(1);
+
+ $result = $this->PruefungModel->loadWhere(
+ array('pruefung_id' => $pruefung_id)
+ );
+ if (isError($result)) {
+ return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+
+ if (!hasData($result))
+ {
+ return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Pruefung_id']), self::ERROR_TYPE_GENERAL);
+ }
+ $this->terminateWithSuccess(current(getData($result)) ? : null);
+ }
+
+ /**
+ * Inserts a pruefung
+ *
+ * @param lehrveranstaltung_id, student_uid, lehreinheit_id
+ *
+ * @return values on success
+ * retval 0: pruefung inserted
+ * reval 1: pruefung and zeugnisnote inserted
+ * retval 2: pruefung inserted, no insert Zeugnisnote
+ * (change after date of examination)
+ * retval 3: pruefung of type Termin2 inserted
+ * and pruefung of type Termin1 as well
+ * retval 5: prueufungen Termin 2 and 1 inserted
+ * and no insert Zeugnisnote (change after date of examination)
+ */
+ public function insertPruefung()
+ {
+ $authUID = getAuthUID();
+
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
+ ]);
+ $this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+ ]);
+ $this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+ ]);
+ $this->form_validation->set_rules(
+ 'datum',
+ $this->p->t('global', 'datum'),
+ ['is_valid_date']
+ );
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ //calculate studiensemester_kurzbz this from lehreinheit (case newPruefung)
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ if (!$studiensemester_kurzbz)
+ {
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ $result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
+
+ $lehreinheit = $this->getDataOrTerminateWithError($result);
+ $studiensemester_kurzbz = current($lehreinheit)->studiensemester_kurzbz;
+
+ if (isError($result))
+ {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ }
+
+ $result = $this->PruefungModel->insert([
+ 'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+ 'datum' => $this->input->post('datum'),
+ 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+ 'note' => $this->input->post('note'),
+ 'anmerkung' => $this->input->post('anmerkung'),
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID,
+ ]);
+
+ $this->getDataOrTerminateWithError($result);
+
+ //check if existing zeugnisnote
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->ZeugnisnoteModel->loadWhere(array(
+ 'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz));
+
+ if (isError($result))
+ {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+
+ if (!hasData($result))
+ {
+ //insert zeugnisnote, if not existing
+ $result = $this->ZeugnisnoteModel->insert(array(
+ 'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'note' => $this->input->post('note'),
+ 'uebernahmedatum' => date('c'),
+ 'benotungsdatum' => $this->input->post('datum'),
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID
+ ));
+
+ if (isError($result))
+ {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ $this->terminateWithSuccess(1);
+ }
+
+ $return_code = 0;
+
+ //handling Termin1 if not existing
+ if($this->input->post('pruefungstyp_kurzbz') == "Termin2")
+ {
+ $resultP = $this->PruefungModel->loadWhere(array(
+ 'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'pruefungstyp_kurzbz' => 'Termin1'));
+
+ if (isError($resultP))
+ {
+ $this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
+ }
+ if(!hasData($resultP))
+ {
+ //check if existing Zeugnisnote
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+ $this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
+
+ $resultP = $this->ZeugnisnoteModel->loadWhere(array(
+ 'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+ 'student_uid' => $this->input->input->post('student_uid'),
+ 'lehre.tbl_zeugnisnote.studiensemester_kurzbz' => $studiensemester_kurzbz));
+ if (isError($resultP))
+ {
+ $this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
+ }
+ if (!hasData($resultP))
+ {
+ $this->terminateWithError("Zeugnisnote existiert nicht", self::ERROR_TYPE_GENERAL);
+ }
+ $dataNote = current(getData($resultP));
+
+ $resultN = $this->PruefungModel->insert([
+ 'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+ 'datum' => $dataNote->benotungsdatum,
+ 'pruefungstyp_kurzbz' => 'Termin1',
+ 'note' => $dataNote->note,
+ 'punkte' => $dataNote->punkte,
+ 'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID,
+ ]);
+
+ if (isError($resultN)) {
+ $this->terminateWithError(getError($resultN), self::ERROR_TYPE_GENERAL);
+ }
+ $return_code = 3;
+ }
+ }
+
+ $note = current(getData($result));
+ $uebernahmedatum = new DateTime($note->uebernahmedatum);
+ $benotungsdatum = new DateTime($note->benotungsdatum);
+
+ $checkDate = $uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
+ ? $benotungsdatum
+ : $uebernahmedatum;
+
+ if ($checkDate >= $this->input->post('datum') && $note !== $note->note)
+ {
+ $this->terminateWithSuccess($return_code + 2);
+ }
+ $this->terminateWithSuccess($return_code + 2);
+ }
+
+ /**
+ * Updates a pruefung
+ *
+ * @param pruefung_id
+ *
+ * @return success or error
+ *
+ * no impact on lehre.tbl_zeugnisnote
+ */
+ public function updatePruefung($pruefung_id)
+ {
+ $result = $this->PruefungModel->load($pruefung_id);
+
+ $oldpruefung = $this->getDataOrTerminateWithError($result);
+ if (!$oldpruefung)
+ show_404(); // Pruefung that should be updated does not exist
+
+ $authUID = getAuthUID();
+
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
+ ]);
+ $this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+ ]);
+ $this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+ ]);
+ $this->form_validation->set_rules(
+ 'datum',
+ $this->p->t('global', 'datum'),
+ ['is_valid_date']
+ );
+
+ if ($this->form_validation->run() == false)
+ {
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+ }
+
+ $result = $this->PruefungModel->update(
+ [
+ 'pruefung_id' => $pruefung_id
+ ],
+ [ 'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+ 'student_uid' => $this->input->post('student_uid'),
+ 'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+ 'note' => $this->input->post('note'),
+ 'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+ 'datum' => $this->input->post('datum'),
+ 'anmerkung' => $this->input->post('anmerkung'),
+ 'updatevon' => $authUID,
+ 'updateamum' => date('c'),
+ ]
+ );
+ $this->getDataOrTerminateWithError($result);
+
+ return $this->outputJsonSuccess(true);
+ }
+
+ /**
+ * Deletes a pruefung
+ *
+ * @param pruefung_id
+ *
+ * @return success or error
+ *
+ * no impact on lehre.tbl_zeugnisnote
+ */
+ public function deletePruefung($pruefung_id)
+ {
+ $result = $this->PruefungModel->load($pruefung_id);
+
+ $oldpruefung = $this->getDataOrTerminateWithError($result);
+ if (!$oldpruefung)
+ show_404(); // Pruefung that should be deleted does not exist
+
+ $result = $this->PruefungModel->delete(
+ [
+ 'pruefung_id' => $pruefung_id
+ ]
+ );
+
+ $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess(true);
+ }
+
+ public function getTypenPruefungen()
+ {
+ $this->load->model('education/Pruefungstyp_model', 'PruefungtypModel');
+
+ //TODO(Manu) sort Termin3
+ $this->PruefungtypModel->addOrder('sort', 'ASC');
+ $result = $this->PruefungtypModel->loadWhere(
+ array('abschluss' => 'false')
+ );
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ return $this->terminateWithSuccess(getData($result) ?: []);
+ }
+
+ public function getAllLehreinheiten()
+ {
+ $lv_id = $this->input->post('lv_id');
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ $result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ public function getLvsandLesByStudent($student_uid, $semester_kurzbz=null)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid, $semester_kurzbz);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $lv_ids = array();
+ $allData = array();
+
+ foreach ($data as $lehrveranstaltung) {
+ $lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
+ }
+
+ $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+ foreach ($lv_ids as $id)
+ {
+ $result = $this->LehreinheitModel->getLesFromLvIds($id, $semester_kurzbz);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ if (is_array($data)) {
+ $allData = array_merge($allData, $data);
+ }
+ }
+
+ return $this->terminateWithSuccess($allData);
+ }
+
+ public function getLvsAndMas($student_uid)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $lv_ids = array();
+ $allDataMa = array();
+
+ foreach ($data as $lehrveranstaltung)
+ {
+ $lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
+ }
+
+ $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+ foreach ($lv_ids as $id)
+ {
+ $resultMa = $this->MitarbeiterModel->getMitarbeiterFromLV($id);
+ $dataMa = $this->getDataOrTerminateWithError($resultMa);
+
+ if (is_array($dataMa))
+ {
+ $allDataMa = array_merge($allDataMa, $dataMa);
+ }
+ }
+ return $this->terminateWithSuccess($allDataMa);
+ }
+
+ public function getLvsByStudent($student_uid, $studiensemester_kurzbz = null)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid, $studiensemester_kurzbz);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+
+ public function getMitarbeiterLv($lv_id)
+ {
+ $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+ $result = $this->MitarbeiterModel->getMitarbeiterFromLV($lv_id);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+
+ public function getNoten()
+ {
+ $this->load->model('education/Note_model', 'NoteModel');
+
+ $this->NoteModel->addOrder('note', 'ASC');
+ $result = $this->NoteModel->load();
+
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ return $this->terminateWithSuccess(getData($result) ?: []);
+ }
+
+ public function checkZeugnisnoteLv()
+ {
+ $student_uid = $this->input->post('student_uid');
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ $lehrveranstaltung_id = $this->input->post('lehrveranstaltung_id');
+
+ $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+ $result = $this->ZeugnisnoteModel->loadWhere(array(
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id,
+ 'student_uid' => $student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz));
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($data);
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 24986429d..8167bd90f 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -2,6 +2,7 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
+use CI3_Events as Events;
use \DateTime as DateTime;
class Status extends FHCAPI_Controller
@@ -10,47 +11,102 @@ class Status extends FHCAPI_Controller
{
parent::__construct([
'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
- 'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
- 'getStatusgruende' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'getLastBismeldestichtag' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'isLastStatus' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'deleteStatus' => ['admin:r','assistenz:r'],
+ 'getMaxSemester' => ['admin:r', 'assistenz:r'],
+ 'changeStatus' => ['admin:rw', 'assistenz:rw'],
+ 'addStudent' => ['admin:rw', 'assistenz:rw'],
+ 'getStatusgruende' => self::PERM_LOGGED,
+ 'getLastBismeldestichtag' => self::PERM_LOGGED,
+ 'isLastStatus' => self::PERM_LOGGED,
+ 'getStatusarray' => self::PERM_LOGGED,
+ 'deleteStatus' => ['admin:rw','assistenz:rw'],
'loadStatus' => ['admin:r', 'assistenz:r'],
- 'updateStatus' => ['admin:r', 'assistenz:r'],
- 'advanceStatus' => ['admin:r', 'assistenz:r'],
- 'confirmStatus' => ['admin:r', 'assistenz:r']
+ 'insertStatus' => ['admin:rw', 'assistenz:rw'],
+ 'updateStatus' => ['admin:rw', 'assistenz:rw'],
+ 'advanceStatus' => ['admin:rw', 'assistenz:rw'],
+ 'confirmStatus' => ['admin:rw', 'assistenz:rw'],
+
]);
+ //Load Models
+ $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+
// Load Libraries
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ $this->load->library('PrestudentstatusCheckLib');
+
+ // Additional Permission Checks
+ if ($this->router->method == 'insertStatus'
+ || $this->router->method == 'updateStatus'
+ || $this->router->method == 'confirmStatus'
+ || $this->router->method == 'deleteStatus'
+ || $this->router->method == 'advanceStatus'
+ || $this->router->method == 'changeStatus'
+ || $this->router->method == 'addStudent'
+ ) {
+ $prestudent_id = current(array_slice($this->uri->rsegments, 2));
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+ }
// Load language phrases
$this->loadPhrases([
- 'ui', 'bismeldestichtag','lehre','studierendenantrag'
+ 'global', 'ui', 'bismeldestichtag','lehre','studierendenantrag'
]);
}
public function getHistoryPrestudent($prestudent_id)
{
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $result = $this->PrestudentstatusModel->getHistoryPrestudent($prestudent_id);
- $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
- if (isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * Gets the maximum possible semester for one or more Studiengaenge.
+ * If there are more than one Studiengang each maximum is calculated and
+ * the smallest result is returned.
+ *
+ * @return void
+ */
+ public function getMaxSemester()
+ {
+ $studiengang_kzs = $this->input->post('studiengang_kzs');
+
+ if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
+ 'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
}
- $this->terminateWithSuccess((getData($result) ?: []));
+
+
+ if (defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER == false)
+ $this->terminateWithSuccess(100);
+
+ $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+ $result = $this->LehrverbandModel->getMaxSemester($studiengang_kzs);
+
+ $maxsem = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($maxsem ? current($maxsem)->maxsem : 10);
}
public function getStatusgruende()
{
$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
- $result = $this->StatusgrundModel->load();
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess(getData($result) ?: []);
+ $result = $this->StatusgrundModel->getAktiveGruende();
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
public function getLastBismeldestichtag()
@@ -58,384 +114,541 @@ class Status extends FHCAPI_Controller
$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess($result);
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
}
public function isLastStatus($prestudent_id)
{
- //TODO(Manu) translate here
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+
+ $result = $this->getDataOrTerminateWithError($result);
+
+ return $this->terminateWithSuccess($result);
+ }
+
+ public function getStudiensemesterOfStatus($prestudent_id, $status)
+ {
+ $result = $this->PrestudentstatusModel->loadWhere([
+ "prestudent_id" => $prestudent_id,
+ "status_kurzbz" => $status
+ ]);
+ $this->PrestudentstatusModel->addLimit(1);
if (isError($result))
{
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
- if($result->retval == "1")
- {
- //return $this->outputJson($result->retval);
- return $this->terminateWithError("Die letzte Rolle kann nur durch den Administrator geloescht werden", self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess($result);
+ $studiensem = current(getData($result));
+
+ return $studiensem->studiensemester_kurzbz;
}
- public function addNewStatus($prestudent_id)
+ public function getStatusarray()
{
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $prestudent_id,
- ]);
+ $this->load->model('crm/Status_model', 'StatusModel');
+ $result = $this->StatusModel->getAllStatiWithStatusgruende();
+
if(isError($result))
{
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
- $result = current(getData($result));
- //Variablen für Statuscheck
- $stg = $result->studiengang_kz;
- $reihungstest_angetreten = $result->reihungstestangetreten;
- $name = trim($result->vorname . " ". $result->nachname);
- $zgv_code = $result->zgv_code;
+ $data = $this->getDataOrTerminateWithError($result);
- $isStudent = false;
+ $this->terminateWithSuccess($data);
+ }
- if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- $result = $this->p->t('lehre','error_keineSchreibrechte');
-
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
- $uid = getAuthUID();
- $status_kurzbz = $this->input->post('status_kurzbz');
- $ausbildungssemester = $this->input->post('ausbildungssemester');
- $datum = $this->input->post('datum');
- $bestaetigtam = $this->input->post('bestaetigtam');
- $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
- $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
- $anmerkung = $this->input->post('anmerkung');
- $statusgrund_id = $this->input->post('statusgrund_id');
- $rt_stufe = $this->input->post('rt_stufe');
- $bestaetigtvon = $uid;
+ /**
+ * Changes the status of a prestudent with full additional logic.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function changeStatus($prestudent_id)
+ {
+ $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
//GET lastStatus
$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- elseif(!hasData($result))
- {
- $lastStatusData = [];
- }
- else
- $lastStatusData = current(getData($result));
+ $lastStatusData = $this->getDataOrTerminateWithError($result);
+ $lastStatusData = current($lastStatusData);
- //Different handling depending on newStatus
- //Todo(manu) check later with multiactions
- /* if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
- {
- //$studiensemester = $semester_aktuell;
- $ausbildungssemester = $lastStatusData->ausbildungssemester;
- }*/
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+ $result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]);
+ $prestudent_person = $this->getDataOrTerminateWithError($result);
+ $prestudent_person = current($prestudent_person);
- /* if($status_kurzbz != 'Student')
- {
- $ausbildungssemester = $lastStatusData->ausbildungssemester;
- }*/
+ $studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
- //check if Rolle already exists
- $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
- $prestudent_id,
- $status_kurzbz,
- $studiensemester_kurzbz,
- $ausbildungssemester
- );
+ $status_kurzbz = $this->input->post('status_kurzbz');
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));*/
- }
- if($result->retval == '1')
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);*/
- return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
- //return $this->terminateWithError("test error_rolleBereitsVorhanden", self::ERROR_TYPE_GENERAL);
+ $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+ if ($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT
+ || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND
+ ) {
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
}
-
- //Check Reihungstest
- //TODO(manu) erst später für multiactions releveant
- if(REIHUNGSTEST_CHECK)
- {
- if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");*/
- return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', $name), self::ERROR_TYPE_GENERAL);
- }
+ $ausbildungssemester = $lastStatusData->ausbildungssemester;
+ if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) {
+ $ausbildungssemester = $this->input->post('ausbildungssemester');
}
- //Check ZGV
- //TODO(manu) erst später für multiactions releveant
- if(!defined("ZGV_CHECK") || ZGV_CHECK)
- {
- if($status_kurzbz=='Bewerber' && $zgv_code=='')
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");*/
- return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
+ $statusgrund_id = $this->input->post('statusgrund_id');
+ $datum_string = date('c');
+ $datum = new DateTime($datum_string);
- }
- }
+ //Form Validation
+ $this->load->library('form_validation');
- //Check ZGV-Master
- //TODO(manu) erst später für multiactions releveant
- $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
- $result = $this->StudiengangModel->load([
- 'studiengang_kz'=> $stg
- ]);
- if(isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- $result = current(getData($result));
- $typ = $result->typ;
-
- if(!defined("ZGV_CHECK") || ZGV_CHECK)
- {
- if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");*/
- return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
- }
- }
-
- //check if bewerberstatus exists
- if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
- {
- //TODO(manu) erst später für multiactions releveant
- //FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
-
- $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
- if (isError($result))
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));*/
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == "0")
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);*/
- return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', $name), self::ERROR_TYPE_GENERAL);
- }
- }
-
- //check if studentrolle already exists
- //TODO(manu) eigener Code für Diplomand?
- if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == "0")
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);*/
- return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval != "0")
- {
- $isStudent = true;
- }
- }
-
- $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
- if(!$isBerechtigtNoStudstatusCheck)
- {
- //Block STATUSCHECKS
- $new_status_datum = isset($datum) ? $datum : date('Y-m-d');
- $result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
- if (isError($result))
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));*/
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- $result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
- $prestudent_id,
- $status_kurzbz,
- $studiensemester_kurzbz,
- $new_status_datum,
- $ausbildungssemester
- );
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- //check if Bismeldestichtag erreicht
- $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
- $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == "1")
- {
- return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
- }
- }
-
-
- // Start DB transaction
- $this->db->trans_begin(); // Beginnen der Transaktion
-
- $result = $this->PrestudentstatusModel->insert(
+ $this->form_validation->set_rules(
+ 'status_kurzbz',
+ $this->p->t('global', 'status'),
[
- 'prestudent_id' => $prestudent_id,
- 'status_kurzbz' => $status_kurzbz,
- 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz,
- 'studienplan_id' => $lastStatusData->studienplan_id,
- 'ausbildungssemester' => $ausbildungssemester,
- 'anmerkung' => $anmerkung,
- 'statusgrund_id' => $statusgrund_id,
- 'insertvon' => $uid,
- 'insertamum' => date('c'),
- 'bestaetigtam' => $bestaetigtam,
- 'bestaetigtvon' => $bestaetigtvon,
- 'datum' => $datum,
- 'rt_stufe' => $rt_stufe
+ 'required',
+ //Check Reihungstest
+ ['reihungstest_check', function ($value) use ($prestudent_person) {
+ if (!REIHUNGSTEST_CHECK)
+ return true;
+ if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check ZGV
+ ['checkIfZGV', function ($value) use ($prestudent_person) {
+ if (defined("ZGV_CHECK") && !ZGV_CHECK)
+ return true;
+ if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check ZGV Master
+ ['checkIfZGVMaster', function ($value) use ($prestudent_person) {
+ if (defined("ZGV_CHECK") && !ZGV_CHECK)
+ return true;
+ if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check Bewerberstatus
+ ['checkIfExistingBewerberstatus', function ($value) use ($prestudent_id) {
+ if ($value != Prestudentstatus_model::STATUS_AUFGENOMMENER
+ && $value != Prestudentstatus_model::STATUS_WARTENDER
+ )
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check If Student
+ ['status_stud_exists', function ($value) use ($prestudent_id) {
+ if ($value != Prestudentstatus_model::STATUS_STUDENT
+ && $value != Prestudentstatus_model::STATUS_ABBRECHER
+ )
+ return true; // Only test if new status is Student
+
+ $result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ],
+ [
+ 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+ 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+ 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+ 'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+ 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
]
);
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+ $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+ else
+ $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+
+ $this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+
+ $this->form_validation->set_rules('_default', '', [
+ ['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+
+ $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }],
+ //Check if Rolle already exists
+ ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+ if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }],
+ ['history_timesequence', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_laststatus', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_unterbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_abbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_diplomant', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
+ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]),
+ 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+ 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+ 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+ 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+ 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ $this->load->library('PrestudentLib');
+
+ $this->db->trans_start();
+
+ switch($status_kurzbz){
+ case Prestudentstatus_model::STATUS_ABBRECHER:
+ $result = $this->prestudentlib->setAbbrecher(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ null,
+ $statusgrund_id,
+ $datum_string,
+ null,
+ null
+ );
+ break;
+ case Prestudentstatus_model::STATUS_UNTERBRECHER:
+ $result = $this->prestudentlib->setUnterbrecher(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ null,
+ null,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_STUDENT:
+ $result = $this->prestudentlib->setStudent(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_DIPLOMAND:
+ $result = $this->prestudentlib->setDiplomand(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_ABSOLVENT:
+ $result = $this->prestudentlib->setAbsolvent(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_BEWERBER:
+ $result = $this->prestudentlib->setBewerber(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_AUFGENOMMENER:
+ $result = $this->prestudentlib->setAufgenommener(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_ABGEWIESENER:
+ $result = $this->prestudentlib->setAbgewiesener(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ case Prestudentstatus_model::STATUS_WARTENDER:
+ $result = $this->prestudentlib->setWartender(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ break;
+ default:
+ $this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
}
+ $this->getDataOrTerminateWithError($result);
+ $this->db->trans_complete();
- if($isStudent)
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfUid($prestudent_id);
- if (isError($result)) {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $student_uid = $result->retval;
-
- //load student
- $result = $this->StudentModel->loadWhere(
- array(
- 'student_uid' => $student_uid
- )
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- $studentData = current(getData($result) ? : []);
- $verband = $studentData->verband == '' ? '' : $studentData->verband;
- $gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
- $studiengang_kz = $studentData->studiengang_kz;
-
- //Handle Abbrecher and Unterbrecher
- //TODO (manu) implement later with multiactions
- // not active yet: works only for "status ändern" in FAS
- if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
- {
- $ausbildungssemester = 0;
- $gruppe = '';
- $verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
- }
-
- //process studentlehrverband
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->processStudentlehrverband(
- $student_uid,
- $studiengang_kz,
- $ausbildungssemester,
- $verband,
- $gruppe,
- $studiensemester_kurzbz
- );
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);*/
- return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
- }
-
- //Student updaten (fuer Abbrecher und Unterbrecher)
- //not active yet: works only for "status ändern" in FAS
- //Todo(Manu) Later for multiactions
-
-
- if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
- {
- $result = $this->StudentModel->update(
- [
- 'student_uid' => $student_uid
- ],
- [
- 'studiengang_kz' => $studiengang_kz,
- 'semester' => $ausbildungssemester,
- 'verband' => $verband,
- 'gruppe' => $gruppe,
- 'updateamum' => date('c'),
- 'updatevon' => $uid
- ]);
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);
- }
- }
-
- }
-
- $this->db->trans_commit();
-
- //return $this->outputJsonSuccess($prestudent_id);
$this->terminateWithSuccess($prestudent_id);
}
- public function loadStatus()
+ public function addStudent($prestudent_id)
{
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+ // Prepare lastAufgenommener Status
+ $this->PrestudentstatusModel->addOrder('datum', 'DESC');
+ $this->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+ $this->PrestudentstatusModel->addLimit(1);
+ $result = $this->PrestudentstatusModel->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+ ]);
+ $lastAufgenommener = $this->getDataOrTerminateWithError($result);
- $prestudent_id = $this->input->post('prestudent_id');
- $status_kurzbz = $this->input->post('status_kurzbz');
- $ausbildungssemester = $this->input->post('ausbildungssemester');
- $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+ if ($lastAufgenommener)
+ $lastAufgenommener = current($lastAufgenommener);
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+ //get studentname for validations
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+ $result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]);
+ $prestudent_person = $this->getDataOrTerminateWithError($result);
+ $prestudent_person = current($prestudent_person);
+ $studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
+
+
+ //Form Validation
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+
+ $this->form_validation->set_rules('_default', '', [
+ //Check ZGV
+ ['checkIfZGV', function () use ($prestudent_person) {
+ if (defined("ZGV_CHECK") && !ZGV_CHECK)
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check ZGV Master
+ ['checkIfZGVMaster', function () use ($prestudent_person) {
+ if (defined("ZGV_CHECK") && !ZGV_CHECK)
+ return true;
+ $result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check Bewerberstatus
+ ['checkIfExistingBewerberstatus', function () use ($prestudent_id) {
+ $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check Aufgenommenerstatus
+ ['checkIfExistingAufgenommenerstatus', function () use ($lastAufgenommener) {
+ return !!$lastAufgenommener;
+ }],
+ //Check Bewerberstatus & Aufgenommenerstatus semester
+ ['checkIfLastBewerberAndAufgenommenerShareSemesters', function () use ($prestudent_id) {
+ $result = $this->prestudentstatuschecklib->checkIfLastBewerberAndAufgenommenerShareSemesters($prestudent_id);
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ //Check If FirstStudent
+ ['check_isFirstStudStatus', function () use ($prestudent_id) {
+ $result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }],
+ //Check if Rolle already exists
+ ['rolle_doesnt_exist', function () use ($prestudent_id, $lastAufgenommener) {
+ if (!$lastAufgenommener)
+ return true; // Error will be handled by the checkIfExistingAufgenommenerstatus statement above
+
+ $result = $this->PrestudentstatusModel->loadWhere([
+ 'studiensemester_kurzbz' => $lastAufgenommener->studiensemester_kurzbz,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+ 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+ 'checkIfExistingAufgenommenerstatus' => $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]),
+ 'checkIfLastBewerberAndAufgenommenerShareSemesters' => $this->p->t('lehre', 'error_lastBewerberAndAufgenommenerSemesters'),
+ 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+ 'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+ 'check_isFirstStudStatus' => $this->p->t('lehre', 'error_personBereitsStudent', ['name' => $studentName]),
+ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ // Start DB transaction
+ $this->db->trans_start();
+
+ $this->load->library('PrestudentLib');
+
+ $this->prestudentlib->setFirstStudent(
+ $prestudent_id,
+ $lastAufgenommener->studiensemester_kurzbz,
+ $lastAufgenommener->ausbildungssemester,
+ $lastAufgenommener->orgform_kurzbz,
+ $lastAufgenommener->studienplan_id,
+ $this->input->post('statusgrund_id')
+ );
+
+ $this->getDataOrTerminateWithError($result);
+
+ $this->db->trans_commit();
+
+ return $this->outputJsonSuccess(true);
+ }
+
+ public function loadStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
+ {
$result = $this->PrestudentstatusModel->loadWhere(
array(
'prestudent_id' => $prestudent_id,
@@ -451,7 +664,7 @@ class Status extends FHCAPI_Controller
elseif (!hasData($result))
{
- $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+ $this->terminateWithError($this->p->t('lehre', 'error_noStatusFound'), self::ERROR_TYPE_GENERAL);
}
else
{
@@ -459,145 +672,73 @@ class Status extends FHCAPI_Controller
}
}
- public function deleteStatus()
+ /**
+ * Delete a status entry
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param string $studiensemester_kurzbz
+ * @param integer $ausbildungssemester
+ *
+ * @return void
+ */
+ public function deleteStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
{
-
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $prestudent_id = $this->input->post('prestudent_id');
- $status_kurzbz = $this->input->post('status_kurzbz');
- $ausbildungssemester = $this->input->post('ausbildungssemester');
- $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
- $deletePrestudent = false;
-
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $prestudent_id,
+ $result = $this->PrestudentstatusModel->load([
+ $ausbildungssemester,
+ $studiensemester_kurzbz,
+ $status_kurzbz,
+ $prestudent_id
]);
- if(isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $result = current(getData($result));
+ $oldstatus = $this->getDataOrTerminateWithError($result);
+ if (!$oldstatus)
+ show_404(); // Status that should be updated does not exist
- $stg = $result->studiengang_kz;
+ $oldstatus = current($oldstatus);
- $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
- $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
- if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
- }
+ $erweiterteBerechtigung =
+ $this->permissionlib->isBerechtigt('admin', null, 'suid')
+ || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
- if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
- {
- return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL);
- }
//check if last status
$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
- //return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- if (isError($result))
- {
-/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result);*/
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == "1")
- {
- //Berechtigungen nach Check prüfen!
- if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
- {
- return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteLastStatus'), self::ERROR_TYPE_GENERAL);
- }
- else
- {
- $deletePrestudent = true;
- }
+ $result = $this->getDataOrTerminateWithError($result);
+
+ $deletePrestudent = $result;
+
+
+ //Berechtigungen nach Check prüfen!
+ if (!$erweiterteBerechtigung) {
+ if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+ $this->terminateWithError(
+ $this->p->t('lehre', 'error_onlyAdminDeleteRolleStudent'),
+ self::ERROR_TYPE_GENERAL,
+ REST_Controller::HTTP_FORBIDDEN
+ );
+
+ if ($deletePrestudent)
+ $this->terminateWithError(
+ $this->p->t('lehre', 'error_onlyAdminDeleteLastStatus'),
+ self::ERROR_TYPE_GENERAL,
+ REST_Controller::HTTP_FORBIDDEN
+ );
+
+ $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
+
+ if (!$this->getDataOrTerminateWithError($result))
+ $this->terminateWithError(
+ $this->p->t('lehre', 'error_dataVorMeldestichtag'),
+ self::ERROR_TYPE_GENERAL,
+ REST_Controller::HTTP_FORBIDDEN
+ );
}
// Start DB transaction
$this->db->trans_begin();
- //load rolle für LOG sqlundo
- $result = $this->PrestudentstatusModel->loadWhere(
- array(
- 'prestudent_id' => $prestudent_id,
- 'status_kurzbz' => $status_kurzbz,
- 'ausbildungssemester' => $ausbildungssemester,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz
- )
- );
-
- if (isError($result))
- {
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if (!hasData($result)) {
- return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
-
- }
-
- //Data of current Rolle
- $statusData = current(getData($result));
-
- $datum = $statusData->datum == '' ? 'null' : $statusData->datum;
- $insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
- $insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon;
- $updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum;
- $updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon;
- $ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id;
- $orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz;
- $bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam;
- $bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon;
- $anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung;
- $bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum;
- $studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id;
- $rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe;
- $statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id;
-
- $quotes_datum = $datum == "null" ? " " : "'";
- $quotes_insertamum = $insertamum == "null" ? " " : "'";
- $quotes_insertvon = $insertvon == "null" ? " " : "'";
- $quotes_updateamum = $updateamum == "null" ? " " : "'";
- $quotes_updatevon = $updatevon == "null" ? " " : "'";
- $quotes_ext_id = $ext_id == "null" ? " " : "'";
- $quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'";
- $quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'";
- $quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'";
- $quotes_anmerkung = $anmerkung == "null" ? " " : "'";
- $quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'";
- $quotes_studienplan_id = $studienplan_id == "null" ? " " : "'";
- $quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
- $quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
-
- $sqlundo =
- "
- INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester,
- datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon,
- anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id)
- VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
- . $quotes_datum . $datum . $quotes_datum . ","
- . $quotes_insertamum . $insertamum . $quotes_insertamum . ","
- . $quotes_insertvon . $insertvon . $quotes_insertvon . ","
- . $quotes_updateamum . $updateamum . $quotes_updateamum . ","
- . $quotes_updatevon . $updatevon . $quotes_updatevon . ","
- . $quotes_ext_id . $ext_id . $quotes_ext_id . ","
- . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
- . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
- . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
- . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
- . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
- . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
- . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
- . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
- ";
-
//Delete Status
$result = $this->PrestudentstatusModel->delete(
[
@@ -608,756 +749,998 @@ class Status extends FHCAPI_Controller
]
);
- if($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if(!hasData($result))
- {
- return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+ $this->getDataOrTerminateWithError($result);
- }
+ //Delete Studentlehrverband if no Status left in this semester
+ $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
- //save log delete prestudentstatus
- $uid = getAuthUID();
- $beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id;
- $sql = "DELETE FROM public.tbl_prestudentstatus
- WHERE prestudent_id = " . $prestudent_id . "
- AND status_kurzbz = '" . $status_kurzbz . "'
- AND ausbildungssemester ='" . $ausbildungssemester . "'
- AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'";
-
- $this->load->model('system/Log_model', 'LogModel');
- $result = $this->LogModel->insert([
- 'mitarbeiter_uid' => $uid,
- 'beschreibung' => $beschreibung,
- 'sql' => $sql,
- 'sqlundo' => $sqlundo
- ]);
- if (isError($result) || !hasData($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- $logId = $result->retval;
-
- //Delete Studentlehrverband if no Status left
- $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, true);
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if ($result->retval == "1")
+ $result = $this->getDataOrTerminateWithError($result);
+ if ($result)
{
//get student_uid
$this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfUid($prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if (!hasData($result))
- {
- return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
- }
- $student_uid = $result->retval;
-
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->delete(
- array(
- 'student_uid' => $student_uid,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz
- )
- );
- if ($this->db->trans_status() === false || isError($result) || !hasData($result))
- {
- $this->db->trans_rollback();
-
- return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL);
- }
-
- $this->terminateWithSuccess(true);
-
- }
- //Delete Prestudent if no data is left
-
- if($deletePrestudent && $isBerechtigtAdmin)
- {
- //TODO(manu) check all connected tables, Handling of Deletion
- //check if existing dokumentprestudent
- $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
- $result = $this->DokumentprestudentModel->loadWhere(
- array(
- 'prestudent_id' => $prestudent_id
- )
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
- }
- if (hasData($result))
- {
- return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL);
- }
-
- //check if Anrechnungen tbl_anrechnung
- $output_anrechnungen = '';
- $this->load->model('education/Anrechnung_model', 'AnrechnungModel');
- $result = $this->AnrechnungModel->loadWhere(
- array(
- 'prestudent_id' => $prestudent_id
- )
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if (hasData($result))
- {
- return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL);
- }
-
- //DELETE Prestudent
-
- //save log delete prestudent
- $uid = getAuthUID();
- $beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
- $sql = "DELETE FROM public.tbl_prestudent
- WHERE prestudent_id = " . $prestudent_id;
-
- //load prestudent für LOG sqlundo
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->loadWhere(
- array(
- 'prestudent_id' => $prestudent_id
- )
- );
- if (isError($result) || !hasData($result))
- {
- //TODO(Manu) in these case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- //Data of current Prestudent
- $prestudentData = current(getData($result));
-
- $aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz;
- $studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz;
- $berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code;
- $ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode;
- $zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code;
- $zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort;
- $zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum;
- $zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation;
- $zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt;
- $zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code;
- $zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort;
- $zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum;
- $zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation;
- $zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt;
- $aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel;
- $facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf;
- $anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest;
- $reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false';
- $reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id;
- $rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte;
- $rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1;
- $rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2;
- $rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3;
- $bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false';
- $person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id;
- $anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung;
- $mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor;
- $ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id;
- $dual = $prestudentData->dual == 1 ? 'true' : 'false';
- $ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat;
- $zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code;
- $zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort;
- $zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum;
- $zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation;
- $gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz;
- $aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz;
- $priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung;
- $zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt;
-
- $quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'";
- $quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'";
- $quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'";
- $quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'";
- $quotes_zgv_code = $zgv_code == "null" ? " " : "'";
- $quotes_zgvort = $zgvort == "null" ? " " : "'";
- $quotes_zgvdatum = $zgvdatum == "null" ? " " : "'";
- $quotes_zgvnation = $zgvnation == "null" ? " " : "'";
- $quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'";
- $quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'";
- $quotes_zgvmaort = $zgvmaort == "null" ? " " : "'";
- $quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'";
- $quotes_zgvmanation = $zgvmanation == "null" ? " " : "'";
- $quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'";
- $quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'";
- $quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'";
- $quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'";
- $quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'";
- $quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'";
- $quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'";
- $quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'";
- $quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'";
- $quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'";
- $quotes_bismelden = $bismelden == "null" ? " " : "'";
- $quotes_person_id = $person_id == "null" ? " " : "'";
- $quotes_anmerkung = $anmerkung == "null" ? " " : "'";
- $quotes_mentor = $mentor == "null" ? " " : "'";
- $quotes_ext_id = $ext_id == "null" ? " " : "'";
- $quotes_dual = $dual == "null" ? " " : "'";
- $quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'";
- $quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'";
- $quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'";
- $quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'";
- $quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'";
- $quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'";
- $quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'";
- $quotes_priorisierung = $priorisierung == "null" ? " " : "'";
- $quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'";
-
-
- $sqlundo =
- "
- INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
- zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
- aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
- rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
- dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
- gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt)
- VALUES('" . $prestudent_id . "',"
- . $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
- . $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
- . $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
- . $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . ","
- . $quotes_zgv_code . $zgv_code . $quotes_zgv_code . ","
- . $quotes_zgvort . $zgvort . $quotes_zgvort . ","
- . $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . ","
- . $quotes_zgvnation . $zgvnation . $quotes_zgvnation . ","
- . $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . ","
- . $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . ","
- . $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . ","
- . $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . ","
- . $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . ","
- . $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . ","
- . $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . ","
- . $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . ","
- . $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . ","
- . $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . ","
- . $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . ","
- . $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . ","
- . $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . ","
- . $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . ","
- . $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . ","
- . $quotes_bismelden . $bismelden . $quotes_bismelden . ","
- . $quotes_person_id . $person_id . $quotes_person_id . ","
- . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
- . $quotes_mentor . $mentor . $quotes_mentor . ","
- . $quotes_ext_id . $ext_id . $quotes_ext_id . ","
- . $quotes_dual . $dual . $quotes_dual . ","
- . $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . ","
- . $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . ","
- . $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . ","
- . $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . ","
- . $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . ","
- . $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . ","
- . $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
- . $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
- . $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
- ";
-
- $this->load->model('system/Log_model', 'LogModel');
- $result = $this->LogModel->insert([
- 'mitarbeiter_uid' => $uid,
- 'beschreibung' => $beschreibung,
- 'sql' => $sql,
- 'sqlundo' => $sqlundo
+ $result = $this->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
]);
- if (isError($result) || !hasData($result))
+
+ $student = $this->getDataOrTerminateWithError($result);
+ if ($student)
{
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ $student = current($student);
+ $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+ $result = $this->StudentlehrverbandModel->delete(
+ array(
+ 'student_uid' => $student->student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz
+ )
+ );
+
+ $this->getDataOrTerminateWithError($result);
}
-
- //$logId = $result->retval;
-
- //independent transaction
- $this->db->trans_start();
-
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->delete(
- array(
- 'prestudent_id' => $prestudent_id
- )
- );
- if ($this->db->trans_status() === false)
- {
- $this->db->trans_rollback();
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- $this->db->trans_commit();
- $this->terminateWithSuccess($result);
}
+
+ //Delete Prestudent if no data is left
+ if ($deletePrestudent)
+ {
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $result = $this->PrestudentModel->delete($prestudent_id);
+
+ $this->getDataOrTerminateWithError($result);
+ }
+
$this->db->trans_commit();
return $this->terminateWithSuccess(true);
}
- public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+ /**
+ * Inserts a status with less validations and extra logic for manual
+ * manipulation
+ *
+ * @param integer $prestudent_id
+ *
+ * @return void
+ */
+ public function insertStatus($prestudent_id)
{
- $isStudent = false;
- $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+ $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+ $isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $key_prestudent_id,
- ]);
- if(isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $result = current(getData($result));
- $stg = $result->studiengang_kz;
-
- if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
- }
-
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
- $uid = getAuthUID();
- $prestudent_id = $this->input->post('prestudent_id');
+ $authUID = getAuthUID();
$status_kurzbz = $this->input->post('status_kurzbz');
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
$ausbildungssemester = $this->input->post('ausbildungssemester');
$datum = $this->input->post('datum');
$bestaetigtam = $this->input->post('bestaetigtam');
+ $orgform_kurzbz = $this->input->post('orgform_kurzbz');
+ $anmerkung = $this->input->post('anmerkung');
$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
- $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
$studienplan_id = $this->input->post('studienplan_id');
- $anmerkung = $this->input->post('anmerkung');
- $statusgrund_id = $this->input->post('statusgrund_id');
$rt_stufe = $this->input->post('rt_stufe');
- $bestaetigtvon = $uid;
+ $statusgrund_id = $this->input->post('statusgrund_id');
- //check if Bismeldestichtag erreicht
- if(!$isBerechtigtNoStudstatusCheck)
- {
- // only check datum (without semester)
- $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
- /* $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/
- $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if ($result->retval == "1")
- {
- return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
- }
- }
- //check if Rolle already exists
- if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
- || ($key_ausbildungssemester != $ausbildungssemester))
- {
- $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
- $prestudent_id,
- $status_kurzbz,
- $studiensemester_kurzbz,
- $ausbildungssemester
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+
+ if (!$isBerechtigtBasisPrestudentstatus)
+ $this->form_validation->set_rules(
+ 'bewerbung_abgeschicktamum',
+ $this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+ 'is_null',
+ [
+ 'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+ ]
);
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- if($result->retval == '1')
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result->code);
- }
- }
- //check if studentrolle already exists
- if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == "0")
- {
- return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval != "0")
- {
- $isStudent = true;
- }
- }
+ $this->form_validation->set_rules(
+ 'datum',
+ $this->p->t('global', 'datum'),
+ [
+ 'required', // In FAS empty datum results in todays
+ 'is_valid_date',
+ ['is_date_not_before_today', function ($value) {
+ if (!is_valid_date($value))
+ return true; // Error will be handled by the is_valid_date statement above
+ $today = new DateTime('today');
+ return (new DateTime($value) >= $today);
+ }],
+ ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$value)
+ return true; // Error will be handled by the required statement above
+ $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
- if(!$isBerechtigtNoStudstatusCheck)
- {
- //Block STATUSCHECKS
+ return !$this->getDataOrTerminateWithError($result);
+ }]
+ ],
+ [
+ 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
+ 'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast')
+ ]
+ );
- $result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+ $this->form_validation->set_rules(
+ 'status_kurzbz',
+ $this->p->t('lehre', 'status_rolle'),
+ [
+ 'required',
+ ['status_stud_exists', function ($value) use ($prestudent_id) {
+ if ($value != Prestudentstatus_model::STATUS_STUDENT)
+ return true; // Only test if new status is Student
+
+ $result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
+
+ return $this->getDataOrTerminateWithError($result);
+ }]
+ ],
+ [
+ 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+ ]
+ );
+
+ $this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required');
+
+ $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required');
+
+ $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
+
+ // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
+ if (!$datum || !is_valid_date($datum))
+ $datum = null;
+
+ $this->form_validation->set_rules('_default', '', [
+ ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+ if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }],
+ ['history_timesequence', function () use (
+ $isBerechtigtNoStudstatusCheck,
$prestudent_id,
$status_kurzbz,
- $studiensemester_kurzbz,
$datum,
+ $studiensemester_kurzbz,
$ausbildungssemester
- );
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- }
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_laststatus', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_unterbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_abbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_diplomant', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+ return true; // Error will be handled by the required statements above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ '',
+ ''
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+ 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+ 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+ 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+ 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+ 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
// Start DB transaction
- $this->db->trans_begin();
+ $this->db->trans_start();
- //update status
- $result = $this->PrestudentstatusModel->update(
+ $this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID);
+
+ //insert status
+ $result = $this->PrestudentstatusModel->insert([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $status_kurzbz,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'datum' => $datum,
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID,
+ 'orgform_kurzbz' => $orgform_kurzbz,
+ 'bestaetigtam' => $bestaetigtam,
+ 'bestaetigtvon' => $bestaetigtam ? $authUID : null,
+ 'anmerkung' => $anmerkung,
+ 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+ 'studienplan_id' => $studienplan_id,
+ 'rt_stufe' => $rt_stufe,
+ 'statusgrund_id' => $statusgrund_id
+ ]);
+
+ $this->getDataOrTerminateWithError($result);
+
+ $this->db->trans_complete();
+
+ $this->terminateWithSuccess(true);
+ }
+
+ /**
+ * Updates a status entry
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param string $key_studiensemester_kurzbz
+ * @param integer $key_ausbildungssemester
+ *
+ * @return void
+ */
+ public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+ {
+ $result = $this->PrestudentstatusModel->load([
+ $key_ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $status_kurzbz,
+ $prestudent_id
+ ]);
+ $oldstatus = $this->getDataOrTerminateWithError($result);
+ if (!$oldstatus)
+ show_404(); // Status that should be updated does not exist
+
+ $oldstatus = current($oldstatus);
+
+
+ $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+ $isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
+
+
+ $authUID = getAuthUID();
+ $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz;
+ $ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester;
+ $datum = $this->input->post('datum') ?: $oldstatus->datum;
+
+
+ //Form Validation
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+ 'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+ ]);
+
+ if (!$isBerechtigtBasisPrestudentstatus)
+ $this->form_validation->set_rules(
+ 'bewerbung_abgeschicktamum',
+ $this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+ 'is_null',
+ [
+ 'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+ ]
+ );
+
+ $this->form_validation->set_rules(
+ 'datum',
+ $this->p->t('global', 'datum'),
[
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
- 'ausbildungssemester' => $key_ausbildungssemester,
+ 'is_valid_date',
+ ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$value)
+ return true; // Error will be handled by the required statement above
+
+ $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }]
],
[
- 'status_kurzbz' => $status_kurzbz,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz,
- 'ausbildungssemester' => $ausbildungssemester,
- 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
- 'studienplan_id' => $studienplan_id,
- 'anmerkung' => $anmerkung,
- 'statusgrund_id' => $statusgrund_id,
- 'updatevon' => $uid,
- 'updateamum' => date('c'),
- 'bestaetigtam' => $bestaetigtam,
- 'bestaetigtvon' => $bestaetigtvon,
- 'datum' => $datum,
- 'rt_stufe' => $rt_stufe
+ 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
]
);
- if (isError($result))
- {
- $this->db->trans_rollback();
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
+ $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
- if($isStudent)
- {
- //check Studentlehrverband
- $this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfUid($prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if (!hasData($result))
- {
- $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
- }
- $student_uid = $result->retval;
+ if (!is_valid_date($datum))
+ $datum = null;
- //process studentlehrverband
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->loadWhere(
- array(
- 'student_uid' => $student_uid,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz
- )
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- //Data of current Semester
- $studentlvbData = current(getData($result) ? : []);
-
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->processStudentlehrverband(
- $student_uid,
- $studentlvbData->studiengang_kz,
+ // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
+ $this->form_validation->set_rules('_default', '', [
+ //Check if Rolle already exists
+ ['new_rolle_doesnt_exist', function () use (
+ $prestudent_id,
+ $status_kurzbz,
+ $studiensemester_kurzbz,
$ausbildungssemester,
- $studentlvbData->verband,
- $studentlvbData->gruppe,
- $studiensemester_kurzbz
- );
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
- }
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($key_studiensemester_kurzbz == $studiensemester_kurzbz
+ && $key_ausbildungssemester == $ausbildungssemester
+ )
+ return true; // Primary key has not change we update in place
+
+ $result = $this->PrestudentstatusModel->load([
+ $ausbildungssemester,
+ $studiensemester_kurzbz,
+ $status_kurzbz,
+ $prestudent_id
+ ]);
+ return !$this->getDataOrTerminateWithError($result);
+ }],
+ ['history_timesequence', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$datum)
+ return true; // Error will be handled by the is_valid_date statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_laststatus', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$datum)
+ return true; // Error will be handled by the is_valid_date statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_unterbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$datum)
+ return true; // Error will be handled by the is_valid_date statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_abbrecher', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$datum)
+ return true; // Error will be handled by the is_valid_date statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }],
+ ['history_diplomant', function () use (
+ $isBerechtigtNoStudstatusCheck,
+ $prestudent_id,
+ $status_kurzbz,
+ $datum,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ ) {
+ if ($isBerechtigtNoStudstatusCheck)
+ return true; // Skip if access right says so
+ if (!$datum)
+ return true; // Error will be handled by the is_valid_date statement above
+
+ $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+ $prestudent_id,
+ $status_kurzbz,
+ new DateTime($datum),
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $key_ausbildungssemester
+ );
+
+ return $this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'new_rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+ 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+ 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+ 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+ 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+ 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ // Start DB transaction
+ $this->db->trans_start();
+
+ $this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID);
+
+ //update status
+ $updateData = [
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'datum' => $datum,
+ 'updateamum' => date('c'),
+ 'updatevon' => $authUID
+ ];
+ foreach ([
+ 'orgform_kurzbz',
+ 'anmerkung',
+ 'bewerbung_abgeschicktamum',
+ 'studienplan_id',
+ 'rt_stufe',
+ 'statusgrund_id'
+ ] as $key)
+ if ($this->input->post($key))
+ $updateData[$key] = $this->input->post($key);
+
+ if ($this->input->post('bestaetigtam')) {
+ $updateData['bestaetigtam'] = $this->input->post('bestaetigtam');
+ $updateData['bestaetigtvon'] = $authUID;
}
+
+ $result = $this->PrestudentstatusModel->update([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $status_kurzbz,
+ 'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+ 'ausbildungssemester' => $key_ausbildungssemester,
+ ], $updateData);
+
+ $this->getDataOrTerminateWithError($result);
+
$this->db->trans_commit();
+
return $this->outputJsonSuccess(true);
}
- public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+ /**
+ * Advances a status entry
+ * must be of type Student, Diplomand or Unterbrecher
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param string $key_studiensemester_kurzbz
+ * @param integer $key_ausbildungssemester
+ *
+ * @return void
+ */
+ public function advanceStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
{
- $isStudent = false;
-
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $key_prestudent_id,
+ $result = $this->PrestudentstatusModel->load([
+ $key_ausbildungssemester,
+ $key_studiensemester_kurzbz,
+ $status_kurzbz,
+ $prestudent_id
]);
- if(isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $result = current(getData($result));
+ $oldstatus = $this->getDataOrTerminateWithError($result);
+ if (!$oldstatus)
+ show_404(); // Status that should be updated does not exist
- $stg = $result->studiengang_kz;
+ $oldstatus = current($oldstatus);
- if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
- }
-
- //Data Vorrücken
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
- $result = $this->PrestudentstatusModel->loadWhere(
- array(
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'ausbildungssemester' => $key_ausbildungssemester,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz
- )
- );
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- elseif (!hasData($result))
- {
- return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
- }
- else
- {
- $statusData = current(getData($result));
- }
+ //Target studiensemester_kurzbz
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz);
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- $studiensem_next = current(getData($result));
- $studiensem_next = $studiensem_next->studiensemester_kurzbz;
+ $studiensemester_kurzbz = $this->getDataOrTerminateWithError($result);
+ $studiensemester_kurzbz = current($studiensemester_kurzbz)->studiensemester_kurzbz;
- $ausbildungssem_next = $key_ausbildungssemester+1;
- //check if Rolle already exists
- $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
- $key_prestudent_id,
- $key_status_kurzbz,
- $studiensem_next,
- $ausbildungssem_next
- );
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if($result->retval == '1')
- {
- return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
- }
+ //Target ausbildungssemester
+ $ausbildungssemester = $key_ausbildungssemester + 1;
+
+
+ //Form Validation
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_data([
+ 'status_kurzbz' => $status_kurzbz
+ ]);
+
+ $this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_rolle'), [
+ 'in_list[' .
+ Prestudentstatus_model::STATUS_STUDENT . ',' .
+ Prestudentstatus_model::STATUS_DIPLOMAND . ',' .
+ Prestudentstatus_model::STATUS_UNTERBRECHER . ']',
+ ['status_stud_exists', function ($value) use ($prestudent_id) {
+ if ($value != Prestudentstatus_model::STATUS_STUDENT)
+ return true;
+
+ $result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
+
+ return $this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+ ]);
+
+ $this->form_validation->set_rules('_default', '', [
+ //Check if Rolle already exists
+ ['rolle_doesnt_exist', function () use (
+ $prestudent_id,
+ $status_kurzbz,
+ $studiensemester_kurzbz,
+ $ausbildungssemester
+ ) {
+ $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+ return !$this->getDataOrTerminateWithError($result);
+ }]
+ ], [
+ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
- //check if studentrolle already exists
- if($key_status_kurzbz == 'Student')
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if ($result->retval == "0")
- {
- return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
- }
- }
// Start DB transaction
$this->db->trans_begin();
+ $authUID = getAuthUID();
+ $now = date('c');
+
//insert prestudentstatus
- $uid = getAuthUID();
- $result = $this->PrestudentstatusModel->insert(
- [
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'studiensemester_kurzbz' => $studiensem_next,
- 'ausbildungssemester' => $ausbildungssem_next,
- 'insertamum' => date('c'),
- 'insertvon' => $uid,
- 'bestaetigtam' => date('c'),
- 'bestaetigtvon' => $uid,
- 'studienplan_id' => $statusData->studienplan_id,
- 'datum' => date('c'),
- 'anmerkung' => $statusData->anmerkung
- ]
- );
+ $result = $this->PrestudentstatusModel->insert([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $status_kurzbz,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'datum' => $now,
+ 'insertamum' => $now,
+ 'insertvon' => $authUID,
+ 'orgform_kurzbz' => $oldstatus->orgform_kurzbz,
+ 'studienplan_id' => $oldstatus->studienplan_id,
+ 'bestaetigtam' => $now,
+ 'bestaetigtvon' => $authUID,
+ 'anmerkung' => $oldstatus->anmerkung
+ ]);
- if (isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
+ $this->getDataOrTerminateWithError($result);
+
+ //get student_uid
$this->load->model('crm/Student_model', 'StudentModel');
- $result = $this->StudentModel->checkIfUid($key_prestudent_id);
- if(isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- if (!hasData($result))
- {
- $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
- }
- $student_uid = $result->retval;
+ $result = $this->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ $student = $this->getDataOrTerminateWithError($result);
+
+ if (!$student)
+ $this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+ $student = current($student);
+
//process studentlehrverband
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->loadWhere(
- array(
- 'student_uid' => $student_uid,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz
- )
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
+ $result = $this->StudentlehrverbandModel->load([
+ $key_studiensemester_kurzbz,
+ $student->student_uid
+ ]);
+
+ $studentlvb = $this->getDataOrTerminateWithError($result);
+ if (!$studentlvb)
+ $this->terminateWithError($this->p->t('lehre', 'error_noStudentlehrverband'));
//Data of current Semester
- $result = getData($result) ? : [];
- $studentlvbData = current($result);
+ $studentlvb = current($studentlvb);
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->processStudentlehrverband(
- $student_uid,
- $studentlvbData->studiengang_kz,
- $ausbildungssem_next,
- $studentlvbData->verband,
- $studentlvbData->gruppe,
- $studiensem_next
- );
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
- }
+
+ $newStudentlvb = [
+ 'student_uid' => $studentlvb->student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'studiengang_kz' => $studentlvb->studiengang_kz,
+ 'semester' => $studentlvb->semester,
+ 'verband' => $studentlvb->verband,
+ 'gruppe' => $studentlvb->gruppe,
+ 'insertamum' => $now,
+ 'insertvon' => $authUID,
+ 'ext_id' => $studentlvb->ext_id
+
+ ];
+
+
+ $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+ $result = $this->LehrverbandModel->load([
+ $student->gruppe,
+ $student->verband,
+ $ausbildungssemester,
+ $student->studiengang_kz
+ ]);
+
+ $lv = $this->getDataOrTerminateWithError($result);
+ if ($lv) {
+ $newStudentlvb['semester'] = $ausbildungssemester;
+ } // If there is no lehrverband just use the same as in the previous studiensemester
+
+
+ //add studentlehrverband
+ $result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+
+ $this->getDataOrTerminateWithError($result);
$this->db->trans_commit();
return $this->outputJsonSuccess(true);
}
- public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+ /**
+ * Confirms a status entry
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param string $key_studiensemester_kurzbz
+ * @param integer $key_ausbildungssemester
+ *
+ * @return void
+ */
+ public function confirmStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
{
- $uid = getAuthUID();
-
- //get Studiengang von prestudent_id
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
- $result = $this->PrestudentModel->load([
- 'prestudent_id'=> $key_prestudent_id,
+ $result = $this->PrestudentstatusModel->load([
+ $ausbildungssemester,
+ $studiensemester_kurzbz,
+ $status_kurzbz,
+ $prestudent_id
]);
- if(isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $result = current(getData($result));
+ $oldstatus = $this->getDataOrTerminateWithError($result);
+ if (!$oldstatus)
+ show_404(); // Status that should be updated does not exist
- $stg = $result->studiengang_kz;
+ $oldstatus = current($oldstatus);
- if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
- {
- return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
- }
- $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+ $authUID = getAuthUID();
+ $now = date('c');
- $result = $this->PrestudentstatusModel->loadWhere(
- array(
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'ausbildungssemester' => $key_ausbildungssemester,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz
- )
+ //Form Validation
+ $this->load->library('form_validation');
+
+ $this->form_validation->set_rules('Status', '', [
+ ['status_not_yet_confirmed', function () use ($oldstatus) {
+ return !$oldstatus->bestaetigtam;
+ }],
+ ['bewerbung_abgeschickt', function () use ($oldstatus) {
+ return !!$oldstatus->bewerbung_abgeschicktamum;
+ }]
+ ], [
+ 'status_not_yet_confirmed' => $this->p->t('lehre', 'error_statusConfirmedYet'),
+ 'bewerbung_abgeschickt' => $this->p->t('lehre', 'error_bewerbungNochNichtAbgeschickt')
+ ]);
+
+ if (!$this->form_validation->run())
+ $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+ //update status
+ $result = $this->PrestudentstatusModel->update([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $status_kurzbz,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ ], [
+ 'bestaetigtam' => $now,
+ 'bestaetigtvon' => $authUID,
+ 'updateamum' => $now,
+ 'updatevon' => $authUID
+ ]);
+
+ $this->getDataOrTerminateWithError($result);
+
+
+ //Send Message
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ $this->PrestudentModel->addSelect('p.*');
+ $this->PrestudentModel->addSelect('stg.oe_kurzbz');
+ $this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
+ $this->PrestudentModel->addSelect('stg.email AS stg_email');
+ $this->PrestudentModel->addSelect('plan.orgform_kurzbz');
+ $this->PrestudentModel->addSelect('typ.bezeichnung AS typ_bezeichnung');
+
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+ $this->PrestudentModel->addJoin('public.tbl_studiengangstyp typ', 'typ');
+ $this->PrestudentModel->addJoin('public.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+ $result = $this->PrestudentModel->load($prestudent_id);
+
+ $studentdata = $this->getDataOrTerminateWithError($result);
+
+ $this->load->library('MessageLib');
+ $result = $this->messagelib->sendMessageUserTemplate(
+ $studentdata->person_id, // receiversPersonId
+ 'MailStatConfirm' . $status_kurzbz, // vorlage
+ [
+ 'anrede' => $studentdata->anrede,
+ 'vorname' => $studentdata->vorname,
+ 'nachname' => $studentdata->nachname,
+ 'typ' => $studentdata->typ_bezeichnung,
+ 'studiengang' => $studentdata->stg_bezeichnung,
+ 'orgform' => $studentdata->orgform_kurzbz ?: $oldstatus->orgform_kurzbz,
+ 'stgMail' => $studentdata->stg_email
+ ], // parseData
+ null, // orgform
+ 1, // TODO
+ $studentdata->oe_kurzbz, // senderOU
+ null, // relationmessage_id
+ MSG_PRIORITY_NORMAL, // priority
+ true // multiPartMime
);
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- elseif (!hasData($result))
- {
- return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
- }
+ $this->terminateWithSuccess(true);
+ }
- $statusData = current(getData($result));
+ /**
+ * Helper function for insertStatus and updateStatus.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param string $studiensemester_kurzbz
+ * @param integer $ausbildungssemester
+ * @param string $authUID
+ *
+ * @return void
+ */
+ private function updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID)
+ {
+ if (!in_array($status_kurzbz, [
+ Prestudentstatus_model::STATUS_STUDENT,
+ Prestudentstatus_model::STATUS_DIPLOMAND,
+ Prestudentstatus_model::STATUS_ABSOLVENT,
+ Prestudentstatus_model::STATUS_INCOMING,
+ Prestudentstatus_model::STATUS_ABBRECHER,
+ Prestudentstatus_model::STATUS_UNTERBRECHER
+ ]))
+ return; // No Update necessary
- //check if Status is unconfirmed..
- if($statusData->bestaetigtam != null)
- {
- //return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- return $this->terminateWithError($this->p->t('lehre','error_statusConfirmedYet'), self::ERROR_TYPE_GENERAL);
- }
+ $result = $this->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
- //check if Bewerbung abgeschickt
- if($statusData->bewerbung_abgeschicktamum == null)
- {
- return $this->terminateWithError($this->p->t('lehre','error_bewerbungNochNichtAbgeschickt'), self::ERROR_TYPE_GENERAL);
- }
+ $student = $this->getDataOrTerminateWithError($result);
- $result = $this->PrestudentstatusModel->update(
- [
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
- 'ausbildungssemester' => $key_ausbildungssemester,
- ],
- [
- 'prestudent_id' => $key_prestudent_id,
- 'status_kurzbz' => $key_status_kurzbz,
- 'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
- 'ausbildungssemester' => $key_ausbildungssemester,
- 'bestaetigtam' => date('c'),
- 'bestaetigtvon' => $uid,
+ if (!$student)
+ return; // No Update necessary
+
+ $student = current($student);
+
+ $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+ $result = $this->StudentlehrverbandModel->loadWhere([
+ 'student_uid' => $student->student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz
+ ]);
+
+ $studentlvb = $this->getDataOrTerminateWithError($result);
+
+
+ $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+ $this->LehrverbandModel->addLimit(1);
+ $result = $this->LehrverbandModel->load([
+ $student->gruppe,
+ $student->verband,
+ $ausbildungssemester,
+ $student->studiengang_kz
+ ]);
+ $lv = $this->getDataOrTerminateWithError($result);
+
+
+ if ($studentlvb && !$lv)
+ return; // No Update necessary
+
+ if ($studentlvb) // Update current Student-Lehrverband entry
+ $this->StudentlehrverbandModel->update([
+ 'student_uid' => $student->student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz
+ ], [
+ 'studiengang_kz' => $student->studiengang_kz,
+ 'semester' => $ausbildungssemester,
+ 'verband' => $student->verband,
+ 'gruppe' => $student->gruppe,
'updateamum' => date('c'),
- 'updatevon' => $uid
- ]
- );
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->outputJsonSuccess(true);
+ 'updatevon' => $authUID
+ ]);
+ else // Add new Student-Lehrverband entry
+ $this->StudentlehrverbandModel->insert([
+ 'student_uid' => $student->student_uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'studiengang_kz' => $student->studiengang_kz,
+ 'semester' => $lv ? $ausbildungssemester : $student->semester,
+ 'verband' => $student->verband,
+ 'gruppe' => $student->gruppe,
+ 'insertamum' => date('c'),
+ 'insertvon' => $authUID
+ ]);
+ }
+
+ /**
+ * Helper function for sanitizing Alias Name
+ * replaces empty spaces with underlines
+ *
+ * @param string $str
+ *
+ * @return string
+ */
+ private function _sanitizeAliasName($str)
+ {
+ $str = sanitizeProblemChars($str);
+ return mb_strtolower(str_replace(' ', '_', $str));
}
}
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 31fc7075c..f24ef62bb 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -33,20 +33,29 @@ class Student extends FHCAPI_Controller
*/
public function __construct()
{
- // TODO(chris): permissions
parent::__construct([
'get' => ['admin:r', 'assistenz:r'],
- 'save' => ['admin:w', 'assistenz:w'],
- 'check' => ['admin:w', 'assistenz:w'],
- 'add' => ['admin:w', 'assistenz:w']
+ 'save' => ['admin:rw', 'assistenz:rw'],
+ 'check' => ['admin:rw', 'assistenz:rw'],
+ 'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
]);
// Load Libraries
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ if ($this->router->method == 'get'
+ || $this->router->method == 'save'
+ ) {
+ $prestudent_id = current(array_slice($this->uri->rsegments, 2));
+ if ($this->router->method == 'get')
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+ else
+ $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+ }
+
// Load language phrases
$this->loadPhrases([
- 'ui'
+ 'ui', 'lehre'
]);
}
@@ -133,9 +142,10 @@ class Student extends FHCAPI_Controller
$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
- $fieldValidations = $this->getDataOrTerminateWithError($result);
+ //TODO(Manu) check with Chris: input number not allowed
+ $udf_field_validations = $this->getDataOrTerminateWithError($result);
- $this->form_validation->set_rules($fieldvalidations);
+ $this->form_validation->set_rules($udf_field_validations);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -146,6 +156,8 @@ class Student extends FHCAPI_Controller
$uid = $student ? current($student)->student_uid : null;
+ $studiengang_kz = $student ? current($student)->studiengang_kz : null;
+
$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
$person = $this->getDataOrTerminateWithError($result);
@@ -213,20 +225,35 @@ class Student extends FHCAPI_Controller
// Check PKs
if (count($update_lehrverband) + count($update_student) && $uid === null) {
- // TODO(chris): phrase
- $this->terminateWithValidationErrors(['' => "Kein/e StudentIn vorhanden!"]);
+ $this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_student')]);
}
if (count($update_person) && $person_id === null) {
- // TODO(chris): phrase
- $this->terminateWithValidationErrors(['' => "Keine Person vorhanden!"]);
+ $this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_person')]);
}
// Do Updates
if (count($update_lehrverband)) {
- $result = $this->StudentlehrverbandModel->update([
+ $curstudlvb = $this->StudentlehrverbandModel->load([
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'student_uid' => $uid
- ], $update_lehrverband);
+ ]);
+
+ if(hasData($curstudlvb) && count(getData($curstudlvb)) > 0 )
+ {
+ $result = $this->StudentlehrverbandModel->update([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $uid
+ ], $update_lehrverband);
+ }
+ else
+ {
+ $result = $this->StudentlehrverbandModel->insert(array_merge([
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'student_uid' => $uid,
+ 'studiengang_kz' => $studiengang_kz
+ ], $update_lehrverband));
+ }
+
$this->getDataOrTerminateWithError($result);
}
@@ -258,9 +285,7 @@ class Student extends FHCAPI_Controller
{
$this->load->library('form_validation');
- $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
- 'isValidDate' => $this->p->t('ui', 'error_invalid_date')
- ]);
+ $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
new file mode 100644
index 000000000..5fb7b592c
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -0,0 +1,743 @@
+.
+ */
+
+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 listing students
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Students extends FHCAPI_Controller
+{
+ private $allowedStgs = [];
+
+
+ public function __construct()
+ {
+ $permissions = [];
+ $router = load_class('Router');
+ $permissions[$router->method] = ['admin:r', 'assistenz:r'];
+ parent::__construct($permissions);
+
+ $this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+ $this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+ if (!$this->allowedStgs) {
+ $this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
+ exit;
+ }
+
+ // Load Libraries
+ $this->load->library('VariableLib', ['uid' => getAuthUID()]);
+ }
+
+ /**
+ * Remap calls:
+ * / => return []
+ * /inout => return []
+ * /inout/incoming => getIncoming
+ * /inout/outgoing => getOutgoing
+ * /inout/gemeinsamestudien => getGemeinsamestudien
+ * /(studiengang_kz) => getStudents
+ * /(studiengang_kz)/prestudent => getPrestudents
+ * /(studiengang_kz)/prestudent/* => getPrestudents
+ * /(studiengang_kz)/(semester) => getStudents
+ * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz) => getStudents
+ * /(studiengang_kz)/(semester)/(verband) => getStudents
+ * /(studiengang_kz)/(semester)/(verband)/(gruppe) => getStudents
+ * /(studiengang_kz)/(org_form) => getStudents
+ * /(studiengang_kz)/(org_form)/prestudent => getPrestudents
+ * /(studiengang_kz)/(org_form)/prestudent/* => getPrestudents
+ * /(studiengang_kz)/(org_form)/(semester) => getStudents
+ * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
+ * => getStudents
+ * /(studiengang_kz)/(org_form)/(semester)/(verband) => getStudents
+ * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
+ * => getStudents
+ * /uid/(student_uid) => getStudent
+ * /prestudent/(prestudent_id) => getPrestudent
+ * /person/(person_id) => getPerson
+ *
+ * @param string $method
+ * @param array $params (optional)
+ *
+ * @return void
+ */
+ public function _remap($method, $params = [])
+ {
+ if ($method == '' || $method == 'index')
+ return $this->terminateWithSuccess([]);
+
+ if ($method == 'inout') {
+ if (!count($params))
+ return $this->terminateWithSuccess([]);
+ switch ($params[0]) {
+ case 'incoming':
+ return $this->getIncoming();
+ case 'outgoing':
+ return $this->getOutgoing();
+ case 'gemeinsamestudien':
+ return $this->getGemeinsamestudien();
+ default:
+ return show_404();
+ }
+ }
+
+ $count = count($params);
+ if (!$count)
+ return $this->getStudents($method);
+
+ if ($method == 'uid' && $count == 1)
+ return $this->getStudent($params[0]);
+
+ if ($method == 'prestudent' && $count == 1)
+ return $this->getPrestudent($params[0]);
+
+ if ($method == 'person' && $count == 1)
+ return $this->getPerson($params[0]);
+
+ if (is_numeric($params[0])) {
+ $sem = $params[0];
+ if ($count == 3 && $params[1] == 'grp') {
+ $g = $params[2];
+ $ver = null;
+ $grp = null;
+ } else {
+ $g = null;
+ $ver = $count > 1 ? $params[1] : null;
+ $grp = $count > 2 ? $params[2] : null;
+ }
+ return $this->getStudents($method, $sem, $ver, $grp, $g);
+ } elseif ($params[0] == 'prestudent') {
+ if ($count == 1)
+ return $this->getPrestudents($method);
+ if ($count == 2)
+ return $this->getPrestudents($method, $params[1]);
+ return $this->getPrestudents($method, $params[1], $params[$count-1]);
+ } else {
+ $org = $params[0];
+ if ($count > 1 && $params[1] == 'prestudent') {
+ if ($count == 2)
+ return $this->getPrestudents($method, null, null, $org);
+ if ($count == 3)
+ return $this->getPrestudents($method, $params[2], null, $org);
+ return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
+ }
+ $sem = $count > 1 ? $params[1] : null;
+ if ($count == 4 && $params[2] == 'grp') {
+ $g = $params[3];
+ $ver = null;
+ $grp = null;
+ } else {
+ $g = null;
+ $ver = $count > 2 ? $params[2] : null;
+ $grp = $count > 3 ? $params[3] : null;
+ }
+
+ return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
+ }
+
+ show_404();
+ }
+
+ /**
+ * @return void
+ */
+ protected function getIncoming()
+ {
+ // TODO(chris): IMPLEMENT!
+ $this->terminateWithSuccess([]);
+ }
+
+ /**
+ * @return void
+ */
+ protected function getOutgoing()
+ {
+ // TODO(chris): IMPLEMENT!
+ $this->terminateWithSuccess([]);
+ }
+
+ /**
+ * @return void
+ */
+ protected function getGemeinsamestudien()
+ {
+ // TODO(chris): IMPLEMENT!
+ $this->terminateWithSuccess([]);
+ }
+
+ /**
+ * @param integer $studiengang_kz
+ * @param string $studiensemester_kurzbz (optional)
+ * @param string $filter (optional)
+ * @param string $orgform_kurzbz (optional)
+ *
+ * @return void
+ */
+ protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+ {
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ $stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+ $selectRT = "
+ SELECT 1
+ FROM public.tbl_rt_person
+ JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id)
+ WHERE person_id=p.person_id
+ AND studienplan_id IN (
+ SELECT studienplan_id
+ FROM lehre.tbl_studienplan
+ JOIN lehre.tbl_studienordnung o USING(studienordnung_id)
+ WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz
+ )
+ AND r.studiensemester_kurzbz=" . $stdsemEsc;
+
+
+ $where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
+
+ if ($orgform_kurzbz) {
+ $where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+ }
+
+ switch ($filter) {
+ case "interessenten":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ break;
+ case "bewerbungnichtabgeschickt":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $where['bewerbung_abgeschicktamum'] = null;
+ break;
+ case "bewerbungabgeschickt":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
+ $where['bestaetigtam'] = null;
+ break;
+ case "statusbestaetigt":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $where['bestaetigtam IS NOT NULL'] = null;
+ break;
+ case "statusbestaetigtrtnichtangemeldet":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $where['bestaetigtam IS NOT NULL'] = null;
+ $this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "statusbestaetigtrtangemeldet":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $where['bestaetigtam IS NOT NULL'] = null;
+ $this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "zgv":
+ $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+ $result = $this->StudiengangModel->load($studiengang_kz);
+
+ $stg = $this->getDataOrTerminateWithError($result);
+ if (!$stg)
+ $this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
+ $stg = current($stg);
+
+ $where['ps.status_kurzbz'] = 'Interessent';
+
+ if ($stg->typ == 'm') {
+ $where['zgvmas_code IS NOT NULL'] = null;
+ if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+ $where['zgvmas_erfuellt'] = true;
+ } elseif ($stg->typ == 'p') {
+ $where['zgvdoktor_code IS NOT NULL'] = null;
+ if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+ $where['zgvdoktor_erfuellt'] = true;
+ } else {
+ $where['zgv_code IS NOT NULL'] = null;
+ if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+ $where['zgv_erfuellt'] = true;
+ }
+ break;
+ case "reihungstestangemeldet":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "reihungstestnichtangemeldet":
+ $where['ps.status_kurzbz'] = 'Interessent';
+ $this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "bewerber":
+ $where['ps.status_kurzbz'] = 'Bewerber';
+ break;
+ case "bewerberrtnichtangemeldet":
+ $where['ps.status_kurzbz'] = 'Bewerber';
+ $this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "bewerberrtangemeldet":
+ $where['ps.status_kurzbz'] = 'Bewerber';
+ $this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+ break;
+ case "bewerberrtangemeldetteilgenommen":
+ $where['ps.status_kurzbz'] = 'Bewerber';
+ $this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+ $where['reihungstestangetreten'] = true;
+ break;
+ case "bewerberrtangemeldetnichtteilgenommen":
+ $where['ps.status_kurzbz'] = 'Bewerber';
+ $this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+ $where['reihungstestangetreten'] = false;
+ break;
+ case "aufgenommen":
+ $where['ps.status_kurzbz'] = 'Aufgenommener';
+ break;
+ case "warteliste":
+ $where['ps.status_kurzbz'] = 'Wartender';
+ break;
+ case "absage":
+ $where['ps.status_kurzbz'] = 'Abgewiesener';
+ break;
+ case "incoming":
+ // NOTE(chris): in FAS it was not filtered for studiengang_kz
+ $where['ps.status_kurzbz'] = 'Incoming';
+ break;
+ case "absolvent":
+ $where['ps.status_kurzbz'] = 'Absolvent';
+ break;
+ case "diplomand":
+ $where['ps.status_kurzbz'] = 'Diplomand';
+ break;
+ default:
+ if (!$studiensemester_kurzbz) {
+ // TODO(chris): this does not work with $orgform_kurzbz != null
+ $where['ps.status_kurzbz'] = null;
+ } else {
+ $this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+ 'Interessent',
+ 'Bewerber',
+ 'Aufgenommener',
+ 'Wartender',
+ 'Abgewiesener'
+ ]);
+ }
+ break;
+ }
+
+ /*
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->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
+ AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL)
+ AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+ $this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+ ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
+ AND ps.prestudent_id=tbl_prestudent.prestudent_id
+ AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
+ AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');*/
+ $this->prepareQuery($studiensemester_kurzbz);
+
+ $this->PrestudentModel->addSelect("
+ CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent')
+ THEN ps.ausbildungssemester::text
+ ELSE ''::text END AS semester", false);
+ $this->PrestudentModel->addSelect("'' AS verband");
+ $this->PrestudentModel->addSelect("'' AS gruppe");
+ $this->addSelectPrioRel();
+
+ $this->addFilter($studiensemester_kurzbz);
+
+ $result = $this->PrestudentModel->loadWhere($where);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * @param integer $studiengang_kz
+ * @param integer $semester (optional)
+ * @param string $verband (optional)
+ * @param integer $gruppe (optional)
+ * @param string $gruppe_kurzbz (optional)
+ * @param string $orgform_kurzbz (optional)
+ *
+ * @return void
+ */
+ protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+ {
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ /*
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+ $this->PrestudentModel->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
+ AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL)
+ AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+ $this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+ $this->PrestudentModel->addJoin(
+ 'public.tbl_studentlehrverband v',
+ 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+ );*/
+ $this->prepareQuery($studiensemester_kurzbz, '');
+
+ $this->PrestudentModel->addSelect('v.semester');
+ $this->PrestudentModel->addSelect('v.verband');
+ $this->PrestudentModel->addSelect('v.gruppe');
+ $this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+
+
+ $where = [];
+
+ if ($gruppe_kurzbz !== null) {
+ $this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+ $where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+ $where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+ } else {
+ $where['v.studiengang_kz'] = $studiengang_kz;
+
+ if ($semester !== null)
+ $where['v.semester'] = $semester;
+
+ if ($verband !== null)
+ $where['v.verband'] = $verband;
+
+ if ($gruppe !== null)
+ $where['v.gruppe'] = $gruppe;
+
+ if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
+ $this->PrestudentModel->db->where(
+ "(
+ SELECT orgform_kurzbz
+ FROM public.tbl_prestudentstatus
+ WHERE prestudent_id=tbl_prestudent.prestudent_id
+ AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+ ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+ ) =",
+ $this->PrestudentModel->escape($orgform_kurzbz),
+ false
+ );
+ }
+
+ }
+
+ $this->addFilter($studiensemester_kurzbz);
+
+ $result = $this->PrestudentModel->loadWhere($where);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * @param string $prestudent_id
+ *
+ * @return void
+ */
+ protected function getPrestudent($prestudent_id)
+ {
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ /*
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+ $this->PrestudentModel->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
+ AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL)
+ AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+ $this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+ $this->PrestudentModel->addJoin(
+ 'public.tbl_studentlehrverband v',
+ 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+ 'LEFT'
+ );*/
+ $this->prepareQuery($studiensemester_kurzbz);
+
+ $this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+ $this->PrestudentModel->addSelect('v.verband');
+ $this->PrestudentModel->addSelect('v.gruppe');
+ $this->addSelectPrioRel();
+
+ $this->addFilter($studiensemester_kurzbz);
+
+ $result = $this->PrestudentModel->loadWhere([
+ 'tbl_prestudent.prestudent_id' => $prestudent_id
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * @param string $student_uid
+ *
+ * @return void
+ */
+ protected function getStudent($student_uid)
+ {
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ /*
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+ $this->PrestudentModel->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
+ AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL)
+ AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+ $this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+ $this->PrestudentModel->addJoin(
+ 'public.tbl_studentlehrverband v',
+ 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+ 'LEFT'
+ );*/
+ $this->prepareQuery($studiensemester_kurzbz);
+
+ $this->PrestudentModel->addSelect('v.semester');
+ $this->PrestudentModel->addSelect('v.verband');
+ $this->PrestudentModel->addSelect('v.gruppe');
+ $this->addSelectPrioRel();
+
+ $this->addFilter($studiensemester_kurzbz);
+
+ $result = $this->PrestudentModel->loadWhere([
+ 's.student_uid' => $student_uid
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * @param integer $person_id
+ *
+ * @return void
+ */
+ protected function getPerson($person_id)
+ {
+ $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+ /*
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+ $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+ $this->PrestudentModel->addJoin(
+ 'public.tbl_studentlehrverband v',
+ 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+ 'LEFT'
+ );*/
+ $this->prepareQuery($studiensemester_kurzbz);
+
+ $this->PrestudentModel->addSelect('v.semester');
+ $this->PrestudentModel->addSelect('v.verband');
+ $this->PrestudentModel->addSelect('v.gruppe');
+ $this->addSelectPrioRel();
+
+ $this->addFilter($studiensemester_kurzbz);
+
+ $result = $this->PrestudentModel->loadWhere([
+ 'p.person_id' => $person_id
+ ]);
+
+ $data = $this->getDataOrTerminateWithError($result);
+
+ $this->terminateWithSuccess($data);
+ }
+
+ /**
+ * @param string|null $studiensemester_kurzbz
+ * @param string $type
+ *
+ * @return void
+ */
+ protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+ {
+ $stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+ $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+ $this->PrestudentModel->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
+ AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL)
+ AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+ $this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+ $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+ $this->PrestudentModel->addJoin(
+ 'public.tbl_studentlehrverband v',
+ 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+ $type
+ );
+ $this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+ ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
+ AND ps.prestudent_id=tbl_prestudent.prestudent_id
+ AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
+ AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+
+ $this->PrestudentModel->addSelect("b.uid");
+ $this->PrestudentModel->addSelect('titelpre');
+ $this->PrestudentModel->addSelect('nachname');
+ $this->PrestudentModel->addSelect('vorname');
+ $this->PrestudentModel->addSelect('wahlname');
+ $this->PrestudentModel->addSelect('vornamen');
+ $this->PrestudentModel->addSelect('titelpost');
+ $this->PrestudentModel->addSelect('svnr');
+ $this->PrestudentModel->addSelect('ersatzkennzeichen');
+ $this->PrestudentModel->addSelect('gebdatum');
+ $this->PrestudentModel->addSelect('geschlecht');
+
+ // semester
+ // verband
+ // gruppe
+
+ $this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+ $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+ $this->PrestudentModel->addSelect("s.matrikelnr");
+ $this->PrestudentModel->addSelect('p.person_id');
+ $this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+ $this->PrestudentModel->addSelect('pls.datum AS status_datum');
+ $this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+ $this->PrestudentModel->addSelect(
+ "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+ false
+ );
+ $this->PrestudentModel->addSelect("
+ CASE WHEN b.uid IS NOT NULL AND b.uid<>''
+ THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . "
+ ELSE '' END AS mail_intern", false);
+ $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+ $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+ $this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+ $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+ $this->PrestudentModel->addSelect(
+ "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+ false
+ );
+ $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+ $this->PrestudentModel->addSelect('tbl_prestudent.dual');
+ $this->PrestudentModel->addSelect('p.matr_nr');
+ $this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+ $this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+ // priorisierung_relativ
+
+ $this->PrestudentModel->addSelect('mentor');
+ $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+
+ /*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+ $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+ $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+ $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+ $this->PrestudentModel->addSelect('p.zugangscode');
+ $this->PrestudentModel->addSelect('p.bpk');*/
+
+ $this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
+ $this->PrestudentModel->addOrder('nachname');
+ $this->PrestudentModel->addOrder('vorname');
+ }
+
+ /**
+ * @return void
+ */
+ protected function addSelectPrioRel()
+ {
+ $this->PrestudentModel->addSelect("(
+ SELECT count(*)
+ FROM (
+ SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+ FROM PUBLIC.tbl_prestudent pss
+ JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+ WHERE person_id = p.person_id
+ AND studiensemester_kurzbz = (
+ SELECT studiensemester_kurzbz
+ FROM PUBLIC.tbl_prestudentstatus
+ WHERE prestudent_id = tbl_prestudent.prestudent_id
+ AND status_kurzbz = 'Interessent'
+ LIMIT 1
+ )
+ AND status_kurzbz = 'Interessent'
+ ) prest
+ WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+ AND priorisierung <= tbl_prestudent.priorisierung
+ ) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
+ }
+
+ /**
+ * Adds additional filters to the query
+ *
+ * @param string $studiensemester_kurzbz
+ *
+ * @return void
+ */
+ protected function addFilter($studiensemester_kurzbz)
+ {
+ $filter = $this->input->get('filter');
+ if (isset($filter['konto_count_0'])) {
+ $bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+ $stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+ $this->PrestudentModel->db->where('(
+ SELECT count(*)
+ FROM public.tbl_konto
+ WHERE person_id=tbl_prestudent.person_id
+ AND buchungstyp_kurzbz=' . $bt . '
+ AND studiensemester_kurzbz=' . $stdsem . '
+ ) =', 0);
+ $this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+ }
+ if (isset($filter['konto_missing_counter'])) {
+ $bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+ $stg = '';
+ if ($this->variablelib->getVar('kontofilterstg') == 'true')
+ $stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+ $bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+ $this->PrestudentModel->db->where('(
+ SELECT sum(betrag)
+ FROM public.tbl_konto
+ WHERE person_id=tbl_prestudent.person_id' .
+ $bt .
+ $stg . '
+ ) !=', 0);
+ }
+ }
+}
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 5a7960fd5..e8c532652 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -27,15 +27,15 @@ class Verband extends FHCAPI_Controller
{
public function __construct()
{
- // TODO(chris): permissions
$permissions = [];
$router = load_class('Router');
- $permissions[$router->method] = self::PERM_LOGGED;
+ $permissions[$router->method] = ['admin:r', 'assistenz:r'];
parent::__construct($permissions);
// Load Models
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
}
+
/**
* Remap calls:
* /
@@ -56,6 +56,13 @@ class Verband extends FHCAPI_Controller
if ($method == '' || $method == 'index')
return $this->getBase();
+ // NOTE(chris): Test if access is allowed ($method is the Studiengang)
+ if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+ && !$this->permissionlib->isBerechtigt('admin', 's', $method)
+ ) {
+ return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+ }
+
$count = count($params);
if (!$count)
return $this->getStudiengang($method);
@@ -63,12 +70,16 @@ class Verband extends FHCAPI_Controller
if ($count == 1) {
if (is_numeric($params[0]))
return $this->getSemester($method, $params[0]);
+ elseif ($params[0] == 'prestudent')
+ return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method));
else
return $this->getStudiengang($method, $params[0]);
}
if ($count == 2) {
if (is_numeric($params[0]))
return $this->getVerband($method, $params[0], $params[1]);
+ elseif ($params[1] == 'prestudent')
+ return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method));
else
return $this->getSemester($method, $params[1], $params[0]);
}
@@ -87,7 +98,10 @@ class Verband extends FHCAPI_Controller
$this->StudiengangModel->addDistinct();
$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
- $this->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name", false);
+ $this->StudiengangModel->addSelect(
+ "CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+ false
+ );
$this->StudiengangModel->addSelect('erhalter_kz');
$this->StudiengangModel->addSelect('typ');
$this->StudiengangModel->addSelect('kurzbz');
@@ -98,31 +112,40 @@ class Verband extends FHCAPI_Controller
$this->StudiengangModel->addOrder('typ');
$this->StudiengangModel->addOrder('kurzbz');
+ $stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+ $stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+ if (!$stgs)
+ $this->terminateWithSuccess([]);
+
+ $this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
$list = $this->getDataOrTerminateWithError($result);
- $list[] = [
- 'name' => 'International',
- 'link' => 'inout',
- 'children' => [
- [
- 'name' => 'Incoming',
- 'link' => 'inout/incoming',
- 'leaf' => true
- ],
- [
- 'name' => 'Outgoing',
- 'link' => 'inout/outgoing',
- 'leaf' => true
- ],
- [
- 'name' => 'Gemeinsame Studien',
- 'link' => 'inout/gemeinsamestudien',
- 'leaf' => true
+ if ($this->permissionlib->isBerechtigt('inout/uebersicht'))
+ $list[] = [
+ 'name' => 'International',
+ 'link' => 'inout',
+ 'children' => [
+ [
+ 'name' => 'Incoming',
+ 'link' => 'inout/incoming',
+ 'leaf' => true
+ ],
+ [
+ 'name' => 'Outgoing',
+ 'link' => 'inout/outgoing',
+ 'leaf' => true
+ ],
+ [
+ 'name' => 'Gemeinsame Studien',
+ 'link' => 'inout/gemeinsamestudien',
+ 'leaf' => true
+ ]
]
- ]
- ];
+ ];
$this->terminateWithSuccess($list);
}
@@ -145,7 +168,7 @@ class Verband extends FHCAPI_Controller
$this->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->StudiengangModel->addSelect('semester');
- $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+ $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->StudiengangModel->addOrder('semester');
@@ -180,8 +203,6 @@ class Verband extends FHCAPI_Controller
$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
- // TODO(chris): semester for gruppe_kurzbz <- what did i mean by that?
-
$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
$result = $this->StudienordnungModel->loadWhere([
@@ -223,7 +244,7 @@ class Verband extends FHCAPI_Controller
$this->GruppeModel->addSelect('sort');
$this->GruppeModel->addSelect('gruppe_kurzbz');
- $this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . ' AS stg_kz', false);
+ $this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->GruppeModel->addOrder('sort');
$this->GruppeModel->addOrder('gruppe_kurzbz');
@@ -251,7 +272,7 @@ class Verband extends FHCAPI_Controller
$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
$this->StudiengangModel->addSelect('verband');
- $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+ $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->StudiengangModel->addOrder('verband');
@@ -299,7 +320,7 @@ class Verband extends FHCAPI_Controller
$this->StudiengangModel->addSelect("TRUE AS leaf", false);
$this->StudiengangModel->addSelect('gruppe');
- $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+ $this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
$this->StudiengangModel->addOrder('gruppe');
@@ -331,18 +352,20 @@ class Verband extends FHCAPI_Controller
{
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
- $this->StudiensemesterModel->addOrder('start');
+ $this->load->model('system/Variable_model', 'VariableModel');
+ $result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+ $data = $this->getDataOrTerminateWithError($result);
+ $number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? null;
- /**
- * TODO(chris): filter with variable:
- * - $number_displayed_past_studiensemester from Variable
- * - then: $stsem_obj->getPlusMinus(NULL, $number_displayed_past_studiensemester, 'ende ASC');
- */
+ $this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
+ $this->StudiensemesterModel->addOrder('ende');
$result = $this->StudiensemesterModel->load();
$studiensemester = $this->getDataOrTerminateWithError($result);
$result = [];
+ $studiengang_kz = (int)$studiengang_kz;
+
foreach ($studiensemester as $sem) {
$semlink = $link . $sem->studiensemester_kurzbz;
$intlink = $semlink . '/interessenten';
@@ -381,12 +404,12 @@ class Verband extends FHCAPI_Controller
'children' => [
[
'name' => 'Nicht zum Reihungstest angemeldet',
- 'link' => $intlink . '/statusbestaetigt/reihungstestnichtangemeldet',
+ 'link' => $intlink . '/statusbestaetigtrtnichtangemeldet',
'leaf' => true
],
[
'name' => 'Reihungstest angemeldet',
- 'link' => $intlink . '/statusbestaetigt/reihungstestangemeldet',
+ 'link' => $intlink . '/statusbestaetigtrtangemeldet',
'leaf' => true
]
]
@@ -409,7 +432,33 @@ class Verband extends FHCAPI_Controller
'name' => 'Bewerber',
'link' => $semlink . '/bewerber',
'stg_kz' => $studiengang_kz,
- 'leaf' => true
+ 'children' => [
+ [
+ 'name' => 'Nicht zum Reihungstest angemeldet',
+ 'link' => $intlink . '/bewerberrtnichtangemeldet',
+ 'stg_kz' => $studiengang_kz,
+ 'leaf' => true
+ ],
+ [
+ 'name' => 'Reihungstest angemeldet',
+ 'link' => $intlink . '/bewerberrtangemeldet',
+ 'stg_kz' => $studiengang_kz,
+ 'children' => [
+ [
+ 'name' => 'Teilgenommen',
+ 'link' => $intlink . '/bewerberrtangemeldetteilgenommen',
+ 'stg_kz' => $studiengang_kz,
+ 'leaf' => true
+ ],
+ [
+ 'name' => 'Nicht teilgenommen',
+ 'link' => $intlink . '/bewerberrtangemeldetnichtteilgenommen',
+ 'stg_kz' => $studiengang_kz,
+ 'leaf' => true
+ ]
+ ]
+ ]
+ ]
],
[
'name' => 'Aufgenommen',
diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
index a686f6060..6a373137f 100644
--- a/application/controllers/api/v1/person/Person.php
+++ b/application/controllers/api/v1/person/Person.php
@@ -264,4 +264,4 @@ class Person extends API_Controller
return success('Input data are valid');
}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 4486f9d74..ff59ef41a 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -5,8 +5,12 @@ if (! defined("BASEPATH")) exit("No direct script access allowed");
class UHSTAT1 extends FHC_Controller
{
const BERECHTIGUNG_UHSTAT_VERWALTEN = 'student/uhstat1daten_verwalten';
+ const LOGIN_SESSION_INDEX = 'bewerbung/user';
const PERSON_ID_SESSION_INDEX = 'bewerbung/personId';
const CODEX_OESTERREICH = 'A';
+ const CODEX_UNKNOWN_YEAR = 9999;
+ const CODEX_UNKNOWN_NATION = 'XXX';
+ const CODEX_UNKNOWN_BILDUNGMAX = 999;
const LOWER_BOUNDARY_YEARS = 160;
const UPPER_BOUNDARY_YEARS = 20;
@@ -210,7 +214,9 @@ class UHSTAT1 extends FHC_Controller
else
return true;
- if (!isset($bildungsstaat)) return true;
+ // if no Bildungsstaat or Bildungmax unknown - valid
+ if (!isset($bildungsstaat) || $bildungmax == self::CODEX_UNKNOWN_BILDUNGMAX) return true;
+
// find out if abschluss is in Austria
$this->AbschlussModel->addSelect("in_oesterreich");
@@ -219,8 +225,11 @@ class UHSTAT1 extends FHC_Controller
if (hasData($abschlussRes))
{
$in_oesterreich = getData($abschlussRes)[0]->in_oesterreich;
- // invalid if abschluss in Austria, but not Bildungsstaat, or abschluss not in Austria, but Bildungsstaat in Austria
- return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH) || (!$in_oesterreich && $bildungsstaat != self::CODEX_OESTERREICH);
+
+ // valid if Bildungsstaat and Abschluss in Austria, or Bildungsstaat and Abschluss not in Austria
+ // (or Abschluss not in Austria and Bildungsstaat unknown)
+ return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH)
+ || (!$in_oesterreich && ($bildungsstaat != self::CODEX_OESTERREICH || $bildungsstaat == self::CODEX_UNKNOWN_NATION));
}
return false;
@@ -363,7 +372,11 @@ class UHSTAT1 extends FHC_Controller
// get realistic birth years, dated back from current year
$currYear = date("Y");
- $formMetaData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+ $yearRange = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+ $formMetaData['jahre'] = array_combine($yearRange, $yearRange);
+
+ // add "unknown" option
+ $formMetaData['jahre'][self::CODEX_UNKNOWN_YEAR] = 'unbekannt';
return success($formMetaData);
}
@@ -411,7 +424,10 @@ class UHSTAT1 extends FHC_Controller
private function _getValidPersonId($berechtigungsArt)
{
// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
- if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]))
+ if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX])
+ && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX])
+ && isset($_SESSION[self::LOGIN_SESSION_INDEX])
+ )
return $_SESSION[self::PERSON_ID_SESSION_INDEX];
// if person id passed directly...
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
new file mode 100644
index 000000000..1fdb7e2a1
--- /dev/null
+++ b/application/controllers/components/Cis/Mylv.php
@@ -0,0 +1,213 @@
+ ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+ 'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+ 'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+ 'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+ 'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+ ]);
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ */
+ public function Student()
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+ /**
+ */
+ public function Studiensemester()
+ {
+ $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+ $result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+ /**
+ */
+ public function Lvs($studiensemester_kurzbz)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+ $result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+ /**
+ */
+ public function Info($studiensemester_kurzbz, $lehrveranstaltung_id)
+ {
+ $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+ $result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+ $lv = current(getData($result) ?: []);
+
+ if (!$lv)
+ return $this->outputJsonError('Could\'t find Lehrveranstaltung with id: ' . $lehrveranstaltung_id);
+
+
+ $this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+ $result = $this->LehreinheitmitarbeiterModel->getForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $lvinfo = [];
+ $lvinfo['lektoren'] = getData($result) ?: [];
+
+ $kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+ $lvinfo['lektoren'] = array_values(array_filter($lvinfo['lektoren'], function ($v) use ($kollisionsfreie_user) {
+ return !in_array($v->uid, $kollisionsfreie_user);
+ }));
+
+ $lvinfo['lvLeitung'] = array_values(array_filter($lvinfo['lektoren'], function ($v) {
+ return $v->lehrfunktion_kurzbz == 'LV-Leitung';
+ }));
+
+
+ $this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+ $result = $this->OrganisationseinheitModel->getWithType($lv->oe_kurzbz);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $lvinfo['oe'] = current(getData($result) ?: []);
+
+
+ $this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+ $result = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('Leitung', $lv->oe_kurzbz);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $lvinfo['oeLeitung'] = getData($result) ?: [];
+
+
+ $result = $this->LehrveranstaltungModel->getKoordinator($lehrveranstaltung_id, $studiensemester_kurzbz);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $lvinfo['koordinator'] = getData($result) ?: [];
+
+ if (defined('ACTIVE_ADDONS') && in_array('lvinfo', explode(';', ACTIVE_ADDONS)) && file_exists(FHCPATH . 'addons/lvinfo/include/lvinfo.class.php'))
+ {
+ require_once(FHCPATH . 'addons/lvinfo/include/lvinfo.class.php');
+ $lvinfoObj = new lvinfo();
+ $lvinfoObj->loadLVinfo($lehrveranstaltung_id, $studiensemester_kurzbz, null, true);
+ if (is_array($lvinfoObj->result))
+ {
+ $oldP = property_exists($this, 'p') ? $this->p : null;
+ $result = [];
+ $lvinfos = $lvinfoObj->result;
+ $lvinfoSet = new lvinfo();
+ $lvinfoSet->load_lvinfo_set($studiensemester_kurzbz);
+ foreach ($lvinfos as $lvi)
+ {
+ $this->p = null;
+ $this->loadPhrases('ui', $lvi->sprache);
+ $result[$lvi->sprache] = [];
+ foreach ($lvinfoSet->result as $set)
+ {
+ $key = $set->lvinfo_set_kurzbz;
+ if (!isset($lvi->data[$key]))
+ continue;
+ $info = [
+ 'header' => $set->lvinfo_set_bezeichnung[$lvi->sprache]
+ ];
+ if (isset($set->einleitungstext[$lvi->sprache]))
+ $info['subheader'] = $set->einleitungstext[$lvi->sprache];
+ switch ($set->lvinfo_set_typ)
+ {
+ case 'boolean':
+ $info['body'] = $this->p->t('ui', $lvi->data[$key] === true ? 'ja' : 'nein');
+ break;
+ case 'array':
+ $info['body'] = array_map('htmlspecialchars', $lvi->data[$key]);
+ break;
+ case 'editor':
+ $info['body'] = $lvi->data[$key];
+ break;
+ default:
+ $info['body'] = htmlspecialchars($lvi->data[$key]);
+ }
+ if ($info['body'])
+ $result[$lvi->sprache][] = $info;
+ }
+ }
+ if ($result)
+ {
+ $lvinfo['lvinfo'] = $result;
+ $lvinfo['lvinfoDefaultLang'] = getUserLanguage();
+
+ $this->load->model('system/Sprache_model', 'SpracheModel');
+ $result = $this->SpracheModel->loadMultiple(array_keys($result));
+ if (!isError($result))
+ {
+ $result = getData($result);
+ $lvinfo['sprachen'] = [];
+ foreach ($result as $sprache) {
+ $lvinfo['sprachen'][$sprache->sprache] = $sprache;
+ }
+ }
+ }
+ $this->p = $oldP;
+ }
+ }
+
+
+ $this->outputJsonSuccess($lvinfo);
+ }
+
+ /**
+ */
+ public function Pruefungen($lehrveranstaltung_id)
+ {
+ $this->load->model('education/Pruefung_model', 'PruefungModel');
+
+ $result = $this->PruefungModel->getByStudentAndLv(getAuthUID(), $lehrveranstaltung_id, getUserLanguage());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
new file mode 100644
index 000000000..a9f35c651
--- /dev/null
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -0,0 +1,73 @@
+ ['basis/cis'],
+ 'Reservierungen' => ['basis/cis'],
+ 'Stunden' => ['basis/cis'],
+ ]);
+ }
+
+ //------------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ */
+ public function index()
+ {
+ $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+ /* $result = $this->StundenplanModel->loadForUid(getAuthUID());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+ */
+ $res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID()));
+
+ $res = getData($res);
+
+ $this->outputJsonSuccess($res);
+ }
+
+ /**
+ */
+ public function Reservierungen()
+ {
+ $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+ $result = $this->ReservierungModel->loadForUid(getAuthUID());
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+ /**
+ */
+ public function Stunden()
+ {
+ $this->load->model('ressource/Stunde_model', 'StundeModel');
+
+ $result = $this->StundeModel->load();
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result));
+ }
+
+
+}
diff --git a/application/controllers/components/stv/Favorites.php b/application/controllers/components/stv/Favorites.php
deleted file mode 100644
index 9d70f0b29..000000000
--- a/application/controllers/components/stv/Favorites.php
+++ /dev/null
@@ -1,57 +0,0 @@
-load->model('system/Variable_model', 'VariableModel');
-
- // Load libraries
- $this->load->library('AuthLib');
-
- // TODO(chris): variable table might be to small to store favorites!
- }
-
- public function index()
- {
- $result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
-
- $this->outputJson(getData($result)['stv_favorites']);
- }
-
- public function set()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $this->load->library('form_validation');
-
- $this->form_validation->set_rules('favorites', 'Favorites', 'required');
-
- if ($this->form_validation->run() == false) {
- $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
- return $this->outputJson($this->form_validation->error_array());
- }
-
- $favorites = $this->input->post('favorites');
-
- $result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
-
- $this->outputJsonSuccess(true);
- }
-}
diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
deleted file mode 100644
index 85071c416..000000000
--- a/application/controllers/components/stv/Kontakt.php
+++ /dev/null
@@ -1,709 +0,0 @@
-load->library('AuthLib');
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
- $this->load->library('form_validation');
-
- // Load language phrases
- $this->loadPhrases([
- 'ui'
- ]);
- }
-
- public function getAdressen($person_id)
- {
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- $this->AdresseModel->addSelect('public.tbl_adresse.*');
- $this->AdresseModel->addSelect('t.*');
- $this->AdresseModel->addSelect('f.firma_id');
- $this->AdresseModel->addSelect('f.name as firmenname');
- $this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
- $this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
- $result = $this->AdresseModel->loadWhere(
- array('person_id' => $person_id)
- );
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- public function addNewAddress($person_id)
- {
- $_POST = json_decode($this->input->raw_input_stream, true);
-
- $this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- $uid = getAuthUID();
-/* $person_id = $this->input->post('$person_id');
- $co_name = $this->input->post('co_name');
- $strasse = $this->input->post('strasse');
- $ort = $this->input->post('ort');
- $gemeinde = $this->input->post('gemeinde');
- $nation = $this->input->post('nation');
- $name = $this->input->post('name');
- $typ = $this->input->post('typ');
- $anmerkung = $this->input->post('anmerkung');*/
-
- $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
- $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
- $ort = isset($_POST['ort']) ? $_POST['ort'] : null;
- $gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
- $nation = isset($_POST['nation']) ? $_POST['nation'] : null;
- $name = isset($_POST['name']) ? $_POST['name'] : null;
- $typ = isset($_POST['typ']) ? $_POST['typ'] : null;
- $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
- if(isset($_POST['firma']))
- {
- $firma_id = $_POST['firma']['firma_id'];
- }
- else
- $firma_id = null;
-
- $result = $this->AdresseModel->insert(
- [
- 'person_id' => $person_id,
- 'strasse' => $strasse,
- 'insertvon' => $uid,
- 'insertamum' => date('c'),
- 'plz' => $_POST['plz'],
- 'ort' => $ort,
- 'gemeinde' => $gemeinde,
- 'nation' => $nation,
- 'heimatadresse' => $_POST['heimatadresse'],
- 'zustelladresse' => $_POST['zustelladresse'],
- 'co_name' => $co_name,
- 'typ' => $typ,
- 'firma_id' => $firma_id,
- 'name' => $name,
- 'rechnungsadresse' => $_POST['rechnungsadresse'],
- 'anmerkung' => $anmerkung
-
- ]
- );
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function updateAddress($address_id)
- {
- $uid = getAuthUID();
- $_POST = json_decode($this->input->raw_input_stream, true);
-
- $this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- if(!$address_id)
- {
- return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- if(isset($_POST['firma']))
- {
- $firma_id = $_POST['firma']['firma_id'];
- }
- else
- $firma_id = null;
-
-
-
- $person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
- $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
- $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
- $ort = isset($_POST['ort']) ? $_POST['ort'] : null;
- $gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
- $nation = isset($_POST['nation']) ? $_POST['nation'] : null;
- $name = isset($_POST['name']) ? $_POST['name'] : null;
- $typ = isset($_POST['typ']) ? $_POST['typ'] : null;
- $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
-/* $person_id = $this->input->post('$person_id');
- $co_name = $this->input->post('co_name');
- $strasse = $this->input->post('strasse');
- $ort = $this->input->post('ort');
- $gemeinde = $this->input->post('gemeinde');
- $nation = $this->input->post('nation');
- $name = $this->input->post('name');
- $typ = $this->input->post('typ');
- $anmerkung = $this->input->post('anmerkung');*/
-
- $result = $this->AdresseModel->update(
- [
- 'adresse_id' => $address_id
- ],
- [ 'person_id' => $person_id,
- 'strasse' => $strasse,
- 'updatevon' => $uid,
- 'updateamum' => date('c'),
- 'plz' => $_POST['plz'],
- 'ort' => $ort,
- 'gemeinde' => $gemeinde,
- 'nation' => $nation,
- 'heimatadresse' => $_POST['heimatadresse'],
- 'zustelladresse' => $_POST['zustelladresse'],
- 'co_name' => $co_name,
- 'typ' => $typ,
- 'firma_id' => $firma_id,
- 'name' => $name,
- 'rechnungsadresse' => $_POST['rechnungsadresse'],
- 'anmerkung' => $anmerkung
- ]
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function loadAddress($adresse_id)
- {
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- $this->AdresseModel->addSelect('public.tbl_adresse.*');
- $this->AdresseModel->addSelect('t.*');
- $this->AdresseModel->addSelect('f.firma_id');
- $this->AdresseModel->addSelect('f.name as firmenname');
- $this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
- $this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
- $this->AdresseModel->addLimit(1);
-
- $result = $this->AdresseModel->loadWhere(
- array('adresse_id' => $adresse_id)
- );
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
-
- elseif (!hasData($result)) {
- $this->outputJson($result); //success mit Wert null
- }
- else
- {
- $this->outputJsonSuccess(current(getData($result)));
- }
- }
-
- public function deleteAddress($adresse_id)
- {
- $this->load->model('person/Adresse_model', 'AdresseModel');
-
- $result = $this->AdresseModel->delete(
- array('adresse_id' => $adresse_id)
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
- elseif (!hasData($result)) {
- $this->outputJson($result); //success mit Wert null
- }
- return $this->outputJsonSuccess(current(getData($result)));
- }
-
- public function getAdressentypen()
- {
- $this->load->model('person/Adressentyp_model', 'AdressentypModel');
-
- $result = $this->AdressentypModel->load();
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- public function getFirmen($searchString)
- {
- $this->load->model('ressource/firma_model', 'FirmaModel');
-
- $result = $this->FirmaModel->searchFirmen($searchString);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
- $this->outputJson($result);
- }
-
- public function getStandorte($searchString)
- {
- $this->load->model('organisation/standort_model', 'StandortModel');
-
- $result = $this->StandortModel->searchStandorte($searchString);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
- $this->outputJson($result);
- }
-
- public function getKontakte($person_id)
- {
- $this->load->model('person/Kontakt_model', 'KontaktModel');
- $this->load->model('organisation/standort_model', 'StandortModel');
- $this->KontaktModel->addSelect("*,
- TO_CHAR (CASE
- WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum
- THEN public.tbl_kontakt.updateamum
- ELSE public.tbl_kontakt.insertamum
- END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
- $this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
- $result = $this->KontaktModel->loadWhere(
- array('person_id' => $person_id)
- );
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- public function getKontakttypen()
- {
- $this->load->model('person/Kontakttyp_model', 'KontakttypModel');
-
- $result = $this->KontakttypModel->load();
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- public function loadContact($kontakt_id)
- {
- $this->load->model('person/Kontakt_model', 'KontaktModel');
-
- $this->KontaktModel->addSelect('public.tbl_kontakt.*');
- $this->KontaktModel->addSelect('st.kurzbz');
- $this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
- $this->KontaktModel->addLimit(1);
-
- $result = $this->KontaktModel->loadWhere(
- array('kontakt_id' => $kontakt_id)
- );
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
-
- elseif (!hasData($result)) {
- $this->outputJson($result); //success mit Wert null
- // $this->outputJson(getData($result) ?: []);
- }
- else
- {
- $this->outputJsonSuccess(current(getData($result)));
- }
- }
-
- public function addNewContact($person_id)
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
- else
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $this->load->model('person/Kontakt_model', 'KontaktModel');
-
- if(isset($_POST['standort']))
- {
- $standort_id = $_POST['standort']['standort_id'];
- }
- else
- $standort_id = null;
-
- $uid = getAuthUID();
-
- $kontakttyp = $this->input->post('kontakttyp');
- $anmerkung = $this->input->post('anmerkung');
- $kontakt = $this->input->post('kontakt');
- $ext_id = $this->input->post('ext_id');
-
- $result = $this->KontaktModel->insert(
- [
- 'person_id' => $person_id,
- 'kontakttyp' => $kontakttyp,
- 'anmerkung' => $anmerkung,
- 'kontakt' => $kontakt,
- 'zustellung' => $_POST['zustellung'],
- 'insertvon' => $uid,
- 'insertamum' => date('c'),
- 'standort_id' => $standort_id,
- 'ext_id' => $ext_id
- ]
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result);
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function updateContact($kontakt_id)
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $this->load->model('person/Kontakt_model', 'KontaktModel');
-
- if(!$kontakt_id)
- {
- return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
- else
- $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- if(isset($_POST['standort']))
- {
- $standort_id = $_POST['standort']['standort_id'];
- }
- else
- $standort_id = null;
-
- $uid = getAuthUID();
- $kontakttyp = $this->input->post('kontakttyp');
- $anmerkung = $this->input->post('anmerkung');
- $kontakt = $this->input->post('kontakt');
- $ext_id = $this->input->post('ext_id');
- $person_id = $this->input->post('person_id');
-
- $result = $this->KontaktModel->update(
- [
- 'kontakt_id' => $kontakt_id
- ],
- [
- 'person_id' => $person_id,
- 'kontakttyp' => $kontakttyp,
- 'anmerkung' => $anmerkung,
- 'kontakt' => $kontakt,
- 'zustellung' => $_POST['zustellung'],
- 'insertvon' => $uid,
- 'insertamum' => date('c'),
- 'standort_id' => $standort_id,
- 'ext_id' => $ext_id
- ]
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function deleteContact($kontakt_id)
- {
- $this->load->model('person/Kontakt_model', 'KontaktModel');
-
- $result = $this->KontaktModel->delete(
- array('kontakt_id' => $kontakt_id)
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
- elseif (!hasData($result)) {
- $this->outputJson($result);
- }
- return $this->outputJsonSuccess(current(getData($result)));
- }
-
-
- public function getBankverbindung($person_id)
- {
- $this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
- $this->BankverbindungModel->addSelect('*');
-
- $result = $this->BankverbindungModel->loadWhere(
- array('person_id' => $person_id)
- );
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- public function addNewBankverbindung($person_id)
- {
- $this->load->library('form_validation');
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
- $this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
- $ext_id = $this->input->post('ext_id');
- $oe_kurzbz = $this->input->post('oe_kurzbz');
- $orgform_kurzbz = $this->input->post('orgform_kurzbz');
- $name = $this->input->post('name');
- $anschrift = $this->input->post('anschrift');
- $bic = $this->input->post('bic');
- $blz = $this->input->post('blz ');
- $kontonr = $this->input->post('kontonr');
-
- $result = $this->BankverbindungModel->insert(
- [
- 'person_id' => $person_id,
- 'name' => $name,
- 'anschrift' => $anschrift,
- 'bic' => $bic,
- 'iban' => $_POST['iban'],
- 'blz' => $blz,
- 'kontonr' => $kontonr,
- 'insertvon' => 'uid',
- 'insertamum' => date('c'),
- 'typ' => $_POST['typ'],
- 'verrechnung' => $_POST['verrechnung'],
- 'ext_id' => $ext_id,
- 'oe_kurzbz' => $oe_kurzbz,
- 'orgform_kurzbz' => $orgform_kurzbz
- ]
- );
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result);
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function loadBankverbindung($bankverbindung_id)
- {
- $this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
- $this->BankverbindungModel->addSelect('*');
-
- $this->BankverbindungModel->addLimit(1);
-
- $result = $this->BankverbindungModel->loadWhere(
- array('bankverbindung_id' => $bankverbindung_id)
- );
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
-
- elseif (!hasData($result)) {
- $this->outputJson($result); //success mit Wert null
- // $this->outputJson(getData($result) ?: []);
- }
- else
- {
- $this->outputJsonSuccess(current(getData($result)));
- }
- }
-
- public function updateBankverbindung($bankverbindung_id)
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
- $this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
-
- $this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
- if(!$bankverbindung_id)
- {
- return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- if ($this->form_validation->run() == false)
- {
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $uid = getAuthUID();
-
- $result = $this->BankverbindungModel->update(
- [
- 'bankverbindung_id' => $bankverbindung_id
- ],
- [
- 'person_id' => $_POST['person_id'],
- 'name' => $_POST['name'],
- 'anschrift' => $_POST['anschrift'],
- 'bic' => $_POST['bic'],
- 'iban' => $_POST['iban'],
- 'blz' => $_POST['blz'],
- 'kontonr' => $_POST['kontonr'],
- 'updatevon' => $uid,
- 'updateamum' => date('c'),
- 'typ' => $_POST['typ'],
- 'verrechnung' => $_POST['verrechnung'],
- 'ext_id' => $_POST['ext_id'],
- 'oe_kurzbz' => $_POST['oe_kurzbz'],
- 'orgform_kurzbz' => $_POST['orgform_kurzbz']
- ]
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- return $this->outputJsonSuccess(true);
- }
-
- public function deleteBankverbindung($bankverbindung_id)
- {
- $this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
- $result = $this->BankverbindungModel->delete(
- array('bankverbindung_id' => $bankverbindung_id)
- );
-
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson($result);
- }
- elseif (!hasData($result)) {
- $this->outputJson($result);
- }
- return $this->outputJsonSuccess(current(getData($result)));
- }
-
- public function plz_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('plz_required', $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function kontakt_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('kontakt_required', $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function iban_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('iban_required', $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function typ_required($value)
- {
- if (empty($value)) {
- $this->form_validation->set_message('typ_required', $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function plz_numeric($value)
- {
- if (!is_numeric($value)) {
- $this->form_validation->set_message('plz_numeric', $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
- return false;
- }
- else
- {
- return true;
- }
- }
-
- public function kontakt_valid_email($email)
- {
- if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
- $this->form_validation->set_message('kontakt_valid_email', $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
- return false;
- }
- else
- {
- return true;
- }
- }
-}
diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php
deleted file mode 100644
index fb61de065..000000000
--- a/application/controllers/components/stv/Noten.php
+++ /dev/null
@@ -1,168 +0,0 @@
- 'student/noten:r',
- 'getZeugnis' => 'student/noten:r',
- 'update' => ['admin:w', 'assistenz:w']
- ]);
-
- // Load Libraries
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
- }
-
- public function get()
- {
- $this->load->model('codex/Note_model', 'NoteModel');
-
- $result = $this->NoteModel->addOrder('note');
-
- $result = $this->NoteModel->load();
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- return $this->outputJson($result);
- }
-
- public function getZeugnis($prestudent_id, $all = null)
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
- $result = $this->StudentModel->loadWhere([
- 'prestudent_id' => $prestudent_id
- ]);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson($result);
- }
- if (!hasData($result))
- return $this->outputJsonSuccess(null);
-
- $student_uid = current(getData($result))->student_uid;
-
- $studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
-
- $result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- return $this->outputJson($result);
- }
-
- public function update()
- {
- $this->load->model('crm/Student_model', 'StudentModel');
- $this->load->model('organisation/Studienplan_model', 'StudienplanModel');
- $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
- $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
- $this->load->library('form_validation');
-
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- if (empty($_POST) || !is_array(current($_POST))) {
- $result = $this->hasPermissionUpdate($this->input->post('lehrveranstaltung_id'), $this->input->post('student_uid'));
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
- return $this->outputJson($result);
- }
-
- $this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrverantaltung ID', 'required|numeric');
- $this->form_validation->set_rules('student_uid', 'Student UID', 'required');
- $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester Kurzbezeichnung', 'required');
- $this->form_validation->set_rules('note', 'Note', 'required|numeric');
- $post = [$_POST];
- } else {
- foreach ($_POST as $i => $data) {
- $lvid = isset($data['lehrveranstaltung_id']) ? $data['lehrveranstaltung_id'] : null;
- $uid = isset($data['student_uid']) ? $data['student_uid'] : null;
- $result = $this->hasPermissionUpdate($lvid, $uid);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
- return $this->outputJson($result);
- }
-
- $this->form_validation->set_rules($i . '[lehrveranstaltung_id]', '#' . $i . ' Lehrverantaltung ID', 'required|numeric');
- $this->form_validation->set_rules($i . '[student_uid]', '#' . $i . ' Student UID', 'required');
- $this->form_validation->set_rules($i . '[studiensemester_kurzbz]', '#' . $i . ' Studiensemester Kurzbezeichnung', 'required');
- $this->form_validation->set_rules($i . '[note]', '#' . $i . ' Note', 'required|numeric');
- }
- $post = $_POST;
- }
- if ($this->form_validation->run() == false) {
- $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
- return $this->outputJsonError($this->form_validation->error_array());
- }
-
- $final_result = success();
- $this->ZeugnisnoteModel->db->trans_start();
-
- foreach ($post as $i => $data) {
- $note = $data['note'];
- unset($data['note']);
- $result = $this->ZeugnisnoteModel->update($data, [
- 'note' => $note,
- 'benotungsdatum' => date('c'),
- 'updateamum' => date('c'),
- 'updatevon' => getAuthUID()
- ]);
- if (isError($result)) {
- $final_result = $result;
- break;
- }
- }
-
- $this->ZeugnisnoteModel->db->trans_complete();
-
- if (isError($final_result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- }
-
- $this->outputJson($final_result);
- }
-
- protected function hasPermissionUpdate($lehrveranstaltung_id, $student_uid)
- {
- // TODO(chris): error phrases!
- if ($lehrveranstaltung_id === null || $student_uid === null)
- return success();
- $result = $this->StudentModel->load([$student_uid]);
- if (isError($result))
- return $result;
- if (!hasData($result))
- return error('Fehler beim Ermitteln des Studenten');
- $student = current(getData($result));
-
- if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz))
- return success();
- if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz))
- return success();
-
- $result = $this->StudienplanModel->getAllOesForLv($lehrveranstaltung_id);
- if (isError($result))
- return $result;
- $oes = getData($result) ?: [];
- $result = $this->LehrveranstaltungModel->getStg($lehrveranstaltung_id);
- if (isError($result))
- return $result;
- if (hasData($result))
- $oes[] = current(getData($result));
-
- foreach ($oes as $oe) {
- if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz))
- return success();
- if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz))
- return success();
- }
-
- return error('Forbidden');
- }
-}
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
deleted file mode 100644
index 475497141..000000000
--- a/application/controllers/components/stv/Students.php
+++ /dev/null
@@ -1,710 +0,0 @@
-load->library('AuthLib');
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
- }
-
- /**
- * Remap calls:
- * / => return []
- * /inout => return []
- * /inout/incoming => getIncoming
- * /inout/outgoing => getOutgoing
- * /inout/gemeinsamestudien => getGemeinsamestudien
- * /(studiengang_kz) => getStudents
- * /(studiengang_kz)/prestudent => getPrestudents
- * /(studiengang_kz)/prestudent/* => getPrestudents
- * /(studiengang_kz)/(semester) => getStudents
- * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz) => getStudents
- * /(studiengang_kz)/(semester)/(verband) => getStudents
- * /(studiengang_kz)/(semester)/(verband)/(gruppe) => getStudents
- * /(studiengang_kz)/(org_form) => getStudents
- * /(studiengang_kz)/(org_form)/prestudent => getPrestudents
- * /(studiengang_kz)/(org_form)/prestudent/* => getPrestudents
- * /(studiengang_kz)/(org_form)/(semester) => getStudents
- * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
- * => getStudents
- * /(studiengang_kz)/(org_form)/(semester)/(verband) => getStudents
- * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
- * => getStudents
- * /uid/(student_uid) => getStudent
- * /prestudent/(prestudent_id) => getPrestudent
- * /person/(person_id) => getPerson
- *
- * @param string $method
- * @param array $params (optional)
- *
- * @return void
- */
- public function _remap($method, $params = [])
- {
- if ($method == '' || $method == 'index')
- return $this->outputJson([]);
-
- if ($method == 'inout') {
- if (!count($params))
- return $this->outputJson([]);
- switch ($params[0]) {
- case 'incoming':
- return $this->getIncoming();
- case 'outgoing':
- return $this->getOutgoing();
- case 'gemeinsamestudien':
- return $this->getGemeinsamestudien();
- default:
- return show_404();
- }
- }
-
- $count = count($params);
- if (!$count)
- return $this->getStudents($method);
-
- if ($method == 'uid' && $count == 1)
- return $this->getStudent($params[0]);
-
- if ($method == 'prestudent' && $count == 1)
- return $this->getPrestudent($params[0]);
-
- if ($method == 'person' && $count == 1)
- return $this->getPerson($params[0]);
-
- if (is_numeric($params[0])) {
- $sem = $params[0];
- if ($count == 3 && $params[1] == 'grp') {
- $g = $params[2];
- $ver = null;
- $grp = null;
- } else {
- $g = null;
- $ver = $count > 1 ? $params[1] : null;
- $grp = $count > 2 ? $params[2] : null;
- }
- return $this->getStudents($method, $sem, $ver, $grp, $g);
- } elseif ($params[0] == 'prestudent') {
- if ($count == 1)
- return $this->getPrestudents($method);
- if ($count == 2)
- return $this->getPrestudents($method, $params[1]);
- return $this->getPrestudents($method, $params[1], $params[$count-1]);
- } else {
- $org = $params[0];
- if ($count > 1 && $params[1] == 'prestudent') {
- if ($count == 2)
- return $this->getPrestudents(null, null, $org);
- if ($count == 3)
- return $this->getPrestudents($params[2], null, $org);
- return $this->getPrestudents($params[2], $params[$count-1], $org);
- }
- $sem = $count > 1 ? $params[1] : null;
- if ($count == 4 && $params[2] == 'grp') {
- $g = $params[3];
- $ver = null;
- $grp = null;
- } else {
- $g = null;
- $ver = $count > 2 ? $params[2] : null;
- $grp = $count > 3 ? $params[3] : null;
- }
-
- return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
- }
-
- show_404();
- }
-
- /**
- * @return void
- */
- protected function getIncoming()
- {
- // TODO(chris): IMPLEMENT!
- $this->outputJson([]);
- }
-
- /**
- * @return void
- */
- protected function getOutgoing()
- {
- // TODO(chris): IMPLEMENT!
- $this->outputJson([]);
- }
-
- /**
- * @return void
- */
- protected function getGemeinsamestudien()
- {
- // TODO(chris): IMPLEMENT!
- $this->outputJson([]);
- }
-
- /**
- * @param integer $studiengang_kz
- * @param string $studiensemester_kurzbz (optional)
- * @param string $filter (optional)
- * @param string $orgform_kurzbz (optional)
- *
- * @return void
- */
- protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
- {
- // TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
- // TODO(chris): IMPLEMENT!
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
- $stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
-
- $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
- #$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $this->PrestudentModel->escape($studiensemester_kurzbz) . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id');
- $this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
- // TODO(chris): check what functions are returning when no entry exists
-
- $this->PrestudentModel->addSelect('p.person_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
- $this->PrestudentModel->addSelect("'' AS uid");
- $this->PrestudentModel->addSelect('titelpre');
- $this->PrestudentModel->addSelect('titelpost');
- $this->PrestudentModel->addSelect('vorname');
- $this->PrestudentModel->addSelect('wahlname');
- $this->PrestudentModel->addSelect('vornamen');
- $this->PrestudentModel->addSelect('geschlecht');
- $this->PrestudentModel->addSelect('nachname');
- $this->PrestudentModel->addSelect('gebdatum');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
- $this->PrestudentModel->addSelect('ersatzkennzeichen');
- $this->PrestudentModel->addSelect('svnr');
- $this->PrestudentModel->addSelect("'' AS matrikelnr");
- $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
- $this->PrestudentModel->addSelect("'' AS semester");
- $this->PrestudentModel->addSelect("'' AS verband");
- $this->PrestudentModel->addSelect("'' AS gruppe");
- $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
- $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
- $this->PrestudentModel->addSelect('mentor');
- $this->PrestudentModel->addSelect('FALSE AS bnaktiv');
- $this->PrestudentModel->addSelect(
- "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
- false
- );
- $this->PrestudentModel->addSelect(
- "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
- false
- );
- $this->PrestudentModel->addSelect('tbl_prestudent.dual');
- $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
- $this->PrestudentModel->addSelect('p.matr_nr');
- $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
- $this->PrestudentModel->addSelect('p.zugangscode');
- $this->PrestudentModel->addSelect('p.bpk');
-
- $this->PrestudentModel->addOrder('nachname');
- $this->PrestudentModel->addOrder('vorname');
-
- $where = [];
- if ($orgform_kurzbz) {
- $where['ps.orgform_kurzbz'] = $orgform_kurzbz;
- }
-
- switch ($filter) {
- case "interessenten":
- $where['ps.status_kurzbz'] = 'Interessent';
- break;
- case "bewerbungnichtabgeschickt":
- $where['ps.status_kurzbz'] = 'Interessent';
- $where['bewerbung_abgeschicktamum'] = null;
- break;
- case "bewerbungabgeschickt":
- $where['ps.status_kurzbz'] = 'Interessent';
- $where['bewerbung_abgeschicktamum IS NOT'] = null;
- $where['bestaetigtam'] = null;
- break;
- case "statusbestaetigt":
- $where['ps.status_kurzbz'] = 'Interessent';
- $where['bestaetigtam IS NOT'] = null;
- break;
- case "statusbestaetigtrtnichtangemeldet":
- $where['ps.status_kurzbz'] = 'Interessent';
- $where['bestaetigtam IS NOT'] = null;
- $this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
- break;
- case "statusbestaetigtrtangemeldet":
- $where['ps.status_kurzbz'] = 'Interessent';
- $where['bestaetigtam IS NOT'] = null;
- $this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
- break;
- case "zgv":
- $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
- $result = $this->StudiengangModel->load($studiengang_kz);
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- } elseif (!hasData($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
- // TODO(chris): phrase
- return $this->outputJson("Studiengang does not exist");
- }
- $stg = current(getData($result));
-
- $where['ps.status_kurzbz'] = 'Interessent';
-
- if ($stg->typ == 'm') {
- $where['zgvmas_code IS NOT'] = null;
- if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
- $where['zgvmas_erfuellt'] = true;
- } elseif ($stg->typ == 'p') {
- $where['zgvdoktor_code IS NOT'] = null;
- if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
- $where['zgvdoktor_erfuellt'] = true;
- } else {
- $where['zgv_code IS NOT'] = null;
- if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
- $where['zgv_erfuellt'] = true;
- }
- break;
- case "reihungstestangemeldet":
- $where['ps.status_kurzbz'] = 'Interessent';
- $this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
- break;
- case "reihungstestnichtangemeldet":
- $where['ps.status_kurzbz'] = 'Interessent';
- $this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
- break;
- case "bewerber":
- $where['ps.status_kurzbz'] = 'Bewerber';
- break;
- case "aufgenommen":
- $where['ps.status_kurzbz'] = 'Aufgenommener';
- break;
- case "warteliste":
- $where['ps.status_kurzbz'] = 'Wartender';
- break;
- case "absage":
- $where['ps.status_kurzbz'] = 'Abgewiesener';
- break;
- case "absolvent":
- $where['ps.status_kurzbz'] = 'Absolvent';
- break;
- case "diplomand":
- $where['ps.status_kurzbz'] = 'Diplomand';
- break;
- default:
- if (!$studiensemester_kurzbz) {
- // TODO(chris): should work ... needs testing
- // we want all prestudents without status?
- $where['ps.status_kurzbz'] = null;
- } else {
- $this->PrestudentModel->db->where_in('ps.status_kurzbz', [
- 'Interessent',
- 'Bewerber',
- 'Aufgenommener',
- 'Wartender',
- 'Abgewiesener'
- ]);
- }
- break;
- }
-
- $this->addFilter($studiensemester_kurzbz);
-
- $this->outputJson([]);
- }
-
- /**
- * @param integer $studiengang_kz
- * @param integer $semester (optional)
- * @param string $verband (optional)
- * @param integer $gruppe (optional)
- * @param string $gruppe_kurzbz (optional)
- * @param string $orgform_kurzbz (optional)
- *
- * @return void
- */
- protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
- {
- $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
- $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
- $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
- $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
- $this->PrestudentModel->addJoin(
- 'public.tbl_studentlehrverband v',
- 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
- );
-
- $this->PrestudentModel->addSelect('p.person_id');
- $this->PrestudentModel->addSelect('s.prestudent_id');
- $this->PrestudentModel->addSelect('b.uid');
- $this->PrestudentModel->addSelect('titelpre');
- $this->PrestudentModel->addSelect('titelpost');
- $this->PrestudentModel->addSelect('vorname');
- $this->PrestudentModel->addSelect('wahlname');
- $this->PrestudentModel->addSelect('vornamen');
- $this->PrestudentModel->addSelect('geschlecht');
- $this->PrestudentModel->addSelect('nachname');
- $this->PrestudentModel->addSelect('gebdatum');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
- $this->PrestudentModel->addSelect('ersatzkennzeichen');
- $this->PrestudentModel->addSelect('svnr');
- $this->PrestudentModel->addSelect('s.matrikelnr');
- $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
- $this->PrestudentModel->addSelect('v.semester');
- $this->PrestudentModel->addSelect('v.verband');
- $this->PrestudentModel->addSelect('v.gruppe');
- $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
- $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
- $this->PrestudentModel->addSelect('mentor');
- $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
- $this->PrestudentModel->addSelect(
- "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
- false
- );
- $this->PrestudentModel->addSelect(
- "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
- false
- );
- $this->PrestudentModel->addSelect('tbl_prestudent.dual');
- $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
- $this->PrestudentModel->addSelect('p.matr_nr');
- $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
- $this->PrestudentModel->addSelect('p.zugangscode');
- $this->PrestudentModel->addSelect('p.bpk');
-
- $this->PrestudentModel->addOrder('nachname');
- $this->PrestudentModel->addOrder('vorname');
-
-
- $where = [];
-
- if ($gruppe_kurzbz !== null) {
- $this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
- $where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
- $where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
- } else {
- $where['v.studiengang_kz'] = $studiengang_kz;
-
- if ($semester !== null)
- $where['v.semester'] = $semester;
-
- if ($verband !== null)
- $where['v.verband'] = $verband;
-
- if ($gruppe !== null)
- $where['v.gruppe'] = $gruppe;
-
- if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
- $this->PrestudentModel->db->where(
- "(
- SELECT orgform_kurzbz
- FROM public.tbl_prestudentstatus
- WHERE prestudent_id=tbl_prestudent.prestudent_id
- AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
- ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
- )",
- $this->PrestudentModel->escape($orgform_kurzbz),
- false
- );
- }
-
- }
-
- $this->addFilter($studiensemester_kurzbz);
-
- $result = $this->PrestudentModel->loadWhere($where);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- /**
- * @param string $prestudent_id
- *
- * @return void
- */
- protected function getPrestudent($prestudent_id)
- {
- $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
- $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
- $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
- $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
- $this->PrestudentModel->addJoin(
- 'public.tbl_studentlehrverband v',
- 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
- 'LEFT'
- );
-
- $this->PrestudentModel->addSelect('p.person_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
- $this->PrestudentModel->addSelect('b.uid');
- $this->PrestudentModel->addSelect('titelpre');
- $this->PrestudentModel->addSelect('titelpost');
- $this->PrestudentModel->addSelect('vorname');
- $this->PrestudentModel->addSelect('wahlname');
- $this->PrestudentModel->addSelect('vornamen');
- $this->PrestudentModel->addSelect('geschlecht');
- $this->PrestudentModel->addSelect('nachname');
- $this->PrestudentModel->addSelect('gebdatum');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
- $this->PrestudentModel->addSelect('ersatzkennzeichen');
- $this->PrestudentModel->addSelect('svnr');
- $this->PrestudentModel->addSelect('s.matrikelnr');
- $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
- $this->PrestudentModel->addSelect('v.semester');
- $this->PrestudentModel->addSelect('v.verband');
- $this->PrestudentModel->addSelect('v.gruppe');
- $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
- $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
- $this->PrestudentModel->addSelect('mentor');
- $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
- $this->PrestudentModel->addSelect(
- "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
- false
- );
- $this->PrestudentModel->addSelect(
- "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
- false
- );
- $this->PrestudentModel->addSelect('tbl_prestudent.dual');
- $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
- $this->PrestudentModel->addSelect('p.matr_nr');
- $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
- $this->PrestudentModel->addSelect('p.zugangscode');
- $this->PrestudentModel->addSelect('p.bpk');
-
- $this->addFilter($studiensemester_kurzbz);
-
- $result = $this->PrestudentModel->loadWhere([
- 'tbl_prestudent.prestudent_id' => $prestudent_id
- ]);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- /**
- * @param string $student_uid
- *
- * @return void
- */
- protected function getStudent($student_uid)
- {
- $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
- $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
- $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
- $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
- $this->PrestudentModel->addJoin(
- 'public.tbl_studentlehrverband v',
- 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
- 'LEFT'
- );
-
- $this->PrestudentModel->addSelect('p.person_id');
- $this->PrestudentModel->addSelect('s.prestudent_id');
- $this->PrestudentModel->addSelect('b.uid');
- $this->PrestudentModel->addSelect('titelpre');
- $this->PrestudentModel->addSelect('titelpost');
- $this->PrestudentModel->addSelect('vorname');
- $this->PrestudentModel->addSelect('wahlname');
- $this->PrestudentModel->addSelect('vornamen');
- $this->PrestudentModel->addSelect('geschlecht');
- $this->PrestudentModel->addSelect('nachname');
- $this->PrestudentModel->addSelect('gebdatum');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
- $this->PrestudentModel->addSelect('ersatzkennzeichen');
- $this->PrestudentModel->addSelect('svnr');
- $this->PrestudentModel->addSelect('s.matrikelnr');
- $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
- $this->PrestudentModel->addSelect('v.semester');
- $this->PrestudentModel->addSelect('v.verband');
- $this->PrestudentModel->addSelect('v.gruppe');
- $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
- $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
- $this->PrestudentModel->addSelect('mentor');
- $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
- $this->PrestudentModel->addSelect(
- "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
- false
- );
- $this->PrestudentModel->addSelect(
- "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
- false
- );
- $this->PrestudentModel->addSelect('tbl_prestudent.dual');
- $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
- $this->PrestudentModel->addSelect('p.matr_nr');
- $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
- $this->PrestudentModel->addSelect('p.zugangscode');
- $this->PrestudentModel->addSelect('p.bpk');
-
- $this->addFilter($studiensemester_kurzbz);
-
- $result = $this->PrestudentModel->loadWhere([
- 's.student_uid' => $student_uid
- ]);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- /**
- * @param integer $person_id
- *
- * @return void
- */
- protected function getPerson($person_id)
- {
- $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
- $this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
- $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
- $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
- $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
- $this->PrestudentModel->addJoin(
- 'public.tbl_studentlehrverband v',
- 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
- 'LEFT'
- );
-
- $this->PrestudentModel->addSelect('p.person_id');
- $this->PrestudentModel->addSelect('s.prestudent_id');
- $this->PrestudentModel->addSelect('b.uid');
- $this->PrestudentModel->addSelect('titelpre');
- $this->PrestudentModel->addSelect('titelpost');
- $this->PrestudentModel->addSelect('vorname');
- $this->PrestudentModel->addSelect('wahlname');
- $this->PrestudentModel->addSelect('vornamen');
- $this->PrestudentModel->addSelect('geschlecht');
- $this->PrestudentModel->addSelect('nachname');
- $this->PrestudentModel->addSelect('gebdatum');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
- $this->PrestudentModel->addSelect('ersatzkennzeichen');
- $this->PrestudentModel->addSelect('svnr');
- $this->PrestudentModel->addSelect('s.matrikelnr');
- $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
- $this->PrestudentModel->addSelect('v.semester');
- $this->PrestudentModel->addSelect('v.verband');
- $this->PrestudentModel->addSelect('v.gruppe');
- $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
- $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
- $this->PrestudentModel->addSelect('mentor');
- $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
- $this->PrestudentModel->addSelect(
- "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
- false
- );
- $this->PrestudentModel->addSelect(
- "(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
- false
- );
- $this->PrestudentModel->addSelect('tbl_prestudent.dual');
- $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
- $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
- $this->PrestudentModel->addSelect('p.matr_nr');
- $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
- $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
- $this->PrestudentModel->addSelect('p.zugangscode');
- $this->PrestudentModel->addSelect('p.bpk');
-
- $this->addFilter($studiensemester_kurzbz);
-
- $result = $this->PrestudentModel->loadWhere([
- 'p.person_id' => $person_id
- ]);
-
- if (isError($result)) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- $this->outputJson(getError($result));
- } else {
- $this->outputJson(getData($result) ?: []);
- }
- }
-
- /**
- * Adds additional filters to the query
- *
- * @param string $studiensemester_kurzbz
- *
- * @return void
- */
- protected function addFilter($studiensemester_kurzbz)
- {
- $filter = $this->input->get('filter');
- if (isset($filter['konto_count_0'])) {
- $bt = $this->PrestudentModel->escape($filter['konto_count_0']);
- $stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
-
- $this->PrestudentModel->db->where('(
- SELECT count(*)
- FROM public.tbl_konto
- WHERE person_id=tbl_prestudent.person_id
- AND buchungstyp_kurzbz=' . $bt . '
- AND studiensemester_kurzbz=' . $stdsem . '
- ) =', 0);
- $this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
- }
- if (isset($filter['konto_missing_counter'])) {
- $bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
- $stg = '';
- if ($this->variablelib->getVar('kontofilterstg') == 'true')
- $stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
-
- $bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
-
- $this->PrestudentModel->db->where('(
- SELECT sum(betrag)
- FROM public.tbl_konto
- WHERE person_id=tbl_prestudent.person_id' .
- $bt .
- $stg . '
- ) !=', 0);
- }
- }
-}
diff --git a/application/controllers/components/stv/Studienplan.php b/application/controllers/components/stv/Studienplan.php
index 2e7c2f425..b60388ac1 100644
--- a/application/controllers/components/stv/Studienplan.php
+++ b/application/controllers/components/stv/Studienplan.php
@@ -2,12 +2,14 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
-class Studienplan extends FHC_Controller
+class Studienplan extends Auth_Controller
{
public function __construct()
{
// TODO(chris): access!
- parent::__construct();
+ parent::__construct([
+ 'get' => self::PERM_LOGGED
+ ]);
}
public function get()
diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
index 09bbf8886..c3db99686 100644
--- a/application/controllers/components/stv/Studiensemester.php
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -2,12 +2,16 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
-class Studiensemester extends FHC_Controller
+class Studiensemester extends Auth_Controller
{
public function __construct()
{
// TODO(chris): access!
- parent::__construct();
+ parent::__construct([
+ 'index' => self::PERM_LOGGED,
+ 'now' => self::PERM_LOGGED,
+ 'set' => self::PERM_LOGGED
+ ]);
}
public function index()
@@ -28,7 +32,7 @@ class Studiensemester extends FHC_Controller
{
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
- $result = $this->StudiensemesterModel->getAkt();
+ $result = $this->StudiensemesterModel->getNearest();
if (isError($result)) {
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
new file mode 100644
index 000000000..422bf0675
--- /dev/null
+++ b/application/controllers/dashboard/Api.php
@@ -0,0 +1,76 @@
+ 'dashboard/admin:rw',
+ 'getNews' => 'dashboard/benutzer:r',
+ 'getAmpeln' => 'dashboard/benutzer:r',
+ )
+ );
+
+ $this->load->library('AuthLib', null, 'AuthLib');
+
+ $this->_setAuthUID();
+ }
+
+ public function index()
+ {
+ echo 'Dashboard API Controller';
+ }
+
+ /**
+ * Get News.
+ */
+ public function getNews()
+ {
+ $limit = $this->input->get('limit');
+
+ $this->load->model('content/News_model', 'NewsModel');
+
+ $result = $this->NewsModel->getAll($limit);
+
+ if (hasData($result))
+ {
+ $this->outputJson(getData($result), REST_Controller::HTTP_OK);
+ }
+ else
+ {
+ $this->terminateWithJsonError('fehler entdeckt');
+ }
+ }
+
+
+ /**
+ * Get Ampeln.
+ */
+ public function getAmpeln()
+ {
+
+ $this->load->model('content/Ampel_model', 'AmpelModel');
+ $result = $this->AmpelModel->getByUser($this->_uid);
+
+ if (hasData($result))
+ {
+ $this->outputJson(getData($result), REST_Controller::HTTP_OK);
+ }
+ else
+ {
+ $this->terminateWithJsonError('fehler entdeckt');
+ }
+ }
+
+ /**
+ * Retrieve the UID of the logged user and checks if it is valid
+ */
+ private function _setAuthUID()
+ {
+ $this->_uid = getAuthUID();
+
+ if (!$this->_uid) show_error('User authentification failed');
+ }
+}
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
new file mode 100644
index 000000000..2c0cf5fca
--- /dev/null
+++ b/application/controllers/dashboard/Config.php
@@ -0,0 +1,216 @@
+ 'dashboard/benutzer:r',
+ 'dummy' => 'dashboard/benutzer:r',
+ 'genWidgetId' => 'dashboard/benutzer:rw',
+ 'addWidgetsToPreset' => 'dashboard/admin:rw',
+ 'removeWidgetFromPreset' => 'dashboard/admin:rw',
+ 'addWidgetsToUserOverride' => 'dashboard/benutzer:rw',
+ 'removeWidgetFromUserOverride' => 'dashboard/benutzer:rw',
+ 'funktionen' => 'dashboard/admin:r',
+ 'preset' => 'dashboard/admin:r',
+ 'presetBatch' => 'dashboard/admin:r'
+ )
+ );
+
+ $this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+ $this->load->library('AuthLib', null, 'AuthLib');
+ $this->load->model('ressource/Funktion_model', 'FunktionModel');
+ }
+
+ public function index()
+ {
+ $dashboard_kurzbz = $this->input->get('db');
+ $uid = $this->AuthLib->getAuthObj()->username;
+
+ $dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+ if(!$dashboard) {
+ http_response_code(404);
+ $this->terminateWithJsonError(array(
+ 'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+ ));
+ }
+
+ $mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
+ $this->outputJsonSuccess($mergedconfig);
+ }
+
+ public function genWidgetId()
+ {
+ $dashboard_kurzbz = $this->input->get('db');
+ $widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+ $this->outputJsonSuccess(array(
+ 'widgetid' => $widgetid
+ ));
+ }
+
+ public function addWidgetsToPreset()
+ {
+ $input = json_decode($this->input->raw_input_stream);
+ $dashboard_kurzbz = $input->db;
+ $funktion_kurzbz = $input->funktion_kurzbz;
+
+ $preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+
+ $preset_decoded = json_decode($preset->preset, true);
+
+ $this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+
+ $preset->preset = json_encode($preset_decoded);
+
+ $result = $this->DashboardLib->insertOrUpdatePreset($preset);
+ if (isError($result)) {
+ http_response_code(500);
+ $this->terminateWithJsonError('preset could not be saved');
+ }
+
+ $this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
+ }
+
+ public function removeWidgetFromPreset()
+ {
+ $input = json_decode($this->input->raw_input_stream);
+ $dashboard_kurzbz = $input->db;
+ $funktion_kurzbz = $input->funktion_kurzbz;
+ $widgetid = $input->widgetid;
+
+ $preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+ if ($preset === null) {
+ http_response_code(404);
+ $this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
+ }
+
+ $preset_decoded = json_decode($preset->preset, true);
+ if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], $funktion_kurzbz, $widgetid))
+ {
+ http_response_code(404);
+ $this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+ }
+
+ $preset->preset = json_encode($preset_decoded);
+ $result = $this->DashboardLib->insertOrUpdatePreset($preset);
+ if (isError($result))
+ {
+ http_response_code(500);
+ $this->terminateWithJsonError('failed to remove widget');
+ }
+ $this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+ }
+
+ public function addWidgetsToUserOverride()
+ {
+ $input = json_decode($this->input->raw_input_stream);
+ $dashboard_kurzbz = $input->db;
+ $funktion_kurzbz = $input->funktion_kurzbz;
+ $uid = $this->AuthLib->getAuthObj()->username;
+
+ $override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+
+ $override_decoded = json_decode($override->override, true);
+
+ $this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+
+ $override->override = json_encode($override_decoded);
+
+ $result = $this->DashboardLib->insertOrUpdateOverride($override);
+ if (isError($result)) {
+ http_response_code(500);
+ $this->terminateWithJsonError('override could not be saved');
+ }
+
+ $this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
+ }
+
+ public function removeWidgetFromUserOverride()
+ {
+ $input = json_decode($this->input->raw_input_stream);
+ $dashboard_kurzbz = $input->db;
+ $funktion_kurzbz = $input->funktion_kurzbz;
+ $uid = $this->AuthLib->getAuthObj()->username;
+ $widgetid = $input->widgetid;
+
+ $override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+ if (empty($override)) {
+ http_response_code(404);
+ $this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+ }
+
+ $override_decoded = json_decode($override->override, true);
+
+ if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], $funktion_kurzbz, $widgetid))
+ {
+ http_response_code(404);
+ $this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+ }
+
+ $override->override = json_encode($override_decoded);
+ $result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+ if (isError($result))
+ {
+ http_response_code(500);
+ $this->terminateWithJsonError('failed to remove widget');
+ }
+ $this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+ }
+
+ public function funktionen()
+ {
+ $funktionen = $this->FunktionModel->load();
+
+ if (isError($funktionen)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($funktionen)
+ ]);
+ }
+
+ return $this->outputJsonSuccess(getData($funktionen) ?: []);
+ }
+
+ public function preset()
+ {
+ $db = $this->input->get('db');
+ $funktion = $this->input->get('funktion');
+
+ $conf = $this->DashboardLib->getPreset($db, $funktion);
+
+ if (!$conf)
+ return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+ return $this->outputJsonSuccess(json_decode($conf->preset, true));
+ }
+
+ public function presetBatch()
+ {
+ $db = $this->input->get('db');
+ $funktionen = $this->input->get('funktionen');
+ $result = [];
+
+ foreach ($funktionen as $funktion) {
+ $conf = $this->DashboardLib->getPreset($db, $funktion);
+ if ($conf)
+ {
+ $preset = json_decode($conf->preset, true);
+ if (!isset($preset['widgets']) || !isset($preset['widgets'][$funktion]))
+ $result[$funktion] = [];
+ else
+ $result[$funktion] = $preset['widgets'][$funktion];
+ }
+ else
+ $result[$funktion] = [];
+ }
+
+ return $this->outputJsonSuccess($result);
+ }
+}
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
new file mode 100644
index 000000000..3773a6d73
--- /dev/null
+++ b/application/controllers/dashboard/Dashboard.php
@@ -0,0 +1,86 @@
+ 'dashboard/admin:r',
+ 'create' => 'dashboard/admin:rw',
+ 'update' => 'dashboard/admin:rw',
+ 'delete' => 'dashboard/admin:rw'
+ )
+ );
+
+ $this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+ $this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+ }
+
+ public function index()
+ {
+ $result = $this->DashboardModel->load();
+
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+
+ return $this->outputJsonSuccess(getData($result) ?: []);
+ }
+
+ public function create()
+ {
+ $input = $this->getPostJSON();
+
+ $result = $this->DashboardModel->insert($input);
+
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+
+ return $this->outputJsonSuccess(getData($result) ?: []);
+ }
+
+ public function update()
+ {
+ $input = $this->getPostJSON();
+
+ $result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+
+ return $this->outputJsonSuccess(getData($result) ?: []);
+ }
+
+ public function delete()
+ {
+ $input = $this->getPostJSON();
+
+ $result = $this->DashboardModel->delete($input->dashboard_id);
+
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+
+ return $this->outputJsonSuccess(getData($result) ?: []);
+ }
+}
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
new file mode 100644
index 000000000..35d530384
--- /dev/null
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -0,0 +1,58 @@
+ 'dashboard/benutzer:r',
+ 'admin' => 'dashboard/admin:rw'
+ )
+ );
+
+ $this->load->library('AuthLib');
+ $this->load->library('WidgetLib');
+
+ $this->_setAuthUID(); // sets property uid
+
+ $this->setControllerId(); // sets the controller id
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+ public function index()
+ {
+ $this->load->view('dashboard/dashboard_demo.php', []);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+ public function admin()
+ {
+ $this->load->view('dashboard/dashboard_demo_admin.php', []);
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Private methods
+
+ /**
+ * Retrieve the UID of the logged user and checks if it is valid
+ */
+ private function _setAuthUID()
+ {
+ $this->_uid = getAuthUID();
+
+ if (!$this->_uid) show_error('User authentification failed');
+ }
+}
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
new file mode 100644
index 000000000..0da6fe8da
--- /dev/null
+++ b/application/controllers/dashboard/Widget.php
@@ -0,0 +1,109 @@
+ ['dashboard/benutzer:r', 'dashboard/admin:r'],
+ 'getAll' => 'dashboard/admin:r',
+ 'getWidgetsForDashboard' => ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+ 'setAllowed' => 'dashboard/admin:rw'
+ )
+ );
+
+ $this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+ $this->load->model('dashboard/Widget_model', 'WidgetModel');
+ $this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+ }
+
+ public function index()
+ {
+ $widget_id = $this->input->get('id');
+
+ $widget = $this->WidgetModel->load($widget_id);
+
+ if (isError($widget) || !getData($widget))
+ return $this->outputJsonSuccess([
+ "widget_id" => 0,
+ "widget_kurzbz" => "notfound",
+ "arguments" => json_encode([
+ "className" => 'alert-danger',
+ "title" => 'Widget Not Found',
+ "msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+ ]),
+ "setup" => json_encode([
+ "name" => 'Widget Not Found',
+ "file" => 'DashboardWidget/Default.js',
+ "width" => 1,
+ "height" => 1
+ ])
+ ]);
+ return $this->outputJsonSuccess(current(getData($widget)));
+ }
+
+ public function getAll()
+ {
+ $dashboard_id = $this->input->get('dashboard_id');
+ $result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+ if (isError($result))
+ return $this->outputJsonError(getError($result));
+
+ $this->outputJsonSuccess(getData($result) ?: []);
+ }
+
+ public function getWidgetsForDashboard()
+ {
+ $db = $this->input->get('db');
+ $result = $this->WidgetModel->getForDashboard($db);
+
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+
+ $this->outputJsonSuccess(getData($result) ?: []);
+ }
+
+ public function setAllowed()
+ {
+ $input = $this->getPostJSON();
+
+ $dashboard_id = $input->dashboard_id;
+ $widget_id = $input->widget_id;
+ $action = $input->action;
+
+ if ($action == 'add') {
+ $result = $this->DashboardWidgetModel->insert([
+ 'dashboard_id' => $dashboard_id,
+ 'widget_id' => $widget_id
+ ]);
+ } elseif ($action == 'delete') {
+ $result = $this->DashboardWidgetModel->delete([
+ 'dashboard_id' => $dashboard_id,
+ 'widget_id' => $widget_id
+ ]);
+ } else {
+ http_response_code(404); // TODO(chris): 400?
+ $this->terminateWithJsonError([
+ 'error' => 'action value invalid'
+ ]);
+ }
+ if (isError($result)) {
+ http_response_code(404);
+ $this->terminateWithJsonError([
+ 'error' => getError($result)
+ ]);
+ }
+ return $this->outputJsonSuccess(getData($result));
+ }
+}
diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
index 5784830b6..52bf972e3 100644
--- a/application/controllers/jobs/AnrechnungJob.php
+++ b/application/controllers/jobs/AnrechnungJob.php
@@ -195,10 +195,10 @@ class AnrechnungJob extends JOB_Controller
$studiengang_bezeichnung = $this->StudiengangModel->load($studiengang_kz)->retval[0]->stg_bezeichnung;
// Get STGL mail address
- $stglMailReceiver_arr = self::_getSTGLMailAddress($studiengang_kz);
+ $stglMailReceiver_arr = $this->_getSTGLMailAddress($studiengang_kz);
// Get HTML table with new Anrechnungen of that STG plus amount of them
- list ($anrechnungen_amount, $anrechnungen_table) = self::_getSTGLMailDataTable($studiengang_kz, $anrechnungen);
+ list ($anrechnungen_amount, $anrechnungen_table) = $this->_getSTGLMailDataTable($studiengang_kz, $anrechnungen);
// Link to Antrag genehmigen dashboard
$url =
@@ -514,8 +514,6 @@ html;
'vorname' => $stgl->vorname
);
}
-
- return $stglMailAdress_arr;
}
// If not available, get assistance mail address
else
@@ -524,12 +522,13 @@ html;
if (hasData($result))
{
- return array(
- $result->retval[0]->email,
- ''
+ $stglMailAdress_arr[]= array(
+ 'to' => $result->retval[0]->email,
+ 'vorname' => ''
);
}
}
+ return $stglMailAdress_arr;
}
// Build HTML table with yesterdays new Anrechnungen of the given STG
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 717561589..11b950174 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -29,6 +29,10 @@ class AntragJob extends JOB_Controller
$this->load->model('crm/Student_model', 'StudentModel');
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+ $this->loadPhrases([
+ 'lehre'
+ ]);
}
/**
@@ -179,8 +183,8 @@ class AntragJob extends JOB_Controller
$data,
$to,
'Anträge - Aktion(en) erforderlich',
- DEFAULT_SANCHO_HEADER_IMG,
- DEFAULT_SANCHO_FOOTER_IMG,
+ '',
+ '',
'',
$cc
))
@@ -412,10 +416,12 @@ class AntragJob extends JOB_Controller
$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
$this->StudierendenantragModel->addSelect('s.insertamum');
$this->StudierendenantragModel->addSelect('s.insertvon');
+ $this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id');
+ $this->StudierendenantragModel->addSelect('pts.student_uid');
$this->StudierendenantragModel->db->where_in(
'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
- $this->config->item('antrag_prestudentstatus_whitelist')
+ $this->config->item('antrag_prestudentstatus_whitelist_abmeldung')
);
$result = $this->StudierendenantragModel->getWithLastStatusWhere([
@@ -449,11 +455,23 @@ class AntragJob extends JOB_Controller
if (isError($result))
$this->logError(getError($result));
+ $this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+ $result = $this->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+ if (isError($result)) {
+ $this->logError(getError($result));
+ continue;
+ } elseif (!hasData($result)) {
+ $this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
+ continue;
+ }
+
+ $statusgrund = current(getData($result));
+
$result = $this->prestudentlib->setAbbrecher(
$antrag->prestudent_id,
$antrag->studiensemester_kurzbz,
'AntragJob',
- 'abbrecherStgl',
+ $statusgrund->statusgrund_id,
$antrag->insertamum,
null,
$antrag->insertvon ?: $insertvon
@@ -484,7 +502,7 @@ class AntragJob extends JOB_Controller
$person = current(getData($result));
$email = $studiengang->email;
$dataMail = array(
- 'prestudent' => $antrag->prestudent_id,
+ 'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id,
'studiensemester' => $antrag->studiensemester_kurzbz,
'name' => trim($person->vorname . ' '. $person->nachname),
);
diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php
index cf97b7f68..fe7ee21f5 100755
--- a/application/controllers/jobs/IssueResolver.php
+++ b/application/controllers/jobs/IssueResolver.php
@@ -9,8 +9,8 @@ class IssueResolver extends IssueResolver_Controller
{
parent::__construct();
- // set fehler codes which can be resolved by the job
- // structure: fehlercode => class (library) name for resolving
+ // set fehler codes which can be resolved by the job, with own resolver defined
+ // structure: fehlercode => class (library) name for resolving in "resolvers" folder
$this->_codeLibMappings = array(
'CORE_ZGV_0001' => 'CORE_ZGV_0001',
'CORE_ZGV_0002' => 'CORE_ZGV_0002',
@@ -30,7 +30,6 @@ class IssueResolver extends IssueResolver_Controller
'CORE_STG_0002' => 'CORE_STG_0002',
'CORE_STG_0003' => 'CORE_STG_0003',
'CORE_STG_0004' => 'CORE_STG_0004',
- 'CORE_STUDENTSTATUS_0001' => 'CORE_STUDENTSTATUS_0001',
'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
@@ -45,10 +44,19 @@ class IssueResolver extends IssueResolver_Controller
'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
+ 'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
'CORE_PERSON_0001' => 'CORE_PERSON_0001',
'CORE_PERSON_0002' => 'CORE_PERSON_0002',
'CORE_PERSON_0003' => 'CORE_PERSON_0003',
- 'CORE_PERSON_0004' => 'CORE_PERSON_0004'
+ 'CORE_PERSON_0004' => 'CORE_PERSON_0004',
+ 'CORE_PERSON_0005' => 'CORE_PERSON_0005',
+ 'CORE_PERSON_0006' => 'CORE_PERSON_0006'
+ );
+
+ // fehler which are resolved by the job the same way as they are produced
+ // structure: fehlercode => class (library) name for resolving in "plausichecks" folder
+ $this->_codeProducerLibMappings = array(
+ 'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
);
}
}
diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php
index 58bc1fb7c..0e49ca8a5 100644
--- a/application/controllers/jobs/OneTimeMessages.php
+++ b/application/controllers/jobs/OneTimeMessages.php
@@ -51,7 +51,8 @@ class OneTimeMessages extends JOB_Controller
FROM public.tbl_prestudent p
JOIN public.tbl_prestudentstatus ps USING (prestudent_id)
JOIN public.tbl_studiengang s USING (studiengang_kz)
- WHERE ps.status_kurzbz = \'Wartender\'
+ WHERE get_rolle_prestudent(ps.prestudent_id, NULL) = \'Wartender\'
+ AND ps.status_kurzbz = \'Wartender\'
AND ps.studiensemester_kurzbz = ?
AND ps.datum <= NOW() - \''.$days.' days\'::interval
AND s.typ = ?
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index b55287439..6dd214fbb 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -431,8 +431,8 @@ class ReihungstestJob extends JOB_Controller
$mailcontent_data_arr,
$applicant->email,
'Ihre Anmeldung zum Reihungstest - Reminder / Your registration for the placement test - Reminder',
- DEFAULT_SANCHO_HEADER_IMG,
- DEFAULT_SANCHO_FOOTER_IMG,
+ '',
+ '',
$from,
'',
$bcc);
@@ -821,7 +821,7 @@ class ReihungstestJob extends JOB_Controller
JOIN lehre.tbl_studienordnung USING (studienordnung_id)
JOIN PUBLIC.tbl_studiengang ON (tbl_studienordnung.studiengang_kz = tbl_studiengang.studiengang_kz)
WHERE get_rolle_prestudent (tbl_prestudent.prestudent_id, ?) IN ('Aufgenommener','Bewerber','Wartender','Abgewiesener')
- AND studiensemester_kurzbz = ?
+ AND studiensemester_kurzbz = ?
AND tbl_studiengang.typ IN ('b', 'm')
)
SELECT * FROM prst
@@ -861,7 +861,7 @@ class ReihungstestJob extends JOB_Controller
{
// Alle niedrigeren Prios laden
$qryNiedrPrios = "
- SELECT DISTINCT
+ SELECT DISTINCT ON(prestudent_id)
get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') AS laststatus,
tbl_studienplan.orgform_kurzbz,
tbl_person.nachname,
@@ -876,11 +876,11 @@ class ReihungstestJob extends JOB_Controller
JOIN PUBLIC.tbl_studiengang ON (tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz)
WHERE tbl_prestudent.person_id = ".$row_ps->person_id."
AND tbl_prestudent.prestudent_id != ".$row_ps->prestudent_id."
- AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender')
+ AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender', 'Student')
AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."'
AND tbl_studiengang.typ IN ('b', 'm')
AND priorisierung > ".$row_ps->priorisierung."
- ORDER BY studiengang_kz, laststatus
+ ORDER BY prestudent_id, studiengang_kz, laststatus, tbl_prestudentstatus.datum DESC
";
// Wenn der letzte Status "Aufgenommener" ist, alle niedrigeren Prios auf "Abgewiesen" setzen
@@ -894,12 +894,22 @@ class ReihungstestJob extends JOB_Controller
{
foreach ($resultNiedrPrios->retval as $rowNiedrPrios)
{
- // nur Info wenn aufgenommen oder master
- if ($rowNiedrPrios->laststatus == 'Aufgenommener' || $rowNiedrPrios->studiengang_typ == 'm')
+ // nur Info wenn aufgenommen/student oder master
+ if ($rowNiedrPrios->laststatus == 'Aufgenommener' || $rowNiedrPrios->laststatus == 'Student' || $rowNiedrPrios->studiengang_typ == 'm')
{
- // Mail zur Info an Assistenz schicken, dass in höherer Prio aufgenommen wurde
- $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][]
- = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+
+ if ($rowNiedrPrios->laststatus == 'Aufgenommener')
+ {
+ // Mail zur Info an Assistenz schicken, dass in höherer Prio aufgenommen wurde
+ $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][]
+ = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+ }
+ else if ($rowNiedrPrios->laststatus == 'Student')
+ {
+ $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['StudentHoeherePrio'][]
+ = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
+ }
+
}
elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum)
{
@@ -966,7 +976,7 @@ class ReihungstestJob extends JOB_Controller
FROM public.tbl_konto
WHERE person_id = " . $row_ps->person_id . "
AND studiensemester_kurzbz = '" . $row_ps->studiensemester_kurzbz . "'
- AND buchungstyp_kurzbz = 'StudiengebuehrAnzahlung'";
+ AND buchungstyp_kurzbz IN ('StudiengebuehrAnzahlung','KautionDrittStaat')";
$resultKautionExists = $db->execReadOnlyQuery($qryKautionExists);
if (hasdata($resultKautionExists))
@@ -1061,6 +1071,20 @@ class ReihungstestJob extends JOB_Controller
$mailcontent .= '';
$content = true;
}
+ if (isset($value['StudentHoeherePrio']) && !isEmptyArray($value['StudentHoeherePrio']))
+ {
+ $mailcontent .= '
+ Folgende Studenten wurden in einem höher priorisierten Studiengang aufgenommen:
';
+ $mailcontent .= '';
+ $mailcontent .= ' ';
+ sort($value['StudentHoeherePrio']);
+ foreach ($value['StudentHoeherePrio'] AS $key=>$bewerber)
+ {
+ $mailcontent .= '| '.$bewerber.' |
';
+ }
+ $mailcontent .= '
';
+ $content = true;
+ }
if (isset($value['AbgewiesenHoeherePrio']) && !isEmptyArray($value['AbgewiesenHoeherePrio']))
{
$mailcontent .= '
diff --git a/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php b/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php
deleted file mode 100644
index d22ddb85f..000000000
--- a/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-load->library('vertragsbestandteil/VertragsbestandteilLib',
- null, 'VertragsbestandteilLib');
- $this->load->library('vertragsbestandteil/GehaltsbestandteilLib',
- null, 'GehaltsbestandteilLib');
- }
-
- public function testFetch()
- {
- $dienstverhaeltnis_id = 1;
- $stichtag = null;
-
- foreach($this->VertragsbestandteilLib->fetchVertragsbestandteile(
- $dienstverhaeltnis_id, $stichtag) as $vertragsbestandteil)
- {
- //print_r($vertragsbestandteil);
- echo $vertragsbestandteil . "\n";
- }
- }
-
- public function testUpdate()
- {
- $now = new DateTime();
-
- $data = new stdClass();
- $data->vertragsbestandteil_id = 32;
- $data->von = '2022-12-05';
-
- $data->wochenstunden = 45.0;
- $data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN;
-
- $vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-
- try
- {
- $this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
- echo "Update successful.\n";
- }
- catch( Exception $ex )
- {
- echo "Update failed.\n";
- }
- }
-
-
- public function testInsert()
- {
- $now = new DateTime();
-
- $data = new stdClass();
- $data->dienstverhaeltnis_id = 1;
- $data->von = '2022-12-01';
- $data->insertamum = $now->format(DateTime::ATOM);
- $data->insertvon = 'ma0080';
- $data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION;
-
- $data->benutzerfunktion_id = 112667;
- $data->anmerkung = 'test funkton';
- $data->kuendigungsrelevant = false;
-
- $vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-
- try
- {
- $this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
- echo "Insert successful.\n";
- }
- catch( Exception $ex )
- {
- echo "Insert failed.\n";
- }
- }
-
- public function testGehaltsbestandteilInsert()
- {
- $data = new stdClass();
- $data->gehaltsbestandteil_id = 2;
- /*
- $data->dienstverhaeltnis_id = 39;
- $data->vertragsbestandteil_id = 123;
- $data->gehaltstyp_kurzbz = 'zulage';
- $data->von = '2023-04-01';
- $data->bis = '2023-08-31';
- $data->anmerkung = 'test anmerkung';
- $data->grundbetrag = 100;
- $data->betrag_valorisiert = 100;
- $data->valorisierung = true;
- */
- $data->auszahlungen = 12;
-
- $gb = new \vertragsbestandteil\Gehaltsbestandteil();
- $gb->hydrateByStdClass($data);
-
- print_r($gb->toStdClass());
-
- $this->GehaltsbestandteilLib->storeGehaltsbestandteil($gb);
- }
-}
diff --git a/application/controllers/lehre/Pruefungsprotokoll.php b/application/controllers/lehre/Pruefungsprotokoll.php
index 21f50acca..4d34b08ca 100644
--- a/application/controllers/lehre/Pruefungsprotokoll.php
+++ b/application/controllers/lehre/Pruefungsprotokoll.php
@@ -6,58 +6,59 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
*/
class Pruefungsprotokoll extends Auth_Controller
{
- private $_uid; // uid of the logged user
+ private $_uid; // uid of the logged user
- /**
- * Constructor
- */
- public function __construct()
- {
- // Set required permissions
- parent::__construct(
- array(
- 'index' => 'lehre/pruefungsbeurteilung:r',
- 'Protokoll' => 'lehre/pruefungsbeurteilung:r',
- 'saveProtokoll' => 'lehre/pruefungsbeurteilung:rw',
- )
- );
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ // Set required permissions
+ parent::__construct(
+ array(
+ 'index' => 'lehre/pruefungsbeurteilung:r',
+ 'Protokoll' => 'lehre/pruefungsbeurteilung:r',
+ 'showProtokoll' => 'lehre/pruefungsbeurteilung:r',
+ 'saveProtokoll' => 'lehre/pruefungsbeurteilung:rw',
+ )
+ );
- // Load models
- $this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel');
- $this->load->model('education/Abschlussbeurteilung_model', 'AbschlussbeurteilungModel');
+ // Load models
+ $this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel');
+ $this->load->model('education/Abschlussbeurteilung_model', 'AbschlussbeurteilungModel');
- $this->load->library('PermissionLib');
- $this->load->library('AuthLib');
+ $this->load->library('PermissionLib');
+ $this->load->library('AuthLib');
- // Load language phrases
- $this->loadPhrases(
- array(
- 'ui',
- 'global',
- 'person',
- 'abschlusspruefung',
+ // Load language phrases
+ $this->loadPhrases(
+ array(
+ 'ui',
+ 'global',
+ 'person',
+ 'abschlusspruefung',
'password',
'lehre'
- )
- );
+ )
+ );
- $this->_setAuthUID(); // sets property uid
+ $this->_setAuthUID(); // sets property uid
- $this->setControllerId(); // sets the controller id
- }
+ $this->setControllerId(); // sets the controller id
+ }
- // -----------------------------------------------------------------------------------------------------------------
- // Public methods
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
public function index()
{
$this->load->library('WidgetLib');
-
+
// Protokolle anzeigen seit heute / letzte Woche / alle
$period = $this->input->post('period');
$period = (!is_null($period)) ? $period : 'today';
-
+
$data = array('period' => $period);
-
+
$this->load->view('lehre/pruefungsprotokollUebersicht.php', $data);
}
@@ -66,47 +67,15 @@ class Pruefungsprotokoll extends Auth_Controller
*/
public function Protokoll()
{
- $abschlusspruefung_id = $this->input->get('abschlusspruefung_id');
+ $this->load->view('lehre/pruefungsprotokoll.php', $this->_getPruefungsprotokollData());
+ }
- if (!is_numeric($abschlusspruefung_id))
- show_error('invalid abschlusspruefung');
-
- $abschlusspruefung_saved = false;
- $abschlusspruefung = $this->_getAbschlusspruefungBerechtigt($abschlusspruefung_id);
-
- if (isError($abschlusspruefung))
- show_error(getError($abschlusspruefung));
- else
- {
- $abschlusspruefung = getData($abschlusspruefung);
- $abschlusspruefung_saved = isset($abschlusspruefung->protokoll) && isset($abschlusspruefung->abschlussbeurteilung_kurzbz);
- }
-
- $this->AbschlussbeurteilungModel->addOrder("sort", "ASC");
- $this->AbschlussbeurteilungModel->addOrder("(CASE WHEN abschlussbeurteilung_kurzbz = 'ausgezeichnet' THEN 1
- WHEN abschlussbeurteilung_kurzbz = 'gut' THEN 2
- WHEN abschlussbeurteilung_kurzbz = 'bestanden' THEN 3
- WHEN abschlussbeurteilung_kurzbz = 'angerechnet' THEN 4
- ELSE 5
- END
- )");
- $abschlussbeurteilung = $this->AbschlussbeurteilungModel->load();
-
- if (isError($abschlussbeurteilung))
- show_error(getError($abschlussbeurteilung));
- else
- $abschlussbeurteilung = getData($abschlussbeurteilung);
-
- $language = getUserLanguage();
-
- $data = array(
- 'abschlusspruefung' => $abschlusspruefung,
- 'abschlussbeurteilung' => $abschlussbeurteilung,
- 'abschlusspruefung_saved' => $abschlusspruefung_saved,
- 'language' => $language
- );
-
- $this->load->view('lehre/pruefungsprotokoll.php', $data);
+ /**
+ * Show Pruefungsprotokoll.
+ */
+ public function showProtokoll()
+ {
+ $this->load->view('lehre/pruefungsprotokoll.php', array_merge($this->_getPruefungsprotokollData(), array('readonly' => true)));
}
/**
@@ -168,18 +137,66 @@ class Pruefungsprotokoll extends Auth_Controller
$this->outputJsonError($this->p->t('ui', 'ungueltigeParameter'));
}
- // -----------------------------------------------------------------------------------------------------------------
- // Private methods
+ // -----------------------------------------------------------------------------------------------------------------
+ // Private methods
- /**
- * Retrieve the UID of the logged user and checks if it is valid
- */
- private function _setAuthUID()
- {
- $this->_uid = getAuthUID();
+ /**
+ * Retrieve the UID of the logged user and checks if it is valid
+ */
+ private function _setAuthUID()
+ {
+ $this->_uid = getAuthUID();
- if (!$this->_uid) show_error('User authentification failed');
- }
+ if (!$this->_uid) show_error('User authentification failed');
+ }
+
+ /**
+ *
+ * @param
+ * @return object success or error
+ */
+ private function _getPruefungsprotokollData()
+ {
+ $abschlusspruefung_id = $this->input->get('abschlusspruefung_id');
+
+ if (!is_numeric($abschlusspruefung_id))
+ show_error('invalid abschlusspruefung');
+
+ $abschlusspruefung_saved = false;
+ $abschlusspruefung = $this->_getAbschlusspruefungBerechtigt($abschlusspruefung_id);
+
+ if (isError($abschlusspruefung))
+ show_error(getError($abschlusspruefung));
+ else
+ {
+ $abschlusspruefung = getData($abschlusspruefung);
+ $abschlusspruefung_saved = isset($abschlusspruefung->protokoll) && isset($abschlusspruefung->abschlussbeurteilung_kurzbz);
+ }
+
+ $this->AbschlussbeurteilungModel->addOrder("sort", "ASC");
+ $this->AbschlussbeurteilungModel->addOrder("(CASE WHEN abschlussbeurteilung_kurzbz = 'ausgezeichnet' THEN 1
+ WHEN abschlussbeurteilung_kurzbz = 'gut' THEN 2
+ WHEN abschlussbeurteilung_kurzbz = 'bestanden' THEN 3
+ WHEN abschlussbeurteilung_kurzbz = 'angerechnet' THEN 4
+ ELSE 5
+ END
+ )");
+ $abschlussbeurteilung = $this->AbschlussbeurteilungModel->load();
+
+ if (isError($abschlussbeurteilung))
+ show_error(getError($abschlussbeurteilung));
+ else
+ $abschlussbeurteilung = getData($abschlussbeurteilung);
+
+ $language = getUserLanguage();
+
+ return array(
+ 'abschlusspruefung' => $abschlusspruefung,
+ 'abschlussbeurteilung' => $abschlussbeurteilung,
+ 'abschlusspruefung_saved' => $abschlusspruefung_saved,
+ 'language' => $language
+ );
+ }
/**
* Retrieves an Abschlussprüfung, with permission check
@@ -187,7 +204,7 @@ class Pruefungsprotokoll extends Auth_Controller
* @param $abschlusspruefung_id
* @return object success or error
*/
- private function _getAbschlusspruefungBerechtigt($abschlusspruefung_id)
+ private function _getAbschlusspruefungBerechtigt($abschlusspruefung_id)
{
$result = error('Error when getting Abschlusspruefung');
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index d6d6b2c50..107c9af96 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -21,6 +21,7 @@ class Studierendenantrag extends FHC_Controller
// Load Models
$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+ $this->load->model('person/Person_model', 'PersonModel');
// Load language phrases
$this->loadPhrases([
@@ -102,6 +103,7 @@ class Studierendenantrag extends FHC_Controller
public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
{
+
$this->load->view('lehre/Antrag/Create', [
'prestudent_id' => $prestudent_id,
'studierendenantrag_id' => $studierendenantrag_id,
@@ -185,4 +187,4 @@ class Studierendenantrag extends FHC_Controller
return $strRequiredPermissions;
}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index 3cba756cf..ebc272e3e 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -111,8 +111,13 @@ class requestAnrechnung extends Auth_Controller
$lehrveranstaltung_id = $this->input->post('lv_id');
$studiensemester_kurzbz = $this->input->post('studiensemester');
$bestaetigung = $this->input->post('bestaetigung');
- $begruendung_ects = $this->input->post('begruendung_ects');
- $begruendung_lvinhalt = $this->input->post('begruendung_lvinhalt');
+ $begruendung_ects = $this->config->item('explain_equivalence') === TRUE
+ ? $this->input->post('begruendung_ects')
+ : NULL;
+ $begruendung_lvinhalt = $this->config->item('explain_equivalence') === TRUE
+ ? $this->input->post('begruendung_lvinhalt')
+ : NULL;
+
// Validate data
if (empty($_FILES['uploadfile']['name']))
@@ -124,8 +129,8 @@ class requestAnrechnung extends Auth_Controller
isEmptyString($anmerkung) ||
isEmptyString($lehrveranstaltung_id) ||
isEmptyString($studiensemester_kurzbz) ||
- isEmptyString($begruendung_ects) ||
- isEmptyString($begruendung_lvinhalt))
+ ($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_ects)) ||
+ ($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_lvinhalt)))
{
return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
}
@@ -168,7 +173,7 @@ class requestAnrechnung extends Auth_Controller
// Hold just inserted DMS ID
$lastInsert_dms_id = $result->retval['dms_id'];
-
+
// Save Anrechnung and Anrechnungstatus
$result = $this->AnrechnungModel->createAnrechnungsantrag(
$prestudent_id,
diff --git a/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
new file mode 100644
index 000000000..b1ab2fe26
--- /dev/null
+++ b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
@@ -0,0 +1,45 @@
+ 'lehre/lehrveranstaltung:rw',
+ )
+ );
+
+ // Load libraries
+ $this->load->library('AuthLib');
+
+
+ // Load language phrases
+ $this->loadPhrases(
+ array(
+ 'global',
+ 'lehre'
+ )
+ );
+
+ $this->_setAuthUID();
+ }
+
+ public function index()
+ {
+ $this->load->view('lehre/lvplanung/lvTemplateUebersicht.php');
+ }
+
+
+ /**
+ * Retrieve the UID of the logged user and checks if it is valid
+ */
+ private function _setAuthUID()
+ {
+ $this->_uid = getAuthUID();
+
+ if (!$this->_uid) show_error('User authentification failed');
+ }
+}
\ No newline at end of file
diff --git a/application/controllers/person/Gruppenmanagement.php b/application/controllers/person/Gruppenmanagement.php
index 1a4c341a4..099871676 100644
--- a/application/controllers/person/Gruppenmanagement.php
+++ b/application/controllers/person/Gruppenmanagement.php
@@ -29,6 +29,7 @@ class Gruppenmanagement extends Auth_Controller
$this->load->model('person/benutzer_model', 'BenutzerModel');
$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
$this->load->model('person/benutzergruppe_model', 'BenutzergruppeModel');
+ $this->load->model('person/gruppe_manager_model', 'GruppemanagerModel');
$this->load->model('system/Log_model', 'LogModel');
$this->load->library('WidgetLib');
@@ -117,6 +118,27 @@ class Gruppenmanagement extends Auth_Controller
$result = error('Uid missing');
else
{
+ $this->GruppemanagerModel->addSelect('1');
+ $isManagerRes = $this->GruppemanagerModel->loadWhere(
+ array(
+ 'uid' => $this->_uid,
+ 'gruppe_kurzbz' => $gruppe_kurzbz
+ )
+ );
+
+ if (isError($isManagerRes))
+ {
+ $this->outputJsonError(getError($isManagerRes));
+ return;
+ }
+
+ if (!hasData($isManagerRes))
+ {
+ $this->outputJsonError($this->p->t('gruppenmanagement', 'nichtZumEditierenDerGruppeBerechtigt'));
+ return;
+ }
+
+ $this->BenutzergruppeModel->addSelect('1');
$benutzerExistsRes = $this->BenutzergruppeModel->loadWhere(
array(
'uid' => $uid,
@@ -170,6 +192,26 @@ class Gruppenmanagement extends Auth_Controller
$result = error('Uid missing');
else
{
+ $this->GruppemanagerModel->addSelect('1');
+ $isManagerRes = $this->GruppemanagerModel->loadWhere(
+ array(
+ 'uid' => $this->_uid,
+ 'gruppe_kurzbz' => $gruppe_kurzbz
+ )
+ );
+
+ if (isError($isManagerRes))
+ {
+ $this->outputJsonError(getError($isManagerRes));
+ return;
+ }
+
+ if (!hasData($isManagerRes))
+ {
+ $this->outputJsonError($this->p->t('gruppenmanagement', 'nichtZumEditierenDerGruppeBerechtigt'));
+ return;
+ }
+
$result = $this->BenutzergruppeModel->delete(
array(
'uid' => $uid,
diff --git a/application/controllers/system/MigrateContract.php b/application/controllers/system/MigrateContract.php
index f011be356..817eaa4f0 100644
--- a/application/controllers/system/MigrateContract.php
+++ b/application/controllers/system/MigrateContract.php
@@ -16,7 +16,9 @@ class MigrateContract extends CLI_Controller
{
private $matching_ba1_vertragsart;
- private $OE_DEFAULT = 'gst';
+ private $OE_DEFAULT;
+
+ protected $configerrors;
/**
* Constructor
@@ -28,29 +30,70 @@ class MigrateContract extends CLI_Controller
$this->load->model('codex/bisverwendung_model', 'BisVerwendungModel');
$this->load->model('person/benutzerfunktion_model', 'BenutzerfunktionModel');
- $this->matching_ba1_vertragsart = array(
- '101'=>'externerlehrender',
- '102'=>'DV anderen Gebietskörperschaft',
- '103'=>'echterdv',
- '104'=>'studentischehilfskr',
- '105'=>'externerlehrender',
- '106'=>'Andere Bildungseinrichtung',
- '107'=>'werkvertrag',
- '108'=>'studentischehilfskr',
- '109'=>'ueberlassungsvertrag',
- '110'=>'echterfreier',
- '111'=>'echterdv', //All-In
- );
+ $this->load->config('migratecontract');
+
+ $this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
+ $this->matching_ba1_vertragsart = $this->config->item('migratecontract_matching_ba1_vertragsart');
+ $this->configerrors = array();
}
// -----------------------------------------------------------------------------------------------------------------
// Public methods
+ public function checkConfig()
+ {
+ echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
+ echo "matching_ba1_vertragsart: " . print_r($this->matching_ba1_vertragsart, true);
+
+ $this->checkOE_DEFAULT();
+ $this->checkMatching_ba1_vertragsart();
+
+ if( count($this->configerrors) > 0 )
+ {
+ foreach($this->configerrors AS $configerror)
+ {
+ echo $configerror . "\n";
+ }
+ die("Fehler in der Konfiguration. Abbruch!\n");
+ }
+ else
+ {
+ echo "Konfiguration OK.\n";
+ }
+ }
+
+ protected function checkOE_DEFAULT()
+ {
+ $db = new DB_Model();
+ $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
+ $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
+ if( !hasData($oeres) )
+ {
+ $this->configerrors[] = 'Default Organisationseinheit: "'
+ . $this->OE_DEFAULT . '" nicht gefunden.';
+ }
+ }
+
+ protected function checkMatching_ba1_vertragsart() {
+ $db = new DB_Model();
+ foreach( $this->matching_ba1_vertragsart AS $vertragsart_kurzbz )
+ {
+ $vasql = 'SELECT * FROM hr.tbl_vertragsart WHERE vertragsart_kurzbz = ?';
+ $vares = $db->execReadOnlyQuery($vasql, array($vertragsart_kurzbz));
+ if( !hasData($vares) )
+ {
+ $this->configerrors[] = 'Vertragsart "' . $vertragsart_kurzbz
+ . '" nicht gefunden.';
+ }
+ }
+ }
/**
* Everything has a beginning
*/
public function index($user = null)
{
+ $this->checkConfig();
+
if (!is_null($user))
{
$contracts = $this->_transformUser($user);
@@ -400,6 +443,11 @@ class MigrateContract extends CLI_Controller
*/
private function _addVertragsbestandteilZeitaufzeichnung(&$contracts, $dv, $row_verwendung)
{
+ if( is_null($row_verwendung->zeitaufzeichnungspflichtig) || is_null($row_verwendung->azgrelevant) )
+ {
+ return;
+ }
+
if (isset($contracts['dv'][$dv]['vbs']))
{
foreach ($contracts['dv'][$dv]['vbs'] as $index_vbs=>$row_vbs)
diff --git a/application/controllers/system/MigrateHourlyRate.php b/application/controllers/system/MigrateHourlyRate.php
index 4fed2f585..dbc8f1416 100644
--- a/application/controllers/system/MigrateHourlyRate.php
+++ b/application/controllers/system/MigrateHourlyRate.php
@@ -4,14 +4,15 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
class MigrateHourlyRate extends CLI_Controller
{
-
- CONST DEFAULT_OE = 'gst';
CONST DEFAULT_DATE = '1970-01-01';
CONST STUNDENSTAZTYP_LEHRE = 'lehre';
CONST STUNDENSTAZTYP_KALKULATORISCH = 'kalkulatorisch';
+ private $OE_DEFAULT;
private $_ci;
+ protected $configerrors;
+
public function __construct()
{
parent::__construct();
@@ -21,10 +22,38 @@ class MigrateHourlyRate extends CLI_Controller
$this->load->model('codex/Bisverwendung_model', 'BisVerwendungModel');
$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+
+ $this->load->config('migratecontract');
+
+ $this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
+ $this->configerrors = array();
+ }
+
+ public function checkConfig()
+ {
+ echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
+
+ $this->checkOE_DEFAULT();
+
+ if( count($this->configerrors) > 0 )
+ {
+ foreach($this->configerrors AS $configerror)
+ {
+ echo $configerror . "\n";
+ }
+ die("Fehler in der Konfiguration. Abbruch!\n");
+ }
+ else
+ {
+ echo "Konfiguration OK.\n";
+ }
}
public function index($user = null)
{
+ $this->checkConfig();
+
+ echo "Lehre Stundensaetze werden migriert.\n";
$mitarbeiterResult = $this->_getMitarbeiterStunden($user);
if (isError($mitarbeiterResult)) return $mitarbeiterResult;
if (!hasData($mitarbeiterResult)) return error('Keine Mitarbeiterstunden gefunden');
@@ -38,20 +67,71 @@ class MigrateHourlyRate extends CLI_Controller
if (isError($insertResult)) return $insertResult;
}
- $sapResult = $this->_getSapStunden($user);
- if (isError($sapResult)) return $sapResult;
- if (!hasData($sapResult)) return error('Keinen kalkulatorischen Stundensaetze gefunden');
-
- $mitarbeiterArray = getData($sapResult);
-
- foreach ($mitarbeiterArray as $mitarbeiter)
+ if( $this->checkIfSAPSyncTableExists() )
{
- $this->_getUnternehmen($mitarbeiter);
- $insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_KALKULATORISCH, date_format(date_create($mitarbeiter->beginn), 'Y-m-d'));
- if (isError($insertResult)) return $insertResult;
+ echo "SAP Sync Tabelle gefunden. SAP Stundensaetze werden migriert.\n";
+ $sapResult = $this->_getSapStunden($user);
+ if (isError($sapResult)) return $sapResult;
+ if (!hasData($sapResult)) return error('Keinen kalkulatorischen Stundensaetze gefunden');
+
+ $mitarbeiterArray = getData($sapResult);
+
+ foreach ($mitarbeiterArray as $mitarbeiter)
+ {
+ $this->_getUnternehmen($mitarbeiter);
+ $insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_KALKULATORISCH, date_format(date_create($mitarbeiter->beginn), 'Y-m-d'));
+ if (isError($insertResult)) return $insertResult;
+ }
+ }
+ else
+ {
+ echo "SAP Sync Tabelle nicht gefunden. Ignoriere SAP Stundensaetze.\n";
}
}
+ protected function checkOE_DEFAULT()
+ {
+ $db = new DB_Model();
+ $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
+ $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
+ if( !hasData($oeres) )
+ {
+ $this->configerrors[] = 'Default Organisationseinheit: "'
+ . $this->OE_DEFAULT . '" nicht gefunden.';
+ }
+ }
+
+ protected function checkIfSAPSyncTableExists()
+ {
+ $dbModel = new DB_Model();
+ $params = array(
+ DB_NAME,
+ 'sync',
+ 'tbl_sap_stundensatz'
+ );
+
+ $sql = "SELECT
+ 1 AS exists
+ FROM
+ information_schema.tables
+ WHERE
+ table_catalog = ? AND
+ table_schema = ? AND
+ table_name = ?";
+
+ $res = $dbModel->execReadOnlyQuery($sql, $params);
+
+ if( hasData($res) )
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+
private function _getSapStunden($user = null)
{
$dbModel = new DB_Model();
@@ -127,7 +207,7 @@ class MigrateHourlyRate extends CLI_Controller
$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'");
}
- $unternehmen = self::DEFAULT_OE;
+ $unternehmen = $this->OE_DEFAULT;
if (hasData($unternehmenResult))
$unternehmen = getData($unternehmenResult)[0]->oe_kurzbz;
diff --git a/application/controllers/system/TestSearch.php b/application/controllers/system/TestSearch.php
deleted file mode 100644
index 1f5c66a1d..000000000
--- a/application/controllers/system/TestSearch.php
+++ /dev/null
@@ -1,44 +0,0 @@
- 'system/developer:r'
- )
- );
-
- // Loads WidgetLib
- $this->load->library('WidgetLib');
-
- // Loads phrases system
- $this->loadPhrases(
- array(
- 'global',
- 'ui',
- 'filter'
- )
- );
- }
-
- // -----------------------------------------------------------------------------------------------------------------
- // Public methods
-
- /**
- * Everything has a beginning
- */
- public function index()
- {
- $this->load->view('system/logs/testSearch.php');
- }
-}
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index cf0c6755a..f6e41d2e6 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -337,10 +337,13 @@ class InfoCenter extends Auth_Controller
$persondata = $this->_loadPersonData($person_id);
$checkPerson = $this->PersonModel->checkDuplicate($person_id);
-
if (isError($checkPerson)) show_error(getError($checkPerson));
- $duplicate = array('duplicated' => getData($checkPerson));
+ $checkUnruly = $this->PersonModel->checkUnruly($persondata['stammdaten']->vorname, $persondata['stammdaten']->nachname, $persondata['stammdaten']->gebdatum);
+ if (isError($checkUnruly)) show_error(getError($checkUnruly));
+
+ $duplicate = array('duplicate' => getData($checkPerson));
+ $unruly = array('unruly' => getData($checkUnruly));
$prestudentdata = $this->_loadPrestudentData($person_id);
@@ -351,7 +354,8 @@ class InfoCenter extends Auth_Controller
$persondata,
$prestudentdata,
$dokumentdata,
- $duplicate
+ $duplicate,
+ $unruly
);
$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -1285,67 +1289,28 @@ class InfoCenter extends Auth_Controller
$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
$kontakte = $this->input->post('kontakt');
- foreach ($kontakte as $kontakt)
- {
- $kontaktExists = $this->KontaktModel->loadWhere(array(
- 'kontakt_id' => $kontakt['id'],
- 'person_id' => $person_id,
- ));
+ if($kontakte) {
- if (hasData($kontaktExists))
- {
- $kontaktExists = getData($kontaktExists)[0];
+ foreach ($kontakte as $kontakt) {
+ $kontaktExists = $this->KontaktModel->loadWhere(array(
+ 'kontakt_id' => $kontakt['id'],
+ 'person_id' => $person_id,
+ ));
- if ($kontaktExists->kontakt === $kontakt['value'])
- continue;
+ if (hasData($kontaktExists)) {
+ $kontaktExists = getData($kontaktExists)[0];
- $update = $this->KontaktModel->update(
- array
- (
- 'kontakt_id' => $kontakt['id']
- ),
- array
- (
- 'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
- 'updateamum' => date('Y-m-d H:i:s'),
- 'updatevon' => $this->_uid
- )
- );
+ if ($kontaktExists->kontakt === $kontakt['value'])
+ continue;
- if (isError($update))
- $this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
- }
- }
-
- $adressen = $this->input->post('adresse');
-
- foreach ($adressen as $adresse)
- {
- $adresseExists = $this->AdresseModel->loadWhere(array(
- 'adresse_id' => $adresse['id'],
- 'person_id' => $person_id,
- ));
-
- if (hasData($adresseExists))
- {
- $adresse = $adresse['value'];
- $adresseExists = getData($adresseExists)[0];
- if ($adresseExists->strasse !== $adresse['strasse'] ||
- $adresseExists->plz !== $adresse['plz'] ||
- $adresseExists->ort !== $adresse['ort'] ||
- $adresseExists->nation !== $adresse['nation'])
- {
- $update = $this->AdresseModel->update(
+ $update = $this->KontaktModel->update(
array
(
- 'adresse_id' => $adresseExists->adresse_id
+ 'kontakt_id' => $kontakt['id']
),
array
(
- 'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
- 'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
- 'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
- 'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+ 'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
'updateamum' => date('Y-m-d H:i:s'),
'updatevon' => $this->_uid
)
@@ -1354,7 +1319,48 @@ class InfoCenter extends Auth_Controller
if (isError($update))
$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
}
+ }
+ }
+
+ $adressen = $this->input->post('adresse');
+
+ if($adressen) {
+
+ foreach ($adressen as $adresse) {
+ $adresseExists = $this->AdresseModel->loadWhere(array(
+ 'adresse_id' => $adresse['id'],
+ 'person_id' => $person_id,
+ ));
+
+ if (hasData($adresseExists)) {
+ $adresse = $adresse['value'];
+ $adresseExists = getData($adresseExists)[0];
+ if ($adresseExists->strasse !== $adresse['strasse'] ||
+ $adresseExists->plz !== $adresse['plz'] ||
+ $adresseExists->ort !== $adresse['ort'] ||
+ $adresseExists->nation !== $adresse['nation']) {
+ $update = $this->AdresseModel->update(
+ array
+ (
+ 'adresse_id' => $adresseExists->adresse_id
+ ),
+ array
+ (
+ 'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
+ 'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
+ 'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
+ 'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+ 'updateamum' => date('Y-m-d H:i:s'),
+ 'updatevon' => $this->_uid
+ )
+ );
+
+ if (isError($update))
+ $this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+ }
+
+ }
}
}
@@ -2383,4 +2389,4 @@ class InfoCenter extends Auth_Controller
$this->outputJsonSuccess("Success");
}
-}
+}
\ No newline at end of file
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
index d170a7eca..466627fe3 100644
--- a/application/core/Auth_Controller.php
+++ b/application/core/Auth_Controller.php
@@ -67,6 +67,108 @@ abstract class Auth_Controller extends FHC_Controller
}
}
+ /**
+ * Checks for Permissions depending if the given person is a
+ * Mitarbeiter and/or Student
+ * and exits/outputs an error if they are not met.
+ *
+ * @param integer $person_id
+ * @param array $permMa Perms if the person is a Mitarbeiter
+ * @param array $permStud Perms if the person is a Student
+ *
+ * @return void
+ */
+ protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+ {
+ $res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+
+ if ($res) {
+ $perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+ $this->_outputAuthError([$this->router->method => $perm]);
+ }
+ }
+
+ /**
+ * Checks for Permissions depending on the Studiengang of a Prestudent
+ * and exits/outputs an error if they are not met.
+ *
+ * @param integer $prestudent_id
+ * @param array $permStud Perms if the person is a Student
+ *
+ * @return void
+ */
+ protected function checkPermissionsForPrestudent($prestudent_id, $permStud)
+ {
+ if (!$this->hasPermissionsForPrestudent($prestudent_id, $permStud)) {
+ $this->_outputAuthError([$this->router->method => $permStud]);
+ }
+ }
+
+ /**
+ * Checks for Permissions depending if the given person is a
+ * Mitarbeiter and/or Student
+ * and returns the result.
+ *
+ * @param integer $person_id
+ * @param array $permMa Perms if the person is a Mitarbeiter
+ * @param array $permStud Perms if the person is a Student
+ *
+ * @return integer 0 if permission is granted
+ */
+ protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+ {
+ $res = 3;
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
+ $this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
+ $result = $this->PersonModel->load($person_id);
+ if (hasData($result)) {
+ if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
+ return 0;
+ $res = 1;
+ }
+ $this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+ $result = $this->PersonModel->load($person_id);
+ if (hasData($result)) {
+ $permStudConverted = [];
+ foreach (getData($result) as $row) {
+ foreach ($permStud as $k => $v) {
+ if (!isset($permStudConverted[$k])) {
+ $permStudConverted[$k] = $this->permissionlib->convertAccessType($v);
+ }
+ if ($this->permissionlib->isBerechtigt($permStudConverted[$k][0], $permStudConverted[$k][1], $row->studiengang_kz))
+ return 0;
+ }
+ }
+ $res += 2;
+ }
+ return $res;
+ }
+
+ /**
+ * Checks for Permissions depending on the Studiengang of a Prestudent
+ * and returns the result.
+ *
+ * @param integer $prestudent_id
+ * @param array $permStud Perms if the person is a Student
+ *
+ * @return boolean
+ */
+ protected function hasPermissionsForPrestudent($prestudent_id, $permStud)
+ {
+ $this->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $result = $this->PrestudentModel->load($prestudent_id);
+ if (!hasData($result))
+ show_404();
+ $stg = current(getData($result))->studiengang_kz;
+ foreach ($permStud as $k => $v) {
+ $perm = $this->permissionlib->convertAccessType($v);
+ if ($this->permissionlib->isBerechtigt($perm[0], $perm[1], $stg))
+ return true;
+ }
+ return false;
+ }
+
/**
* Outputs an error message and sets the HTTP Header.
* This function is protected so that it can be overwritten.
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 33a96b89e..37f6c3f21 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -46,6 +46,20 @@ class CI3_Events
* NOTE(chris): Autoload Events config
*/
require_once(APPPATH.'config/Events.php');
+
+$active_addons_array = explode(";", ACTIVE_ADDONS);
+
foreach (scandir(APPPATH.'config/extensions') as $dir)
if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
+
+foreach (scandir(FHCPATH.'addons') as $dir)
+ if ($dir[0] != '.' && file_exists(FHCPATH.'addons/'.$dir.'/Events.php'))
+ {
+ // only includes the Events of the addon if the addon is one of the active addons in the cis config
+ if(in_array($dir,$active_addons_array))
+ {
+ require_once FHCPATH . 'addons/' . $dir . '/Events.php';
+ }
+ }
+
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index c799de516..2f33bc82e 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -60,6 +60,9 @@ class DB_Model extends CI_Model
protected $pk; // Name of the PrimaryKey for DB-Update, Load, ...
protected $hasSequence; // False if this table has a composite primary key that is not using a sequence
// True if this table has a primary key that uses a sequence
+ //protected $paginationOptions; // $page and $page_size together in an associative array
+ protected $page;
+ protected $page_size;
private $executedQueryMetaData;
private $executedQueryListFields;
@@ -531,7 +534,7 @@ class DB_Model extends CI_Model
if (!is_numeric($start) || (is_numeric($start) && $start <= 0))
return error('The start parameter is not valid', EXIT_MODEL);
- if (is_numeric($end) && $end > $start)
+ if (is_numeric($end))
{
$this->db->limit($start, $end);
}
@@ -988,14 +991,17 @@ class DB_Model extends CI_Model
// Find and replace all the occurrences of the provided encrypted columns
// with the postgresql decryption function
- $query = str_replace(
- $encryptedColumn,
- sprintf(
- self::CRYPT_WHERE_TEMPLATE,
- $encryptedColumn,
- $decryptionPassword,
- $definition[self::CRYPT_CAST]
- ),
+ $query = preg_replace_callback(
+ '/(? 0 && $page_size > 0) {
+
+ if (isset($num_rows) && is_numeric($num_rows) && $num_rows > 0) {
+ $floatMaxPageCount = $num_rows / $page_size;
+ $maxPageCount = ceil($floatMaxPageCount);
+ if($page > $maxPageCount){
+ $page = $maxPageCount;
+ }
+ }
+ $offset = (($page-1) * $page_size);
+ $this->addLimit($page_size, $offset);
+
+ } else {
+ $this->addLimit($page_size);
+ }
+ }
+
+ /**
+ * getQueryNumRows
+ * returns the number of rows of the current build query of the codeigniter query builder instance
+ * @param bool $reset resets the select of the query
+ *
+ * @return Result_object $num_rows
+ */
+ function getNumRows($reset=false)
+ {
+ // returns the number of rows when executing the current query without reseting the select statement of the query
+ $num_rows = $this->db->count_all_results($this->dbTable,$reset);
+ if($num_rows){
+ return success($num_rows);
+ }else{
+ return error($this->db->error(), EXIT_DATABASE);
+ }
+ }
}
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 36388e271..c1e57a0f2 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -146,6 +146,19 @@ class FHCAPI_Controller extends Auth_Controller
$this->returnObj['meta'][$key] = $value;
}
+ /**
+ * @param string $key
+ * @return mixed
+ */
+ public function getMeta($key)
+ {
+ if (!isset($this->returnObj['meta']))
+ return null;
+ if (!isset($this->returnObj['meta'][$key]))
+ return null;
+ return $this->returnObj['meta'][$key];
+ }
+
/**
* @param string $status
* @return void
@@ -184,7 +197,7 @@ class FHCAPI_Controller extends Auth_Controller
}
/**
- * @param array $error
+ * @param string|array|object $error
* @param string $type (optional)
* @param integer $status (optional)
* @return void
@@ -200,7 +213,7 @@ class FHCAPI_Controller extends Auth_Controller
/**
* @param stdclass $result
* @param string $errortype
- * @return void
+ * @return mixed
*/
protected function getDataOrTerminateWithError($result, $errortype = self::ERROR_TYPE_GENERAL)
{
diff --git a/application/core/IssueResolver_Controller.php b/application/core/IssueResolver_Controller.php
index 758064ed8..ea278ddb0 100755
--- a/application/core/IssueResolver_Controller.php
+++ b/application/core/IssueResolver_Controller.php
@@ -5,21 +5,18 @@
*/
abstract class IssueResolver_Controller extends JOB_Controller
{
- const CI_PATH = 'application';
- const CI_LIBRARY_FOLDER = 'libraries';
- const EXTENSIONS_FOLDER = 'extensions';
- const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
- const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
+ // mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
+ protected $_codeLibMappings = [];
- protected $_codeLibMappings;
+ // mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
+ protected $_codeProducerLibMappings = [];
public function __construct()
{
parent::__construct();
+ // pass extension name if calling from extension
$this->load->model('system/Issue_model', 'IssueModel');
-
- $this->load->library('IssuesLib');
}
/**
@@ -27,97 +24,29 @@ abstract class IssueResolver_Controller extends JOB_Controller
*/
public function run()
{
+ $this->load->library(
+ 'issues/PlausicheckResolverLib',
+ [
+ 'extensionName' => $this->_extensionName ?? null,
+ 'codeLibMappings' => $this->_codeLibMappings,
+ 'codeProducerLibMappings' => $this->_codeProducerLibMappings
+ ]
+ );
+
$this->logInfo("Issue resolve job started");
// load open issues with given errorcodes
- $openIssuesRes = $this->IssueModel->getOpenIssues(array_keys($this->_codeLibMappings));
+ $openIssuesRes = $this->IssueModel->getOpenIssues(
+ array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
+ );
- // log error if occured
- if (isError($openIssuesRes))
- {
- $this->logError(getError($openIssuesRes));
- }
- else
- {
- // log info if no data found
- if (!hasData($openIssuesRes))
- {
- $this->logInfo("No open issues found");
- }
- else
- {
- $openIssues = getData($openIssuesRes);
+ $openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
- foreach ($openIssues as $issue)
- {
- // ignore if Fehlercode is not in libmappings (shouldn't be checked)
- if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
+ $result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
- $libName = $this->_codeLibMappings[$issue->fehlercode];
-
- // add person id and oe kurzbz automatically as params, merge it with additional params
- // decode bewerbung_parameter into assoc array
- $params = array_merge(
- array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
- isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
- );
-
- // if called from extension (extension name set), path includes extension names
- $libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
-
- // path for loading issue library
- $issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-
- // file path of library for check if file exists
- $issuesLibFilePath = DOC_ROOT . self::CI_PATH
- . '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
- // check if library file exists
- if (!file_exists($issuesLibFilePath))
- {
- // log error and continue with next issue if not
- $this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
- continue;
- }
-
- // load library connected to fehlercode
- $this->load->library($issuesLibPath . $libName);
-
- $lowercaseLibName = mb_strtolower($libName);
-
- // check if method is defined in library class
- if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
- {
- // log error and continue with next issue if not
- $this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
- continue;
- }
-
- // call the function for checking for issue resolution
- $issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
- if (isError($issueResolvedRes))
- {
- $this->logError(getError($issueResolvedRes));
- }
- else
- {
- $issueResolvedData = getData($issueResolvedRes);
-
- if ($issueResolvedData === true)
- {
- // set issue to resolved if needed
- $behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
-
- if (isError($behobenRes))
- $this->logError(getError($behobenRes));
- else
- $this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
- }
- }
- }
- }
- }
+ // log if error, or log info if inserted new issue
+ foreach ($result->errors as $error) $this->logError($error);
+ foreach ($result->infos as $info) $this->logInfo($info);
$this->logInfo("Issue resolve job ended");
}
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 8a93c4f0f..fc8f79540 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -6,20 +6,31 @@ use \DateTime as DateTime;
abstract class Notiz_Controller extends FHCAPI_Controller
{
- //public function __construct($zuordnung = 'person/Notizzuordnung_model')
- public function __construct()
+ const DEFAULT_PERMISSION_R = 'admin:r';
+ const DEFAULT_PERMISSION_RW = 'admin:rw';
+
+ public function __construct($permissions)
{
- parent::__construct([
- 'getUid' => self::PERM_LOGGED,
- 'getNotizen' => self::PERM_LOGGED,
- 'loadNotiz' => self::PERM_LOGGED,
- 'addNewNotiz' => self::PERM_LOGGED,
- 'updateNotiz' => self::PERM_LOGGED,
- 'deleteNotiz' => ['admin:w', 'assistenz:w'],
- 'loadDokumente' => ['admin:w', 'assistenz:w'],
- 'getMitarbeiter' => self::PERM_LOGGED,
- 'isBerechtigt' => self::PERM_LOGGED,
- ]);
+ $default_permissions = [
+ 'getUid' => self::DEFAULT_PERMISSION_R,
+ 'getNotizen' => self::DEFAULT_PERMISSION_R,
+ 'loadNotiz' => self::DEFAULT_PERMISSION_R,
+ 'addNewNotiz' => self::DEFAULT_PERMISSION_RW,
+ 'updateNotiz' => self::DEFAULT_PERMISSION_RW,
+ 'deleteNotiz' => self::DEFAULT_PERMISSION_RW,
+ 'loadDokumente' => self::DEFAULT_PERMISSION_R,
+ 'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
+ 'isBerechtigt' => self::DEFAULT_PERMISSION_R,
+ ];
+
+ if(!is_array($permissions))
+ {
+ $this->terminateWithError("Notiz_controller construct: permissions must be an array");
+ }
+
+ $merged_permissions = array_merge($default_permissions, $permissions);
+
+ parent::__construct($merged_permissions);
//Load Models
$this->load->model('person/Notiz_model', 'NotizModel');
@@ -158,8 +169,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$text = $this->input->post('text');
$erledigt = $this->input->post('erledigt');
$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
- //$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
- $bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
+ $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
$type = $this->input->post('typeId');
$start = $this->input->post('start');
$ende = $this->input->post('ende');
@@ -299,28 +309,17 @@ abstract class Notiz_Controller extends FHCAPI_Controller
}
//update(1) loading all dms-entries with this notiz_id
+ $dms_id_arr = [];
$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
- $dms_uploaded = null;
$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
- if (isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- elseif (!hasData($result))
- {
- $dms_id_arr = null;
- }
- else
- {
- $result = getData($result);
- foreach($result as $doc) {
- $dms_id_arr[] = array(
- 'name' => $doc->name,
- 'dms_id' => $doc->dms_id
- );
- }
+ $result = $this->getDataOrTerminateWithError($result);
+ foreach ($result as $doc) {
+ $dms_id_arr[$doc->dms_id] = array(
+ 'name' => $doc->name,
+ 'dms_id' => $doc->dms_id
+ );
}
foreach ($_FILES as $k => $file)
@@ -328,9 +327,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//update(2) attach all new files (except type application/x.fhc-dms+json)
if($file["type"] == 'application/x.fhc-dms+json')
{
- $dms_uploaded[] = array(
- 'name' => $file["name"]
- );
+ $jsonFile = json_decode(file_get_contents($file['tmp_name']));
+ unset($dms_id_arr[$jsonFile->dms_id]);
+ #$dms_uploaded[] = $jsonFile->dms_id;
}
else
{
@@ -348,48 +347,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//Todo define in dms component: readFile, downloadFile
$result = $this->dmslib->upload($dms, $k, array('*'));
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $dms_id = $result->retval['dms_id'];
+ $result = $this->getDataOrTerminateWithError($result);
+ $dms_id = $result['dms_id'];
$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
+
+ $this->getDataOrTerminateWithError($result);
}
}
//update(3) check if all files have been deleted
- if(count($dms_uploaded) != count($dms_id_arr))
+ foreach ($dms_id_arr as $file)
{
- if (count($dms_uploaded) == 0)
- {
- $filesDeleted = $dms_id_arr;
- }
- else
- {
- $upload_new_names = array_column($dms_uploaded, "name");
+ $result = $this->dmslib->removeAll($file['dms_id']);
- $filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
- return !in_array($file["name"], $upload_new_names);
- });
- }
-
- foreach ($filesDeleted as $file)
- {
- $result = $this->dmslib->removeAll($file['dms_id']);
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- else
- $this->outputJson($result);
- }
+ $this->getDataOrTerminateWithError($result);
}
+
return $this->terminateWithSuccess($result);
}
@@ -397,7 +371,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
{
$this->load->library('DmsLib');
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$notiz_id = $this->input->post('notiz_id');
$typeId = $this->input->post('type_id');
$id = $this->input->post('id');
@@ -405,43 +378,24 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//TODO(manu): define Permissions for deletion document if filecomponent finished
//get dms_id from notizdokument
- $dms_id_arr = [];
$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
+ $result = $this->getDataOrTerminateWithError($result);
- if(hasData($result))
- {
- $result = getData($result);
- foreach ($result as $doc) {
- $dms_id_arr[] = $doc->dms_id;
- }
- }
-
- if($dms_id_arr)
- {
- // Start DB transaction
- $this->db->trans_start();
+ // Start DB transaction
+ $this->db->trans_start();
+ if ($result)
$this->load->library('DmsLib');
-
- foreach($dms_id_arr as $dms_id)
+ foreach ($result as $doc) {
+ $res = $this->dmslib->removeAll($doc->dms_id);
+ if (isError($result))
{
- $result = $this->dmslib->removeAll($dms_id);
-
- if (isError($result))
- {
- $this->db->trans_rollback();
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- $this->outputJson($result);
+ $this->db->trans_rollback();
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
}
@@ -456,9 +410,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$this->load->model('person/Notiz_model', 'NotizModel');
//Delete Note
- $result = $this->NotizModel->delete(
- array('notiz_id' => $notiz_id)
- );
+ $result = $this->NotizModel->delete($notiz_id);
if (isError($result))
{
@@ -470,13 +422,12 @@ abstract class Notiz_Controller extends FHCAPI_Controller
return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
}
- $this->db->trans_rollback();
- return $this->terminateWithSuccess(current(getData($result)));
+ $this->db->trans_complete();
+ return $this->terminateWithSuccess(getData($result));
}
public function loadDokumente()
{
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$notiz_id = $this->input->post('notiz_id');
$this->NotizModel->addSelect('campus.tbl_dms_version.*');
@@ -508,4 +459,4 @@ abstract class Notiz_Controller extends FHCAPI_Controller
return $this->terminateWithSuccess($result);
}
-}
\ No newline at end of file
+}
diff --git a/application/core/PlausiIssueProducer_Controller.php b/application/core/PlausiIssueProducer_Controller.php
index 0dce7a487..5216d284c 100644
--- a/application/core/PlausiIssueProducer_Controller.php
+++ b/application/core/PlausiIssueProducer_Controller.php
@@ -5,61 +5,23 @@
*/
abstract class PlausiIssueProducer_Controller extends JOB_Controller
{
- protected $_fehlerLibMappings;
+ protected $_fehlerLibMappings = [];
protected $_app;
- public function __construct($app = null)
- {
- parent::__construct();
-
- // pass extension name if calling from extension
- $extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
-
- // load libraries
- $this->load->library('issues/PlausicheckProducerLib', array('extensionName' => $extensionName, 'app' => $this->_app));
- $this->load->library('IssuesLib');
- }
-
protected function producePlausicheckIssues($params)
{
+ $this->load->library(
+ 'issues/PlausicheckProducerLib',
+ ['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
+ );
+
$this->logInfo("Plausicheck issue producer job started");
- // get the data returned by Plausicheck
- foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
- {
- // execute the check
- $this->logInfo("Checking " . $fehler_kurzbz . "...");
- $plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
- $libName,
- $fehler_kurzbz,
- $params
- );
+ $result = $this->plausicheckproducerlib->producePlausicheckIssues($params);
- if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes));
-
- if (hasData($plausicheckRes))
- {
- $plausicheckData = getData($plausicheckRes);
-
- foreach ($plausicheckData as $plausiData)
- {
- // get the data needed for issue production
- $person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
- $oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
- $fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
- $resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
-
- // write the issue
- $addIssueRes = $this->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
-
- // log if error, or log info if inserted new issue
- if (isError($addIssueRes))
- $this->logError(getError($addIssueRes));
- elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
- $this->logInfo("Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id);
- }
- }
- }
+ // log if error, or log info if inserted new issue
+ foreach ($result->errors as $error) $this->logError($error);
+ foreach ($result->infos as $info) $this->logInfo($info);
$this->logInfo("Plausicheck issue producer job stopped");
}
diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php
new file mode 100644
index 000000000..10e54780e
--- /dev/null
+++ b/application/core/Tag_Controller.php
@@ -0,0 +1,212 @@
+ self::BERECHTIGUNG_KURZBZ,
+ 'getTags' => self::BERECHTIGUNG_KURZBZ,
+ 'addTag' => self::BERECHTIGUNG_KURZBZ,
+
+ 'updateTag' => self::BERECHTIGUNG_KURZBZ,
+ 'doneTag' => self::BERECHTIGUNG_KURZBZ,
+ 'deleteTag' => self::BERECHTIGUNG_KURZBZ,
+ ];
+
+ $merged_permissions = array_merge($default_permissions, $permissions);
+
+ parent::__construct($merged_permissions);
+
+ $this->_setAuthUID();
+ $this->load->model('person/Notiz_model', 'NotizModel');
+ $this->load->model('system/Notiztyp_model', 'NotiztypModel');
+ $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+ }
+
+ public function getTag()
+ {
+ $language = $this->_getLanguageIndex();
+ $id = $this->input->get('id');
+
+ $this->NotizModel->addSelect(
+ "tbl_notiz.titel,
+ tbl_notiz.text,
+ array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung,
+ tbl_notiz.notiz_id,
+ tbl_notiz_typ.style,
+ tbl_notiz.erledigt as done,
+ tbl_notiz.insertamum,
+ tbl_notiz.updateamum,
+ (verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
+ (bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter
+ "
+ );
+ $this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
+
+ $this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT');
+ $this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT');
+
+ $this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.verfasser_uid = bearbeiterbenutzer.uid', 'LEFT');
+ $this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT');
+
+ $notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id));
+
+ $this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array());
+ }
+
+ public function getTags()
+ {
+ $this->NotiztypModel->addSelect(
+ 'typ_kurzbz as tag_typ_kurzbz,
+ array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung,
+ style,
+ beschreibung,
+ tag
+ '
+ );
+ $this->NotiztypModel->addOrder('prioritaet');
+ $notiztypen = $this->NotiztypModel->loadWhere(array('aktiv' => true));
+ $this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
+ }
+
+ public function addTag($withZuordnung = true)
+ {
+ $postData = $this->getPostJson();
+
+ $checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $postData->tag_typ_kurzbz));
+
+ if (!hasData($checkTyp))
+ $this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+
+ if ($withZuordnung)
+ {
+ $return = array();
+ $checkZuordnungType = $this->NotizzuordnungModel->isValidType($postData->zuordnung_typ);
+ if (!isSuccess($checkZuordnungType))
+ $this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+ $values = array_unique($postData->values);
+
+ foreach ($values as $value)
+ {
+ $insertResult = $this->addNotiz($postData);
+
+ if (isError($insertResult))
+ $this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+ $insertZuordnung = $this->NotizzuordnungModel->insert(array(
+ 'notiz_id' => $insertResult->retval,
+ $postData->zuordnung_typ => $value
+ ));
+
+ if (isError($insertZuordnung))
+ $this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+ $return[] = [$postData->zuordnung_typ => $value, 'id' => $insertResult->retval];
+ }
+ $this->terminateWithSuccess($return);
+ }
+ else
+ {
+ $insertResult = $this->addNotiz($postData);
+ if (isError($insertResult))
+ $this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+ return $insertResult->retval;
+ }
+ }
+
+ private function addNotiz($postData)
+ {
+ return $this->NotizModel->insert(array(
+ 'titel' => 'TAG', //TODO klären
+ 'text' => $postData->notiz,
+ 'verfasser_uid' => $this->_uid,
+ 'erledigt' => false,
+ 'insertamum' => date('Y-m-d H:i:s'),
+ 'insertvon' => $this->_uid,
+ 'typ' => $postData->tag_typ_kurzbz
+ ));
+
+ }
+ public function updateTag()
+ {
+ $postData = $this->getPostJson();
+ $updateData = $this->NotizModel->update(array('notiz_id' => $postData->id),
+ array('text' => $postData->notiz,
+ 'updateamum' => date('Y-m-d H:i:s'),
+ 'updatevon' => $this->_uid,
+ 'bearbeiter_uid' => $this->_uid,
+ )
+ );
+ $this->terminateWithSuccess($updateData);
+ }
+ public function doneTag()
+ {
+ $postData = $this->getPostJson();
+ $updateData = $this->NotizModel->update(array('notiz_id' => $postData->id),
+ array('erledigt' => !$postData->done,
+ 'updateamum' => date('Y-m-d H:i:s'),
+ 'updatevon' => $this->_uid,
+ 'bearbeiter_uid' => $this->_uid,
+ )
+ );
+
+ $this->terminateWithSuccess($updateData);
+ }
+
+ public function deleteTag($withZuordnung = true)
+ {
+ $postData = $this->getPostJson();
+
+ $deleteNotiz = "";
+ if ($withZuordnung)
+ {
+ $deleteZuordnung = $this->NotizzuordnungModel->delete(array(
+ 'notiz_id' => $postData->id
+ ));
+
+ if (isSuccess($deleteZuordnung))
+ {
+ $deleteNotiz = $this->NotizModel->delete(array(
+ 'notiz_id' => $postData->id
+ ));
+ }
+ }
+ else
+ {
+ $deleteNotiz = $this->NotizModel->delete(array(
+ 'notiz_id' => $postData->id
+ ));
+ }
+ $this->terminateWithSuccess($deleteNotiz);
+ }
+
+ private function _setAuthUID()
+ {
+ $this->_uid = getAuthUID();
+
+ if (!$this->_uid)
+ show_error('User authentification failed');
+ }
+
+ private function _getLanguageIndex()
+ {
+ $this->load->model('system/Sprache_model', 'SpracheModel');
+ $this->SpracheModel->addSelect('index');
+ $result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+ return hasData($result) ? getData($result)[0]->index : 1;
+ }
+
+
+}
\ No newline at end of file
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index ea1795ad5..de7e866f4 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -87,18 +87,32 @@ function generateCSSsInclude($CSSs)
*/
function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
{
+ $ci =& get_instance();
+ $ci->load->model('system/Sprache_model','SpracheModel');
+ $server_language = getData($ci->SpracheModel->loadWhere(['content' => true]));
+ $server_language = array_map(function($language){
+ return ['sprache'=>$language->sprache, 'LC_Time'=>$language->locale, 'bezeichnung'=>$language->bezeichnung[$language->index-1]];
+ }, $server_language);
$user_language = getUserLanguage();
+ $ci->load->config('javascript');
+ $systemerror_mailto = $ci->config->item('systemerror_mailto');
+
+ $FHC_JS_DATA_STORAGE_OBJECT = array(
+ 'app_root' => APP_ROOT,
+ 'ci_router' => $indexPage,
+ 'called_path' => $calledPath,
+ 'called_method' => $calledMethod,
+ 'server_languages' => $server_language,
+ 'user_language' => $user_language,
+ 'timezone' => date_default_timezone_get(),
+ 'systemerror_mailto' => $systemerror_mailto,
+ );
+
$toPrint = "\n";
$toPrint .= '';
$toPrint .= "\n\n";
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index cc896856d..602008d3b 100644
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -25,6 +25,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* Used to create a return object, should not be used directly
+ * @return stdClass
*/
function _createReturnObject($code, $error, $retval)
{
@@ -39,7 +40,7 @@ function _createReturnObject($code, $error, $retval)
/**
* Success
*
- * @return array
+ * @return stdClass
*/
function success($retval = null, $code = null)
{
@@ -49,7 +50,7 @@ function success($retval = null, $code = null)
/**
* Error
*
- * @return array
+ * @return stdClass
*/
function error($retval = null, $code = null)
{
diff --git a/application/helpers/hlp_sancho_helper.php b/application/helpers/hlp_sancho_helper.php
index d599e40bc..9a32f5e1a 100644
--- a/application/helpers/hlp_sancho_helper.php
+++ b/application/helpers/hlp_sancho_helper.php
@@ -23,9 +23,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
// Functions needed in the view FHC-Header
// ------------------------------------------------------------------------
-const DEFAULT_SANCHO_HEADER_IMG = 'sancho_header_DEFAULT.jpg';
-const DEFAULT_SANCHO_FOOTER_IMG = 'sancho_footer_DEFAULT.jpg';
-
/**
* Send single Mail with Sancho Design and Layout.
* @param string $vorlage_kurzbz Name of the template for specific mail content.
@@ -38,27 +35,88 @@ const DEFAULT_SANCHO_FOOTER_IMG = 'sancho_footer_DEFAULT.jpg';
* @param string $bcc Sets BCC of mail.
* @return void
*/
-function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = DEFAULT_SANCHO_HEADER_IMG, $footerImg = DEFAULT_SANCHO_FOOTER_IMG, $from = null, $cc = null, $bcc = null)
+function sendSanchoMail(
+ $vorlage_kurzbz,
+ $vorlage_data,
+ $to,
+ $subject,
+ $headerImg = '',
+ $footerImg = '',
+ $from = null,
+ $cc = null,
+ $bcc = null
+)
{
$ci =& get_instance();
$ci->load->library('email');
$ci->load->library('MailLib');
- $sanchoHeader_img = 'skin/images/sancho/'. $headerImg;
- $sanchoFooter_img = 'skin/images/sancho/'. $footerImg;
+ $sancho_mail_config = $ci->config->item('mail');
+
if ($from == '')
{
- $from = 'sancho@'.DOMAIN;
+ $from = ((isset($sancho_mail_config['sancho_mail_default_sender'])
+ && $sancho_mail_config['sancho_mail_default_sender'])
+ ? $sancho_mail_config['sancho_mail_default_sender']
+ : 'noreply')
+ . '@' . DOMAIN;
}
// Embed sancho header and footer image
// reset important to ensure embedding of images when called in a loop
$ci->email->clear(true); // clear vars and attachments
- $ci->email->attach($sanchoHeader_img);
- $ci->email->attach($sanchoFooter_img);
- $cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
- $cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
+
+ $cid_header = '';
+ $cid_footer = '';
+
+ if (isset($sancho_mail_config['sancho_mail_use_images']) && $sancho_mail_config['sancho_mail_use_images'])
+ {
+ $sanchoHeader_img = '';
+ $sanchoFooter_img = '';
+
+ if (isset($headerImg) && $headerImg != '')
+ {
+ // use provided header image
+ $sanchoHeader_img = $headerImg;
+ }
+ elseif (isset($sancho_mail_config['sancho_mail_header_img']) && $sancho_mail_config['sancho_mail_header_img'])
+ {
+ // use default header image
+ $sanchoHeader_img = $sancho_mail_config['sancho_mail_header_img'];
+ }
+
+ if (isset($footerImg) && $footerImg != '')
+ {
+ // use provided footer image
+ $sanchoFooter_img = $footerImg;
+ }
+ elseif (isset($sancho_mail_config['sancho_mail_footer_img']) && $sancho_mail_config['sancho_mail_footer_img'])
+ {
+ // use default footer image
+ $sanchoFooter_img = $sancho_mail_config['sancho_mail_footer_img'];
+ }
+
+ // add image file paths
+ if (isset($sancho_mail_config['sancho_mail_img_path']))
+ {
+ if ($sanchoHeader_img != '')
+ {
+ $sanchoHeader_img = $sancho_mail_config['sancho_mail_img_path'].$sanchoHeader_img;
+ }
+
+ if ($sanchoFooter_img != '')
+ {
+ $sanchoFooter_img = $sancho_mail_config['sancho_mail_img_path'].$sanchoFooter_img;
+ }
+ }
+
+ // attach header and footer
+ $ci->email->attach($sanchoHeader_img, 'inline');
+ $ci->email->attach($sanchoFooter_img, 'inline');
+ $cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
+ $cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
+ }
// Set specific mail content into specific content template
$content = _parseMailContent($vorlage_kurzbz, $vorlage_data);
@@ -74,7 +132,18 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
$body = _parseMailContent('Sancho_Mail_Template', $layout);
// Send mail
- return $ci->maillib->send($from, $to, $subject, $body, $alias = '', $cc, $bcc, $altMessage = '', $bulk = true, $autogenerated = true);
+ return $ci->maillib->send(
+ $from,
+ $to,
+ $subject,
+ $body,
+ '', // alias
+ $cc,
+ $bcc,
+ '', // altMessage
+ true, // bulk
+ true // autogenerated
+ );
}
/**
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index ce4485279..d90a98241 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -77,7 +77,9 @@ class AntragLib
'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
], [
- 'statusgrund_id' => null
+ 'statusgrund_id' => null,
+ 'updateamum' => date('c'),
+ 'updatevon' => $insertvon
]);
}
}
@@ -121,7 +123,7 @@ class AntragLib
public function unpauseAntrag($antrag_id, $insertvon)
{
if ($insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED)
- return error($this->p->t('studierendenantrag', 'error_no_right'));
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_right'));
if ($insertvon == Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) {
return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
}
@@ -257,18 +259,28 @@ class AntragLib
if (isError($result))
$errors[] = getError($result);
+ $this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+ $result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStud']);
+ if (isError($result)) {
+ $errors[] = getError($result);
+ continue;
+ } elseif (!hasData($result)) {
+ $errors[] = $this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStud']);
+ continue;
+ }
+ $statusgrund = current(getData($result));
+
$result = $this->_ci->prestudentlib->setAbbrecher(
$antrag->prestudent_id,
$antrag->studiensemester_kurzbz,
$insertvon,
- 'abbrecherStud',
+ $statusgrund->statusgrund_id,
$antrag->datum,
$insertam
);
- if (isError($result))
- {
+ if (isError($result)) {
$errors[] = getError($result);
- return $errors;
+ continue;
}
$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
@@ -325,7 +337,10 @@ class AntragLib
'status_kurzbz'=>$prestudentstatus->status_kurzbz,
'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
- ], []);
+ ], [
+ 'updateamum' => $insertam,
+ 'updatevon' => $insertvon
+ ]);
if (isError($result))
{
$errors[] = getError($result);
@@ -421,11 +436,20 @@ class AntragLib
// NOTE(chris): here we should have error handling but at the
// moment there is no way to notify the user for "soft" errors
+ $this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+ $result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
+
+ $statusgrund = current(getData($result));
+
$result = $this->_ci->prestudentlib->setAbbrecher(
$antrag->prestudent_id,
$antrag->studiensemester_kurzbz,
$insertvon,
- 'abbrecherStgl',
+ $statusgrund->statusgrund_id,
$status->insertamum
);
@@ -911,7 +935,7 @@ class AntragLib
public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
{
$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
'studiensemester_kurzbz'=> $studiensemester_kurzbz,
'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
]);
@@ -1341,7 +1365,7 @@ class AntragLib
if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
], [
Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1353,7 +1377,7 @@ class AntragLib
return success(-1);
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
], [
Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1367,7 +1391,7 @@ class AntragLib
return success(0);
}
- $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+ $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
if (isError($result))
return $result;
if (!hasData($result))
@@ -1428,7 +1452,7 @@ class AntragLib
&& $result->status_kurzbz != 'Unterbrecher') {
return success(0);
}
- $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+ $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
if (isError($result))
return $result;
if (!hasData($result))
@@ -1444,12 +1468,6 @@ class AntragLib
elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
return success(-2);
}
- if ($antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
- {
- // NOTE(chris): Ignore canceled ones
- if ($antrag->status == Studierendenantragstatus_model::STATUS_CANCELLED)
- continue;
- }
if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
{
if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
@@ -1510,7 +1528,7 @@ class AntragLib
$datumStatus = $result->datum;
if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
]);
@@ -1520,7 +1538,7 @@ class AntragLib
return success(-1);
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
]);
@@ -1530,7 +1548,7 @@ class AntragLib
return success(-1);
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
- 'prestudent_id' => $prestudent_id,
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
]);
@@ -1541,7 +1559,7 @@ class AntragLib
return success(0);
}
- $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+ $result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
if (isError($result))
return $result;
if (!hasData($result))
@@ -1594,7 +1612,7 @@ class AntragLib
public function getDetailsForLastAntrag($prestudent_id, $typ = null)
{
$where = [
- 'prestudent_id' => $prestudent_id
+ 'tbl_studierendenantrag.prestudent_id' => $prestudent_id
];
$types = null;
if ($typ) {
@@ -2180,4 +2198,4 @@ class AntragLib
$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
return $result;
}
-}
+}
\ No newline at end of file
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
new file mode 100644
index 000000000..355cf7c56
--- /dev/null
+++ b/application/libraries/CmsLib.php
@@ -0,0 +1,309 @@
+ci =& get_instance();
+
+ // Load Models
+ $this->ci->load->model('content/Content_model', 'ContentModel');
+ $this->ci->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
+ $this->ci->load->model('content/Template_model', 'TemplateModel');
+ if (defined('LOG_CONTENT') && LOG_CONTENT)
+ $this->ci->load->model('system/Webservicelog_model', 'WebservicelogModel');
+ }
+
+ // -----------------------------------------------------------------------------------------------------------------
+ // Public methods
+
+ /**
+ * @param int $content_id
+ * @param int $version
+ * @param string $sprache
+ * @param boolean $sichtbar
+ *
+ * @return stdClass
+ */
+ public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
+ {
+ if (!is_numeric($content_id))
+ return error('ContentID ist ungueltig');
+
+ if ($sprache === null)
+ $sprache = getUserLanguage();
+
+ $islocked = $this->ci->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
+ if (isError($islocked))
+ return $islocked;
+
+ if (getData($islocked)) {
+ $uid = getAuthUID();
+ $isberechtigt = $this->ci->ContentgruppeModel->berechtigt($content_id, $uid);
+ if (isError($isberechtigt))
+ return $isberechtigt;
+
+ if (!getData($isberechtigt))
+ return error('global/keineBerechtigungFuerDieseSeite');
+ }
+ $content = $this->ci->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
+
+ if (isError($content))
+ return $content;
+
+ // Legt einen Logeintrag für die Klickstatistik an
+ if (defined('LOG_CONTENT') && LOG_CONTENT) {
+ // Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
+ if (isLogged()) {
+ $request_data = 'content_id=' . $content_id;
+ if ($version !== null)
+ $request_data .= '&version=' . $version;
+ if ($sichtbar !== true)
+ $request_data .= '&sichtbar=' . $sichtbar;
+ $this->ci->WebservicelogModel->insert([
+ 'webservicetyp_kurzbz' => 'content',
+ 'request_id' => $content_id,
+ 'beschreibung' => 'content',
+ 'request_data' => $request_data . '&sprache=' . $sprache,
+ 'execute_time' => 'now()',
+ 'execute_user' => getAuthUID()
+ ]);
+ }
+ }
+
+ $content = getData($content);
+
+ //XSLT Vorlage laden
+ $template = $this->ci->TemplateModel->load($content->template_kurzbz);
+ if (isError($template))
+ return $template;
+ $template = current(getData($template));
+
+ $XML = new DOMDocument();
+ $XML->loadXML($content->content);
+
+ if($content->titel){
+ $betreff = $content->titel;
+ }else{
+ //DomDocument getElementsByTagName returns a DomNodeList
+ $betreff = $XML->getElementsByTagName('betreff');
+ //check if any betreff was found and if it is not empty
+ if($betreff->length > 0 && !empty($betreff->item(0)->nodeValue))
+ {
+ //DomNodeList item() return a DomNode, property nodeValue contains the value of the node
+ $betreff = $betreff->item(0)->nodeValue;
+
+ }
+ else
+ {
+ return error('no betreff found for the content');
+ }
+ }
+
+ $xsltemplate = new DOMDocument();
+ $xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+ //Transformation
+ $processor = new XSLTProcessor();
+ $processor->importStylesheet($xsltemplate);
+
+
+ $transformed_content = $processor->transformToXML($XML);
+ //replaces all the dms.php with the new CIS4 Controller
+ $transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content);
+ //replaces all the cms.php with the new CIS4 Controller
+ $transformed_content = preg_replace('/content\.php\?content\_id\=([0-9]+)/', APP_ROOT.'cis.php/CisVue/Cms/content/$1', $transformed_content);
+
+ return success([
+ "betreff"=>$betreff,
+ "type"=>$content->template_kurzbz,
+ "content"=>$transformed_content
+ ]);
+ }
+
+ /**
+ * @param stdClass $stg_obj
+ *
+ * @return stdClass
+ */
+ protected function getNewsExtras($stg_obj, $semester)
+ {
+ $this->ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+ $stg_ltg = $this->ci->StudiengangModel->getLeitungDetailed($stg_obj->studiengang_kz);
+ if (isError($stg_ltg))
+ return $stg_ltg;
+ $stg_ltg = getData($stg_ltg) ?: [];
+
+ $gf_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
+ if (isError($gf_ltg))
+ return $gf_ltg;
+ $gf_ltg = getData($gf_ltg) ?: [];
+
+ $stv_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
+ if (isError($stv_ltg))
+ return $stv_ltg;
+ $stv_ltg = getData($stv_ltg) ?: [];
+
+ $ass = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+ if (isError($ass))
+ return $ass;
+ $ass = getData($ass) ?: [];
+
+ $hochschulvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
+ if (isError($hochschulvertr))
+ return $hochschulvertr;
+ $hochschulvertr = getData($hochschulvertr) ?: [];
+
+ $stdv = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
+ if (isError($stdv))
+ return $stdv;
+ $stdv = getData($stdv) ?: [];
+
+ $jahrgangsvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
+ if (isError($jahrgangsvertr))
+ return $jahrgangsvertr;
+ $jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+
+ return success($this->ci->load->view('Cis/Cms/News/Xml/NewsExtras', [
+ 'studiengang' => $stg_obj,
+ 'semester' => $semester,
+ 'stg_ltg' => $stg_ltg,
+ 'gf_ltg' => $gf_ltg,
+ 'stv_ltg' => $stv_ltg,
+ 'ass' => $ass,
+ 'hochschulvertr' => $hochschulvertr,
+ 'stdv' => $stdv,
+ 'jahrgangsvertr' => $jahrgangsvertr
+ ], true));
+ }
+
+ /**
+ * @param string $studiengang_kz
+ * @param string $semester
+ *
+ * @return array queried studiengang_kz and semester
+ */
+ public function getStgAndSem($studiengang_kz, $semester)
+ {
+ $this->ci->load->model('crm/Student_model', 'StudentModel');
+
+ //Zum anzeigen der Studiengang-Details neben den News
+ $student = $this->ci->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+ if (isError($student))
+ return $student;
+ if (getData($student)) {
+ $student = current(getData($student));
+ if ($studiengang_kz === null)
+ $studiengang_kz = $student->studiengang_kz;
+ if ($semester === null)
+ $semester = $student->semester;
+ }
+ return [$studiengang_kz, $semester];
+ }
+
+ /**
+ * @param boolean $infoscreen
+ * @param string | null $studiengang_kz
+ * @param int | null $semester
+ * @param boolean $mischen
+ * @param string $titel
+ * @param boolean $edit
+ * @param boolean $sichtbar
+ *
+ * @return void
+ */
+ public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10, $sprache)
+ {
+ $this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+ list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
+ $all = $edit;
+
+ $xml = '';
+
+ $this->ci->load->model('content/News_model', 'NewsModel');
+ $news = $this->ci->NewsModel->getNewsWithContent($sprache, $studiengang_kz, $semester, null, $sichtbar, 0, $page, $page_size, $all, $mischen);
+
+ if (isError($news))
+ return $news;
+
+ $news = getData($news);
+
+ foreach ($news as $newsobj) {
+ if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
+ continue;
+ $date = new DateTime($newsobj->datum);
+ $datum = 'format('d.m.Y') . ']]>';
+ $datum .= 'format('Y-m-d H:i') . ']]>';
+ $id = $edit ? 'news_id . ']]>' : '';
+ $xml .= "" . $newsobj->content . $datum . $id . "";
+ }
+
+ /* if ($studiengang_kz != 0) {
+ $stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
+ if (isError($stg_obj))
+ return $stg_obj;
+ $stg_obj = current(getData($stg_obj) ?: []);
+
+ if ($stg_obj) {
+ if (!$edit && !$infoscreen) {
+ $extras = $this->getNewsExtras($stg_obj, $semester);
+ if (isError($extras))
+ return $extras;
+ $xml .= getData($extras);
+ }
+ $xml .= 'bezeichnung . ']]>';
+ }
+ } */
+
+ if ($titel != '') {
+ $xml .= '' . $titel . '';
+ }
+
+ $xml .= '';
+
+ //XSLT Vorlage laden
+ $template = $this->ci->TemplateModel->load($infoscreen ? 'news_infoscreen' : 'news');
+ if (isError($template))
+ return $template;
+ $template = current(getData($template));
+
+ $XML = new DOMDocument();
+ $XML->loadXML($xml);
+
+ $xsltemplate = new DOMDocument();
+ $xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+ //Transformation
+ $processor = new XSLTProcessor();
+ $processor->importStylesheet($xsltemplate);
+
+ $content = $processor->transformToDoc($XML);
+ $content->formatOutput = true;
+
+ $content = $content->saveHTML();
+ $content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+
+ return success($content);
+ }
+}
diff --git a/application/libraries/DocumentExportLib.php b/application/libraries/DocumentExportLib.php
new file mode 100644
index 000000000..595ac461a
--- /dev/null
+++ b/application/libraries/DocumentExportLib.php
@@ -0,0 +1,714 @@
+vorlage_kurzbz, $oe_kurzbz, $version);
+ * $doc->setFilename($filename);
+ * $doc->addDataXML($data);
+ * $doc->addImage($imagepath, $imagename, $imagecontenttype);
+ * $doc->create($outputformat);
+ * $doc->output(true);
+ * $doc->close();
+ *
+ * New:
+ * $xml_data = $this->documentexportlib->getDataXML($data);
+ * $images = [[
+ * 'path' => $imagepath,
+ * 'name' => $imagename,
+ * 'contenttype' => $imagecontenttype
+ * ]];
+ * $this->documentexportlib->showContent(
+ * $filename,
+ * $vorlage,
+ * $xml_data,
+ * $oe_kurzbz,
+ * $version,
+ * $outputformat,
+ * null,
+ * null,
+ * $images
+ * );
+ */
+class DocumentExportLib
+{
+ private $unoconv_version;
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ // Gets CI instance
+ $this->ci =& get_instance();
+
+ // Load Phrases
+ $this->ci->load->library('PhrasesLib', ['document_export', null], 'documentExportPhrases');
+
+ // Which document converter has to be used
+ if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+ {
+ // Use docsbox!!
+ }
+ else
+ {
+ exec('unoconv --version', $ret_arr);
+
+ if(isset($ret_arr[0]))
+ {
+ $hlp = explode(' ', $ret_arr[0]);
+ if(isset($hlp[1]))
+ {
+ $this->unoconv_version = $hlp[1];
+ }
+ else
+ show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv_version"));
+ }
+ else
+ show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv"));
+ }
+ }
+
+ /**
+ * Laedt die XML Daten fuer die XSL Transformation anhand eines Arrays
+ *
+ * @param array $data Array mit Daten
+ * @param string $root Bezeichnung des Root Nodes
+ *
+ * @return DOMDocument
+ */
+ public function getDataArray($data, $root)
+ {
+ $xml_data = new DOMDocument();
+ $xml_data->loadXML($this->convertArrayToXML($data, $root));
+ return $xml_data;
+ }
+
+ /**
+ * XML Daten fuer die XSL Transformation
+ *
+ * @param string $xml
+ *
+ * @return DOMDocument
+ */
+ public function getDataXML($xml)
+ {
+ $xml_data = new DOMDocument();
+ $xml_data->loadXML($xml);
+ return $xml_data;
+ }
+
+ /**
+ * URL zu XML Datei die fuer XSLTransformation verwendet werden soll
+ *
+ * @param string $xml URL to XML
+ * @param string $params GET parameter
+ *
+ * @return stdClass
+ */
+ public function getDataURL($xml, $params)
+ {
+ $xml_found = false;
+
+ $aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
+ foreach($aktive_addons as $addon) {
+ $xmlfile = DOC_ROOT . 'addons/' . $addon . '/rdf/' . $xml;
+ if (file_exists($xmlfile)) {
+ $xml_found = true;
+ $xml_url = XML_ROOT . '../addons/' . $addon . '/rdf/' . $xml . '?' . $params;
+ break;
+ }
+ }
+ if (!$xml_found)
+ $xml_url = XML_ROOT . $xml . '?' . $params;
+
+
+ // Load the XML source
+ $xml_data = new DOMDocument;
+
+ if (!$xml_data->load($xml_url))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_xml_load", [
+ "url" => $xml_url,
+ "xml" => $xml,
+ "params" => $params
+ ]));
+
+ return success($xml_data);
+ }
+
+ /**
+ * Adds a XML Tag for signatur to the document
+ *
+ * @param DomDocument $xml_data
+ *
+ * @return void
+ */
+ protected function addSignToData($xml_data)
+ {
+ $signblock = $xml_data->createElement("signed", "true");
+ $xml_data->documentElement->appendChild($signblock);
+ }
+
+ /**
+ * Adds a XML Tag for archive to the document
+ *
+ * @param DomDocument $xml_data
+ *
+ * @return void
+ */
+ public function addArchiveToData($xml_data)
+ {
+ $archiv = $xml_data->createElement("archivierbar", "true");
+ $xml_data->documentElement->appendChild($archiv);
+ }
+
+ /**
+ * Get the contents of a Document
+ *
+ * @param stdClass $vorlage A db entry from tbl_vorlage
+ * @param DomDocument $xml_data
+ * @param string $oe_kurzbz
+ * @param integer|null $version (optional)
+ * @param string $outputformat (optional)
+ * @param string $sign_user (optional) Must be a valid uid
+ * @param string $sign_profile (optional) Signatureprofile for signing
+ * @param array $images (optional) Each element should have a property path, name & contenttype which are all strings
+ *
+ * @return stdClass
+ */
+ public function getContent(
+ $vorlage,
+ $xml_data,
+ $oe_kurzbz,
+ $version = null,
+ $outputformat = null,
+ $sign_user = null,
+ $sign_profile = null,
+ $images = []
+ ) {
+ $source_folder = getcwd();
+ $temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
+
+ $outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
+
+ $result = $this->createAndSignContent(
+ $temp_folder,
+ $outputformat,
+ $vorlage,
+ $oe_kurzbz,
+ $version,
+ $xml_data,
+ $images,
+ $sign_user,
+ $sign_profile
+ );
+ if (isError($result)) {
+ $this->close($temp_folder, $source_folder);
+ return $result;
+ }
+ $temp_filename = getData($result);
+
+ $fsize = filesize($temp_filename);
+ $handle = fopen($temp_filename, 'r');
+ if (!$handle)
+ return error($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+ $result = fread($handle, $fsize);
+ fclose($handle);
+
+ $this->close($temp_folder, $source_folder);
+
+ return success($result);
+ }
+
+ /**
+ * Sets the headers and displays the Document.
+ * On failure the exit() function will be called
+ *
+ * @param string $filename
+ * @param stdClass $vorlage A db entry from tbl_vorlage
+ * @param DomDocument $xml_data
+ * @param string $oe_kurzbz
+ * @param integer|null $version (optional)
+ * @param string $outputformat (optional)
+ * @param string $sign_user (optional) Must be a valid uid
+ * @param string $sign_profile (optional) Signatureprofile for signing
+ * @param array $images (optional) Each element should have a property path, name & contenttype which are all strings
+ *
+ * @return void
+ */
+ public function showContent(
+ $filename,
+ $vorlage,
+ $xml_data,
+ $oe_kurzbz,
+ $version = null,
+ $outputformat = null,
+ $sign_user = null,
+ $sign_profile = null,
+ $images = []
+ ) {
+ $source_folder = getcwd();
+ $temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
+
+ $outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
+
+ $result = $this->createAndSignContent(
+ $temp_folder,
+ $outputformat,
+ $vorlage,
+ $oe_kurzbz,
+ $version,
+ $xml_data,
+ $images,
+ $sign_user,
+ $sign_profile
+ );
+ if (isError($result)) {
+ $this->close($temp_folder, $source_folder);
+ exit(getError($result));
+ }
+ $temp_filename = getData($result);
+
+ $fsize = filesize($temp_filename);
+ $handle = fopen($temp_filename, 'r');
+ if (!$handle) {
+ $this->close($temp_folder, $source_folder);
+ exit($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+ }
+
+ if (headers_sent()) {
+ $this->close($temp_folder, $source_folder);
+ exit($this->ci->documentExportPhrases->t("document_export", "error_headers"));
+ }
+
+ switch ($outputformat) {
+ case 'pdf':
+ header('Content-type: application/pdf');
+ header('Content-Disposition: attachment; filename="' . $filename . '.pdf"');
+ header('Content-Length: ' . $fsize);
+ break;
+
+ case 'doc':
+ header('Content-type: application/vnd.ms-word');
+ header('Content-Disposition: attachment; filename="' . $filename . '.doc"');
+ header('Content-Length: ' . $fsize);
+ break;
+
+ case 'odt':
+ header('Content-type: application/vnd.oasis.opendocument.text');
+ header('Content-Disposition: attachment; filename="' . $filename . '.odt"');
+ header('Content-Length: ' . $fsize);
+ break;
+ default:
+ $this->close($temp_folder, $source_folder);
+ exit($this->ci->documentExportPhrases->t("document_export", "error_outputformat_missing"));
+ }
+
+ while (!feof($handle)) {
+ echo fread($handle, 8192);
+ }
+ fclose($handle);
+
+ $this->close($temp_folder, $source_folder);
+ }
+
+ /**
+ * Helper function for getContent and showContent.
+ * Creates the temp folder and calls create and sign functions.
+ *
+ * @param string $temp_folder
+ * @param string $outputformat
+ * @param stdClass $vorlage
+ * @param string $oe_kurzbz
+ * @param integer $version
+ * @param DomDocument $xml_data
+ * @param array $images Each element should have a property path, name and contenttype which are all strings
+ * @param string $sign_user Must be a valid uid
+ * @param string $sign_profile Signatureprofile for signing
+ *
+ * @return stdClass
+ */
+ protected function createAndSignContent(
+ $temp_folder,
+ $outputformat,
+ $vorlage,
+ $oe_kurzbz,
+ $version,
+ $xml_data,
+ $images,
+ $sign_user,
+ $sign_profile
+ ) {
+ mkdir($temp_folder);
+ chdir($temp_folder);
+
+ $this->ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+
+ $result = $this->ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_template_missing"));
+ $vorlage_stg = current(getData($result));
+ foreach ($vorlage_stg as $k => $v)
+ $vorlage->$k = $v;
+
+ $result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images);
+ if (isError($result))
+ return $result;
+
+ $temp_filename = getData($result);
+
+ if ($sign_user) {
+ $this->addSignToData($xml_data);
+
+ $result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile);
+ if (isError($result))
+ return $result;
+
+ $temp_filename = getData($result);
+ }
+
+ return success($temp_filename);
+ }
+
+ /**
+ * Helper function for createAndSignContent.
+ * Creates the files in the temp folder.
+ *
+ * @param string $temp_folder
+ * @param string $outputformat
+ * @param stdClass $vorlage
+ * @param DomDocument $xml_data
+ * @param array $images Each element should have a property path, name and contenttype which are all strings
+ *
+ * @return stdClass
+ */
+ protected function create($temp_folder, $outputformat, $vorlage, $xml_data, $images)
+ {
+ $content_xsl = new DOMDocument();
+ if (!$content_xsl->loadXML($vorlage->text))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_xsl_load"));
+
+ $proc = new XSLTProcessor();
+ $proc->importStyleSheet($content_xsl);
+
+ $contentbuffer = $proc->transformToXml($xml_data);
+
+ file_put_contents($temp_folder . '/content.xml', $contentbuffer);
+
+ if ($xml_data->firstChild->tagName == 'error')
+ return error($xml_data->firstChild->textContent);
+
+ // styles.xml erstellen
+ if ($vorlage->style) {
+ $styles_xsl = new DOMDocument();
+ if (!$styles_xsl->loadXML($vorlage->style))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_styles_load"));
+ $style_proc = new XSLTProcessor();
+ $style_proc->importStyleSheet($styles_xsl);
+
+ $stylesbuffer = $style_proc->transformToXml($xml_data);
+
+ file_put_contents($temp_folder . '/styles.xml', $stylesbuffer);
+ }
+
+ // Template holen
+ $vorlage_found = false;
+ $vorlage_filename = $vorlage->vorlage_kurzbz . ($vorlage->mimetype == 'application/vnd.oasis.opendocument.spreadsheet' ? '.ods' : '.odt');
+
+ $aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
+ foreach($aktive_addons as $addon) {
+ $zipfile = DOC_ROOT . 'addons/' . $addon . '/system/vorlage_zip/' . $vorlage_filename;
+
+ if (file_exists($zipfile)) {
+ $vorlage_found = true;
+ break;
+ }
+ }
+ if (!$vorlage_found)
+ $zipfile = DOC_ROOT . 'system/vorlage_zip/' . $vorlage_filename;
+
+ $tempname_zip = $temp_folder . '/out.zip';
+
+ if (!copy($zipfile, $tempname_zip))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_file_copy"));
+
+ exec("zip $tempname_zip content.xml");
+ if (!is_null($styles_xsl))
+ exec("zip $tempname_zip styles.xml");
+
+ // bilder hinzufuegen
+ if (count($images) > 0)
+ {
+ // Unterordner fuer die Bilder erstellen
+ mkdir('Pictures');
+
+ // Manifest Datei holen
+ exec('unzip ' . $tempname_zip . ' META-INF/manifest.xml');
+
+ // Bild zur Manifest Datei hinzufuegen
+ $manifest = file_get_contents('META-INF/manifest.xml');
+
+ $manifest_xml = new DOMDocument;
+ if (!$manifest_xml->loadXML($manifest))
+ return error($this->ci->documentExportPhrases->t("document_export", "error_manifest"));
+
+ //root-node holen
+ $root = $manifest_xml->getElementsByTagName('manifest')->item(0);
+
+ foreach ($images as $bild) {
+ copy($bild['path'], 'Pictures/' . $bild['name']);
+
+ //Neues Element unterhalb des Root Nodes anlegen
+ $node = $manifest_xml->createElement("manifest:file-entry");
+ $node->setAttribute("manifest:full-path", 'Pictures/' . $bild['name']);
+ $node->setAttribute("manifest:media-type", $bild['contenttype']);
+ $root->appendChild($node);
+ }
+
+ $out = $manifest_xml->saveXML();
+
+ //geaenderte Manifest Datei speichern und wieder ins Zip packen
+ file_put_contents('META-INF/manifest.xml', $out);
+ exec('zip ' . $tempname_zip . ' META-INF/*');
+
+ // Bilder zum ZIP-File hinzufuegen
+ exec('zip ' . $tempname_zip . ' Pictures/*');
+ }
+
+ clearstatcache();
+
+ switch ($outputformat) {
+ case 'pdf':
+ case 'doc':
+ $ret = 0;
+ $temp_filename = $temp_folder . '/out.' . $outputformat;
+
+ if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true) {
+ // Use docsbox
+
+ $this->ci->load->library("DocsboxLib");
+
+ $docboxlib = get_class($this->ci->docboxlib);
+
+ $ret = $docboxlib::convert($tempname_zip, $temp_filename, $outputformat);
+ } else {
+ // Use unoconv
+
+ // Unoconv Version 0.6 hat eine Bug wodurch die Berechtigungen des PDF/Doc nicht korrekt gesetzt
+ // werden. Deshalb wird dies hier speziell behandelt.
+ // Die 2. Variante hat den Vorteil dass hier eine bessere Fehlerbehandlung moeglich ist
+ if ($this->unoconv_version == '0.6')
+ $command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . ' %2$s > %1$s';
+ else
+ $command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . ' --output %s %s 2>&1';
+
+ $command = sprintf($command, $temp_filename, $tempname_zip);
+
+ exec($command, $out, $ret);
+ }
+
+ if ($ret)
+ return error($this->ci->documentExportPhrases->t("document_export", "error_conv_timeout"));
+ break;
+ case 'odt':
+ default:
+ $temp_filename = $tempname_zip;
+ }
+
+ return success($temp_filename);
+ }
+
+ /**
+ * Helper function for createAndSignContent.
+ * Signs the main file in the temp folder.
+ *
+ * @param string $temp_folder
+ * @param string $temp_filename
+ * @param string $outputformat
+ * @param string $user Must be a valid uid
+ * @param string $profile Signatureprofile for signing
+ *
+ * @return stdClass
+ */
+ protected function sign($temp_folder, $temp_filename, $outputformat, $user, $profile)
+ {
+ if ($outputformat != 'pdf')
+ return error($this->ci->documentExportPhrases->t("document_export", "error_sign_pdf"));
+
+ // Load the File
+ $file_data = file_get_contents($temp_filename);
+
+ $data = new stdClass();
+ $data->document = base64_encode($file_data);
+
+ // Signatur Profil
+ if (!is_null($profile))
+ $data->profile = $profile;
+ else
+ $data->profile = SIGNATUR_DEFAULT_PROFILE;
+
+ // Username des Endusers der die Signatur angefordert hat
+ $data->user = $user;
+
+ $ch = curl_init();
+
+ curl_setopt($ch, CURLOPT_URL, SIGNATUR_URL . '/' . SIGNATUR_SIGN_API);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 7);
+ curl_setopt($ch, CURLOPT_USERAGENT, "FH-Complete");
+
+ // SSL Zertifikatsprüfung deaktivieren
+ // Besser ist es das Zertifikat am Server zu installieren!
+ //curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+ //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+ $data_string = json_encode($data, JSON_FORCE_OBJECT);
+
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, [
+ 'Content-Type: application/json',
+ 'Content-Length:' . mb_strlen($data_string),
+ 'Authorization: Basic ' . base64_encode(SIGNATUR_USER . ":" . SIGNATUR_PASSWORD)
+ ]);
+
+ $result = curl_exec($ch);
+ if (curl_errno($ch)) {
+ curl_close($ch);
+ return error($this->ci->documentExportPhrases->t("document_export", "error_sign_timeout"));
+ }
+ curl_close($ch);
+ $resultdata = json_decode($result);
+
+ // If it is success
+ if (isset($resultdata->error) && $resultdata->error == 0) {
+ $signed_filename = $temp_folder . '/signed.pdf';
+ file_put_contents($signed_filename, base64_decode($resultdata->retval));
+ return success($signed_filename);
+ }
+
+ // otherwise if it is an error
+ return error($resultdata->retval ?? $this->ci->documentExportPhrases->t("global", "unknown_error", ["error" => $result]));
+ }
+
+ /**
+ * Deletes all files in the $temp_folder and changes back to the source_folder
+ *
+ * @param string $temp_folder
+ * @param string $source_folder
+ *
+ * @return void
+ */
+ protected function close($temp_folder, $source_folder)
+ {
+ $files = glob($temp_folder . '/*'); // get all file names
+ foreach ($files as $file)
+ if (is_file($file))
+ unlink($file);
+
+ chdir($source_folder);
+ rmdir($temp_folder);
+ }
+
+ /**
+ * Convert an array to XML
+ *
+ * @param array $data
+ * @param string $root
+ * @param SimpleXMLElement $xml_data
+ *
+ * @return string|boolean
+ */
+ private function convertArrayToXML($data, $root = null, $xml_data = null)
+ {
+ $_xml_data = $xml_data;
+ if ($_xml_data === null)
+ $_xml_data = new SimpleXMLElement($root !== null ? '<' . $root . ' />' : '');
+
+ foreach ($data as $key => $value) {
+ if (is_array($value)) {
+ if (is_numeric($key)) {
+ $key = 'item' . $key; // dealing with <0/>.. issues
+ $this->convertArrayToXML($value, null, $_xml_data);
+ } else {
+ $subnode = $_xml_data->addChild($key);
+ $this->convertArrayToXML($value, null, $subnode);
+ }
+ } else {
+ // Remove UTF8 Control Characters (breaking XML)
+ $value = preg_replace('/[\x00-\x1F\x7F]/u', '', $value);
+ $_xml_data->addChild((string)$key, htmlspecialchars("$value"));
+ }
+ }
+
+ return $_xml_data->asXML();
+ }
+
+ /**
+ * Get default outputformat from mimetype if its not set
+ *
+ * @param string $outputformat
+ * @param string $mimetype
+ *
+ * @return string
+ */
+ private function getDefaultOutputFormat($outputformat, $mimetype)
+ {
+ if ($outputformat)
+ return $outputformat;
+
+ if ($mimetype == 'application/vnd.oasis.opendocument.spreadsheet')
+ return 'ods';
+ if ($mimetype == 'application/vnd.oasis.opendocument.text')
+ return 'odt';
+
+ return 'pdf';
+ }
+}
diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index 8b13ae3e5..272899de6 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -371,21 +371,21 @@ class FilterCmptLib
foreach ($filterFields as $filterField)
{
// If not an empty array
- if ($filterField != null)
+ if (!isEmptyArray($filterField))
{
//
- if (isset($filterField->name) && isset($filterField->operation) && isset($filterField->condition)
- && !isEmptyString($filterField->name) && !isEmptyString($filterField->operation)
- && !isEmptyString($filterField->condition))
+ if (isset($filterField['name']) && isset($filterField['operation']) && isset($filterField['condition'])
+ && !isEmptyString($filterField['name']) && !isEmptyString($filterField['operation'])
+ && !isEmptyString((string)$filterField['condition']))
{
// Fine
$filter = new stdClass();
- $filter->name = $filterField->name;
- $filter->operation = $filterField->operation;
- $filter->condition = $filterField->condition;
- if (isset($filterField->option) && !isEmptyString($filterField->option))
+ $filter->name = $filterField['name'];
+ $filter->operation = $filterField['operation'];
+ $filter->condition = $filterField['condition'];
+ if (isset($filterField['option']) && !isEmptyString($filterField['option']))
{
- $filter->option = $filterField->option;
+ $filter->option = $filterField['option'];
}
else
{
@@ -565,6 +565,7 @@ class FilterCmptLib
getAuthPersonId()
);
+
// If filters were loaded
if (hasData($filters))
{
@@ -1173,4 +1174,3 @@ class FilterCmptLib
return $filterName;
}
}
-
diff --git a/application/libraries/IssuesLib.php b/application/libraries/IssuesLib.php
index 9b3a9de6e..f38303b3c 100644
--- a/application/libraries/IssuesLib.php
+++ b/application/libraries/IssuesLib.php
@@ -246,7 +246,27 @@ class IssuesLib
$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
}
- $openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
+ if (isset($resolution_params))
+ {
+ if (is_array($resolution_params))
+ {
+ foreach ($resolution_params as $resolution_key => $resolution_param)
+ {
+ if (!is_string($resolution_key))
+ return error("Invalid parameter for resolution, must be an associative array");
+ }
+ }
+ else
+ return error("Invalid parameters for resolution");
+ }
+
+ $openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount(
+ $fehlercode,
+ $person_id,
+ $oe_kurzbz,
+ $fehlercode_extern,
+ $resolution_params
+ );
if (hasData($openIssuesCountRes))
{
@@ -256,20 +276,6 @@ class IssuesLib
if ($openIssueCount == 0)
{
- if (isset($resolution_params))
- {
- if (is_array($resolution_params))
- {
- foreach ($resolution_params as $resolution_key => $resolution_param)
- {
- if (!is_string($resolution_key))
- return error("Invalid parameter for resolution, must be an associative array");
- }
- }
- else
- return error("Invalid parameters for resolution");
- }
-
// insert new issue
return $this->_ci->IssueModel->insert(
array(
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
index bf8174cf4..42502f999 100644
--- a/application/libraries/PermissionLib.php
+++ b/application/libraries/PermissionLib.php
@@ -95,6 +95,33 @@ class PermissionLib
return $isBerechtigt;
}
+ /**
+ * Prueft ob die Berechtigung zumindest fuer eine der angegebenen OE vorhanden ist.
+ * @param $berechtigung_kurzbz
+ * @param $oe_kurzbz
+ * @param $art
+ * @param $kostenstelle_id
+ * @return boolean
+ */
+ public function isBerechtigtMultipleOe($berechtigung_kurzbz, $oe_kurzbz, $art=null, $kostenstelle_id=null)
+ {
+ $results = array();
+
+ foreach($oe_kurzbz as $value)
+ {
+ $results[] = $this->isBerechtigt($berechtigung_kurzbz, $art, $value, $kostenstelle_id);
+ }
+
+ if(!in_array(true, $results))
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
/**
* Checks if the caller is allowed to access to this content with the given permissions
* - if it's called from command line than it's trusted
@@ -147,19 +174,7 @@ class PermissionLib
if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
{
// Retrieves permission and required access type from the $requiredPermissions array
- list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
-
- $accessType = '';
-
- // Set the access type
- if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
- {
- $accessType = PermissionLib::SELECT_RIGHT; // S
- }
- if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
- {
- $accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
- }
+ list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
if (!isEmptyString($accessType)) // if compliant
{
@@ -209,6 +224,24 @@ class PermissionLib
return $checkPermissions;
}
+ /**
+ * Retrieves permission and required access type from the newly formatted permission string
+ *
+ * @param string $permission
+ *
+ * @return array
+ */
+ public function convertAccessType($permission)
+ {
+ list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
+ $accessType = '';
+ if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
+ $accessType = PermissionLib::SELECT_RIGHT;
+ if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
+ $accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
+ return [$permission, $accessType];
+ }
+
/**
* Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
* It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)
diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
index dec3d54c0..ecd8094d6 100644
--- a/application/libraries/PhrasesLib.php
+++ b/application/libraries/PhrasesLib.php
@@ -200,6 +200,17 @@ class PhrasesLib
return '<< PHRASE '.$phrase.' >>';
}
+ /**
+ * Workaround to reload the phrases array on an already constructed library.
+ * @parameters -> look for _setPhrases docs
+ */
+ public function setPhrases($categories, $language)
+ {
+ if (count($categories) > 0) $this->_setPhrases($categories, $language);
+
+ return $this->_phrases;
+ }
+
// -----------------------------------------------------------------------------------------------------------------
// Private methods
@@ -319,6 +330,7 @@ class PhrasesLib
{
$this->_phrases = $phrases->retval;
}
+
}
/**
@@ -329,4 +341,4 @@ class PhrasesLib
{
return json_encode($this->_phrases);
}
-}
+}
\ No newline at end of file
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ae4ad59c6..ef5e2e3a9 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,8 +35,15 @@ class PrestudentLib
$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
}
- public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
- {
+ public function setAbbrecher(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $insertvon = null,
+ $statusgrund_id = null,
+ $datum = null,
+ $bestaetigtam = null,
+ $bestaetigtvon = null
+ ) {
if (!$insertvon)
$insertvon = getAuthUID();
if (!$bestaetigtvon)
@@ -70,8 +77,8 @@ class PrestudentLib
if(!$bestaetigtam)
$bestaetigtam = date('c');
- //Status und Statusgrund updaten
- $result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
+ // Status und Statusgrund updaten
+ $result = $this->_ci->PrestudentstatusModel->insert([
'prestudent_id' => $prestudent_id,
'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
@@ -82,13 +89,13 @@ class PrestudentLib
'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
'studienplan_id'=> $prestudent_status->studienplan_id,
'bestaetigtvon' => $bestaetigtvon,
- 'bestaetigtam' => $bestaetigtam
+ 'bestaetigtam' => $bestaetigtam,
+ 'statusgrund_id' => $statusgrund_id
]);
if (isError($result))
return $result;
-
//Verband anlegen
$result = $this->_ci->LehrverbandModel->load([
'studiengang_kz' => $student->studiengang_kz,
@@ -134,7 +141,7 @@ class PrestudentLib
]);
}
- //noch nicht eingetragene Zeugnisnoten auf 9 setzen
+ // noch nicht eingetragene Zeugnisnoten auf 9 setzen
$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
if (isError($result))
return $result;
@@ -166,9 +173,9 @@ class PrestudentLib
}
- //Update Aktionen
+ // Update Aktionen
- //StudentModel updaten
+ // StudentModel updaten
$this->_ci->StudentModel->update([
'student_uid' => $student->student_uid
], [
@@ -192,7 +199,7 @@ class PrestudentLib
'updatevon' => $insertvon
]);
- //Benutzer inaktiv setzen
+ // Benutzer inaktiv setzen
$this->_ci->BenutzerModel->update([
'uid' => $student->student_uid
], [
@@ -206,17 +213,28 @@ class PrestudentLib
return success();
}
- public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
- {
+ public function setUnterbrecher(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $studierendenantrag_id = null,
+ $insertvon = null,
+ $ausbildungssemester = null,
+ $statusgrund_id = null
+ ) {
$ausbildungssemester_plus = 0;
+
if (!$insertvon)
$insertvon = getAuthUID();
+
$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+
if (isError($result))
return $result;
+
$result = getData($result);
- if (!$result) {
+
+ if (!$result) { // NOTE(chris): no status in target stdsem
//NOTE(manu): only valid if nextSemester focus max
$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -224,7 +242,7 @@ class PrestudentLib
return $result;
$result = getData($result);
- //check if ausbildungssemester is last
+ // check if ausbildungssemester is last
$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
if(isError($res))
@@ -236,7 +254,7 @@ class PrestudentLib
$studiengang = current(getData($res));
$prestudent_status = current($result);
- if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+ if ($prestudent_status->status_kurzbz != Prestudentstatus_model::STATUS_UNTERBRECHER && $prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
$ausbildungssemester_plus = 1;
if(!$result)
@@ -246,34 +264,79 @@ class PrestudentLib
'studiensemester_kurzbz' => $studiensemester_kurzbz
]));
}
+ } elseif (current($result)->status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER) {
+ if ($studierendenantrag_id)
+ {
+ $resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+ if (isError($resultAntrag))
+ return $resultAntrag;
+ $resultAntrag = getData($resultAntrag);
+ if (!$resultAntrag)
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+
+ $antrag = current($resultAntrag);
+ $anmerkung = current($result)->anmerkung . ' Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+
+ $result = $this->_ci->PrestudentstatusModel->update([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => current($result)->ausbildungssemester
+ ], [
+ 'updatevon' => $insertvon,
+ 'updateamum' => date('c'),
+ 'anmerkung'=> $anmerkung
+ ]);
+
+ if (isError($result))
+ return $result;
+ }
+
+ return success();
}
$prestudent_status = current($result);
+
+
$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
if (isError($result))
return $result;
+
$result = getData($result);
+
if (!$result)
return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
$student = current($result);
- $resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
- if (isError($resultAntrag))
- return $resultAntrag;
- $resultAntrag = getData($resultAntrag);
- if (!$resultAntrag)
- return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
- $antrag = current($resultAntrag);
+ if ($studierendenantrag_id)
+ {
+ $resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+ if (isError($resultAntrag))
+ return $resultAntrag;
+ $resultAntrag = getData($resultAntrag);
+ if (!$resultAntrag)
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
- //Status updaten
+ $antrag = current($resultAntrag);
+ $anmerkung = 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+ }
+ else
+ $anmerkung = '';
+
+ if ($ausbildungssemester)
+ $semester = $ausbildungssemester;
+ else
+ $semester = $prestudent_status->ausbildungssemester + $ausbildungssemester_plus;
+
+ // Status updaten
$result = $this->_ci->PrestudentstatusModel->insert([
'prestudent_id' => $prestudent_id,
'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
'studiensemester_kurzbz' => $studiensemester_kurzbz,
- 'ausbildungssemester' => $prestudent_status->ausbildungssemester + $ausbildungssemester_plus,
+ 'ausbildungssemester' => $semester,
'datum' => date('c'),
'insertvon' => $insertvon,
'insertamum' => date('c'),
@@ -281,7 +344,8 @@ class PrestudentLib
'studienplan_id'=> $prestudent_status->studienplan_id,
'bestaetigtvon' => $insertvon,
'bestaetigtam' => date('c'),
- 'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
+ 'anmerkung'=> $anmerkung,
+ 'statusgrund_id' => $statusgrund_id
]);
if (isError($result))
@@ -332,7 +396,7 @@ class PrestudentLib
]);
}
- //noch nicht eingetragene Zeugnisnoten auf 9 setzen
+ // noch nicht eingetragene Zeugnisnoten auf 9 setzen
$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
if (isError($result))
return $result;
@@ -363,10 +427,9 @@ class PrestudentLib
}
}
+ // Update Aktionen
- //Update Aktionen
-
- //StudentModel updaten
+ // StudentModel updaten
$this->_ci->StudentModel->update([
'student_uid' => $student->student_uid
], [
@@ -409,4 +472,463 @@ class PrestudentLib
return success();
}
+
+ public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ $authUID = getAuthUID();
+ $now = date('c');
+
+
+ $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+ 'prestudent_id' => $prestudent_id
+ ]));
+
+ $prestudent_status = current(getData($result));
+
+
+ $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+ $student = current(getData($result));
+
+
+ $this->_ci->load->library('VariableLib', ['uid' => $authUID]);
+ $semester_aktuell = $this->_ci->variablelib->getVar('semester_aktuell');
+
+
+ // Update Aktionen
+
+ // Status updaten
+ $result = $this->_ci->PrestudentstatusModel->insert([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'statusgrund_id' => $statusgrund_id,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'datum' => $now,
+ 'insertvon' => $authUID,
+ 'insertamum' => $now,
+ 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+ 'studienplan_id'=> $prestudent_status->studienplan_id,
+ 'bestaetigtvon' => $authUID,
+ 'bestaetigtam' => $now
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Student updaten
+ $result = $this->_ci->StudentModel->update([
+ 'student_uid' => $student->student_uid
+ ], [
+ 'semester' => $ausbildungssemester,
+ 'verband' => '',
+ 'gruppe' => '',
+ 'updatevon' => $authUID,
+ 'updateamum' => $now
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Studentlehrverband updaten
+ $result = $this->_ci->StudentlehrverbandModel->update([
+ 'student_uid' => $student->student_uid,
+ 'studiensemester_kurzbz' => $semester_aktuell
+ ], [
+ 'semester' => $ausbildungssemester,
+ 'verband' => '',
+ 'gruppe' => '',
+ 'updatevon' => $authUID,
+ 'updateamum' => $now
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Benutzer updaten
+ $result = $this->_ci->BenutzerModel->load([$student->student_uid]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('person', 'error_noBenutzer'));
+
+ $benutzer = current(getData($result));
+ $updateData = [
+ 'aktiv' => true,
+ 'updateamum' => $now,
+ 'updatevon' => $authUID
+ ];
+ if (!$benutzer->aktiv) {
+ $updateData['updateaktivam'] = $now;
+ $updateData['updateaktivvon'] = $authUID;
+ }
+
+
+ $this->_ci->BenutzerModel->update([$student->student_uid], $updateData);
+
+ return success();
+ }
+
+ public function setFirstStudent(
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $orgform_kurzbz,
+ $studienplan_id,
+ $statusgrund_id
+ ) {
+ $this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+ $this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+ $result = $this->_ci->PrestudentModel->load($prestudent_id);
+
+ if (isError($result))
+ return $result;
+
+ if (!hasData($result))
+ return error('No prestudent');
+
+ $student_data = current(getData($result));
+
+
+ $authUID = getAuthUID();
+ $now = date('c');
+ $today = date('Y-m-d');
+
+ $jahr = mb_substr($studiensemester_kurzbz, 4, 2);
+
+
+ // Genererate Personenkennzeichen
+ $personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
+ $student_data->studiengang_kz,
+ $studiensemester_kurzbz,
+ $student_data->typ
+ );
+ if (isError($personenkennzeichen))
+ return $personenkennzeichen;
+ $personenkennzeichen = getData($personenkennzeichen);
+
+
+ // Generate UID
+ $uid = $this->_ci->StudentModel->generateUID(
+ $student_data->kurzbz,
+ $jahr,
+ $student_data->typ,
+ $personenkennzeichen,
+ $student_data->vorname,
+ $student_data->nachname
+ );
+ if (isError($uid))
+ return $uid;
+ $uid = getData($uid);
+
+
+ // Generate Matrikelnummer
+ $matrikelnummer = $this->_ci->BenutzerModel->generateMatrikelnummer(
+ $student_data->oe_kurzbz
+ );
+ if (isError($matrikelnummer))
+ return $matrikelnummer;
+ $matrikelnummer = getData($matrikelnummer);
+
+
+ // Generate Alias
+ $alias = '';
+ if (!defined('GENERATE_ALIAS_STUDENT')
+ || GENERATE_ALIAS_STUDENT === true
+ ) {
+ $result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
+ if (isError($result))
+ return $result;
+ $alias = getData($result);
+ }
+
+ // Generate Activation Key
+ $activationkey = $this->_ci->BenutzerModel->generateActivationkey();
+
+
+ // Overwrite stuff
+ if (defined('SET_UID_AS_MATRIKELNUMMER')
+ && SET_UID_AS_MATRIKELNUMMER)
+ $matrikelnummer = $uid;
+ if (defined('SET_UID_AS_PERSONENKENNZEICHEN')
+ && SET_UID_AS_PERSONENKENNZEICHEN)
+ $personenkennzeichen = $uid;
+
+
+ // Update Person
+ $this->_ci->load->model('person/Person_model', 'PersonModel');
+ $result = $this->_ci->PersonModel->update([
+ 'person_id' => $student_data->person_id,
+ 'matr_nr' => null
+ ], [
+ 'matr_nr' => $matrikelnummer
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Add Benutzer
+ $result = $this->_ci->BenutzerModel->insert([
+ 'uid' => $uid,
+ 'person_id' => $student_data->person_id,
+ 'aktiv' => true,
+ 'aktivierungscode' => $activationkey,
+ 'alias' => $alias,
+ 'insertvon' => $authUID,
+ 'insertamum' => $now,
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Add Student
+ $result = $this->_ci->StudentModel->insert([
+ 'student_uid' => $uid,
+ 'matrikelnr' => $personenkennzeichen,
+ 'prestudent_id' => $prestudent_id,
+ 'studiengang_kz' => $student_data->studiengang_kz,
+ 'semester' => $ausbildungssemester,
+ 'verband' => ' ',
+ 'gruppe' => ' ',
+ 'insertvon' => $authUID,
+ 'insertamum' => $now
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Add Lehrverband if it does not exist
+ $result = $this->_ci->LehrverbandModel->load([' ', ' ', $ausbildungssemester, $student_data->studiengang_kz]);
+
+ if (isError($result))
+ return $result;
+
+ if (!hasData($result)) {
+ $result = $this->_ci->LehrverbandModel->insert([
+ 'studiengang_kz' => $student_data->studiengang_kz,
+ 'semester' => $ausbildungssemester,
+ 'verband' => ' ',
+ 'gruppe' => ' ',
+ 'aktiv' => true
+ ]);
+
+ if (isError($result))
+ return $result;
+ }
+
+
+ // Add Rolle
+ $result = $this->_ci->PrestudentstatusModel->insert([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'orgform_kurzbz'=> $orgform_kurzbz,
+ 'studienplan_id'=> $studienplan_id,
+ 'datum' => $today,
+ 'insertamum' => $now,
+ 'insertvon' => $authUID,
+ 'bestaetigtam' => $today,
+ 'bestaetigtvon' => $authUID,
+ 'statusgrund_id' => $statusgrund_id
+ ]);
+
+ if (isError($result))
+ return $result;
+
+
+ // Add Studentlehrverband
+ $result = $this->_ci->StudentlehrverbandModel->insert([
+ 'student_uid' => $uid,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'studiengang_kz' => $student_data->studiengang_kz,
+ 'semester' => $ausbildungssemester,
+ 'verband' => ' ',
+ 'gruppe' => ' ',
+ 'insertamum' => $now,
+ 'insertvon' => $authUID
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ return success();
+ }
+
+ public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ return $this->setBasic(
+ getAuthUID(),
+ date('c'),
+ Prestudentstatus_model::STATUS_DIPLOMAND,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ }
+
+ public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ $authUID = getAuthUID();
+ $now = date('c');
+
+
+ $result = $this->setBasic(
+ $authUID,
+ $now,
+ Prestudentstatus_model::STATUS_ABSOLVENT,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+
+ if (isError($result))
+ return $result;
+
+
+ // Load Student
+ $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+ $student = current(getData($result));
+
+
+ // Benutzer inaktiv setzen
+ $this->_ci->BenutzerModel->update([
+ 'uid' => $student->student_uid
+ ], [
+ 'aktiv' => false,
+ 'updateaktivvon' => $authUID,
+ 'updateaktivam' => $now,
+ 'updatevon' => $authUID,
+ 'updateamum' => $now
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ return success();
+ }
+
+ public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ $result = $this->setBasic(
+ getAuthUID(),
+ date('c'),
+ Prestudentstatus_model::STATUS_BEWERBER,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+
+ if (isError($result))
+ return $result;
+
+ if (SEND_BEWERBER_INFOMAIL) {
+ // TODO(chris): IMPLEMENT!
+ }
+
+ return success();
+ }
+
+ public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ return $this->setBasic(
+ getAuthUID(),
+ date('c'),
+ Prestudentstatus_model::STATUS_AUFGENOMMENER,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ }
+
+ public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ return $this->setBasic(
+ getAuthUID(),
+ date('c'),
+ Prestudentstatus_model::STATUS_ABGEWIESENER,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ }
+
+ public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+ {
+ return $this->setBasic(
+ getAuthUID(),
+ date('c'),
+ Prestudentstatus_model::STATUS_WARTENDER,
+ $prestudent_id,
+ $studiensemester_kurzbz,
+ $ausbildungssemester,
+ $statusgrund_id
+ );
+ }
+
+ protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
+ {
+ $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+ 'prestudent_id' => $prestudent_id
+ ]));
+
+ $prestudent_status = current(getData($result));
+
+
+ // Update Aktionen
+
+ // Status updaten
+ $result = $this->_ci->PrestudentstatusModel->insert([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => $status_kurzbz,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz,
+ 'ausbildungssemester' => $ausbildungssemester,
+ 'datum' => $now,
+ 'insertvon' => $authUID,
+ 'insertamum' => $now,
+ 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+ 'studienplan_id'=> $prestudent_status->studienplan_id,
+ 'bestaetigtvon' => $authUID,
+ 'bestaetigtam' => $now,
+ 'statusgrund_id' => $statusgrund_id
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ return success();
+ }
}
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
new file mode 100644
index 000000000..5e3d8a307
--- /dev/null
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -0,0 +1,922 @@
+_ci =& get_instance();
+
+ $this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+ $this->_ci->load->model('person/Person_model', 'PersonModel');
+ $this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+ $this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+ $this->_ci->load->model('crm/Student_model', 'StudentModel');
+ $this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+ $this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+ }
+
+ /**
+ * Checks if a status add is valid.
+ * @return object error if invalid
+ */
+ public function checkStatusAdd(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_status_studiensemester_kurzbz,
+ $new_status_datum,
+ $new_status_ausbildungssemester,
+ $new_studienplan_id
+ ) {
+ $studentName = '';
+
+ $nameRes = $this->_ci->PersonModel->loadPrestudent($prestudent_id);
+
+ if (hasData($nameRes))
+ {
+ $nameData = getData($nameRes)[0];
+ $studentName = $nameData->vorname.' '.$nameData->nachname;
+ }
+
+ // Datum des neuen Status darf nicht in Vergangenheit liegen, sonst Probleme wenn neues Datum < Bismeldedatum
+ if (new DateTime($new_status_datum) < new DateTime('today'))
+ return error($studentName . $this->_ci->p->t('lehre', 'error_entryInPast'));
+
+ return $this->_checkIfValidStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_status_studiensemester_kurzbz,
+ $new_status_datum,
+ $new_status_ausbildungssemester,
+ $new_studienplan_id
+ );
+ }
+
+ /**
+ * Checks if a status update is valid.
+ * @return error if invalid
+ */
+ public function checkStatusUpdate(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_status_studiensemester_kurzbz,
+ $new_status_datum,
+ $new_status_ausbildungssemester,
+ $new_studienplan_id,
+ $old_status_studiensemester,
+ $old_status_ausbildungssemester
+ ) {
+
+ return $this->_checkIfValidStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_status_studiensemester_kurzbz,
+ $new_status_datum,
+ $new_status_ausbildungssemester,
+ $new_studienplan_id,
+ $old_status_studiensemester,
+ $old_status_ausbildungssemester
+ );
+ }
+
+ /**
+ * Checks if a student already exists.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkIfExistingStudent($prestudent_id)
+ {
+ $result = $this->_ci->StudentModel->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ return success(hasData($result));
+ }
+
+ /**
+ * Check if Reihungstest was admitted
+ *
+ * @param stdClass $prestudent
+ *
+ * @return stdClass
+ */
+ public function checkIfAngetreten($prestudent)
+ {
+ return success($prestudent->reihungstestangetreten);
+ }
+
+ /**
+ * Check if ZGV-Code is registered
+ *
+ * @param stdClass $prestudent
+ *
+ * @return stdClass
+ */
+ public function checkIfZGVEingetragen($prestudent_person)
+ {
+ return success((boolean)$prestudent_person->zgv_code);
+ }
+
+ /**
+ * Check if Master ZGV-Code is registered
+ *
+ * @param stdClass $prestudent
+ *
+ * @return booleans $zgv_code, error if not registered
+ */
+ public function checkIfZGVEingetragenMaster($prestudent)
+ {
+ $this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+ $result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz);
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz]));
+
+ if (current($result->retval)->typ != 'm')
+ return success(true); // NOTE(chris): we only test master stgs, all other stgs should default to true
+
+ return success((boolean)$prestudent->zgvmas_code);
+ }
+
+ /**
+ * Checks if a bewerber status already exists.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkIfExistingBewerberstatus($prestudent_id)
+ {
+ $result = $this->_ci->PrestudentstatusModel->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+ ]);
+ if (isError($result))
+ return $result;
+
+ return success(hasData($result));
+ }
+
+
+ /**
+ * Checks if status aufgenommen already exists.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkIfExistingAufgenommenerstatus($prestudent_id)
+ {
+ $result = $this->_ci->PrestudentstatusModel->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+ ]);
+ if (isError($result))
+ return $result;
+
+ return success(hasData($result));
+ }
+
+ /**
+ * Checks if the last Bewerber status and the last Aufgenommener status
+ * have the same studiensemester and ausbildungssemester.
+ *
+ * Attention:
+ * If one of those two status is missing the function returns true!
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkIfLastBewerberAndAufgenommenerShareSemesters($prestudent_id)
+ {
+ $this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addLimit(1);
+ $result = $this->_ci->PrestudentstatusModel->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+ ]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return success(true);
+
+ $bewerber = current(getData($result));
+
+ $this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addLimit(1);
+ $result = $this->_ci->PrestudentstatusModel->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+ ]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return success(true);
+
+ $aufgenommener = current(getData($result));
+
+ return success(
+ $bewerber->studiensemester_kurzbz == $aufgenommener->studiensemester_kurzbz
+ && $bewerber->ausbildungssemester == $aufgenommener->ausbildungssemester
+ );
+ }
+
+ /**
+ * Check if Bismeldestichtag erreicht
+ *
+ * @param DateTime $statusDatum
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
+ public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz = null)
+ {
+ $result = $this->_ci->BismeldestichtagModel->checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz);
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result) == "1");
+ }
+
+ /**
+ * Runs all checks on Status History and saves it in cache.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ protected function prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ // Generate key for caching
+ $primary = implode('|', [
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date->format('Y-m-d'),
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ]);
+
+ if (isset($this->_cache_history[$primary]))
+ return $this->_cache_history[$primary];
+
+ $this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+ // Get the history
+ $result = $this->_ci->PrestudentstatusModel->getHistoryWithNewOrEditedState(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ if (!hasData($result))
+ return error('This is impossible');
+
+ $history = getData($result);
+ $historyCount = count($history);
+
+ // Run checks
+ $checks = [
+ 'timesequence' => true,
+ 'laststatus' => true,
+ 'unterbrechersemester' => true,
+ 'abbrechersemester' => true,
+ 'diplomant' => true,
+ 'student' => true
+ ];
+
+ for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) {
+ if (!$checks['timesequence']
+ && !$checks['laststatus']
+ && !$checks['unterbrechersemester']
+ && !$checks['abbrechersemester']
+ && !$checks['diplomant']
+ && !$checks['student']
+ )
+ break; // early out
+
+ $next = $history[$n];
+ $current = $history[$c];
+
+ // Zeitabfolge ungültig?
+ if ($checks['timesequence']
+ && $next->start < $current->start
+ )
+ $checks['timesequence'] = false;
+
+ // Abbrecher- oder Absolventenstatus muss Endstatus sein
+ if ($checks['laststatus']
+ && in_array($current->status_kurzbz, [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS])
+ )
+ $checks['laststatus'] = false;
+
+ // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+ if ($checks['unterbrechersemester']
+ && $current->status_kurzbz == self::UNTERBRECHER_STATUS
+ && $next->status_kurzbz == self::UNTERBRECHER_STATUS
+ && $current->ausbildungssemester != $next->ausbildungssemester
+ )
+ $checks['unterbrechersemester'] = false;
+
+ // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+ if ($checks['abbrechersemester']
+ && $current->status_kurzbz == self::UNTERBRECHER_STATUS
+ && $next->status_kurzbz == self::ABBRECHER_STATUS
+ && $current->ausbildungssemester != $next->ausbildungssemester
+ )
+ $checks['abbrechersemester'] = false;
+
+ if (($checks['diplomant']
+ || $checks['student'])
+ && $next->status_kurzbz == self::STUDENT_STATUS
+ ) {
+ $restl_stati = array_unique(array_column(array_slice($history, $c), 'status_kurzbz'));
+
+ // keine Studenten nach Diplomand Status
+ if ($checks['diplomant']
+ && in_array(self::DIPLOMAND_STATUS, $restl_stati)
+ )
+ $checks['diplomant'] = false;
+
+ // vor Studentenstatus müssen bestimmte Status vorhanden sein
+ if ($checks['student']
+ && array_values(array_intersect($restl_stati, $this->_statusAbfolgeVorStudent)) != array_values($this->_statusAbfolgeVorStudent)
+ )
+ $checks['student'] = false;
+ }
+ }
+
+ $this->_cache_history[$primary] = success($checks);
+
+ return success($checks);
+ }
+
+ /**
+ * Checks if the time sequence of the status history is valid.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryTimesequence(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['timesequence']);
+ }
+
+ /**
+ * Checks if the last status of the status history is not Abbrecher or
+ * Absolvent.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryLaststatus(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['laststatus']);
+ }
+
+ /**
+ * Checks if two consecutively Unterbrecher have the same
+ * ausbildungssemester in the status history.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryUnterbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['unterbrechersemester']);
+ }
+
+ /**
+ * Checks if an Unterbrecher followed by an Abbrecher have the same
+ * ausbildungssemester in the status history.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryAbbrechersemester(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['abbrechersemester']);
+ }
+
+ /**
+ * Checks if no Diplomant is followed by a Student in the status history.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryDiplomant(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['diplomant']);
+ }
+
+ /**
+ * Checks if a Student precedes given stati in the status history.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function checkStatusHistoryStudent(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ // TODO(chris): TEST
+ $result = $this->prepareStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ );
+
+ if (isError($result))
+ return $result;
+
+ return success(getData($result)['student']);
+ }
+
+ /**
+ * Checks if Personenkennzeichen is set correctly.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkPersonenkennzeichen($prestudent_id)
+ {
+ // TODO(chris): TEST
+ $this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id');
+ $this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr');
+
+ $this->_ci->PrestudentstatusModel->addJoin('public.tbl_student', 'prestudent_id');
+
+ $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.datum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+ $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+ $this->_ci->PrestudentstatusModel->addLimit(1);
+
+ $result = $this->_ci->PrestudentstatusModel->loadWhere([
+ 'tbl_prestudentstatus.prestudent_id' => $prestudent_id,
+ 'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ if (!hasData($result))
+ return success(true); // Not a student yet so no wrong personenkennzeichen
+
+ $data = current(getData($result));
+
+ $jahr = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($data->studiensemester_kurzbz);
+
+
+ return success($jahr == mb_substr($data->matrikelnr, 0, 2));
+ }
+
+ /**
+ * Checks if Orgform of Student status and Bewerber status match.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function checkStudentOrgform($prestudent_id)
+ {
+ // TODO(chris): TEST
+ $result = $this->_ci->PrestudentstatusModel->getBewerberWhereOrgformNotStudent($prestudent_id);
+
+ if (isError($result))
+ return $result;
+
+ return success(!hasData($result));
+ }
+
+ /**
+ * Check if History of StatusData is valid
+ * @param integer $prestudent_id
+ * @return error if not valid, array StatusArr if valid
+ */
+ private function _checkIfValidStatusHistory(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_status_studiensemester_kurzbz,
+ $new_status_datum,
+ $new_status_ausbildungssemester,
+ $new_studienplan_id,
+ $old_status_studiensemester = null,
+ $old_status_ausbildungssemester = null
+ ) {
+ //get start studiensemester
+ $semResult = $this->_ci->StudiensemesterModel->load([
+ 'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
+ ]);
+
+ if (isError($semResult))
+ {
+ $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+ return $this->outputJson(getError($semResult));
+ }
+
+ if (!hasData($semResult)) {
+ return error($this->_ci->p->t('lehre', 'error_noStudiensemester') . $new_status_studiensemester_kurzbz);
+ }
+
+ $studiensemester = getData($semResult)[0];
+ $new_status_semesterstart = $studiensemester->start;
+
+ // get studienplan orgform
+ $new_studienplan_orgform_kurzbz = '';
+ $this->_ci->StudienplanModel->addSelect('orgform_kurzbz');
+ $stplResult = $this->_ci->StudienplanModel->load([
+ 'studienplan_id' => $new_studienplan_id
+ ]);
+
+ if (isError($stplResult))
+ {
+ $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+ return $this->outputJson(getError($stplResult));
+ }
+
+ if (hasData($stplResult)) $new_studienplan_orgform_kurzbz = getData($stplResult)[0]->orgform_kurzbz;
+
+
+ //get all prestudentstati
+ $resultPs = $this->_ci->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
+
+ if (isError($resultPs)) return $resultPs;
+
+ $resultArr = hasData($resultPs) ? getData($resultPs) : [];
+ $statusArr = [];
+
+ $newStatusInserted = false;
+ $new_status_datum_form = new DateTime($new_status_datum);
+ $new_status_semesterstart_form = new DateTime($new_status_semesterstart);
+
+ if (!isEmptyArray($resultArr))
+ {
+ // neuen Status zum Hinzufügen
+ $first_status = $resultArr[0];
+ $neuer_status = new stdClass();
+ $neuer_status->status_kurzbz = $status_kurzbz;
+ $neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+ $neuer_status->datum = $new_status_datum;
+ $neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+ $neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+ $neuer_status->matrikelnr = $first_status->matrikelnr;
+ $neuer_status->vorname = $first_status->vorname;
+ $neuer_status->nachname = $first_status->nachname;
+
+ // Status, welcher gerade geändert wird, holen
+ $status_to_change = array_filter(
+ $resultArr,
+ function ($status) use ($status_kurzbz, $old_status_studiensemester, $old_status_ausbildungssemester) {
+ return
+ $status->status_kurzbz == $status_kurzbz
+ && $status->studiensemester_kurzbz == $old_status_studiensemester
+ && $status->ausbildungssemester == $old_status_ausbildungssemester;
+ }
+ );
+
+ if (!isEmptyArray($status_to_change))
+ {
+ $status_to_change_index = key($status_to_change);
+
+ // wenn sich Studiensemester und Ausbildungssemester nicht geändert haben...
+ if ($new_status_studiensemester_kurzbz == $old_status_studiensemester
+ && $new_status_ausbildungssemester == $old_status_ausbildungssemester)
+ {
+ // ...neuen status an selber stelle einfügen wie zu ändernder Status
+ $resultArr[$status_to_change_index] = (object)array_merge((array)$resultArr[$status_to_change_index], (array)$neuer_status);
+ $newStatusInserted = true;
+ }
+ else
+ {
+ // bei Status mit neuem Semester: alten Status entfernen
+ unset($resultArr[$status_to_change_index]);
+ }
+ }
+ }
+
+ foreach ($resultArr as $row)
+ {
+ $studiensemester_start = new DateTime($row->studiensemester_start);
+ $status_datum = new DateTime($row->datum);
+
+ if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start)
+ {
+ if (!$newStatusInserted)
+ {
+ // neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
+ $statusArr[] = $neuer_status;
+ $newStatusInserted = true;
+ }
+ $statusArr[] = $row;
+ }
+ elseif ($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start)
+ {
+ $statusArr[] = $row;
+ }
+ else
+ {
+ // Zeitabfolge ungültig, Fehler
+ return error($this->_ci->p->t('lehre', 'error_statuseintrag_zeitabfolge'));
+ }
+ }
+
+ // erster Studentstatus
+ $ersterStudent = null;
+
+ // Über alle gespeicherten Status gehen und Statusabfolge prüfen
+ for ($i = 0; $i < count($statusArr); $i++)
+ {
+ $curr_status = $statusArr[$i];
+ $curr_status_kurzbz = $curr_status->status_kurzbz;
+ $curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
+ $next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
+ $next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
+
+ $studentName = $curr_status->vorname . ' ' . $curr_status->nachname;
+
+ if ($curr_status_kurzbz == self::STUDENT_STATUS) $ersterStudent = $curr_status;
+
+ // Abbrecher- oder Absolventenstatus muss Endstatus sein
+ if (isset($next_status) && in_array($curr_status_kurzbz, $this->_endStatusArr))
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_endstatus'));
+ }
+
+ // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+ if
+ ($curr_status_kurzbz == self::UNTERBRECHER_STATUS && isset($next_status) && $next_status->status_kurzbz == self::UNTERBRECHER_STATUS
+ && $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecher'));
+ }
+
+ // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+ if (isset($next_status)
+ && $curr_status_kurzbz == self::UNTERBRECHER_STATUS
+ && $next_status->status_kurzbz == self::ABBRECHER_STATUS && $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'));
+ }
+
+ if (isset($next_status) && $next_status->status_kurzbz == self::STUDENT_STATUS)
+ {
+ $restliche_status_obj = array_slice($statusArr, $i);
+ $restliche_status = array_unique(array_column($restliche_status_obj, 'status_kurzbz'));
+ $status_intersected = array_intersect($restliche_status, $this->_statusAbfolgeVorStudent);
+
+ // Vor Studentstatus darf kein Diplomand Status vorhanden sein
+ if (in_array(self::DIPLOMAND_STATUS, $restliche_status))
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveDiplomandStudent'));
+ }
+
+ // Vor Studentstatus müssen bestimmte Status vorhanden sein
+ if (array_values($status_intersected) != array_values(array_reverse($this->_statusAbfolgeVorStudent)))
+ {
+ return error(
+ $studentName . ' '
+ . $this->_ci->p->t('lehre', 'error_wrongStatusOrderBeforeStudent', array(implode(', ', $this->_statusAbfolgeVorStudent)))
+ );
+ }
+ }
+ }
+
+ if (isset($ersterStudent))
+ {
+ $studentName = $ersterStudent->vorname . ' ' . $ersterStudent->nachname;
+
+ // wenn erster Studentstatus, checken ob Personenkennzeichen passt
+ $studienjahrNumber = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($ersterStudent->studiensemester_kurzbz);
+
+ if ($studienjahrNumber != mb_substr($ersterStudent->matrikelnr, 0, 2))
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_personenkennzeichenPasstNichtZuStudiensemester'));
+ }
+
+ // wenn erster Studentstatus, checken ob Orgform des Bewerbers mit Studenten übereinstimmt
+ if (!isEmptyArray(
+ array_filter(
+ $restliche_status_obj,
+ function ($s) use ($ersterStudent) {
+ return
+ $s->status_kurzbz == self::BEWERBER_STATUS
+ && (
+ $s->studienplan_orgform_kurzbz != $ersterStudent->studienplan_orgform_kurzbz
+ );
+ }
+ )
+ )
+ )
+ {
+ return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_bewerberOrgformUngleichStudentOrgform'));
+ }
+ }
+
+ return $resultPs;
+ }
+}
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index b725f6e90..13b0efdbb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -33,7 +33,7 @@ class SearchBarLib
const ERROR_NOT_AUTH = 'ERR005';
// List of allowed types of search
- const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
+ const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];
const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
@@ -178,6 +178,7 @@ class SearchBarLib
protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
{
+ $searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
$document = implode(' || \' \' || ', $columns);
$query = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
$reversequery = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
@@ -297,13 +298,15 @@ EOSC;
AND (datum_bis IS NULL OR datum_bis >= NOW())
AND b.aktiv = TRUE
) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
- WHERE ' .
+ WHERE
+ o.aktiv = true
+ AND (' .
$this->buildSearchClause(
$dbModel,
array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'),
$searchstr
) .
- '
+ ')
GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
');
@@ -359,17 +362,26 @@ EOSC;
private function _student($searchstr, $type)
{
$dbModel = new DB_Model();
-
+ $gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
$students = $dbModel->execReadOnlyQuery('
SELECT
\''.$type.'\' AS type,
s.student_uid AS uid,
+ CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
s.matrikelnr,
+ CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+ stg.bezeichnung AS studiengang,
p.person_id AS person_id,
p.vorname || \' \' || p.nachname AS name,
- k.kontakt as email ,
- p.foto
+ CASE
+ when s.student_uid = \''.getAuthUID().'\' then p.foto
+ when p.foto IS NULL then \''.$gesperrtes_foto.'\'
+ when p.foto_sperre = false then p.foto
+ else \''.$gesperrtes_foto.'\'
+ end as foto,
+ b.aktiv
FROM public.tbl_student s
+ JOIN public.tbl_studiengang stg USING(studiengang_kz)
JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
JOIN public.tbl_person p USING(person_id)
LEFT JOIN (
@@ -377,10 +389,57 @@ EOSC;
FROM public.tbl_kontakt
WHERE kontakttyp = \'email\'
) as k USING(person_id)
- WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+ WHERE
+ b.aktiv = TRUE
+ AND (b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+ OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+ OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\')
+ GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name,
+ email, p.foto, s.verband, s.semester, stg.bezeichnung,
+ stg.typ, stg.kurzbz, b.aktiv
+ ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+ ');
+
+ // If something has been found then return it
+ if (hasData($students)) return getData($students);
+
+ // Otherwise return an empty array
+ return array();
+ }
+
+ private function _studentStv($searchstr, $type)
+ {
+ $dbModel = new DB_Model();
+
+ $students = $dbModel->execReadOnlyQuery('
+ SELECT
+ \''.$type.'\' AS type,
+ s.student_uid AS uid,
+ s.matrikelnr,
+ CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+ stg.bezeichnung AS studiengang,
+ p.person_id AS person_id,
+ p.vorname || \' \' || p.nachname AS name,
+ k.kontakt AS email,
+ p.foto,
+ b.aktiv
+ FROM public.tbl_student s
+ JOIN public.tbl_studiengang stg USING(studiengang_kz)
+ JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+ JOIN public.tbl_person p USING(person_id)
+ LEFT JOIN (
+ SELECT kontakt, person_id
+ FROM public.tbl_kontakt
+ WHERE kontakttyp = \'email\'
+ ) as k USING(person_id)
+ WHERE
+ b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
- GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+ GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name,
+ k.kontakt, p.foto, s.verband, s.semester, stg.bezeichnung,
+ stg.typ, stg.kurzbz, b.aktiv
+ ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
');
// If something has been found then return it
@@ -454,6 +513,80 @@ EOSC;
*/
private function _raum($searchstr, $type)
{
+ $dbModel = new DB_Model();
+
+ $rooms = $dbModel->execReadOnlyQuery('
+ SELECT
+ \''.$type.'\' AS type,
+ COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
+ COALESCE(ort.gebteil, \'N/A\') as building,
+ COALESCE(ort.ausstattung, \'N/A\') as austattung,
+ COALESCE(CAST(ort.stockwerk AS VARCHAR), \'N/A\') as floor,
+ COALESCE(CAST(ort.dislozierung AS VARCHAR), \'N/A\') as room_number,
+ COALESCE(CAST(ort.content_id AS VARCHAR), \'N/A\') as content_id,
+
+ CASE
+ WHEN standort.plz IS NULL OR standort.ort IS NULL THEN
+ CASE
+ WHEN standort.strasse IS NULL THEN
+ CASE
+ WHEN ort.stockwerk IS NULL THEN \'N/A\'
+ ELSE CONCAT(ort.stockwerk,\' Stockwerk\')
+ END
+ ELSE
+ CASE
+ WHEN ort.stockwerk IS NULL THEN standort.strasse
+ ELSE CONCAT(standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+ END
+ END
+ ELSE
+ CASE
+ WHEN standort.strasse IS NULL THEN
+ CASE
+ WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort)
+ ELSE CONCAT(standort.plz,\' \',standort.ort,\' / \',ort.stockwerk,\' Stockwerk\')
+ END
+ ELSE
+ CASE
+ WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort,\' / \',standort.strasse)
+ ELSE CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+ END
+ END
+ END as standort,
+
+
+ CASE
+ WHEN ort.max_person IS NULL OR ort.arbeitsplaetze IS NULL THEN \'N/A\'
+ ELSE CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\')
+ END as sitzplaetze
+
+ FROM public.tbl_ort as ort
+ LEFT JOIN (
+ select ort,standort_id,strasse, plz
+ FROM public.tbl_standort
+ LEFT JOIN public.tbl_adresse USING(adresse_id)
+ ) standort USING(standort_id)
+ WHERE
+ ort.aktiv = true
+ AND
+ ort.lehre = true
+ AND (' .
+ $this->buildSearchClause(
+ $dbModel,
+ array('ort.ort_kurzbz', 'ort.bezeichnung'),
+ $searchstr
+ ) .
+ ')'
+ );
+
+ // If something has been found
+ if (hasData($rooms))
+ {
+ // Returns the dataset
+ return getData($rooms);
+ }
+
+ // Otherwise return an empty array
return array();
}
}
diff --git a/application/libraries/TableWidgetLib.php b/application/libraries/TableWidgetLib.php
index 3af99cca7..feda0d67c 100644
--- a/application/libraries/TableWidgetLib.php
+++ b/application/libraries/TableWidgetLib.php
@@ -26,6 +26,8 @@ class TableWidgetLib
{
const TABLE_UNIQUE_ID = 'tableUniqueId'; // TableWidget unique id
+ const TABLE_BOOTSTRAP_VERSION = 'bootstrapVersion'; // TableWidget bootstrap version
+
// TableWidget session name
const SESSION_NAME = 'FHC_TABLE_WIDGET';
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
index 2fa5dd0d4..7437c58ff 100644
--- a/application/libraries/UDFLib.php
+++ b/application/libraries/UDFLib.php
@@ -159,7 +159,7 @@ class UDFLib
$found = false; // used to check if the field is found or not in the json schema
$this->_sortJsonSchemas($jsonSchemasArray); // Sort the list of UDF by sort property
-
+
// Loops through json schemas
foreach ($jsonSchemasArray as $jsonSchema)
{
@@ -294,7 +294,7 @@ class UDFLib
// Checks if the requiredPermissions is available and it is a valid array or a valid string
if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
- || !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+ || !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
{
// Then check if the user has the permissions to read such UDF
if (!$this->_readAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -355,7 +355,7 @@ class UDFLib
// Checks if the requiredPermissions is available and it is a valid array or a valid string
if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
- || !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+ || !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
{
// Then check if the user has the permissions to write such UDF
if (!$this->_writeAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -634,8 +634,10 @@ class UDFLib
]);
if (isError($result))
return $result;
-
- $this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
+ if (!hasData($result))
+ $this->_definition_cache[$dbTable] = [];
+ else
+ $this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
}
return success($this->_definition_cache[$dbTable]);
}
@@ -657,8 +659,8 @@ class UDFLib
$result = $this->getDefinitionForModel($targetModel);
if (isError($result))
return $result;
- $definitions = getData($result);
-
+ $definitions = $result->retval;
+
usort($definitions, function ($a, $b) {
return $a[self::SORT] - $b[self::SORT];
});
@@ -701,7 +703,7 @@ class UDFLib
self::PERMISSION_TABLE_METHOD,
self::PERMISSION_TYPE_WRITE
);
-
+
// set listValues for dropdowns
if (isset($field[self::LIST_VALUES])) {
if (isset($field[self::LIST_VALUES]['enum'])) {
@@ -997,7 +999,7 @@ class UDFLib
$htmlParameters[HTMLWidget::HTML_ID] = $jsonSchema->{self::NAME};
$htmlParameters[HTMLWidget::HTML_NAME] = $jsonSchema->{self::NAME};
}
-
+
/**
* Sort the list of UDF by sort property
*/
@@ -1020,7 +1022,7 @@ class UDFLib
return ($a->{self::SORT} < $b->{self::SORT}) ? -1 : 1;
});
}
-
+
/**
* Loads the UDF description by the given schema and table
*/
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
new file mode 100644
index 000000000..edea7c310
--- /dev/null
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -0,0 +1,232 @@
+_ci =& get_instance();
+
+ $this->_ci->load->model('dashboard/Dashboard_model', 'DashboardModel');
+ $this->_ci->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+ $this->_ci->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
+ }
+
+ public function generateWidgetId($dashboard_kurzbz = '')
+ {
+ $dashboard_kurzbz = (!empty($dashboard_kurzbz)) ? $dashboard_kurzbz : self::DEFAULT_DASHBOARD_KURZBZ;
+ $widgetid_input = time() . '_' . $dashboard_kurzbz . '_' . bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
+ $widgetid = md5($widgetid_input);
+ return $widgetid;
+ }
+
+ public function getDashboardByKurzbz($dashboard_kurzbz)
+ {
+ $result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+
+ if (hasData($result))
+ {
+ return current(getData($result));
+ }
+
+ return null;
+ }
+
+ public function getMergedConfig($dashboard_id, $uid)
+ {
+ $defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
+ $userconfig = $this->getUserConfig($dashboard_id, $uid);
+
+ $mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+
+ return $mergedconfig;
+ }
+
+ public function getDefaultConfig($dashboard_id, $uid)
+ {
+ $res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+ $defaultconfig = array();
+
+ if (hasData($res_presets))
+ {
+ $presets = getData($res_presets);
+ foreach ($presets as $presetobj)
+ {
+ $preset = json_decode($presetobj->preset, true);
+ if (null !== $preset)
+ {
+ $defaultconfig = array_replace_recursive($defaultconfig, $preset);
+ }
+ }
+ }
+
+ return $defaultconfig;
+ }
+
+ public function getUserConfig($dashboard_id, $uid)
+ {
+ $res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
+
+ if (hasData($res_userconfig))
+ {
+ $data = getData($res_userconfig);
+ $decodedconfig = json_decode(current($data)->override, true);
+ if (null !== $decodedconfig)
+ {
+ return $decodedconfig;
+ }
+ }
+
+ return [];
+ }
+
+ public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid)
+ {
+ $override = $this->getOverride($dashboard_kurzbz, $uid);
+ if (null !== $override) {
+ return $override;
+ }
+
+ $dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+
+ $emptyoverride = new stdClass();
+ $emptyoverride->dashboard_id = $dashboard->dashboard_id;
+ $emptyoverride->uid = $uid;
+ $emptyoverride->override = '{"widgets": {"' . self::USEROVERRIDE_SECTION . '": {}}}';
+
+ return $emptyoverride;
+ }
+
+ public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz)
+ {
+ if ($funktion_kurzbz === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL)
+ $funktion_kurzbz = null;
+ $preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+ if (null !== $preset) {
+ return $preset;
+ }
+
+ $dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+
+ $emptypreset = new stdClass();
+ $emptypreset->dashboard_id = $dashboard->dashboard_id;
+ $emptypreset->funktion_kurzbz = $funktion_kurzbz;
+ $section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+ $emptypreset->preset = '{"widgets": {"' . $section . '": {}}}';
+
+ return $emptypreset;
+ }
+
+ public function getPreset($dashboard_kurzbz, $section)
+ {
+ $dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+
+ $funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
+ $result = $this->_ci->DashboardPresetModel
+ ->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+
+ if (hasData($result))
+ {
+ return current(getData($result));
+ }
+
+ return null;
+ }
+
+ public function getOverride($dashboard_kurzbz, $uid)
+ {
+ $dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+
+ $result = $this->_ci->DashboardOverrideModel
+ ->getOverride($dashboard->dashboard_id, $uid);
+
+ if (hasData($result))
+ {
+ return current(getData($result));
+ }
+
+ return null;
+ }
+
+ public function insertOrUpdatePreset($preset)
+ {
+ if (isset($preset->preset_id) && $preset->preset_id > 0)
+ {
+ $result = $this->_ci->DashboardPresetModel->update($preset->preset_id, $preset);
+ }
+ else
+ {
+ $result = $this->_ci->DashboardPresetModel->insert($preset);
+ }
+
+ return $result;
+ }
+
+ public function insertOrUpdateOverride($override)
+ {
+ if (isset($override->override_id) && $override->override_id > 0)
+ {
+ $result = $this->_ci->DashboardOverrideModel->update($override->override_id, $override);
+ }
+ else
+ {
+ $result = $this->_ci->DashboardOverrideModel->insert($override);
+ }
+
+ return $result;
+ }
+
+ public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+ {
+ foreach ($addwigets as $widget)
+ {
+ if(!isset($widget->widgetid))
+ {
+ $widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
+ }
+ $this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
+ }
+ }
+
+ public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
+ {
+ $section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+ if (!isset($widgets[$section]) || !is_array($widgets[$section]))
+ {
+ $widgets[$section] = array();
+ }
+
+ $widgets[$section][$widgetid] = $widget;
+ }
+
+ public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
+ {
+ $section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+ if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
+ {
+ unset($widgets[$section][$widgetid]);
+ if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
+ unset($widgets[$section]);
+ }
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+}
diff --git a/application/libraries/issues/PlausicheckDefinitionLib.php b/application/libraries/issues/PlausicheckDefinitionLib.php
index cef28a736..d8c26d43a 100644
--- a/application/libraries/issues/PlausicheckDefinitionLib.php
+++ b/application/libraries/issues/PlausicheckDefinitionLib.php
@@ -15,7 +15,6 @@ class PlausicheckDefinitionLib
'AktSemesterNull' => 'AktSemesterNull',
'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
- 'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
'DatumSponsionFehlt' => 'DatumSponsionFehlt',
'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
@@ -33,8 +32,10 @@ class PlausicheckDefinitionLib
'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
- 'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
+ 'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
+ 'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
//'StudienplanUngueltig' => 'StudienplanUngueltig'
+ //'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
);
/**
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
index c32f1f863..cea9967fb 100644
--- a/application/libraries/issues/PlausicheckProducerLib.php
+++ b/application/libraries/issues/PlausicheckProducerLib.php
@@ -12,19 +12,25 @@ class PlausicheckProducerLib
private $_ci; // ci instance
private $_extensionName; // name of extension
- private $_app; // name of application
- private $_konfiguration = array(); // konfigratio parameters
+ private $_konfiguration = []; // configuration parameters
+ private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
+ private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
public function __construct($params = null)
{
// set extension name if called from extension
if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+ if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
+ if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
// set application
$app = isset($params['app']) ? $params['app'] : null;
$this->_ci =& get_instance(); // get ci instance
+ // load libraries
+ $this->_ci->load->library('IssuesLib');
+
// load models
$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
@@ -42,6 +48,52 @@ class PlausicheckProducerLib
}
}
+ /**
+ * Produces multiple plausicheck issues at once and saved them to db.
+ * @param array $params passed to each plausicheck
+ * @return result object with occured error and info
+ */
+ public function producePlausicheckIssues($params)
+ {
+ $result = new StdClass();
+ $result->errors = [];
+ $result->infos = [];
+
+ foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+ {
+ $plausicheckRes = $this->producePlausicheckIssue(
+ $libName,
+ $fehler_kurzbz,
+ $params
+ );
+
+ if (hasData($plausicheckRes))
+ {
+ $plausicheckData = getData($plausicheckRes);
+
+ foreach ($plausicheckData as $plausiData)
+ {
+ // get the data needed for issue production
+ $person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
+ $oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
+ $fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
+ $resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
+
+ // write the issue
+ $addIssueRes = $this->_ci->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
+
+ // log if error, or log info if inserted new issue
+ if (isError($addIssueRes))
+ $result->errors[] = getError($addIssueRes);
+ elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
+ $result->infos[] = "Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id;
+ }
+ }
+ }
+
+ return $result;
+ }
+
/**
* Executes plausicheck using a given library, returns the result.
* @param $libName string name of library producing the issue
@@ -67,7 +119,10 @@ class PlausicheckProducerLib
$config = isset($this->_konfiguration[$fehler_kurzbz]) ? $this->_konfiguration[$fehler_kurzbz] : null;
// load library connected to fehlercode
- $this->_ci->load->library($issuesLibPath . $libName, $config);
+ $this->_ci->load->library(
+ $issuesLibPath . $libName,
+ ['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+ );
$lowercaseLibName = mb_strtolower($libName);
diff --git a/application/libraries/issues/PlausicheckResolverLib.php b/application/libraries/issues/PlausicheckResolverLib.php
new file mode 100644
index 000000000..2b20a7d93
--- /dev/null
+++ b/application/libraries/issues/PlausicheckResolverLib.php
@@ -0,0 +1,137 @@
+_extensionName = $params['extensionName'];
+ if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
+ if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
+
+ $this->_ci =& get_instance(); // get ci instance
+
+ $this->_ci->load->library('IssuesLib');
+ $this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
+ }
+
+ /**
+ * Reseolves multiple plausicheck issues at once.
+ * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
+ * @param array $openIssues passed issues to resolve
+ * @return result object with occured error and info
+ */
+ public function resolvePlausicheckIssues($openIssues)
+ {
+ $result = new StdClass();
+ $result->errors = [];
+ $result->infos = [];
+
+ foreach ($openIssues as $issue)
+ {
+ // add person id and oe kurzbz automatically as params, merge it with additional params
+ // decode bewerbung_parameter into assoc array
+ $params = array_merge(
+ array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+ isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
+ );
+
+ $issueResolved = false;
+
+ // ignore if Fehlercode is not in libmappings (shouldn't be checked)
+ if (isset($this->_codeLibMappings[$issue->fehlercode]))
+ {
+ $libName = $this->_codeLibMappings[$issue->fehlercode];
+
+ // if called from extension (extension name set), path includes extension names
+ $libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+ // path for loading issue library
+ $issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+ // file path of library for check if file exists
+ $issuesLibFilePath = DOC_ROOT . self::CI_PATH
+ . '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+ // check if library file exists
+ if (!file_exists($issuesLibFilePath))
+ {
+ // log error and continue with next issue if not
+ $result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+ continue;
+ }
+
+ // load library connected to fehlercode
+ $this->_ci->load->library($issuesLibPath . $libName);
+
+ $lowercaseLibName = mb_strtolower($libName);
+
+ // check if method is defined in library class
+ if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+ {
+ // log error and continue with next issue if not
+ $result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+ continue;
+ }
+
+ // call the function for checking for issue resolution
+ $issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+ if (isError($issueResolvedRes))
+ {
+ $result->errors[] = getError($issueResolvedRes);
+ }
+ else
+ {
+ $issueResolved = getData($issueResolvedRes) === true;
+ }
+ }
+ elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
+ {
+ $libName = $this->_codeProducerLibMappings[$issue->fehlercode];
+
+ // execute same check as used for issue production
+ $issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
+ $libName,
+ $issue->fehler_kurzbz,
+ $params
+ );
+
+ if (isError($issueResolvedRes))
+ {
+ $result->errors[] = getError($issueResolvedRes);
+ }
+ else
+ {
+ $issueResolved = !hasData($issueResolvedRes);
+ }
+ }
+
+ // set issue to resolved if needed
+ if ($issueResolved)
+ {
+ $behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
+
+ if (isError($behobenRes))
+ $result->errors[] = getError($behobenRes);
+ else
+ $result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
+ }
+ }
+
+ return $result;
+ }
+}
diff --git a/application/libraries/issues/plausichecks/AbbrecherAktiv.php b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
index 9eae389b5..464b77a30 100644
--- a/application/libraries/issues/plausichecks/AbbrecherAktiv.php
+++ b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
@@ -9,83 +9,21 @@ require_once('PlausiChecker.php');
*/
class AbbrecherAktiv extends PlausiChecker
{
- public function executePlausiCheck($params)
- {
- $results = array();
+ protected $_base_sql = "
+ SELECT
+ pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+ FROM
+ public.tbl_prestudentstatus pre_status
+ JOIN public.tbl_prestudent pre USING(prestudent_id)
+ JOIN public.tbl_student student USING(prestudent_id)
+ JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
+ JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+ WHERE
+ pre_status.status_kurzbz ='Abbrecher'
+ AND benutzer.aktiv=true";
- // get parameters from config
- $exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
- // pass parameters needed for plausicheck
- $studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
- // get all students failing the plausicheck
- $prestudentRes = $this->getAbbrecherAktiv($studiengang_kz, null, $exkludierte_studiengang_kz);
-
- if (isError($prestudentRes)) return $prestudentRes;
-
- if (hasData($prestudentRes))
- {
- $prestudents = getData($prestudentRes);
-
- // populate results with data necessary for writing issues
- foreach ($prestudents as $prestudent)
- {
- $results[] = array(
- 'person_id' => $prestudent->person_id,
- 'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
- 'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
- 'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
- );
- }
- }
-
- // return the results
- return success($results);
- }
-
- /**
- * Abbrecher cannot be active.
- * @param studiengang_kz int if check is to be executed for certain Studiengang
- * @param prestudent_id int if check is to be executed only for one prestudent
- * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
- * @return success with prestudents or error
- */
- public function getAbbrecherAktiv($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
- {
- $params = array();
-
- $qry = "
- SELECT
- pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
- FROM
- public.tbl_prestudentstatus pre_status
- JOIN public.tbl_prestudent pre USING(prestudent_id)
- JOIN public.tbl_student student USING(prestudent_id)
- JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
- JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
- WHERE
- pre_status.status_kurzbz ='Abbrecher'
- AND benutzer.aktiv=true";
-
- if (isset($studiengang_kz))
- {
- $qry .= " AND stg.studiengang_kz = ?";
- $params[] = $studiengang_kz;
- }
-
- if (isset($prestudent_id))
- {
- $qry .= " AND pre.prestudent_id = ?";
- $params[] = $prestudent_id;
- }
-
- if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
- {
- $qry .= " AND stg.studiengang_kz NOT IN ?";
- $params[] = $exkludierte_studiengang_kz;
- }
-
- return $this->_db->execReadOnlyQuery($qry, $params);
- }
+ protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
+ protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
+ protected $_fehlertext_params = ['prestudent_id'];
+ protected $_resolution_params = ['prestudent_id'];
}
diff --git a/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php b/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php
new file mode 100644
index 000000000..3951f6d76
--- /dev/null
+++ b/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php
@@ -0,0 +1,143 @@
+_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+ // pass parameters needed for plausicheck
+ $studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+ $studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+ // get all students failing the plausicheck
+ $prestudentRes = $this->getDualesStudiumOhneMarkierung(
+ $studiensemester_kurzbz,
+ $studiengang_kz,
+ null,
+ $exkludierte_studiengang_kz
+ );
+
+ if (isError($prestudentRes)) return $prestudentRes;
+
+ if (hasData($prestudentRes))
+ {
+ $prestudents = getData($prestudentRes);
+
+ // populate results with data necessary for writing issues
+ foreach ($prestudents as $prestudent)
+ {
+ $results[] = array(
+ 'person_id' => $prestudent->person_id,
+ 'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+ 'fehlertext_params' => array(
+ 'prestudent_id' => $prestudent->prestudent_id,
+ 'studienplan' => $prestudent->studienplan
+ ),
+ 'resolution_params' => array(
+ 'prestudent_id' => $prestudent->prestudent_id,
+ 'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+ )
+ );
+ }
+ }
+
+ // return the results
+ return success($results);
+ }
+
+ /**
+ * All prestudents in dual Studiengang should have set the dual flag to true.
+ * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+ * @param studiengang_kz int if check is to be executed for certain Studiengang
+ * @param prestudent_id int if check is to be executed only for one prestudent
+ * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+ * @return success with prestudents or error
+ */
+ public function getDualesStudiumOhneMarkierung(
+ $studiensemester_kurzbz,
+ $studiengang_kz = null,
+ $prestudent_id = null,
+ $exkludierte_studiengang_kz = null
+ ) {
+ $params = array($studiensemester_kurzbz);
+
+ $qry = "
+ SELECT
+ DISTINCT pre.person_id, pre.prestudent_id,
+ stpl.bezeichnung AS studienplan,
+ status.studiensemester_kurzbz,
+ status.ausbildungssemester,
+ stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+ FROM
+ public.tbl_prestudent pre
+ JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+ JOIN public.tbl_person USING(person_id)
+ JOIN lehre.tbl_studienplan stpl USING(studienplan_id)
+ JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+ JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+ WHERE
+ (stpl.orgform_kurzbz = 'DUA' OR status.orgform_kurzbz = 'DUA')
+ AND pre.dual = FALSE
+ AND status.studiensemester_kurzbz=?
+ AND pre.bismelden
+ AND stg.melderelevant
+ AND NOT EXISTS (
+ SELECT 1
+ FROM
+ public.tbl_prestudentstatus
+ JOIN lehre.tbl_studienplan USING(studienplan_id)
+ JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+ WHERE
+ prestudent_id = pre.prestudent_id
+ AND
+ (
+ -- if there is a newer non-dual status, dual has not to be set
+ (
+ (
+ tbl_studienplan.orgform_kurzbz <> stpl.orgform_kurzbz
+ OR status.orgform_kurzbz <> tbl_prestudentstatus.orgform_kurzbz
+ )
+ AND
+ (
+ tbl_studiensemester.ende::date > sem.ende::date
+ OR (tbl_studiensemester.ende::date = sem.ende::date AND tbl_prestudentstatus.datum::date > status.datum::date)
+ )
+ )
+ OR
+ -- exclude Abgewiesene - they are not reported
+ tbl_prestudentstatus.status_kurzbz = 'Abgewiesener'
+ )
+ )";
+
+ if (isset($studiengang_kz))
+ {
+ $qry .= " AND stg.studiengang_kz = ?";
+ $params[] = $studiengang_kz;
+ }
+
+ if (isset($prestudent_id))
+ {
+ $qry .= " AND pre.prestudent_id = ?";
+ $params[] = $prestudent_id;
+ }
+
+ if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+ {
+ $qry .= " AND stg.studiengang_kz NOT IN ?";
+ $params[] = $exkludierte_studiengang_kz;
+ }
+
+ return $this->_db->execReadOnlyQuery($qry, $params);
+ }
+}
diff --git a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
index dead2b1e7..59965e238 100644
--- a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
+++ b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
@@ -67,6 +67,7 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
$prestudent_id = null,
$exkludierte_studiengang_kz = null
) {
+ $this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;
diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php
index 086a44cc4..7e5fe7db0 100644
--- a/application/libraries/issues/plausichecks/PlausiChecker.php
+++ b/application/libraries/issues/plausichecks/PlausiChecker.php
@@ -6,15 +6,25 @@
abstract class PlausiChecker
{
protected $_ci; // code igniter instance
- protected $_config; // configuration parameters for this plausicheck
+ protected $_config; // all applicable configuration parameters for this plausicheck
protected $_db; // database for queries
- public function __construct($configurationParams = null)
+ protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
+
+ protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
+ protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]
+
+ protected $_fehlertext_params = []; // parameter names for fehlertext params used for this plausicheck
+ protected $_resolution_params = []; // parameter names for resolution params used for this plausicheck
+
+ public function __construct($params = null)
{
$this->_ci =& get_instance(); // get code igniter instance
// set configuration
- $this->_config = $configurationParams;
+ $this->_config = $params['configurationParams'] ?? [];
+
+ $this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
// get database for queries
$this->_db = new DB_Model();
@@ -25,5 +35,83 @@ abstract class PlausiChecker
* @param $paramsForChecking array parameters needed for executing the check
* @return array with objects which failed the plausi check
*/
- abstract public function executePlausiCheck($paramsForChecking);
+ public function executePlausiCheck($paramsForChecking)
+ {
+ $results = [];
+ $params = [];
+ $qry = $this->_base_sql;
+
+ if ($this->_isForResolutionCheck == true)
+ {
+ foreach ($this->_resolution_params as $resParam)
+ {
+ if (!isset($paramsForChecking[$resParam]))
+ return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
+ }
+ }
+
+ // add config params to query
+ if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
+ {
+ foreach ($this->_config_params as $param_name => $param_sql)
+ {
+ if (isset($this->_config[$param_name]))
+ {
+ $qry .= $param_sql;
+ $params[] = $this->_config[$param_name];
+ }
+ }
+ }
+
+ // add check params to query
+ if (isset($this->_params_for_checking) && !isEmptyArray($this->_params_for_checking))
+ {
+ foreach ($this->_params_for_checking as $param_name => $param_sql)
+ {
+ if (isset($paramsForChecking[$param_name]))
+ {
+ $qry .= $param_sql;
+ $params[] = $paramsForChecking[$param_name];
+ }
+ }
+ }
+
+ $result = $this->_db->execReadOnlyQuery($qry, $params);
+
+ if (isError($result)) return $result;
+
+ if (hasData($result))
+ {
+ $data = getData($result);
+
+ // populate results with data necessary for writing issues
+ foreach ($data as $d)
+ {
+ $fehlertext_params = [];
+ $resolution_params = [];
+
+ // add params for error texts
+ foreach ($this->_fehlertext_params as $param)
+ {
+ if (isset($d->{$param})) $fehlertext_params[$param] = $d->{$param};
+ }
+
+ // add params for resolution of issue
+ foreach ($this->_resolution_params as $param)
+ {
+ if (isset($d->{$param})) $resolution_params[$param] = $d->{$param};
+ }
+
+ $results[] = array(
+ 'person_id' => $d->person_id,
+ 'oe_kurzbz' => $d->prestudent_stg_oe_kurzbz,
+ 'fehlertext_params' => $fehlertext_params,
+ 'resolution_params' => $resolution_params
+ );
+ }
+ }
+
+ // return the results
+ return success($results);
+ }
}
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0005.php b/application/libraries/issues/resolvers/CORE_PERSON_0005.php
new file mode 100644
index 000000000..1d768e70c
--- /dev/null
+++ b/application/libraries/issues/resolvers/CORE_PERSON_0005.php
@@ -0,0 +1,36 @@
+_ci =& get_instance(); // get code igniter instance
+
+ $this->_ci->load->model('person/Person_model', 'PersonModel');
+
+ // load geburtsnation for the given person
+ $this->_ci->PersonModel->addSelect('geburtsnation');
+ $personRes = $this->_ci->PersonModel->load($params['issue_person_id']);
+
+ if (isError($personRes)) return $personRes;
+
+ if (hasData($personRes))
+ {
+ // get person data
+ $personData = getData($personRes)[0];
+
+ // if geburtsnation present, issue is resolved
+ return success(!isEmptyString($personData->geburtsnation));
+ }
+ else
+ return success(false); // if no person found, not resolved
+ }
+}
\ No newline at end of file
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0006.php b/application/libraries/issues/resolvers/CORE_PERSON_0006.php
new file mode 100644
index 000000000..8b7ff9c56
--- /dev/null
+++ b/application/libraries/issues/resolvers/CORE_PERSON_0006.php
@@ -0,0 +1,37 @@
+_ci =& get_instance(); // get code igniter instance
+
+ $this->_ci->load->model('codex/Uhstat1daten_model', 'UhstatModel');
+
+ $personRes = $this->_ci->UhstatModel->getUHSTAT1PersonData([$params['issue_person_id']]);
+
+ if (isError($personRes)) return $personRes;
+
+ if (hasData($personRes))
+ {
+ // get person data
+ $personData = getData($personRes)[0];
+
+ // if person identification data present, issue is resolved
+ return success(
+ !isEmptyString($personData->ersatzkennzeichen)
+ || (!isEmptyString($personData->vbpkAs) && !isEmptyString($personData->vbpkBf))
+ );
+ }
+ else
+ return success(false); // if no person found, not resolved
+ }
+}
\ No newline at end of file
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php
new file mode 100644
index 000000000..0bba1ddff
--- /dev/null
+++ b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php
@@ -0,0 +1,36 @@
+_ci =& get_instance(); // get code igniter instance
+
+ $this->_ci->load->library('issues/plausichecks/DualesStudiumOhneMarkierung');
+
+ // check if issue persists
+ $checkRes = $this->_ci->dualesstudiumohnemarkierung->getDualesStudiumOhneMarkierung(
+ $params['studiensemester_kurzbz'],
+ null,
+ $params['prestudent_id']
+ );
+
+ if (isError($checkRes)) return $checkRes;
+
+ if (hasData($checkRes))
+ return success(false); // not resolved if issue is still present
+ else
+ return success(true); // resolved otherwise
+ }
+}
diff --git a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
index 309d3dfdc..07c417077 100644
--- a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
+++ b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
@@ -29,6 +29,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
protected $updateamum;
protected $updatevon;
+ protected $dvendegrund_kurzbz;
+ protected $dvendegrund_anmerkung;
+
public function __construct()
{
parent::__construct();
@@ -49,6 +52,8 @@ class Dienstverhaeltnis extends AbstractBestandteil {
isset($data->insertvon) && $this->setInsertvon($data->insertvon);
isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+ isset($data->dvendegrund_kurzbz) && $this->setDvendegrund_kurzbz($data->dvendegrund_kurzbz);
+ isset($data->dvendegrund_anmerkung) && $this->setDvendegrund_anmerkung($data->dvendegrund_anmerkung);
$this->fromdb = false;
}
@@ -64,7 +69,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
'insertamum' => $this->getInsertamum(),
'insertvon' => $this->getInsertvon(),
'updateamum' => $this->getUpdateamum(),
- 'updatevon' => $this->getUpdatevon()
+ 'updatevon' => $this->getUpdatevon(),
+ 'dvendegrund_kurzbz' => $this->getDvendegrund_kurzbz(),
+ 'dvendegrund_anmerkung' => $this->getDvendegrund_anmerkung()
);
$tmp = array_filter($tmp, function($k) {
@@ -139,6 +146,16 @@ EOTXT;
return $this->updatevon;
}
+ public function getDvendegrund_kurzbz()
+ {
+ return $this->dvendegrund_kurzbz;
+ }
+
+ public function getDvendegrund_anmerkung()
+ {
+ return $this->dvendegrund_anmerkung;
+ }
+
public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
{
$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
@@ -214,6 +231,20 @@ EOTXT;
return $this;
}
+ public function setDvendegrund_kurzbz($dvendegrund_kurzbz)
+ {
+ $this->markDirty('dvendegrund_kurzbz', $this->dvendegrund_kurzbz, $dvendegrund_kurzbz);
+ $this->dvendegrund_kurzbz = $dvendegrund_kurzbz;
+ return $this;
+ }
+
+ public function setDvendegrund_anmerkung($dvendegrund_anmerkung)
+ {
+ $this->markDirty('dvendegrund_anmerkung', $this->dvendegrund_anmerkung, $dvendegrund_anmerkung);
+ $this->dvendegrund_anmerkung = $dvendegrund_anmerkung;
+ return $this;
+ }
+
public function validate() {
//do Validation here
$ci = get_instance();
diff --git a/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php b/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
index 22f8ee2ae..95bbdd908 100644
--- a/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
+++ b/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
@@ -201,6 +201,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
public function setGrundbetrag($grundbetrag)
{
+ if(is_float($grundbetrag))
+ {
+ $grundbetrag = number_format($grundbetrag, 2, '.', '');
+ }
$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
$this->grundbetrag = $grundbetrag;
return $this;
@@ -208,6 +212,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
public function setBetrag_valorisiert($betrag_valorisiert)
{
+ if(is_float($betrag_valorisiert))
+ {
+ $betrag_valorisiert = number_format($betrag_valorisiert, 2, '.', '');
+ }
$this->markDirty('betrag_valorisiert', $this->betrag_valorisiert, $betrag_valorisiert);
$this->betrag_valorisiert = $betrag_valorisiert;
return $this;
diff --git a/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php b/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
index b75bdd722..1aaafa471 100644
--- a/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
@@ -28,9 +28,17 @@ class GehaltsbestandteilLib
$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
}
- public function fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
+ public function fetchGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
{
- return $this->GehaltsbestandteilModel->getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
+ return $this->GehaltsbestandteilModel->getGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag, $includefuture);
+ }
+
+ public function fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null,
+ $includefuture=false, $withvalorisationhistory=true)
+ {
+ return $this->GehaltsbestandteilModel->getGehaltsbestandteile(
+ $dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+ );
}
public function fetchGehaltsbestandteil($gehaltsbestandteil_id)
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
index 297896a02..2e6182957 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
@@ -26,6 +26,8 @@ class VertragsbestandteilLib
{
const INCLUDE_FUTURE = true;
const DO_NOT_INCLUDE_FUTURE = false;
+ const WITH_VALORISATION_HISTORY = true;
+ const NOT_WITH_VALORISATION_HISTORY = false;
protected $CI;
/** @var Dienstverhaeltnis_model */
@@ -90,10 +92,15 @@ class VertragsbestandteilLib
return $dv;
}
- public function fetchVertragsbestandteile($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
+ public function fetchVertragsbestandteile($dienstverhaeltnis_id, $stichtag=null,
+ $includefuture=false, $withvalorisationhistory=true)
{
- $vbs = $this->VertragsbestandteilModel->getVertragsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
- $gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
+ $vbs = $this->VertragsbestandteilModel->getVertragsbestandteile(
+ $dienstverhaeltnis_id, $stichtag, $includefuture
+ );
+ $gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
+ $dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+ );
$gbsByVBid = array();
foreach( $gbs as $gb )
@@ -435,7 +442,7 @@ class VertragsbestandteilLib
return $result;
}
- public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate)
+ public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $dvendegrund_kurzbz=null, $dvendegrund_anmerkung=null)
{
if( $dv->getBis() !== null && $dv->getBis() < $enddate )
{
@@ -460,6 +467,14 @@ class VertragsbestandteilLib
$this->endVertragsbestandteil($vb, $enddate);
}
+ if( $dvendegrund_kurzbz !== null )
+ {
+ $dv->setDvendegrund_kurzbz($dvendegrund_kurzbz);
+ }
+ if( $dvendegrund_anmerkung !== null )
+ {
+ $dv->setDvendegrund_anmerkung($dvendegrund_anmerkung);
+ }
$dv->setBis($enddate);
$this->updateDienstverhaeltnis($dv);
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 8725cd98d..abc2114a6 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -299,6 +299,91 @@ class Vertrag_model extends DB_Model
}
}
+ /**
+ * Prueft ob ein Mitarbeiter einen erteilten Vertrag zu einer Lehrveranstaltung besitzt.
+ * @param $lehrveranstaltung_id ID der Lehrveranstaltung
+ * @param $studiensemester_kurzbz Studiensemester das geprueft wird
+ * @param $mitarbeiter_uid UID des Mitarbeiters
+ */
+ public function isVertragErteiltLV($lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid)
+ {
+ if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
+ && CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+ {
+ // Liegt das Studiensemester vor dem Pruefdatum, wird die LV immer als Erteilt angezeigt
+ $stsemquery = "
+ SELECT
+ tbl_studiensemester.start
+ FROM
+ public.tbl_studiensemester
+ WHERE
+ studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz)."
+ AND tbl_studiensemester.start < (
+ SELECT
+ start
+ FROM
+ public.tbl_studiensemester stsem
+ WHERE
+ stsem.studiensemester_kurzbz = " . $this->escape(CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON)."
+ )";
+
+ if ($stsemresult = $this->execReadOnlyQuery($stsemquery))
+ {
+ $stsemdata = getData($stsemresult);
+ if ($stsemdata && count($stsemdata) > 0)
+ {
+ // Wenn das Studiensemester vor dem Pruefdatum liegt, gilt der Vertrag immer als erteilt.
+ return true;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ $query = "
+ SELECT
+ 1
+ FROM
+ lehre.tbl_lehreinheitmitarbeiter
+ JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+ JOIN lehre.tbl_vertrag USING(vertrag_id)
+ JOIN lehre.tbl_vertrag_vertragsstatus USING(vertrag_id)
+ WHERE
+ tbl_lehreinheitmitarbeiter.mitarbeiter_uid = " . $this->escape($mitarbeiter_uid) . "
+ AND tbl_lehreinheit.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ AND tbl_lehreinheit.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+ AND tbl_vertrag_vertragsstatus.vertragsstatus_kurzbz='erteilt'
+ AND NOT EXISTS(
+ SELECT
+ 1
+ FROM
+ lehre.tbl_vertrag_vertragsstatus vstatus
+ WHERE
+ vstatus.vertrag_id = tbl_vertrag.vertrag_id
+ AND vstatus.vertragsstatus_kurzbz = 'storno'
+ )
+ ";
+
+ if ($result = $this->execReadOnlyQuery($query))
+ {
+ $data = getData($result);
+ if ($data && count($data) > 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
// -----------------------------------------------------------------------------------------------------------------
// Private methods
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
index 1cff1dc54..5ecd4bb51 100644
--- a/application/models/codex/Bisio_model.php
+++ b/application/models/codex/Bisio_model.php
@@ -44,4 +44,27 @@ class Bisio_model extends DB_Model
else
return success("Bisio not found");
}
+
+ /**
+ * checks, if an (extension) table exists to avoid later errors
+ * @param String $schema like 'extension'
+ * @param String $table like 'tbl_mo_bisiozuordnung'
+ * @return boolean
+ */
+ public function tableExists($schema, $table)
+ {
+ $params = array($schema, $table);
+
+ $qry = "SELECT
+ 1
+ FROM
+ information_schema.role_table_grants
+ WHERE
+ table_schema = ?
+ AND table_name = ?";
+
+ $result = $this->execQuery($qry, $params);
+
+ return $result;
+ }
}
diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index 6c0858b35..f9b412e7a 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -13,38 +13,41 @@ class Bismeldestichtag_model extends DB_Model
public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
{
- $qry = "
- SELECT
- meldestichtag_id, meldestichtag, studiensemester_kurzbz, insertamum, insertvon, updateamum, updatevon
- FROM
- bis.tbl_bismeldestichtag
- WHERE
- meldestichtag < NOW()
- ";
+ $this->addSelect('meldestichtag_id');
+ $this->addSelect('meldestichtag');
+ $this->addSelect('studiensemester_kurzbz');
+ $this->addSelect('insertamum');
+ $this->addSelect('insertvon');
+ $this->addSelect('updateamum');
+ $this->addSelect('updatevon');
- if (isset($studiensemester_kurzbz))
- {
- $qry .= "
- AND
- studiensemester_kurzbz= ?";
+ if ($studiensemester_kurzbz) {
+ $this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
}
- $qry .= "
- ORDER BY
- meldestichtag DESC
- LIMIT 1;";
+ $this->addOrder('meldestichtag', 'DESC');
+ $this->addLimit(1);
- $result = $this->execQuery($qry, array($studiensemester_kurzbz));
+ return $this->loadWhere([
+ 'meldestichtag < NOW()' => null
+ ]);
+ }
- if (isError($result))
- {
- return error($result);
- }
- if (!hasData($result)) {
- return success("0",'Kein Meldestichtag vorhanden');
- }
- return $result;
+ /**
+ * Liefert nächstliegenden Bismeldestichtag.
+ * @return object success or error
+ */
+ public function getNextMeldestichtag()
+ {
+ $this->addSelect('meldestichtag');
+ $this->addSelect('studiensemester_kurzbz');
+ $this->addOrder('meldestichtag', 'ASC');
+ $this->addLimit(1);
+
+ return $this->loadWhere([
+ 'meldestichtag >= NOW()' => null
+ ]);
}
/**
@@ -68,25 +71,26 @@ class Bismeldestichtag_model extends DB_Model
);
if(isError($result))
{
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
+ return $result;
}
$result = current(getData($result));
- $studiensemester_ende = $result->ende;
+ $studiensemester_ende = new DateTime($result->ende);
}
// letztes erreichtes Bismeldedatum holen
$result = $this->getLastReachedMeldestichtag();
if (isError($result))
{
- return error($result);
+ return $result;
}
if (!hasData($result)) {
return success("0",'No Statusdata vorhanden');
}
$stichtag = current(getData($result));
- $stichtag = $stichtag->meldestichtag;
+ $stichtag = new DateTime($stichtag->meldestichtag);
+
+ $statusDatum = new DateTime($status_datum);
// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
if (isset($statusDatum))
@@ -100,7 +104,7 @@ class Bismeldestichtag_model extends DB_Model
$erreicht = $erreicht || $studiensemester_ende < $stichtag;
}
- if($erreicht)
+ if ($erreicht)
return success("1", "Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden");
return success("0", "Meldestatus nicht erreicht");
diff --git a/application/models/codex/Bisstandort_model.php b/application/models/codex/Bisstandort_model.php
new file mode 100644
index 000000000..9c7e9e45b
--- /dev/null
+++ b/application/models/codex/Bisstandort_model.php
@@ -0,0 +1,14 @@
+dbTable = 'bis.tbl_bisstandort';
+ $this->pk = 'standort_code';
+ }
+}
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
index c782346a0..069037cee 100644
--- a/application/models/codex/Gemeinde_model.php
+++ b/application/models/codex/Gemeinde_model.php
@@ -19,4 +19,38 @@ class Gemeinde_model extends DB_Model
return $this->loadWhere(array("plz" => $plz));
}
-}
\ No newline at end of file
+
+ public function getGemeindeByNation($nation, $zip)
+ {
+ $this->addSelect(["name"]);
+
+ if ($nation == "A")
+ {
+ if (isset($zip) && $zip > 999 && $zip < 32000)
+ {
+ $gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+ if (isError($gemeinde_res))
+ {
+ show_error("error while trying to query bis.tbl_gemeinde");
+ }
+ $gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+ $gemeinde_res = array_map(function ($obj) {
+ return $obj->name;
+ }, $gemeinde_res);
+ echo json_encode($gemeinde_res);
+
+ } else {
+ echo json_encode(error("ortschaftskennziffer code was not valid"));
+ }
+ }
+ }
+
+ public function checkLocation($plz, $gemeinde, $ort)
+ {
+ $this->db->where('ortschaftsname', $ort);
+ $this->db->where('name', $gemeinde);
+ $this->db->where('plz', $plz);
+
+ return (boolean)$this->db->count_all_results($this->dbTable);
+ }
+}
diff --git a/application/models/codex/Uhstat1daten_model.php b/application/models/codex/Uhstat1daten_model.php
index 9bca44b58..899f037ef 100644
--- a/application/models/codex/Uhstat1daten_model.php
+++ b/application/models/codex/Uhstat1daten_model.php
@@ -11,4 +11,44 @@ class Uhstat1daten_model extends DB_Model
$this->dbTable = 'bis.tbl_uhstat1daten';
$this->pk = 'uhstat1daten_id';
}
+
+ /**
+ * Gets person data needed for sending as UHSTAT1 data.
+ * @param array $person_id_arr
+ * @param string $studiensemester
+ * @param array $status_kurzbz
+ * @return object success with prestudents or error
+ */
+ public function getUHSTAT1PersonData($person_id_arr)
+ {
+ if (!isset($person_id_arr) || isEmptyArray($person_id_arr)) return success([]);
+
+ $params = array($person_id_arr);
+
+ $prstQry = "SELECT
+ DISTINCT ON (pers.person_id)
+ pers.person_id, uhstat_daten.uhstat1daten_id, pers.svnr, pers.ersatzkennzeichen, pers.geburtsnation,
+ uhstat_daten.mutter_geburtsstaat, uhstat_daten.mutter_bildungsstaat, uhstat_daten.mutter_geburtsjahr,
+ uhstat_daten.mutter_bildungmax, uhstat_daten.vater_geburtsstaat, uhstat_daten.vater_bildungsstaat,
+ uhstat_daten.vater_geburtsjahr, uhstat_daten.vater_bildungmax,
+ kzVbpkAs.inhalt AS \"vbpkAs\", kzVbpkBf.inhalt AS \"vbpkBf\"
+ FROM
+ public.tbl_person pers
+ JOIN public.tbl_prestudent ps USING (person_id)
+ JOIN public.tbl_studiengang stg USING (studiengang_kz)
+ JOIN bis.tbl_uhstat1daten uhstat_daten USING (person_id)
+ LEFT JOIN public.tbl_kennzeichen kzVbpkAs ON kzVbpkAs.kennzeichentyp_kurzbz = 'vbpkAs'AND kzVbpkAs.person_id = pers.person_id AND kzVbpkAs.aktiv
+ LEFT JOIN public.tbl_kennzeichen kzVbpkBf ON kzVbpkBf.kennzeichentyp_kurzbz = 'vbpkBf'AND kzVbpkBf.person_id = pers.person_id AND kzVbpkBf.aktiv
+ WHERE
+ ps.bismelden
+ AND stg.melderelevant
+ AND pers.person_id IN ?
+ ORDER BY
+ pers.person_id";
+
+ return $this->execReadOnlyQuery(
+ $prstQry,
+ $params
+ );
+ }
}
diff --git a/application/models/content/Ampel_Benutzer_Bestaetigt_model.php b/application/models/content/Ampel_Benutzer_Bestaetigt_model.php
new file mode 100644
index 000000000..72373c2d8
--- /dev/null
+++ b/application/models/content/Ampel_Benutzer_Bestaetigt_model.php
@@ -0,0 +1,14 @@
+dbTable = 'public.tbl_ampel_benutzer_bestaetigt';
+ $this->pk = 'ampel_benutzer_bestaetigt_id';
+ }
+
+}
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index c50025a12..1f6cf9f93 100644
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -16,37 +16,95 @@ class Ampel_model extends DB_Model
* 1. not after the deadline date
* 2. not before the vorlaufszeit
* @param bool $email If true, then only ampeln are retrieved that are marked to be sent by mail.
- * @return array Returns array of objects.
+ * @return stdClass Returns array of objects.
*/
- public function active($email = false)
+ public function active($email = false, $uid = null)
{
- $parametersArray = null;
- $query = '
- SELECT *
- FROM public.tbl_ampel
- WHERE';
-
- if ($email === true)
- {
- $parametersArray['email'] = $email;
- $query .= ' email = ? AND';
+ $userLanguage = getUserLanguage();
+ $selectStatement='*,beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as beschreibung_trans, buttontext[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as buttontext_trans';
+
+ if($uid != null ){
+ $selectStatement .= ',
+ COALESCE((
+ SELECT true
+ FROM public.tbl_ampel_benutzer_bestaetigt a
+ WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
+ AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
}
- $query .= '(
- (NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
- OR (verfallszeit IS NULL)
- AND (NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
- OR (vorlaufzeit IS NULL AND NOW() < deadline))';
+ $this->addSelect($selectStatement);
+ $whereStatement='';
- $query .= ' ORDER BY deadline DESC';
+ if ($email === true) {
+ $whereStatement .= ' email = '.$this->escape($email).' AND';
+ }
+
+ $whereStatement .=
+ '(
+ (
+ (NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
+ OR (verfallszeit IS NULL)
+ )
+ AND
+ (
+ (NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
+ OR (vorlaufzeit IS NULL AND NOW() < deadline)
+ )
+ )';
+
+ $this->addOrder('deadline', 'DESC');
+ return $this->loadWhere($whereStatement);
+
+ }
+
+ public function openActive($uid, $email = false)
+ {
+ $userLanguage = getUserLanguage();
+ $selectStatement = '*,beschreibung[(' . $this->getLanguageIndex($this->escape($userLanguage)) . ')] as beschreibung_trans, buttontext[(' . $this->getLanguageIndex($this->escape($userLanguage)) . ')] as buttontext_trans';
+
+
+ $selectStatement .= ',
+ COALESCE((
+ SELECT true
+ FROM public.tbl_ampel_benutzer_bestaetigt a
+ WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
+ AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
+
+ $this->addSelect($selectStatement);
+ $whereStatement = '';
+
+ if ($email === true) {
+ $whereStatement .= ' email = ' . $this->escape($email) . ' AND';
+ }
+
+ $whereStatement .=
+ '
+ (COALESCE((
+ SELECT true
+ FROM public.tbl_ampel_benutzer_bestaetigt a
+ WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
+ AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) = FALSE) AND
+ (
+ (
+ (NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
+ OR (verfallszeit IS NULL)
+ )
+ AND
+ (
+ (NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
+ OR (vorlaufzeit IS NULL AND NOW() < deadline)
+ )
+ )';
+
+ $this->addOrder('deadline', 'DESC');
+ return $this->loadWhere($whereStatement);
- return $this->execQuery($query, $parametersArray);
}
/**
* Returns all Ampel-receiver of a specific Ampel.
* @param string $benutzer_select SQL Statement which defines the Ampel-receiver.
- * @return array Returns array of objects with property 'uid'.
+ * @return stdClass Returns array of objects with property 'uid'.
*/
public function execBenutzerSelect($benutzer_select)
{
@@ -90,4 +148,101 @@ class Ampel_model extends DB_Model
else
return $result; //will contain the error-msg from execQuery
}
+
+ /**
+ * checks if a user is assigned to an ampel
+ * @param string $uid userID
+ * @param string $benutzer_select the select query which gets all the user that are assigned to an ampel
+ * @return stdClass
+ */
+ public function isZugeteilt($uid, $benutzer_select){
+ $zugeteilt = $this->execReadOnlyQuery("
+ SELECT
+ CASE WHEN ? IN (".$benutzer_select.")
+ THEN true
+ ELSE false
+ END as zugeteilt
+ ", [$uid]);
+
+ if(isError($zugeteilt)){
+ return $zugeteilt;
+ }
+
+ $zugeteilt = getData($zugeteilt);
+
+ return success(current($zugeteilt)->zugeteilt);
+ }
+
+ // THIS FUNCTION IS NOT IN USE
+ // fetches all ampeln that were assigned to the user after the working start_date
+ function alleAmpeln($uid){
+ $userLanguage = getUserLanguage();
+
+ $zugeteile_ampeln = [];
+
+ $datum = new datum();
+ $now = $datum->mktime_fromdate(date('Y-m-d'));
+
+ // start date of user
+ $benutzerStartDate = $this->execReadOnlyQuery("
+ SELECT insertamum FROM public.tbl_benutzer WHERE uid = ?", [$uid]);
+ $benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
+
+ $allAmpeln = $this->execReadOnlyQuery("
+ SELECT *, beschreibung[(".$this->getLanguageIndex($this->escape($userLanguage)).")] as beschreibung_trans, buttontext[(".$this->getLanguageIndex($this->escape($userLanguage)).")] as buttontext_trans FROM
+ public.tbl_ampel");
+
+ if(isError($allAmpeln)) return error(getError($allAmpeln));
+
+ $allAmpeln = getData($allAmpeln);
+ foreach($allAmpeln as $ampel){
+
+ // check if the ampel is assigned to the user
+ $zugeteilt = $this->execReadOnlyQuery("
+ SELECT
+ CASE WHEN ? IN (".$ampel->benutzer_select.")
+ THEN true
+ ELSE false
+ END as zugeteilt
+ ", [$uid]);
+
+ if(isError($zugeteilt)) return error(getError($zugeteilt));
+
+ $zugeteilt = current(getData($zugeteilt))->zugeteilt;
+
+
+ // abgelaufen check
+ // $now > strtotime('+' . $ampel->verfallszeit . ' day', $ampel->deadline)
+
+ if(
+ // aktuelles datum liegt vor der Vorlaufzeit der Ampel
+ (isset($ampel->vorlaufzeit) && $now < strtotime('-' . $ampel->vorlaufzeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
+ ||
+ // ampel ist vor Arbeitsstart abgelaufen
+ (isset($ampel->verfallszeit) && $benutzerStartDate > strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
+ ||
+ // ampel ist vor Arbeitsstart abgelaufen (verfallszeit nicht vorhanden)
+ ($benutzerStartDate > strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
+ ){
+ // continue iteration if ampel is expired before work start or shouldn't be visible yet
+ continue;
+ }
+
+ $ampel->zugeteilt = $zugeteilt;
+
+ if($zugeteilt) $zugeteile_ampeln[] = $ampel;
+
+ }
+
+ return success($zugeteile_ampeln);
+ }
+
+ private function getLanguageIndex($userLanguage)
+ {
+ return "
+ SELECT index
+ FROM public.tbl_sprache
+ WHERE sprache = " . $userLanguage;
+ }
+
}
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ee4315ebd..278022b59 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -11,4 +11,316 @@ class Content_model extends DB_Model
$this->dbTable = 'campus.tbl_content';
$this->pk = 'content_id';
}
+
+ /**
+ * Laedt den Content in der angegebenen Sprache
+ * Sollte der Content in dieser Sprache nicht vorhanden sein, wird der Content in der Default Sprache geladen
+ *
+ * @param integer $content_id
+ * @param string $sprache optional
+ * @param integer $version optional
+ * @param boolean | null $sichtbar optional
+ *
+ * @return stdClass
+ */
+ public function getContent($content_id, $sprache = DEFAULT_LANGUAGE, $version = null, $sichtbar = null, $load_default_language = false)
+ {
+ $this->load->model('content/Contentsprache_model', 'ContentspracheModel');
+ $spracheExists = $this->ContentspracheModel->exists($content_id, $sprache, $version, $sichtbar);
+ if (isError($spracheExists))
+ return $spracheExists;
+
+ if(!getData($spracheExists))
+ {
+ if($load_default_language)
+ $sprache = DEFAULT_LANGUAGE;
+ else
+ return error('Der Content existiert in dieser Sprache nicht ');
+ }
+
+ $condition = ['content_id' => $content_id, 'sprache' => $sprache];
+
+ if ($sichtbar === true || $sichtbar === false)
+ $condition['sichtbar'] = $sichtbar;
+ if ($version)
+ $condition['version'] = $version;
+
+ $this->addSelect([
+ '*',
+ 'tbl_contentsprache.insertamum',
+ 'tbl_contentsprache.insertvon',
+ 'tbl_contentsprache.updateamum',
+ 'tbl_contentsprache.updatevon'
+ ]);
+ $this->addJoin('campus.tbl_contentsprache', 'content_id');
+ $this->addOrder('version', 'DESC');
+ $this->addLimit(1);
+
+ $result = $this->loadWhere($condition);
+
+ if (isError($result))
+ return $result;
+ if (!getData($result))
+ return error('Dieser Eintrag wurde nicht gefunden');
+
+ return success(current(getData($result)));
+ }
+
+ /**
+ * Sucht die content_id fuer den CIS4_Root Menu content
+ *
+ * @return integer|null content_id of the Cis4_Root Menu
+ */
+ public function getMenuContentID(){
+ // early return if the CIS4_MENU_ENTRY constant is defined
+ if(defined('CIS4_MENU_ENTRY'))
+ {
+ return CIS4_MENU_ENTRY;
+ }
+
+ // load the CIS4 Menu content_id from the database using the column 'beschreibugn' of the campus.tbl_content table
+ $CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]);
+
+ if(isError($CIS4_ROOT_CONTENT))
+ {
+ return null;
+ }
+
+ $CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT);
+
+ if(count($CIS4_ROOT_CONTENT) > 0)
+ {
+ return current($CIS4_ROOT_CONTENT)->content_id ?? null;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Laedt alle Content Eintraege unterhalb eines Contents
+ * (Ohne Newseintraege)
+ *
+ * @param integer $root_content_id
+ * @param string $uid
+ * @param string $sprache optional
+ *
+ * @return stdClass on success an array with menu objects
+ */
+ public function getMenu($root_content_id, $uid, $sprache = DEFAULT_LANGUAGE)
+ {
+
+ /*,
+ {
+ "content_id": 1000007,
+ "template_kurzbz": "redirect",
+ "titel": "Anrechnung",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ }
+ */
+
+ /*
+ {
+ "content_id": 1000003,
+ "template_kurzbz": "redirect",
+ "titel": "COVID-19",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ */
+
+ if ($root_content_id === null) {
+ $res = json_decode('{
+ "content_id": 1000000,
+ "template_kurzbz": "contentmittitel",
+ "titel": "CIS4",
+ "content": "",
+ "menu_open": true,
+ "aktiv": true,
+ "childs": [
+ {
+ "content_id": 1000001,
+ "template_kurzbz": "redirect",
+ "titel": "News",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ {
+ "content_id": 1000002,
+ "template_kurzbz": "redirect",
+ "titel": "Profil",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ {
+ "content_id": 1000004,
+ "template_kurzbz": "redirect",
+ "titel": "Meine LV",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ {
+ "content_id": 1000005,
+ "template_kurzbz": "redirect",
+ "titel": "Stundenplan",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ {
+ "content_id": 1000006,
+ "template_kurzbz": "redirect",
+ "titel": "Dokumente",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ },
+ {
+ "content_id": 1000007,
+ "template_kurzbz": "redirect",
+ "titel": "Studierendenstatus",
+ "content": "",
+ "menu_open": false,
+ "aktiv": true,
+ "childs": []
+ }
+
+ ]
+ }');
+ return success($res);
+ }
+ $sql = "
+ SELECT
+ c.content_id,
+ c.template_kurzbz,
+ s.titel,
+ s.content,
+ c.menu_open,
+ c.aktiv,
+ k.child_content_id,
+ k.sort FROM (
+ SELECT
+ c.content_id,
+ s.contentsprache_id
+ FROM
+ campus.tbl_content c
+ JOIN (
+ SELECT
+ s5.content_id,
+ s5.contentsprache_id
+ FROM (
+ SELECT
+ content_id,
+ sprache,
+ MAX(version) AS version
+ FROM (
+ SELECT
+ c1.content_id,
+ COALESCE(s1.sprache, ?) AS sprache
+ FROM
+ campus.tbl_content c1
+ LEFT JOIN
+ campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
+ WHERE
+ sichtbar=true
+ ) s2
+ LEFT JOIN
+ campus.tbl_contentsprache s3 USING(content_id, sprache)
+ WHERE
+ sichtbar=true
+ GROUP BY
+ content_id,
+ sprache
+ ) s4
+ LEFT JOIN
+ campus.tbl_contentsprache s5 USING(content_id, sprache, version)
+ WHERE
+ version IS NOT NULL
+ ) t USING (content_id)
+ JOIN
+ campus.tbl_contentsprache s USING (contentsprache_id)
+ WHERE
+ c.template_kurzbz<>'news'
+ AND
+ c.content_id IN (
+ WITH RECURSIVE childs(content_id, child_content_id) as
+ (
+ SELECT content_id, child_content_id FROM campus.tbl_contentchild
+ WHERE content_id=?
+ UNION ALL
+ SELECT cc.child_content_id, null FROM campus.tbl_contentchild cc, childs
+ WHERE cc.content_id=childs.content_id
+ )
+ SELECT content_id
+ FROM childs
+ GROUP BY content_id
+ )
+ GROUP BY c.content_id,
+ s.contentsprache_id
+ ) m
+ JOIN
+ campus.tbl_content c USING(content_id)
+ JOIN
+ campus.tbl_contentsprache s USING(contentsprache_id)
+ LEFT JOIN
+ campus.tbl_contentchild k ON(m.content_id=k.content_id)
+ WHERE EXISTS (
+ SELECT 1
+ FROM campus.tbl_contentgruppe
+ JOIN public.vw_gruppen USING(gruppe_kurzbz)
+ WHERE (
+ tbl_contentgruppe.content_id=c.content_id
+ OR NOT EXISTS (
+ SELECT 1
+ FROM campus.tbl_contentgruppe
+ WHERE content_id=c.content_id
+ )
+ )
+ AND vw_gruppen.uid=?
+ )
+ ORDER BY content_id, sort";
+
+ $result = $this->execQuery($sql, [DEFAULT_LANGUAGE, $sprache, $root_content_id, $uid]);
+
+ if (isError($result))
+ return $result;
+
+ $contents = getData($result) ?? [];
+ $result = [];
+ foreach ($contents as $content) {
+ if (!isset($result[$content->content_id])) {
+ $result[$content->content_id] = clone($content);
+ unset($result[$content->content_id]->child_content_id);
+ unset($result[$content->content_id]->sort);
+ $result[$content->content_id]->childs = [];
+ }
+ if ($content->child_content_id !== null)
+ $result[$content->content_id]->childs[] = $content->child_content_id;
+ }
+ foreach ($result as $content) {
+ foreach ($content->childs as $k => $v) {
+ if (isset($result[$v])) {
+ $content->childs[$k] = $result[$v];
+ } else {
+ unset($content->childs[$k]);
+ }
+ }
+ }
+
+ return success(isset($result[$root_content_id]) ? $result[$root_content_id] : null);
+ }
}
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
index 03efc87b1..23dc897a1 100644
--- a/application/models/content/Contentgruppe_model.php
+++ b/application/models/content/Contentgruppe_model.php
@@ -11,4 +11,50 @@ class Contentgruppe_model extends DB_Model
$this->dbTable = 'campus.tbl_contentgruppe';
$this->pk = array('gruppe_kurzbz', 'content_id');
}
+
+ /**
+ * Prueft ob der Zugriff auf den Content eingeschraenkt ist auf
+ * eine bestimmte Benutzergruppe
+ *
+ * @param int $content_id
+ *
+ * @return stdClass success(true) wenn eingeschraenkt sonst success(false)
+ */
+ public function islocked($content_id)
+ {
+ $islocked = $this->loadWhere(['content_id' => $content_id]);
+
+ if (isError($islocked))
+ return $islocked;
+ return success(!!getData($islocked));
+ }
+
+ /**
+ * Prueft ob ein User die Berechtigung fuer das Anzeigen des
+ * Contents besitzt
+ *
+ * @param int $content_id ID des Contents
+ * @param string $uid User der versucht auf den Content zuzugreifen
+ *
+ * @return stdClass
+ */
+ public function berechtigt($content_id, $uid)
+ {
+ $islocked = $this->islocked($content_id);
+ if (isError($islocked))
+ return $islocked;
+
+ $condition = ['uid' => $uid];
+ if (getData($islocked)) {
+ $condition['content_id'] = $content_id;
+ }
+ $this->addJoin('public.vw_gruppen', 'gruppe_kurzbz');
+
+ $result = $this->loadWhere($condition);
+
+ if (isError($result))
+ return $result;
+ return success(!!getData($result));
+ }
+
}
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
index eb7e257b2..80b053e28 100644
--- a/application/models/content/Contentsprache_model.php
+++ b/application/models/content/Contentsprache_model.php
@@ -11,4 +11,32 @@ class Contentsprache_model extends DB_Model
$this->dbTable = 'campus.tbl_contentsprache';
$this->pk = 'contentsprache_id';
}
+
+ /**
+ * Prueft ob der Content in der angegeben Sprache vorhanden ist
+ *
+ * @param int $content_id
+ * @param string $sprache
+ * @param int | null $version (optional)
+ * @param boolean | null $sichtbar (optional)
+ * @return stdClass
+ */
+ public function exists($content_id, $sprache, $version=null, $sichtbar=null)
+ {
+ $condition = ['content_id' => $content_id, 'sprache' => $sprache];
+
+ if ($version)
+ $condition['version'] = $version;
+
+ if ($sichtbar !== null)
+ $condition['sichtbar'] = $sichtbar;
+
+ $result = $this->loadWhere($condition);
+
+ if (isError($result))
+ return $result;
+
+ return success(!!getData($result));
+ }
+
}
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 8d636d808..ad8ecab99 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -11,4 +11,124 @@ class News_model extends DB_Model
$this->dbTable = 'campus.tbl_news';
$this->pk = 'news_id';
}
+
+ /**
+ * Get all News ordered by date. (most actual on top)
+ * @param null $limit Amount of news.
+ * @return array
+ */
+ public function getAll($limit = null)
+ {
+ $this->addJoin("campus.tbl_content","content_id");
+ return $this->execReadOnlyQuery('
+ SELECT *, TO_CHAR(campus.tbl_news.datum, ?) as datumformatted
+ FROM campus.tbl_news
+ JOIN campus.tbl_content content ON content.content_id = campus.tbl_news.content_id
+ WHERE
+ --text IS NOT NULL AND
+ datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+ ORDER BY datum DESC
+ LIMIT ' . $this->escape($limit)
+ , ['DD/MM/YYYY']);
+ }
+
+ public function getNewsContentIDs($limit=10){
+ $this->addSelect(['content_id']);
+ return $this->loadWhere("datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+ ORDER BY datum DESC
+ LIMIT " . $this->escape($limit));
+
+ }
+
+
+
+ /**
+ * @param string $sprache
+ * @param string $studiengang_kz
+ * @param integer | null $semester
+ * @param string $fachbereich_kurzbz
+ * @param boolean $sichtbar
+ * @param integer $maxalter
+ * @param integer $page
+ * @param integer $page_size
+ * @param boolean $all
+ * @param boolean $mischen
+ *
+ * TODO(chris): this is not a good function -> the params are all over the place
+ *
+ */
+ protected function prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+ {
+
+ $this->addOrder('datum', 'DESC');
+
+ $studiengang_kz = trim($studiengang_kz);
+ $fachbereich_kurzbz = trim($fachbereich_kurzbz);
+
+ $where = [];
+ if (trim($maxalter) != '0') {
+ $where[] = "(now()-datum) < interval " . $this->db->escape($maxalter) . " days";
+
+ }
+ if (!$all) {
+ $where[] = "datum <= now()";
+ $where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
+ }
+ if ($fachbereich_kurzbz != '*') {
+ if ($fachbereich_kurzbz == '') {
+ $where[] = "fachbereich_kurzbz IS NULL";
+ } else {
+ $where[] = "fachbereich_kurzbz = " . $this->db->escape($fachbereich_kurzbz);
+
+ }
+ }
+ if ($studiengang_kz == '0') {
+ $where[] = "studiengang_kz = " . $this->db->escape($studiengang_kz);
+
+ if ($semester === NULL)
+ $where[] = "semester IS NULL";
+ elseif ($semester === 0)
+ $where[] = "semester = 0";
+ } elseif ($studiengang_kz != '') {
+ $add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
+ $where[] = "((studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = " . $this->db->escape($semester) . ") OR (studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = 0) OR (studiengang_kz = 0 AND semester = " . $this->db->escape($semester) . ")" . $add . ")";
+
+ }
+ $this->addJoin('campus.tbl_contentsprache cs', 'content_id');
+
+ $where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
+
+ $where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END)";
+
+
+ $where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END))";
+
+
+ $where = implode(" AND ", $where);
+
+ $this->db->where($where, NULL, FALSE);
+
+ }
+
+ public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+ {
+ $this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+
+ // getting the number of rows of the query and adding pagination to the query result
+ $num_rows = $this->getNumRows(true);
+ $this->addPagination($page, $page_size, $num_rows);
+
+ // preparing the query again because every call to get_compiled_select or cour_all_results will add the from clause to the query
+ $this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+
+ return $this->load();
+ }
+
+ public function countNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+ {
+ $this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+ return $this->getNumRows();
+ }
+
+
}
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 15a38022e..57b6e0665 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -193,4 +193,55 @@ class Akte_model extends DB_Model
return success($dokumente->retval);
}
+
+ /**
+ * Liefert die Archivdokumente einer Person
+ *
+ * @param integer $person_id
+ * @param boolean|null $signiert Wenn true werden nur Dokumente geliefert die digital signiert wurden.
+ * @param boolean|null $stud_selfservice Wenn true werden nur Dokumente geliefert die Studierende selbst herunterladen duerfen.
+ *
+ * @return stdClass
+ */
+ public function getArchiv($person_id, $signiert = null, $stud_selfservice = null)
+ {
+ $this->addSelect('akte_id');
+ $this->addSelect('person_id');
+ $this->addSelect('dokument_kurzbz');
+ $this->addSelect('mimetype');
+ $this->addSelect('erstelltam');
+ $this->addSelect('gedruckt');
+ $this->addSelect('titel_intern');
+ $this->addSelect('anmerkung_intern');
+ $this->addSelect('titel');
+ $this->addSelect('bezeichnung');
+ $this->addSelect('updateamum');
+ $this->addSelect('insertamum');
+ $this->addSelect('updatevon');
+ $this->addSelect('insertvon');
+ $this->addSelect('uid');
+ $this->addSelect('dms_id');
+ $this->addSelect('anmerkung');
+ $this->addSelect('nachgereicht');
+ $this->addSelect('CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden', false);
+ $this->addSelect('nachgereicht_am');
+ $this->addSelect('ausstellungsnation');
+ $this->addSelect('formal_geprueft_amum');
+ $this->addSelect('archiv');
+ $this->addSelect('signiert');
+ $this->addSelect('stud_selfservice');
+ $this->addSelect('akzeptiertamum');
+
+ if ($signiert !== null)
+ $this->db->where('signiert', (boolean)$signiert);
+ if ($stud_selfservice !== null)
+ $this->db->where('stud_selfservice', (boolean)$stud_selfservice);
+
+ $this->addOrder('erstelltam', 'DESC');
+
+ return $this->loadWhere([
+ 'person_id' => $person_id,
+ 'archiv' => true
+ ]);
+ }
}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index d130d5db8..51d3117bc 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -340,6 +340,34 @@ class Konto_model extends DB_Model
}
/**
+ * @param integer $prestudent_id
+ * @param string $stsem
+ * @param array $buchungstypen
+ *
+ * @return stdClass
+ */
+ public function checkStudienbeitragFromPrestudent($prestudent_id, $stsem, $buchungstypen)
+ {
+ $this->addSelect($this->dbTable . '.buchungsnr');
+ $this->addSelect($this->dbTable . '.buchungsdatum');
+
+ $this->addJoin('public.tbl_prestudent s', $this->dbTable . '.person_id=s.person_id AND ' . $this->dbTable . '.studiengang_kz=s.studiengang_kz');
+
+ $this->db->where_in('buchungstyp_kurzbz', $buchungstypen);
+ $this->db->where('0 >= (
+ SELECT sum(betrag)
+ FROM ' . $this->dbTable . ' skonto
+ WHERE skonto.buchungsnr = ' . $this->dbTable . '.buchungsnr_verweis
+ OR skonto.buchungsnr_verweis = ' . $this->dbTable . '.buchungsnr_verweis
+ )', null, false);
+
+ return $this->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'studiensemester_kurzbz' => $stsem
+ ]);
+ }
+
+ /*
* check if student has paid studienbeitrag for certain semester
*
* @param $person_id person_id
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index e045eaf84..242c26518 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -14,6 +14,39 @@ class Prestudent_model extends DB_Model
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
}
+ /**
+ * Update Data in DB-Table
+ *
+ * @param string $id PK for DB-Table
+ * @param array $data DataArray for Insert
+ * @return array
+ */
+ public function update($id, $data, $encryptedColumns = null)
+ {
+ if (isset($data['zgvmas_code'])
+ || isset($data['zgvmanation'])
+ || isset($data['zgv_code'])
+ || isset($data['zgvnation'])
+ ) {
+ /**
+ * Falls ZGV vorhanden, setze Ausstellungsstaat (für BIS-Meldung)
+ * auf Nation der höchsten angegebenen ZGV
+ */
+ $case = '(CASE
+ WHEN zgvmas_code IS NOT NULL AND zgvmanation IS NOT NULL THEN zgvmanation
+ WHEN zgv_code IS NOT NULL AND zgvnation IS NOT NULL THEN zgvnation
+ ELSE NULL END)';
+
+ foreach (['zgvmas_code', 'zgvmanation', 'zgv_code', 'zgvnation'] as $key)
+ if (isset($data[$key]))
+ $case = str_replace($key, $this->escape($data[$key]), $case);
+
+ $this->db->set('ausstellungsstaat', $case, false);
+ }
+
+ return parent::update($id, $data, $encryptedColumns);
+ }
+
/**
* getLastStatuses
*/
@@ -707,9 +740,11 @@ class Prestudent_model extends DB_Model
*/
public function getHistoryPrestudents($person_id)
{
+
$query = "
- SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
- CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status
+ SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, ps.orgform_kurzbz,
+ ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
+ CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
FROM public.tbl_prestudent p
JOIN (
SELECT DISTINCT ON(prestudent_id) *
@@ -718,6 +753,7 @@ class Prestudent_model extends DB_Model
ORDER BY prestudent_id, datum desc, insertamum desc
) ps USING(prestudent_id)
JOIN public.tbl_status USING(status_kurzbz)
+ LEFT JOIN public.tbl_status_grund g USING (statusgrund_id)
JOIN public.tbl_studiengang sg USING(studiengang_kz)
LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
LEFT JOIN public.tbl_student s USING (prestudent_id)
@@ -726,61 +762,4 @@ class Prestudent_model extends DB_Model
return $this->execQuery($query, array($person_id));
}
-
- /**
- * Gets history of prestudent, prestudent_id given
- * @param int $prestudent_id
- * @return object
- */
- public function getHistoryPrestudent($prestudent_id)
- {
- $query = "
- SELECT
- ps.status_kurzbz,
- ps.studiensemester_kurzbz,
- ps.ausbildungssemester,
- CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand')
- THEN CONCAT(lv.semester, lv.verband, lv.gruppe)
- ELSE ''
- END AS lehrverband,
- ps.datum,
- TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
- sp.bezeichnung,
- ps.bestaetigtam,
- TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
- ps.bewerbung_abgeschicktamum,
- TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
- stg.statusgrund_kurzbz,
- ps.orgform_kurzbz,
- ps.prestudent_id,
- sp.studienplan_id,
- ps.anmerkung,
- ps.bestaetigtvon,
- ps.insertamum,
- TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum,
- ps.insertvon,
- ps.updateamum,
- TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
- ps.updatevon
- FROM
- public.tbl_prestudentstatus ps
- JOIN
- public.tbl_student st USING (prestudent_id)
- JOIN
- public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
- LEFT JOIN
- lehre.tbl_studienplan sp USING (studienplan_id)
- LEFT JOIN
- public.tbl_status_grund stg USING (statusgrund_id)
- LEFT JOIN
- public.tbl_studentlehrverband lv ON
- (st.student_uid = lv.student_uid
- AND st.student_uid IS NOT NULL
- AND lv.studiensemester_kurzbz = ps.studiensemester_kurzbz)
- WHERE prestudent_id = ?
- ORDER BY datum DESC
- ";
-
- return $this->execQuery($query, array($prestudent_id));
- }
}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index cad3f1b91..de91319b9 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -5,6 +5,15 @@ class Prestudentstatus_model extends DB_Model
const STATUS_ABBRECHER = 'Abbrecher';
const STATUS_UNTERBRECHER = 'Unterbrecher';
+ const STATUS_STUDENT = 'Student';
+ const STATUS_DIPLOMAND = 'Diplomand';
+ const STATUS_ABSOLVENT = 'Absolvent';
+ const STATUS_BEWERBER = 'Bewerber';
+ const STATUS_AUFGENOMMENER = 'Aufgenommener';
+ const STATUS_WARTENDER = 'Wartender';
+ const STATUS_ABGEWIESENER = 'Abgewiesener';
+ const STATUS_INTERESSENT = 'Interessent';
+ const STATUS_INCOMING = 'Incoming';
/**
* Constructor
@@ -15,15 +24,77 @@ class Prestudentstatus_model extends DB_Model
$this->dbTable = 'public.tbl_prestudentstatus';
$this->pk = array('ausbildungssemester', 'studiensemester_kurzbz', 'status_kurzbz', 'prestudent_id');
$this->hasSequence = false;
+ }
-/* $CI =& get_instance();
+ /**
+ * loadWhereUid
+ *
+ * loads all rows for a student_uid
+ *
+ * @param string $uid
+ * @param array $where Optional. Default empty array
+ * @param boolean $withPrestudent Optional. Default true
+ *
+ * @return stdClass
+ */
+ public function loadWhereUid($uid, $where = null, $withPrestudent = false)
+ {
+ $this->addSelect($this->dbTable . '.*');
+ $this->addJoin('public.tbl_student', 'prestudent_id');
- $CI->load->library('PhrasesLib');
+ if ($withPrestudent) {
+ $this->addJoin('public.tbl_prestudent s', 'prestudent_id');
+ $this->addSelect('s.aufmerksamdurch_kurzbz');
+ $this->addSelect('s.person_id');
+ $this->addSelect('s.studiengang_kz');
+ $this->addSelect('s.berufstaetigkeit_code');
+ $this->addSelect('s.ausbildungcode');
+ $this->addSelect('s.zgv_code');
+ $this->addSelect('s.zgvort');
+ $this->addSelect('s.zgvdatum');
+ $this->addSelect('s.zgvmas_code');
+ $this->addSelect('s.zgvmaort');
+ $this->addSelect('s.zgvmadatum');
+ $this->addSelect('s.aufnahmeschluessel');
+ $this->addSelect('s.facheinschlberuf');
+ $this->addSelect('s.reihungstest_id');
+ $this->addSelect('s.anmeldungreihungstest');
+ $this->addSelect('s.reihungstestangetreten');
+ $this->addSelect('s.rt_gesamtpunkte');
+ $this->addSelect('s.bismelden');
+ $this->addSelect('s.dual');
+ $this->addSelect('s.rt_punkte1');
+ $this->addSelect('s.rt_punkte2');
+ $this->addSelect('s.ausstellungsstaat');
+ $this->addSelect('s.rt_punkte3');
+ $this->addSelect('s.zgvdoktor_code');
+ $this->addSelect('s.zgvdoktorort');
+ $this->addSelect('s.zgvdoktordatum');
+ $this->addSelect('s.mentor');
+ $this->addSelect('s.zgvnation');
+ $this->addSelect('s.zgvmanation');
+ $this->addSelect('s.zgvdoktornation');
+ $this->addSelect('s.gsstudientyp_kurzbz');
+ $this->addSelect('s.aufnahmegruppe_kurzbz');
+ $this->addSelect('s.udf_values');
+ $this->addSelect('s.priorisierung');
+ $this->addSelect('s.foerderrelevant');
+ $this->addSelect('s.standort_code');
+ $this->addSelect('s.zgv_erfuellt');
+ $this->addSelect('s.zgvmas_erfuellt');
+ $this->addSelect('s.zgvdoktor_erfuellt');
+ }
- // Load language phrases
- $CI->loadPhrases([
- 'ui', 'lehre'
- ]);*/
+
+ $this->addOrder('datum');
+ $this->addOrder('insertamum');
+
+ if (!$where)
+ $where = [];
+
+ $where['student_uid'] = $uid;
+
+ return $this->loadWhere($where);
}
/**
@@ -289,6 +360,7 @@ class Prestudentstatus_model extends DB_Model
$this->addSelect('ss.studienjahr_kurzbz');
$this->addSelect('pers.vorname');
$this->addSelect('pers.nachname');
+ $this->addSelect('pers.unruly');
$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
$this->addSelect('pers.person_id');
$this->addSelect('g.studiengang_kz');
@@ -339,318 +411,249 @@ class Prestudentstatus_model extends DB_Model
*/
public function withGrund($statusgrund_kurzbz)
{
- if($statusgrund_kurzbz)
+ if ($statusgrund_kurzbz)
$this->db->set(
'statusgrund_id',
- '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')',
+ '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz=' . $this->db->escape($statusgrund_kurzbz) . ')',
false
);
return $this;
}
- /**
- * Check if Rolle already exists
- * @param integer $prestudent_id
- * @param string $status_kurzbz
- * @param string $studiensemester_kurzbz
- * @param integer $ausbildungssemester
- * @return 1: if Rolle exists, 0: if it doesn't
- * Copy from studentDBDML.php
- */
- public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
- {
- $qry = "SELECT
- *
- FROM
- public.tbl_prestudentstatus
- WHERE
- prestudent_id = ?
- AND
- status_kurzbz = ?
- AND
- studiensemester_kurzbz = ?
- AND
- ausbildungssemester = ?";
-
- $result = $this->execQuery($qry, array($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester));
-
- if (isError($result))
- {
- return error($result);
- }
- elseif (!hasData($result))
- {
- return success(0);
- }
- else
- {
- //TODO(manu) nur retval übergeben
- return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden'));
- }
- }
-
- /**
- * Check if Rolle there is an existing Bewerberstatus
- * @param integer $prestudent_id
- * @return error if no bewerberstatus, success if existing
- */
- public function checkIfExistingBewerberstatus($prestudent_id, $name = null)
- {
- $qry = "SELECT
- *
- FROM
- public.tbl_prestudentstatus
- WHERE
- prestudent_id = ?
- AND
- status_kurzbz = 'Bewerber'";
-
- $result = $this->execQuery($qry, array($prestudent_id));
-
- if (isError($result))
- {
- return error($result);
- }
- elseif (!hasData($result))
- {
- $person = $name ? $name : "Person";
- return success("0", $person . " muss zuerst zum Bewerber gemacht werden!");
- }
- else
- {
- return success($result);
- }
- }
-
/**
* Check if there is only one prestudentstatus left
- * @param integer $prestudent_id
- * @return success("1") if last prestudentstatusentry, else success("0")
+ *
+ * @param integer $prestudent_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
*/
- public function checkIfLastStatusEntry($prestudent_id, $isStudent=false )
+ public function checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz = null)
{
- $qry = "SELECT
- COUNT(*) as anzahl
- FROM
- public.tbl_prestudentstatus
+ $this->addSelect('COUNT(*) AS anzahl', false);
+
+ if ($studiensemester_kurzbz)
+ $this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+
+ $result = $this->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+
+ if (isError($result))
+ return $result;
+
+ $resultObject = current($result->retval);
+
+ $anzahl = (int)$resultObject->anzahl;
+
+ if ($anzahl <= 1)
+ return success(true, $this->p->t('lehre', 'error_lastRole'));
+
+ return success(false, $this->p->t('lehre', 'anzahl_existingRoles', ['anzahl' => $anzahl]));
+ }
+
+ public function getAllPrestudentstatiWithStudiensemester($prestudent_id)
+ {
+ $qry = "
+ SELECT
+ tbl_prestudentstatus.status_kurzbz,
+ tbl_prestudentstatus.studiensemester_kurzbz,
+ tbl_prestudentstatus.ausbildungssemester,
+ tbl_prestudentstatus.datum,
+ s.start AS studiensemester_start,
+ pl.orgform_kurzbz AS studienplan_orgform_kurzbz,
+ stud.matrikelnr,
+ pers.vorname,
+ pers.nachname
+ FROM
+ public.tbl_prestudentstatus
+ JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz)
+ JOIN public.tbl_prestudent USING (prestudent_id)
+ JOIN public.tbl_person pers USING (person_id)
+ LEFT JOIN public.tbl_student stud USING (prestudent_id)
+ LEFT JOIN lehre.tbl_studienplan pl USING (studienplan_id)
WHERE
prestudent_id = ?
- ";
-
- if($isStudent)
- {
- $qry .= "AND status_kurzbz = 'Student'";
- }
-
- $result = $this->execQuery($qry, array($prestudent_id));
-
- if (isError($result))
- {
- return error($result);
- }
- else
- {
- $resultObject = current(getData($result));
-
- if (property_exists($resultObject, 'anzahl'))
- {
- $anzahl = (int) $resultObject->anzahl;
- if ($anzahl <= 1 )
- {
- return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden");
- }
- else
- return success("0", $anzahl . " Rollen vorhanden");
-
- }
- else
- {
- return error("PrestudentstatusModel: Error During Check if Last Status Entry.");
- }
- }
- }
-
- /**
- * Check if Datum New Status is in the Past
- * @param integer $prestudent_id
- * @return error if in past
- */
- public function checkDatumNewStatus($new_status_datum)
- {
- $today = new DateTime('today');
- $new_status_datum = new DateTime($new_status_datum);
-
- if($new_status_datum < $today)
- {
- return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen ");
- }
- else
- {
- return success();
- }
- }
-
- /**
- * Check if History of StatusData is valid
- * @param integer $prestudent_id
- * @return error if not valid, array StatusArr if valid
- */
- public function checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
- {
- //$isNewStatus = $this->checkIfNewStatus($prestudent_id, $status_kurzbz);
- $isNewStatus = $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
-
- //get start studiensemester
- $result = $this->StudiensemesterModel->load([
- 'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
- ]);
- if(isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return $this->outputJson(getError($result));
- }
- elseif(!hasData($result)) {
- return error("Kein Eintrag für Studiensemester vorhanden! :-/" . $new_status_studiensemester_kurzbz);
- }
-
- $studiensemester = current($result->retval);
- $new_status_semesterstart = $studiensemester->start;
-
- //get all prestudentstati
- //TODO(manu) errorlogic
- $resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
- if (isError($resultPs))
- {
- $resultArr = [];
- }
- if(!hasData($resultPs))
- {
- $resultArr = [];
- }
- else
- $resultArr = $resultPs->retval;
-
- $statusArr = array();
-
- $newStatusInserted = false;
- $new_status_datum_form = new DateTime($new_status_datum);
- $new_status_semesterstart_form = new DateTime($new_status_semesterstart);
-
- foreach ($resultArr as $row)
- {
- $studiensemester_start = new DateTime($row->studiensemester_start);
- $status_datum = new DateTime ($row->datum);
-
-
- if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start) {
-
- if (!$newStatusInserted)
- {
- // neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
- $neuer_status = new stdClass();
- $neuer_status->status_kurzbz = $status_kurzbz;
- $neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
- $neuer_status->datum = $new_status_datum;
- $neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
- $statusArr[] = $neuer_status;
- $newStatusInserted = true;
- }
- $statusArr[] = $row;
- }
- elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){
- $statusArr[] = $row;
-
- }
- else
- {
- return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein");
- }
-
- }
-
- $endstatusArr = array('Absolvent', 'Abbrecher');
- // Über alle gespeicherten Status gehen und Statusabfolge prüfen
- for ($i = 0; $i < count($statusArr); $i++) {
- $curr_status = $statusArr[$i];
- $curr_status_kurzbz = $curr_status->status_kurzbz;
- $curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
- $next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
- $next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
-
- // Abbrecher- oder Absolventenstatus muss Endstatus sein
- if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
-
- return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
- }
-
- // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
- if (
- $curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher'
- && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
- )
- {
- return error("Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben");
- }
-
- // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
- if (
- isset($next_status) && $curr_status_kurzbz == 'Unterbrecher'
- && $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
- )
- {
- return error("Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben");
- }
-
- // keine Studenten nach Diplomand Status
- if (
- isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
- )
- {
- return error("Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden");
- }
-
- }
-
- //return $statusArr; //rot
- //return $resultPs->retval; //rot
- //TODO(Manu) check, warum Fehlermeldung bei anderem returnwert!
- return $resultPs;
- }
-
- public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
- {
-
- //Todo(manu) check isNewStatus
- $isNewStatus = $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
-
- $qry = "
- SELECT public.tbl_prestudentstatus.status_kurzbz,
- public.tbl_prestudentstatus.studiensemester_kurzbz,
- public.tbl_prestudentstatus.ausbildungssemester,
- public.tbl_prestudentstatus.datum,
- s.start AS studiensemester_start
- FROM public.tbl_prestudentstatus
- JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz)
- WHERE prestudent_id = ?
- ORDER BY public.tbl_prestudentstatus.datum DESC,
- public.tbl_prestudentstatus.insertamum DESC,
- public.tbl_prestudentstatus.ext_id DESC
+ ORDER BY
+ public.tbl_prestudentstatus.datum DESC,
+ public.tbl_prestudentstatus.insertamum DESC,
+ public.tbl_prestudentstatus.ext_id DESC
";
- $result = $this->execQuery($qry, array($prestudent_id));
-
- if (isError($result))
- {
- return error($result);
- }
- if (!hasData($result)) {
- return success("0",'No Statusdata vorhanden');
- }
-
- return $result;
-
+ return $this->execQuery($qry, array($prestudent_id));
}
+ /**
+ * Gets status history of a prestudent
+ * This function uses the language of the logged in user to
+ * translate the given statusgrund
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function getHistoryPrestudent($prestudent_id)
+ {
+ $lang= getUserLanguage();
+ $this->addSelect('tbl_prestudentstatus.prestudent_id');
+ $this->addSelect('tbl_prestudentstatus.status_kurzbz');
+ $this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz');
+ $this->addSelect('tbl_prestudentstatus.ausbildungssemester');
+ $this->addSelect('tbl_prestudentstatus.datum');
+ $this->addSelect('tbl_prestudentstatus.insertamum');
+ $this->addSelect('tbl_prestudentstatus.insertvon');
+ $this->addSelect('tbl_prestudentstatus.updateamum');
+ $this->addSelect('tbl_prestudentstatus.updatevon');
+ $this->addSelect('tbl_prestudentstatus.orgform_kurzbz');
+ $this->addSelect('tbl_prestudentstatus.bestaetigtam');
+ $this->addSelect('tbl_prestudentstatus.bestaetigtvon');
+ $this->addSelect('tbl_prestudentstatus.bewerbung_abgeschicktamum');
+ $this->addSelect('tbl_prestudentstatus.anmerkung');
+ $this->addSelect('plan.studienplan_id');
+ $this->addSelect('plan.bezeichnung');
-}
+ $this->addSelect('grund.beschreibung[(
+ SELECT index
+ FROM public.tbl_sprache
+ WHERE sprache=' . $this->escape($lang) . '
+ )] AS statusgrund_bezeichnung', false);
+ $this->addSelect("CASE
+ WHEN s.student_uid IS NOT NULL
+ AND tbl_prestudentstatus.status_kurzbz IN (" . implode(",", $this->escape([
+ 'Student',
+ 'Diplomand',
+ 'Abbrecher',
+ 'Absolvent',
+ 'Ausserodentlicher',
+ 'Incoming',
+ 'Outgoing',
+ 'Unterbrecher'
+ ])) . ")
+ THEN lv.semester || lv.verband || lv.gruppe
+ ELSE '-'
+ END AS lehrverband", false);
+
+
+ $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+ $this->addJoin('public.tbl_status_grund grund', 'statusgrund_id', 'LEFT');
+ $this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+ $this->addJoin(
+ 'public.tbl_studentlehrverband lv',
+ 's.student_uid IS NOT NULL AND s.student_uid=lv.student_uid AND tbl_prestudentstatus.studiensemester_kurzbz=lv.studiensemester_kurzbz',
+ 'LEFT'
+ );
+
+ $this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+ $this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+ $this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+ return $this->loadWhere([
+ 'tbl_prestudentstatus.prestudent_id' => $prestudent_id
+ ]);
+ }
+
+ /**
+ * Gets status history of a prestudent for checking purposes.
+ * This function adds the new state or replaces the edited.
+ *
+ * @param integer $prestudent_id
+ * @param string $status_kurzbz
+ * @param DateTime $new_date
+ * @param string $new_studiensemester_kurzbz
+ * @param integer $new_ausbildungssemester
+ * @param string $old_studiensemester_kurzbz
+ * @param integer $old_ausbildungssemester
+ *
+ * @return stdClass
+ */
+ public function getHistoryWithNewOrEditedState(
+ $prestudent_id,
+ $status_kurzbz,
+ $new_date,
+ $new_studiensemester_kurzbz,
+ $new_ausbildungssemester,
+ $old_studiensemester_kurzbz,
+ $old_ausbildungssemester
+ ) {
+ $new_date = $new_date->format('Y-m-d');
+
+ $this->addSelect('status_kurzbz');
+ $this->addSelect('studiensemester_kurzbz');
+ $this->addSelect('ausbildungssemester');
+ $this->addSelect('datum');
+ $this->addSelect('insertamum');
+ $this->addSelect('ext_id');
+
+ if ($old_studiensemester_kurzbz || $old_ausbildungssemester) {
+ $this->db->not_group_start();
+ $this->db->where('status_kurzbz', $status_kurzbz);
+ $this->db->where('studiensemester_kurzbz', $old_studiensemester_kurzbz);
+ $this->db->where('ausbildungssemester', $old_ausbildungssemester);
+ $this->db->group_end();
+ }
+
+ $this->db->where('prestudent_id', $prestudent_id);
+
+ $tmpTable = $this->db->get_compiled_select($this->dbTable);
+
+ $tmpTable .= "UNION
+ SELECT " .
+ $this->escape($status_kurzbz) . " AS status_kurzbz, " .
+ $this->escape($new_studiensemester_kurzbz) . " AS studiensemester_kurzbz, " .
+ $this->escape($new_ausbildungssemester) . " AS ausbildungssemester, " .
+ $this->escape($new_date) . "::date AS datum," .
+ $this->escape(date('c')) . "::date AS insertamum," .
+ "NULL AS ext_id";
+
+ $this->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz');
+
+ $this->addOrder('s.datum', 'DESC');
+ $this->addOrder('s.insertamum', 'DESC');
+ $this->addOrder('s.ext_id', 'DESC');
+
+ $dbTable = $this->dbTable;
+ $this->dbTable = "(" . $tmpTable . ") s";
+
+ $result = $this->load();
+
+ $this->dbTable = $dbTable;
+
+ return $result;
+ }
+
+ /**
+ * For checks if Orgform of Student status and Bewerber status match.
+ * Returns any Bewerber status that does not match the first Student
+ * status' Orgform.
+ *
+ * @param integer $prestudent_id
+ *
+ * @return stdClass
+ */
+ public function getBewerberWhereOrgformNotStudent($prestudent_id)
+ {
+ $this->addSelect('plan.orgform_kurzbz');
+
+ $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+ $this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+ $this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+ $this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+ $this->addLimit(1);
+
+ $this->db->where('prestudent_id', $prestudent_id);
+ $this->db->where('status_kurzbz', self::STATUS_STUDENT);
+
+ $sql = $this->db->get_compiled_select($this->dbTable);
+
+ $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+ $this->db->where('plan.orgform_kurzbz !=', '(' . $sql . ')', false);
+ return $this->loadWhere([
+ 'prestudent_id' => $prestudent_id,
+ 'status_kurzbz' => self::STATUS_BEWERBER
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
index 7b1b38ecb..1ee2a5199 100644
--- a/application/models/crm/Status_model.php
+++ b/application/models/crm/Status_model.php
@@ -11,4 +11,21 @@ class Status_model extends DB_Model
$this->dbTable = 'public.tbl_status';
$this->pk = 'status_kurzbz';
}
+
+ public function getAllStatiWithStatusgruende()
+ {
+ $lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+ $this->addSelect('sg.status_kurzbz');
+
+ $this->addSelect('statusgrund_id');
+ $this->addSelect('sg.bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+ $this->addSelect('sg.beschreibung' . $lang . ' AS beschreibung');
+
+ $this->addJoin('public.tbl_status_grund sg', 'ON (sg.status_kurzbz = public.tbl_status.status_kurzbz)', 'LEFT');
+
+ return $this->loadWhere([
+ 'aktiv'=> true,
+ ]);
+ }
}
diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
index d488e12d1..8fc2a3a62 100644
--- a/application/models/crm/Statusgrund_model.php
+++ b/application/models/crm/Statusgrund_model.php
@@ -27,4 +27,19 @@ class Statusgrund_model extends DB_Model
return success($status->retval);
}
+
+ public function getAktiveGruende()
+ {
+ $lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+ $this->addSelect('tbl_status_grund.*');
+ $this->addSelect('bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+ $this->addSelect('beschreibung' . $lang . ' AS beschreibung');
+
+ $this->addOrder('bezeichnung_mehrsprachig' . $lang);
+
+ return $this->loadWhere([
+ 'aktiv' => true
+ ]);
+ }
}
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index f9a1f77f3..539c3cf56 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -1,4 +1,8 @@
hasSequence = false;
}
+ /**
+ * Checks if the user is a Student.
+ * @param string $uid
+ * @return array
+ */
+ public function isStudent($uid)
+ {
+ $this->addSelect('1');
+
+ $result = $this->loadWhere(array('student_uid' => $uid));
+
+
+ if(hasData($result))
+ {
+ return success(true);
+ }
+ else
+ {
+ return success(false);
+ }
+ }
+
// ****
// * Generiert die Matrikelnummer
// * FORMAT: 0710254001
@@ -43,9 +69,169 @@ class Student_model extends DB_Model
$max = 0;
$max += 1;
+
return $matrikelnummer.sprintf("%03d", $max);
}
+ /**
+ * Generiert die Matrikelnummer
+ * FORMAT: 0710254001
+ * 07 = Jahr
+ * 1/2/0 = WS/SS/incoming
+ * 0254 = Studiengangskennzahl vierstellig
+ * 001 = Laufende Nummer
+ * copy of generateMatrikelnummer plus
+ * logic FH Burgenland
+ *
+ * TODO(chris): replace function above with this?
+ * TODO(chris): rename to generatePersonenkennzeichen?
+ *
+ * @param integer $studiengang_kz
+ * @param string $studiensemester_kurzbz
+ * @param string $typ
+ *
+ * @return stdClass
+ */
+ public function generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz, $typ = null)
+ {
+ $personenkennzeichen = false;
+
+ Events::trigger(
+ 'generate_personenkennzeichen',
+ function ($value) use ($personenkennzeichen) {
+ $personenkennzeichen = $value;
+ },
+ $studiengang_kz,
+ $studiensemester_kurzbz,
+ $typ
+ );
+
+ if ($personenkennzeichen !== false)
+ return success($personenkennzeichen);
+
+ // Validierung der Eingabewerte
+ if (strlen($studiensemester_kurzbz) < 6) {
+ throw new InvalidArgumentException("Ungültiges studiensemester_kurzbz Format.");
+ }
+
+ $jahr = mb_substr($studiensemester_kurzbz, 4);
+ $art = substr($studiensemester_kurzbz, 0, 2);
+
+ if (($studiengang_kz < 0) || (isset($typ) && ($typ == 'l')))
+ {
+ $studiengang_kz=abs($studiengang_kz);
+ //Lehrgang
+ switch($art)
+ {
+ case 'WS':
+ $art = '3';
+ break;
+ case 'SS':
+ $art = '4';
+ break;
+ default:
+ $art = '0';
+ break;
+ }
+ }
+ else
+ {
+ //Studiengang
+ switch($art)
+ {
+ case 'WS':
+ $art = '1';
+ break;
+ case 'SS':
+ $art = '2';
+ break;
+ default:
+ $art = '0';
+ break;
+ }
+ }
+ if($art=='2' || $art=='4')
+ $jahr = $jahr-1;
+
+ //FH-Burgenland - weil leider die AO Studiengänge aufgeteilt sind
+ //(AO sind normal 9+erhalter Nummer, matrikelnr/personenkz wird auch im DVUH Extension berücksichtigt)
+ if ($studiengang_kz >= 90010 && $studiengang_kz <= 90019)
+ {
+ $matrikelnummer = sprintf("%02d", $jahr).$art.substr($studiengang_kz, 0, 4);
+ }
+ else
+ {
+ $matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz);
+ }
+
+ $qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1";
+ $matrikelnrres = $this->execQuery($qry, array($matrikelnummer.'%'));
+
+ $max = 0;
+ if ($matrikelnrres && hasData($matrikelnrres)) {
+ $max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
+ if (!is_numeric($max)) {
+ $max = (int)$max;
+ }
+ }
+
+ $max += 1;
+ return success($matrikelnummer.sprintf("%03d", $max));
+ }
+
+ /**
+ * Generiert die UID
+ * FORMAT: el07b001
+ * $stgkzl: el = studiengangskuerzel
+ * $jahr: 07 = Jahr
+ * $stgtyp: b/m/d/x = Bachelor/Master/Diplom/Incoming
+ * $matrikelnummer
+ * 001 = Laufende Nummer Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
+ * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
+ *
+ * @param string $stgkzl
+ * @param string $jahr
+ * @param string $stgtyp
+ * @param string $matrikelnummer
+ * @param string $vorname
+ * @param string $nachname
+ *
+ * @return stdClass
+ */
+ public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer, $vorname, $nachname)
+ {
+ $uid = false;
+
+ Events::trigger(
+ 'generate_student_uid',
+ function ($value) use ($uid) {
+ $uid = $value;
+ },
+ $stgkzl,
+ $jahr,
+ $stgtyp,
+ $matrikelnummer,
+ $vorname,
+ $nachname
+ );
+
+ if ($uid !== false)
+ return success($uid);
+
+ $art = mb_substr($matrikelnummer, 2, 1);
+ $nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3);
+ if($art=='2') //Sommersemester
+ $nr = $nr+500;
+ elseif($art=='0' && $stgtyp=='m') //Incoming im Masterstudiengang
+ $nr = $nr+500;
+ elseif($art=='4' && $stgtyp=='l') // Lehrgangsteilnehmer im Sommersemester
+ $nr = $nr+500;
+
+
+ return success(mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr));
+ }
+
+
/**
* Get students UID by PrestudentID.
* @param $prestudent_id
@@ -67,35 +253,6 @@ class Student_model extends DB_Model
return $result->retval[0]->student_uid;
}
- /**
- * Get students UID by PrestudentID.
- * @param $prestudent_id
- * @return mixed
- */
- public function checkIfUID($prestudent_id)
- {
- $this->addSelect('student_uid');
-
- $result = $this->loadWhere(
- array('prestudent_id' => $prestudent_id)
- );
-
- if(isError($result))
- {
- return error( "Error while checking student_uid");
- }
-
- if (!hasData($result))
- {
- return success("0","Keine Student_uid vorhanden");
- }
-
- $student_uid = $result->retval[0]->student_uid;
-
- return success ($student_uid);
-
- }
-
public function searchStudent($filter)
{
$this->addSelect('vorname, nachname, gebdatum, person.person_id, student_uid');
@@ -107,7 +264,8 @@ class Student_model extends DB_Model
OR lower(person.nachname) like ".$this->db->escape('%'.$filter.'%')."
OR lower(person.vorname) like ".$this->db->escape('%'.$filter.'%')."
OR lower(person.nachname || ' ' || person.vorname) like ".$this->db->escape('%'.$filter.'%')."
- OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%'));
+ OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%')
+ );
return $result;
}
@@ -121,46 +279,4 @@ class Student_model extends DB_Model
{
return $student_uid . '@' . DOMAIN;
}
-
- /**
- * Check if StudentenRolle already exists
- * @param integer $prestudent_id
- * @return 0 if not exists, count(rollen) if it does
- * Copy from studentDBDML.php
- */
- public function checkIfExistingStudentRolle($prestudent_id)
- {
- $qry = "SELECT
- count(*) as anzahl
- FROM
- public.tbl_student
- WHERE
- prestudent_id = ? ";
-
- $result = $this->execQuery($qry, array($prestudent_id));
-
- if (isError($result))
- {
- return error($result);
- }
- else
- {
- $resultObject = current(getData($result));
-
- if (property_exists($resultObject, 'anzahl')) {
- $resultValue = (int) $resultObject->anzahl;
-
- if ($resultValue > 0)
- {
- return success($resultValue, $resultValue . " vorhandene Rollen");
- }
- else
- {
- return success("0", "Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter 'Status aendern' den Punkt 'Student'");
- }
- } else {
- return error("StudentModel: Error During Check if Existing Student Rolle.");
- }
- }
- }
}
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
new file mode 100644
index 000000000..5efacc26b
--- /dev/null
+++ b/application/models/dashboard/Bookmark_model.php
@@ -0,0 +1,18 @@
+dbTable = 'dashboard.tbl_bookmark';
+ $this->pk = 'bookmark_id';
+ }
+
+
+
+
+}
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
new file mode 100644
index 000000000..d7a12bb42
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Override_model.php
@@ -0,0 +1,26 @@
+dbTable = 'dashboard.tbl_dashboard_benutzer_override';
+ $this->pk = 'override_id';
+ }
+
+
+ /**
+ * Get Overrides of given uid.
+ * @param integer dashboard_id
+ * @param string $uid
+ * @return array
+ */
+ public function getOverride($dashboard_id, $uid)
+ {
+ return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'uid'=> $uid));
+ }
+}
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
new file mode 100644
index 000000000..ca10ce98a
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Preset_model.php
@@ -0,0 +1,67 @@
+dbTable = 'dashboard.tbl_dashboard_preset';
+ $this->pk = 'preset_id';
+ }
+
+ /**
+ * Get Presets of given uid.
+ * @param integer dashboard_id
+ * @param string $uid
+ * @return array
+ */
+ public function getPresets($dashboard_id, $uid)
+ {
+ // TODO: get Funktionen for uid and load all preset for all funktionen for uid
+ //return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+ $sql = <<execQuery($sql, array($dashboard_id, $uid));
+ }
+
+ /**
+ * Get Preset by Dashboard and Funktion
+ * @param integer dashboard_id
+ * @param string funktion_kurzbz
+ * @return array
+ */
+ public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
+ {
+ return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
+ }
+}
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
new file mode 100644
index 000000000..9e0a4c200
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Widget_model.php
@@ -0,0 +1,15 @@
+dbTable = 'dashboard.tbl_dashboard_widget';
+ $this->pk = ['dashboard_id', 'widget_id'];
+ $this->hasSequence = false;
+ }
+}
diff --git a/application/models/dashboard/Dashboard_model.php b/application/models/dashboard/Dashboard_model.php
new file mode 100644
index 000000000..88946ed83
--- /dev/null
+++ b/application/models/dashboard/Dashboard_model.php
@@ -0,0 +1,25 @@
+dbTable = 'dashboard.tbl_dashboard';
+ $this->pk = 'dashboard_id';
+ }
+
+
+ /**
+ * Get Dashboard by kurzbz.
+ * @param string dashboard_kurzbz
+ * @return array
+ */
+ public function getDashboardByKurzbz($dashboard_kurzbz)
+ {
+ return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
+ }
+}
diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
new file mode 100644
index 000000000..b1160e28f
--- /dev/null
+++ b/application/models/dashboard/Widget_model.php
@@ -0,0 +1,32 @@
+dbTable = 'dashboard.tbl_widget';
+ $this->pk = 'widget_id';
+ }
+
+ public function getWithAllowedForDashboard($dashboard_id)
+ {
+ $this->addSelect($this->dbTable . '.*');
+ $this->addSelect('CASE WHEN dashboard_id IS NULL THEN 0 ELSE 1 END AS allowed', false);
+ $this->db->join('dashboard.tbl_dashboard_widget dw', $this->dbTable . '.widget_id=dw.widget_id AND dashboard_id = ?', 'LEFT', false);
+
+ return $this->execQuery($this->db->get_compiled_select($this->dbTable), [$dashboard_id]);
+ }
+
+ public function getForDashboard($db)
+ {
+ $this->addSelect($this->dbTable . '.*');
+ $this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id');
+ $this->addJoin('dashboard.tbl_dashboard', 'dashboard_id');
+
+ return $this->loadWhere(['dashboard_kurzbz' => $db]);
+ }
+}
diff --git a/application/models/education/Abschlusspruefung_model.php b/application/models/education/Abschlusspruefung_model.php
index 268e786cb..0ba8fd55c 100644
--- a/application/models/education/Abschlusspruefung_model.php
+++ b/application/models/education/Abschlusspruefung_model.php
@@ -113,4 +113,61 @@ class Abschlusspruefung_model extends DB_Model
return success($abschlusspruefungdata);
}
+
+ /**
+ * Gets data of an Abschlusspruefung
+ * @param $student_uid
+ * @return object
+ */
+ public function getAbschlusspruefungForPrestudent($student_uid)
+ {
+ $qry = "
+ SELECT
+ exam.*,
+ CONCAT(
+ person_pruefer1.nachname || ' ',
+ person_pruefer1.vorname,
+ COALESCE(' ' || person_pruefer1.titelpre)
+ ) AS person_pruefer1,
+ CONCAT(
+ person_pruefer2.nachname || ' ',
+ person_pruefer2.vorname,
+ COALESCE(' ' || person_pruefer2.titelpre)
+ ) AS person_pruefer2,
+ CONCAT(
+ person_pruefer3.nachname || ' ',
+ person_pruefer3.vorname,
+ COALESCE(' ' || person_pruefer3.titelpre)
+ ) AS person_pruefer3,
+ CONCAT(
+ person_vorsitzender.nachname || ' ',
+ person_vorsitzender.vorname,
+ COALESCE(' ' || person_vorsitzender.titelpre)
+ ) AS person_vorsitzender,
+ datum,
+ freigabedatum,
+ sponsion,
+ uhrzeit,
+ person_pruefer1.nachname as p1_nachname,
+ person_pruefer2.nachname as p2_nachname,
+ person_pruefer3.nachname as p3_nachname,
+ person_vorsitzender.nachname as vorsitz_nachname,
+ beurteilung.bezeichnung as beurteilung_bezeichnung,
+ antritt.bezeichnung as antritt_bezeichnung
+ FROM
+ lehre.tbl_abschlusspruefung exam
+ JOIN lehre.tbl_pruefungstyp USING (pruefungstyp_kurzbz)
+ LEFT JOIN public.tbl_benutzer ben_vorsitzender ON (ben_vorsitzender.uid = vorsitz)
+ LEFT JOIN public.tbl_person person_vorsitzender ON (ben_vorsitzender.person_id = person_vorsitzender.person_id)
+ LEFT JOIN public.tbl_person person_pruefer1 ON (person_pruefer1.person_id = pruefer1)
+ LEFT JOIN public.tbl_person person_pruefer2 ON (person_pruefer2.person_id = pruefer2)
+ LEFT JOIN public.tbl_person person_pruefer3 ON (person_pruefer3.person_id = pruefer3)
+ LEFT JOIN lehre.tbl_abschlussbeurteilung beurteilung USING (abschlussbeurteilung_kurzbz)
+ LEFT JOIN lehre.tbl_abschlusspruefung_antritt antritt USING (pruefungsantritt_kurzbz)
+ WHERE student_uid = ?
+ ORDER BY exam.datum DESC
+ ";
+
+ return $this->execQuery($qry, array('student_uid' => $student_uid));
+ }
}
diff --git a/application/models/education/Akadgrad_model.php b/application/models/education/Akadgrad_model.php
new file mode 100644
index 000000000..92762a525
--- /dev/null
+++ b/application/models/education/Akadgrad_model.php
@@ -0,0 +1,14 @@
+dbTable = 'lehre.tbl_akadgrad';
+ $this->pk = 'akadgrad_id';
+ }
+}
\ No newline at end of file
diff --git a/application/models/education/Anwesenheit_model.php b/application/models/education/Anwesenheit_model.php
index 80a1fc111..b2c78fe02 100644
--- a/application/models/education/Anwesenheit_model.php
+++ b/application/models/education/Anwesenheit_model.php
@@ -11,4 +11,193 @@ class Anwesenheit_model extends DB_Model
$this->dbTable = 'campus.tbl_anwesenheit';
$this->pk = 'anwesenheit_id';
}
+
+ /**
+ * Laedt die Anwesenheiten in Prozent von Studierenden bei Lehrveranstaltungen
+ * Wenn die StudentUID uebergeben wird, werden alle Lehrveranstaltungen zu denen der Studierenden zugeteilt ist inkl Prozent der Anwesenheit
+ * Wenn die LehrveranstaltungID uebergeben wird, werden alle Studierenden geholt die zugeteilt sind inkl Prozent der Anwesenheit
+ * Es werden pro Student die Anwesenheiten berechnet aufgrund der Lehreinheit zu der sie zugeordnet sind
+ *
+ * @param string $studiensemester_kurzbz
+ * @param string|null (optional) $student_uid
+ * @param integer|null (optional) $lehrveranstaltung_id
+ *
+ * @return stdClass
+ */
+ public function loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid = null, $lehrveranstaltung_id = null)
+ {
+ $this->addSelect("vorname");
+ $this->addSelect("nachname");
+ $this->addSelect("wahlname");
+ $this->addSelect("lehrveranstaltung_id");
+ $this->addSelect("bezeichnung");
+ $this->addSelect("gruppe");
+ $this->addSelect("student_uid AS uid");
+ $this->addSelect("COUNT(stundenplan_id) AS gesamtstunden");
+ $this->addSelect("COALESCE(anwesend.summe, 0) AS anwesend");
+ $this->addSelect("COALESCE(nichtanwesend.summe, 0) AS nichtanwesend");
+ $this->addSelect("COALESCE(anwesend.summe, 0) + COALESCE(nichtanwesend.summe, 0) AS erfassteanwesenheit");
+ $this->addSelect("CASE
+ WHEN COUNT(stundenplan_id) = 0 OR COALESCE(anwesend.summe, 0) + COALESCE(nichtanwesend.summe, 0) = 0
+ THEN 100
+ ELSE TRUNC(100-(100/COUNT(stundenplan_id)*COALESCE(nichtanwesend.summe, 0)), 2)
+ END AS prozent");
+
+
+ $this->db->join("(
+ SELECT
+ semester::text AS gruppe,
+ public.tbl_studentlehrverband.studiensemester_kurzbz,
+ student_uid,
+ studiengang_kz
+ FROM public.tbl_studentlehrverband
+ WHERE studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+
+ UNION
+
+ SELECT
+ semester || verband AS gruppe,
+ public.tbl_studentlehrverband.studiensemester_kurzbz,
+ student_uid,
+ studiengang_kz
+ FROM public.tbl_studentlehrverband
+ WHERE studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+
+ UNION
+
+ SELECT
+ semester || verband || gruppe AS gruppe,
+ public.tbl_studentlehrverband.studiensemester_kurzbz,
+ student_uid,
+ studiengang_kz
+ FROM public.tbl_studentlehrverband
+ WHERE studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+
+ UNION
+
+ SELECT
+ gruppe_kurzbz AS gruppe,
+ public.tbl_benutzergruppe.studiensemester_kurzbz,
+ uid AS student_uid,
+ studiengang_kz
+ FROM public.tbl_benutzergruppe
+ JOIN public.tbl_gruppe USING (gruppe_kurzbz)
+ WHERE studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ ) a", "gruppe,studiensemester_kurzbz,studiengang_kz", "", false);
+ $this->addJoin("public.tbl_benutzer b", "b.uid = student_uid");
+ $this->addJoin("public.tbl_person p", "person_id");
+ $this->db->join("(
+ SELECT
+ lehrveranstaltung_id,
+ studiensemester_kurzbz, uid AS student_uid,
+ SUM(einheiten) AS summe
+ FROM campus.tbl_anwesenheit a
+ JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+ JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+ WHERE anwesend = TRUE
+ AND studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ GROUP BY
+ lehrveranstaltung_id,
+ bezeichnung,
+ uid,
+ studiensemester_kurzbz
+ ) anwesend", "lehrveranstaltung_id,student_uid,studiensemester_kurzbz", "LEFT", false);
+ $this->db->join("(
+ SELECT
+ lehrveranstaltung_id,
+ studiensemester_kurzbz,
+ uid AS student_uid,
+ SUM(einheiten) AS summe
+ FROM campus.tbl_anwesenheit a
+ JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+ JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+ WHERE anwesend = FALSE
+ AND studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ GROUP BY
+ lehrveranstaltung_id, bezeichnung, uid, studiensemester_kurzbz
+ ) nichtanwesend", "lehrveranstaltung_id,student_uid,studiensemester_kurzbz", "LEFT", false);
+
+ $this->addGroupBy("vorname");
+ $this->addGroupBy("nachname");
+ $this->addGroupBy("wahlname");
+ $this->addGroupBy("lehrveranstaltung_id");
+ $this->addGroupBy("bezeichnung");
+ $this->addGroupBy("gruppe");
+ $this->addGroupBy("student_uid");
+ $this->addGroupBy("anwesend.summe");
+ $this->addGroupBy("nichtanwesend.summe");
+
+
+ $where = [
+ "lehrveranstaltung_id >" => 0
+ ];
+
+ if ($student_uid)
+ $where["student_uid"] = $student_uid;
+
+ if ($lehrveranstaltung_id)
+ $where["lehrveranstaltung_id"] = $lehrveranstaltung_id;
+
+ if ($lehrveranstaltung_id) {
+ $this->addOrder("nachname");
+ $this->addOrder("vorname");
+ } elseif ($student_uid) {
+ $this->addOrder("bezeichnung");
+ }
+
+
+ $tmp = $this->dbTable;
+
+ $this->dbTable = "(
+ SELECT
+ SUM(stundenplan_id) AS stundenplan_id,
+ datum,
+ stunde,
+ lehrveranstaltung_id,
+ bezeichnung,
+ studiensemester_kurzbz,
+ studiengang_kz,
+ TRIM(
+ CASE
+ WHEN stp.gruppe_kurzbz IS NOT NULL
+ THEN stp.gruppe_kurzbz
+ ELSE stp.semester || (
+ CASE
+ WHEN verband IS NULL
+ THEN ''
+ ELSE stp.verband
+ END
+ ) || (
+ CASE
+ WHEN stp.gruppe IS NULL
+ THEN ''
+ ELSE stp.gruppe
+ END
+ )
+ END
+ ) AS gruppe
+ FROM lehre.tbl_lehrveranstaltung lv
+ JOIN lehre.tbl_lehreinheit le USING (lehrveranstaltung_id)
+ JOIN lehre.tbl_stundenplan stp USING (lehreinheit_id,studiengang_kz)
+ WHERE studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ AND (titel NOT LIKE '%Nebenprüfung%' OR titel IS NULL)
+ GROUP BY
+ datum,
+ stunde,
+ lehrveranstaltung_id,
+ bezeichnung,
+ studiensemester_kurzbz,
+ studiengang_kz,
+ stp.gruppe_kurzbz,
+ stp.semester,
+ stp.verband,
+ stp.gruppe
+ ) x";
+
+ $result = $this->loadWhere($where);
+
+ $this->dbTable = $tmp;
+
+ return $result;
+ }
}
diff --git a/application/models/education/LePruefung_model.php b/application/models/education/LePruefung_model.php
index ac6c7f9b2..6e51f1975 100644
--- a/application/models/education/LePruefung_model.php
+++ b/application/models/education/LePruefung_model.php
@@ -11,4 +11,45 @@ class LePruefung_model extends DB_Model
$this->dbTable = 'lehre.tbl_pruefung';
$this->pk = 'pruefung_id';
}
+
+ /**
+ * gets all Pruefungen for a student_uid
+ * @param string $student_uid
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
+ public function getPruefungenByStudentuid($student_uid, $studiensemester_kurzbz = null)
+ {
+ $this->addSelect('tbl_pruefung.datum');
+ $this->addSelect("TO_CHAR(tbl_pruefung.datum::timestamp, 'DD.MM.YYYY') AS format_datum");
+ $this->addSelect('tbl_pruefung.anmerkung');
+ $this->addSelect('tbl_pruefung.pruefungstyp_kurzbz');
+ $this->addSelect('tbl_pruefung.pruefung_id');
+ $this->addSelect('tbl_pruefung.lehreinheit_id');
+ $this->addSelect('tbl_pruefung.student_uid');
+ $this->addSelect('tbl_pruefung.mitarbeiter_uid');
+ $this->addSelect('tbl_pruefung.punkte');
+
+ $this->addSelect('tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung');
+ $this->addSelect('tbl_lehrveranstaltung.lehrveranstaltung_id');
+ $this->addSelect('tbl_note.bezeichnung as note_bezeichnung');
+ $this->addSelect('tbl_pruefungstyp.beschreibung as typ_beschreibung');
+ $this->addSelect('tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz');
+
+ $this->addJoin('lehre.tbl_lehreinheit', 'lehre.tbl_pruefung.lehreinheit_id=lehre.tbl_lehreinheit.lehreinheit_id');
+ $this->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+ $this->addJoin('lehre.tbl_note', 'note');
+ $this->addJoin('lehre.tbl_pruefungstyp', 'pruefungstyp_kurzbz');
+
+ if ($studiensemester_kurzbz)
+ $this->db->where("tbl_lehreinheit.studiensemester_kurzbz = ", $studiensemester_kurzbz);
+
+ $this->addOrder('tbl_pruefung.datum', 'DESC');
+ $this->addOrder('tbl_pruefung.pruefung_id', 'DESC');
+
+ return $this->loadWhere([
+ 'student_uid' => $student_uid
+ ]);
+ }
}
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index 10c122b94..d4bc7a22f 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -31,7 +31,7 @@ class Lehreinheit_model extends DB_Model
$this->addOrder('lehreinheit_id');
$les = $this->loadWhere(
array('lehrveranstaltung_id' => $lehrveranstaltung_id,
- 'studiensemester_kurzbz' => $studiensemester)
+ 'studiensemester_kurzbz' => $studiensemester)
);
if (hasData($les))
@@ -113,4 +113,194 @@ class Lehreinheit_model extends DB_Model
return $this->execQuery($query, array($lehreinheit_id));
}
+
+ /**
+ * Gets emails of all Studierende in a lehrveranstaltung
+ * @param int $lehreinheit_id
+ * @return array
+ */
+ public function getStudentenMail($lehreinheit_id)
+ {
+
+ // logic used from cis_menu_lv.inc.php line 335
+ return $this->execReadOnlyQuery("
+ SELECT
+ gruppe_kurzbz,
+ CASE
+ WHEN nomail = TRUE THEN 'nomail'
+ WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?)
+ ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?)
+ END AS mail
+
+ FROM
+ (
+ SELECT
+ distinct vw_lehreinheit.studiensemester_kurzbz, vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, vw_lehreinheit.semester,
+ COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp,
+ CASE
+ WHEN mailgrp = TRUE OR mailgrp IS NULL THEN FALSE
+ ELSE TRUE
+ END as nomail
+ FROM campus.vw_lehreinheit
+ LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
+ WHERE
+ vw_lehreinheit.lehrveranstaltung_id=
+ (select distinct lehrveranstaltung_id from campus.vw_lehreinheit where lehreinheit_id=?)
+ AND
+ vw_lehreinheit.studiensemester_kurzbz =
+ (select distinct studiensemester_kurzbz from campus.vw_lehreinheit where lehreinheit_id=?)
+ AND (vw_lehreinheit.gruppe_kurzbz IS NULL OR
+ (vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0))
+
+
+ ) AS subquery
+ ",[DOMAIN,DOMAIN,$lehreinheit_id,$lehreinheit_id ]);
+ }
+
+ public function getLehreinheitenForStudentAndStudienSemester($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+ {
+ $query = <<escape($lehrveranstaltung_id)} AND
+ vslv.uid = {$this->escape($student_uid)} AND
+ vslv.studiensemester_kurzbz = {$this->escape($studiensemester_kurzbz)}
+EOSQL;
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ public function getLehrfachIdMitarbeiter($angezeigtes_stsem,$user,$lvid)
+ {
+ $query = "
+ SELECT
+ distinct lehrfach_id
+ FROM
+ lehre.tbl_lehreinheit
+ JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+ WHERE
+ studiensemester_kurzbz=" . $this->escape($angezeigtes_stsem) . "
+ AND mitarbeiter_uid=" . $this->escape($user)."
+ AND lehrveranstaltung_id=" . $this->escape(intval($lvid));
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ public function getLehrfachIdStudierender($angezeigtes_stsem,$user,$lvid)
+ {
+ $query = "
+ SELECT
+ distinct lehrfach_id
+ FROM
+ campus.vw_student_lehrveranstaltung
+ WHERE
+ lehrveranstaltung_id=" . $this->escape(intval($lvid))."
+ AND studiensemester_kurzbz=" . $this->escape($angezeigtes_stsem)."
+ AND uid=" . $this->escape($user);
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ public function getLehreinheitInfo($lvid, $angezeigtes_stsem, $lehrfach_id)
+ {
+ $query = "
+ SELECT
+ *
+ FROM (
+ SELECT
+ distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
+ CASE
+ WHEN lehrfunktion_kurzbz='LV-Leitung' THEN true
+ ELSE false
+ END as lvleiter
+ FROM
+ lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter,
+ public.tbl_benutzer, public.tbl_person
+ WHERE
+ tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id
+ AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid = tbl_benutzer.uid
+ AND tbl_person.person_id = tbl_benutzer.person_id
+ AND lehrveranstaltung_id = " . $this->escape(intval($lvid)) . "
+ AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%'
+ AND tbl_benutzer.aktiv = true
+ AND tbl_person.aktiv = true
+ AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+
+ if($lehrfach_id != '')
+ {
+ $query .= " AND tbl_lehreinheit.lehrfach_id = " . $this->escape(intval($lehrfach_id));
+ }
+
+ $query .= " ORDER BY uid, lvleiter desc) as a ORDER BY lvleiter desc, nachname, vorname";
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ /**
+ * Gets Lehreinheiten for Lehrveranstaltungen in a Studiensemester.
+ * Without using tbl_lehrfach: bezeichnung and kurzbz ALWAYS from lehrveranstaltung
+ * @param $lehrveranstaltung_id
+ * @param $studiensemester
+ * @return array with Lehreinheiten and their Lehreinheitgruppen
+ */
+ public function getLesFromLvIds($lehrveranstaltung_id, $studiensemester_kurzbz = null)
+ {
+ $params = array($lehrveranstaltung_id);
+
+ $query = "
+ SELECT
+ lv.lehrveranstaltung_id,
+ le.lehreinheit_id,
+ le.lehrform_kurzbz,
+ lv.kurzbz,
+ lv.bezeichnung,
+ lv.semester,
+ (
+ SELECT
+ STRING_AGG(CONCAT(leg.semester, leg.verband, leg.gruppe), ' ')
+ FROM lehre.tbl_lehreinheitgruppe leg
+ WHERE leg.lehreinheit_id = le.lehreinheit_id
+ ) AS gruppe,
+ STRING_AGG(tma.kurzbz, ' ') as kuerzel
+ FROM
+ lehre.tbl_lehreinheit le
+ JOIN
+ lehre.tbl_lehrveranstaltung lv ON lv.lehrveranstaltung_id = le.lehrveranstaltung_id
+ JOIN
+ lehre.tbl_lehreinheitmitarbeiter ma USING (lehreinheit_id)
+ JOIN
+ public.tbl_mitarbeiter tma USING (mitarbeiter_uid)
+ WHERE
+ lv.lehrveranstaltung_id = ?
+ ";
+
+ if (isset($studiensemester_kurzbz))
+ {
+ $query .= " AND le.studiensemester_kurzbz = ?";
+ $params[] = $studiensemester_kurzbz;
+ }
+
+ $query .="
+ GROUP BY
+ lv.lehrveranstaltung_id,
+ le.lehreinheit_id,
+ le.lehrform_kurzbz,
+ lv.kurzbz,
+ lv.bezeichnung,
+ lv.semester
+ ORDER BY
+ le.lehreinheit_id;
+ ";
+
+ return $this->execQuery($query, $params);
+ }
}
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
index dd5c7c858..ae1ac55d2 100644
--- a/application/models/education/Lehreinheitmitarbeiter_model.php
+++ b/application/models/education/Lehreinheitmitarbeiter_model.php
@@ -41,4 +41,38 @@ class Lehreinheitmitarbeiter_model extends DB_Model
return error ('Incorrect parameter type');
}
}
+
+ /**
+ * @param integer $lehrveranstaltung_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
+ public function getForLv($lehrveranstaltung_id, $studiensemester_kurzbz)
+ {
+ $this->addSelect('ma.uid, ma.vorname, ma.nachname, ma.titelpre, ma.titelpost, lehrfunktion_kurzbz');
+ $this->addGroupBy('ma.uid, ma.vorname, ma.nachname, ma.titelpre, ma.titelpost, lehrfunktion_kurzbz');
+
+ $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+ $this->addJoin('campus.vw_mitarbeiter ma', $this->dbTable . '.mitarbeiter_uid=ma.uid');
+
+ $this->addOrder('nachname');
+ $this->addOrder('vorname');
+
+ if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON') && CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+ {
+ $this->addJoin('(SELECT vertrag_id, CASE WHEN vertragsstatus_kurzbz=\'storno\' THEN 0 WHEN vertragsstatus_kurzbz=\'erteilt\' THEN 1 ELSE 2 END AS vertragsstatus_kurzbz FROM lehre.tbl_vertrag_vertragsstatus) v', 'vertrag_id', 'LEFT');
+ $having = $this->db->compile_binds('(EXISTS (SELECT 1 FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=? AND tbl_studiensemester.start < (SELECT start FROM public.tbl_studiensemester stsem WHERE stsem.studiensemester_kurzbz=?)) OR MIN(vertragsstatus_kurzbz)=1)', [
+ $studiensemester_kurzbz,
+ CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON
+ ]);
+ $this->db->having($having);
+ }
+
+ return $this->loadWhere([
+ 'lehrveranstaltung_id' => $lehrveranstaltung_id,
+ 'studiensemester_kurzbz' => $studiensemester_kurzbz
+ ]);
+ }
+
}
diff --git a/application/models/education/LehrveranstaltungFaktor_model.php b/application/models/education/LehrveranstaltungFaktor_model.php
new file mode 100644
index 000000000..c8a0c8aa8
--- /dev/null
+++ b/application/models/education/LehrveranstaltungFaktor_model.php
@@ -0,0 +1,14 @@
+dbTable = 'lehre.tbl_lehrveranstaltung_faktor';
+ $this->pk = 'lehrveranstaltung_faktor_id';
+ }
+}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index cefd147b9..056fb45d7 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -15,6 +15,192 @@ class Lehrveranstaltung_model extends DB_Model
$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
}
+ /**
+ * Get all Templates and its assigned Lehrveranstaltungen of given Studiensemester and Oes.
+ * Lvs are queried via actual Studienordnung and Studienplan.
+ *
+ * @param null|string $studiensemester_kurzbz
+ * @param null|array $oes
+ * @param null $lehrveranstaltung_id Queries certain LV only
+ * @return array|stdClass|null
+ */
+ public function getTemplateLvTree($studiensemester_kurzbz = null, $oes = null, $studienjahr_kurzbz = null){
+
+ if (is_string($studiensemester_kurzbz) && is_string($studienjahr_kurzbz))
+ {
+ return error('Query not possible for both studiensemester and studienjahr');
+ }
+
+ $params = [];
+ $qry = '
+ WITH
+ -- All Lvs that are assigned to a template in given Studiensemester for given Oes
+ -- joining via actual Studienplan
+ standardisierteLvs AS (
+ SELECT
+ lv.*,
+ stpl.studienplan_id::text as studienplan_id,
+ stpl.bezeichnung AS studienplan_bezeichnung,
+ stplsem.studiensemester_kurzbz
+ FROM
+ lehre.tbl_studienplan stpl
+ JOIN lehre.tbl_studienordnung sto USING (studienordnung_id)
+ JOIN lehre.tbl_studienplan_semester stplsem USING (studienplan_id)
+ JOIN lehre.tbl_studienplan_lehrveranstaltung stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+ JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+ JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+ JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
+ JOIN public.tbl_studiengangstyp stgtyp ON stgtyp.typ = stg.typ
+ WHERE
+ -- filter type lv
+ lehrtyp_kurzbz = \'lv\'
+ -- filter lvs assigned to template (= standardisierte lv)
+ AND lehrveranstaltung_template_id IS NOT NULL';
+
+ if (is_string($studiensemester_kurzbz))
+ {
+ /* filter by studiensemester */
+ $params[]= $studiensemester_kurzbz;
+ $qry.= ' AND stplsem.studiensemester_kurzbz = ? ';
+
+ }
+
+ if (is_string($studienjahr_kurzbz)) {
+ /* filter by studiensemester */
+ $params[] = $studienjahr_kurzbz;
+ $qry .= '
+ AND stplsem.studiensemester_kurzbz IN (
+ SELECT studiensemester_kurzbz
+ FROM public.tbl_studiensemester
+ WHERE studienjahr_kurzbz = ?
+ )';
+ }
+
+ if (is_array($oes))
+ {
+ /* filter by organisationseinheit */
+ $params[]= $oes;
+ $qry.= ' AND lv.oe_kurzbz IN ? ';
+ }
+ $qry.= '
+ ),
+ -- All templates
+ templateLvs AS (
+ SELECT
+ lv.*,
+ NULL AS studienplan_id,
+ (
+ SELECT string_agg(stpl_bezeichnung, \', \')
+ FROM
+ (
+ SELECT stlv.studienplan_bezeichnung AS stpl_bezeichnung
+ FROM standardisierteLvs stlv
+ WHERE stlv.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+ ) AS studienplaene
+ ) AS studienplan_bezeichnung,
+ NULL AS studiensemester_kurzbz
+ FROM
+ lehre.tbl_lehrveranstaltung lv
+ WHERE
+ -- filter type template
+ lehrtyp_kurzbz = \'tpl\'
+ -- filter semester that were retrieved by standardisierte lvs semester for selected studiensemester
+ AND EXISTS (
+ SELECT 1
+ FROM standardisierteLvs std
+ WHERE std.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+ )';
+
+ if (is_array($oes))
+ {
+ /* filter by organisationseinheit */
+ $params[]= $oes;
+ $qry.= ' AND lv.oe_kurzbz IN ? ';
+ }
+ $qry.= '
+ )
+ ';
+
+ $qry.= '
+ SELECT
+ lv.lehrveranstaltung_id,
+ lv.kurzbz,
+ lv.lehrtyp_kurzbz,
+ lv.bezeichnung AS lv_bezeichnung,
+ lv.bezeichnung_english,
+ lv.studiengang_kz,
+ lv.semester,
+ lv.oe_kurzbz,
+ lv.ects,
+ lv.lehrform_kurzbz,
+ lv.orgform_kurzbz,
+ lv.sprache,
+ lv.aktiv,
+ lv.lehrveranstaltung_template_id,
+ lv.studienplan_id,
+ lv.studienplan_bezeichnung,
+ lv.studiensemester_kurzbz,
+ upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",
+ stg.bezeichnung AS "stg_bezeichnung",
+ stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+ CASE
+ WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+ WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+ ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+ END AS "lv_oe_bezeichnung",
+ (
+ -- comma seperated string of all lehreinheitgruppen
+ SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+ FROM(
+ -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+ SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+ (
+ -- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+ SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+ -- get Spezialgruppe or Lehrverbandgruppe
+ COALESCE(
+ legr.gruppe_kurzbz,
+ CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+ ) as bezeichnung
+ FROM lehre.tbl_lehreinheitgruppe legr
+ JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+ JOIN lehre.tbl_lehrveranstaltung lv1 USING (lehrveranstaltung_id)
+ JOIN public.tbl_studiengang stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+ WHERE lv1.lehrveranstaltung_id = lv.lehrveranstaltung_id
+ AND le.studiensemester_kurzbz = lv.studiensemester_kurzbz
+ ) AS lehreinheitgruppen
+ GROUP BY studiengang_kz, bezeichnung
+ ORDER BY studiengang_kz DESC
+ ) AS uniqueLehreinheitgruppen_bezeichnung
+ ) AS lehreinheitgruppen_bezeichnung
+ FROM (
+ SELECT
+ *
+ FROM
+ standardisierteLvs
+ UNION
+ SELECT
+ *
+ FROM templateLvs
+ ) AS lv
+ JOIN public.tbl_studiengang stg ON stg.studiengang_kz = lv.studiengang_kz
+ JOIN public.tbl_studiengangstyp stgtyp ON stgtyp.typ = stg.typ
+ JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = lv.oe_kurzbz
+ ORDER BY
+ -- Sort by lv.bezeichnung
+ lv.bezeichnung,
+ -- Within each group, ensure templates appear first
+ CASE
+ WHEN lv.lehrtyp_kurzbz = \'tpl\' THEN 0
+ ELSE 1
+ END,
+ -- Ensure assigend lvs follow their template, grouped by lehrveranstaltung_template_id
+ COALESCE(lv.lehrveranstaltung_template_id, lv.lehrveranstaltung_id)
+ ';
+
+ return $this->execQuery($qry, $params);
+ }
+
/**
* Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
* @param string $studiensemester_kurzbz
@@ -226,33 +412,145 @@ class Lehrveranstaltung_model extends DB_Model
/**
* Gets Lehrveranstaltungen of a student
* @param $student_uid
- * @param null $studiensemester_kurzbz
+ * @param $studiensemester_kurzbz
* @return array|null
*/
public function getLvsByStudent($student_uid, $studiensemester_kurzbz = null)
{
$params = array($student_uid);
-
$qry = "SELECT * FROM lehre.tbl_lehrveranstaltung
- WHERE lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM campus.vw_student_lehrveranstaltung
- WHERE uid=?";
+ WHERE lehrveranstaltung_id IN(
+ SELECT lehrveranstaltung_id FROM campus.vw_student_lehrveranstaltung
+ WHERE uid=?";
+
if (isset($studiensemester_kurzbz))
{
- $qry .= " AND studiensemester_kurzbz=?";
$params[] = $studiensemester_kurzbz;
+ $qry .= " AND studiensemester_kurzbz=?";
}
- $qry .= ") OR lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote WHERE student_uid=?";
+ $qry .= ")";
+
+ $qry .= " OR lehrveranstaltung_id IN(
+ SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote
+ WHERE student_uid=?";
$params[] = $student_uid;
- if (isset($studiensemester_kurzbz))
- {
- $qry .= " AND studiensemester_kurzbz=?";
- $params[] = $studiensemester_kurzbz;
- }
+
$qry .= ") ORDER BY semester, bezeichnung";
return $this->execQuery($qry, $params);
}
+ /**
+ * Gets Lehrveranstaltungen of a student with grades if available
+ *
+ * @param string $student_uid
+ * @param string $studiensemester_kurzbz
+ * @param string|null $sprache
+ * @param number|null $lvid - returns only information about that single lv if the parameter is set
+ *
+ * @return stdClass
+ */
+ public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null, $lvid=null)
+ {
+ if ($sprache) {
+ $sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
+ $bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
+ $sgbezeichnung = $sprache == 'English' ? 'COALESCE(sg.english, sg.bezeichnung)' : 'sg.bezeichnung';
+ $lvbezeichnung = $sprache == 'English' ? 'COALESCE(v.bezeichnung_english, v.bezeichnung)' : 'v.bezeichnung';
+ } else {
+ $bezeichnung = 'bezeichnung';
+ $sgbezeichnung = 'sg.bezeichnung';
+ $lvbezeichnung = 'v.bezeichnung';
+ }
+
+ $this->addDistinct();
+ // TODO(chris): selects
+ /*
+ semester (?)
+ module
+ bezeichnung
+ sg_bezeichnung
+ studiengang_kuerzel
+ lvnote
+ znote
+ studiengang_kz
+ lehrveranstaltung_id
+ benotung
+ lvinfo
+ farbe
+
+ sprache (?)
+ ects (?)
+ incoming (?)
+ orgform_kurzbz (?)
+ */
+ // TODO(chris): module or kf
+ #$this->addSelect($this->dbTable . '.*');
+ #$this->addSelect('v.*');
+ $this->addSelect($this->dbTable . '.benotung');
+ $this->addSelect($this->dbTable . '.lvinfo');
+ $this->addSelect($this->dbTable . '.farbe');
+ $this->addSelect($this->dbTable . '.incoming');
+ $this->addSelect($this->dbTable . '.orgform_kurzbz');
+ $this->addSelect('v.studiengang_kz');
+ $this->addSelect('v.lehrveranstaltung_id');
+ $this->addSelect('v.semester');
+
+ $this->addSelect('v.sprache');
+ $this->addSelect('v.ects');
+ $this->addSelect('znn.positiv');
+
+ #$this->addSelect('splv.module');
+ $this->addSelect($lvbezeichnung . ' AS bezeichnung');
+ $this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
+ $this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
+
+ //also adds returns the index of the grade
+ //TODO: ist zeugnissnote immer gleich wie die lvgesamtnote
+ $this->addSelect('COALESCE(zn.note::numeric,gn.note::numeric) as note_index');
+ $this->addSelect('COALESCE(znn.positiv,gnn.positiv) as positiv');
+ $this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
+ $this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
+
+ // TODO(chris): Potentielle Anpassung "Eine UID"
+ $this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
+ $this->addJoin('public.tbl_studiengang sg', $this->dbTable . '.studiengang_kz = sg.studiengang_kz');
+ $this->db->where("v.lehreverzeichnis<>''");
+ if(isset($lvid))
+ {
+ $this->db->where("v.lehrveranstaltung_id", $lvid);
+ }
+
+ $this->addJoin('campus.tbl_lvgesamtnote gn', 'gn.lehrveranstaltung_id=v.lehrveranstaltung_id AND gn.student_uid=v.uid AND gn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
+ $this->addJoin('lehre.tbl_note gnn', 'gn.note=gnn.note', 'LEFT');
+
+ $this->addJoin('lehre.tbl_zeugnisnote zn', 'zn.lehrveranstaltung_id=v.lehrveranstaltung_id AND zn.student_uid=v.uid AND zn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
+ $this->addJoin('lehre.tbl_note znn', 'zn.note=znn.note', 'LEFT');
+
+ $this->addOrder('bezeichnung');
+
+ /*if (!defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") || !CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN) {
+ $modulebezeichnung = str_replace('v.', 'm.', $lvbezeichnung);
+ $modulesql = '
+ LEFT JOIN lehre.tbl_studienplan_lehrveranstaltung p ON(lv.studienplan_lehrveranstaltung_id_parent=p.studienplan_lehrveranstaltung_id)
+ LEFT JOIN lehre.tbl_lehrveranstaltung m ON(m.lehrveranstaltung_id = p.lehrveranstaltung_id)';
+ } else {
+ $modulebezeichnung = 'NULL';
+ $modulesql = '';
+ }
+
+ $this->addJoin('(
+ SELECT lv.lehrveranstaltung_id, sps.studiensemester_kurzbz, so.studiengang_kz, lv.semester, ' . $modulebezeichnung . ' AS module
+ FROM lehre.tbl_studienplan_lehrveranstaltung lv
+ LEFT JOIN lehre.tbl_studienplan sp ON(sp.studienplan_id=lv.studienplan_id)
+ JOIN lehre.tbl_studienplan_semester sps ON(sp.studienplan_id=sps.studienplan_id AND sps.semester=lv.semester)
+ JOIN lehre.tbl_studienordnung so ON(so.studienordnung_id=sp.studienordnung_id)
+ ' . $modulesql . '
+ ) splv', 'splv.lehrveranstaltung_id=v.lehrveranstaltung_id AND splv.studiensemester_kurzbz=v.studiensemester_kurzbz AND splv.studiengang_kz=v.studiengang_kz', 'LEFT');*/
+
+ return $this->loadWhere(['v.uid' => $student_uid, 'v.lehre' => true, 'v.studiensemester_kurzbz' => $studiensemester_kurzbz]);
+ }
+
/**
* Gets valid Lehrveranstaltungen with incoming places for a Studiensemester.
* Only
@@ -332,6 +630,37 @@ class Lehrveranstaltung_model extends DB_Model
return $this->execQuery($query, array($uid, $studiensemester_kurzbz, $lehrveranstaltung_id));
}
+ /**
+ * Get Lehreinheit.
+ *
+ * @param string $student_uid
+ * @param string $studiensemester_kurzbz
+ * @param integer $lehrveranstaltung_id
+ *
+ * @return stdClass
+ */
+ public function getLeByStudent($student_uid, $studiensemester_kurzbz, $lehrveranstaltung_id)
+ {
+ $this->addSelect("lehreinheit_id");
+
+ $this->addOrder("lehreinheit_id", "ASC");
+
+ $this->addLimit(1);
+
+ $tmp = $this->dbTable;
+ $this->dbTable = "campus.vw_student_lehrveranstaltung";
+
+ $result = $this->loadWhere([
+ "uid" => $student_uid,
+ "lehrveranstaltung_id" => $lehrveranstaltung_id,
+ "studiensemester_kurzbz" => $studiensemester_kurzbz
+ ]);
+
+ $this->dbTable = $tmp;
+
+ return $result;
+ }
+
/**
* Sucht nach LV Templates und gibt Id und Label ("bezeichnung [kurzbz]") aus
* Diese funktion ist für autocomplete gedacht
@@ -377,6 +706,28 @@ class Lehrveranstaltung_model extends DB_Model
return $this->execQuery($qry);
}
+ /**
+ * Check if given LV is a template (Quellkurs)
+ *
+ * @param $lehrveranstaltung_id
+ * @return array|stdClass|void
+ */
+ public function checkIsTemplate($lehrveranstaltung_id)
+ {
+ $this->addSelect('lehrtyp_kurzbz, lehrveranstaltung_template_id');
+ $result = $this->load($lehrveranstaltung_id);
+
+ if (isError($result))
+ return error(getError($result));
+
+ if (hasData($result))
+ {
+ return success(
+ getData($result)[0]->lehrtyp_kurzbz === 'tpl' &&
+ getData($result)[0]->lehrveranstaltung_template_id === null
+ );
+ }
+ }
/**
* Get ECTS Summe pro angerechnetes Quereinstiegssemester.
@@ -494,10 +845,147 @@ class Lehrveranstaltung_model extends DB_Model
return $this->execQuery($qry, array($student_uid));
}
+ /**
+ * @param integer $lehrveranstaltung_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
+ public function getKoordinator($lehrveranstaltung_id, $studiensemester_kurzbz = null)
+ {
+ $binds = [
+ $lehrveranstaltung_id,
+ $lehrveranstaltung_id,
+ $lehrveranstaltung_id,
+ $lehrveranstaltung_id
+ ];
+ $qry = "
+ SELECT
+ a.uid, vorname, nachname, titelpre, titelpost
+ FROM (
+ SELECT
+ koordinator as uid
+ FROM
+ lehre.tbl_lehrveranstaltung
+ WHERE
+ lehrveranstaltung_id = ?
+ UNION
+ SELECT
+ uid
+ FROM
+ lehre.tbl_lehreinheit
+ JOIN lehre.tbl_lehrveranstaltung AS lehrfach ON(tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id)
+ JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz)
+ JOIN public.tbl_benutzerfunktion ON(tbl_fachbereich.fachbereich_kurzbz=tbl_benutzerfunktion.fachbereich_kurzbz)
+ WHERE
+ tbl_benutzerfunktion.funktion_kurzbz='fbk'
+ AND (tbl_benutzerfunktion.datum_von IS null OR tbl_benutzerfunktion.datum_von <= now())
+ AND (tbl_benutzerfunktion.datum_bis IS null OR tbl_benutzerfunktion.datum_bis >= now())
+ AND tbl_lehreinheit.lehrveranstaltung_id = ?
+ AND tbl_benutzerfunktion.oe_kurzbz = (
+ SELECT
+ tbl_studiengang.oe_kurzbz
+ FROM
+ lehre.tbl_lehrveranstaltung
+ JOIN public.tbl_studiengang USING(studiengang_kz)
+ WHERE lehrveranstaltung_id = ?
+ )
+ AND EXISTS (
+ SELECT
+ lehrveranstaltung_id
+ FROM
+ lehre.tbl_lehrveranstaltung
+ WHERE
+ lehrveranstaltung_id = ?
+ AND koordinator IS null
+ )
+ ";
+
+ if ($studiensemester_kurzbz !== null)
+ {
+ $qry .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
+ $binds[] = $studiensemester_kurzbz;
+ }
+
+ $qry .= "
+ ) AS a
+ JOIN campus.vw_mitarbeiter ON(a.uid=vw_mitarbeiter.uid)
+ WHERE vw_mitarbeiter.aktiv
+ ";
+
+ return $this->execQuery($qry, $binds);
+ }
+
public function getStg($lehrveranstaltung_id)
{
$this->addSelect('stg.*');
$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
return $this->load($lehrveranstaltung_id);
}
+
+ //Berechtigungen auf Fachbereichsebene
+ public function getBerechtigungenAufFachberechsebene($lvid, $angezeigtes_stsem)
+ {
+ $query = "
+ SELECT
+ DISTINCT lehrfach.oe_kurzbz
+ FROM
+ lehre.tbl_lehrveranstaltung
+ JOIN
+ lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
+ JOIN
+ lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+ WHERE
+ tbl_lehrveranstaltung.lehrveranstaltung_id = " . $this->escape(intval($lvid));
+
+ if(isset($angezeigtes_stsem) && $angezeigtes_stsem != ''){
+ $query .= " AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+ }
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ public function getStudentEMail($lvid, $angezeigtes_stsem)
+ {
+ $query = "
+ SELECT
+ DISTINCT vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ,
+ vw_lehreinheit.semester, COALESCE(vw_lehreinheit.verband,'') as verband,
+ COALESCE(vw_lehreinheit.gruppe,'') as gruppe,
+ vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp
+ FROM
+ campus.vw_lehreinheit
+ LEFT JOIN
+ public.tbl_gruppe USING(gruppe_kurzbz)
+ WHERE
+ lehrveranstaltung_id = " . $this->escape(intval($lvid)) . "
+ AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+
+ $res = $this->execReadOnlyQuery($query);
+ return $res;
+ }
+
+ /**
+ * Gets lehrveranstaltungen of a studiengang
+ * @param integer $studiengang_kz
+ * @return array|null
+ */
+ public function getLvsByStudiengangkz($studiengang_kz)
+ {
+ $params = array($studiengang_kz);
+
+ $qry = "SELECT
+ *
+ FROM
+ lehre.tbl_lehrveranstaltung
+ WHERE lehrveranstaltung_id IN
+ (SELECT lehrveranstaltung_id
+ FROM campus.vw_student_lehrveranstaltung
+ WHERE studiengang_kz = ?";
+
+ $qry .= ") ORDER BY semester, bezeichnung";
+
+ return $this->execQuery($qry, $params);
+ }
}
diff --git a/application/models/education/Lvangebot_model.php b/application/models/education/Lvangebot_model.php
index e16b726dd..8d5096fb0 100644
--- a/application/models/education/Lvangebot_model.php
+++ b/application/models/education/Lvangebot_model.php
@@ -11,4 +11,39 @@ class Lvangebot_model extends DB_Model
$this->dbTable = 'lehre.tbl_lvangebot';
$this->pk = 'lvangebot_id';
}
+
+/**
+ * Prueft ob eine Abmeldung von einer Lehrveranstaltung moeglich ist
+ * und liefert die Gruppen von denen sich abgemeldet werden kann
+ * @param $lehrveranstaltung_id
+ * @param $studiensemester_kurzbz
+ * @param $uid
+ * @return $gruppen Array mit den Gruppen
+ */
+ public function AbmeldungMoeglich($lehrveranstaltung_id, $studiensemester_kurzbz, $uid)
+ {
+ $query = "SELECT
+ gruppe_kurzbz
+ FROM
+ lehre.tbl_lvangebot
+ JOIN public.tbl_benutzergruppe USING(studiensemester_kurzbz, gruppe_kurzbz)
+ WHERE
+ tbl_lvangebot.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz)."
+ AND tbl_benutzergruppe.uid = " . $this->escape($uid)."
+ AND (tbl_lvangebot.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id))."
+ OR tbl_lvangebot.lehrveranstaltung_id IN(SELECT lehrveranstaltung_id_kompatibel
+ FROM lehre.tbl_lehrveranstaltung_kompatibel
+ WHERE lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id))."
+ )
+ )";
+ $res = $this->execReadOnlyQuery($query);
+ $rows = (hasData($res)) ? getData($res) : array();
+
+ $gruppen=array();
+ foreach($rows as $row)
+ {
+ $gruppen[] = $row->gruppe_kurzbz;
+ }
+ return $gruppen;
+ }
}
diff --git a/application/models/education/Lvgesamtnote_model.php b/application/models/education/Lvgesamtnote_model.php
index f0c1883de..c30045ff0 100644
--- a/application/models/education/Lvgesamtnote_model.php
+++ b/application/models/education/Lvgesamtnote_model.php
@@ -10,5 +10,40 @@ class Lvgesamtnote_model extends DB_Model
parent::__construct();
$this->dbTable = 'campus.tbl_lvgesamtnote';
$this->pk = array('student_uid', 'studiensemester_kurzbz', 'lehrveranstaltung_id');
+ $this->hasSequence = false;
+ }
+
+ /**
+ * Laedt die Noten
+ *
+ * @param integer $lehrveranstaltung_id
+ * @param string $student_uid
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
+ public function getLvGesamtNoten($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+ {
+ $this->addSelect($this->dbTable . ".*");
+ $this->addSelect("n.bezeichnung AS note_bezeichnung");
+ $this->addSelect("lv.bezeichnung AS lehrveranstaltung_bezeichnung");
+ $this->addSelect("lv.studiengang_kz");
+ $this->addSelect("UPPER(stg.typ || stg.kurzbz) AS studiengang");
+
+ $this->addJoin("lehre.tbl_note n", "note");
+ $this->addJoin("lehre.tbl_lehrveranstaltung lv", "lehrveranstaltung_id");
+ $this->addJoin("public.tbl_studiengang stg", "studiengang_kz");
+
+ $this->db->where($this->dbTable . ".freigabedatum <", "NOW()", false);
+
+ $where = [];
+ if ($studiensemester_kurzbz)
+ $where[$this->dbTable . ".studiensemester_kurzbz"] = $studiensemester_kurzbz;
+ if ($lehrveranstaltung_id)
+ $where[$this->dbTable . ".lehrveranstaltung_id"] = $lehrveranstaltung_id;
+ if ($student_uid)
+ $where[$this->dbTable . ".student_uid"] = $student_uid;
+
+ return $this->loadWhere($where);
}
}
diff --git a/application/models/education/Note_model.php b/application/models/education/Note_model.php
new file mode 100644
index 000000000..80b454398
--- /dev/null
+++ b/application/models/education/Note_model.php
@@ -0,0 +1,14 @@
+dbTable = 'lehre.tbl_note';
+ $this->pk = 'note';
+ }
+}
\ No newline at end of file
diff --git a/application/models/education/Notenschluesselaufteilung_model.php b/application/models/education/Notenschluesselaufteilung_model.php
index 5e0f2f05c..d48e16b0b 100644
--- a/application/models/education/Notenschluesselaufteilung_model.php
+++ b/application/models/education/Notenschluesselaufteilung_model.php
@@ -11,4 +11,34 @@ class Notenschluesselaufteilung_model extends DB_Model
$this->dbTable = 'lehre.tbl_notenschluesselaufteilung';
$this->pk = 'notenschluesselaufteilung_id';
}
+
+ /**
+ * Liefert die Note zu Punkten einer Lehrveranstaltung
+ *
+ * @param number $points
+ * @param integer $lehrveranstaltung_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass returns success(null) if no entry is found
+ */
+ public function getNote($points, $lehrveranstaltung_id, $studiensemester_kurzbz)
+ {
+ $this->load->model('education/Notenschluesselzuordnung_model', 'NotenschluesselzuordnungModel');
+ $notenschluessel_kurzbz = $this->NotenschluesselzuordnungModel->getKurzbzForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
+
+ $this->addSelect("note");
+ $this->addOrder("punkte", "DESC");
+ $this->addLimit(1);
+
+ $result = $this->loadWhere([
+ "notenschluessel_kurzbz" => $notenschluessel_kurzbz,
+ "punkte <=" => $points
+ ]);
+
+ if (isError($result))
+ return $result;
+ if (!hasData($result))
+ return success(null);
+ return success(current(getData($result))->note);
+ }
}
diff --git a/application/models/education/Notenschluesselzuordnung_model.php b/application/models/education/Notenschluesselzuordnung_model.php
index e6881e12b..9eb46b290 100644
--- a/application/models/education/Notenschluesselzuordnung_model.php
+++ b/application/models/education/Notenschluesselzuordnung_model.php
@@ -11,4 +11,71 @@ class Notenschluesselzuordnung_model extends DB_Model
$this->dbTable = 'lehre.tbl_notenschluesselzuordnung';
$this->pk = 'notenschluesselzuordnung_id';
}
+
+ /**
+ * Liefert den passenden Notenschluessel zu einer Lehrveranstaltung
+ *
+ * @param integer $lehrveranstaltung_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return integer|null
+ */
+ public function getKurzbzForLv($lehrveranstaltung_id, $studiensemester_kurzbz)
+ {
+ $this->addSelect("notenschluessel_kurzbz");
+
+ $this->db->where("lehrveranstaltung_id", $lehrveranstaltung_id);
+ if ($studiensemester_kurzbz) {
+ $this->db->where("studiensemester_kurzbz", $studiensemester_kurzbz);
+ $this->db->or_where("studiensemester_kurzbz", null);
+ } else {
+ $this->db->where("studiensemester_kurzbz", null);
+ }
+
+ $result = $this->load();
+
+ if (!isError($result) && hasData($result))
+ return current(getData($result))->notenschluessel_kurzbz;
+
+
+ $this->addSelect("notenschluessel_kurzbz");
+
+ $this->addJoin("(
+ WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz, depth) AS (
+ SELECT oe_kurzbz, oe_parent_kurzbz, 1
+ FROM public.tbl_organisationseinheit
+ WHERE oe_kurzbz = (
+ SELECT
+ oe_kurzbz
+ FROM
+ lehre.tbl_lehrveranstaltung
+ WHERE
+ lehrveranstaltung_id = " . $this->escape($lehrveranstaltung_id) . "
+ )
+ UNION ALL
+ SELECT o.oe_kurzbz, o.oe_parent_kurzbz, oes.depth+1 AS depth
+ FROM public.tbl_organisationseinheit o, oes
+ WHERE o.oe_kurzbz = oes.oe_parent_kurzbz
+ AND aktiv = true
+ )
+ SELECT * FROM oes
+ ) oes", "oe_kurzbz");
+
+ $this->addOrder("depth", "ASC");
+ $this->addLimit(1);
+
+ if ($studiensemester_kurzbz) {
+ $this->db->where_in("studiensemester_kurzbz", [$studiensemester_kurzbz, null]);
+ $result = $this->load();
+ } else {
+ $result = $this->loadWhere([
+ "studiensemester_kurzbz" => null
+ ]);
+ }
+
+ if (isError($result) || !hasData($result))
+ return null;
+
+ return current(getData($result))->notenschluessel_kurzbz;
+ }
}
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index b876030a6..5fb58cc81 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -25,7 +25,7 @@ class Paabgabe_model extends DB_Model
WHERE projektarbeit_id = ?
AND paabgabetyp_kurzbz = 'end'
AND paabg.abgabedatum IS NOT NULL
- ORDER BY paabg.abgabedatum, paabg.datum DESC
+ ORDER BY paabg.abgabedatum DESC, paabg.datum DESC
LIMIT 1";
return $this->execQuery($qry, array($projektarbeit_id));
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 214d6519f..927d83c82 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -37,6 +37,35 @@ class Pruefung_model extends DB_Model
return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
}
+ /**
+ * Gets Pruefungen of a student for a Lehrveranstaltung.
+ *
+ * @param string $uid
+ * @param string $lehrveranstaltung_id
+ * @param string|null $sprache
+ *
+ * @return object
+ */
+ public function getByStudentAndLv($uid, $lehrveranstaltung_id, $sprache = null)
+ {
+ // TODO(chris): Potentielle Anpassung "Eine UID"
+ $this->dbTable = 'lehre.tbl_pruefung';
+
+ if ($sprache) {
+ $sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
+ $bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
+ } else {
+ $bezeichnung = 'bezeichnung';
+ }
+
+ $this->addSelect($this->dbTable . '.pruefung_id, ' . $this->dbTable . '.pruefungstyp_kurzbz, ' . $this->dbTable . '.datum, COALESCE(n.' . $bezeichnung . ', n.note::text) AS note');
+
+ $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+ $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+ $this->addJoin('lehre.tbl_note n', 'note');
+
+ return $this->loadWhere(['lehrveranstaltung_id' => $lehrveranstaltung_id, 'student_uid' => $uid]);
+ }
/**
* NOTE(chris): not used
@@ -175,6 +204,8 @@ class Pruefung_model extends DB_Model
$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
$this->addSelect('pss.ausbildungssemester');
+ $this->addJoin('(SELECT MAX(datum) AS datum, lehreinheit_id AS le_id, student_uid AS stud_uid FROM lehre.tbl_pruefung p WHERE pruefungstyp_kurzbz IN (\'kommPruef\', \'zusKommPruef\') GROUP BY lehreinheit_id, student_uid) lpd',
+ 'p.datum = lpd.datum AND p.lehreinheit_id = lpd.le_id AND p.student_uid = lpd.stud_uid');
$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
$this->addJoin('public.tbl_student s', 'student_uid');
diff --git a/application/models/education/Pruefungsantritt_model.php b/application/models/education/Pruefungsantritt_model.php
new file mode 100644
index 000000000..f22633117
--- /dev/null
+++ b/application/models/education/Pruefungsantritt_model.php
@@ -0,0 +1,14 @@
+dbTable = 'lehre.tbl_abschlusspruefung_antritt';
+ $this->pk = 'pruefungsantritt_kurzbz';
+ }
+}
\ No newline at end of file
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 38791a812..2ef14e58e 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -11,149 +11,7 @@ class Studentlehrverband_model extends DB_Model
$this->dbTable = 'public.tbl_studentlehrverband';
$this->pk = array('studiensemester_kurzbz', 'student_uid');
$this->hasSequence = false;
- }
- /**
- * Check if Studentlehrverband already exists
- * @param string $student_id
- * @param string $studiensemester_kurzbz
- * @return 1: if Rolle exists, 0: if it doesn't
- */
- public function checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz)
- {
- $qry = "SELECT
- *
- FROM
- public.tbl_studentlehrverband
- WHERE
- student_uid = ?
- AND
- studiensemester_kurzbz = ?";
-
- $result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz));
-
- if (isError($result))
- {
- return error($result);
- }
- elseif (!hasData($result))
- {
- return success("0", "Kein Studentlehrverband vorhanden!");
- }
- else
- {
- return success("1","Studentlehrverband vorhanden!");
- }
- }
-
- public function processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz)
- {
- $uid = getAuthUID();
- $this->db->trans_begin(); // Start Transaktion
-
- $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
- $result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
- if (isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during update Lehrverband");
- }
-
- if ($result->retval == "0") {
- // Übergeordneten Lehrverband check and/or insert
- $result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
- if (isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during update Lehrverband");
- }
-
- if ($result->retval == "0")
- {
- $result = $this->LehrverbandModel->insert([
- 'studiengang_kz' => $studiengang_kz,
- 'semester' => $ausbildungssemester,
- 'verband' => '',
- 'gruppe' => '',
- 'aktiv' => true,
- 'bezeichnung' => 'Ab-Unterbrecher'
- ]);
-
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- return error("0", "Error during insert lehrverband übergeordnet");
- }
- }
-
- // Lehrverband insert
- $bezeichnung = $verband == 'A' ? ' Abbrecher' : 'Unterbrecher';
- $result = $this->LehrverbandModel->insert([
- 'studiengang_kz' => $studiengang_kz,
- 'semester' => $ausbildungssemester,
- 'verband' => $verband,
- 'gruppe' => $gruppe,
- 'bezeichnung' => $bezeichnung,
- 'aktiv' => true
- ]);
-
- if ($this->db->trans_status() === false || isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during insert lehrverband");
- }
- }
-
- // Studentlehrverband insert or update
- $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
- $result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
- if (isError($result)) {
- $this->db->trans_rollback();
- return error(getError($result));
- }
-
- if ($result->retval == "0") {
- $result = $this->StudentlehrverbandModel->insert([
- 'student_uid' => $student_uid,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz,
- 'semester' => $ausbildungssemester,
- 'verband' => $verband,
- 'gruppe' => $gruppe,
- 'insertamum' => date('c'),
- 'insertvon' => $uid,
- 'studiengang_kz' => $studiengang_kz
- ]);
- if ($this->db->trans_status() === false || isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during insert studentlehrverband");
- }
- }
- else
- {
- $result = $this->StudentlehrverbandModel->update(
- [
- 'student_uid' => $student_uid,
- 'studiensemester_kurzbz' => $studiensemester_kurzbz
- ],
- [
- 'semester' => $ausbildungssemester,
- 'verband' => $verband,
- 'gruppe' => $gruppe,
- 'updateamum' => date('c'),
- 'updatevon' => $uid,
- 'studiengang_kz' => $studiengang_kz
- ]
- );
- if ($this->db->trans_status() === false || isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during update studentlehrverband");
- }
- }
-
- // finish transaktion
- if ($this->db->trans_status() === false || isError($result)) {
- $this->db->trans_rollback();
- return error("0", "Error during insert/update Studentlehrverband");
- } else {
- $this->db->trans_commit();
- return success();
- }
+ $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
}
}
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index e138d1a1c..677d01f04 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -38,6 +38,7 @@ class Studierendenantrag_model extends DB_Model
$this->addSelect('studienjahr_kurzbz');
$this->addSelect('vorname');
$this->addSelect('nachname');
+ $this->addSelect('unruly');
$this->addSelect('p.prestudent_id');
$this->addSelect('p.studiengang_kz');
$this->addSelect('semester');
@@ -96,7 +97,8 @@ class Studierendenantrag_model extends DB_Model
Studierendenantragstatus_model::STATUS_REJECTED,
Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
Studierendenantragstatus_model::STATUS_DEREGISTERED,
- Studierendenantragstatus_model::STATUS_PAUSE
+ Studierendenantragstatus_model::STATUS_PAUSE,
+ Studierendenantragstatus_model::STATUS_REMINDERSENT
]);
$this->db->or_group_start();
$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -148,6 +150,8 @@ class Studierendenantrag_model extends DB_Model
$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
$this->addSelect('s.insertvon status_insertvon');
$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
+ $this->addSelect('p.unruly AS unruly');
+ $this->addSelect($this->dbTable . '.insertamum AS insertamum');
$this->addJoin(
'campus.tbl_studierendenantrag_status s',
@@ -157,6 +161,18 @@ class Studierendenantrag_model extends DB_Model
'campus.tbl_studierendenantrag_statustyp t',
's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
);
+ $this->addJoin(
+ 'public.tbl_student st',
+ 'st.prestudent_id=tbl_studierendenantrag.prestudent_id'
+ );
+ $this->addJoin(
+ 'public.tbl_benutzer b',
+ 'st.student_uid=b.uid'
+ );
+ $this->addJoin(
+ 'public.tbl_person p',
+ 'b.person_id=p.person_id'
+ );
if ($types && is_array($types)) {
$this->db->where_in('typ', $types);
@@ -354,7 +370,7 @@ class Studierendenantrag_model extends DB_Model
$this->db->where([
'prestudent_id' => $prestudent_id,
'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
- 'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+ 'campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
'start < ' . $end => null,
'datum_wiedereinstieg > ' . $start => null,
]);
@@ -410,7 +426,7 @@ class Studierendenantrag_model extends DB_Model
FROM campus.tbl_studierendenantrag
LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
WHERE typ=?
- AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+ AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
AND prestudent_id=?
) a ON (s.start < a.ende AND s.ende > a.start)
WHERE s.start >= (" . $subquery . ")
@@ -420,7 +436,10 @@ class Studierendenantrag_model extends DB_Model
return $this->execQuery($sql, [
$max_length,
self::TYP_UNTERBRECHUNG,
- Studierendenantragstatus_model::STATUS_CANCELLED,
+ array(
+ Studierendenantragstatus_model::STATUS_CANCELLED,
+ Studierendenantragstatus_model::STATUS_REJECTED
+ ),
$prestudent_id,
$studiensemester ?: $prestudent_id,
$max_length * $max_starters
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
index 4318c773e..927343a3e 100644
--- a/application/models/education/Studierendenantraglehrveranstaltung_model.php
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -46,6 +46,15 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
}
}
+ /**
+ * Gets all LVs for a repeating prestudent that are either not allowed or
+ * already done.
+ *
+ * @param string $prestudent_id
+ * @param string $studiensemester_kurzbz
+ *
+ * @return stdClass
+ */
public function getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz)
{
$this->addSelect($this->dbTable . '.*');
@@ -66,39 +75,53 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
);
$this->addJoin('public.tbl_student s', 'prestudent_id');
- // NOTE(chris): last offizell note
- $this->addJoin('(
- SELECT z.*
- FROM lehre.tbl_zeugnisnote z
- LEFT JOIN public.tbl_studiensemester zs
- USING(studiensemester_kurzbz)
- JOIN (
- SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start
- FROM lehre.tbl_zeugnisnote zi
- LEFT JOIN lehre.tbl_note zin
- USING(note)
- LEFT JOIN public.tbl_studiensemester zis
- USING(studiensemester_kurzbz)
- WHERE zin.aktiv AND zin.offiziell
- GROUP BY zi.lehrveranstaltung_id, zi.student_uid
- ) zx
- ON (
- z.lehrveranstaltung_id=zx.lehrveranstaltung_id
- AND z.student_uid=zx.student_uid
- AND zs.start = zx.start
- )) z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid', 'LEFT');
- $this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
-
+
$this->load->config('studierendenantrag');
$note_intern_angerechntet = $this->config->item('wiederholung_note_angerechnet');
- return $this->loadWhere([
+ $where = [
'ps.prestudent_id' => $prestudent_id,
'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
'n.note <> ' => 0,
- $this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
- '(n.note<>' . $this->db->escape($note_intern_angerechntet) . ' OR (z.note IS NOT NULL AND zn.positiv))' => null
- ]);
+ // NOTE(chris): grade "intern angerechnet" needs an official grade beforehand (the subquery gets the last positive offical grade)
+ "(n.note<>" . $this->db->escape($note_intern_angerechntet) . " OR EXISTS (
+ SELECT
+ 1
+ FROM
+ lehre.tbl_zeugnisnote z
+ LEFT JOIN public.tbl_studiensemester zs USING(studiensemester_kurzbz)
+ JOIN (
+ SELECT
+ zi.lehrveranstaltung_id,
+ zi.student_uid,
+ MAX(zis.start) AS start
+ FROM
+ lehre.tbl_zeugnisnote zi
+ LEFT JOIN lehre.tbl_note zin USING(note)
+ LEFT JOIN public.tbl_studiensemester zis USING(studiensemester_kurzbz)
+ WHERE
+ zin.aktiv
+ AND zin.offiziell
+ GROUP BY
+ zi.lehrveranstaltung_id,
+ zi.student_uid
+ ) zx ON (
+ z.lehrveranstaltung_id = zx.lehrveranstaltung_id
+ AND z.student_uid = zx.student_uid
+ AND zs.start = zx.start
+ )
+ JOIN lehre.tbl_note zn USING (note)
+ WHERE
+ z.lehrveranstaltung_id = lv.lehrveranstaltung_id
+ AND z.student_uid = s.student_uid
+ AND zn.positiv
+ ))" => null
+ ];
+
+ if ($studiensemester_kurzbz !== false)
+ $where[$this->dbTable . '.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+
+ return $this->loadWhere($where);
}
}
diff --git a/application/models/education/Zeugnisnote_model.php b/application/models/education/Zeugnisnote_model.php
index b4d909e37..f32713dec 100644
--- a/application/models/education/Zeugnisnote_model.php
+++ b/application/models/education/Zeugnisnote_model.php
@@ -177,45 +177,63 @@ class Zeugnisnote_model extends DB_Model
$params[] = $studiensemester_kurzbz;
}
- $qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
- vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
- vw_student_lehrveranstaltung.ects, vw_student_lehrveranstaltung.semesterstunden,
- tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
- tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id,
- vw_student_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung,
- vw_student_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
- tbl_note.bezeichnung as note_bezeichnung,
- tbl_note.positiv as note_positiv,
- tbl_zeugnisnote.bemerkung as bemerkung,
- vw_student_lehrveranstaltung.sort,
- vw_student_lehrveranstaltung.zeugnis,
- vw_student_lehrveranstaltung.studiengang_kz,
- vw_student_lehrveranstaltung.lv_lehrform_kurzbz,
- tbl_lehrveranstaltung.sws
- FROM
- (
- campus.vw_student_lehrveranstaltung LEFT JOIN lehre.tbl_zeugnisnote
- ON(uid=student_uid
- AND vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_zeugnisnote.studiensemester_kurzbz
- AND vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
- )
- ) LEFT JOIN lehre.tbl_note USING(note)
- JOIN lehre.tbl_lehrveranstaltung ON(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
- WHERE true $where
+ $qry = "SELECT
+ a.*,
+ lv.lehrform_kurzbz AS lehrveranstaltung_lehrform,
+ lv.kurzbz AS lehrveranstaltung_kurzbz,
+ UPPER(stg1.typ || stg1.kurzbz) AS studiengang,
+ s.studiengang_kz AS studiengang_kz,
+ UPPER(stg2.typ || stg2.kurzbz) AS studiengang_lv,
+ lv.studiengang_kz AS studiengang_kz_lv,
+ lv.semester AS semester_lv,
+ lv.ects AS ects_lv,
+ lv.zeugnis,
+ lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english
+ FROM (
+ SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
+ vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
+ vw_student_lehrveranstaltung.ects, vw_student_lehrveranstaltung.semesterstunden,
+ tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
+ tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id,
+ vw_student_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung,
+ vw_student_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
+ tbl_note.bezeichnung as note_bezeichnung,
+ tbl_note.positiv as note_positiv,
+ tbl_zeugnisnote.bemerkung as bemerkung,
+ vw_student_lehrveranstaltung.sort,
+ vw_student_lehrveranstaltung.zeugnis,
+ vw_student_lehrveranstaltung.studiengang_kz,
+ vw_student_lehrveranstaltung.lv_lehrform_kurzbz,
+ tbl_lehrveranstaltung.sws
+ FROM
+ (
+ campus.vw_student_lehrveranstaltung LEFT JOIN lehre.tbl_zeugnisnote
+ ON(uid=student_uid
+ AND vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_zeugnisnote.studiensemester_kurzbz
+ AND vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+ )
+ ) LEFT JOIN lehre.tbl_note USING(note)
+ JOIN lehre.tbl_lehrveranstaltung ON(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+ WHERE true $where
- UNION
- SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
- uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
- tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
- tbl_note.bezeichnung as note_bezeichnung, tbl_note.positiv as note_positiv, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
- tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.sws
- FROM
- lehre.tbl_zeugnisnote
- JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
- JOIN lehre.tbl_note USING(note)
- WHERE true $where2
+ UNION
+ SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
+ uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
+ tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
+ tbl_note.bezeichnung as note_bezeichnung, tbl_note.positiv as note_positiv, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
+ tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.sws
+ FROM
+ lehre.tbl_zeugnisnote
+ JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+ JOIN lehre.tbl_note USING(note)
+ WHERE true $where2
- ORDER BY sort";
+ ORDER BY sort
+ ) a
+ LEFT JOIN public.tbl_student s ON (a.uid = s.student_uid)
+ LEFT JOIN public.tbl_studiengang stg1 ON (s.studiengang_kz = stg1.studiengang_kz)
+ LEFT JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+ LEFT JOIN public.tbl_studiengang stg2 ON (lv.studiengang_kz = stg2.studiengang_kz)";
return $this->execQuery($qry, $params);
}
diff --git a/application/models/organisation/Geschaeftsjahr_model.php b/application/models/organisation/Geschaeftsjahr_model.php
index 4f0d03b73..fdd774a8c 100644
--- a/application/models/organisation/Geschaeftsjahr_model.php
+++ b/application/models/organisation/Geschaeftsjahr_model.php
@@ -32,11 +32,20 @@ class Geschaeftsjahr_model extends DB_Model
* Gets next Geschaeftsjahr, as determined by its start date
* @return array|null
*/
- public function getNextGeschaeftsjahr()
+ public function getNextGeschaeftsjahr($offsetDays=null)
{
$query = 'SELECT *
- FROM public.tbl_geschaeftsjahr
- WHERE start > now()
+ FROM public.tbl_geschaeftsjahr WHERE ';
+
+ if(!is_null($offsetDays))
+ {
+ $query .= "start > now() - '".$offsetDays." days'::interval";
+ }
+ else
+ {
+ $query .= 'start > now()';
+ }
+ $query .= '
ORDER BY start
LIMIT 1';
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index 2336e3408..0e760a116 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -13,43 +13,32 @@ class Lehrverband_model extends DB_Model
}
/**
- * Check if Lehrverband already exists
- * @param Integer $studiengang_kz
- * @param Integer $semester
- * @param char $verband
- * @param char $gruppe
- * @return 1: if Lehrverband exists, 0: if it doesn't
+ * Gets the maximum possible semester for one or more Studiengaenge.
+ * If there are more than one Studiengang each maximum is calculated and
+ * the smallest result is returned.
+ *
+ * @param array $studiengang_kzs
+ *
+ * @return stdClass
*/
- public function checkIfLehrverbandExists($studiengang_kz, $semester, $verband, $gruppe)
+ public function getMaxSemester($studiengang_kzs)
{
- $qry = "SELECT
- *
- FROM
- public.tbl_lehrverband
- WHERE
- studiengang_kz = ?
- AND
- semester = ?
- AND
- verband = ?
- AND
- gruppe = ?
-
- ";
+ $sqls = [];
+ foreach ($studiengang_kzs as $studiengang_kz) {
+ $this->addSelect('MAX(semester) AS maxsem');
+ $this->db->where('studiengang_kz', $studiengang_kz);
+ $sqls[] = $this->db->get_compiled_select($this->dbTable);
+ }
+
+ $this->addSelect('MIN(a.maxsem) AS maxsem');
+
+ $dbTable = $this->dbTable;
+ $this->dbTable = '(' . implode(' UNION ', $sqls) . ') AS a';
+
+ $result = $this->load();
+
+ $this->dbTable = $dbTable;
- $result = $this->execQuery($qry, array($studiengang_kz, $semester, $verband, $gruppe));
-
- if(isError($result))
- {
- return error($result);
- }
- elseif(!hasData($result))
- {
- return success("0", "Kein Lehrverband vorhanden!");
- }
- else
- {
- return success("1","Lehrverband vorhanden!");
- }
+ return $result;
}
}
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index bec4aee47..1b1a826aa 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -188,4 +188,33 @@ class Organisationseinheit_model extends DB_Model
}
return $this->loadWhere($condition);
}
+
+ /**
+ * @param string $oe_kurzbz
+ *
+ * @return stdClass
+ */
+ public function getWithType($oe_kurzbz)
+ {
+ $this->addSelect($this->dbTable . '.*, t.bezeichnung AS organisationseinheittyp');
+ $this->addJoin('public.tbl_organisationseinheittyp t', 'organisationseinheittyp_kurzbz');
+
+ return $this->load($oe_kurzbz);
+ }
+
+ /**
+ * Get OEs by eventQuery string. Use with autocomplete event queries.
+ * @param $eventQuery String
+ * @return array
+ */
+ public function getAutocompleteSuggestions($eventQuery)
+ {
+ $this->addSelect('oe_kurzbz');
+ $this->addSelect('organisationseinheittyp_kurzbz, oe_kurzbz, bezeichnung, aktiv, lehre');
+ $this->addOrder('organisationseinheittyp_kurzbz, bezeichnung');
+
+ return $this->loadWhere("
+ oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
+ ");
+ }
}
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
index 03a06ffae..aeeab4497 100644
--- a/application/models/organisation/Standort_model.php
+++ b/application/models/organisation/Standort_model.php
@@ -28,5 +28,12 @@ class Standort_model extends DB_Model
return $this->execQuery($qry);
}
+
+ public function getStandorteByFirma($firma_id)
+ {
+ $this->addSelect("DISTINCT ON (standort_id) bezeichnung, standort_id");
+
+ return $this->loadWhere(array("firma_id" => $firma_id));
+ }
}
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 4bbb63805..7ea8a901c 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -457,7 +457,7 @@ class Studiengang_model extends DB_Model
*/
public function getLeitung($studiengang_kz = null)
{
- $this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email');
+ $this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email, titelpre, titelpost, alias');
$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
$this->addJoin('public.tbl_benutzer', 'uid');
$this->addJoin('public.tbl_person', 'person_id');
@@ -493,6 +493,53 @@ class Studiengang_model extends DB_Model
return $this->loadWhere($condition);
}
+ /**
+ * Get Studiengangsleitung/en of Studiengang/Studiengaenge. With Details
+ *
+ * @param null $studiengang_kz Numeric or Array
+ * @return array
+ */
+ public function getLeitungDetailed($studiengang_kz = null)
+ {
+ $this->addSelect('studiengang_kz, email, f.oe_kurzbz, b.uid, b.alias, b.aktiv, p.vorname, p.nachname, p.titelpre, p.titelpost, m.telefonklappe, k.kontakt, o.planbezeichnung');
+ $this->addJoin('public.tbl_benutzerfunktion f', 'oe_kurzbz');
+ $this->addJoin('public.tbl_benutzer b', 'uid');
+ $this->addJoin('public.tbl_person p', 'person_id');
+ $this->addJoin('public.tbl_mitarbeiter m', 'mitarbeiter_uid=uid', 'LEFT');
+ $this->addJoin('public.tbl_kontakt k', 'k.standort_id=m.standort_id AND kontakttyp=\'telefon\'', 'LEFT');
+ $this->addJoin('public.tbl_ort o', 'ort_kurzbz', 'LEFT');
+
+ if (!is_numeric($studiengang_kz) && !is_array($studiengang_kz))
+ {
+ return error('Studiengangskennzahl ungültig');
+ }
+
+ if (is_null($studiengang_kz))
+ {
+ $condition = '
+ funktion_kurzbz = \'Leitung\'
+ AND ( datum_von <= NOW() OR datum_von IS NULL )
+ AND ( datum_bis >= NOW() OR datum_bis IS NULL )
+ ';
+ }
+ elseif (is_numeric($studiengang_kz) || is_array($studiengang_kz))
+ {
+ if (is_array($studiengang_kz))
+ {
+ $studiengang_kz = array_map(array($this,'escape'), $studiengang_kz);
+ $studiengang_kz = implode(', ', $studiengang_kz);
+ }
+ $condition = '
+ funktion_kurzbz = \'Leitung\'
+ AND ( datum_von <= NOW() OR datum_von IS NULL )
+ AND ( datum_bis >= NOW() OR datum_bis IS NULL )
+ AND studiengang_kz IN (' . $studiengang_kz. ')';
+ ;
+ }
+
+ return $this->loadWhere($condition);
+ }
+
public function getStudiengaengeWithOrgForm($typ, $semester)
{
$query = "SELECT DISTINCT (UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz)) AS Studiengang
@@ -600,4 +647,135 @@ class Studiengang_model extends DB_Model
return $this->load();
}
+
+ /**
+ * @return stdClass
+ */
+ public function getStudiengangInfoForNews()
+ {
+
+ $this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+ $this->load->model('person/Person_model', 'PersonModel');
+ $this->load->model('crm/Student_model', 'StudentModel');
+
+ $addEmailProperty= function(&$benutzerfunktionen){
+ if(count($benutzerfunktionen) && defined('DOMAIN'))
+ {
+ $benutzerfunktionen = array_map(function($benutzer)
+ {
+ $benutzer->email = $benutzer->alias."@".DOMAIN;
+ return $benutzer;
+ },$benutzerfunktionen) ;
+ }
+
+ };
+ $addFotoProperty= function(&$collection){
+ $collection = array_map(function($item){
+ $person_id = $this->PersonModel->getByUid($item->uid);
+ if(isError($person_id))
+ return error($person_id);
+ $person_id = current(getData($person_id))->person_id;
+ $this->PersonModel->addSelect('foto');
+ $foto = $this->PersonModel->loadWhere(array('person_id'=>$person_id));
+ if(isError($foto))
+ return error($foto);
+ $foto = current(getData($foto))->foto;
+ $item->foto = $foto;
+ return $item;
+ },$collection);
+ };
+
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+
+ $student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+ if (isError($student))
+ return error($student);
+ if (getData($student)) {
+ $student = current(getData($student));
+ $studiengang_kz = $student->studiengang_kz;
+ $semester = $student->semester;
+ }
+
+ $stg_obj = $this->load($studiengang_kz);
+ if(isError($stg_obj))
+ return error($stg_obj);
+ if(getData($stg_obj))
+ {
+ $stg_obj = current(getData($stg_obj));
+ }
+
+ $stg_ltg = $this->getLeitungDetailed($stg_obj->studiengang_kz);
+ if (isError($stg_ltg))
+ return $stg_ltg;
+ $stg_ltg = getData($stg_ltg) ?: [];
+ $addFotoProperty($stg_ltg);
+
+ $gf_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
+ if (isError($gf_ltg))
+ return $gf_ltg;
+ $gf_ltg = getData($gf_ltg) ?: [];
+ $addEmailProperty($gf_ltg);
+
+ $stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
+ if (isError($stv_ltg))
+ return $stv_ltg;
+ $stv_ltg = getData($stv_ltg) ?: [];
+ $addEmailProperty($stv_ltg);
+
+ $ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+ if (isError($ass))
+ return $ass;
+ $ass = getData($ass) ?: [];
+ $addEmailProperty($ass);
+ $addFotoProperty($ass);
+
+ $hochschulvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
+ if (isError($hochschulvertr))
+ return $hochschulvertr;
+ $hochschulvertr = getData($hochschulvertr) ?: [];
+ $addEmailProperty($hochschulvertr);
+
+
+ $stdv = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
+ if (isError($stdv))
+ return $stdv;
+ $stdv = getData($stdv) ?: [];
+ $addEmailProperty($stdv);
+
+
+ $jahrgangsvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
+ if (isError($jahrgangsvertr))
+ return $jahrgangsvertr;
+ $jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+ $addEmailProperty($jahrgangsvertr);
+
+
+ $result_object = new stdClass();
+ $result_object->studiengang = $stg_obj;
+ $result_object->semester = $semester;
+ $result_object->stg_ltg = $stg_ltg;
+ $result_object->gf_ltg = $gf_ltg;
+ $result_object->stv_ltg = $stv_ltg;
+ $result_object->ass = $ass;
+ $result_object->hochschulvertr = $hochschulvertr;
+ $result_object->stdv = $stdv;
+ $result_object->jahrgangsvertr = $jahrgangsvertr;
+
+ return success($result_object);
+ }
+
+ public function getLvaForStudiengangInStudiensemester($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz) {
+ $qry = '
+ SELECT DISTINCT ON (lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,
+ kurzbz, bezeichnung, semester,
+ lehre.tbl_lehrveranstaltung.sprache, orgform_kurzbz,
+ lehre.tbl_lehrveranstaltung.lehrform_kurzbz)
+ lehre.tbl_lehrveranstaltung.lehrveranstaltung_id, kurzbz, bezeichnung,
+ semester, lehre.tbl_lehrveranstaltung.sprache, orgform_kurzbz, lehre.tbl_lehrveranstaltung.lehrform_kurzbz
+ FROM lehre.tbl_lehrveranstaltung JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id) JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+ WHERE aktiv = TRUE AND studiengang_kz = ? AND orgform_kurzbz = ? AND tbl_lehreinheit.studiensemester_kurzbz IN ?';
+
+ return $this->execReadOnlyQuery($qry, array($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz));
+ }
}
diff --git a/application/models/organisation/Studienjahr_model.php b/application/models/organisation/Studienjahr_model.php
index 3bbe3a07f..1686ddc48 100644
--- a/application/models/organisation/Studienjahr_model.php
+++ b/application/models/organisation/Studienjahr_model.php
@@ -1,4 +1,5 @@
execQuery($query);
+ }
+ public function getNextStudienjahr()
+ {
+ $this->addJoin('public.tbl_studiensemester', 'studienjahr_kurzbz');
+ $this->addOrder('start');
+ $this->addLimit(1);
+
+ return $this->loadWhere(['start >' => 'NOW()']);
+ }
+ public function getNextFrom($studienjahr_kurzbz)
+ {
+ $this->addLimit(1);
+
+ return $this->loadWhere([
+ 'studienjahr_kurzbz >' => $studienjahr_kurzbz
+ ]);
+ }
+
+ /**
+ * Get the current Studienjahr. During the summer term, continue using the previous Studienjahr.
+ *
+ * @param int $days
+ * @return array|stdClass|null
+ */
+ public function getLastOrAktStudienjahr($days = 60)
+ {
+ if (!is_numeric($days)) {
+ $days = 60;
+ }
+
+ $query = '
+ SELECT *
+ FROM public.tbl_studienjahr
+ JOIN public.tbl_studiensemester USING (studienjahr_kurzbz)
+ WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
+ ORDER by start DESC
+ LIMIT 1
+ ';
+
+ return $this->execQuery($query);
+ }
+
+ /**
+ * Get the current Studienjahr. During the summer term, get the upcoming next Studienjahr.
+ *
+ * @param int $days
+ * @return array|stdClass|null
+ */
+ public function getAktOrNextStudienjahr($days = 62)
+ {
+ if (!is_numeric($days)) {
+ $days = 62;
+ }
+
+ $query = '
+ SELECT *
+ FROM public.tbl_studienjahr
+ JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
+ WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
+ ORDER by start DESC
+ LIMIT 1
+ ';
+
return $this->execQuery($query);
}
}
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index a142cd19b..e35ba52fb 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -119,4 +119,19 @@ class Studienplan_model extends DB_Model
'lv.lehrveranstaltung_id' => $lehrveranstaltung_id
]);
}
+
+ public function getStudienplaeneByPrestudents($prestudent_id)
+ {
+ $this->addDistinct();
+ $this->addSelect($this->dbTable . '.*');
+ $this->addSelect('sem.start AS start_stsem');
+ $this->addJoin('lehre.tbl_studienordnung o', 'studienordnung_id');
+ $this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+ $this->addJoin('public.tbl_studiensemester sem', 'sem.studiensemester_kurzbz = o.gueltigvon', 'LEFT');
+ $this->addOrder('sem.start');
+
+ return $this->loadWhere([
+ 'prestudent_id' => $prestudent_id
+ ]);
+ }
}
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index 45a4eac7c..f29ab223c 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -13,35 +13,35 @@ class Studiensemester_model extends DB_Model
$this->hasSequence = false;
}
- /**
- * Get actual Studiensemester.
- *
- * @return array
- */
- public function getAkt()
- {
- return $this->loadWhere(array(
- 'start <= ' => 'NOW()',
- 'ende >= ' => 'NOW()'
- )
- );
- }
+ /**
+ * Get actual Studiensemester.
+ *
+ * @return array
+ */
+ public function getAkt()
+ {
+ return $this->loadWhere(array(
+ 'start <= ' => 'NOW()',
+ 'ende >= ' => 'NOW()'
+ )
+ );
+ }
// Get next study semester
public function getNext()
- {
- $query = '
- SELECT *
- FROM
- public.tbl_studiensemester
- WHERE
- start > now()
- ORDER BY start
- LIMIT 1;
- ';
+ {
+ $query = '
+ SELECT *
+ FROM
+ public.tbl_studiensemester
+ WHERE
+ start > now()
+ ORDER BY start
+ LIMIT 1;
+ ';
- return $this->execQuery($query);
- }
+ return $this->execQuery($query);
+ }
/**
* getLastOrAktSemester
@@ -170,22 +170,40 @@ class Studiensemester_model extends DB_Model
return $this->execQuery($query, array($studiensemester_kurzbz, $studiengang_kz));
}
+ /**
+ * Gets a Studiensemester for a date
+ * @param $date
+ * @return string
+ */
+ public function getByDate($date)
+ {
+ // gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
+ $query = "
+ SELECT studiensemester_kurzbz, start, ende
+ FROM public.tbl_studiensemester
+ WHERE ( ende >= ?::date AND start <= ?::date ) OR ( ende >= ?::date + '-45 days'::interval AND start <= ?::date + '-45 days'::interval )
+ ORDER BY start DESC
+ LIMIT 1";
+
+ return $this->execQuery($query, array($date,$date,$date,$date));
+ }
+
/**
* Gets all Studiensemester between two dates
* @param $from
* @param $to
* @return array|null
*/
- public function getByDate($from, $to)
+ public function getByDateRange($from, $to)
{
if (date_format(date_create($from), 'Y-m-d') > (date_format(date_create($to), 'Y-m-d')))
return success(array());
$query = "
- SELECT *
- FROM public.tbl_studiensemester
- WHERE ( ?::date < ende AND ?::date > start )
- ORDER BY start DESC";
+ SELECT *
+ FROM public.tbl_studiensemester
+ WHERE ( ?::date < ende AND ?::date > start )
+ ORDER BY start DESC";
return $this->execQuery($query, array($from, $to));
}
@@ -200,18 +218,127 @@ class Studiensemester_model extends DB_Model
{
$query = "SELECT studiensemester_kurzbz, start, ende FROM public.vw_studiensemester
WHERE studiensemester_kurzbz <> ?
- ORDER BY delta, start LIMIT 1";
+ ORDER BY delta, start LIMIT 1";
return $this->execQuery($query, array($studiensemester_kurzbz));
}
+ /**
+ * @param string $student_uid
+ *
+ * @return StdClass
+ */
+ public function getWhereStudentHasLvs($student_uid)
+ {
+ $this->addDistinct();
+ $this->addSelect($this->dbTable . '.*');
+
+ // TODO(chris): Potentielle Anpassung "Eine UID"
+ $this->addJoin('campus.vw_student_lehrveranstaltung v', 'studiensemester_kurzbz');
+ $this->db->where("v.lehreverzeichnis<>''");
+
+ $this->addOrder($this->dbTable . '.start');
+
+ return $this->loadWhere(['uid' => $student_uid, 'v.lehre' => true]);
+ }
+
public function getAktAndFutureSemester()
{
$query = 'SELECT studiensemester_kurzbz
FROM public.tbl_studiensemester
WHERE start >= NOW() OR (start <= NOW() AND ende >= NOW())
ORDER BY start';
-
+
return $this->execQuery($query);
}
+
+ /**
+ * Liefert ausgehend von heutigen Datum $plus studiensemester in die Zukunft und $minus Studiensemester in die Vergangenheit
+ *
+ * @param integer $plus Optional. Wieviele Studiensemester in die Zukunft sollen ausgegeben werden. Wenn NULL werden alle zukuenftigen geliefert.
+ * @param integer $minus Optional. Wieviele Studiensemester in die Vergangenheit sollen ausgegeben werden. Wenn NULL werden alle vergangenen geliefert.
+ *
+ * @return stdClass
+ */
+ public function addPlusMinus($plus = null, $minus = null)
+ {
+ $this->addSelect($this->pk);
+ $this->addOrder('ende');
+ if ($plus)
+ $this->addLimit($plus);
+ $this->db->where('start >= NOW()', null, false);
+ $plus = $this->db->get_compiled_select($this->dbTable);
+
+ $this->addSelect($this->pk);
+ $this->addOrder('start', 'DESC');
+ if ($minus)
+ $this->addLimit($minus);
+ $this->db->where('start <= NOW()', null, false);
+ $minus = $this->db->get_compiled_select($this->dbTable);
+
+ $this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
+ }
+
+ /**
+ * Holt letzen zwei Ziffern des Studienjahres von Studiensemester, z.B. 24 für WS2024 und SS2025
+ * @param studiensemester_kurzbz
+ * @return string Studienjahr Nummer
+ */
+ public function getStudienjahrNumberFromStudiensemester($studiensemester_kurzbz)
+ {
+ $studienjahrNumber = mb_substr($studiensemester_kurzbz, 4, 2);
+ if (is_numeric($studienjahrNumber) && mb_substr($studiensemester_kurzbz, 0, 2) == 'SS') (int)$studienjahrNumber -= 1;
+ return $studienjahrNumber;
+ }
+
+ /**
+ * Get Studienjahr by Studiensemester.
+ *
+ * @param $studiensemester_kurzbz
+ * @return array|stdClass
+ */
+ public function getStudienjahrByStudiensemester($studiensemester_kurzbz)
+ {
+ $studienjahrObj = null;
+
+ if (!is_numeric($studiensemester_kurzbz))
+ {
+ $this->StudiensemesterModel->addSelect('studienjahr_kurzbz');
+ $result = $this->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz =' => $studiensemester_kurzbz));
+ }
+
+ if (hasData($result))
+ {
+ $studienjahr = getData($result)[0]->studienjahr_kurzbz;
+ $startstudienjahr = substr($studienjahr, 0, 4);
+ $endstudienjahr = substr($studienjahr, 0, 2) . substr($studienjahr, -2);
+
+ $studienjahrObj = new StdClass();
+
+ $studienjahrObj->studienjahr_kurzbz = $studienjahr;
+ $studienjahrObj->startstudienjahr = $startstudienjahr;
+ $studienjahrObj->endstudienjahr= $endstudienjahr;
+ }
+
+ if (isError($result)) {
+ return error(getError($result));
+ }
+
+ return success($studienjahrObj);
+ }
+
+ /**
+ * Holt Start und Ende des Studiensemester_kurzbz
+ * @param studiensemester_kurzbz
+ * @return stdClass
+ */
+ public function getStartEndeFromStudiensemester($studiensemester_kurzbz)
+ {
+ return $this->execReadOnlyQuery("
+ SELECT
+ start, ende
+ FROM public.tbl_studiensemester
+ WHERE studiensemester_kurzbz = ?",[$studiensemester_kurzbz]);
+
+ }
}
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
index cc6d68673..4dd03ea6b 100644
--- a/application/models/person/Adresse_model.php
+++ b/application/models/person/Adresse_model.php
@@ -24,51 +24,4 @@ class Adresse_model extends DB_Model
$this->addSelect($select);
return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true));
}
-
- /**
- * Get Array of Names of Gemeinden having Postleitzahl
- * @param integer $plz Postleitzahl
- * @return array $result[]
- */
- public function getGemeinden($plz)
- {
- $qry = "
- SELECT distinct
- g.name
- FROM bis.tbl_gemeinde g
- WHERE g.plz=?
- ORDER BY g.name
- ";
-
- return $this->execQuery($qry, array($plz));
- }
-
- /**
- * Get Array of Names of Ortschaften having Postleitzahl
- * @param integer $plz Postleitzahl
- * @param String $gemeindename Name Gemeinde
- * @return array $result[]
- */
- public function getOrtschaften($plz, $gemeinde=null)
- {
- $params = array($plz);
- $qry = "
- SELECT distinct
- g.ortschaftsname
- FROM bis.tbl_gemeinde g
- WHERE g.plz=? ";
-
- if (isset($gemeinde))
- {
- $qry .= "AND g.name=?";
- $params[] = $gemeinde;
- }
-
- $qry .= "ORDER BY g.ortschaftsname";
-
- return $this->execQuery($qry, $params);
- }
-}
-
-
-
+}
\ No newline at end of file
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index eff1329a6..65121dbb5 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -1,4 +1,7 @@
addLimit(1);
$this->addSelect('vorname, nachname');
$this->addJoin('public.tbl_person', 'person_id');
$nameresult = $this->loadWhere(array('uid' => $uid));
- if (hasData($nameresult))
- {
- $aliasdata = getData($nameresult);
- $alias = $this->_sanitizeAliasName($aliasdata[0]->vorname).'.'.$this->_sanitizeAliasName($aliasdata[0]->nachname);
- $aliasexists = $this->aliasExists($alias);
+ if (isError($nameresult))
+ return $nameresult;
- if (hasData($aliasexists) && !getData($aliasexists)[0])
- $aliasres = $alias;
- }
- return success($aliasres);
+ if (!hasData($nameresult))
+ return success('');
+
+ $aliasdata = current(getData($nameresult));
+
+ return $this->generateAliasFromName($aliasdata->vorname, $aliasdata->nachname);
+ }
+
+ /**
+ * Generates alias for a vor- and nachname.
+ *
+ * @param string $vorname
+ * @param string $nachname
+ *
+ * @return stdClass
+ */
+ public function generateAliasFromName($vorname, $nachname)
+ {
+ $alias = $this->_sanitizeAliasName($vorname . '.' . $nachname);
+
+ $result = $this->aliasExists($alias);
+
+ if (isError($result))
+ return $result;
+
+ if (current(getData($result)))
+ return success('');
+
+ return success($alias);
+ }
+
+ /**
+ * Generates a matrikelnummer
+ *
+ * @param string $oe_kurzbz
+ *
+ * @return stdClass
+ */
+ public function generateMatrikelnummer($oe_kurzbz)
+ {
+ $matrikelnummer = false;
+
+ Events::trigger(
+ 'generate_matrikelnummer',
+ function ($value) use ($matrikelnummer) {
+ $matrikelnummer = $value;
+ },
+ $oe_kurzbz
+ );
+
+ if ($matrikelnummer !== false)
+ return success($matrikelnummer);
+
+ return success(null);
+ }
+
+ /**
+ * Generates an activation key
+ *
+ * @return string
+ */
+ public function generateActivationkey()
+ {
+ $this->load->library('CryptLib');
+
+ $key = '';
+ for ($i=0; $i<32; $i++)
+ $key .= ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'][mt_rand(0, 15)];
+
+ $value = uniqid(mt_rand(), true);
+ $length = strlen($value);
+ $value = str_pad($value, $length + 32 - ($length % 32), chr(0));
+
+ return md5($this->cryptlib->RIJNDAEL_256_ECB($value, $key, true));
}
// --------------------------------------------------------------------------------------------
@@ -100,9 +169,10 @@ class Benutzer_model extends DB_Model
* @param string $str
* @return string
*/
+
private function _sanitizeAliasName($str)
{
$str = sanitizeProblemChars($str);
- return mb_strtolower(str_replace(' ','_', $str));
+ return mb_strtolower(str_replace(' ', '_', $str));
}
}
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
index e44281a92..8c43e4f84 100644
--- a/application/models/person/Benutzerfunktion_model.php
+++ b/application/models/person/Benutzerfunktion_model.php
@@ -50,6 +50,53 @@ class Benutzerfunktion_model extends DB_Model
return $this->execQuery($qry, $params);
}
+ /**
+ * Lädt alle Benutzerfunktionen zu einer UID im Zeitraum eines Studiensemesters
+ *
+ * @param string $uid
+ * @param string $stdsem
+ * @param string $funktion_kurzbz (optional)
+ *
+ * @return stdClass
+ */
+ public function getBenutzerFunktionByUidInStdsem($uid, $stdsem, $funktion_kurzbz = null)
+ {
+ $stdsemEscaped = $this->escape($stdsem);
+ $this->addSelect($this->dbTable . ".*");
+ $this->addSelect("oe.bezeichnung AS organisationseinheit_bezeichnung");
+ $this->addSelect("oe.organisationseinheittyp_kurzbz");
+
+ $this->addJoin("public.tbl_organisationseinheit oe", "oe_kurzbz");
+
+ $this->db->where("uid", $uid);
+
+ if ($funktion_kurzbz !== null)
+ $this->db->where("funktion_kurzbz", $funktion_kurzbz);
+
+ $this->db->group_start();
+ $this->db->where("datum_bis IS NULL");
+ $this->db->or_where("datum_bis >=", "(
+ SELECT start
+ FROM public.tbl_studiensemester
+ WHERE studiensemester_kurzbz = " . $stdsemEscaped . "
+ )", false);
+ $this->db->group_end();
+
+ $this->db->group_start();
+ $this->db->where("datum_von IS NULL");
+ $this->db->or_where("datum_von <=", "(
+ SELECT ende
+ FROM public.tbl_studiensemester
+ WHERE studiensemester_kurzbz = " . $stdsemEscaped . "
+ )", false);
+ $this->db->group_end();
+
+ $this->addOrder("datum_bis", "NULLS LAST");
+ $this->addOrder("datum_von", "NULLS LAST");
+
+ return $this->load();
+ }
+
/**
* Get the Benutzerfunktion using the person_id
*/
@@ -147,6 +194,38 @@ class Benutzerfunktion_model extends DB_Model
return $this->execQuery($query, $parametersArray);
}
+ /**
+ * Gets all Benutzer with details for a given Benutzerfunktion and optionally specified Oe and semester
+ *
+ * @param string $funktion_kurzbz
+ * @param string $oe_kurzbz
+ * @param integer | null $semester
+ * @return array|null
+ */
+ public function getBenutzerFunktionenDetailed($funktion_kurzbz, $oe_kurzbz = null, $semester = null)
+ {
+ $this->addSelect($this->dbTable . '.funktion_kurzbz, ' . $this->dbTable . '.oe_kurzbz, ' . $this->dbTable . '.semester, ' . $this->dbTable . '.bezeichnung, f.beschreibung, b.uid, b.alias, b.aktiv, p.vorname, p.nachname, p.titelpre, p.titelpost, m.telefonklappe, k.kontakt, o.planbezeichnung');
+ $this->addJoin('public.tbl_funktion f', 'funktion_kurzbz');
+ $this->addJoin('public.tbl_benutzer b', 'uid');
+ $this->addJoin('public.tbl_person p', 'person_id');
+ $this->addJoin('public.tbl_mitarbeiter m', 'mitarbeiter_uid=uid', 'LEFT');
+ $this->addJoin('public.tbl_kontakt k', 'k.standort_id=m.standort_id AND kontakttyp=\'telefon\'', 'LEFT');
+ $this->addJoin('public.tbl_ort o', 'ort_kurzbz', 'LEFT');
+
+ $this->addOrder('LOWER(uid)');
+
+ $where = [$this->dbTable . '.funktion_kurzbz' => $funktion_kurzbz];
+ if ($oe_kurzbz !== null)
+ $where[$this->dbTable . '.oe_kurzbz'] = $oe_kurzbz;
+ if ($semester !== null)
+ $where[$this->dbTable . '.semester'] = $semester;
+
+ $this->db->where('(' . $this->dbTable . '.datum_bis >= NOW() OR ' . $this->dbTable . '.datum_bis IS NULL)', NULL, FALSE);
+ $this->db->where('(' . $this->dbTable . '.datum_von <= NOW() OR ' . $this->dbTable . '.datum_von IS NULL)', NULL, FALSE);
+
+ return $this->loadWhere($where);
+ }
+
/**
* Get active Studiengangsleitung(en) of the user by UID.
* @param $uid
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
index e569094c4..fba797641 100644
--- a/application/models/person/Benutzergruppe_model.php
+++ b/application/models/person/Benutzergruppe_model.php
@@ -12,4 +12,25 @@ class Benutzergruppe_model extends DB_Model
$this->pk = array('gruppe_kurzbz', 'uid');
$this->hasSequence = false;
}
+
+ /**
+ * Laedt die User in einer Benutzergruppe
+ * @param gruppe_kurzbz, stsem
+ * @return array
+ */
+ public function getUids($gruppe_kurzbz, $stsem)
+ {
+ $query = "
+ SELECT
+ uid
+ FROM
+ public.tbl_benutzergruppe
+ WHERE
+ gruppe_kurzbz = " . $this->escape($gruppe_kurzbz) . "
+ AND studiensemester_kurzbz = " . $this->escape($stsem);
+
+ $res = $this->execReadOnlyQuery($query);
+ $uids = (hasData($res)) ? getData($res) : array();
+ return $uids;
+ }
}
diff --git a/application/models/person/Gruppe_manager_model.php b/application/models/person/Gruppe_manager_model.php
new file mode 100644
index 000000000..93d45bd1f
--- /dev/null
+++ b/application/models/person/Gruppe_manager_model.php
@@ -0,0 +1,14 @@
+dbTable = 'public.tbl_gruppe_manager';
+ $this->pk = 'gruppe_manager_id';
+ }
+}
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 560d6c0c7..2e99d1cdd 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -133,142 +133,6 @@ class Notiz_model extends DB_Model
return $result;
}
- /**
- * Add a Notiz with Notizuordnung for a given type
- * @param type type of id for Notizzuordnung (example: person, prestudent, mitarbeiter, projekt, projektphase, projekttask,
- * bestellung, lehreinheit, anrechnung)
- * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...)
- * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz
- */
- public function addNotizForType(
- $type,
- $id,
- $titel,
- $text,
- $insertvon,
- $start = null,
- $ende = null,
- $erledigt = false,
- $verfasser_uid = null,
- $bearbeiter_uid = null
- ) {
-
- //check, ob id und type valid
- if (!isset($id) || ($id == "undefined")) {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return error("Id(". $id. ') ist keine gültige ID!');
- }
-
- // Loads model Notizzuordnung_model
- $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
- //check if valid type
- $result = $this->NotizzuordnungModel->isValidType($type);
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return error($type . ' ist kein gültiger ID_TYP!');
- }
-
- // Start DB transaction
- $this->db->trans_start(false);
-
- $result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
- "insertvon" => $insertvon, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
-
- if (isSuccess($result))
- {
- $notiz_id = $result->retval;
-
- //TODO(Manu) neue Function assign Notiz
- if($type == "software_id")
- {
- // Loads extension Model
- $this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
- $result = $this->ExtensionnotizzuordnungModel->insert([
- 'notiz_id' => $notiz_id,
- 'id' => $id,
- 'type_id' => $type
- ]);
- }
- else
- {
- $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
- }
- if (isError($result))
- {
- $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
- return error('Fehler Insert Zuordnungstabelle');
- }
- }
-
-
- // Transaction complete!
- $this->db->trans_complete();
-
- // Check if everything went ok during the transaction
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- $result = error($result->msg, EXIT_ERROR);
- }
- else
- {
- $this->db->trans_commit();
- $result = success($notiz_id);
- }
-
- return $result;
- }
-
- /**
- * Add a Notiz for a given person with DMS_id
- *
- */
- //Todo(manu) deprecated?
-/* public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null)
- {
- // Loads model Notizzuordnung_model
- $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
- // Start DB transaction
- $this->db->trans_start(false);
-
- $result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
- "insertvon" => $verfasser_uid, 'start' => $von, 'ende' => $bis));
-
- if (isSuccess($result))
- {
- $notiz_id = $result->retval;
- $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $person_id));
-
- if($dms_id)
- {
- // Loads model Notizdokument_model
- $this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
- $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
- }
- }
-
- // Transaction complete!
- $this->db->trans_complete();
-
- // Check if everything went ok during the transaction
- if ($this->db->trans_status() === false || isError($result))
- {
- $this->db->trans_rollback();
- $result = error($result->msg, EXIT_ERROR);
- }
- else
- {
- $this->db->trans_commit();
- $result = success($notiz_id);
- }
-
- return $result;
- }*/
-
/**
* gets all Notizen for a person
* @param $person_id
@@ -278,7 +142,7 @@ class Notiz_model extends DB_Model
$this->addSelect('public.tbl_notiz.*');
$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
- return $this->loadWhere(array('person_id' => $person_id));
+ return $this->loadWhere(array('person_id' => $person_id, 'tbl_notiz.typ' => NULL));
}
/**
@@ -292,10 +156,10 @@ class Notiz_model extends DB_Model
$qry = "
SELECT
n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
- TO_CHAR (CASE
+ (CASE
WHEN n.updateamum >= n.insertamum THEN n.updateamum
ELSE n.insertamum
- END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
+ END) AS lastUpdate,
regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format,
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 88813220e..997048972 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -290,19 +290,34 @@ class Person_model extends DB_Model
return success($result->vorname. ' '. $result->nachname);
}
+ /**
+ * Get first name of given uid. (Vorname Nachname)
+ * @param $uid
+ * @return array
+ */
+ public function getFirstName($uid)
+ {
+ $result = getData($this->getByUid($uid))[0];
+ if (!$result) {
+ show_error('Failed loading person');
+ }
+
+ return success($result->vorname);
+ }
+
public function checkDuplicate($person_id)
{
$qry = "SELECT person_id
FROM public.tbl_prestudent p
- JOIN
+ JOIN
(
SELECT DISTINCT ON(prestudent_id) *
FROM public.tbl_prestudentstatus
- WHERE prestudent_id IN
+ WHERE prestudent_id IN
(
- SELECT prestudent_id
- FROM public.tbl_prestudent
- WHERE person_id IN
+ SELECT prestudent_id
+ FROM public.tbl_prestudent
+ WHERE person_id IN
(
SELECT p2.person_id
FROM public.tbl_person p
@@ -316,8 +331,8 @@ class Person_model extends DB_Model
ORDER BY prestudent_id, datum DESC, insertamum DESC
) ps USING(prestudent_id)
JOIN public.tbl_status USING(status_kurzbz)
- WHERE status_kurzbz = 'Interessent'
- AND studiengang_kz IN
+ WHERE status_kurzbz = 'Interessent'
+ AND studiengang_kz IN
(
SELECT studiengang_kz
FROM public.tbl_prestudent p
@@ -374,5 +389,38 @@ class Person_model extends DB_Model
'prestudent_id' => $prestudent_id
]);
}
-}
+ public function checkUnruly($vorname, $nachname, $gebdatum)
+ {
+ $qry = "SELECT person_id, vorname, nachname, gebdatum, unruly
+ FROM tbl_person
+ WHERE tbl_person.vorname = ?
+ AND tbl_person.nachname = ?
+ AND tbl_person.gebdatum = ?
+ AND tbl_person.unruly = TRUE;";
+
+ return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
+ }
+
+ public function checkUnrulyWhere($where, $paramsArray)
+ {
+ $qry = 'SELECT *
+ FROM tbl_person p
+ WHERE '.$where.';';
+
+ return $this->execQuery($qry, $paramsArray);
+ }
+
+ public function updateUnruly($person_id, $unruly)
+ {
+ $result = $this->update($person_id, array(
+ 'unruly' => $unruly
+ ));
+
+ if (isError($result)) {
+ return error($result->msg, EXIT_ERROR);
+ } else if (isSuccess($result) && hasData($result)) {
+ return success($result);
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
new file mode 100644
index 000000000..ffb04b7e7
--- /dev/null
+++ b/application/models/person/Profil_update_model.php
@@ -0,0 +1,187 @@
+dbTable = 'public.tbl_profil_update';
+ $this->pk = ['profil_update_id'];
+ $this->hasSequence = true;
+
+
+ $this->load->model('crm/Student_model', 'StudentModel');
+ $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+ $this->load->library('PermissionLib');
+ }
+
+ /**
+ * getTimestamp
+ * returns insert or update timestamp of a certain profil update
+ *
+ * @param boolean $update: conditional whether to return insertamum or updateamum
+ */
+ //TODO: function wird nicht verwendet
+ public function getTimestamp($id, $update = false)
+ {
+ $selectStatement = $update ? 'updateamum' : 'insertamum';
+ $this->addSelect([$selectStatement]);
+ $res = $this->load([$id]);
+ return hasData($res) ? getData($res)[0]->$selectStatement : null;
+ }
+
+ /**
+ * getFilesFromChangeRequest
+ *
+ * returns all files associated to a profil update request in the following format:
+ * {dms_id:123 , name:"test"}
+ *
+ * @param boolean $profil_update_id primary key of the profil update request
+ * @return array
+ */
+ //TODO: function wird nicht verwendet
+ public function getFilesFromChangeRequest($profil_update_id)
+ {
+ $this->addSelect(["requested_change"]);
+ $res = $this->load([$profil_update_id]);
+ $res = hasData($res) ? getData($res)[0] : null;
+ return json_decode($res->requested_change)->files ?: [];
+ }
+
+
+ //? queries the tbl_profil_updates without permissions of the user
+ public function getProfilUpdatesWhere($whereClause)
+ {
+ if (array_key_exists("uid", $whereClause)) {
+ $whereClause["public.tbl_profil_update.uid"] = $whereClause["uid"];
+ unset($whereClause["uid"]);
+ }
+ $this->addSelect(["public.tbl_profil_update.*", "public.tbl_person.vorname"]);
+ $this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
+ $this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
+ $res = $this->loadWhere($whereClause);
+ if (isError($res)) {
+ return $res;
+ }
+ if (hasData($res)) {
+ foreach (getData($res) as $request) {
+ $this->formatProfilRequest($request);
+ }
+ }
+
+ return $res;
+
+ }
+
+ //? remove File from the Profil Update
+ public function removeFileFromProfilUpdate($dms_id)
+ {
+
+ if(!is_int($dms_id) || $dms_id < 0){
+ return error("not valid dms_id");
+ }
+
+ return $this->execReadOnlyQuery("
+ UPDATE public.tbl_profil_update
+ SET attachment_id = NULL
+ WHERE attachment_id = ?", [$dms_id]);
+
+ }
+
+
+ /**
+ * getProfilUpdateWithPermission
+ *
+ * queries the profil updates and checks if the user trying to query the data has permissions to get the profil updates
+ *
+ * @param string $whereClause additional where clause that will be appended to the db query
+ * @return array array with all the profil updates that the user is eligible to see
+ */
+ public function getProfilUpdateWithPermission($whereClause = null)
+ {
+
+ $studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten', 's');
+ $mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', 's');
+ $oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
+
+ $lang = "select index from public.tbl_sprache where sprache =" . $this->escape(getUserLanguage());
+ $res = [];
+
+ if ($studentBerechtigung) {
+
+
+ //? Nur wenn der/die AssistentIn auch die Berechtigung in der gleichen Organisationseinheit des Studenten hat
+ $parameters = [];
+ $query = "
+ SELECT
+ profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated, status_timestamp, status_message, attachment_id
+ FROM public.tbl_profil_update
+ JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status
+ JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
+ JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
+ JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
+ JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
+ Where public.tbl_studiengang.oe_kurzbz IN ? ";
+ $parameters[] = $oe_berechtigung;
+ if ($whereClause) {
+ foreach ($whereClause as $key => $value) {
+ $parameters[] = $value;
+ $query .= " AND " . $key . " = ?";
+ }
+ }
+
+ $studentRequests = $this->execReadOnlyQuery($query, $parameters);
+
+ if (isError($studentRequests))
+ return error("db error: " . getData($studentRequests));
+ $studentRequests = getData($studentRequests) ?: [];
+ foreach ($studentRequests as $request) {
+ array_push($res, $request);
+ }
+ }
+ if ($mitarbeiterBerechtigung) {
+ $this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
+ $this->addJoin('tbl_profil_update_status', 'tbl_profil_update_status.status_kurzbz=tbl_profil_update.status');
+ $this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
+ $this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
+ $this->addJoin('tbl_person', 'tbl_benutzer.person_id=tbl_person.person_id');
+ $mitarbeiterRequests = $this->loadWhere($whereClause);
+ if (isError($mitarbeiterRequests))
+ return error("db error: " . getData($mitarbeiterRequests));
+ $mitarbeiterRequests = getData($mitarbeiterRequests) ?: [];
+ foreach ($mitarbeiterRequests as $request) {
+ array_push($res, $request);
+ }
+ }
+ if ($res) {
+
+ foreach ($res as $request) {
+ $this->formatProfilRequest($request);
+ }
+ }
+
+ return $res;
+
+ }
+
+ /**
+ * formatProfilRequest
+ *
+ * formats the the properties of a profilUpdate request row result
+ *
+ * @param stdClass $request unflitered profilUpdate row result from the database
+ * @return void
+ */
+ private function formatProfilRequest($request)
+ {
+ $request->requested_change = json_decode($request->requested_change);
+ $request->insertamum = !is_null($request->insertamum) ? date_create($request->insertamum)->format('d.m.Y') : null;
+ $request->updateamum = !is_null($request->updateamum) ? date_create($request->updateamum)->format('d.m.Y') : null;
+ $request->status_timestamp = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('d.m.Y') : null;
+ }
+
+}
diff --git a/application/models/person/Profil_update_status_model.php b/application/models/person/Profil_update_status_model.php
new file mode 100644
index 000000000..e69f9a047
--- /dev/null
+++ b/application/models/person/Profil_update_status_model.php
@@ -0,0 +1,18 @@
+dbTable = 'public.tbl_profil_update_status';
+ $this->pk = ['status_kurzbz'];
+ $this->hasSequence = false;
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/application/models/person/Profil_update_topic_model.php b/application/models/person/Profil_update_topic_model.php
new file mode 100644
index 000000000..0b7ad61e3
--- /dev/null
+++ b/application/models/person/Profil_update_topic_model.php
@@ -0,0 +1,16 @@
+dbTable = 'public.tbl_profil_update_topic';
+ $this->pk = ['topic_kurzbz'];
+ $this->hasSequence = false;
+
+ }
+}
\ No newline at end of file
diff --git a/application/models/project/Projects_employees_model.php b/application/models/project/Projects_employees_model.php
new file mode 100644
index 000000000..a12e3961c
--- /dev/null
+++ b/application/models/project/Projects_employees_model.php
@@ -0,0 +1,22 @@
+dbTable = 'sync.tbl_projects_employees';
+ $this->pk = 'projects_employees_id';
+ }
+
+ public function deleteByProjectTaskId($ids)
+ {
+ $qry = "DELETE FROM " . $this->dbTable . "
+ WHERE project_task_id IN ?";
+
+ return $this->execQuery($qry, array($ids));
+ }
+}
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 69aa962c1..290c3491d 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -17,7 +17,7 @@ class Betriebsmittel_model extends DB_Model
*/
public function loadInventarliste($filter)
{
- $filter = strtoLower($filter);
+ $filter = urldecode(strtoLower($filter));
$qry = "
SELECT
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index bffa82501..6da9a384d 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -100,7 +100,7 @@ class Betriebsmittelperson_model extends DB_Model
public function getBetriebsmittelData($id, $type_id)
{
switch ($type_id) {
- case 'person':
+ case 'person_id':
$cond = 'bmp.person_id';
break;
case 'uid':
@@ -109,20 +109,41 @@ class Betriebsmittelperson_model extends DB_Model
case 'betriebsmittelperson_id':
$cond = 'bmp.betriebsmittelperson_id';
break;
- default:
+ default:
return error("ID nicht gültig");
}
$query = "
SELECT
- bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer
+ bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung,
+ bmp.retouram,
+ bmp.ausgegebenam,
+ bm.beschreibung, bmp.uid, bmp.kaution,
+ bm.betriebsmittel_id, bmp.betriebsmittelperson_id,
+ bm.inventarnummer, bm.nummer2
FROM
- wawi.tbl_betriebsmittelperson bmp
+ wawi.tbl_betriebsmittelperson bmp
JOIN
- wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
+ wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
WHERE
- " . $cond . " = ? ";
+ " . $cond . " = ? ";
return $this->execQuery($query, array($id));
}
+
+ /**
+ * Perform a loadWhere on the vw_betriebsmittelperson DB View
+ *
+ * @param array $where
+ *
+ * @return stdClass
+ */
+ public function loadViewWhere($where)
+ {
+ $table = $this->dbTable;
+ $this->dbTable = 'public.vw_betriebsmittelperson';
+ $result = $this->loadWhere($where);
+ $this->dbTable = $table;
+ return $result;
+ }
}
diff --git a/application/models/ressource/Lehretools_model.php b/application/models/ressource/Lehretools_model.php
new file mode 100644
index 000000000..69d9f6555
--- /dev/null
+++ b/application/models/ressource/Lehretools_model.php
@@ -0,0 +1,62 @@
+dbTable = 'campus.tbl_lehre_tools';
+ $this->pk = 'lehre_tools_id';
+ }
+
+ /**
+ *
+ * Laedt die Tools zu einer Lehrveranstaltung
+ * @param $lehrveranstaltung_id
+ * @param $studiensemester_kurzbz
+ */
+ public function getTools($lehrveranstaltung_id, $studiensemester_kurzbz, $sprache)
+ {
+ $query = "SELECT
+ lehre_tools_id,
+ bezeichnung[(SELECT index FROM public.tbl_sprache WHERE sprache = " . $this->escape($sprache) . ")] AS bezeichnung,
+ kurzbz,
+ basis_url,
+ logo_dms_id
+ FROM
+ campus.tbl_lehre_tools
+ JOIN campus.tbl_lehre_tools_organisationseinheit USING(lehre_tools_id)
+ WHERE
+ campus.tbl_lehre_tools_organisationseinheit.aktiv AND
+ (
+ oe_kurzbz IN(
+ SELECT
+ tbl_studiengang.oe_kurzbz
+ FROM
+ lehre.tbl_lehrveranstaltung
+ JOIN public.tbl_studiengang USING(studiengang_kz)
+ WHERE
+ tbl_lehrveranstaltung.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+ )
+ OR
+ oe_kurzbz IN(
+ SELECT
+ lehrfach.oe_kurzbz
+ FROM
+ lehre.tbl_lehreinheit
+ JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(lehrfach_id=lehrfach.lehrveranstaltung_id)
+ WHERE
+ tbl_lehreinheit.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+ AND tbl_lehreinheit.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+ )
+ )
+ ORDER BY lehre_tools_id";
+
+ $toolsres = $this->execReadOnlyQuery($query);
+ $tools = (hasData($toolsres)) ? getData($toolsres) : array();
+
+ return $tools;
+ }
+}
\ No newline at end of file
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index c38fcf054..836f5d65a 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -217,12 +217,28 @@ class Mitarbeiter_model extends DB_Model
return success($kurzbz);
}
- public function searchMitarbeiter($filter)
+ /**
+ * Search function for mitarbeiter
+ * @param $filter searchstring: searches for nachname, vorname, mitarbeiter_uid
+ * $param $mode gives the resultobject in different version:
+ * null : "[mitarbeiter_uid], Nachname, Vorname, (mitarbeiter_uid)"
+ * 'mitAkadGrad': "[mitarbeiter_uid], Nachname, Vorname, Titelpre, Titelpost (mitarbeiter_uid)"
+ * 'ohneMaUid' : "[mitarbeiter_uid], Nachname, Vorname, Titelpre, Titelpost"
+ * @return object in 3 versions
+ */
+ public function searchMitarbeiter($filter, $mode=null)
{
$filter = strtoLower($filter);
+
+ if ($mode == "mitAkadGrad")
+ $returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+ elseif ($mode == "ohneMaUid")
+ $returnwert = "p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
+ else
+ $returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+
$qry = "
- SELECT
- ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter
+ SELECT " . $returnwert . "
FROM
public.tbl_mitarbeiter ma
JOIN
@@ -238,4 +254,28 @@ class Mitarbeiter_model extends DB_Model
return $this->execQuery($qry);
}
+
+ /**
+ * Gets Mitarbeiter for a certain Lehrveranstaltung.
+ *
+ * @param $lehrveranstaltung_id
+ * @return array with Mitarbeiter and their Lehreinheiten
+ */
+ public function getMitarbeiterFromLV($lehrveranstaltung_id){
+ //TODO(manu) maybe filter that in pruefungslist.js ?
+ $qry = "SELECT DISTINCT
+ lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid
+ FROM
+ lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
+ WHERE
+ lehrveranstaltung_id= ?
+ AND
+ mitarbeiter_uid=uid
+ AND
+ tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id;";
+
+ $parametersArray = array($lehrveranstaltung_id);
+
+ return $this->execQuery($qry, $parametersArray);
+ }
}
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
index 59b213a54..de0c8e331 100644
--- a/application/models/ressource/Ort_model.php
+++ b/application/models/ressource/Ort_model.php
@@ -20,4 +20,16 @@ class Ort_model extends DB_Model
return $this->OrtModel->loadWhere(array("raumtyp_kurzbz" => $raumtyp_kurzbz));
}
+
+ public function getContentID($ort_kurzbz)
+ {
+
+ return $this->execReadOnlyQuery("
+ SELECT content_id
+ FROM public.tbl_ort
+ WHERE ort_kurzbz = ?;
+ ",[$ort_kurzbz]);
+
+ }
+
}
\ No newline at end of file
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 37d0cb376..f635d0cb1 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -11,4 +11,129 @@ class Reservierung_model extends DB_Model
$this->dbTable = 'campus.tbl_reservierung';
$this->pk = 'reservierung_id';
}
+
+
+ /**
+ * @param $uid
+ *
+ * @return stdClass
+ */
+ public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
+ {
+
+ $stundenplan_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),'/'))
+ END as gruppen_kuerzel
+ FROM campus.vw_reservierung r
+ JOIN public.tbl_studiengang studg ON studg.studiengang_kz=r.studiengang_kz
+ JOIN lehre.tbl_stunde stund ON stund.stunde = r.stunde
+ LEFT JOIN public.tbl_benutzergruppe bg ON r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?
+ LEFT JOIN public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <= r.datum AND ss1.ende >= r.datum
+ LEFT JOIN public.tbl_studentlehrverband slv ON r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe ='' OR r.gruppe ='0') AND r.gruppe_kurzbz IS NULL
+ LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum
+ WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
+ OR ss2.studiensemester_kurzbz IS NOT NULL)";
+
+ $raum_reservierungen_query = "SELECT res.*, beginn, ende,
+ CASE
+ WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz
+ ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))
+ END as gruppen_kuerzel
+ FROM campus.vw_reservierung res
+ JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+ 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;
+
+ $query_result= $this->execReadOnlyQuery("
+ SELECT
+ 'reservierung' as type, beginn, ende, datum,
+ COALESCE(titel, beschreibung) as topic,
+ array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
+ array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+
+ ort_kurzbz, 'FFFFFF' as farbe
+
+ FROM
+ (
+ ". $subquery ."
+ ) AS subquery
+
+ GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+
+ ORDER BY datum, beginn
+ ", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
+
+
+ return $query_result;
+ }
+
+ /**
+ * @param $uid
+ *
+ * @return stdClass
+ */
+ public function getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz = null)
+ {
+
+ $raum_reservierungen_query = "SELECT res.*, beginn, ende,
+ CASE
+ WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz
+ ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))
+ END as gruppen_kuerzel
+ FROM campus.vw_reservierung res
+ JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+ 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 = $raum_reservierungen_query;
+
+
+ $query_result= $this->execReadOnlyQuery("
+ SELECT
+ 'reservierung' as type, beginn, ende, datum,
+ COALESCE(titel, beschreibung) as topic,
+ array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
+ array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+
+ ort_kurzbz, 'FFFFFF' as farbe
+
+ FROM
+ (
+ ". $subquery ."
+ ) AS subquery
+
+ GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+
+ ORDER BY datum, beginn
+ ", [getAuthUID(), $start_date, $end_date]);
+
+
+ return $query_result;
+ }
+
+ /**
+ * @param $uid
+ *
+ * @return stdClass
+ */
+ public function loadForUid($uid)
+ {
+ $this->addSelect('r.*');
+ $this->db->join('public.tbl_benutzergruppe bg', 'r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
+ $this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=r.datum AND ss1.ende>=r.datum', 'LEFT');
+ $this->db->join('public.tbl_studentlehrverband slv', "r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe='' OR r.gruppe='0') AND r.gruppe_kurzbz IS NULL", 'LEFT', false);
+ $this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
+ $this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
+ $this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
+
+ $query = $this->db->get_compiled_select('campus.vw_reservierung r');
+
+ return $this->execQuery($query, [$uid, $uid]);
+ }
+
}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index be3d520b5..012ce0a57 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -11,4 +11,428 @@ class Stundenplan_model extends DB_Model
$this->dbTable = 'lehre.tbl_stundenplan';
$this->pk = 'stundenplan_id';
}
+
+ /**
+ * @param string $ort_kurzbz
+ * @param string $date
+ *
+ * @return stdClass
+ */
+ public function getRoomDataOnInterval($ort_kurzbz,$start_date,$end_date){
+
+
+
+ /*$raum_stundenplan= $this->execReadOnlyQuery("
+ -- merging all reservierungs information with the stundenplan information but with different types
+ SELECT 'stundenplan_eintrag' as eintrags_type, 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, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, * FROM lehre.vw_stundenplan sp
+ WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
+ UNION ALL
+ SELECT 'reservierungs_eintrag' as eintrags_type, NULL, NULL, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
+ WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
+ ", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
+ */
+
+
+ $raum_stundenplan= $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;
+ }
+
+ /**
+ * @param string $ort_kurzbz The room to query the planning for
+ * @param string $start_date The start date of the query interval
+ * @param string $end_date The end date of the query interval
+ *
+ * @return stdClass
+ */
+ public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
+
+
+ $gruppierteEvents= $this->execReadOnlyQuery("
+ SELECT
+
+ 'reservierung' as type,
+ NULL as unr,datum, stunde,
+ titel AS topic,
+ beschreibung as beschreibung,
+ string_agg(DISTINCT gruppe, '/') as gruppe,
+ string_agg(DISTINCT lektor, '/') as lektor,
+ res.ort_kurzbz,res.studiengang_kz, res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
+
+ FROM
+
+ (
+ SELECT
+ NULL as unr,datum, stunde,
+ CASE
+ WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+ ELSE CONCAT(UPPER(studg.typ),UPPER(res.stg_kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))
+ END as gruppe,
+ CASE
+ WHEN mit.kurzbz IS NOT NULL THEN mit.kurzbz
+ ELSE uid
+ END as lektor,
+ res.ort_kurzbz,res.studiengang_kz, res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
+ FROM lehre.vw_reservierung res
+
+ LEFT JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=uid
+ JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+
+ WHERE
+ res.ort_kurzbz = ?
+ AND res.datum >= ?
+ AND res.datum <= ?
+ ) as res
+
+ GROUP BY res.ort_kurzbz,res.studiengang_kz, res.datum, res.stunde, res.titel, res.beschreibung
+
+ UNION ALL
+
+ SELECT
+
+ 'stundenplan' as type,
+ unr,datum, stunde,
+ CONCAT(lehrfach,'-',lehrform) as topic,
+ '' as beschreibung,
+ string_agg(DISTINCT gruppe, '/') as gruppe,
+ string_agg(DISTINCT lektor, '/') as lektor,
+ ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+ FROM
+ (
+ SELECT
+ unr,datum, stunde,
+ 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 gruppe,
+ CASE
+ WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+ ELSE lektor
+ END as lektor,
+ ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+ FROM lehre.vw_stundenplan sp
+
+ WHERE ort_kurzbz = ?
+ AND datum >= ?
+ AND datum <= ?
+
+ ) as sp
+
+ GROUP BY
+
+ ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+ ORDER BY datum, stunde
+ ", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]);
+
+ return $gruppierteEvents;
+ }
+
+
+ /**
+ * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
+ * @param string $stundenplanViewQuery the subquery used to group the result
+ *
+ * @return stdClass
+ */
+ public function stundenplanGruppierung($stundenplanViewQuery)
+ {
+ $query_result = $this->execReadOnlyQuery("
+ 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 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,
+ 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
+ JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+
+ ) as subquery
+
+ GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+
+ ORDER BY datum, beginn
+ ");
+
+ return $query_result;
+ }
+
+ /**
+ * queries Stundenplan but for a whole lva, irrespective of who is requesting it
+ *
+ * @return void
+ */
+ public function getStundenplanLVA($start_date, $end_date, $lv_id) {
+ return $this->execReadOnlyQuery("
+
+ 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 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,
+ 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 (
+ SELECT sp.*
+ FROM lehre.vw_stundenplan sp
+ WHERE
+ sp.datum >= ?
+ AND sp.datum <= ? AND sp.lehrveranstaltung_id = ?
+ ) sp
+ JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+
+ ) as subquery
+
+ GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+
+ ORDER BY datum, beginn
+ ", [$start_date, $end_date, $lv_id]);
+ }
+
+ /**
+ * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
+ *
+ * @return void
+ */
+ public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
+ return $this->execReadOnlyQuery("
+
+ 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
+ JOIN public.tbl_mitarbeiter ON public.tbl_mitarbeiter.kurzbz = sp.mitarbeiter_kurzbz
+ WHERE mitarbeiter_uid = ?
+
+ ) as subquery
+
+ GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+
+ ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
+ }
+
+ /**
+ * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
+ *
+ * @return mixed
+ */
+ public function getStundenplanQuery($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){
+ $result = true;
+ $sem = array_keys($semester);
+ foreach($sem as $s){
+ if(count($toBeCheckedArray[$s]) > 0){
+ $result = false;
+ break;
+ }
+ }
+ return $result;
+ };
+
+ // if both the gruppen and the studentlehrverbaende are empty we early return
+ if($emptyCheck($gruppen) && $emptyCheck($studentlehrverbaende))
+ {
+ return false;
+ }
+
+ $query =
+ "select sp.*
+ from lehre.vw_stundenplan sp
+ WHERE
+ sp.datum >= ".$this->escape($start_date)."
+ AND sp.datum <= ".$this->escape($end_date);
+
+ // adds the AND sql chain only if both $gruppen and $studentlehrverbaende are not empty
+ if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
+ {
+ $query .= " AND ( ";
+ }
+
+ foreach($semester as $sem => $semester_date_range)
+ {
+
+ foreach($semester_date_range as $sem_date => $sem_date_range)
+ {
+ // if there are not groups for the semester skip the iteration step
+ if(!array_key_exists($sem_date,$gruppen) || count($gruppen[$sem_date]) == 0)
+ {
+ continue;
+ }
+ // converts the array of gruppen strings into a sql IN (_,_,_) chain
+ $query .="(sp.gruppe_kurzbz IN (" .implode(',',$gruppen[$sem_date]).") AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende)." )";
+
+ $query .="OR";
+ }
+ }
+
+ // if there are no studentlehrverbaende and the gruppen are not empty, we can remove the last OR added after the groups
+ if($emptyCheck($studentlehrverbaende) && !$emptyCheck($gruppen))
+ {
+ $query = substr($query, 0, -2);
+ }
+
+ foreach($semester as $sem=>$semester_date_range)
+ {
+ foreach($semester_date_range as $sem_date => $sem_date_range)
+ {
+ if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
+ {
+ continue;
+ }
+ foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
+ {
+ $query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
+ // Eintraege fuer den ganzen Verband
+ $query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
+ // Eintraege fuer das ganze Semester
+ $query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).") AND gruppe_kurzbz is null)";
+
+ $query .="OR";
+
+ }
+ }
+ }
+
+ // if the studentlehrverbaende is not empty we can remove the last OR that was added to the query
+ if(!$emptyCheck($studentlehrverbaende))
+ {
+ $query = substr($query, 0, -2);
+ }
+
+ // closes the AND sql chain only if it was opened previously
+ if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
+ {
+ $query .= ")";
+ }
+
+ return $query;
+ }
+
+ /**
+ * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific room within a date range.
+ * @param string $ort_kurzbz the ort from which we want to query the stundenplan events
+ * @param string $start_date (inclusive) the minimum date that an event should have to be fetched
+ * @param string $end_date (inclusive) the maximum date that an event should not extend to be fetched
+ *
+ * @return string
+ */
+ public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
+ {
+ return
+ "select sp.*
+ FROM lehre.vw_stundenplan sp
+ WHERE ort_kurzbz = ".$this->escape($ort_kurzbz)."
+ AND datum >= ".$this->escape($start_date)."
+ AND datum <= ".$this->escape($end_date);
+ }
+
+ /**
+ * @param string $uid
+ *
+ * @return stdClass
+ */
+ public function loadForUid($uid)
+ {
+ $this->addSelect(['sp.*','le.studiensemester_kurzbz']);
+ $this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
+ $this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
+ $this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
+ $this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum AND ss2.ende>=sp.datum', 'LEFT');
+ $this->db->join('lehre.tbl_lehreinheit le', 'le.lehreinheit_id=sp.lehreinheit_id', 'LEFT');
+ $this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
+ $this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
+
+ $query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
+
+ return $this->execQuery($query, [$uid, $uid]);
+ }
+
}
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index a498e209b..800540d60 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -12,6 +12,8 @@ class Stundenplandev_model extends DB_Model
$this->pk = 'stundenplandev_id';
}
+
+
public function getMissingDirectGroups($studiensemester_kurzbz = null)
{
$qry = "
diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index c397d8573..10f5a6aa1 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -13,5 +13,33 @@ class Stundensatz_model extends DB_Model
$this->pk = 'stundensatz_id';
$this->hasSequence = true;
}
-
+
+ public function getStundensatzByDatum($uid, $beginn, $ende = null, $typ = null)
+ {
+ $qry = "SELECT
+ *
+ FROM
+ hr.tbl_stundensatz
+ WHERE
+ uid = ?
+ AND (gueltig_bis >= ? OR gueltig_bis is null)";
+
+ $params = array($uid, $beginn);
+
+ if (!is_null($ende))
+ {
+ $qry .= " AND (gueltig_von <= ?)";
+ $params[] = $ende;
+ }
+
+ if (!is_null($typ))
+ {
+ $qry .= " AND stundensatztyp = ?";
+ $params[] = $typ;
+ }
+
+ $qry .= " ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1;";
+
+ return $this->execQuery($qry, $params);
+ }
}
\ No newline at end of file
diff --git a/application/models/system/Issue_model.php b/application/models/system/Issue_model.php
index ab1f9ba6e..331b0f050 100644
--- a/application/models/system/Issue_model.php
+++ b/application/models/system/Issue_model.php
@@ -22,13 +22,23 @@ class Issue_model extends DB_Model
*/
public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
{
- $params = array($fehlercodes);
+ $params = array();
// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
- $qry = 'SELECT issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz,
- behebung_parameter, datum, verarbeitetvon, verarbeitetamum
- FROM system.tbl_issue
- WHERE fehlercode IN ?
- AND verarbeitetamum IS NULL';
+ $qry = 'SELECT
+ iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
+ iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
+ iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
+ FROM
+ system.tbl_issue iss
+ JOIN system.tbl_fehler fe USING (fehlercode)
+ WHERE
+ verarbeitetamum IS NULL';
+
+ if (!isEmptyArray($fehlercodes))
+ {
+ $qry .= ' AND fehlercode IN ?';
+ $params[] = $fehlercodes;
+ }
if (!isEmptyString($fehlercode_extern))
{
@@ -59,7 +69,7 @@ class Issue_model extends DB_Model
* @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
* @return Object success with number of issues or error
*/
- public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
+ public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
{
$params = array($fehlercode);
// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
@@ -85,6 +95,19 @@ class Issue_model extends DB_Model
$params[] = $oe_kurzbz;
}
+ if (isset($behebung_parameter) && !isEmptyArray($behebung_parameter))
+ {
+ // convert array to JSON string for postgres
+ $behebung_parameter_string = json_encode($behebung_parameter);
+
+ if ($behebung_parameter_string)
+ {
+ // check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
+ $qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
+ $params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
+ }
+ }
+
return $this->execQuery($qry, $params);
}
}
diff --git a/application/models/system/Notiztyp_model.php b/application/models/system/Notiztyp_model.php
new file mode 100644
index 000000000..b173377e6
--- /dev/null
+++ b/application/models/system/Notiztyp_model.php
@@ -0,0 +1,14 @@
+dbTable = 'public.tbl_notiz_typ';
+ $this->pk = 'typ_kurzbz';
+ }
+}
diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
index d74d03243..1c7811f93 100644
--- a/application/models/system/Recipient_model.php
+++ b/application/models/system/Recipient_model.php
@@ -327,7 +327,7 @@ class Recipient_model extends DB_Model
pr.nachname,
ms.person_id,
mrou.token
- ORDER BY sent DESC';
+ ORDER BY sent DESC LIMIT 1500';
return $this->execQuery($sql, array($person_id, $functions, $person_id));
}
diff --git a/application/models/system/Sprache_model.php b/application/models/system/Sprache_model.php
index 202157a83..fb12b91e9 100644
--- a/application/models/system/Sprache_model.php
+++ b/application/models/system/Sprache_model.php
@@ -11,4 +11,19 @@ class Sprache_model extends DB_Model
$this->dbTable = 'public.tbl_sprache';
$this->pk = 'sprache';
}
+
+ /**
+ * @param array $sprachen
+ *
+ * @return stdClass
+ */
+ public function loadMultiple($sprachen)
+ {
+ $this->db->where_in('sprache', $sprachen);
+
+ $this->addOrder('index');
+
+ return $this->load();
+ }
+
}
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
index 875fc8876..bfa1dcd98 100644
--- a/application/models/system/Variable_model.php
+++ b/application/models/system/Variable_model.php
@@ -66,6 +66,15 @@ class Variable_model extends DB_Model
}
}
}
+
+ if (!isset($vardata['emailadressentrennzeichen']))
+ {
+ $vardata['emailadressentrennzeichen'] =
+ (defined('DEFAULT_EMAILADRESSENTRENNZEICHEN'))
+ ? DEFAULT_EMAILADRESSENTRENNZEICHEN
+ : ',';
+ }
+
$result = success($vardata);
}
diff --git a/application/models/system/Vorlagestudiengang_model.php b/application/models/system/Vorlagestudiengang_model.php
index 24af7353c..613d88226 100644
--- a/application/models/system/Vorlagestudiengang_model.php
+++ b/application/models/system/Vorlagestudiengang_model.php
@@ -11,4 +11,49 @@ class Vorlagestudiengang_model extends DB_Model
$this->dbTable = 'public.tbl_vorlagestudiengang';
$this->pk = 'vorlagestudiengang_id';
}
+
+ /**
+ * Gets the Current Vorlagestudiengang
+ *
+ * @param string $vorlage_kurzbz
+ * @param string $oe_kurzbz Or studiengang_kz
+ * @param integer $version (optional)
+ * @param boolean|null $active (optional)
+ *
+ * @return stdClass
+ */
+ public function getCurrent($vorlage_kurzbz, $oe_kurzbz, $version = null, $active = true)
+ {
+ if (is_numeric($oe_kurzbz)) {
+ $initselect = "SELECT oe_kurzbz, 1 AS l FROM public.tbl_studiengang WHERE studiengang_kz = " . $this->escape($oe_kurzbz);
+ } else {
+ $initselect = "SELECT oe_kurzbz, 1 AS l FROM public.tbl_organisationseinheit WHERE oe_kurzbz = " . $this->escape($oe_kurzbz);
+ }
+
+ $this->addJoin("(
+ WITH RECURSIVE tmp (oe_kurzbz, l) AS (
+ " . $initselect . "
+ UNION ALL
+ SELECT o.oe_parent_kurzbz AS oe_kurzbz, l+1 AS l
+ FROM tmp
+ JOIN public.tbl_organisationseinheit o USING (oe_kurzbz)
+ WHERE o.oe_parent_kurzbz IS NOT NULL
+ ) SELECT * FROM tmp
+ ) oe", "oe_kurzbz");
+
+ if (!is_null($version))
+ $this->db->where('version', $version);
+ if ($active)
+ $this->db->where('aktiv', true);
+
+ $this->addOrder('l', 'ASC');
+ $this->addOrder('version', 'DESC');
+ $this->addLimit(1);
+
+ $result = $this->loadWhere([
+ 'vorlage_kurzbz' => $vorlage_kurzbz
+ ]);
+
+ return $result;
+ }
}
diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index 2fdfcffe2..f81a2d518 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -31,9 +31,13 @@ class Dienstverhaeltnis_model extends DB_Model
org.bezeichnung oe_bezeichnung,
dv.von,
dv.bis,
+ dv.dvendegrund_kurzbz,
+ dv.dvendegrund_anmerkung,
dv.vertragsart_kurzbz,
dv.updateamum,
- dv.updatevon
+ dv.updatevon,
+ dv.dvendegrund_kurzbz,
+ dv.dvendegrund_anmerkung
FROM tbl_mitarbeiter
JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
JOIN tbl_person USING (person_id)
@@ -55,7 +59,14 @@ class Dienstverhaeltnis_model extends DB_Model
}
$qry .="
- ORDER BY dv.von desc
+ ORDER BY
+ CASE
+ WHEN (COALESCE(dv.bis, '2999-12-31'::date) - NOW()::date) < 0 THEN NULL
+ ELSE
+ (COALESCE(dv.bis, '2999-12-31'::date) - NOW()::date)
+ END ASC NULLS LAST,
+ COALESCE(dv.bis, '2999-12-31'::date) DESC,
+ dv.von DESC
";
return $this->execQuery($qry, $data);
diff --git a/application/models/vertragsbestandteil/GehaltsTyp_model.php b/application/models/vertragsbestandteil/GehaltsTyp_model.php
new file mode 100644
index 000000000..c933a3b38
--- /dev/null
+++ b/application/models/vertragsbestandteil/GehaltsTyp_model.php
@@ -0,0 +1,28 @@
+dbTable = 'hr.tbl_gehaltstyp';
+ $this->pk = 'gehaltstyp_kurzbz';
+ }
+
+ /**
+ * Gets Gehaltstyp for a Gehaltsbestandteil.
+ * @param int gehaltsbestandteil_id
+ * @return object the typ
+ */
+ public function getGehaltstypByGehaltsbestandteil($gehaltsbestandteil_id)
+ {
+ $gehaltsTyp = null;
+ $this->addJoin('hr.tbl_gehaltsbestandteil', 'gehaltstyp_kurzbz');
+ $result = $this->loadWhere(['gehaltsbestandteil_id' => $gehaltsbestandteil_id]);
+
+ if (hasData($result)) $gehaltsTyp = getData($result)[0];
+
+ return $gehaltsTyp;
+ }
+}
diff --git a/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php b/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
index e9006dfc0..c50627697 100644
--- a/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
@@ -33,41 +33,84 @@ class Gehaltsbestandteil_model extends DB_Model implements IEncryption
$datestring = $date->format("Y-m-d");
$qry = "
- SELECT
- gehaltsbestandteil_id,
- gbt.von,
- gbt.bis,
- gbt.anmerkung,
- gbt.dienstverhaeltnis_id,
- gehaltstyp_kurzbz,
- valorisierungssperre,
- gbt.valorisierung,
- grundbetrag as grund_betrag_decrypted,
- betrag_valorisiert as betrag_val_decrypted,
- gt.bezeichnung as gehaltstyp_bezeichnung,
- vb.vertragsbestandteiltyp_kurzbz,
- bf.funktion_kurzbz,
- bf.oe_kurzbz,
- fkt.beschreibung as fkt_beschreibung,
- fb.bezeichnung as fb_bezeichnung,
- org.bezeichnung as org_bezeichnung,
- freitext.freitexttyp_kurzbz,
- freitext.titel as freitext_titel
- FROM hr.tbl_gehaltsbestandteil gbt LEFT JOIN hr.tbl_gehaltstyp gt using(gehaltstyp_kurzbz)
- LEFT JOIN hr.tbl_vertragsbestandteil vb using(vertragsbestandteil_id)
- LEFT JOIN hr.tbl_vertragsbestandteil_funktion vbf using(vertragsbestandteil_id)
- LEFT JOIN public.tbl_benutzerfunktion bf using(benutzerfunktion_id)
- LEFT JOIN public.tbl_funktion fkt using(funktion_kurzbz)
- LEFT JOIN public.tbl_fachbereich fb using(fachbereich_kurzbz)
- LEFT JOIN public.tbl_organisationseinheit org on (bf.oe_kurzbz=org.oe_kurzbz)
- LEFT JOIN hr.tbl_vertragsbestandteil_freitext freitext on(vb.vertragsbestandteil_id=freitext.vertragsbestandteil_id)
- WHERE gbt.dienstverhaeltnis_id=? AND
- (gbt.von<=? and (gbt.bis is null OR gbt.bis>=?))
- ORDER BY gt.sort
+with gbt as (
+ select
+ gb.gehaltsbestandteil_id,
+ gb.von,
+ gb.bis,
+ gb.anmerkung,
+ gb.dienstverhaeltnis_id,
+ gb.gehaltstyp_kurzbz,
+ gb.valorisierungssperre,
+ gb.valorisierung,
+ gb.grundbetrag as grund_betrag_decrypted,
+ coalesce(vh.betrag_valorisiert, gb.grundbetrag) as betrag_val_decrypted,
+ gb.vertragsbestandteil_id
+ from
+ hr.tbl_gehaltsbestandteil gb
+ LEFT JOIN
+ hr.tbl_valorisierung_historie vh ON vh.gehaltsbestandteil_id = gb.gehaltsbestandteil_id AND vh.valorisierungsdatum = (
+ SELECT
+ vi.valorisierungsdatum
+ FROM
+ hr.tbl_valorisierung_instanz vi
+ JOIN
+ hr.tbl_dienstverhaeltnis d ON d.dienstverhaeltnis_id = ?
+ AND d.oe_kurzbz = vi.oe_kurzbz
+ WHERE
+ ? >= valorisierungsdatum
+ ORDER BY
+ valorisierungsdatum DESC
+ LIMIT 1
+ )
+ where
+ dienstverhaeltnis_id = ?
+ and (
+ ? BETWEEN COALESCE(von, '1970-01-01'::date) AND COALESCE(bis, '2170-01-01'::date)
+ )
+)
+select
+ gbt.gehaltsbestandteil_id,
+ gbt.von,
+ gbt.bis,
+ gbt.anmerkung,
+ gbt.dienstverhaeltnis_id,
+ gbt.gehaltstyp_kurzbz,
+ gbt.valorisierungssperre,
+ gbt.valorisierung,
+ gbt.grund_betrag_decrypted,
+ gbt.betrag_val_decrypted,
+ gt.bezeichnung as gehaltstyp_bezeichnung,
+ vb.vertragsbestandteiltyp_kurzbz,
+ bf.funktion_kurzbz,
+ bf.oe_kurzbz,
+ fkt.beschreibung as fkt_beschreibung,
+ fb.bezeichnung as fb_bezeichnung,
+ org.bezeichnung as org_bezeichnung,
+ freitext.freitexttyp_kurzbz,
+ freitext.titel as freitext_titel
+from
+ gbt
+LEFT JOIN
+ hr.tbl_gehaltstyp gt using(gehaltstyp_kurzbz)
+LEFT JOIN
+ hr.tbl_vertragsbestandteil vb using(vertragsbestandteil_id)
+LEFT JOIN
+ hr.tbl_vertragsbestandteil_funktion vbf using(vertragsbestandteil_id)
+LEFT JOIN
+ public.tbl_benutzerfunktion bf using(benutzerfunktion_id)
+LEFT JOIN
+ public.tbl_funktion fkt using(funktion_kurzbz)
+LEFT JOIN
+ public.tbl_fachbereich fb using(fachbereich_kurzbz)
+LEFT JOIN
+ public.tbl_organisationseinheit org on (bf.oe_kurzbz=org.oe_kurzbz)
+LEFT JOIN
+ hr.tbl_vertragsbestandteil_freitext freitext on(vb.vertragsbestandteil_id=freitext.vertragsbestandteil_id)
";
return $this->execQuery($qry,
- array($dienstverhaeltnis_id, $datestring, $datestring),
+ array($dienstverhaeltnis_id, $datestring, $dienstverhaeltnis_id, $datestring),
$this->getEncryptedColumns());
}
@@ -86,9 +129,38 @@ class Gehaltsbestandteil_model extends DB_Model implements IEncryption
array($dienstverhaeltnis_id),
$this->getEncryptedColumns());
}
-
- public function getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
+ public function getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null,
+ $includefuture=false, $withvalorisationhistory=true)
+ {
+ if( !is_null($stichtag) && (time() > strtotime($stichtag))
+ && $withvalorisationhistory !== false )
+ {
+ $query = $this->getGehaltsbestandteileMitValorisierungsHistorie(
+ $dienstverhaeltnis_id, $stichtag, $includefuture
+ );
+ }
+ else
+ {
+ $query = $this->getGehaltsbestandteileOhneValorisierungsHistorie(
+ $dienstverhaeltnis_id, $stichtag, $includefuture
+ );
+ }
+
+ $gehaltsbestandteile = array();
+ if( null !== ($rows = getData($query)) )
+ {
+ foreach( $rows as $row ) {
+ $tmpgb = new Gehaltsbestandteil();
+ $tmpgb->hydrateByStdClass($row, true);
+ $gehaltsbestandteile[] = $tmpgb;
+ }
+ }
+
+ return $gehaltsbestandteile;
+ }
+
+ protected function getGehaltsbestandteileOhneValorisierungsHistorie($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
{
$stichtagclause = '';
if( !is_null($stichtag) )
@@ -111,25 +183,145 @@ class Gehaltsbestandteil_model extends DB_Model implements IEncryption
{$stichtagclause}
EOSQL;
- $query = $this->loadWhere(
+ $result = $this->loadWhere(
$where,
$this->getEncryptedColumns()
);
+ return $result;
+ }
+
+ protected function getGehaltsbestandteileMitValorisierungsHistorie($dienstverhaeltnis_id, $stichtag, $includefuture=false)
+ {
+ $date = strftime('%Y-%m-%d', strtotime($stichtag));
+ $includefuture_clause = ($includefuture)
+ ? ' OR COALESCE(von, \'1970-01-01\'::date) > ' . $this->escape($date)
+ : '';
+ $sql = <<escape($dienstverhaeltnis_id)}
+ AND d.oe_kurzbz = vi.oe_kurzbz
+ WHERE
+ {$this->escape($date)} >= valorisierungsdatum
+ ORDER BY
+ valorisierungsdatum DESC
+ LIMIT 1
+ )
+WHERE
+ g.dienstverhaeltnis_id = {$this->escape($dienstverhaeltnis_id)}
+ AND (
+ {$this->escape($date)} BETWEEN COALESCE(von, '1970-01-01'::date) AND COALESCE(bis, '2170-01-01'::date)
+ {$includefuture_clause}
+ )
+EOSQL;
+
+ $result = $this->execReadOnlyQuery($sql, array(), $this->getEncryptedColumns());
+ return $result;
+ }
- $gehaltsbestandteile = array();
+ public function getGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
+ {
+ $stichtagclause = '';
+ if( !is_null($stichtag) )
+ {
+ $date = strftime('%Y-%m-%d', strtotime($stichtag));
+ $stichtagclause = 'AND (' . $this->escape($date)
+ . ' BETWEEN COALESCE(von, \'1970-01-01\'::date)'
+ . ' AND COALESCE(bis, \'2170-01-01\'::date)';
+ if( $includefuture )
+ {
+ $stichtagclause .= ' OR COALESCE(von, \'1970-01-01\'::date) > '
+ . $this->escape($date);
+ }
+ $stichtagclause .= ')';
+ }
+
+ // Note: replaced gb.betrag_valorisiert with vh.betrag_valorisiert!
+ $qry = "
+ SELECT
+ gb.gehaltsbestandteil_id,gb.dienstverhaeltnis_id,gb.vertragsbestandteil_id,gb.gehaltstyp_kurzbz,
+ gb.von,gb.bis,gb.anmerkung,gb.grundbetrag as grundbetrag,gb.valorisierungssperre,gb.insertamum,
+ gb.insertvon,gb.updateamum,gb.updatevon,gb.valorisierung,gb.auszahlungen,
+ vh.valorisierungsdatum, vh.betrag_valorisiert as betrag_valorisiert
+ FROM hr.tbl_gehaltsbestandteil gb LEFT JOIN hr.tbl_valorisierung_historie vh using (gehaltsbestandteil_id)
+ WHERE dienstverhaeltnis_id=?
+ $stichtagclause
+ ORDER BY gb.von,vh.valorisierungsdatum, gb.gehaltsbestandteil_id;
+ ";
+
+ $query = $this->execQuery($qry,
+ array($dienstverhaeltnis_id),
+ $this->getEncryptedColumns());
+
+ $gehaltsbestandteile = array();
if( null !== ($rows = getData($query)) )
{
+ // store for preserving the last records of every gehaltsbestandteil_id
+ $lastRecords = array();
+
foreach( $rows as $row ) {
$tmpgb = new Gehaltsbestandteil();
$tmpgb->hydrateByStdClass($row, true);
- $gehaltsbestandteile[] = $tmpgb;
+
+ // prevent duplication (caused by the join with historic values)
+ if (!isset($lastRecords[(string)$row->gehaltsbestandteil_id])) {
+ $gehaltsbestandteile[] = $tmpgb;
+ $lastRecords[(string)$row->gehaltsbestandteil_id] = $tmpgb;
+ }
+
+ if ($row->betrag_valorisiert != null && $row->valorisierungsdatum != null
+ && $row->valorisierungsdatum != $row->von && $row->valorisierungsdatum != $row->bis) {
+
+ // create additional row
+ $tmpgbv = new Gehaltsbestandteil();
+ $tmpgbv->hydrateByStdClass($row, true);
+ $tmpgbv->setVon($row->valorisierungsdatum);
+ $tmpgbv->setBis($lastRecords[(string)$row->gehaltsbestandteil_id]->getBis());
+ // overwrite Grundbetrag with the current valorized loan
+ // (otherwise the chart would show the wrong value)
+ $tmpgbv->setGrundbetrag($row->betrag_valorisiert);
+ $gehaltsbestandteile[] = $tmpgbv;
+
+ // finish previous
+ $daybefore = new DateTimeImmutable($row->valorisierungsdatum);
+ $daybefore = $daybefore->sub(new \DateInterval('P1D'));
+ $lastRecords[(string)$row->gehaltsbestandteil_id]->setBis($daybefore->format('Y-m-d'));
+
+ // preserve as last row, because there might be another valorization
+ $lastRecords[(string)$row->gehaltsbestandteil_id] = $tmpgbv;
+
+ }
+
}
}
return $gehaltsbestandteile;
}
-
public function getGehaltsbestandteil($id)
{
$this->addSelect('*');
diff --git a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
index 6d8c18859..cbc529d83 100644
--- a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
@@ -19,12 +19,17 @@ class Vertragsbestandteil_model extends DB_Model
protected function getVertragsbestandteilSQL()
{
+ $sapInstalled = $this->_checkIfSAPSyncTableExists();
+
+ $oe_kurzbz_sap = $sapInstalled ? 'sap.oe_kurzbz_sap' : 'NULL AS oe_kurzbz_sap';
+ $sap_join = $sapInstalled ? 'LEFT JOIN sync.tbl_sap_organisationsstruktur sap USING(oe_kurzbz)' : '';
+
$sql = <<overlappingvbs;
}
+
+ /**
+ * Checks if sap sync table exists.
+ * @return bool
+ */
+ private function _checkIfSAPSyncTableExists()
+ {
+ $params = array(
+ DB_NAME,
+ 'sync',
+ 'tbl_sap_organisationsstruktur'
+ );
+
+ $sql = "SELECT
+ 1 AS exists
+ FROM
+ information_schema.tables
+ WHERE
+ table_catalog = ? AND
+ table_schema = ? AND
+ table_name = ?";
+
+ $res = $this->execReadOnlyQuery($sql, $params);
+
+ return hasData($res);
+ }
}
diff --git a/application/views/Cis/Cms/News/Xml/Address/Detailed.php b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
new file mode 100644
index 000000000..934b5ba93
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
@@ -0,0 +1,11 @@
+aktiv) { ?>
+ uid; ?>]]>
+ titelpre . ' ' . $obj->vorname . ' ' . $obj->nachname . ' ' . $obj->titelpost; ?>]]>
+ alias ?: $obj->uid; ?>@]]>
+ telefonklappe !== null) { ?>
+ kontakt ?: ''; ?> - telefonklappe; ?>]]>
+
+ planbezeichnung) { ?>
+ planbezeichnung; ?>]]>
+
+
\ No newline at end of file
diff --git a/application/views/Cis/Cms/News/Xml/Address/Short.php b/application/views/Cis/Cms/News/Xml/Address/Short.php
new file mode 100644
index 000000000..61888fb7e
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/Address/Short.php
@@ -0,0 +1,6 @@
+aktiv) { ?>
+ uid; ?>]]>
+ uid; ?>@]]>
+
+ titelpre . ' ' . $obj->vorname . ' ' . $obj->nachname . ' ' . $obj->titelpost; ?>bezeichnung != '' && $obj->bezeichnung != $obj->beschreibung) echo ' (' . $obj->bezeichnung . ')'; ?>]]>
+
diff --git a/application/views/Cis/Cms/News/Xml/NewsExtras.php b/application/views/Cis/Cms/News/Xml/NewsExtras.php
new file mode 100644
index 000000000..b3b86e567
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/NewsExtras.php
@@ -0,0 +1,46 @@
+
+ studiengang_kz; ?>
+ p->t('global', 'studiengangsleitung'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?>
+
+ p->t('global', 'geschaeftsfuehrendeltg'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?>
+
+ p->t('global', 'stellvertreter'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?>
+
+ p->t('global', 'sekretariat'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?>
+
+
+ zusatzinfo_html; ?>]]>
+
+ p->t('global', 'hochschulvertretung'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?>
+
+
+ p->t('global', 'studentenvertreter'); ?> oe_kurzbz); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?>
+
+
+ p->t('global', 'jahrgangsvertretung'); ?> p->t('global', 'semester'); ?>]]>';
+
+ view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?>
+
+
+
+
+ p->t('global', 'allgemeinerdownload'); ?>]]>
+ typ . $studiengang->kurzbz); ?>]]>
+ kurzbzlang); ?>]]>
+ studiengang_kz; ?>]]>
+ ';
+
+
+
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
new file mode 100644
index 000000000..f34ce3fc1
--- /dev/null
+++ b/application/views/Cis/Documents.php
@@ -0,0 +1,212 @@
+ 'Documents',
+ 'tabulator5' => true,
+ 'customJSModules' => ['public/js/apps/Cis/Documents.js']
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Dokument |
+
+ Studiengang |
+
+ Studiensemester |
+ Sprache |
+ p->t('tools', 'vorlageWohnsitzfinanzamt'); ?> |
+
+
+
+ $this->p->t('global', 'deutsch'), 'StudienerfolgEng' => $this->p->t('global', 'englisch')] as $lang_xsl => $lang) { ?>
+
+
+
+
+
+ ; ?>) p->t('tools', 'studienerfolgsbestaetigung'); ?>
+
+ |
+
+ bezeichnung; ?> |
+
+ p->t('tools', 'alleStudiensemester'); ?> |
+ |
+ |
+
+ studiensemester as $stsem => $sem) { ?>
+
+ |
+
+ p->t('tools', 'studienerfolgsbestaetigung'); ?>
+
+ |
+
+ bezeichnung; ?> |
+
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Dokument |
+ Datum |
+
+
+
+
+
+ |
+
+ bezeichnung; ?>
+
+ | erstelltam))->format('d.m.Y'); ?> |
+
+
+
+
+
+
+
+
+
+
+ p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
+
+
+
+
+
+
+
+
+
+
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
new file mode 100644
index 000000000..f66ebf8a9
--- /dev/null
+++ b/application/views/Cis/Profil.php
@@ -0,0 +1,18 @@
+ 'Profil',
+ 'customJSModules' => ['public/js/apps/Cis/Profil.js'],
+ 'tabulator5' => true,
+ 'primevue3' => true,
+ 'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
+
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+
+
+
+
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
new file mode 100644
index 000000000..e797d436f
--- /dev/null
+++ b/application/views/Cis/ProfilUpdate.php
@@ -0,0 +1,49 @@
+ 'Profil Änderungen',
+ 'vue3' => true,
+ 'bootstrap5' => true,
+ 'fontawesome6'=> true,
+ 'axios027' => true,
+ 'tabulator5' => true,
+ 'customJSModules' => array(
+ 'public/js/apps/Cis/ProfilUpdateRequests.js'
+ ),
+ 'customCSSs' => array(
+ 'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'
+ )
+);
+
+if(defined("CIS4"))
+{
+ $this->load->view(
+ 'templates/CISVUE-Header',
+ $includesArray
+ );
+}
+else
+{
+ $this->load->view(
+ 'templates/FHC-Header',
+ $includesArray
+ );
+}
+?>
+
+
+
+load->view(
+ 'templates/CISVUE-Footer',
+ $includesArray
+ );
+} else {
+ $this->load->view(
+ 'templates/FHC-Footer',
+ $includesArray
+ );
+}
+?>
\ No newline at end of file
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
new file mode 100644
index 000000000..4590b210e
--- /dev/null
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -0,0 +1,41 @@
+ 'Cis4',
+ 'axios027' => true,
+ 'bootstrap5' => true,
+ 'fontawesome6' => true,
+ 'tabulator5' => true,
+ 'vue3' => true,
+ 'primevue3' => true,
+ 'customCSSs' => array(
+ 'public/css/components/verticalsplit.css',
+ 'public/css/components/searchbar/searchbar.css',
+ 'public/css/Fhc.css',
+ 'public/css/components/dashboard.css',
+ 'public/css/components/calendar.css',
+ 'public/css/components/Sprachen.css',
+ 'public/css/components/MyLv.css',
+ 'public/css/components/FilterComponent.css',
+ 'public/css/components/Profil.css',
+ 'public/css/components/FormUnderline.css',
+ 'public/css/Cis4/Cms.css',
+ ),
+ 'customJSs' => array(
+ 'vendor/npm-asset/primevue/accordion/accordion.js',
+ 'vendor/npm-asset/primevue/accordiontab/accordiontab.js'
+ ),
+ 'customJSModules' => array(
+ 'public/js/apps/Dashboard/Fhc.js'
+ ),
+
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+>
+
+
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 8993053b3..c10dc475a 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -34,8 +34,10 @@
!defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT,
- 'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? true : ZGV_DOKTOR_ANZEIGEN,
- 'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? true : ZGV_ERFUELLT_ANZEIGEN
+ //replaced by possibility to hide each formular field via config stv.php
+ #'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
+ #'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
+ 'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT
];
?>
diff --git a/application/views/codex/oehbeitrag.php b/application/views/codex/oehbeitrag.php
index feebeddef..ba99bbf0c 100644
--- a/application/views/codex/oehbeitrag.php
+++ b/application/views/codex/oehbeitrag.php
@@ -26,7 +26,6 @@ $this->load->view(
);
?>
-
widgetlib->widget('NavigationWidget'); ?>
@@ -63,6 +62,5 @@ $this->load->view(
-
load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 78a30b3e5..a255781f1 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -74,16 +74,23 @@ $saved = isset($saved) && $saved === true;
@@ -94,16 +101,23 @@ $saved = isset($saved) && $saved === true;
p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
load->view(
- 'templates/FHC-Footer',
- $sitesettings
-);
+
+if (defined('CIS4')) {
+ $this->load->view(
+ 'templates/CISVUE-Footer',
+ $sitesettings
+ );
+} else {
+ $this->load->view(
+ 'templates/FHC-Footer',
+ $sitesettings
+ );
+}
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 614af5d79..6d769dafe 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -17,10 +17,17 @@ $sitesettings = array(
)
);
-$this->load->view(
- 'templates/FHC-Header',
- $sitesettings
-);
+if(defined('CIS4')){
+ $this->load->view(
+ 'templates/CISVUE-Header',
+ $sitesettings
+ );
+}else{
+ $this->load->view(
+ 'templates/FHC-Header',
+ $sitesettings
+ );
+}
?>
@@ -150,8 +157,6 @@ $this->load->view(
break;
case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
$allowed = [
- Studierendenantragstatus_model::STATUS_APPROVED,
- Studierendenantragstatus_model::STATUS_OBJECTED,
Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
Studierendenantragstatus_model::STATUS_DEREGISTERED
];
@@ -223,7 +228,14 @@ $this->load->view(
load->view(
- 'templates/FHC-Footer',
- $sitesettings
-);
+if (defined('CIS4')) {
+ $this->load->view(
+ 'templates/CISVUE-Footer',
+ $sitesettings
+ );
+} else {
+ $this->load->view(
+ 'templates/FHC-Footer',
+ $sitesettings
+ );
+}
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index 2171d6928..e51cfd1bc 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -28,7 +28,7 @@ $this->load->view(
?>
-
; ?>){kind=logo}
+