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

fix bug for empty projekt and projektphasen

Browse Source
This commit is contained in:
OliiverHacker
2020-09-23 12:45:00 +02:00
parent ad98fed84b
commit 85c6aa08fc
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/projekt.class.php
+5 -2
View File
@@ -523,6 +523,8 @@ class projekt extends basis_db
*/
public function checkProjectInCorrectTime($projekt_kurzbz, $give_project_start, $give_projekt_ende)
{
if(empty($projekt_kurzbz))
return true;
try
{
$projekt = $this->getProjectByKurzbz($projekt_kurzbz);
@@ -546,7 +548,7 @@ class projekt extends basis_db
}
catch (Exception $e)
{
error_log('Exception abgefangen: ', $e->getMessage(), "\n");
error_log('Exception abgefangen: ', $e->getMessage(), "\n");
}
}
@@ -554,7 +556,8 @@ class projekt extends basis_db
{
$qry = "SELECT * FROM fue.tbl_projekt
WHERE projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
if ($result = $this->db_query($qry)) {
if ($result = $this->db_query($qry))
{
$row = $this->db_fetch_object($result);
$obj = new projekt();
include/projektphase.class.php
+14 -12
View File
@@ -581,25 +581,27 @@ public function getFortschritt($projektphase_id)
public function checkProjectphaseInCorrectTime($projektphase_id, $given_projectphase_start, $given_projektphase_ende)
{
if(empty($projektphase_id))
return true;
try
{
$projektphase = $this->getProjectphaseById($projektphase_id);
if(strtotime($projektphase->start))
{
$projektphase_start = date('Y-m-d', strtotime($projektphase->start));
}
{
$projektphase_start = date('Y-m-d', strtotime($projektphase->start));
}
else
{
$projektphase_start = NULL;
}
{
$projektphase_start = NULL;
}
if(strtotime($projektphase->ende))
{
$projektphase_ende = date('Y-m-d', strtotime($projektphase->ende));
}
{
$projektphase_ende = date('Y-m-d', strtotime($projektphase->ende));
}
else
{
$projektphase_ende = NULL;
}
{
$projektphase_ende = NULL;
}
$given_start = date('Y-m-d', strtotime($given_projectphase_start));
$given_ende = date('Y-m-d', strtotime($given_projektphase_ende));