diff --git a/module/action/model.php b/module/action/model.php index 64d2ac9def..0aa57c4eec 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1082,13 +1082,13 @@ class actionModel extends model * @access public * @return array */ - public function buildDateGroup($actions, $direction = 'next') + public function buildDateGroup($actions, $direction = 'next', $type = 'today') { $dateGroup = array(); foreach($actions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = date(DT_DATE4, $timeStamp); + $date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } @@ -1103,7 +1103,7 @@ class actionModel extends model foreach($lastDateActions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = date(DT_DATE4, $timeStamp); + $date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } diff --git a/module/company/control.php b/module/company/control.php index e3633a5e63..4c1c107308 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -243,7 +243,7 @@ class company extends control $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->param = $param; - $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType); $this->view->direction = $direction; $this->display(); } diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index 7857018ad7..0beed2ab9c 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -17,3 +17,4 @@ .dynamic.collapsed .timeline {max-height: 58px;} .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; } +.margin-l-50px {margin-left: 50px;} diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 3ee42be80f..a2465c1753 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -41,14 +41,14 @@ $actions):?>
-
+
action->dynamic->today;?>
-