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

* code task #43342.

Browse Source
This commit is contained in:
王怡栋
2021-10-25 09:49:14 +08:00
parent 43ac494106
commit 95fde8eaca
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/executions.php
+1 -1
View File
@@ -21,7 +21,7 @@ class executionsEntry extends entry
public function get($projectID = 0)
{
$control = $this->loadController('execution', 'all');
$control->all($this->param('status', 'all'), $this->param('project', $projectID), $this->param('order', 'id_desc'), 0, $this->param('total', 0), $this->param('limit', 20), $this->param('page', 1));
$control->all($this->param('status', 'all'), $this->param('project', $projectID), $this->param('order', 'id_desc'), 0, 0, $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
api/v1/entries/program.php
+1 -1
View File
@@ -9,6 +9,6 @@
* @version 1
* @link http://www.zentao.net
*/
class ProgramEntry extends Entry
class programEntry extends Entry
{
}
api/v1/entries/user.php
+11 -1
View File
@@ -66,7 +66,17 @@ class userEntry extends Entry
case 'product':
$info->product = array('total' => 0, 'products' => array());
$products = $this->my->getProducts();
$products = $this->my->getProducts('ownbyme');
if($products)
{
$info->product['total'] = $products->allCount;
$info->product['products'] = $products->products;
}
break;
case 'undoneproduct':
$info->product = array('total' => 0, 'products' => array());
$products = $this->my->getProducts('undone');
if($products)
{
$info->product['total'] = $products->allCount;
module/my/model.php
+9 -4
View File
@@ -60,14 +60,17 @@ class myModel extends model
/**
* Get my charged products.
*
* @param string $type undone|ownbyme
* @access public
* @return object
*/
public function getProducts()
public function getProducts($type = 'undone')
{
$products = $this->dao->select('t1.id as id,t1.*')->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->where('t1.deleted')->eq(0)
->beginIF($type == 'undone')->andWhere('t1.status')->eq('normal')->fi()
->beginIF($type == 'ownbyme')->andWhere('t1.PO')->eq($this->app->user->account)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
->orderBy('t1.order_asc')
->fetchAll('id');
@@ -121,10 +124,11 @@ class myModel extends model
->andWhere('t2.deleted')->eq(0)
->orderBy('t1.project')
->fetchAll('product');
foreach($executions as $key => $execuData)
$this->loadModel('execution');
foreach($executions as $productID => $execution)
{
$execution = $this->loadModel('execution')->getById($execuData->id);
$executions[$key]->progress = ($execution->totalConsumed + $execution->totalLeft) ? floor($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft) * 1000) / 1000 * 100 : 0;
$execution = $this->execution->getById($execution->id);
$executions[$productID]->progress = ($execution->totalConsumed + $execution->totalLeft) ? floor($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft) * 1000) / 1000 * 100 : 0;
}
$allCount = count($products);
@@ -139,6 +143,7 @@ class myModel extends model
$product->storyFinishedTotal = isset($summaryStories[$product->id]) ? $summaryStories[$product->id]->finishedTotal : 0;
$product->storyLeftTotal = isset($summaryStories[$product->id]) ? $summaryStories[$product->id]->leftTotal : 0;
$product->storyFinishedRate = isset($summaryStories[$product->id]) ? $summaryStories[$product->id]->finishedRate : 0;
$product->latestExecution = isset($executions[$product->id]) ? $executions[$product->id] : '';
if($product->status != 'closed') $unclosedCount ++;
if($product->status == 'closed') unset($products[$key]);
}