blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replacement of call check_infrastruktur by check of right "servicezeitaufzeichnung", input fields, Uebersichtstabelle and CSV export show only fields for Infrastruktur if user has the right, projects are shown after their end + 1 month + 1 day.

Browse Source
This commit is contained in:
alex
2017-11-03 10:32:13 +01:00
parent 27879509ef
commit 3d2df79c6d
3 changed files with 81 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/projekt.class.php
+3 -3
View File
@@ -374,7 +374,7 @@ class projekt extends basis_db
JOIN fue.tbl_projekt_ressource USING(ressource_id)
JOIN fue.tbl_projekt USING(projekt_kurzbz)
WHERE (beginn<=now() or beginn is null)
AND (ende + interval '1' day >=now() OR ende is null)
AND (ende + interval '1 month 1 day' >=now() OR ende is null)
AND mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid);
if ($projektphasen == true)
@@ -391,10 +391,10 @@ class projekt extends basis_db
(
(
(tbl_projekt.beginn<=now() or tbl_projekt.beginn is null)
AND (tbl_projekt.ende + interval '1' day >=now() OR tbl_projekt.ende is null)
AND (tbl_projekt.ende + interval '1 month 1 day' >=now() OR tbl_projekt.ende is null)
) OR (
(tbl_projektphase.start<=now() or tbl_projektphase.start is null)
AND (tbl_projektphase.ende + interval '1' day >=now() OR tbl_projektphase.ende is null)
AND (tbl_projektphase.ende + interval '1 month 1 day' >=now() OR tbl_projektphase.ende is null)
)
)
AND mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid);