X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FCalendar.class.php;h=447a45e02f5c6a1659dc6205713473b29ec99a47;hb=8a671525046655e057a15c6de9507834322b466d;hp=ab2dcf5738f634e20010a3112fa43c5e11381f18;hpb=cd5e077ecb497431decde4835138b877d63b261c;p=timetracker.git
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index ab2dcf57..447a45e0 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -57,18 +57,13 @@ class Calendar extends FormElement {
$this->highlight = $highlight;
}
- function localize($i18n) {
+ function localize() {
global $user;
+ global $i18n;
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
- if (is_array($i18n->holidays)) {
- foreach ($i18n->holidays as $fday) {
- $date_a = explode("/",$fday); // format mm/dd
- $this->holidays[] = mktime(0,0,0, $date_a[0], $date_a[1], date("Y"));// + 7200;
- }
- }
- $this->weekStartDay = $user->week_start;
+ $this->weekStartDay = $user->getWeekStart();
}
function setStyle($style) { $this->style = $style; }
@@ -131,6 +126,8 @@ class Calendar extends FormElement {
$str .= "
";
+ // TODO: refactor this entire class, as $weekend_start and $weekend_end
+ // are not what their names suggest (debug with non zero week start to see it).
$weekend_start = 6 - $this->weekStartDay; // Saturday by default.
$weekend_end = (7 - $this->weekStartDay) % 7; // Sunday by default.
if (defined('WEEKEND_START_DAY')) {
@@ -170,14 +167,11 @@ class Calendar extends FormElement {
$stl_cell = ' class="CalendarDay"';
}
- // holidays
- if ($this->showHolidays) {
- foreach ($this->holidays as $day) {
- if($day == $date) {
- $stl_cell = ' class="CalendarDayHoliday"';
- $stl_link = ' class="CalendarLinkHoliday"';
- }
- }
+ // holidays
+ $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
+ if (ttTimeHelper::isHoliday($date_to_check)) {
+ $stl_cell = ' class="CalendarDayHoliday"';
+ $stl_link = ' class="CalendarLinkHoliday"';
}
// selected day
@@ -204,7 +198,7 @@ class Calendar extends FormElement {
$str .= "
\n";
}
- $str .= "controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->getKey('label.today')." |
\n";
+ $str .= "controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')." |
\n";
$str .= "\n";
$str .= "controlName\" value=\"$indate\">\n";
@@ -257,7 +251,7 @@ class Calendar extends FormElement {
function _getActiveDates($start, $end) {
global $user;
- $user_id = $user->getActiveUser();
+ $user_id = $user->getUser();
$table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';