diff --git a/Layout/default/TimerecordingCalendar/Index.php b/Layout/default/TimerecordingCalendar/Index.php index 502f4d150..ae9f2b5dd 100644 --- a/Layout/default/TimerecordingCalendar/Index.php +++ b/Layout/default/TimerecordingCalendar/Index.php @@ -223,16 +223,19 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"); } oldname = value.user.user; } - holidays.push({ - id: cindex, - backgroundColor: bgcolors[colorcount], - start: value.cstart.cstart, - end: value.cend.cend, - title: value.ccategory.ccategory + " " + value.user.user, - description: value.ccategory.ccategory + " " + value.user.user - }); + if (value.hourday.hourday!='5') { + holidays.push({ + id: cindex, + backgroundColor: bgcolors[colorcount], + start: value.cstart.cstart, + end: value.cend.cend, + title: value.ccategory.ccategory + " " + value.user.user, + description: value.ccategory.ccategory + " " + value.user.user + }); + cindex++; + } oldname = value.user.user; - cindex++; + }); var initialLocaleCode = 'en'; diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php index 6d97f26e3..91de31b94 100644 --- a/application/TimerecordingReport/TimerecordingReportController.php +++ b/application/TimerecordingReport/TimerecordingReportController.php @@ -319,6 +319,8 @@ class TimerecordingReportController extends mfBaseController 'category' => array('category' => $category, 'order' => $timerecording->timerecordingCategory->name), 'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment), 'edit' => array('edit' => $edit, 'order' => $edit), + 'hourday' => array('hourday' => $timerecording->timerecordingCategory->hourday, 'order' => $timerecording->timerecordingCategory->hourday), + ); } endforeach;