mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-04 05:39:28 +00:00
Zeitumstellungsbugfixes
Im Semesterplan im Tempus wird die Woche 43 2x angezeigt und beginnt mit einem Sonntag
This commit is contained in:
@@ -141,10 +141,8 @@ define('MAIL_INTERNATIONAL_OUTGOING', 'invalid@technikum-wien.at');
|
||||
// ***** MOODLE *****
|
||||
// Moodle verwenden Ja/Nein
|
||||
define('MOODLE',true);
|
||||
// Pfad zum Moodle
|
||||
define('MOODLE_PATH','http://www.technikum-wien.at/moodle/');
|
||||
// Connection String fuer Moodle Datenbank (nur Posgresql)
|
||||
define("CONN_STRING_MOODLE","host=localhost dbname=bla user=bla password=bla");
|
||||
// Webservice TOKEN fuer Moodle 2.4
|
||||
define('MOODLE_TOKEN24','');
|
||||
|
||||
// ***** OPUS *****
|
||||
// Angaben fuer OPUS Schnittstelle
|
||||
|
||||
@@ -201,7 +201,7 @@ function kalenderwoche($datum)
|
||||
{
|
||||
//$woche=date("W",mktime($date[hours],$date[minutes],$date[seconds],$date[mon],$date[mday],$date[year]));
|
||||
if (!date("w",$datum))
|
||||
$datum+=86400;
|
||||
$datum=strtotime("+1 day",$datum);
|
||||
//echo date("l j.m.Y - W",$datum);
|
||||
$woche=date("W",$datum);
|
||||
//if ($woche==53)
|
||||
@@ -219,10 +219,16 @@ function montag($datum)
|
||||
$wt=date("w",$datum);
|
||||
// Sonntag?
|
||||
if (!$wt)
|
||||
$wt++;
|
||||
if($wt!=1)
|
||||
$datum-=86400*($wt-1);
|
||||
|
||||
{
|
||||
// Wenn es ein Sonntag ist, auf Montag springen
|
||||
$datum=strtotime('+1 day',$datum);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if($wt!=1)
|
||||
$datum-=86400*($wt-1);
|
||||
}
|
||||
return $datum;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!ENTITY window.title "Tempus">
|
||||
<!ENTITY window.version "2.0 vom 12.Feb.2007">
|
||||
<!ENTITY window.version "2.0">
|
||||
|
||||
|
||||
<!ENTITY menu-file.label "Datei">
|
||||
|
||||
+269
-813
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user