diff --git a/application/controllers/GiantController.php b/application/controllers/GiantController.php
index c1b498d51..205603471 100644
--- a/application/controllers/GiantController.php
+++ b/application/controllers/GiantController.php
@@ -9,29 +9,29 @@ require_once 'common/dates.php';
class GiantController extends Zend_Controller_Action
{
protected $TestIndication = true;
-
+
protected $TestCompanies = array(
- 'BE' => array(
- '0439546194', '0436576412', '0430459076', '0430000604', '0404869783', '0404869783',
- '0406952018'
- ),
- 'ES' => array(
- 'A00000000', 'A80192727'
- ),
- 'GB' => array(
- '00000086', '00082932', '98888888', '214436', '1777777', '991581', '1800000'
- ),
- 'NL' => array(
- '533885', '1383988', '1383989', '891962239', '891974008', '892130032', '896614719',
- '896614735', '896614735', '896615243'
- ),
- 'FR' => array(
- '55214450300018', '49496793800031', '47997411500012', '48765114300017',
- '43235433000040', '39435613300022', '39504742600014', '76980020200020',
- '35379698000020', '56202109700018', '70204756400068', '70204756400068'
- ),
+ 'BE' => array(
+ '0439546194', '0436576412', '0430459076', '0430000604', '0404869783', '0404869783',
+ '0406952018'
+ ),
+ 'ES' => array(
+ 'A00000000', 'A80192727'
+ ),
+ 'GB' => array(
+ '00000086', '00082932', '98888888', '214436', '1777777', '991581', '1800000'
+ ),
+ 'NL' => array(
+ '533885', '1383988', '1383989', '891962239', '891974008', '892130032', '896614719',
+ '896614735', '896614735', '896615243'
+ ),
+ 'FR' => array(
+ '55214450300018', '49496793800031', '47997411500012', '48765114300017',
+ '43235433000040', '39435613300022', '39504742600014', '76980020200020',
+ '35379698000020', '56202109700018', '70204756400068', '70204756400068'
+ ),
);
-
+
public function init()
{
@@ -63,32 +63,32 @@ class GiantController extends Zend_Controller_Action
{
$rechercheParams = new RechercheHistorique();
$giantFunction = new GiantFunction();
- if (count($rechercheParams->liste()) > 0)
- {
- $recherche = $rechercheParams->item(0);
- $type = $recherche['type'];
- $params = $recherche['params'];
- }
- $Commande = new Commandes();
- $user = new Scores_Utilisateur();
- $listeCommandes = $Commande->getCommandesByLogin($user->getLogin());
- $total = 0;
- $liste = $giantFunction->divCommande($listeCommandes, $total);
- $ListeRapport = new GiantRechercheController($params['pays'], $this->TestIndication);
- $result = $ListeRapport->ListeRapport($this->getRequest()->getParam('CompanyId'));
- $this->view->total = $total;
- $this->view->listeCommandes = $liste;
- $this->view->modification = (isset($result->MonitoringOptions))?($ListeRapport->getModification($result->MonitoringOptions->MonitoringOption[0])):null;
- $this->view->description = $ListeRapport->getDescription();
- $this->view->raisonSociale = $this->getRequest()->getParam('raisonSociale');
- $this->view->listeRapport = $result;
- $this->view->telephone = $this->getRequest()->getParam('telephone');
- $this->view->CompanyId = $this->getRequest()->getParam('CompanyId');
- $this->view->raisonSociale = $this->getRequest()->getParam('raisonSociale');
- $this->view->CompanyRegisterNumber = $this->getRequest()->getParam('CompanyRegisterNumber');
- $this->view->Pays = $this->getRequest()->getParam('Pays');
- $this->view->Adresse = explode(':', $this->getRequest()->getParam('Adresse'));
- if($this->view->debug)
+ if (count($rechercheParams->liste()) > 0)
+ {
+ $recherche = $rechercheParams->item(0);
+ $type = $recherche['type'];
+ $params = $recherche['params'];
+ }
+ $Commande = new Commandes();
+ $user = new Scores_Utilisateur();
+ $listeCommandes = $Commande->getCommandesByLogin($user->getLogin());
+ $total = 0;
+ $liste = $giantFunction->divCommande($listeCommandes, $total);
+ $ListeRapport = new GiantRechercheController($params['pays'], $this->TestIndication);
+ $result = $ListeRapport->ListeRapport($this->getRequest()->getParam('CompanyId'));
+ $this->view->total = $total;
+ $this->view->listeCommandes = $liste;
+ $this->view->modification = (isset($result->MonitoringOptions))?($ListeRapport->getModification($result->MonitoringOptions->MonitoringOption[0])):null;
+ $this->view->description = $ListeRapport->getDescription();
+ $this->view->raisonSociale = $this->getRequest()->getParam('raisonSociale');
+ $this->view->listeRapport = $result;
+ $this->view->telephone = $this->getRequest()->getParam('telephone');
+ $this->view->CompanyId = $this->getRequest()->getParam('CompanyId');
+ $this->view->raisonSociale = $this->getRequest()->getParam('raisonSociale');
+ $this->view->CompanyRegisterNumber = $this->getRequest()->getParam('CompanyRegisterNumber');
+ $this->view->Pays = $this->getRequest()->getParam('Pays');
+ $this->view->Adresse = explode(':', $this->getRequest()->getParam('Adresse'));
+ if($this->view->debug)
$this->view->soap = $ListeRapport->soapG;
}
@@ -96,10 +96,10 @@ class GiantController extends Zend_Controller_Action
{
$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
- $this->getRequest()->getParam('Type'),
- $this->getRequest()->getParam('Pays'),
- $this->getRequest()->getParam('Language'),
- $this->TestIndication
+ $this->getRequest()->getParam('Type'),
+ $this->getRequest()->getParam('Pays'),
+ $this->getRequest()->getParam('Language'),
+ $this->TestIndication
);
$creditrecommendationAction = array('getAvisDeCredit' => 'CreditRecommendation');
$creditrecommendation = unserialize(base64_decode($id));
@@ -124,13 +124,13 @@ class GiantController extends Zend_Controller_Action
{
$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
- $this->getRequest()->getParam('Type'),
- $this->getRequest()->getParam('Pays'),
- $this->getRequest()->getParam('Language'),
- $this->TestIndication
+ $this->getRequest()->getParam('Type'),
+ $this->getRequest()->getParam('Pays'),
+ $this->getRequest()->getParam('Language'),
+ $this->TestIndication
);
$compactAction = array('getAvisDeCredit' => 'CreditRecommendation', 'getPositionFinanciere' => 'FinancialSummary',
- 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position'
+ 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position'
);
$compact = unserialize(base64_decode($id));
$identiteController = new GiantIdentiteController($compact);
@@ -155,14 +155,14 @@ class GiantController extends Zend_Controller_Action
{
$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
- $this->getRequest()->getParam('Type'),
- $this->getRequest()->getParam('Pays'),
- $this->getRequest()->getParam('Language'),
- $this->TestIndication
+ $this->getRequest()->getParam('Type'),
+ $this->getRequest()->getParam('Pays'),
+ $this->getRequest()->getParam('Language'),
+ $this->TestIndication
);
$fullAction = array('getAvisDeCredit' => 'CreditRecommendation', 'getComptesAnnuels' => 'AnnualAccounts', 'getPositionFinanciere' => 'FinancialSummary',
- 'getComportementPaiement' => 'PaymentBehaviour', 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position',
- 'getComparaisonValeurs'=> 'PeerGroup', 'getHistoriques' => 'Event'
+ 'getComportementPaiement' => 'PaymentBehaviour', 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position',
+ 'getComparaisonValeurs'=> 'PeerGroup', 'getHistoriques' => 'Event'
);
$full = unserialize(base64_decode($id));
$full->DataSet->Company->CompanyId= $this->getRequest()->getParam('CompanyId');
@@ -187,7 +187,7 @@ class GiantController extends Zend_Controller_Action
{
$form = new Zend_Form();
$form->setMethod('post')
- ->setAction('investigation');
+ ->setAction('investigation');
$reference = $form->createElement('text', 'reference', array('label' => 'Votre Reference'));
$reference->setRequired(true);
@@ -224,4 +224,28 @@ class GiantController extends Zend_Controller_Action
} else
$this->view->form = $this->getForm();
}
+ public function startmonitoringAction()
+ {
+ $this->_helper->layout()->disableLayout();
+ $this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
+ $this->view->lang = $this->getRequest()->getParam('lang');
+ $this->view->CompanyId = $this->getRequest()->getParam('CompanyId');
+ $this->view->Pays = $this->getRequest()->getParam('Pays');
+ $this->view->values = $this->getRequest()->getParams();
+
+ if ($this->getRequest()->isPost()) {
+ $giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
+ $result = $giantController->monitoring($this->getRequest()->getParam('CompanyId'),
+ $this->getRequest()->getParam('CategoryName'),
+ $this->getRequest()->getParam('EventType'),
+ $this->getRequest()->getParam('StartDate'),
+ $this->getRequest()->getParam('EndDate'),
+ $this->getRequest()->getParam('Version'),
+ $this->getRequest()->getParam('LanguageCode'),
+ $this->getRequest()->getParam('Pays')
+ );
+ $this->view->result = $result;
+ }
+
+ }
}
\ No newline at end of file
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index aa9d56f1d..128dfdd16 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -335,8 +335,9 @@ class UserController extends Zend_Controller_Action
public function loginAction()
{
$this->view->inlineScript()
- ->appendFile('/libs/jquery/jquery-1.9.1.min.js')
- ->appendFile('/libs/jquery/jquery.infieldlabel.min.js');
+ ->appendFile('/libs/jquery/jquery.infieldlabel.min.js')
+ ->appendFile('/libs/jquery/jquery-1.9.1.min.js')
+ ->appendFile('/libs/ui-1.9.2/jquery-ui.min.js');
//@todo : gestion des affichages particuliers pour les clients
$this->view->headTitle()->append('Connexion');
@@ -547,5 +548,75 @@ class UserController extends Zend_Controller_Action
print_r($device->getAllFeatures());
echo "";
}
-
+
+ /**
+ * Sends email to the specific client, who requests for forgotten password
+ */
+ public function motpasseAction()
+ {
+ $request = $this->getRequest();
+ $name = 'Mot de passe, Identifiant oubliés';
+ $params = array(
+ 'identifiant' => '',
+ 'telephone' => '',
+ 'email' => '',
+ 'nom' => '',
+ 'prenom' => '',
+ 'fonction' => '',
+ 'rsociale' => '',
+ );
+
+ if ( $request->isXmlHttpRequest() ) {
+ $this->_helper->layout()->disableLayout();
+ if ( $request->isPost() ) {
+ $params = $request->getParams();
+ $message = '';
+
+ $paramlist = array(
+ 'telephone' => 'Numéro de téléphone direct',
+ 'email' => 'Adresse email',
+ 'nom' => 'Nom',
+ 'prenom' => 'Prénom',
+ 'fonction' => 'Fonction',
+ 'rsociale' => 'Sociale',
+ );
+
+ foreach ($paramlist as $item => $val) {
+ if (!isset($params[$item])) {
+ $message .= "Valeur $val vide !
- Consulter le rapport en immédiat
+ Consulter le rapport en immédiat
@@ -129,4 +129,12 @@
+
+
+ Liste des monitoring
+
+ Start monitoring
+ ';print_r($this->modification); ?>
+
+
diff --git a/application/views/default/scripts/giant/startmonitoring.phtml b/application/views/default/scripts/giant/startmonitoring.phtml
new file mode 100644
index 000000000..42b1962e7
--- /dev/null
+++ b/application/views/default/scripts/giant/startmonitoring.phtml
@@ -0,0 +1,34 @@
+
+
+'; print_r($this->values);print_r($this->result);?>
+
Encours
-
K€ (de 0 à 500 K€)
'IndiScore', 'scoreDir' => 'Score dirigeance', 'scoreConf' => 'Score de conformité');
+$select = array('scoreConf' => 'Score de conformité', 'scoreDir' => 'Score dirigeance', 'scoreSolv' => 'IndiScore');
foreach($select as $item => $val) {
?>
- ---
+ ---
typescore; $i++) {
$selected = '';
- if ($i == $getcutoff[$item]) {
+ if (is_numeric($getcutoff[$item]) && $i == $getcutoff[$item]) {
$selected = 'selected';
}
- echo ''.$i.' ';
+ echo ''.$i.' ';
}
?>
diff --git a/application/views/default/scripts/user/login.phtml b/application/views/default/scripts/user/login.phtml
index ec15f9fa0..3016244bb 100644
--- a/application/views/default/scripts/user/login.phtml
+++ b/application/views/default/scripts/user/login.phtml
@@ -1,6 +1,7 @@
doctype()?>
+
headMeta();?>
headTitle();?>
@@ -606,7 +607,7 @@ $(document).ready(function(){
-
+
action('motpasse','user', null); ?>
diff --git a/application/views/default/scripts/user/motpasse.phtml b/application/views/default/scripts/user/motpasse.phtml
new file mode 100644
index 000000000..37422962d
--- /dev/null
+++ b/application/views/default/scripts/user/motpasse.phtml
@@ -0,0 +1,167 @@
+href) {?>
+
+name?>
+
+
+
+
+
+
+message!='') {?>
+
+
+params;
+?>
+
+
+
Cher client,
+
+Pour recevoir votre mot de passe ou votre identifiant oubliés, nous vous invitons à saisir les informations ci-dessous et cliquer sur valider.
+A réception de ces données, nous vous informerons par e-mail.
+
+Tous les champs (*) sont obligatoires : en cas de données manquantes ou erronées , votre demande ne pourra pas être prise en compte par nos services. * = champ obligatoire.
+
+
+
+Les informations que vous nous communiquez dans ce formulaire seront utilisées exclusivement par nos services internes pour le traitement de votre demande et pour personnaliser la communication.
+
+
Modifications au '.date('d/m/Y').' Modifications au '.date('d/m/Y').' ';
foreach($array as $name => $ar) {
$html .= ''.$name.' :
').dialog(dlgOpts);
+ return false;
+ });
+
+ $('.idpr,.id_cr').on('click', function(){
//e.preventDefault();
var n = $(this).attr('id');
@@ -10,7 +30,6 @@ $(document).ready( function()
$('#p'+n).css('display', 'none');
}
});
-
$('.tooltip').each(function(){
var title = $(this).attr('title');
var width = $(this).attr('wdth');
@@ -22,22 +41,25 @@ $(document).ready( function()
position: { at: "bottom center", my: "top center" }
});
});
-
- $( "#radio" ).buttonset();
-
+ $(function() {
+ $( "#radio" ).buttonset();
+ $("#radio1").trigger('click');
+ });
$('.radio').on('click', function() {
$('.lang_img').fadeOut();
$.alink = this.value.toLowerCase();
$.alink_h = this.value;
- $(".idpr").attr("href","/giant/"+$.alink+"/Pays/"+location.pathname.match(/\/Pays\/([^\/]+)/)[1]+"/Type/"+$.alink_h+"/CompanyId/"+location.pathname.match(/\/CompanyId\/([^\/]+)/)[1]+"/Language/"+$('.lang0').text().substr($('.lang0').text().length - 2));
+ $(".id_cr").attr("href","/giant/"+$.alink+"/Pays/"+location.pathname.match(/\/Pays\/([^\/]+)/)[1]+"/Type/"+$.alink_h+"/CompanyId/"+location.pathname.match(/\/CompanyId\/([^\/]+)/)[1]+"/Language/"+$('.lang0').text().substr($('.lang0').text().length - 2));
$(".lang").attr("src","/themes/default/images/drapeaux/"+$('.lang0').text().substr($('.lang0').text().length - 2)+".png");
$(".lang_val").val($('.lang0').text().substr($('.lang0').text().length - 2));
$('.'+$.alink+'').fadeIn(500);
});
$('select').on('change', function() {
$('.lang_img').fadeOut();
- $(".idpr").attr("href","/giant/"+$.alink+"/Pays/"+location.pathname.match(/\/Pays\/([^\/]+)/)[1]+"/Type/"+$.alink_h+"/CompanyId/"+location.pathname.match(/\/CompanyId\/([^\/]+)/)[1]+"/Language/"+this.value);
+ $(".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");
$('.'+$.alink+'').fadeIn(500);
- });
+ });
+
+
});
\ No newline at end of file
diff --git a/public/themes/default/scripts/giant_monitoring.js b/public/themes/default/scripts/giant_monitoring.js
new file mode 100644
index 000000000..08176b2a1
--- /dev/null
+++ b/public/themes/default/scripts/giant_monitoring.js
@@ -0,0 +1,43 @@
+function validate() {
+ $("[required]").each(function() {
+ if (!$(this).val()) {
+ $(this).addClass('brsr');
+ } else {
+ $(this).removeClass('brsr');
+ }
+ });
+};
+$('[required]').blur(function() {
+ validate();
+});
+$(document).ready(function() {
+ validate();
+
+ $(function() {
+ $("#datepicker").datepicker($.datepicker.regional["fr"]);
+ });
+ $(function() {
+ $("#datepicker1").datepicker($.datepicker.regional["fr"]);
+ });
+ $('#dial').dialog({
+ buttons : [ {
+ text : "Valider",
+ click : function() {
+ var values = $(this).find('form').serialize();
+ $.post('/giant/startmonitoring', values, function(data) {
+ $('#dial').html(data);
+
+ });
+
+ }
+ }, {
+ text : "Fermer",
+ click : function() {
+ if ($(".message p").text() == 'Cut-off mis à jour.') {
+ location.reload();
+ }
+ $(this).dialog('close');
+ }
+ } ]
+ });
+});
diff --git a/public/themes/default/scripts/motpasse.js b/public/themes/default/scripts/motpasse.js
new file mode 100644
index 000000000..acd056e8d
--- /dev/null
+++ b/public/themes/default/scripts/motpasse.js
@@ -0,0 +1,64 @@
+function fill() {
+ $("input#frm").each(function() {
+ var td_id = $(this).attr("name");
+ $("td#"+td_id).text($(this).val());
+ });
+}
+
+function validate() {
+ var allvals = true;
+ $("[required]").each(function() {
+ if(!$(this).val()) {
+ allvals = false;
+ $(this).addClass('brsr');
+ }
+ else { $(this).removeClass('brsr'); }
+ });
+ return allvals;
+}
+
+function isEmail(email) {
+ var emailval = true;
+ var regex = /^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ if (!regex.test(email.val())) {
+ emailval = false;
+ $(email).addClass('brsr');
+ }
+ else {
+ $(email).removeClass('brsr');
+ }
+ return emailval;
+}
+
+$(document).ready(function(){
+ validate();
+ isEmail($('[name=email]'));
+});
+
+$('[required]').blur(function(){
+ validate();
+});
+
+$('#dlg').dialog({ buttons: [
+ { text: "Valider", click: function() {
+ fill();
+ $("[name='mailbody']").val($("#alwayshidden").html());
+ var values = $(this).find('form').serialize();
+ if (validate() && isEmail($('[name=email]'))) {
+ if ($('.loading').css('display')=='none') {
+ $('.loading').css('display', 'block');
+ $('.ui-dialog-content').css('overflow','hidden');
+ $(".ui-dialog-buttonpane button:contains('Valider')").button("disable");
+ }
+ else { $('.loading').css('display', 'none');}
+ $.post('/user/motpasse', values, function(data) {
+ $('#dlg').html(data);
+ $('pre').hide();
+ $('#htxt').height(50);
+ $('input#frm').attr("disabled", "disabled");
+ $(".ui-dialog-buttonpane button:contains('Valider')").hide();
+ });
+ }
+ }},
+ { text: "Annuler", click: function() { $(this).dialog('close'); }}
+] });
\ No newline at end of file
diff --git a/public/themes/default/scripts/scorecutoff.js b/public/themes/default/scripts/scorecutoff.js
index 1bc6ad237..c5894715f 100644
--- a/public/themes/default/scripts/scorecutoff.js
+++ b/public/themes/default/scripts/scorecutoff.js
@@ -39,7 +39,7 @@ $('#dialog').dialog({ buttons: [
}
}},
{ text: "Fermer", click: function() {
- if($(".message p").text()) { location.reload(); }
+ if($(".message p").text()=='Cut-off mis à jour.') { location.reload(); }
$(this).dialog('close');
}
}
diff --git a/public/themes/default/styles/giant.css b/public/themes/default/styles/giant.css
index b053a6c2d..769f70fba 100644
--- a/public/themes/default/styles/giant.css
+++ b/public/themes/default/styles/giant.css
@@ -270,4 +270,13 @@
float:right;
margin-left:3px;
+}
+.brsr {
+ border-style:solid;
+ border-width:1px;
+ border-color:red;
+}
+.all_select
+{
+ width: 140px;
}
\ No newline at end of file
