diff --git a/application/configs/menu.input.php b/application/configs/menu.input.php new file mode 100644 index 000000000..cf7c9b16a --- /dev/null +++ b/application/configs/menu.input.php @@ -0,0 +1,17 @@ + "Retour à la fiche d'identite", + 'uri' => "#", + 'pages' => array( + array( + 'label' => "Fiche", + 'module' => 'legal', + 'controller' => 'identite', + 'action' => 'fiche', + ), + + ), + ), + +); \ No newline at end of file diff --git a/application/modules/input/controllers/IndexController.php b/application/modules/input/controllers/IndexController.php index 63166147c..1f42fddbe 100644 --- a/application/modules/input/controllers/IndexController.php +++ b/application/modules/input/controllers/IndexController.php @@ -547,7 +547,7 @@ class Input_IndexController extends Zend_Controller_Action { $request = $this->getRequest(); $champ = $request->getParam('champ', ''); - $this->renderScript('saisie/champs/'.$champ.'.phtml'); + $this->renderScript('index/champs/'.$champ.'.phtml'); } /** diff --git a/application/modules/input/controllers/MandataireController.php b/application/modules/input/controllers/MandataireController.php index b529542c4..289540a55 100644 --- a/application/modules/input/controllers/MandataireController.php +++ b/application/modules/input/controllers/MandataireController.php @@ -260,15 +260,15 @@ class Input_MandataireController extends Zend_Controller_Action $error = true; } - if($tabMandataires['Nom']=='' ){$fields[] ='Nom'; $error = true;} - if($tabMandataires['type']==''){$fields[] ='Type'; $error = true;} - if($tabMandataires['tribunal']==''){$fields[] ='Tribunal'; $error = true;} - if($tabMandataires['coursAppel']==''){$fields[] ='Cours d\'appel'; $error = true;} - if($tabMandataires['Statut']==''){$fields[] ='Statut'; $error = true;} - if($tabMandataires['adresse']==''){$fields[] ='Adresse'; $error = true;} - if($tabMandataires['cp']==''){$fields[] ='Code Postal'; $error = true;} - if($tabMandataires['ville']==''){$fields[] ='Ville'; $error = true;} - if($tabMandataires['tel']==''){$fields[] ='Téléphone'; $error = true;} + if($tabMandataires['Nom']=='' ){$fields ='Nom'; $error = true;} + if($tabMandataires['type']==''){$fields ='Type'; $error = true;} + if($tabMandataires['tribunal']==''){$fields ='Tribunal'; $error = true;} + if($tabMandataires['coursAppel']==''){$fields ='Cours d\'appel'; $error = true;} + if($tabMandataires['Statut']==''){$fields ='Statut'; $error = true;} + if($tabMandataires['adresse']==''){$fields='Adresse'; $error = true;} + if($tabMandataires['cp']==''){$fields ='Code Postal'; $error = true;} + if($tabMandataires['ville']==''){$fields ='Ville'; $error = true;} + if($tabMandataires['tel']==''){$fields ='Téléphone'; $error = true;} //Envoi de la requête au webservices if ($error==true){ diff --git a/application/modules/input/views/default/scripts/index/annoncedialog.phtml b/application/modules/input/views/default/scripts/index/annoncedialog.phtml index 8a7b5fc65..a2cb4b20a 100644 --- a/application/modules/input/views/default/scripts/index/annoncedialog.phtml +++ b/application/modules/input/views/default/scripts/index/annoncedialog.phtml @@ -34,7 +34,7 @@ Siren / Siret : -action('form', 'saisie', null, array('siret'=>$this->siret))?> +action('form', 'index', 'input', array('siret'=>$this->siret))?> message; }?> diff --git a/application/modules/input/views/default/scripts/index/champs/administrateur.phtml b/application/modules/input/views/default/scripts/index/champs/administrateur.phtml index 828b1f6b4..b4fef6a3a 100644 --- a/application/modules/input/views/default/scripts/index/champs/administrateur.phtml +++ b/application/modules/input/views/default/scripts/index/champs/administrateur.phtml @@ -5,15 +5,19 @@ if ( !isset($inEditDialog) || $inEditDialog === false ) { $tribunal = $saisie['tribunal']; } ?> - - +
+ +
+ + href="url(array('module'=>'input','controller'=>'mandataire', 'action'=>'add'))?>"> Edition mandataire

+ href="url(array('module'=>'input','controller'=>'mandataire', 'action'=>'edit', 'tribunal'=>$tribunal))?>"> Ajouter un administrateur -

\ No newline at end of file +

+
+
diff --git a/application/modules/input/views/default/scripts/index/champs/mandataire.phtml b/application/modules/input/views/default/scripts/index/champs/mandataire.phtml index 2e3b3cd84..7a1adab4d 100644 --- a/application/modules/input/views/default/scripts/index/champs/mandataire.phtml +++ b/application/modules/input/views/default/scripts/index/champs/mandataire.phtml @@ -5,15 +5,19 @@ if ( !isset($inEditDialog) || $inEditDialog === false ) { $tribunal = $saisie['tribunal']; } ?> - - +
+ +
+ + href="url(array('module'=>'input','controller'=>'mandataire', 'action'=>'add'))?>"> Edition mandataire

+ href="url(array('module'=>'input','controller'=>'mandataire', 'action'=>'edit', 'tribunal'=>$tribunal))?>"> Ajouter un mandataire -

\ No newline at end of file +

+
+
diff --git a/application/modules/input/views/default/scripts/index/even/0000.phtml b/application/modules/input/views/default/scripts/index/even/0000.phtml index c772e07a6..0f75ee2f6 100644 --- a/application/modules/input/views/default/scripts/index/even/0000.phtml +++ b/application/modules/input/views/default/scripts/index/even/0000.phtml @@ -1 +1 @@ -

Sélectionner l'évènement ou le jugement, pour faire apparaître le formulaire.

\ No newline at end of file +

Sélectionner l'évènement ou le jugement, pour faire apparaître le formulaire.

\ No newline at end of file diff --git a/application/modules/input/views/default/scripts/index/even/1010.phtml b/application/modules/input/views/default/scripts/index/even/1010.phtml index 60766f3f2..a33b75153 100644 --- a/application/modules/input/views/default/scripts/index/even/1010.phtml +++ b/application/modules/input/views/default/scripts/index/even/1010.phtml @@ -1,7 +1,17 @@ - - +
+ +
+ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> - - \ No newline at end of file +
+
+ +action('champs', 'index', "input", array( 'champ' => 'administrateur'))?> +action('champs', 'index', "input", array( 'champ' => 'mandataire'))?> + +
+ +
+ +
+
diff --git a/application/modules/input/views/default/scripts/index/even/1050.phtml b/application/modules/input/views/default/scripts/index/even/1050.phtml index d62c02b5e..8a05e68b6 100644 --- a/application/modules/input/views/default/scripts/index/even/1050.phtml +++ b/application/modules/input/views/default/scripts/index/even/1050.phtml @@ -1,4 +1,4 @@ -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> \ No newline at end of file diff --git a/application/modules/input/views/default/scripts/index/even/1055.phtml b/application/modules/input/views/default/scripts/index/even/1055.phtml index d62c02b5e..8a05e68b6 100644 --- a/application/modules/input/views/default/scripts/index/even/1055.phtml +++ b/application/modules/input/views/default/scripts/index/even/1055.phtml @@ -1,4 +1,4 @@ -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> \ No newline at end of file diff --git a/application/modules/input/views/default/scripts/index/even/1100.phtml b/application/modules/input/views/default/scripts/index/even/1100.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1100.phtml +++ b/application/modules/input/views/default/scripts/index/even/1100.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1200.phtml b/application/modules/input/views/default/scripts/index/even/1200.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1200.phtml +++ b/application/modules/input/views/default/scripts/index/even/1200.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1201.phtml b/application/modules/input/views/default/scripts/index/even/1201.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1201.phtml +++ b/application/modules/input/views/default/scripts/index/even/1201.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1300.phtml b/application/modules/input/views/default/scripts/index/even/1300.phtml index 75429ccad..671d6791b 100644 --- a/application/modules/input/views/default/scripts/index/even/1300.phtml +++ b/application/modules/input/views/default/scripts/index/even/1300.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index','input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1301.phtml b/application/modules/input/views/default/scripts/index/even/1301.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1301.phtml +++ b/application/modules/input/views/default/scripts/index/even/1301.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1302.phtml b/application/modules/input/views/default/scripts/index/even/1302.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1302.phtml +++ b/application/modules/input/views/default/scripts/index/even/1302.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1303.phtml b/application/modules/input/views/default/scripts/index/even/1303.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1303.phtml +++ b/application/modules/input/views/default/scripts/index/even/1303.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1304.phtml b/application/modules/input/views/default/scripts/index/even/1304.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1304.phtml +++ b/application/modules/input/views/default/scripts/index/even/1304.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1305.phtml b/application/modules/input/views/default/scripts/index/even/1305.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1305.phtml +++ b/application/modules/input/views/default/scripts/index/even/1305.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1306.phtml b/application/modules/input/views/default/scripts/index/even/1306.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1306.phtml +++ b/application/modules/input/views/default/scripts/index/even/1306.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1307.phtml b/application/modules/input/views/default/scripts/index/even/1307.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1307.phtml +++ b/application/modules/input/views/default/scripts/index/even/1307.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1308.phtml b/application/modules/input/views/default/scripts/index/even/1308.phtml index 75429ccad..27caefcce 100644 --- a/application/modules/input/views/default/scripts/index/even/1308.phtml +++ b/application/modules/input/views/default/scripts/index/even/1308.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input',array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input',array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1309.phtml b/application/modules/input/views/default/scripts/index/even/1309.phtml index 75429ccad..f509400bb 100644 --- a/application/modules/input/views/default/scripts/index/even/1309.phtml +++ b/application/modules/input/views/default/scripts/index/even/1309.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> diff --git a/application/modules/input/views/default/scripts/index/even/1312.phtml b/application/modules/input/views/default/scripts/index/even/1312.phtml index 60766f3f2..9562cc389 100644 --- a/application/modules/input/views/default/scripts/index/even/1312.phtml +++ b/application/modules/input/views/default/scripts/index/even/1312.phtml @@ -1,7 +1,7 @@ (Format JJ/MM/AAAA) -action('champs', 'saisie', null, array( 'champ' => 'administrateur'))?> -action('champs', 'saisie', null, array( 'champ' => 'mandataire'))?> +action('champs', 'index', 'input', array( 'champ' => 'administrateur'))?> +action('champs', 'index', 'input', array( 'champ' => 'mandataire'))?> \ No newline at end of file diff --git a/application/modules/input/views/default/scripts/index/even/5500.phtml b/application/modules/input/views/default/scripts/index/even/5500.phtml index 3341870d8..43cf9ca32 100644 --- a/application/modules/input/views/default/scripts/index/even/5500.phtml +++ b/application/modules/input/views/default/scripts/index/even/5500.phtml @@ -16,7 +16,7 @@ $tabPerimetreVente = array( ); ?> -action('champs', 'saisie', null, array('champ' => 'opposition'))?> +action('champs', 'index', 'input', array('champ' => 'opposition'))?> (Format JJ/MM/AAAA) diff --git a/application/modules/input/views/default/scripts/index/form.phtml b/application/modules/input/views/default/scripts/index/form.phtml index 8953bb808..1e0d525a3 100644 --- a/application/modules/input/views/default/scripts/index/form.phtml +++ b/application/modules/input/views/default/scripts/index/form.phtml @@ -1,5 +1,7 @@ - - saisie['source']) || $this->saisie['source']=='TS' ){ @@ -34,24 +36,37 @@ if (count($this->ListeJalCollecte)>0) { } ?> - -
- - -(Format JJ/MM/AAAA) +
-
- - + +
+ +
+ +(Format JJ/MM/AAAA) +
- - -(Format JJ/MM/AAAA) +
+ +
+ +
+
- - +(Format JJ/MM/AAAA) +
+ + +
+ +
+ +
+
- - tabEvent)>0) { @@ -104,6 +123,9 @@ if (count($this->tabEvent)>0) { } ?> -
+
+ + +
action('even','index', 'input', array('num'=> $this->eventNum, 'siren'=>substr($this->siret,0,9)))?> -
\ No newline at end of file + diff --git a/application/modules/input/views/default/scripts/index/index.phtml b/application/modules/input/views/default/scripts/index/index.phtml index 75bf73737..2bd9d5de3 100644 --- a/application/modules/input/views/default/scripts/index/index.phtml +++ b/application/modules/input/views/default/scripts/index/index.phtml @@ -1,4 +1,4 @@ -
+
@@ -71,43 +71,73 @@ else ?>
- -
+
+
-

Dénomination sociale et coordonnées

-
+

Dénomination sociale et coordonnées

+ -
- - - - - - - - - - +
+ +
+ +
-

Activité(s) et Chiffres d'Affaires

-
+
+ +
+ +
+
- - - - +
+ +
+ +
+
- - - - +
+
+ +

Activité(s) et Chiffres d'Affaires

+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
-

BODACC

-
+ + +

BODACC

+
action('form','index', 'input', array( 'siret' => $this->siret))?>
-

Informations diverses

-
+

Informations diverses

-
- - +
+ +
+ +
- - -
- +
+ +
+ +
+
+
etab->autreId,0,1)=='W'){ $waldec = $this->etab->autreId; } ?> -
- - + +
+ +
+ +
-
- -
+
etab->FJ,0,1)=='1' || in_array($this->etab->FJ, array(2310, 232 $disable = ''; } ?> -
- -/> + + +
+ +
+/>
+
-
\ No newline at end of file diff --git a/application/modules/input/views/default/scripts/index/refusrncs.phtml b/application/modules/input/views/default/scripts/index/refusrncs.phtml index 656482f4b..918f8d0c1 100644 --- a/application/modules/input/views/default/scripts/index/refusrncs.phtml +++ b/application/modules/input/views/default/scripts/index/refusrncs.phtml @@ -1,4 +1,5 @@ - - \ No newline at end of file + +
+ diff --git a/application/modules/input/views/default/scripts/index/save.phtml b/application/modules/input/views/default/scripts/index/save.phtml index 464e06c46..30fd78688 100644 --- a/application/modules/input/views/default/scripts/index/save.phtml +++ b/application/modules/input/views/default/scripts/index/save.phtml @@ -1,5 +1,5 @@ -
-

Saisie

+
+

Saisie

-

Paramètres

+

Paramètres

 params);?>
 
-

Infos Envoyés

+

Infos Envoyés

 tabInfos);?>
 
diff --git a/application/modules/input/views/default/scripts/lien/countryid.phtml b/application/modules/input/views/default/scripts/lien/countryid.phtml new file mode 100644 index 000000000..39a58eb3b --- /dev/null +++ b/application/modules/input/views/default/scripts/lien/countryid.phtml @@ -0,0 +1 @@ +identifiant); diff --git a/application/modules/input/views/default/scripts/lien/etranger.phtml b/application/modules/input/views/default/scripts/lien/etranger.phtml index 4a8925e12..7615f3d3e 100644 --- a/application/modules/input/views/default/scripts/lien/etranger.phtml +++ b/application/modules/input/views/default/scripts/lien/etranger.phtml @@ -253,15 +253,15 @@ function AddSelectCountry(code, n){ if (!n) { n=1; } else {n++;} if (n<=3){ var html = 'Aucun identifiant !'; - $.getJSON('/lien/countryid', {code: code}, function(data){ + $.getJSON('/input/lien/countryid', {code: code}, function(data){ var option = ''; $.each(data, function(i, item){ option = option + ''; }); if (option!=''){ - html = '
'+ - '
'+ - ''; + html = '
'+ + '
'+ + ''; if (n<3) { html = html+'[+]';} html = html+'[-]
'; } @@ -270,6 +270,7 @@ function AddSelectCountry(code, n){ } } + $('a#google').on('click', function(e){ var val = $('input[name=nom]').val(); window.open('https://www.google.fr/#q='+encodeURIComponent(val)); diff --git a/application/modules/input/views/default/scripts/lien/fiche.phtml b/application/modules/input/views/default/scripts/lien/fiche.phtml index 9bcc47bae..70c90cfa4 100644 --- a/application/modules/input/views/default/scripts/lien/fiche.phtml +++ b/application/modules/input/views/default/scripts/lien/fiche.phtml @@ -67,7 +67,7 @@
-
+ diff --git a/application/modules/input/views/default/scripts/lien/pp.phtml b/application/modules/input/views/default/scripts/lien/pp.phtml index 7675f6b0e..317509c95 100644 --- a/application/modules/input/views/default/scripts/lien/pp.phtml +++ b/application/modules/input/views/default/scripts/lien/pp.phtml @@ -48,8 +48,7 @@ $('input[name=naissance_date]').datepicker({ changeMonth: true, changeYear: true
- -
+
- - -Obtenir les informations. +
+ + +
+ +
+ + +
- - -Obtenir les informations. +
+ +
+ +
+
- - +
+ +
+ +
+
- - - - - @@ -30,9 +48,13 @@ +
+
- - coursAppel as $value) @@ -43,9 +65,13 @@ foreach ($this->coursAppel as $value) } ?> +
+
- - coursAppel as $value) @@ -56,9 +82,13 @@ foreach ($this->coursAppel as $value) } ?> +
+
- - tribunaux as $item) @@ -72,10 +102,14 @@ foreach ($this->tribunaux as $item) } ?> -(Vérifier le tribunal du mandataire) +(Vérifier le tribunal du mandataire) +
+
- - @@ -135,32 +169,70 @@ foreach ($this->tribunaux as $item) + + - - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
- - +
+ +
+ +
+
\ No newline at end of file diff --git a/application/modules/legal/views/default/scripts/dirigeant/liste.phtml b/application/modules/legal/views/default/scripts/dirigeant/liste.phtml index 9b4d0e686..121017a94 100644 --- a/application/modules/legal/views/default/scripts/dirigeant/liste.phtml +++ b/application/modules/legal/views/default/scripts/dirigeant/liste.phtml @@ -54,7 +54,7 @@ SirenTexte($dir->Siren)?> AutrePage) && $this->UserModeEdit) {?> - " href="url(array('module'=>'input', 'controller'=>'index','action'=>'lien','type'=>'actionnaire','mode'=>'add','siren'=>$this->siren,'createfiche'=>$dir->Siren),null,true)?>"> + " href="url(array('module'=>'input', 'controller'=>'lien','action'=>'index','type'=>'actionnaire','mode'=>'add','siren'=>$this->siren,'createfiche'=>$dir->Siren),null,true)?>"> diff --git a/application/modules/legal/views/default/scripts/identite/fiche.phtml b/application/modules/legal/views/default/scripts/identite/fiche.phtml index 650296cca..529aedd4b 100644 --- a/application/modules/legal/views/default/scripts/identite/fiche.phtml +++ b/application/modules/legal/views/default/scripts/identite/fiche.phtml @@ -1,6 +1,5 @@ AutrePage) ) {?>
- diff --git a/library/Application/Controller/Plugin/Menu.php b/library/Application/Controller/Plugin/Menu.php index 5a71dd67e..3788d0cf5 100644 --- a/library/Application/Controller/Plugin/Menu.php +++ b/library/Application/Controller/Plugin/Menu.php @@ -98,6 +98,20 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract $view->headScript() ->appendFile('/libs/metisMenu/metisMenu.min.js', 'text/javascript'); break; + case 'input': + $view = $layout->getView(); + $view->MenuAdvanced = true; + // $view->MenuLabel = 'Informations légales'; + $config = include APPLICATION_PATH . '/configs/menu.input.php'; + $this->container = new Zend_Navigation($config); + $this->setPageParams($request); + $view->navigation($this->container); + $view->headLink() + ->appendStylesheet('/libs/metisMenu/metisMenu.min.css', 'all'); + $view->headScript() + ->appendFile('/libs/metisMenu/metisMenu.min.js', 'text/javascript'); + break; + default: // Menu Default // --- Affichage page error @@ -114,7 +128,7 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract $menu = $computeMenu->getMenu(); $view = $layout->getView(); $view->navigation($menu); - + // --- Identifiant Menu $view->menuId = $computeMenu->getIdMenu($controller, $action); diff --git a/public/themes/default/scripts/saisie.js b/public/themes/default/scripts/saisie.js index 4a5afa43d..fd08d352f 100644 --- a/public/themes/default/scripts/saisie.js +++ b/public/themes/default/scripts/saisie.js @@ -113,7 +113,7 @@ $(function(){ $('[name=oppositionInsee]').on('change', function(e){ e.preventDefault(); if($(this).prop('checked')) { - $('#divOppositionInsee').load('/saisie/oppositioninsee'); + $('#divOppositionInsee').load('/input/index/oppositioninsee'); } else { $('#divOppositionInsee').html(''); } }); @@ -121,7 +121,7 @@ $(function(){ $('[name=refusRNCS]').on('change', function(e){ e.preventDefault(); if($(this).prop('checked')) { - $('#divRefusRNCS').load('/saisie/refusrncs'); + $('#divRefusRNCS').load('/input/index/refusrncs'); } else { $('#divRefusRNCS').html(''); } }); @@ -161,7 +161,7 @@ $(function(){ delay: 1000, minLength:3, source: function(request, response) { - $.getJSON('/mandataire/search', { search: request.term }, + $.getJSON('/input/mandataire/search', { search: request.term }, function(data) { response(data); } ); }, @@ -184,7 +184,7 @@ $(function(){ case 'oppo': var lien = 'Opposition'; break; case 'admin': var lien = 'Administrateur'; break; } - $('#lien'+lien+'Edit').attr('href', '/mandataire/add/tribunal/'+tribunal+'/idMand/'+idMandataire); + $('#lien'+lien+'Edit').attr('href', '/input/mandataire/add/tribunal/'+tribunal+'/idMand/'+idMandataire); } }); }); @@ -286,9 +286,9 @@ function displayBlock(block){ function loadFormSaisie(eventValue, params){ $('#subFormSaisie').html('

Chargement...

'); if(params!=''){ - $('#subFormSaisie').load('/saisie/even/num/'+eventValue, params); + $('#subFormSaisie').load('/input/index/even/num/'+eventValue, params); }else{ - $('#subFormSaisie').load('/saisie/event/num/'+eventValue); + $('#subFormSaisie').load('/input/index/event/num/'+eventValue); } }