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

backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch

Browse Source
This commit is contained in:
Harald Bamberger
2024-07-01 14:12:48 +02:00
parent eb327c3adc
commit dd0bdddbc6
6 changed files with 507 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/ressource/Betriebsmittel_model.php
+1 -1
View File
@@ -17,7 +17,7 @@ class Betriebsmittel_model extends DB_Model
*/
public function loadInventarliste($filter)
{
$filter = strtoLower($filter);
$filter = urldecode(strtoLower($filter));
$qry = "
SELECT
application/models/ressource/Betriebsmittelperson_model.php
+2 -2
View File
@@ -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':
@@ -115,7 +115,7 @@ class Betriebsmittelperson_model extends DB_Model
$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, 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.nummer2
FROM
wawi.tbl_betriebsmittelperson bmp
JOIN