giant: mise a jour affichage rapport html
This commit is contained in:
parent
dd3b37540b
commit
9ceb02679a
@ -298,9 +298,6 @@ function printLiensFinanciers(&$company, $type)
|
||||
}
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------- //
|
||||
// Type de rapport
|
||||
// -------------------------------------------------------------------------- //
|
||||
require_once 'dbbootstrap.php';
|
||||
setDbConn('giantclient');
|
||||
|
||||
@ -314,6 +311,9 @@ if ($r == false) {
|
||||
exit;
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------- //
|
||||
// Type de rapport
|
||||
// -------------------------------------------------------------------------- //
|
||||
print '<div id="center">';
|
||||
switch ($r->DataSetType) {
|
||||
case 'Full':
|
||||
@ -483,14 +483,14 @@ if (isset($c->Operations->IndustryCode) == true ||
|
||||
if (isset($t->Period->StartDate->_) == true &&
|
||||
$t->Period->StartDate->_ > $annee) {
|
||||
$annee = $t->Period->StartDate->_;
|
||||
$total = $t->TotalStaffEmployed + 0;
|
||||
$total = intval($t->TotalStaffEmployed);
|
||||
} else if (isset($t->Period->EndDate->_) == true &&
|
||||
$t->Period->EndDate->_ > $annee) {
|
||||
$annee = $t->Period->EndDate->_;
|
||||
$total = $t->TotalStaffEmployed + 0;
|
||||
$total = intval($t->TotalStaffEmployed);
|
||||
}
|
||||
} else {
|
||||
$total = $t->TotalStaffEmployed + 0;
|
||||
$total = intval($t->TotalStaffEmployed);
|
||||
}
|
||||
}
|
||||
if ($total > 0) {
|
||||
@ -565,12 +565,14 @@ if (isset($c->Employees) == true) {
|
||||
foreach (getArray($c->Employees) as $t) {
|
||||
if (isset($t->Period) == true) {
|
||||
if (isset($t->Period->StartDate) == true) {
|
||||
dRow(pdate($t->Period->StartDate), $t->TotalStaffEmployed + 0);
|
||||
dRow(pdate($t->Period->StartDate),
|
||||
intval($t->TotalStaffEmployed));
|
||||
} else if (isset($t->Period->EndDate) == true) {
|
||||
dRow(pdate($t->Period->EndDate), $t->TotalStaffEmployed + 0);
|
||||
dRow(pdate($t->Period->EndDate),
|
||||
intval($t->TotalStaffEmployed));
|
||||
}
|
||||
} else {
|
||||
dRow('', $t->TotalStaffEmployed + 0);
|
||||
dRow('', intval($t->TotalStaffEmployed));
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
@ -720,17 +722,19 @@ if (isset($c->PaymentBehaviour) == true) {
|
||||
pdate($cat->Period->StartDate).' - '.
|
||||
pdate($cat->Period->EndDate);
|
||||
$total = 0;
|
||||
foreach (getArray($cat->DueDateExceeds) as $e) {
|
||||
if ($e->NrOfDaysExceeds->LowerLimit->_ >= 90) {
|
||||
$total += $e->Percentage;
|
||||
} else {
|
||||
$lab =
|
||||
$e->NrOfDaysExceeds->LowerLimit->_.' to '.
|
||||
$e->NrOfDaysExceeds->UpperLimit->_;
|
||||
$tab[$lab][$trim] = $e->Percentage;
|
||||
if (isset($cat->DueDateExceeds) == true) {
|
||||
foreach (getArray($cat->DueDateExceeds) as $e) {
|
||||
if ($e->NrOfDaysExceeds->LowerLimit->_ >= 90) {
|
||||
$total += $e->Percentage;
|
||||
} else {
|
||||
$lab =
|
||||
$e->NrOfDaysExceeds->LowerLimit->_.' to '.
|
||||
$e->NrOfDaysExceeds->UpperLimit->_;
|
||||
$tab[$lab][$trim] = $e->Percentage;
|
||||
}
|
||||
}
|
||||
$tab['90-'][$trim] = $total;
|
||||
}
|
||||
$tab['90-'][$trim] = $total;
|
||||
}
|
||||
ksort($tab);
|
||||
print '<h2>'.$ap->Description->_.'</h2>';
|
||||
@ -773,17 +777,19 @@ if (isset($c->PaymentBehaviour) == true) {
|
||||
$amount .= $cat->AmountCategory->HigherLimit->_;
|
||||
}
|
||||
$total = 0;
|
||||
foreach (getArray($cat->DueDateExceeds) as $e) {
|
||||
if ($e->NrOfDaysExceeds->LowerLimit->_ >= 90) {
|
||||
$total += $e->Percentage;
|
||||
} else {
|
||||
$lab =
|
||||
$e->NrOfDaysExceeds->LowerLimit->_.' to '.
|
||||
$e->NrOfDaysExceeds->UpperLimit->_;
|
||||
$tab[$lab][$amount] = $e->Percentage;
|
||||
if (isset($cat->DueDateExceeds) == true) {
|
||||
foreach (getArray($cat->DueDateExceeds) as $e) {
|
||||
if ($e->NrOfDaysExceeds->LowerLimit->_ >= 90) {
|
||||
$total += $e->Percentage;
|
||||
} else {
|
||||
$lab =
|
||||
$e->NrOfDaysExceeds->LowerLimit->_.' to '.
|
||||
$e->NrOfDaysExceeds->UpperLimit->_;
|
||||
$tab[$lab][$amount] = $e->Percentage;
|
||||
}
|
||||
}
|
||||
$tab['90-'][$amount] = $total;
|
||||
}
|
||||
$tab['90-'][$amount] = $total;
|
||||
}
|
||||
ksort($tab);
|
||||
print '<h2>'.$ap->Description->_.'</h2>';
|
||||
@ -885,10 +891,14 @@ if (isset($c->PeerGroup->FlexibleComparisonItems
|
||||
foreach ($c->PeerGroup->FlexibleComparisonItems->ComparisonItemsGroup as
|
||||
$group) {
|
||||
print '<td align="right">';
|
||||
print $group->FlexibleComparisonItem[$i]->SubjectValue;
|
||||
if (isset($group->FlexibleComparisonItem[$i]->SubjectValue)) {
|
||||
print $group->FlexibleComparisonItem[$i]->SubjectValue;
|
||||
}
|
||||
print '</td>';
|
||||
print '<td align="right">';
|
||||
print $group->FlexibleComparisonItem[$i]->AverageValue;
|
||||
if (isset($group->FlexibleComparisonItem[$i]->AverageValue)) {
|
||||
print $group->FlexibleComparisonItem[$i]->AverageValue;
|
||||
}
|
||||
print '</td>';
|
||||
}
|
||||
print '</tr>';
|
||||
|
Loading…
Reference in New Issue
Block a user