Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [task#132183,done,1h] add project and product fields to my::audit.

Browse Source
This commit is contained in:
tianshujie
2024-11-20 08:53:28 +08:00
committed by 刘梦艺
parent f7491bd133
commit 4df0bb0fc3
5 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/config/table.php
+10
View File
@@ -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';
module/my/control.php
+2
View File
@@ -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();
}
module/my/model.php
+26 -15
View File
@@ -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);
module/my/tao.php
+8 -6
View File
@@ -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;
}
}
module/my/ui/audit.html.php
+2
View File
@@ -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}&param={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}") : createLink('my', $app->rawMethod, "mode={$mode}&browseType={$browseType}&param={$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);