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

adds more phrasen to the profil and the profilUpdate views, headers of tables phrasen

Browse Source
This commit is contained in:
SimonGschnell
2024-04-19 14:24:32 +02:00
parent 4bb9c61168
commit 1447a930d3
6 changed files with 576 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/Profil.php
+12 -12
View File
@@ -46,7 +46,7 @@ class Profil extends Auth_Controller
// -----------------------------------------------------------------------------------------------------------------
// Public methods
/**
* index loads the Profil view
@@ -142,12 +142,12 @@ class Profil extends Auth_Controller
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){
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");
show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
}
$isMitarbeiter = getData($isMitarbeiter);
if ($isMitarbeiter) {
@@ -161,19 +161,19 @@ class Profil extends Auth_Controller
}
}
// UID is availabe when accessing Profil/View/:uid
else{
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);
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");
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");
show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
}
$isMitarbeiter = getData($isMitarbeiter);
if ($isMitarbeiter) {
@@ -262,7 +262,7 @@ class Profil extends Auth_Controller
} else {
echo json_encode(error("Nation was not 'A' (Austria)"));
}
}
}
// -----------------------------------------------------------------------------------------------------------------
@@ -630,7 +630,7 @@ class Profil extends Auth_Controller
$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;
}
application/controllers/Cis/ProfilUpdate.php
+1 -4
View File
@@ -34,9 +34,6 @@ class ProfilUpdate extends Auth_Controller
'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
'getStatus' => ['student/anrechnung_beantragen:r', 'user:r'],
'getTopic' => ['student/anrechnung_beantragen:r', 'user:r'],
]);
@@ -599,7 +596,7 @@ class ProfilUpdate extends Auth_Controller
$topic = "nachname";
break;
default:
show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error',[$topic]));
show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
return;
}
application/models/person/Profil_update_model.php
+23 -11
View File
@@ -25,6 +25,7 @@ class Profil_update_model extends DB_Model
*
* @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';
@@ -40,8 +41,9 @@ class Profil_update_model extends DB_Model
* {dms_id:123 , name:"test"}
*
* @param boolean $profil_update_id primary key of the profil update request
* @return Array
* @return array
*/
//TODO: function wird nicht verwendet
public function getFilesFromChangeRequest($profil_update_id)
{
$this->addSelect(["requested_change"]);
@@ -62,25 +64,27 @@ class Profil_update_model extends DB_Model
$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)){
if (isError($res)) {
return $res;
}
if(hasData($res)){
if (hasData($res)) {
foreach (getData($res) as $request) {
$this->formatProfilRequest($request);
}
}
return $res;
}
/**
* getProfilUpdateWithPermission
*
* getProfilUpdate
* returns a profil update with id
* returns all profil updates if id is set to null
* 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)
{
@@ -88,8 +92,8 @@ class Profil_update_model extends DB_Model
$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());
$lang = "select index from public.tbl_sprache where sprache =" . $this->escape(getUserLanguage());
$res = [];
if ($studentBerechtigung) {
@@ -99,7 +103,7 @@ class Profil_update_model extends DB_Model
$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
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
@@ -125,7 +129,7 @@ class Profil_update_model extends DB_Model
}
}
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->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');
@@ -149,6 +153,14 @@ class Profil_update_model extends DB_Model
}
/**
* 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);