diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php index 6c074e67e..31d51f71e 100644 --- a/application/controllers/AdminController.php +++ b/application/controllers/AdminController.php @@ -56,7 +56,23 @@ class AdminController extends Zend_Controller_Action /** * Affichage des caractéristiques des services */ - public function serviceAction(){} + public function serviceAction() + { + $request = $this->getRequest(); + $user = new Scores_Utilisateur(); + + $clientId = $user->getIdClient(); + $serviceId = $request->getParam('id'); + + $ws = new Scores_Ws_Client('gestion', '0.4'); + $params = new stdClass(); + $params->id = $serviceId; + $response = $ws->getService($params); + + if ($response !== false) { + $this->view->Users = $response->item; + } + } /** * Liste des utilisateurs d'un service @@ -73,7 +89,6 @@ class AdminController extends Zend_Controller_Action $serviceCode = $request->getParam('service'); $ws = new Scores_Ws_Client('gestion', '0.4'); - //$response = $ws->getUsers(null, $serviceCode, $clientId); $params = new stdClass(); $params->actif = null; $params->service = $serviceCode; diff --git a/application/views/default2015/scripts/admin/index.phtml b/application/views/default2015/scripts/admin/index.phtml index db8a8d2ca..4c60d4c06 100644 --- a/application/views/default2015/scripts/admin/index.phtml +++ b/application/views/default2015/scripts/admin/index.phtml @@ -1,19 +1,15 @@ -
-

ADMINISTRATION

+

Administration

-

Information client

-
+

Information client

Nom : Nom?>

Siret : Siren?> Nic?>

Test : Test?>

-
-

Liste des services

-
+

Liste des services

Les services ou groupes d'utilisateurs sont paramétrés suivant le contrat établi entre votre société et Scores & Decisions. Pour ajouter des services, vous pouvez en faire la demande auprès du support ou de votre commercial.

Services) > 0) {?> - +
@@ -31,14 +27,11 @@ if ($item->Editable == 0){ ?> > - - + +
NomLabel?>Liste des utilisateursParamètrageListe des utilisateursParamètrage Active?>
- - -
-
\ No newline at end of file + \ No newline at end of file diff --git a/application/views/default2015/scripts/admin/service.phtml b/application/views/default2015/scripts/admin/service.phtml index b3d9bbc7f..357d7b2de 100644 --- a/application/views/default2015/scripts/admin/service.phtml +++ b/application/views/default2015/scripts/admin/service.phtml @@ -1 +1,6 @@ -

Administration

+

Service {nom}

+ +

- Afficher les caractéristiques principales

+

- Permission d'accès (afficher toutes les droits diponibles pour faire du commerce)

+

- Préférences par défaut des utilisateurs

\ No newline at end of file diff --git a/application/views/default2015/scripts/admin/user.phtml b/application/views/default2015/scripts/admin/user.phtml index c411305a4..784e709b6 100644 --- a/application/views/default2015/scripts/admin/user.phtml +++ b/application/views/default2015/scripts/admin/user.phtml @@ -1,28 +1,22 @@ -
-

ADMINISTRATION

-

Gestion utilisateur User->Login?>

+

Administration

+

Gestion utilisateur User->Login?>

-

User->Civilite?>. User->Nom?> User->Prenom?>

-
-

Identité

-
- +

Identité

+
- - - + + +
Identifiant :User->Login?>
Courriel :User->Email?>
Actif :User->Enable?>
IdentifiantUser->Login?>
CourrielUser->Email?>
ActifUser->Enable?>
-
-

Service

-
- +

Service

+
- - + +
Nom :User->ServiceLabel?>
Adresse IP :
NomUser->ServiceLabel?>
Adresse IP User->IP as $ip) {?>
@@ -31,11 +25,9 @@
-
-

Accès

-
- +

Accès

+
User->Acces->item as $acces) {?> @@ -44,12 +36,5 @@
-
-

Préférences

-
- -
- - -
\ No newline at end of file +

Préférences

diff --git a/application/views/default2015/scripts/admin/users.phtml b/application/views/default2015/scripts/admin/users.phtml index fef0119b9..c42d79a76 100644 --- a/application/views/default2015/scripts/admin/users.phtml +++ b/application/views/default2015/scripts/admin/users.phtml @@ -1,15 +1,11 @@ -
-

ADMINISTRATION

-

Informations service

-
+

Administration

+

Information Service

Afficher les caratéristiques du service

-

Créer un utilisateur

-
+

Créer un utilisateur | Bouton trier

-

Liste des utilisateurs

-
+

Liste des utilisateurs

Users) > 0) {?> - +
@@ -23,14 +19,12 @@
Identifiant IdentitéCivilite?>. Nom?> Prenom?> Enable?> - Voir - url(array('controller'=> 'admin', 'action'=>'user', 'id'=>$item->id), 'default', true)?>">Voir + - Editer
- -
-
\ No newline at end of file + \ No newline at end of file diff --git a/application/views/default2015/scripts/aide/newliste.phtml b/application/views/default2015/scripts/aide/newliste.phtml index 556db83af..9f4b36335 100644 --- a/application/views/default2015/scripts/aide/newliste.phtml +++ b/application/views/default2015/scripts/aide/newliste.phtml @@ -1,8 +1,6 @@ -
-

Nouveautés

+

translate("Nouveautés")?>

-

Liste par date

-
+

Liste par date

@@ -26,7 +24,4 @@ -
-
- -
\ No newline at end of file + \ No newline at end of file diff --git a/application/views/default2015/scripts/header.phtml b/application/views/default2015/scripts/header.phtml index c56fb76ae..fcd4bd36d 100644 --- a/application/views/default2015/scripts/header.phtml +++ b/application/views/default2015/scripts/header.phtml @@ -5,15 +5,15 @@
- Suivi) {?> + Suivi !== null) {?>
- - +
- - - + print) {?> + Imprimer + + pdf) {?> + PDF + + xml) {?> + XML +
diff --git a/application/views/default2015/scripts/menu.phtml b/application/views/default2015/scripts/menu.phtml index c6deddf47..a5507f36f 100644 --- a/application/views/default2015/scripts/menu.phtml +++ b/application/views/default2015/scripts/menu.phtml @@ -1,32 +1,19 @@ navigation()->menu()->hasPages()) { ?> @@ -119,18 +116,18 @@ -
-Numéros de téléphone
(Fixe, Fax, Mobile) -
-
+
+

Numéros de téléphone
(Fixe, Fax, Mobile)

+
-
+
-
Mot de passe
-
+
+

Mot de passe

+
action=='new') { $typeChamp = 'password'; @@ -140,14 +137,14 @@ if ($this->action=='new') { $changePassword = 0; ?> Modifier le mot de passe. - +
+
-
Relevé de consommation
+
+

Relevé de consommation

isAdmin || $this->isSuperAdmin){ @@ -157,9 +154,11 @@ if ($this->isAdmin || $this->isSuperAdmin){ ); } ?> +
-
Langue de l'interface par défaut
-
+
+

Langue de l'interface par défaut

+
-
Inclure
@@ -219,9 +214,7 @@ foreach($opts as $opt)
-

Surveillance

-
- +

Surveillance

Supports pour les alertes
SMS
@@ -229,11 +222,7 @@ foreach($opts as $opt) Mail
-
- -

Gestion des droits

-
- +

Gestion des droits

Type de profil
isSuperAdmin){ ?> @@ -296,11 +285,8 @@ foreach ($this->prefsLib as $code => $lib) {
-
- options->idClient == 1 && !in_array('edition',$this->droits) ) { ?> -

Mode spéciaux

-
+

Mode spéciaux

Mode Edition
options->modeEdition==true ) { class="noborder"/>
-

-
-

diff --git a/application/views/default2015/scripts/user/liste.phtml b/application/views/default2015/scripts/user/liste.phtml index a88e59427..44aa11d6e 100644 --- a/application/views/default2015/scripts/user/liste.phtml +++ b/application/views/default2015/scripts/user/liste.phtml @@ -26,17 +26,14 @@ $(document).ready(function(){ }); }); -
-

ADMINISTRATION

+

Administration

-

Relevé de consommation complet

-
+

Relevé de consommation complet

action('conso', 'user', null , array('login'=>$this->login, 'idClient'=>$this->idClient));?> -
-

Liste des profils utilisateurs

+

Liste des profils utilisateurs

- +
@@ -127,5 +124,4 @@ foreach ($this->utilisateurs as $uti) {
 
-
\ No newline at end of file diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css index 08e527fef..6e638fa74 100644 --- a/public/themes/default/styles/main.css +++ b/public/themes/default/styles/main.css @@ -146,7 +146,7 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF #ratio {clear: both;font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;font-size: 12px;margin: 10px 0 0;text-align: left;width: 100%;} #LiasseTable {border-collapse: collapse;color:#606060;margin:5px 0 10px 0;} #LiasseTable td {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;} -#LiasseTable td.amount-value {min-width:70px;} +#LiasseTable td.amount-value {min-width:70px; white-space:nowrap;} #liasseForm th {color:#606060;font-weight:bold;} #liasseForm {margin-left:30px;} #liasseForm td {color:#606060;} diff --git a/public/themes/default2015/styles/main.css b/public/themes/default2015/styles/main.css index ff7991c4e..48676167b 100644 --- a/public/themes/default2015/styles/main.css +++ b/public/themes/default2015/styles/main.css @@ -36,8 +36,25 @@ p.bg-classes { /* Menu -------------------------------------------------- */ +@media (max-width: 992px) { + div#menu { + display: none; + } +} +@media (min-width: 992px) { + div#menu { + display:block; + width: 213px; + } +} +@media (min-width: 1200px) { + div#menu { + display:block; + width: 263px; + } +} .ui-accordion .ui-accordion-content { padding:0; } -div#menu.affix { top:10px; width:262px; } +div#menu.affix { top:10px; } div#menu ul.navigation > li a { display:block; text-decoration:none; font-weight:bold; color:#fff; background:#1a5c7d; } div#menu ul.navigation > li ul { padding:0; overflow:hidden; } div#menu ul.navigation > li ul li .ui-accordion-content { padding:0; } @@ -78,6 +95,9 @@ div#menu ul.navigation li a.ui-corner-all, -------------------------------------------------- */ .datemaj span { display:none; } +/* Finance +-------------------------------------------------- */ +#LiasseTable td.amount-value {min-width:70px; white-space:nowrap;} /* Print ----------------------------------*/ diff --git a/scripts/build/profil/local/application.ini b/scripts/build/profil/local/application.ini index c59470bf5..2c2c4fc51 100644 --- a/scripts/build/profil/local/application.ini +++ b/scripts/build/profil/local/application.ini @@ -17,6 +17,7 @@ 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.plugins.Suivi = "Application_Controller_Plugin_Suivi" resources.frontController.params.displayExceptions = 0 resources.layout.layout = "layout" resources.layout.layoutPath = APPLICATION_PATH "/views/default" @@ -24,12 +25,9 @@ resources.view.basePath = APPLICATION_PATH "/views/default" ; Scores configuration profil.server.name = development -profil.webservice.location = sdsrvdev01 profil.webservice.url = "http://webservice-2.7.sd.lan"; profil.mail.method = smtp profil.mail.smtp_host = smtp.free.fr -profil.mail.username = yourusername -profil.mail.password = yourpassword profil.mail.email.support = supportdev@scores-decisions.com profil.mail.email.supportdev = supportdev@scores-decisions.com profil.mail.email.contact = supportdev@scores-decisions.com @@ -37,12 +35,12 @@ profil.mail.email.production = supportdev@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 = "/your/persistent/path/" +profil.path.data = "/home/vhosts/data/extranet/" profil.wkhtmltopdf.path = "/usr/local/bin/wkhtmltopdf" profil.db.sdv1.adapter=mysqli profil.db.sdv1.params.host=127.0.0.1 profil.db.sdv1.params.username=root -profil.db.sdv1.params.password=password +profil.db.sdv1.params.password=scores profil.db.sdv1.params.dbname=extranet profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8" @@ -52,7 +50,7 @@ phpSettings.soap.wsdl_cache_enabled = 1 [development : production] phpSettings.display_startup_errors = 1 -phpSettings.display_errors = 1 +phpSettings.display_errors = 0 phpSettings.soap.wsdl_cache_enabled = 0 resources.frontController.params.displayExceptions = 1