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

* code for task #43747.

Browse Source
This commit is contained in:
王怡栋
2021-11-15 08:37:51 +08:00
parent b68cbf646d
commit 1feb6d2b2f
2 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/products.php
+62 -3
View File
@@ -43,6 +43,8 @@ class productsEntry extends entry
}
else
{
$mergeChildren = $this->param('mergeChildren', '');
$control = $this->loadController('product', 'all');
$control->all($this->param('status', 'all'), $this->param('order', 'order_asc'));
@@ -51,10 +53,67 @@ class productsEntry extends entry
if(isset($data->status) and $data->status == 'success')
{
$result = array();
$products = $data->data->productStats;
foreach($products as $product) $result[] = $this->format($product, 'createdDate:time');
if($mergeChildren)
{
$programs = array();
foreach($data->data->productStructure as $programID => $program)
{
$programs[$programID] = new stdclass();
$programs[$programID]->id = $programID;
$programs[$programID]->name = $program->programName;
$programs[$programID]->type = 'program';
return $this->send(200, array('products' => $result));
foreach($program as $field => $value)
{
if(!isset($programs[$programID]->children)) $programs[$programID]->children = array();
if(isset($value->products))
{
$lineID = $field;
if(empty($lineID))
{
foreach($value->products as $product)
{
unset($product->desc);
$product->stories = (array)$product->stories;
$product->requirements = (array)$product->requirements;
$closedTotal = ($product->stories['closed'] + $product->requirements['closed']);
$allTotal = (array_sum($product->stories) + array_sum($product->requirements));
$product->progress = empty($closedTotal) ? 0 : round($closedTotal / $allTotal * 100, 1);
$programs[$programID]->children[$product->id] = $product;
}
}
else
{
$line = new stdclass();
$line->id = $lineID;
$line->name = $value->lineName;
$line->type = 'line';
$line->children = array();
foreach($value->products as $product)
{
unset($product->desc);
$product->stories = (array)$product->stories;
$product->requirements = (array)$product->requirements;
$closedTotal = ($product->stories['closed'] + $product->requirements['closed']);
$allTotal = (array_sum($product->stories) + array_sum($product->requirements));
$product->progress = empty($closedTotal) ? 0 : round($closedTotal / $allTotal * 100, 1);
$line->children[$product->id] = $product;
}
$programs[$programID]->children[$lineID] = $line;
}
}
}
}
return $this->send(200, $programs);
}
else
{
$products = $data->data->productStats;
foreach($products as $product) $result[] = $this->format($product, 'createdDate:time');
return $this->send(200, array('products' => $result));
}
}
}
framework/api/entry.class.php
+1 -1
View File
@@ -633,7 +633,7 @@ class baseEntry
{
$module = $this->app->getModuleName();
$method = $this->app->getMethodName();
if($module and $method and !commonModel::hasPriv($module, $method))
if($module and $method and !$this->loadModel('common')->isOpenMethod($module, $method) and !commonModel::hasPriv($module, $method))
{
$this->send(403, array('error' => 'Access not allowed'));
}