* adjust for program list.

This commit is contained in:
王怡栋
2021-11-16 14:38:52 +08:00
parent 77b0b5d61e
commit 41d2fb9a04
+34 -40
View File
@@ -29,53 +29,47 @@ class programsEntry extends Entry
$program->browse($this->param('status', 'all'), $this->param('order', 'order_asc'));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
if(!$data or !isset($data->status)) return $this->sendError(400, 'error');
if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
$programs = (array)$data->data->programs;
$progressList = $data->data->progressList;
$users = $data->data->users;
$result = array();
foreach($programs as $program)
{
$programs = (array)$data->data->programs;
$progressList = $data->data->progressList;
$users = $data->data->users;
$result = array();
foreach($programs as $program)
$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)
{
$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');
unset($program->desc);
$program->openedBy = zget($users, $program->openedBy);
$program->closedBy = zget($users, $program->closedBy);
$program->canceledBy = zget($users, $program->canceledBy);
$program->PO = zget($users, $program->PO);
$program->PM = zget($users, $program->PM);
$program->QD = zget($users, $program->QD);
$program->RD = zget($users, $program->RD);
$program->end = $program->end == LONG_TIME ? $this->lang->program->longTime : $program->end;
if($mergeChildren)
$programBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$program->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$program->budget, 2);
$program->labelBudget = $program->budget != 0 ? zget($this->lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $this->lang->project->future;
if(empty($program->parent)) $result[$program->id] = $program;
if(isset($programs[$program->parent]))
{
unset($program->desc);
$program->openedBy = zget($users, $program->openedBy);
$program->closedBy = zget($users, $program->closedBy);
$program->canceledBy = zget($users, $program->canceledBy);
$program->PO = zget($users, $program->PO);
$program->PM = zget($users, $program->PM);
$program->QD = zget($users, $program->QD);
$program->RD = zget($users, $program->RD);
$program->end = $program->end == LONG_TIME ? $this->lang->program->longTime : $program->end;
$programBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$program->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$program->budget, 2);
$program->labelBudget = $program->budget != 0 ? zget($this->lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $this->lang->project->future;
if(empty($program->parent)) $result[$program->parent][$program->id] = $program;
if(isset($programs[$program->parent]))
{
$parentProgram = $programs[$program->parent];
if(!isset($parentProgram->children)) $parentProgram->children = array();
$parentProgram->children[] = $program;
}
}
else
{
$result[] = $program;
$parentProgram = $programs[$program->parent];
if(!isset($parentProgram->children)) $parentProgram->children = array();
$parentProgram->children[] = $program;
}
}
return $this->send(200, array('programs' => array_values($result)));
else
{
$result[] = $program;
}
}
if(isset($data->status) and $data->status == 'fail')
{
return $this->sendError(400, $data->message);
}
return $this->sendError(400, 'error');
return $this->send(200, array('programs' => array_values($result)));
}
/**