issue #0001687: monitoring events interface
This commit is contained in:
parent
51ff973e2e
commit
4f8af1e4fd
@ -96,85 +96,44 @@ par
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($this->surveillances as $item) {?>
|
||||
<?php foreach ($this->val_siren as $monitor) {?>
|
||||
<pre><? print_r($monitor);?></pre>
|
||||
<tr>
|
||||
<td class="aleft">
|
||||
<a href="<?=$this->url(array(
|
||||
'controller' => 'identite',
|
||||
'action' => 'fiche',
|
||||
'siret' => $item['siren'].$item['nic'],
|
||||
))?>"><?=$item['siren']?></a>
|
||||
<p><?=$monitor[0]->Company->CompanyId ?></p>
|
||||
</td>
|
||||
<td>
|
||||
<?=$item['rs']?><br/><i><?=$item['cp']?> <?=$item['ville']?></i>
|
||||
<p><?=$monitor[0]->Company->CompanyName['0']->_ ?></p>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?php
|
||||
foreach ($this->listSources as $source) {
|
||||
$ok = false;
|
||||
foreach ($item['sources'] as $surveillance) {
|
||||
if ( $surveillance['source'] == $source ) {
|
||||
if ($surveillance['ref'] != '') { ?><p><?=$surveillance['ref']?></p><?php }
|
||||
else { ?><p>-</p><?php }
|
||||
$ok = true;
|
||||
}
|
||||
}
|
||||
if ( $ok === false ) {?><p>-</p><?php }
|
||||
foreach ($monitor as $monitor_order) {
|
||||
?><p><?=$monitor_order->ProviderOrderId?></p><?
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<td style='text-align: left'>
|
||||
<?php
|
||||
foreach ($this->listSources as $source) {
|
||||
|
||||
?>
|
||||
<div class="action">
|
||||
|
||||
</div>
|
||||
foreach ($monitor as $monitor_type) {
|
||||
echo "<p>".$monitor_type->Company->Event[0]->EventCode."</p>";
|
||||
|
||||
|
||||
|
||||
<?php } //Fin foreach?>
|
||||
} //Fin foreach?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?php
|
||||
foreach ($this->listSources as $source) {
|
||||
$ok = false;
|
||||
foreach ($item['sources'] as $surveillance) {
|
||||
if ( $surveillance['source'] == $source ) {
|
||||
?>
|
||||
<p><?=substr($surveillance['dateAjout'], 8, 2).'/'.
|
||||
substr($surveillance['dateAjout'], 5, 2).'/'.
|
||||
substr($surveillance['dateAjout'], 0, 4)?></p>
|
||||
<?php
|
||||
$ok = true;
|
||||
}
|
||||
}
|
||||
if ( $ok === false ) {?><p>-</p><?php }
|
||||
foreach ($monitor as $monitor_type) {
|
||||
echo "<p>".$monitor_type->Company->Event[0]->Date->_."</p>";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
<td>
|
||||
<?php
|
||||
foreach ($this->listSources as $source) {
|
||||
$ok = false;
|
||||
foreach ($item['sources'] as $surveillance) {
|
||||
if ( $surveillance['source'] == $source ) {
|
||||
$pDate = substr($surveillance['dateDerEnvoi'], 8, 2).'/'.
|
||||
substr($surveillance['dateDerEnvoi'], 5, 2).'/'.
|
||||
substr($surveillance['dateDerEnvoi'], 0, 4);
|
||||
if ($pDate != '00/00/0000') {
|
||||
echo '<p>'.$pDate.'</p>';
|
||||
} else {
|
||||
echo '<p>-</p>';
|
||||
}
|
||||
$ok = true;
|
||||
}
|
||||
}
|
||||
if ( $ok === false ) {?><p>-</p><?php }
|
||||
foreach ($monitor as $monitor_type) {
|
||||
echo "<p>".$monitor_type->Company->Event[0]->Date->_."</p>";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
@ -204,7 +163,6 @@ par
|
||||
|
||||
</div>
|
||||
|
||||
<pre><? print_r($this->val_siren); ?></pre>
|
||||
|
||||
<script type="text/javascript">
|
||||
function submitTri() {
|
||||
|
@ -100,6 +100,7 @@ Class GiantControllerLib
|
||||
$result = $rapport->GetStartMonitoring($CompanyId, $CategorieName, $EventType, $PreferredStartDate, $PreferredEndDate, $Version, $LanguageCode);
|
||||
|
||||
$CommandeP->InternalOrderId = $result->Order->InternalOrderId;
|
||||
$CommandeP->ProviderOrderId = $result->Order->ProviderOrderId;
|
||||
$Commande->setMonitoring($CommandeP);
|
||||
return ($result);
|
||||
}
|
||||
|
@ -41,6 +41,7 @@ Class Commandes
|
||||
'ActualStartDate' => $parametres->ActualStartDate,
|
||||
'ActualEndDate' => $parametres->ActualEndDate,
|
||||
'InternalOrderId' => $parametres->InternalOrderId,
|
||||
'ProviderOrderId' => $parametres->ProviderOrderId,
|
||||
);
|
||||
$commandes->insert($data);
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ class WSgiant extends Zend_Soap_Client
|
||||
|
||||
$giantHeader = new stdClass();
|
||||
$giantHeader->ConsumerId = $this->wsService->header->ConsumerId;
|
||||
$giantHeader->CustomerId = $utilisateur->getLogin();
|
||||
$giantHeader->CustomerId = '001';
|
||||
|
||||
$giantHeader->Provider = new stdClass();
|
||||
$giantHeader->Provider->CountryCode = $parametres->CountryCode;
|
||||
|
Loading…
Reference in New Issue
Block a user