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

Korrektur Anzeige Projektphasen in Editview

Browse Source
This commit is contained in:
manu
2021-06-24 16:03:01 +02:00
parent e4d2b67369
commit ecd6cd466d
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/zeitaufzeichnung.php
+4 -4
View File
@@ -22,6 +22,7 @@
* Manfred Kindl <kindlm@technikum.wien.at>
* Gerald Raab <raab@technikum-wien.at>
* Alexei Karpenko <karpenko@technikum-wien.at>
* Manuela Thamer <manuela.thamer@technikum-wien.at>
*/
require_once('../../../config/cis.config.inc.php');
require_once('../../../include/functions.inc.php');
@@ -1100,11 +1101,10 @@ if (isset($_GET['type']) && $_GET['type']=='edit')
$service_id = $zeit->service_id;
$kunde_uid = $zeit->kunde_uid;
$projektphase = new projektphase();
$projektphasen = array();
if($projektphase->getProjektphasen($projekt_kurzbz))
if ($projektphase->getProjectphaseForMitarbeiterByKurzBz($uid, $projekt_kurzbz))
{
foreach ($projektphase->result as $row)
{
@@ -1115,7 +1115,7 @@ if (isset($_GET['type']) && $_GET['type']=='edit')
else
{
echo "<b>".$p->t("global/keineBerechtigungZumAendernDesDatensatzes")."</b>";
$zeitaufzeichnung_id='';
$zeitaufzeichnung_id = '';
}
}
}
cis/private/tools/zeitaufzeichnung_projektphasen.php
+24 -4
View File
@@ -1,4 +1,24 @@
<?php
/* Copyright (C) 2021 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Oliver Hacker <hacker@technikum-wien.at>
Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
Manuela Thamer <manuela.thamer@technikum-wien.at>
*/
require_once('../../../config/cis.config.inc.php');
require_once('../../../include/functions.inc.php');
@@ -33,7 +53,7 @@ if (isset($_GET['uid']) && $user != $_GET['uid'])
$datum_obj = new datum();
if(isset($_GET['projekt_kurzbz']))
if (isset($_GET['projekt_kurzbz']))
{
$projekt_kurzbz = $_GET['projekt_kurzbz'];
$projektphase = new projektphase();
@@ -49,12 +69,12 @@ if(isset($_GET['projekt_kurzbz']))
array_push($pp_user_ids, $pp_user->projektphase_id);
}
if($projektphase->getProjektphasen($projekt_kurzbz))
if ($projektphase->getProjektphasen($projekt_kurzbz))
{
$result_obj = array();
foreach($projektphase->result as $row)
foreach ($projektphase->result as $row)
{
if(in_array($row->projektphase_id, $pp_user_ids))
if (in_array($row->projektphase_id, $pp_user_ids))
{
$item['projektphase_id'] = $row->projektphase_id;
$item['bezeichnung'] = $row->bezeichnung;