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

- Dienstreisen werden bei Erstellung der zeitaufzeichnung Projektliste ignoriert

Browse Source
This commit is contained in:
alex
2018-10-03 10:04:55 +02:00
parent 597ed8a16e
commit fa75380fb4
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitaufzeichnung.class.php
+8 -1
View File
@@ -352,9 +352,10 @@ class zeitaufzeichnung extends basis_db
* @param $user
* @param $from startdatum als String in Form Y-m-d
* @param $to enddatum als String in Form Y-m-d
* @param $excluded_activities zu ignorierende Aktivitätstypen
* @return bool
*/
public function getListeUserFromTo($user, $from = null, $to = null)
public function getListeUserFromTo($user, $from = null, $to = null, $excluded_activities = null)
{
$where = "uid=".$this->db_add_param($user);
@@ -375,6 +376,12 @@ class zeitaufzeichnung extends basis_db
$where.= " AND ((start >= ".$this->db_add_param($from)."::DATE AND start <= ".$this->db_add_param($to)."::DATE)
OR (ende >= ".$this->db_add_param($from)."::DATE AND ende <= ".$this->db_add_param($to)."::DATE))";
if (!empty($excluded_activities))
{
$exactstring = is_array($excluded_activities) ? $this->db_implode4SQL($excluded_activities) : $this->db_add_param($excluded_activities);
$where .= " AND (aktivitaet_kurzbz NOT IN (" . $exactstring . ") OR aktivitaet_kurzbz IS NULL)";
}
$qry = "SELECT
*, to_char ((ende-start),'HH24:MI') as diff,
(SELECT (to_char(sum(ende-start),'DD')::integer)*24+to_char(sum(ende-start),'HH24')::integer || ':' || to_char(sum(ende-start),'MI')