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

Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen

Browse Source
This commit is contained in:
Andreas Österreicher
2023-04-27 09:57:40 +02:00
parent 8eb423414a 5519f6af57
commit a528018761
35 changed files with 1820 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/projektphase.class.php
+4 -4
View File
@@ -718,10 +718,10 @@ class projektphase extends basis_db
(
(
(tbl_projekt.beginn<=now() or tbl_projekt.beginn is null)
AND (tbl_projekt.ende + interval '1 month 1 day' >=now() OR tbl_projekt.ende is null)
AND (tbl_projekt.ende + interval '7 month 1 day' >=now() OR tbl_projekt.ende is null)
) AND (
(tbl_projektphase.start<=now() or tbl_projektphase.start is null)
AND (tbl_projektphase.ende + interval '1 month 1 day' >=now() OR tbl_projektphase.ende is null)
AND (tbl_projektphase.ende + interval '7 month 1 day' >=now() OR tbl_projektphase.ende is null)
)
)
AND mitarbeiter_uid=" . $this->db_add_param($mitarbeiter_uid);
@@ -787,10 +787,10 @@ class projektphase extends basis_db
(
(
(tbl_projekt.beginn<=now() or tbl_projekt.beginn is null)
AND (tbl_projekt.ende + interval '1 month 1 day' >=now() OR tbl_projekt.ende is null)
AND (tbl_projekt.ende + interval '7 month 1 day' >=now() OR tbl_projekt.ende is null)
) AND (
(tbl_projektphase.start<=now() or tbl_projektphase.start is null)
AND (tbl_projektphase.ende + interval '1 month 1 day' >=now() OR tbl_projektphase.ende is null)
AND (tbl_projektphase.ende + interval '7 month 1 day' >=now() OR tbl_projektphase.ende is null)
)
)
AND mitarbeiter_uid = ".$this->db_add_param($mitarbeiter_uid)."
include/statistik.class.php
+4 -2
View File
@@ -52,6 +52,7 @@ class statistik extends basis_db
// Daten der Statistik
public $data; // DB ressource
public $html;
public $countRows;
public $csv;
public $json;
@@ -510,6 +511,7 @@ class statistik extends basis_db
$this->html='';
$this->csv='';
$this->json=array();
$this->countRows=0;
set_time_limit(120);
if($this->sql!='')
@@ -572,6 +574,7 @@ class statistik extends basis_db
$this->json[] = $row;
$this->html.= '</tr>';
$this->csv=substr($this->csv,0,-1)."\n";
$this->countRows++;
}
$this->html.= '</tbody>';
}
@@ -586,8 +589,7 @@ class statistik extends basis_db
function getHtmlTable($id, $class='')
{
return '<table class="'.$class.'" id="'.$id.'">'.$this->html.'</table>';
return '<p>'.$this->countRows.' Zeilen</p><table class="'.$class.'" id="'.$id.'">'.$this->html.'</table>';
}
function getCSV()