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

Renamed 'Meine Felder'-msg names and small method adaptation to retrieve fields

Browse Source 
Signed-off-by: Cris <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2020-05-28 09:42:51 +02:00
parent 046994f14b
commit 634401485a
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/MessageLib.php
+3 -3
View File
@@ -222,7 +222,7 @@ class MessageLib
public function getMessageVarsLoggedInUser()
{
// Retrieves message vars from view vw_msg_vars
$messageVars = $this->_ci->MessageModel->getMsgVarsDataLoggedInUser();
$messageVars = $this->_ci->MessageModel->getMsgVarsLoggedInUser();
if (isSuccess($messageVars)) // if everything is ok
{
$variablesArray = array();
@@ -231,8 +231,8 @@ class MessageLib
// Starts from 1 to skip the first element which is uid
for ($i = 1; $i < count($tmpVariablesArray); $i++)
{
$variablesArray['{my_'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}']
= 'my_'. strtoupper($tmpVariablesArray[$i]);
$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}']
= strtoupper($tmpVariablesArray[$i]);
}
return success($variablesArray);
application/models/system/Message_model.php
+17
View File
@@ -171,6 +171,23 @@ class Message_model extends DB_Model
return error($this->db->error(), FHC_DB_ERROR);
}
}
/**
* Get message variables for logged in user
*/
public function getMsgVarsLoggedInUser()
{
$result = $this->db->query('SELECT * FROM public.vw_msg_vars_user WHERE 0 = 1');
if ($result)
{
return success($result->list_fields());
}
else
{
return error($this->db->error(), FHC_DB_ERROR);
}
}
/**
* getMsgVarsDataByPrestudentId
system/dbupdate_3.3.php
+5 -5
View File
@@ -202,11 +202,11 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.vw_msg_vars_user LIMIT 1"))
$qry = '
CREATE OR REPLACE VIEW public.vw_msg_vars_user AS (
SELECT DISTINCT ON
(b.uid) b.uid,
p.vorname,
p.nachname,
b.alias,
ma.telefonklappe AS "durchwahl"
(b.uid) b.uid AS "my_uid",
p.vorname AS "my_vorname",
p.nachname AS "my_nachname",
b.alias AS "my_alias",
ma.telefonklappe AS "my_durchwahl"
FROM public.tbl_person p
JOIN public.tbl_benutzer b USING (person_id)
JOIN public.tbl_mitarbeiter ma ON ma.mitarbeiter_uid = b.uid