X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FCalendar.class.php;h=447a45e02f5c6a1659dc6205713473b29ec99a47;hb=8a671525046655e057a15c6de9507834322b466d;hp=a64a0359d0969221410fe7031d8afe4ebe093738;hpb=cb8e3de960b758147b34d8323054e7de70548619;p=timetracker.git diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php index a64a0359..447a45e0 100644 --- a/WEB-INF/lib/form/Calendar.class.php +++ b/WEB-INF/lib/form/Calendar.class.php @@ -44,36 +44,29 @@ class Calendar extends FormElement { var $controlName = ""; var $highlight = "time"; // Determines what type of active days to highlight ("time" or "expenses"). - // var $mAllDays = true; - var $cClassName = "Calendar"; function __construct($name) { - $this->controlName = $name; - $this->mMonthNames = array('January','February','March','April','May','June','July','August','September','October','November','December'); - $this->mWeekDayShortNames = array('Su','Mo','Tu','We','Th','Fr','Sa'); + $this->class = 'Calendar'; + $this->controlName = $name; // TODO: why controlName? Other classes have "name". + $this->mMonthNames = array('January','February','March','April','May','June','July','August','September','October','November','December'); + $this->mWeekDayShortNames = array('Su','Mo','Tu','We','Th','Fr','Sa'); } - + function setHighlight($highlight) { if ($highlight && $highlight != 'time') $this->highlight = $highlight; } - function setLocalization($i18n) { + function localize() { global $user; + global $i18n; - FormElement::setLocalization($i18n); - $this->mMonthNames = $i18n->monthNames; + $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->mStyle = $style; } + function setStyle($style) { $this->style = $style; } function setCellStyle($style) { $this->mCellStyle = $style; } function setACellStyle($style) { $this->mACellStyle = $style; } function setLinkStyle($style) { $this->mLinkStyle = $style; } @@ -93,8 +86,6 @@ class Calendar extends FormElement { $indate = $this->value; if (!$indate) $indate = strftime(DB_DATEFORMAT); - if (!$this->isRenderable()) return ""; - //current year and month if ( strlen ( $indate ) > 0 ) { $indateObj = new DateAndTime(DB_DATEFORMAT, $indate); @@ -135,6 +126,8 @@ class Calendar extends FormElement { $str .= "