diff --git a/module/report/view/bugsummary.html.php b/module/report/view/bugsummary.html.php index 39ffdb0104..386f1fb110 100644 --- a/module/report/view/bugsummary.html.php +++ b/module/report/view/bugsummary.html.php @@ -41,14 +41,14 @@
| product->name;?> | -product->code;?> | -product->PO;?> | -productplan->common;?> | +product->name;?> | +productplan->common;?> | productplan->desc;?> | productplan->begin;?> | productplan->end;?> | -report->details;?> | +report->details;?> | |||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| name;?> | -code;?> | -PO;?> | +' . $product->name . " {$lang->product->PO}: " . $product->PO . ' ';?> |
plans)):?>
plans as $id => $plan):?>
"?>
@@ -41,10 +37,10 @@
desc;?> | begin;?> | end;?> | -story->statusList['draft'] . ' : ' . (isset($plan->status['draft']) ? $plan->status['draft'] : 0);?> | -story->statusList['active'] . ' : ' . (isset($plan->status['active']) ? $plan->status['active'] : 0);?> | -story->statusList['closed'] . ' : ' . (isset($plan->status['closed']) ? $plan->status['closed'] : 0);?> | -story->statusList['changed'] . ' : ' . (isset($plan->status['changed']) ? $plan->status['changed'] : 0);?> | +story->statusList['draft'] . ' : ' . (isset($plan->status['draft']) ? $plan->status['draft'] : 0);?> | +story->statusList['active'] . ' : ' . (isset($plan->status['active']) ? $plan->status['active'] : 0);?> | +story->statusList['closed'] . ' : ' . (isset($plan->status['closed']) ? $plan->status['closed'] : 0);?> | +story->statusList['changed'] . ' : ' . (isset($plan->status['changed']) ? $plan->status['changed'] : 0);?> | "?> diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php index 89aed9b425..830ed58c6b 100644 --- a/module/report/view/projectdeviation.html.php +++ b/module/report/view/projectdeviation.html.php @@ -1,4 +1,5 @@ +|||||||||||||||||||||
@@ -15,7 +16,7 @@
| report->id;?> |
- report->project;?> |
+ report->project;?> |
report->stories;?> |
report->bugs;?> |
report->devConsumed;?> |
@@ -31,17 +32,18 @@
id;?> |
- name;?> |
+ name;?> |
stories;?> |
bugs;?> |
devConsumed;?> |
testConsumed;?> |
- devConsumed . ' : ' . $project->testConsumed;?> |
+ devConsumed / (($project->testConsumed < 1) ? 1 : $project->testConsumed), 1);?> |
estimate;?> |
consumed;?> |
- consumed - $project->estimate) > 0 ? '+' . ($project->consumed - $project->estimate) : ($project->consumed - $project->estimate);?> |
+ consumed - $project->estimate;?>
+ 0 ? ('+' . $deviation) : ($deviation);?> |
- consumed - $project->estimate) > 0 ? '+' : '') . round(abs($project->consumed - $project->estimate) / $project->consumed * 100, 2) . '%';?>
+ 0 ? '+' : '-') . round(abs($deviation) / $project->estimate * 100, 2) . '%';?>
|
|