scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue #0001719: table upgrade

Browse Source
This commit is contained in:
Arman KYOKCHAN 2013-09-20 13:07:12 +00:00
parent 29551808b8
commit 1074a10866
7 changed files with 186 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml
View File

@ -37,30 +37,30 @@
<?php endif;?>
<a name="13"></a>
<span class="title">Qualification de paiement</span><br /><br />
<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
<table id="giant_synthese">
<tbody>
<tr>
<td style="padding:5px;font-size:12px;"><b>PaymentQualification</b></td>
<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->PaymentQualification))?$this->report->PaymentBehaviour[0]->PaymentQualification->Qualification:'NC';?></td>
</tr>
<tr>
<td colspan="2"><hr style="border:1px dotted silver" /></td>
</tr>
<tr>
<td style="padding:5px;font-size:12px;"><b>DebtorDays</b></td>
<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->DebtorDays:'NC';?></td>
</tr>
<tr>
<td colspan="2"><hr style="border:1px dotted silver" /></td>
</tr>
<tr>
<td style="padding:5px;font-size:12px;"><b>CreditorDays</b></td>
<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->CreditorDays:'NC';?></td>
</tr>
<tr>
<td colspan="2"><hr style="border:1px dotted silver" /></td>
</tr>
</table>
<tr >
<td class="head">
<a class="tooltip tooltipFont">PaymentQualification</a>
</td>
<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->PaymentQualification))?$this->report->PaymentBehaviour[0]->PaymentQualification->Qualification:'NC';?></td>
</tr>
<tr >
<td class="head">
<a class="tooltip tooltipFont">DebtorDays</a>
</td>
<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->DebtorDays:'NC';?></td>
</tr>
<tr >
<td class="head">
<a class="tooltip tooltipFont">CreditorDays</a>
</td>
<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->CreditorDays:'NC';?></td>
</tr>
</tbody>
</table>
<br />
<a name="14"></a>
<span class="title">Analyse par sommes</span><br /><br />

44
application/views/default/scripts/giant/partials/rapports/ComptesAnnuels.phtml
View File

@ -1,35 +1,35 @@
<div class="paragraph compteAnnuels">
<?php if(!empty($this->report->AnnualAccounts)):?>
<table class="hoverTr bilansTAB">
<tr>
<td class="tdP"><b>Date de clôture</b></td>
<table id="giant_synthese">
<tbody>
<tr>
<tr >
<td class="head">
<a class="tooltip tooltipFont">Date de clôture</a>
</td>
<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
<td><?php echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$AnnualAccounts->AccountsDate->_;?></td>
<td class="right"><?php echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$AnnualAccounts->AccountsDate->_;?></td>
<?php endforeach; ?>
</tr>
<tr>
<td colspan="<?php echo $i+2; ?>"><hr /></td>
</tr>
<tr>
<td class="tdP"><b>Etat de compte</b></td>
<tr >
<td class="head">
<a class="tooltip tooltipFont">Etat de compte</a>
</td>
<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
<td><?php echo (empty($AnnualAccounts->AccountsStatus))?'NC':$AnnualAccounts->AccountsStatus;?></td>
<td class="right"><?php echo (empty($AnnualAccounts->AccountsStatus))?'NC':$AnnualAccounts->AccountsStatus;?></td>
<?php endforeach; ?>
</tr>
<tr>
<td colspan="<?php echo $i+2; ?>"><hr /></td>
</tr>
<tr>
<td class="tdP"><b>Type de compte</b></td>
<tr >
<td class="head">
<a class="tooltip tooltipFont">Type de compte</a>
</td>
<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
<td><?php echo (empty($AnnualAccounts->AccountsType))?'NC':$AnnualAccounts->AccountsType;?></td>
<td class="right"><?php echo (empty($AnnualAccounts->AccountsType))?'NC':$AnnualAccounts->AccountsType;?></td>
<?php endforeach; ?>
</tr>
<tr>
<td colspan="<?php echo $i+2; ?>"><hr /></td>
</tr>
</table>
</tbody>
</table>
<br />
<a name="7"></a>
<span class="title" >Actif</span><br />
@ -169,8 +169,6 @@
<br />
<a name="10"></a>
<span class="title">KeyCreditRatios</span><br />
<table id="giant_synthese">
<thead>
<tr>

2
application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml
View File

@ -13,7 +13,7 @@
<?php $i=0;?>
<?php foreach($Dirigeant as $dir):$i++;?>
<tr>
<td class="colorTr" style="font-size:12px;padding:5px;">
<td class="line" style="font-size:12px;padding:5px;">
<?php echo $dir->FirstName.' '.$dir->LastName.'
<br /><b>Né(e) le:</b> '.((!empty($dir->DateOfBirth->_))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $dir->DateOfBirth->_):'NC').
' <br /><b>Domicilié(e) à :</b>'.(($dir->PersonalAddress->HouseNumber!=0)?$dir->PersonalAddress->HouseNumber:'').

47
application/views/default/scripts/giant/partials/rapports/Historiques.phtml
View File

@ -17,40 +17,43 @@
<?php endforeach;?>
</select>
</form>
<table style="margin-left: 19px;" width="97%" class="hoverTr">
<table id="giant_synthese">
<thead>
<tr>
<td><b>Date</b></td>
<td><b>Description</b></td>
<th align="center" class="date">Date</th>
<th align="right" class="date">Description</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="3"><hr style="border:1px dotted silver" /></td>
</tr>
<?php foreach($Events as $date => $event): ?>
<?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($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:$y.'/'.$m.'/'.$d;?></td>
<td><?php echo $val->Description;?></td>
</tr>
<tr>
<td colspan="3"><hr style="border:1px dotted silver" /></td>
</tr>
<?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:$y.'/'.$m.'/'.$d;?></td>
<td><?php echo $val->Description;?></td>
</tr>
<tr>
<td colspan="3"><hr style="border:1px dotted silver" /></td>
</tr>
<tr title="<?php echo $val->FreeText; ?>">
<td align="center" class="head">
<a style="cursor:help" class="tooltip" class="tooltip"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></a>
</td>
<td class="right"><?php echo $val->Description;?></td>
</tr>
<?php endif;?>
<?php else: ?>
<tr align="center" style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
<td class="head">
<a class="tooltip"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></a>
</td>
<td class="right"><?php echo $val->Description;?></td>
</tr>
<?php endif;?>
<?php endforeach;?>
<?php endforeach;?>
</table><br />
</tbody>
</table>
<br />
<?php endforeach;?>
<?php else :?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">

107
application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml
View File

@ -3,28 +3,27 @@
<a name="16"></a>
<span class="title">Actionnaires</span><br /><br />
<?php if(isset($this->report->Shareholder)):?>
<table style="font-size:12px;margin-left: 19px; text-align: center;" width="97%" class="hoverTr">
<tr style="font-weight:800">
<td>Identifiant</td>
<td>Nom société</td>
<td>Pourcentage d'actions</td>
<td>IsPrincipalStakeHolder</td>
</tr>
<table id="giant_synthese" style="font-size:12px;">
<thead>
<tr>
<td colspan="4"></td>
</tr>
<?php $i=0; foreach($this->report->Shareholder as $Shareholder):$i++;?>
<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
<td style="color:#c12b3c" align="center"><?php echo (($Shareholder->Company->CompanyId > 0)?$Shareholder->Company->CompanyId:'-')?></td>
<td style="padding:5px;font-size:12px;"><?php echo $Shareholder->Company->CompanyName[0]->_?></td>
<td style="padding:5px;font-size:12px;"><?php echo (!empty($Shareholder->Shares->Percentage))?$Shareholder->Shares->Percentage.'%':'NC'?> </td>
<td style="padding:5px;font-size:12px;"><?php echo (($Shareholder>IsPrincipalStakeHolder == 1)?'Oui':'Non');?></td>
<th align="right">Identifiant</th>
<th align="right">Nom société</th>
<th align="right">Pourcentage d'actions</th>
<th align="right">IsPrincipalStakeHolder</th>
</tr>
</thead>
<tbody>
<tr>
</tr>
<?php endforeach;?>
</table>
<?php foreach($this->report->Shareholder as $Shareholder):?>
<tr>
<td style="color:#c12b3c" align="center"><?php echo (($Shareholder->Company->CompanyId > 0)?$Shareholder->Company->CompanyId:'-')?></td>
<td class="right"><?php echo $Shareholder->Company->CompanyName[0]->_?></td>
<td class="right"><?php echo (!empty($Shareholder->Shares->Percentage))?$Shareholder->Shares->Percentage.'%':'NC'?> </td>
<td class="right"><?php echo (($Shareholder>IsPrincipalStakeHolder == 1)?'Oui':'Non');?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php else:?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
@ -36,26 +35,25 @@
<a name="17"></a>
<span class="title">Participations</span><br /><br />
<?php if(isset($this->report->Participation)):?>
<table style="font-size:12px;margin-left: 19px;" width="97%" class="hoverTr">
<tr style="font-weight:800">
<td>Identifiant</td>
<td>Nom société</td>
<td>Pourcentage d'actions</td>
</tr>
<table id="giant_synthese" style="font-size:12px;">
<thead>
<tr>
<td colspan="3"></td>
</tr>
<?php $i=0;foreach($this->report->Participation as $Participation):$i++;?>
<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
<td style="color:#c12b3c" align="center"><?php echo (($Participation->Company->CompanyId > 0)?$Participation->Company->CompanyId:'-')?></td>
<td style="padding:5px;font-size:12px;"><?php echo $Participation->Company->CompanyName[0]->_?></td>
<td style="padding:5px;font-size:12px;"><?php echo (!empty($Participation->Shares->Percentage))?$Participation->Shares->Percentage.'%':'NC';?> </td>
<th align="right">Identifiant</th>
<th align="right">Nom société</th>
<th align="right">Pourcentage d'actions</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="3"></td>
</tr>
<?php endforeach;?>
</table>
<?php foreach($this->report->Participation as $Participation):?>
<tr>
<td style="color:#c12b3c" align="center"><?php echo (($Participation->Company->CompanyId > 0)?$Participation->Company->CompanyId:'-')?></td>
<td class="right"><?php echo $Participation->Company->CompanyName[0]->_?></td>
<td class="right"><?php echo (!empty($Participation->Shares->Percentage))?$Participation->Shares->Percentage.'%':'NC'?> </td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php else:?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
@ -67,29 +65,30 @@
<a name="18"></a>
<span class="title">Etablissements</span><br /><br />
<?php if(isset($this->report->Branch)):?>
<table style="font-size:12px;margin-left: 19px;" width="97%" class="hoverTr">
<tr style="font-weight:800">
<td>Identifiant</td>
<td>Nom société</td>
<td>Adresse</td>
</tr>
<table id="giant_synthese" style="font-size:12px;">
<thead>
<tr>
<td colspan="3"></td>
<th align="right">Identifiant</th>
<th align="right">Nom société</th>
<th align="right">Adresse</th>
</tr>
<?php $i=0;foreach($this->report->Branch as $Branch):$i++;?>
<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
<td style="color:#c12b3c" align="center"><?php echo (($Branch->BranchId > 0)?$Branch->BranchId:'-')?></td>
<td style="padding:5px;font-size:12px;"><?php echo ((isset($Branch->BranchName))?$Branch->BranchName->_:'-')?></td>
<td style="padding:5px;font-size:12px;"><?php echo ((isset($Branch->BranchId))?$Branch->BranchAddress[0]->HouseNumber.' '.
</thead>
<tbody>
<tr>
<?php foreach($this->report->Branch as $Branch):?>
<tr>
<td style="color:#c12b3c" align="center"><?php echo (($Branch->BranchId > 0)?$Branch->BranchId:'-')?></td>
<td class="right"><?php echo ((isset($Branch->BranchName))?$Branch->BranchName->_:'-')?></td>
<td class="right"><?php echo ((isset($Branch->BranchId))?$Branch->BranchAddress[0]->HouseNumber.' '.
$Branch->BranchAddress[0]->Street.' '.
$Branch->BranchAddress[0]->PostCode.' '.
$Branch->BranchAddress[0]->City:'-')?></td>
</tr>
<tr>
<td colspan="3"></td>
</tr>
<?php endforeach;?>
</table>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php else:?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>

2
library/Giant/giant.ini
View File

@ -31,4 +31,6 @@ other = "10"
lifetime = "86403"
[test]
;1 = test mode
;0 = production
TestIndication = '1'

69
public/themes/default/styles/giant.css
View File

@ -22,6 +22,15 @@
font-weight: 800;
}
.minTitle {
background: none repeat scroll 0 0 #B9C9FE;
border: 1px solid #FFF;
color: #039;
font-size: 13px;
font-weight: 800;
padding: 4px;
}
.compteAnnuels .center {
text-align: center;
}
@ -141,7 +150,6 @@
background-color: #EDEEF7;
}
/** Giant rapport **/
.red {
font-size: 11px;
background-color: #FFE8E8;
@ -358,13 +366,58 @@
text-decoration: underline;
}
.testSearch a{
.testSearch a {
color: #008000;
font-style: italic;
}
#giant_synthese .head {font-weight: bold;}
#giant_synthese th {background: none repeat scroll 0 0 #B9C9FE;border: 1px solid #FFFFFF;color: #003399;font-size: 13px;font-weight: normal;padding: 4px;}
#giant_synthese td.right {text-align: right;}
#giant_synthese {border-collapse: collapse;clear: both;font-size: 12px;margin: 10px 0px 0;padding: 2px;text-align: left;width: 100%;font-family: arial,sans-serif;font-size: 11px;}
#giant_synthese td {background: none repeat scroll 0 0 #E8EDFF;border: 1px solid #FFFFFF;color: #666699;padding: 4px;}
#giant_synthese tr:hover td {background: none repeat scroll 0 0 #D0DAFD;}
.line {
background: none repeat scroll 0 0 #E8EDFF;
border: 1px solid #FFF;
padding: 4px;
}
.tooltipFont {
color: black;
font-size: 12px;
}
#giant_synthese .head {
font-weight: bold;
}
#giant_synthese th {
background: none repeat scroll 0 0 #B9C9FE;
border: 1px solid #FFFFFF;
color: #003399;
font-size: 13px;
padding: 4px;
}
#giant_synthese td.right {
text-align: right;
}
#giant_synthese {
border-collapse: collapse;
clear: both;
font-size: 12px;
margin: 10px 0px 0;
padding: 2px;
text-align: left;
width: 100%;
font-family: arial, sans-serif;
font-size: 11px;
}
#giant_synthese td {
background: none repeat scroll 0 0 #E8EDFF;
border: 1px solid #FFFFFF;
color: #666699;
padding: 4px;
}
#giant_synthese tr:hover td {
background: none repeat scroll 0 0 #D0DAFD;
}