issue #0001569 : Giant client fro trunk, now branch 2.3-giant could be deleted
This commit is contained in:
Michael RICOIS
parent
114dc7b8b4
commit
64e2abb140
@ -29,7 +29,7 @@
|
||||
<td class="align"><?php echo round($ComparaisonValeurs['current']); ?></td>
|
||||
<td class="align"><?php echo round($ComparaisonValeurs['entreprise']); ?></td>
|
||||
<td class="align"><?php echo $val; ?> %</td>
|
||||
<td class="alignCenter" style="width:20px;"><img class="tooltip" width="420" title="<center><b>Evolution années précédentes</b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>.png' />" alt="icone" src="/themes/default/images/giant/<?php echo ($val > 0)? 'up': 'down';?>.png" /></td>
|
||||
<td class="alignCenter" style="width:20px;"><img class="tooltip" title="<center><b>Evolution années précédentes</b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>.png' />" alt="icone" src="/themes/default/images/giant/<?php echo ($val > 0)? 'up': 'down';?>.png" /></td>
|
||||
<?php if(!empty($ComparaisonValeurs['old'])):?>
|
||||
<?php $i=0;foreach($ComparaisonValeurs['old'] as $valeur):$i++?>
|
||||
<?php if($i == 4) break;?>
|
||||
|
||||
@ -55,9 +55,9 @@
|
||||
<?php endforeach; ?>
|
||||
<td>
|
||||
<?php if($end > $firstAsset):?>
|
||||
<img class="tooltip IMGprint" wdith="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<?php else: ?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<?php endif;unset($firstAsset);?>
|
||||
</td>
|
||||
</tr>
|
||||
@ -96,9 +96,9 @@
|
||||
<?php endforeach; ?>
|
||||
<td>
|
||||
<?php if($end > $firstLiabilities):?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<?php else: ?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<?php endif;unset($firstLiabilities);?>
|
||||
</td>
|
||||
</tr>
|
||||
@ -137,9 +137,9 @@
|
||||
<?php endforeach; ?>
|
||||
<td>
|
||||
<?php if($end > $firstProfitAndLoss):?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<?php else: ?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<?php endif;unset($firstProfitAndLoss);?>
|
||||
</td>
|
||||
</tr>
|
||||
@ -179,9 +179,9 @@
|
||||
<?php endforeach; ?>
|
||||
<td>
|
||||
<?php if($end > $firstKeyCreditRatios):?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
|
||||
<?php else: ?>
|
||||
<img class="tooltip IMGprint" width="420" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/up.png" />
|
||||
<?php endif;unset($firstKeyCreditRatios);?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -6,9 +6,13 @@
|
||||
<form method="POST">
|
||||
<select name="Date" style="float:right" onchange="submit()">
|
||||
<option value="all">Date</option>
|
||||
|
||||
<?php foreach($Events as $date => $event): ?>
|
||||
<option <?php echo ((isset($_POST['Date']) and $_POST['Date'] == $date)?'SELECTED':EOF); ?> value="<?php echo $date;?>">
|
||||
<?php echo ($Events[$date][0]->Date != '//')?$Events[$date][0]->Date:'NC';?>
|
||||
|
||||
<option <?php
|
||||
preg_match('/(\d{4})(\d{2})(\d{2})/', $date, $matches);$y = $matches[1];$m = $matches[2];$d = $matches[3];
|
||||
echo ((isset($_POST['Date']) and $_POST['Date'] == $y.'/'.$m.'/'.$d)?'SELECTED':EOF); ?> value="<?php echo $y.'/'.$m.'/'.$d;?>">
|
||||
<?php echo ($Events[$date][0]->Date != '//')?$Events[$date][0]->Date:$y.'/'.$m.'/'.$d;?>
|
||||
</option>
|
||||
<?php endforeach;?>
|
||||
</select>
|
||||
@ -22,11 +26,13 @@
|
||||
<td colspan="3"><hr style="border:1px dotted silver" /></td>
|
||||
</tr>
|
||||
<?php foreach($Events as $date => $event): ?>
|
||||
<?php foreach($event as $val):?>
|
||||
<?php
|
||||
preg_match('/(\d{4})(\d{2})(\d{2})/', $date, $matches);$y = $matches[1];$m = $matches[2];$d = $matches[3];
|
||||
foreach($event as $val):?>
|
||||
<?php if(!empty($_POST['Date']) and $_POST['Date'] != 'all'):?>
|
||||
<?php if($date == $_POST['Date']):?>
|
||||
<?php if($y.'/'.$m.'/'.$d == $_POST['Date']):?>
|
||||
<tr style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
|
||||
<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:'NC';?></td>
|
||||
<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></td>
|
||||
<td><?php echo $val->Description;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -35,7 +41,7 @@
|
||||
<?php endif;?>
|
||||
<?php else: ?>
|
||||
<tr style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
|
||||
<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:'NC';?></td>
|
||||
<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></td>
|
||||
<td><?php echo $val->Description;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@ -28,6 +28,9 @@ Class GiantControllerLib
|
||||
$CommandeP = new stdClass();
|
||||
|
||||
$id = $Rapport->getRapportExist($CompanyId, $Type);
|
||||
|
||||
$report_id = $Rapport->getRapportExistId($CompanyId, $Type);
|
||||
|
||||
if(empty($id)) {
|
||||
$rapport = new GiantRechercheController($Pays, $TestIndication);
|
||||
$result = $rapport->GetRapport($CompanyId, $Type);
|
||||
@ -36,16 +39,23 @@ Class GiantControllerLib
|
||||
$Type,
|
||||
$Pays,
|
||||
$result);
|
||||
$report_id = $Rapport->getRapportExistId($CompanyId, $Type);
|
||||
|
||||
}
|
||||
$CommandeP->login = $Utilisateur->getLogin();
|
||||
$CommandeP->date = date("Y-m-d");
|
||||
$CommandeP->typeReport = $function->getTypeReport($Type);
|
||||
$CommandeP->price = 0;
|
||||
$CommandeP->pays = strtolower($Pays);
|
||||
|
||||
$CommandeP->rapportId = $report_id[0]['id'];
|
||||
/*echo'<pre>';
|
||||
print_r($report_id);
|
||||
echo'</pre>';
|
||||
if(!$Commande->getCommandeExistToday($CommandeP->login, $CommandeP->date, $CommandeP->typeReport, $CommandeP->pays)) {
|
||||
$Commande->setCommandes($CommandeP);
|
||||
}
|
||||
}*/
|
||||
$Commande->setCommandes($CommandeP);
|
||||
|
||||
return ($id);
|
||||
}
|
||||
|
||||
@ -215,7 +225,7 @@ Class GiantRechercheController extends GiantFunction
|
||||
{
|
||||
$this->CreditData = new CreditData($this->soapG, $CompanyId);
|
||||
$result = $this->CreditData->getMethode('OrderDataSet', array($DataSetType));
|
||||
$result = $this->CreditData->getMethode('RetrieveDataSet', array($result->Order->InternalOrderId));
|
||||
$result = $this->CreditData->getMethode('RetrieveDataSet', array($result->Order->ProviderOrderId));
|
||||
return ($result);
|
||||
}
|
||||
|
||||
|
||||
@ -491,11 +491,26 @@ class ComptesAnnuels
|
||||
{
|
||||
if(!file_exists($this->pathImg.'-'.$name.'.png')) {
|
||||
$c = new PieChart($width, $height);
|
||||
$c->setPieSize(150, 135, 100);
|
||||
$c->addLegend(340, 60);
|
||||
$c->setLabelFormat("{percent}%");
|
||||
$c->setPieSize(105, 135, 70);
|
||||
$c->set3D(10);
|
||||
// $c->addLegend(340, 60);
|
||||
$c->setLabelFormat("{={sector}+1}");
|
||||
$c->setLabelLayout(SideLayout, 16);
|
||||
$c->setData($datas, $labels);
|
||||
$c->setSectorStyle(RoundedEdgeShading, 0xffffff, 1);
|
||||
$c->setSectorStyle(LocalGradientShading);
|
||||
$textBoxObj = $c->setLabelStyle("arial.ttf", 10);
|
||||
$textBoxObj->setBackground(Transparent);
|
||||
|
||||
$b = $c->addLegend(250, 155, true, "arial.ttf", 10);
|
||||
$b->setAlignment(Left);
|
||||
$b->setBackground(Transparent, 0xaaaaaa);
|
||||
$b->setRoundedCorners();
|
||||
$b->setMargin(16);
|
||||
$b->setKeySpacing(0, 4);
|
||||
$b->setKeyBorder(SameAsMainColor);
|
||||
$b->setText(
|
||||
"<*block,valign=top*>{={sector}+1}.<*advanceTo=22*><*block,width=160*>{label}".
|
||||
"<*/*><*block,width=40,halign=right*>{percent}<*/*>%");
|
||||
$c->makeChart($this->pathImg.'-'.$name.'.png');
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
/*
|
||||
/*
|
||||
* To change this template, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
@ -18,11 +18,11 @@ Class Commandes
|
||||
'date' => $parametres->date,
|
||||
'typeReport' => $parametres->typeReport,
|
||||
'price' => $parametres->price,
|
||||
'pays' => $parametres->pays
|
||||
'pays' => $parametres->pays,
|
||||
'rapportId' => $parametres->rapportId
|
||||
);
|
||||
$commandes->insert($data);
|
||||
}
|
||||
|
||||
public function getCommandesByLogin($login)
|
||||
{
|
||||
$commandes = new Application_Model_CommandesGiants();
|
||||
@ -78,5 +78,12 @@ Class Rapports
|
||||
$id = $rapports->getReportByIdAndType($companyId, $this->enumerations[$type]);
|
||||
return ($id);
|
||||
}
|
||||
|
||||
public function getRapportExistId($companyId, $type)
|
||||
{
|
||||
$rapports = new Application_Model_RapportsGiants();
|
||||
$id = $rapports->getReportById($companyId);
|
||||
return ($id);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user