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

ZA anzeigen und syncen

Browse Source
This commit is contained in:
Gerald Raab
2015-04-16 11:21:09 +02:00
parent e1c6e97629
commit a753ec4d77
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/profile/urlaubsfreigabe.php
Regular → Executable
+2 -1
View File
@@ -69,7 +69,8 @@ $addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
// Wenn Seite fertig geladen ist Addons aufrufen
cis/private/profile/urlaubstool.php
Regular → Executable
+1 -1
View File
@@ -449,7 +449,7 @@ $addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
if(file_exists('./../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
cis/private/profile/zeitsperre_resturlaub.php
Regular → Executable
+1 -1
View File
@@ -86,7 +86,7 @@ $addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
if(file_exists('./../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
include/zeitsperre.class.php
+3 -3
View File
@@ -480,9 +480,9 @@ class zeitsperre extends basis_db
unset($this->result);
$this->result=array();
$qry = "select datum::date, freigabevon, zeitsperretyp_kurzbz
from (SELECT generate_series(vondatum::timestamp, bisdatum::timestamp, '1 day') as datum, freigabevon, mitarbeiter_uid, zeitsperretyp_kurzbz FROM campus.tbl_zeitsperre ) a
where a.mitarbeiter_uid = ".$this->db_add_param($uid)." and datum>(now() - interval '50 Days') and zeitsperretyp_kurzbz in ('Krank','Urlaub')";
$qry = "select datum::date, freigabevon, zeitsperretyp_kurzbz
from (SELECT generate_series(vondatum::timestamp, bisdatum::timestamp, '1 day') as datum, freigabevon, mitarbeiter_uid, zeitsperretyp_kurzbz FROM campus.tbl_zeitsperre where vonstunde is null and bisstunde is null) a
where a.mitarbeiter_uid = ".$this->db_add_param($uid)." and datum>(now() - interval '50 Days') and zeitsperretyp_kurzbz in ('Krank','Urlaub', 'ZA')";