diff --git a/module/my/config/table.php b/module/my/config/table.php index 5ecf2ad765..652e562025 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -1012,6 +1012,16 @@ $config->my->audit->dtable->fieldList['type']['title'] = $lang->my->auditFiel $config->my->audit->dtable->fieldList['type']['type'] = 'catetory'; $config->my->audit->dtable->fieldList['type']['sortType'] = true; +$config->my->audit->dtable->fieldList['project']['name'] = 'project'; +$config->my->audit->dtable->fieldList['project']['title'] = $lang->execution->project; +$config->my->audit->dtable->fieldList['project']['type'] = 'text'; +$config->my->audit->dtable->fieldList['project']['show'] = false; + +$config->my->audit->dtable->fieldList['product']['name'] = 'product'; +$config->my->audit->dtable->fieldList['product']['title'] = $lang->story->product; +$config->my->audit->dtable->fieldList['product']['type'] = 'text'; +$config->my->audit->dtable->fieldList['product']['sortType'] = true; + $config->my->audit->dtable->fieldList['time']['name'] = 'time'; $config->my->audit->dtable->fieldList['time']['title'] = $lang->my->auditField->time; $config->my->audit->dtable->fieldList['time']['type'] = 'datetime'; diff --git a/module/my/control.php b/module/my/control.php index 007f2de8f6..f969890a81 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -933,6 +933,8 @@ class my extends control $this->view->param = $param; $this->view->mode = 'audit'; $this->view->flows = $flows; + $this->view->products = $this->loadModel('product')->getPairs('', 0, '', 'all');; + $this->view->projects = $this->loadModel('project')->getPairsByProgram();; $this->display(); } diff --git a/module/my/model.php b/module/my/model.php index 0efaa5b156..9f44b2df48 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -1035,6 +1035,8 @@ class myModel extends model $demand->type = 'demand'; $demand->time = $data->createdDate; $demand->status = $data->status; + $demand->product = $data->product; + $demand->project = 0; $demands[$demand->id] = $demand; } @@ -1079,6 +1081,7 @@ class myModel extends model $story->time = $data->openedDate; $story->status = $data->status; $story->product = $data->product; + $story->project = 0; $story->parent = $data->parent; $stories[$story->id] = $story; } @@ -1111,11 +1114,13 @@ class myModel extends model { if($checkExists) return true; $case = new stdclass(); - $case->id = $data->id; - $case->title = $data->title; - $case->type = 'testcase'; - $case->time = $data->openedDate; - $case->status = $data->status; + $case->id = $data->id; + $case->title = $data->title; + $case->type = 'testcase'; + $case->time = $data->openedDate; + $case->status = $data->status; + $case->product = $data->product; + $case->project = $data->project; $cases[$case->id] = $case; } @@ -1148,11 +1153,13 @@ class myModel extends model if($checkExists) return true; $data = new stdclass(); - $data->id = $review->id; - $data->title = $review->title; - $data->type = 'projectreview'; - $data->time = date('Y-m-d H:i:s', strtotime($review->createdDate)); - $data->status = $review->status; + $data->id = $review->id; + $data->title = $review->title; + $data->type = 'projectreview'; + $data->time = date('Y-m-d H:i:s', strtotime($review->createdDate)); + $data->status = $review->status; + $data->product = $review->product; + $data->project = $review->project; $reviewList[] = $data; } return $reviewList; @@ -1235,11 +1242,13 @@ class myModel extends model if($checkExists) return true; $data = new stdclass(); - $data->id = $feedback->id; - $data->title = $feedback->title; - $data->type = 'feedback'; - $data->time = $feedback->openedDate; - $data->status = $feedback->status; + $data->id = $feedback->id; + $data->title = $feedback->title; + $data->type = 'feedback'; + $data->time = $feedback->openedDate; + $data->status = $feedback->status; + $data->product = isset($feedback->product) ? $feedback->product : 0; + $data->project = isset($feedback->project) ? $feedback->project : 0; $reviewList[] = $data; } return $reviewList; @@ -1291,6 +1300,8 @@ class myModel extends model $review->time = $type == 'attend' ? $object->date : $object->createdDate; $review->status = $type == 'attend' ? $object->reviewStatus : $object->status; $review->title = ''; + $review->product = isset($object->product) ? $object->product : 0; + $review->project = isset($object->project) ? $object->project : 0; if($type == 'attend') { $review->title = sprintf($this->lang->my->auditField->oaTitle[$type], zget($users, $object->account), $object->date); diff --git a/module/my/tao.php b/module/my/tao.php index b7465ba4f1..eae21fbe25 100644 --- a/module/my/tao.php +++ b/module/my/tao.php @@ -309,12 +309,14 @@ class myTao extends myModel foreach($objects as $object) { $data = new stdclass(); - $data->id = $object->id; - $data->title = empty($titleFieldName) || !isset($object->$titleFieldName) ? $title . " #{$object->id}" : $object->{$titleFieldName}; - $data->type = $objectType; - $data->time = $object->{$openedDateField}; - $data->status = 'doing'; - $data->app = isset($flows[$objectType]->app) ? $flows[$objectType]->app : zget($this->lang->navGroup, $objectType, ''); + $data->id = $object->id; + $data->title = empty($titleFieldName) || !isset($object->$titleFieldName) ? $title . " #{$object->id}" : $object->{$titleFieldName}; + $data->type = $objectType; + $data->time = $object->{$openedDateField}; + $data->status = 'doing'; + $data->app = isset($flows[$objectType]->app) ? $flows[$objectType]->app : zget($this->lang->navGroup, $objectType, ''); + $data->product = isset($object->product) ? $object->product : 0; + $data->project = isset($object->project) ? $object->project : 0; $approvalList[] = $data; } } diff --git a/module/my/ui/audit.html.php b/module/my/ui/audit.html.php index f470eff50d..d43e472c42 100644 --- a/module/my/ui/audit.html.php +++ b/module/my/ui/audit.html.php @@ -104,6 +104,8 @@ foreach($reviewList as $review) $reviewList = initTableData($reviewList, $config->my->audit->dtable->fieldList, $this->my); $sortLink = $app->rawMethod == 'audit' ? createLink('my', 'audit', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}") : createLink('my', $app->rawMethod, "mode={$mode}&browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"); +$config->my->audit->dtable->fieldList['product']['map'] = array(0 => '') + $products; +$config->my->audit->dtable->fieldList['project']['map'] = array(0 => '') + $projects; $cols = array_values($config->my->audit->dtable->fieldList); $data = array_values($reviewList);