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

* adjust for programs and products api.

Browse Source
This commit is contained in:
王怡栋
2021-11-15 14:56:27 +08:00
parent d6cd8a284e
commit 0c2c05331f
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/products.php
+19 -4
View File
@@ -59,9 +59,12 @@ class productsEntry extends entry
foreach($data->data->productStructure as $programID => $program)
{
$programs[$programID] = new stdclass();
$programs[$programID]->id = $programID;
$programs[$programID]->name = $program->programName;
$programs[$programID]->type = 'program';
if(!empty($programID))
{
$programs[$programID]->id = $programID;
$programs[$programID]->name = $program->programName;
$programs[$programID]->type = 'program';
}
$unclosedTotal = 0;
foreach($program as $field => $value)
@@ -111,8 +114,20 @@ class productsEntry extends entry
$programs[$programID]->unclosedTotal = $unclosedTotal;
}
}
}
return $this->send(200, array_values($programs));
$topProducts = array();
if(isset($programs[0]))
{
$topProducts = $programs[0]->children;
unset($programs[0]);
}
$programs = array_values($programs);
foreach($topProducts as $product) $programs[] = $product;
return $this->send(200, $programs);
}
else
{
api/v1/entries/programs.php
+7 -5
View File
@@ -19,7 +19,8 @@ class programsEntry extends Entry
*/
public function get()
{
$mergeChildren = $this->param('mergeChildren', '');
$_COOKIE['showClosed'] = $this->param('showClosed', 0);
$mergeChildren = $this->param('mergeChildren', 0);
$program = $this->loadController('program', 'browse');
$program->browse($this->param('status', 'all'), $this->param('order', 'order_asc'));
@@ -27,12 +28,13 @@ class programsEntry extends Entry
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
{
$programs = (array)$data->data->programs;
$users = $data->data->users;
$result = array();
$programs = (array)$data->data->programs;
$progressList = $data->data->progressList;
$users = $data->data->users;
$result = array();
foreach($programs as $program)
{
$program->progress = zget($data->data->progressList, $program->id, 0);
$program->progress = zget($progressList, $program->id, 0);
$param = $this->format($program, 'begin:date,end:date,realBegan:date,realEnd:date,openedDate:time,lastEditedDate:time,closedDate:time,canceledDate:time,deleted:bool');
if($mergeChildren)