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

sap projektnummer im export hinzugefuegt

Browse Source
This commit is contained in:
ma0048
2021-10-15 12:54:24 +02:00
parent 2bb357ccbd
commit 7805784214
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/projekt.class.php
+9 -3
View File
@@ -47,6 +47,7 @@ class projekt extends basis_db
public $farbe;
public $anzahl_ma; // integer
public $aufwand_pt; // integer
public $sap_project_id;
/**
@@ -420,27 +421,31 @@ class projekt extends basis_db
{
$projectList = array();
$qry = "SELECT DISTINCT
tbl_projekt.*
tbl_projekt.*, tbl_projects_timesheets_project.projects_timesheet_id
FROM
fue.tbl_ressource
JOIN fue.tbl_projekt_ressource USING(ressource_id)
JOIN fue.tbl_projekt USING(projekt_kurzbz)
LEFT JOIN sync.tbl_projects_timesheets_project USING(projekt_id)
WHERE (beginn<=now() or beginn is null)
AND (ende + interval '1 month 1 day' >=now() OR ende is null)
AND
(
mitarbeiter_uid=" . $this->db_add_param($mitarbeiter_uid) . " OR
student_uid=" . $this->db_add_param($mitarbeiter_uid) . "
)";
)
AND tbl_projects_timesheets_project.projektphase_id IS NULL
";
if ($projektphasen == true)
$qry .= "UNION
SELECT DISTINCT
tbl_projekt.*
tbl_projekt.*, tbl_projects_timesheets_project.projects_timesheet_id
FROM
fue.tbl_projektphase
JOIN fue.tbl_projekt USING (projekt_kurzbz)
LEFT JOIN sync.tbl_projects_timesheets_project USING(projektphase_id)
JOIN fue.tbl_projekt_ressource USING (projektphase_id)
JOIN fue.tbl_ressource ON (tbl_ressource.ressource_id=tbl_projekt_ressource.ressource_id)
WHERE
@@ -466,6 +471,7 @@ class projekt extends basis_db
$obj->beginn = $row->beginn;
$obj->ende = $row->ende;
$obj->oe_kurzbz = $row->oe_kurzbz;
$obj->sap_project_id = $row->projects_timesheet_id;
$this->result[] = $obj;