diff --git a/application/controllers/GiantController.php b/application/controllers/GiantController.php index 3ccc52ff8..8bf2d88a3 100644 --- a/application/controllers/GiantController.php +++ b/application/controllers/GiantController.php @@ -362,23 +362,16 @@ class GiantController extends Zend_Controller_Action } endforeach; $this->view->val_siren = $merged_siren; - /* + $sess = new stdClass(); $sess->mon_result = $result; - + $auth = Zend_Auth::getInstance(); if ( $auth->hasIdentity() ) { - $this->identity = $auth->getIdentity(); - } - $this->giant->monitoring = $sess; - $auth->getStorage()->write($this->giant); - */ - $type = $this->getRequest()->getParam('Type'); - if(isset($type)) - { - $this->_helper->layout()->disableLayout(); - print_r($this->getRequest()->getParams()); + $identity = $auth->getIdentity(); } + $identity->result = $sess; + $auth->getStorage()->write($identity); } public function retAction() { @@ -386,4 +379,15 @@ class GiantController extends Zend_Controller_Action $resultDB = $giantController->retrivDB($this->getRequest()->getParam('date_st')); print_r($resultDB[0]['ActualStartDate']); } + public function reteventsAction() + { + $this->_helper->layout()->disableLayout(); + $auth = Zend_Auth::getInstance(); + $identity = $auth->getIdentity(); + $result = $auth->getStorage()->read($identity); + $this->view->result = $result->result->mon_result; + + unset($identity->result); + $auth->getStorage()->write($identity); + } } \ No newline at end of file diff --git a/application/views/default/scripts/giant/retevents.phtml b/application/views/default/scripts/giant/retevents.phtml new file mode 100644 index 000000000..e0763801f --- /dev/null +++ b/application/views/default/scripts/giant/retevents.phtml @@ -0,0 +1,214 @@ +
+

SURVEILLANCE

+
+source) ){ +?> + + + + + + + + + +
Nombre d'entités affichéesresult->MonitoringEvents->MonitoringEvent)?>
Nombre de surveillancesval)?>
+ + + + + + +
Nombre de surveillances source?>nbSurveillances?>
+ +
+ + + +

Options de recherche

+ +
+ + +
+
+Tri + +par + +
+ +
+
+" /> + +
+
+ + +

Liste des surveillances

+
+curPage>=1) { ?> + + +curPage!=$this->totPage) { ?> +Page / totPage?> + + +curPage+1<$this->totPage) { ?> + + +
+ +
+ + + + + + + + + + + + +val_siren as $monitor) {?> +
+ + + + + + + + +
SirenRaison SocialeSurveillanceAjout leEnvoyé le
+

Company->CompanyId ?>

+
+

Company->CompanyName['0']->_ ?>

+
+ Company->Event[0]->EventCode."' href='/giant/retrive/Type/".$monitor_type->Company->Event[0]->EventCode."'>

".$monitor_type->Company->Event[0]->EventCode."

"; + } //Fin foreach?> +
+ ".$this->action('ret', 'giant',null,array('date_st'=>$monitor_type->ProviderOrderId)).'

'; + } + ?> +
+ ".$monitor_type->Company->Event[0]->Date->_."

"; + } + ?> +
+
+ +
+curPage>=1) { ?> + + +curPage!=$this->totPage) { ?> +Page / totPage?> + + +curPage+1<$this->totPage) { ?> + + +
+ +
+ + + + diff --git a/application/views/default/scripts/giant/retrive.phtml b/application/views/default/scripts/giant/retrive.phtml index d6da86e3b..027c883fd 100644 --- a/application/views/default/scripts/giant/retrive.phtml +++ b/application/views/default/scripts/giant/retrive.phtml @@ -108,7 +108,7 @@ par Company->Event[0]->EventCode."' href='/giant/retrive/Type/".$monitor_type->Company->Event[0]->EventCode."'>

".$monitor_type->Company->Event[0]->EventCode."

"; + echo "

".$monitor_type->Company->Event[0]->EventCode."

"; } //Fin foreach?> diff --git a/public/themes/default/scripts/giant.js b/public/themes/default/scripts/giant.js index 466016325..2742d7d3f 100644 --- a/public/themes/default/scripts/giant.js +++ b/public/themes/default/scripts/giant.js @@ -4,7 +4,6 @@ $(document).ready( function() e.preventDefault(); var title = $(this).attr('title'); var href = $(this).attr('href'); - var host = 'http://'+window.location.hostname+$(this).attr('href'); alert($(this).attr('value')); var dlgOpts = { bgiframe: true,