Merge from 2.4

This commit is contained in:
Michael RICOIS 2013-06-27 12:20:35 +00:00
parent 615f8bf494
commit ba51166571
9 changed files with 332 additions and 202 deletions

View File

@ -314,7 +314,8 @@ class GiantController extends Zend_Controller_Action
$this->getRequest()->getParam('StartFrom'),
$this->getRequest()->getParam('InternalOrderId'),
$this->getRequest()->getParam('Pays'),
$this->TestIndication
$this->TestIndication,
$this->getRequest()->getParam('monitor_type')
);
$this->view->result = $result;

View File

@ -571,11 +571,10 @@ class SaisieController extends Zend_Controller_Action
$selectEvent = array(
'1100', '1101' , '1200', '1201', '1300', '1301', '1302', '1303', '1304', '1305', '1306',
'1307',
'1308', '1309', '1310', '1311', '1312', '1408', '1411', '1412', '1413', '1414', '1415',
'1511', '1502', '1503', '1512', '1600', '1601', '1999', '2102', '2100', '2202', '2206',
'2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '5500', '6700', '1010',
'1050', '1055', '2203', '2204', '2210', '2212',
'1307', '1308', '1309', '1310', '1311', '1312', '1408', '1411', '1412', '1413', '1414',
'1415', '1511', '1502', '1506', '1503', '1512', '1600', '1601', '1999', '2102', '2100',
'2202', '2206', '2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '5500',
'6700', '1010', '1050', '1055', '2203', '2204', '2210', '2212',
);
$eventM = new Application_Model_TabEvenements();
$sql = $eventM->select()

View File

@ -136,11 +136,26 @@
<a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start monitoring</a>
<a class="dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Stop monitoring</a>
<a class="dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Update monitoring</a>
<a class="retr" title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Retrive monitoring</a>
</div>
<br><br><br><br>
<div class='retrive_but'>
<a title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>/InternalOrderId/32768032781/StartFrom/1'>Retrive monitoring</a><br />
</div>
<div class="dialog-form" title="Create new user">
<form>
<fieldset>
<strong>Monitoring Type For: </strong><br />
<select name="EventType" class="mon_type">
<option value='Customer'>Customer</option>
<option value='Consumer'>Consumer</option>
<option value='Order'>Order</option>
</select><br /><br />
<strong>StartFrom: </strong><br />
<input type="text" name="StartFrom" value="" /> optional<br /><br />
<div class='int_order'><strong>InternalOrderId: </strong><br />
<input type="text" class='datepicker' name="InternalOrderId" value="32768032781"/> <br /><br /></div>
</fieldset>
</form>
</div>
<?php echo'<pre>';print_r($this->modification); ?>
<?php endif;?>

View File

@ -2,9 +2,15 @@
SYSTEM REQUIREMENTS
===================
- Apache 2.2
- Apache 2.2
libapache2-mod-php5
- PHP 5.2.x
- APC
php5-mysqlnd
php5-curl
php5-gd
php-apc
php-soap
php-xml-serializer
- Chartdir library
- browscap.ini (http://tempdownloads.browserscap.com/)
- wkhtmltopdf (http://code.google.com/p/wkhtmltopdf/)
@ -40,7 +46,7 @@ WKHTMLTOPDF
-----------
- Get the static version of wkhtmltopdf
- On Ubuntu :
sudo apt-get install libxrender1 libfontconfig
sudo apt-get install libxrender1 libfontconfig1
- Set execution flag (chmod +x)
- Test

View File

@ -79,10 +79,10 @@ Class GiantControllerLib
$result = $rapport->GetUpdateMonitoring($CompanyId, $InternalOrderId, $CategorieName, $EventType, $PreferredStartDate, $Version, $LanguageCode);
return ($result);
}
public function retrivemonitoring($CompanyId, $StartFrom,$InternalOrderId,$Pays,$TestIndication)
public function retrivemonitoring($CompanyId, $StartFrom,$InternalOrderId,$Pays,$TestIndication,$EventType)
{
$rapport = new GiantRechercheController($Pays, $TestIndication);
$result = $rapport->GetretriveMonitoring($CompanyId, $StartFrom,$InternalOrderId);
$result = $rapport->GetretriveMonitoring($CompanyId, $StartFrom,$InternalOrderId,$EventType);
return ($result);
}
protected function parcourTableau($array)
@ -278,10 +278,10 @@ Class GiantRechercheController extends GiantFunction
$result = $this->CreditData->getMethode('UpdateMonitoringOptions', array($CompanyId, $InternalOrderId, $CategorieName, $EventType, $PreferredStartDate, $Version, $LanguageCode));
return ($result);
}
public function GetRetriveMonitoring($CompanyId, $StartFrom, $InternalOrderId)
public function GetRetriveMonitoring($CompanyId, $StartFrom, $InternalOrderId,$EventType)
{
$this->CreditData = new CreditData($this->soapG, $CompanyId);
$result = $this->CreditData->getMethode('RetrieveMonitoringEventsForOrder', array($CompanyId, $StartFrom, $InternalOrderId));
$result = $this->CreditData->getMethode('RetrieveMonitoringEventsFor'.$EventType, array($CompanyId, $StartFrom, $InternalOrderId));
return ($result);
}
public function ListeRapport($CompanyId)

View File

@ -290,10 +290,10 @@ Class CreditData extends GiantFunction
return ($result);
}
protected function RetrieveMonitoringEventsForCustomer($StartFrom)
protected function RetrieveMonitoringEventsForCustomer($CompanyId, $StartFrom)
{
$parametres = new stdClass();
$parametres->StartFrom = $StartFrom;
if (!empty($StartFrom)) {$parametres->StartFrom = $StartFrom;}
try {
$result = $this->soapG->RetrieveMonitoringEventsForCustomer($parametres);
} catch (SoapFault $soapFault) {
@ -302,10 +302,10 @@ Class CreditData extends GiantFunction
return ($result);
}
protected function RetrieveMonitoringEventsForConsumer($StartFrom)
protected function RetrieveMonitoringEventsForConsumer($CompanyId, $StartFrom)
{
$parametres = new stdClass();
$parametres->StartFrom = $StartFrom;
if (!empty($StartFrom)) {$parametres->StartFrom = $StartFrom;}
try {
$result = $this->soapG->RetrieveMonitoringEventsForConsumer($parametres);
} catch (SoapFault $soapFault) {

View File

@ -54,7 +54,7 @@ $(document).ready( function()
$(".lang_val").val($('.lang0').text().substr($('.lang0').text().length - 2));
$('.'+$.alink+'').fadeIn(500);
});
$('select').on('change', function() {
$('select.lang_val').on('change', function() {
$('.lang_img').fadeOut();
$(".id_cr").attr("href","/giant/"+$.alink+"/Pays/"+location.pathname.match(/\/Pays\/([^\/]+)/)[1]+"/Type/"+$.alink_h+"/CompanyId/"+location.pathname.match(/\/CompanyId\/([^\/]+)/)[1]+"/Language/"+this.value);
$(".lang").attr("src","/themes/default/images/drapeaux/"+this.value+".png");
@ -64,6 +64,36 @@ $(document).ready( function()
$(function() {
$( ".monitor_but a,.retrive_but a" )
.button();
});
$.mon_type = $('.mon_type').val();
$('.retr').on('click', function(e){
e.preventDefault();
var title = $(this).attr('title');
var href = $(this).attr('href');
var dlgOpts = {
bgiframe: true,
title: title,
height: 241,
width: 250,
modal: true,
buttons: {'Envoyer': function() {$(location).attr('href',href+'/InternalOrderId/'+$("[name=InternalOrderId]").val()+'/StartFrom/'+$("[name=StartFrom]").val()+'/monitor_type/'+$.mon_type);},'Fermer': function() { $(this).dialog('close'); }},
close: function() { $(this).dialog('close'); }};
$('.dialog-form').dialog(dlgOpts);
return false;
});
if($('.mon_type').val()!='Order')
{
$('.int_order').fadeOut(500);
}
$('select.mon_type').on('change', function() {
$.mon_type = $(this).val();
if($(this).val()=='Order')
{
$('.int_order').fadeIn(500);
}
else{
$('.int_order').fadeOut(500);
}
});
});

View File

@ -1,260 +1,271 @@
.compteAnnuels .tdP{
font-size:13px;
.compteAnnuels .tdP {
font-size: 13px;
}
.compteAnnuels table {
width:645px;
width: 645px;
margin-left: 19px;
font-size:13px;
font-size: 13px;
}
.compteAnnuels hr {
border:1px dotted silver
border: 1px dotted silver
}
.compteAnnuels #tdP {
font-size:13px;
font-size: 13px;
}
.compteAnnuels .title {
font-size:16px;
color:#00008C;
font-weight:800;
font-size: 16px;
color: #00008C;
font-weight: 800;
}
.compteAnnuels .center {
text-align:center;
text-align: center;
}
.compteAnnuels .bilansTAB td {
font-size:11px; !important
font-size: 11px;
!
important
}
#AvisDeCredit {
margin-left: 19px;
width:97%;
width: 97%;
}
#AvisDeCredit td {
font-size:13px;
font-size: 13px;
}
#AvisDeCredit .float {
float:right;
float: right;
}
#AvisDeCredit hr {
border:1px dotted silver;
border: 1px dotted silver;
}
#AvisDeCredit div {
padding:0.7em;
padding: 0.7em;
}
#AvisDeCredit div span {
float: left; margin-right: 0.3em;
float: left;
margin-right: 0.3em;
}
#ComparisonValeurs span {
font-size:16px;
color:#00008C;
font-weight:800;
font-size: 16px;
color: #00008C;
font-weight: 800;
}
#ComparisonValeurs .Variation {
width:85px;
text-align:right;
width: 85px;
text-align: right;
}
#ComparaisonValeurs hr {
border:1px dotted silver;
border: 1px dotted silver;
}
#ComparisonValeurs div {
padding:0.7em;
padding: 0.7em;
}
.alignCenter {
text-align:center;
text-align: center;
}
#ComparaisonValeurs .align {
align="right"
#ComparaisonValeurs .align {align ="right"
}
#sommaire
{
margin:5px;
#sommaire {
margin: 5px;
}
#sommaire fieldset
{
#sommaire fieldset {
padding: 10px;
border:1px dotted silver;
border: 1px dotted silver;
padding-bottom: 70px;
}
#sommaire fieldset legend
{
font-size:25px;
#sommaire fieldset legend {
font-size: 25px;
font-weight: bold;
color:#000099;
color: #000099;
}
#sommaire h3
{
font-size:25px;
#sommaire h3 {
font-size: 25px;
font-weight: bold;
text-align: right;
margin-right: 10px;
}
#sommaire li
{
font-size:15px;
#sommaire li {
font-size: 15px;
list-style: none;
font-weight: 800;
margin-top: 10px;
}
#sommaire li a
{
color:#000099;
#sommaire li a {
color: #000099;
cursor: pointer;
}
#sommaire li a:hover
{
color:#9C093A;
#sommaire li a:hover {
color: #9C093A;
}
#sommaire span a:hover
{
color:#000099;
#sommaire span a:hover {
color: #000099;
}
#sommaire span a
{
color:#9C093A;
#sommaire span a {
color: #9C093A;
cursor: pointer;
}
#comportementPaiement tr td
{
padding:5px;
#comportementPaiement tr td {
padding: 5px;
}
.colorTr
{
.colorTr {
background-color: #EDEEF7;
}
/** Giant rapport **/
#ComparisonValeurs table
{
font-size:13px;
#ComparisonValeurs table {
font-size: 13px;
margin-left: 19px;
}
.red
{
font-size:11px;
background-color:#FFE8E8;
.red {
font-size: 11px;
background-color: #FFE8E8;
}
.green
{
font-size:11px;
background-color:#E8FFE8;
.green {
font-size: 11px;
background-color: #E8FFE8;
}
#ComparisonValeurs table tr:hover
{
#ComparisonValeurs table tr:hover {
background-color: #E0E4F8;
}
.hoverTr tr:hover
{
background-color: #E0E4F8;
cursor: default;
.hoverTr tr:hover {
background-color: #E0E4F8;
cursor: default;
}
.FR{background-image: url('/themes/default/images/giant/cartes/fr.png');background-repeat: no-repeat;background-position: top right;}
.NL{ background-image: url('/themes/default/images/giant/cartes/nl.JPG');background-repeat: no-repeat;background-position: top right;}
.BE{ background-image: url('/themes/default/images/giant/cartes/be.JPG');background-repeat: no-repeat;background-position: top right;}
.UK{ background-image: url('/themes/default/images/giant/cartes/uk.JPG');background-repeat: no-repeat;background-position: top right;}
.ES{ background-image: url('/themes/default/images/giant/cartes/es.JPG');background-repeat: no-repeat;background-position: top right;}
.FR {
background-image: url('/themes/default/images/giant/cartes/fr.png');
background-repeat: no-repeat;
background-position: top right;
}
#carte
{
width:660px;
.NL {
background-image: url('/themes/default/images/giant/cartes/nl.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.BE {
background-image: url('/themes/default/images/giant/cartes/be.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.UK {
background-image: url('/themes/default/images/giant/cartes/uk.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.ES {
background-image: url('/themes/default/images/giant/cartes/es.JPG');
background-repeat: no-repeat;
background-position: top right;
}
#carte {
width: 660px;
background-position: right top;
background-repeat: no-repeat;
background-color: #fcfdfe;
}
/** Giant Search **/
#info td
{
padding:2px;
#info td {
padding: 2px;
}
.giant-search
{
font-family: Arial,Helvetica,sans-serif;
.giant-search {
font-family: Arial, Helvetica, sans-serif;
color: #535353;
}
.giant-search #Paginator
{
color:black;
.giant-search #Paginator {
color: black;
}
.giant-search ol
{
text-align:left;
margin:10px;
padding:0 20px;
.giant-search ol {
text-align: left;
margin: 10px;
padding: 0 20px;
}
.giant-search #Paginator table
{
width:130px;
.giant-search #Paginator table {
width: 130px;
}
.giant-search #contact
{
padding-left:5px;
}
#inDebug
{
float:left;
}
#debug
{
background-color:#FFFFCC;
padding:10px;
border:1px solid silver;
width:590px;
overflow:auto;
.giant-search #contact {
padding-left: 5px;
}
#debug_menu
{
float:left;
background-color:#FFFFCC;
border:1px solid silver;
width:150px;
height:25px;
margin-bottom:2px;
padding-top:9px;
#inDebug {
float: left;
}
#debug_menu:hover
{
background-color:#FFFF99;
cursor:pointer;
#debug {
background-color: #FFFFCC;
padding: 10px;
border: 1px solid silver;
width: 590px;
overflow: auto;
}
.hide
{
#debug_menu {
float: left;
background-color: #FFFFCC;
border: 1px solid silver;
width: 150px;
height: 25px;
margin-bottom: 2px;
padding-top: 9px;
}
#debug_menu:hover {
background-color: #FFFF99;
cursor: pointer;
}
.hide {
background-color: silver;
height: 455px;
position: absolute;
top:2%;
width: 691px;
opacity:0.3;
height: 455px;
position: absolute;
top: 2%;
width: 691px;
opacity: 0.3;
}
.hide_monitor
{
.hide_monitor {
background-color: #C0C0C0;
height: 497px;
position: absolute;
@ -264,53 +275,54 @@
opacity: 0.3;
}
.radio_but
{
.radio_but {
width: 295px;
}
.lang_img
{
.lang_img {
display: none;
float:right;
margin-left:3px;
float: right;
margin-left: 3px;
}
.lang_select
{
float:right;
margin-left:3px;
.lang_select {
float: right;
margin-left: 3px;
}
.brsr {
border-style:solid;
border-width:1px;
border-color:red;
border-style: solid;
border-width: 1px;
border-color: red;
}
.all_select
{
.all_select {
width: 140px;
}
.acord
{
width:671px;
.acord {
width: 671px;
margin: 0 auto;
}
.gen_div{
width: 600px;
margin-left: 41px;
.gen_div {
width: 600px;
margin-left: 41px;
}
.left_div{
float:left;
width: 300px;
padding-bottom:15px;
.left_div {
float: left;
width: 300px;
padding-bottom: 15px;
}
.right_div{
float:left;
width: 300px;
padding-bottom:15px;
.right_div {
float: left;
width: 300px;
padding-bottom: 15px;
}
.radius
{
.radius {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
@ -319,22 +331,30 @@
-icab-border-radius: 4px;
border-radius: 4px;
}
.monitor_but
{
width: 441px;
margin: 0 auto;
.monitor_but {
width: 601px;
margin: 0 auto;
}
.monitor_but a
{
.monitor_but a {
margin: 7px;
float:left;
float: left;
}
.monitor_resp
{
.monitor_resp {
height: 16px;
clear: both;
margin: 5px;
padding: 5px;
background: #eee;
width: 601px;
}
.dialog-form {
display: none;
}
.mon_type {
width: 140px;
}

View File

@ -0,0 +1,59 @@
[production]
phpSettings.date.timezone = "Europe/Paris"
phpSettings.display_startup_errors = 0
phpSettings.display_errors = 0
phpSettings.soap.wsdl_cache_dir = APPLICATION_PATH "/../data/wsdl"
bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
bootstrap.class = "Bootstrap"
appnamespace = "Application"
resources.session.save_path = APPLICATION_PATH "/../data/sessions"
resources.useragent.mobile.features.path = APPLICATION_PATH "/../library/Zend/Http/UserAgent/Features/Adapter/Browscap.php"
resources.useragent.mobile.features.classname = "Zend_Http_UserAgent_Features_Adapter_Browscap"
resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
resources.frontController.plugins.Theme = "Application_Controller_Plugin_Theme"
resources.frontController.plugins.Lang = "Application_Controller_Plugin_Lang"
resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
resources.frontController.plugins.Pdf = "Application_Controller_Plugin_Pdf"
resources.frontController.plugins.Xml = "Application_Controller_Plugin_Xml"
resources.frontController.plugins.Cgu = "Application_Controller_Plugin_Cgu"
resources.frontController.params.displayExceptions = 0
resources.layout.layout = "main"
resources.layout.layoutPath = APPLICATION_PATH "/views/default"
resources.view.basePath = APPLICATION_PATH "/views/default"
autoloaderNamespaces[] = "Application_"
autoloaderNamespaces[] = "Scores_"
; Scores configuration
profil.server.name = sd-46528
profil.webservice.location = celeste
profil.mail.method = sendmail
profil.mail.email.support = support@scores-decisions.com
profil.mail.email.supportdev = supportdev@scores-decisions.com
profil.mail.email.contact = contact@scores-decisions.com
profil.mail.email.production = production@scores-decisions.com
profil.path.cache = APPLICATION_PATH "/../data/cache"
profil.path.files = APPLICATION_PATH "/../data/files"
profil.path.pages = APPLICATION_PATH "/../data/pages"
profil.path.data = "/home/vhosts/data"
profil.wkhtmltopdf.path = "/home/vhosts/data/wkhtml/linux/wkhtmltopdf-adm64"
profil.db.sdv1.adapter=mysqli
profil.db.sdv1.params.host=localhost
profil.db.sdv1.params.username=extranet
profil.db.sdv1.params.password=bGPZ9qYZQFHMYCnJ
profil.db.sdv1.params.dbname=extranet
profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
[staging : production]
resources.frontController.params.displayExceptions = 0
phpSettings.soap.wsdl_cache_enabled = 1
[development : production]
phpSettings.display_startup_errors = 1
phpSettings.display_errors = 1
phpSettings.soap.wsdl_cache_enabled = 0
resources.frontController.params.displayExceptions = 1
[testing : production]
phpSettings.display_startup_errors = 1
phpSettings.display_errors = 1