From 7cf2f42078a68d61b114bf337ed90ea1bbe80df9 Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 20 Apr 2018 12:09:19 +0800 Subject: [PATCH 1/3] * Refact detail page of todo. --- module/block/view/admin.html.php | 2 +- module/block/view/dashboard.html.php | 16 +-- module/block/view/todoblock.html.php | 11 +- module/my/view/editprofile.html.php | 176 ++++++++++++------------- module/todo/css/edit.css | 2 + module/todo/css/view.css | 2 + module/todo/view/edit.html.php | 16 ++- module/todo/view/view.html.php | 187 ++++++++++++++------------- 8 files changed, 207 insertions(+), 205 deletions(-) diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 463eeff3e5..01a89a8f14 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -39,7 +39,7 @@ include '../../common/view/chosen.html.php';
-   +
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index c6914f3efb..7a2741cec9 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -38,14 +38,14 @@ $useGuest = $this->app->user->account == 'guest'; @@ -78,14 +78,14 @@ $useGuest = $this->app->user->account == 'guest'; diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index e508e91628..4d834d0737 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -25,10 +25,10 @@
-
+
- - + +
@@ -47,8 +47,9 @@
-
- +
+ +
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 3fb047d226..1f250130a9 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -18,99 +18,91 @@

my->editProfile;?>

-
- my->form->lblBasic;?> - - - - - - - - - - - - - - - - - -
user->realname;?>realname, "class='form-control' autocomplete='off'");?>user->email;?>email, "class='form-control' autocomplete='off'");?>
user->gender;?>user->genderList, $user->gender);?>user->birthyear;?>birthday,"class='form-date form-control' autocomplete='off'");?>
user->join;?> - join);?> - join);?> -
-
-
- my->form->lblAccount;?> - - - - - - - - - - +
user->account;?>account, "class='form-control' readonly='readonly' autocomplete='off'");?>user->commiter;?>commiter, "class='form-control' autocomplete='off'");?>
user->password;?> - - - safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> - - + + + + + + + + + + + + + + + + + - - - -
my->form->lblBasic;?>
user->realname;?>realname, "class='form-control' autocomplete='off'");?>user->email;?>email, "class='form-control' autocomplete='off'");?>
user->gender;?>user->genderList, $user->gender);?>user->birthyear;?>birthday,"class='form-date form-control' autocomplete='off'");?>
user->join;?> + join);?> + join);?> user->password2;?>
- -
- my->form->lblContact;?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
user->skype;?>skype, "class='form-control' autocomplete='off'");?>user->qq;?>qq, "class='form-control' autocomplete='off'");?>
user->yahoo;?>yahoo, "class='form-control' autocomplete='off'");?>user->gtalk;?>gtalk, "class='form-control' autocomplete='off'");?>
user->wangwang;?>wangwang, "class='form-control' autocomplete='off'");?>user->mobile;?>mobile, "class='form-control' autocomplete='off'");?>
user->phone;?>phone, "class='form-control' autocomplete='off'");?>user->address;?>address, "class='form-control' autocomplete='off'");?>
user->zipcode;?>zipcode, "class='form-control' autocomplete='off'");?>
-
-
- user->verify;?> - - - - - -
user->verifyPassword;?> -
- user->placeholder->verify}'");?> -
-
+
+ + + + + + + + + + + + + + +
my->form->lblAccount;?>
user->account;?>account, "class='form-control' readonly='readonly' autocomplete='off'");?>user->commiter;?>commiter, "class='form-control' autocomplete='off'");?>
user->password;?> + + + safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> + + + user->password2;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
my->form->lblContact;?>
user->skype;?>skype, "class='form-control' autocomplete='off'");?>user->qq;?>qq, "class='form-control' autocomplete='off'");?>
user->yahoo;?>yahoo, "class='form-control' autocomplete='off'");?>user->gtalk;?>gtalk, "class='form-control' autocomplete='off'");?>
user->wangwang;?>wangwang, "class='form-control' autocomplete='off'");?>user->mobile;?>mobile, "class='form-control' autocomplete='off'");?>
user->phone;?>phone, "class='form-control' autocomplete='off'");?>user->address;?>address, "class='form-control' autocomplete='off'");?>
user->zipcode;?>zipcode, "class='form-control' autocomplete='off'");?>
+ + + + + + +
user->verify;?>
user->verifyPassword;?> +
+ user->placeholder->verify}'");?> +
diff --git a/module/todo/css/edit.css b/module/todo/css/edit.css index e69de29bb2..f0de69d394 100644 --- a/module/todo/css/edit.css +++ b/module/todo/css/edit.css @@ -0,0 +1,2 @@ +.todoType {margin-top: 6px;} +.dateSwitcher {margin-top: 6px;} diff --git a/module/todo/css/view.css b/module/todo/css/view.css index aff5b64dc7..0873d4764f 100644 --- a/module/todo/css/view.css +++ b/module/todo/css/view.css @@ -1 +1,3 @@ #wrap .outer>table#actionbox>caption {margin-top:0px;} +.table-data tbody > tr > th {width: 80px;} +.modal-footer {text-align: center;} diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index 138735f527..5b90b3dc31 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -78,7 +78,7 @@
-
+
todo->typeList[$todo->type];?>
@@ -109,7 +109,7 @@
- todo->statusList, $todo->status, "class='form-control chosen'");?> + todo->statusList, $todo->status, "class='form-control'");?>
@@ -121,15 +121,19 @@ end, 'class="form-control chosen"');?>
- begin == 2400) echo 'checked';?> > - +
+ begin == 2400) echo 'checked';?> > + +
- private) echo 'checked';?> /> - +
+ private) echo 'checked';?> /> + +
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 4ff5808fc0..798851f151 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -13,117 +13,118 @@ private or ($todo->private and $todo->account == $app->user->account)):?> -
-
-
- icons['todo']);?> id;?> - name;?> -
+
+
+

createLink('todo', 'view', 'todo=' . $todo->id), "TODO #{$todo->id} {$todo->name}");?>

-
-
-
-
- +
+
+
+
+
todo->desc; if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue); if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue); if($todo->type == 'story') echo html::a($this->createLink('story', 'view', "id={$todo->idvalue}"), ' STORY#' . $todo->idvalue); ?> - -
desc;?>
-
- +
+
desc;?>
+
+
-
-
-
- todo->legendBasic;?> - - - - - - - - - - - - - - - - - - - - - - - - - - assignedTo)):?> - - - - - - - - - -
todo->pri;?>todo->priList[$todo->pri];?>
todo->status;?>todo->statusList[$todo->status];?>
todo->type;?>todo->typeList[$todo->type];?>
todo->account;?>account);?>
todo->date;?>date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?>
todo->beginAndEnd;?>begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?>
todo->assignTo;?>assignedTo;?>
todo->assignTo . $lang->todo->date;?>assignedDate;?>
-
+
+
+
+
todo->legendBasic;?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + assignedTo)):?> + + + + + + + + + +
todo->pri;?>todo->priList[$todo->pri];?>
todo->status;?>todo->statusList[$todo->status];?>
todo->type;?>todo->typeList[$todo->type];?>
todo->account;?>account);?>
todo->date;?>date == '20300101' ? $lang->todo->periods['future'] : formatTime($todo->date);?>
todo->beginAndEnd;?>begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?>
todo->assignTo;?>assignedTo;?>
todo->assignTo . $lang->todo->date;?>assignedDate, DT_DATE1);?>
+
+
cycle):?> config = json_decode($todo->config);?> -
- todo->cycle;?> - - - - - - - - - -
todo->beginAndEnd?>config->begin . " ~ " . $todo->config->end;?>
todo->cycleConfig?> - config->type == 'day') - { - echo $lang->todo->every . $todo->config->day . $lang->day; - } - elseif($todo->config->type == 'week') - { - foreach(explode(',', $todo->config->week) as $week) echo $lang->todo->dayNames[$week] . ' '; - } - elseif($todo->config->type == 'month') - { - foreach(explode(',', $todo->config->month) as $month) echo $month . ' '; - } - echo '
'; - if($todo->config->beforeDays) printf($lang->todo->lblBeforeDays, $todo->config->beforeDays); - ?> -
-
+
+
todo->cycle;?>
+
+ + + + + + + + + +
todo->beginAndEnd?>config->begin . " ~ " . $todo->config->end;?>
todo->cycleConfig?> + config->type == 'day') + { + echo $lang->todo->every . $todo->config->day . $lang->day; + } + elseif($todo->config->type == 'week') + { + foreach(explode(',', $todo->config->week) as $week) echo $lang->todo->dayNames[$week] . ' '; + } + elseif($todo->config->type == 'month') + { + foreach(explode(',', $todo->config->month) as $month) echo $month . ' '; + } + echo '
'; + if($todo->config->beforeDays) printf($lang->todo->lblBeforeDays, $todo->config->beforeDays); + ?> +
+
+
-
+
account == $app->user->account) { - if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), " " . $lang->todo->edit, '', "class='btn showinonlybody'"); - if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), " " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'"); - if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), " " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'"); - echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), " " . $lang->todo->delete, 'hiddenwin', "class='btn showinonlybody'"); + if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), "", '', "title='{$lang->todo->edit}' class='btn showinonlybody'"); + if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'"); + if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'"); + echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'"); - echo html::a('#commentBox', '', '', "title='$lang->comment' onclick='setComment()' class='btn'"); + echo html::a('#commentBox', '', '', "title='{$lang->comment}' onclick='setComment()' class='btn'"); } if($this->session->todoList) @@ -142,7 +143,7 @@ if($todo->status != 'done' && $todo->status != 'closed') { echo "
"; - echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), " " . $lang->todo->finish, 'hiddenwin', "class='btn showinonlybody btn-success'"); + echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'"); $createStoryPriv = common::hasPriv('story', 'create'); $createTaskPriv = common::hasPriv('task', 'create'); $createBugPriv = common::hasPriv('bug', 'create'); From 4524f89c2145d2e4acb5286da70d6f7238672c9b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 20 Apr 2018 13:00:35 +0800 Subject: [PATCH 2/3] * finish task #3838. --- module/action/model.php | 54 +++++++++- module/company/control.php | 16 +-- module/company/css/dynamic.css | 27 +++-- module/company/view/dynamic.html.php | 143 ++++++++++++++++---------- module/my/control.php | 15 ++- module/my/view/dynamic.html.php | 46 ++++++++- module/product/control.php | 14 +-- module/product/view/dynamic.html.php | 48 ++++++++- module/project/control.php | 27 +++-- module/project/css/dynamic.css | 28 ++++-- module/project/view/dynamic.html.php | 145 ++++++++++++++++----------- module/story/config.php | 2 +- 12 files changed, 397 insertions(+), 168 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index a366968bd0..c933e90787 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -560,16 +560,19 @@ class actionModel extends model * @param object $pager * @param string|int $productID all|int(like 123)|notzero all => include zeror, notzero, great than 0 * @param string|int $projectID same as productID + * @param string $date + * @param string $direction * @access public * @return array */ - public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $productID = 'all', $projectID = 'all') + public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $productID = 'all', $projectID = 'all', $date = '', $direction = 'next') { /* Computer the begin and end date of a period. */ $beginAndEnd = $this->computeBeginAndEnd($period); extract($beginAndEnd); /* Build has priv condition. */ + $condition = 1; if($productID == 'all') $products = $this->loadModel('product')->getPairs(); if($projectID == 'all') $projects = $this->loadModel('project')->getPairs(); if($productID == 'all' or $projectID == 'all') @@ -594,6 +597,7 @@ class actionModel extends model ->where(1) ->beginIF($period != 'all')->andWhere('date')->gt($begin)->fi() ->beginIF($period != 'all')->andWhere('date')->lt($end)->fi() + ->beginIF($date)->andWhere('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'")->fi() ->beginIF($account != 'all')->andWhere('actor')->eq($account)->fi() ->beginIF(is_numeric($productID))->andWhere('product')->like("%,$productID,%")->fi() ->beginIF(is_numeric($projectID))->andWhere('project')->eq($projectID)->fi() @@ -605,6 +609,8 @@ class actionModel extends model ->orderBy($orderBy)->page($pager)->fetchAll(); if(!$actions) return array(); + + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action'); return $this->transformActions($actions); } @@ -616,10 +622,12 @@ class actionModel extends model * @param int $queryID * @param string $orderBy * @param object $pager + * @param string $date + * @param string $direction * @access public * @return array */ - public function getDynamicBySearch($products, $projects, $queryID, $orderBy = 'date_desc', $pager) + public function getDynamicBySearch($products, $projects, $queryID, $orderBy = 'date_desc', $pager = null, $date = '', $direction = 'next') { $query = $queryID ? $this->loadModel('search')->getQuery($queryID) : ''; @@ -662,7 +670,9 @@ class actionModel extends model $actionQuery = str_replace("`product` = '$productID'", "`product` LIKE '%,$productID,%'", $actionQuery); + if($date) $actionQuery = "($actionQuery) AND " . ('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'"); $actions = $this->getBySQL($actionQuery, $orderBy, $pager); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action'); if(!$actions) return array(); return $this->transformActions($actions); } @@ -980,10 +990,11 @@ class actionModel extends model * Build date group by actions * * @param array $actions + * @param string $direction * @access public * @return array */ - public function buildDateGroup($actions) + public function buildDateGroup($actions, $direction = 'next') { $dateGroup = array(); foreach($actions as $action) @@ -994,6 +1005,43 @@ class actionModel extends model $dateGroup[$date][] = $action; } + if($dateGroup) + { + $lastDateActions = $this->dao->select('*')->from(TABLE_ACTION)->where($this->session->actionQueryCondition)->andWhere('`date`')->like(substr($action->originalDate, 0, 10) . '%')->orderBy($this->session->actionOrderBy)->fetchAll('id'); + if(count($dateGroup[$date]) < count($lastDateActions)) + { + unset($dateGroup[$date]); + $lastDateActions = $this->transformActions($lastDateActions); + foreach($lastDateActions as $action) + { + $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); + $date = date(DT_DATE4, $timeStamp); + $action->time = date(DT_TIME2, $timeStamp); + $dateGroup[$date][] = $action; + } + } + } + + if($direction != 'next') $dateGroup = array_reverse($dateGroup); return $dateGroup; } + + /** + * Check Has pre or next. + * + * @param string $date + * @param string $direction + * @access public + * @return bool + */ + public function hasPreOrNext($date, $direction = 'next') + { + $condition = $this->session->actionQueryCondition; + /* Remove date condition for direction. */ + $condition = preg_replace("/AND +date[\<\>]'\d{4}\-\d{2}\-\d{2}'/", '', $condition); + $count = $this->dao->select('count(*) as count')->from(TABLE_ACTION)->where($condition) + ->andWhere('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'") + ->fetch('count'); + return $count > 0; + } } diff --git a/module/company/control.php b/module/company/control.php index 16b1472b80..43df49b69c 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -145,7 +145,7 @@ class company extends control * @access public * @return void */ - public function dynamic($browseType = 'today', $param = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next') { $this->company->setMenu(); $this->app->loadLang('user'); @@ -167,10 +167,11 @@ class company extends control /* Set the pager. */ $this->app->loadClass('pager', $static = true); - $pager = pager::init($recTotal, $recPerPage, $pageID); + $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; + $sort = $this->loadModel('common')->appendOrder($orderBy); /* Set the user and type. */ $account = $browseType == 'account' ? $param : 'all'; @@ -178,6 +179,7 @@ class company extends control $project = $browseType == 'project' ? $param : 'all'; $period = ($browseType == 'account' or $browseType == 'product' or $browseType == 'project') ? 'all' : $browseType; $queryID = ($browseType == 'bysearch') ? (int)$param : 0; + $date = empty($date) ? '' : date('Y-m-d', $date); /* Get products' list.*/ $products = $this->loadModel('product')->getPairs('nocode'); @@ -201,11 +203,11 @@ class company extends control /* Get actions. */ if($browseType != 'bysearch') { - $actions = $this->action->getDynamic($account, $period, $sort, $pager, $product, $project); + $actions = $this->action->getDynamic($account, $period, $sort, $pager, $product, $project, $date, $direction); } else { - $actions = $this->action->getDynamicBySearch($products, $projects, $queryID, $sort, $pager); + $actions = $this->action->getDynamicBySearch($products, $projects, $queryID, $sort, $pager, $date, $direction); } /* Build search form. */ @@ -229,10 +231,12 @@ class company extends control $this->view->product = $product; $this->view->project = $project; $this->view->queryID = $queryID; - $this->view->actions = $actions; $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->param = $param; + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); + $this->view->allCount = $this->action->getCount('all'); + $this->view->direction = $direction; $this->display(); } } diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index 36f0461eb2..f46372e157 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -1,7 +1,20 @@ -#featurebar ul.nav > li .chosen-container{height:20px;} -#featurebar ul.nav > li .chosen-container a.chosen-single{background:#F8FAFE; border:none; -webkit-box-shadow:none;box-shadow:none; font-size:14px;padding-top:0px;} -#featurebar ul.nav > li .chosen-container a.chosen-single div{top:-8px;} -#featurebar ul.nav > li.active .chosen-container a.chosen-single{font-weight:bold} -#featurebar ul.nav > li .chosen-container .chosen-drop {min-width: 300px;!important} -#featurebar .nav > li > .chosen-container-single{top:-1px!important} -#featurebar .nav > li > .chosen-container-single .chosen-single div{padding: 6px 22px!important} +#dynamics {padding: 10px 0;} +.dynamic {position: relative; padding-left: 170px;} +.dynamic-date {position: absolute; left: 0; top: 0; width: 150px; border: 2px solid #eee; border-radius: 4px; padding: 14px 20px; height: 58px;} +.dynamic-date:before {content: ' '; display: block; position: absolute; right: -22px; top: 26px; height: 2px; width: 20px; background-color: #eee;} +.dynamic-date > .date-label, +.dynamic-date > .date-text {font-size: 18px; display: block;} +.dynamic-date > .date-label + .date-text {font-size: 14px; line-height: 14px;} +.dynamic-date > .date-label {margin-top: -8px;} +.dynamic-date > .btn {position: absolute; right: 10px; top: 15px;} +.dynamic .timeline {border: 2px solid #eee; border-radius: 4px; margin-bottom: 20px; padding: 10px 20px 10px 100px; max-height: 800px; transition: max-height .2s; overflow: hidden;} +.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;} +.dynamic .timeline-text {color: #3C4353;} +.dynamic .text-muted {color: #838A9D;} +.dynamic .label-id {top: -1px;} +.dynamic.active .timeline, +.dynamic.active .dynamic-date {border-color: #00a9fc;} +.dynamic.active .dynamic-date:before {background-color: #00a9fc;} +.dynamic.collapsed .timeline {max-height: 58px;} +.dynamic.collapsed .timeline > li + li:after {display: none;} +.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d7';} diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 524b5739dc..bd57fcc688 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -11,60 +11,99 @@ */ ?> - -
-
    +
-
'>
+
+
+ config->global->flow != 'onlyTest'):?> +
+ + action->dynamic->search;?> +
- - - - recTotal}&recPerPage={$pager->recPerPage}";?> - - - - - - - - - - - objectType == 'case' ? 'testcase' : $action->objectType;?> - - - - - - - - - - - -
action->date);?> action->actor);?>action->action);?> action->objectType);?> idAB);?>action->objectName;?>
date;?> - actor]) ? $users[$action->actor] : $action->actor; - echo strpos($actor, ':') === false ? $actor : substr($actor, strpos($actor, ':') + 1); - ?> - actionLabel;?>action->objectTypes[$action->objectType];?>objectID;?>objectLink, $action->objectName);?>
show();?>
- +
+
'>
+
+ + $actions):?> + +
+
+ + action->dynamic->today;?> + + + +
+
    + + $action):?> + +
  • actor == $this->app->user->account) echo "class='active'";?>> +
    + time?> + + actor) . ' ' . $action->actionLabel;?> + objectLabel;?> + objectID;?> + objectLink, $action->objectName);?> + +
    +
    • + +
+
+ +
+ + originalDate) + 24 * 3600); + $lastDate = substr($action->originalDate, 0, 10); + $hasPre = $this->action->hasPreOrNext($firstDate, 'pre'); + $hasNext = $this->action->hasPreOrNext($lastDate, 'next'); + ?> + +
+
    + +
  • + recTotal}&date=" . strtotime($firstDate) . '&direction=pre'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • + +
  • + recTotal}&date=" . strtotime($lastDate) . '&direction=next'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • +
+
+ + +
+ diff --git a/module/my/control.php b/module/my/control.php index 7d345d8bca..550223e11b 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -533,7 +533,7 @@ class my extends control * @access public * @return void */ - public function dynamic($type = 'today', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 50, $pageID = 1) + public function dynamic($type = 'today', $recTotal = 0, $date = '', $direction = 'next') { /* Save session. */ $uri = $this->app->getURI(true); @@ -550,27 +550,26 @@ class my extends control /* Set the pager. */ $this->app->loadClass('pager', $static = true); - $pager = pager::init($recTotal, $recPerPage, $pageID); + $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1); /* Append id for secend sort. */ + $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; $sort = $this->loadModel('common')->appendOrder($orderBy); /* The header and position. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->dynamic; $this->view->position[] = $this->lang->my->dynamic; - $actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager); + $date = empty($date) ? '' : date('Y-m-d', $date); + $actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager, 'all', 'all', $date, $direction); /* Assign. */ $this->view->type = $type; - $this->view->recTotal = $recTotal; - $this->view->recPerPage = $recPerPage; - $this->view->pageID = $pageID; $this->view->orderBy = $orderBy; $this->view->pager = $pager; - $this->view->actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager); - $this->view->dateGroups = $this->action->buildDateGroup($actions); + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); $this->view->allCount = $this->action->getCount(); + $this->view->direction = $direction; $this->display(); } diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index dc30038e90..de99428d74 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -26,6 +26,7 @@
+ $actions):?>
@@ -37,15 +38,54 @@
    + $action):?> -
  • >
    time?>user->realname . ' ' . $action->actionLabel;?> objectLabel;?> objectID;?> objectLink, $action->objectName);?>
    • + +
  • actor == $this->app->user->account) echo "class='active'";?>> +
    + time?> + + user->realname . ' ' . $action->actionLabel;?> + objectLabel;?> + objectID;?> + objectLink, $action->objectName);?> + +
    +
- recTotal > $pager->recPerPage):?> -
show('right', 'pagerjs');?>
+ + originalDate) + 24 * 3600); + $lastDate = substr($action->originalDate, 0, 10); + $hasPre = $this->action->hasPreOrNext($firstDate, 'pre'); + $hasNext = $this->action->hasPreOrNext($lastDate, 'next'); + ?> + +
+
    + +
  • + recTotal}&date=" . strtotime($firstDate) . '&direction=pre'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • + +
  • + recTotal}&date=" . strtotime($lastDate) . '&direction=next'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • +
+
+
+
+
+ + $actions):?> + +
+
+ + action->dynamic->today;?> + + + +
+
    + + $action):?> + +
  • actor == $this->app->user->account) echo "class='active'";?>> +
    + time?> + + actor) . ' ' . $action->actionLabel;?> + objectLabel;?> + objectID;?> + objectLink, $action->objectName);?> + +
    +
    • + +
+
+ +
+ + originalDate) + 24 * 3600); + $lastDate = substr($action->originalDate, 0, 10); + $hasPre = $this->action->hasPreOrNext($firstDate, 'pre'); + $hasNext = $this->action->hasPreOrNext($lastDate, 'next'); + ?> + +
+
    + +
  • + recTotal}&date=" . strtotime($firstDate) . '&direction=pre'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • + +
  • + recTotal}&date=" . strtotime($lastDate) . '&direction=next'); + echo html::a($link, '', '', "class='pager-item'"); + ?> +
    • +
+
+ + +
+ diff --git a/module/story/config.php b/module/story/config.php index cc7e2ea343..f7d11e4e86 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -193,5 +193,5 @@ $config->story->datatable->fieldList['caseCount']['name'] = $lang->story->ca $config->story->datatable->fieldList['actions']['title'] = 'actions'; $config->story->datatable->fieldList['actions']['fixed'] = 'right'; -$config->story->datatable->fieldList['actions']['width'] = '156'; +$config->story->datatable->fieldList['actions']['width'] = '157'; $config->story->datatable->fieldList['actions']['required'] = 'yes'; From 52e0a63267e067caef8d2ccd4fd2e179b466cd9b Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 20 Apr 2018 14:15:21 +0800 Subject: [PATCH 3/3] * Refact detail view of todo. * Optimize codes. --- module/block/view/dashboard.html.php | 6 +++--- module/company/view/browse.html.php | 8 +++----- module/my/view/todo.html.php | 3 ++- module/product/view/all.html.php | 8 +++----- module/productplan/view/browse.html.php | 8 +++----- module/task/model.php | 12 ++++++++---- module/todo/view/view.html.php | 20 ++++++++++---------- www/js/zui/min.js | 4 ++-- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 7a2741cec9..36d4292e00 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -32,15 +32,15 @@ $useGuest = $this->app->user->account == 'guest';
" . $lang->todo->export, '', "class='btn btn-link iframe'");?> - + " . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?> + " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 3f129d83b2..29f4bb8a30 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -91,12 +91,10 @@ -
- - -
+ id => sprintf('%03d', $product->id)));?> + + id);?> - id);?> createLink('product', 'view', 'product=' . $product->id), $product->name);?> line);?> diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index d7ea74387e..4b63dfd765 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -62,12 +62,10 @@ -
- - -
- + id => sprintf('%03d', $plan->id)));?> + id);?> + id"), $plan->title);?> session->currentProductType != 'normal'):?> diff --git a/module/task/model.php b/module/task/model.php index a4ea4e4a10..460ac6f0c4 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2106,10 +2106,14 @@ class taskModel extends model switch($id) { case 'id': - echo "
"; - if($mode == 'table' && $canBatchAction) echo ""; - echo sprintf('%03d', $task->id); - echo '
'; + if($mode == 'table' && $canBatchAction) + { + echo html::checkbox('taskIDList', array($task->id => sprintf('%03d', $task->id))); + } + else + { + printf('%03d', $task->id); + } break; case 'pri': echo ""; diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 798851f151..69bc42d960 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -164,15 +164,15 @@ common::printRPN($browseLink); ?> +
+

comment;?>

+
id")?>' target='hiddenwin'> +
+ +
+
-
- comment;?> -
id")?>' target='hiddenwin'> -
- -
-