Merge pull request #330 from dbarzin/dev

Dev

Author: dbarzin

INSTALL.fr.md

@@ -205,7 +205,7 @@ N'oubliez pas de [configurer](https://dbarzin.github.io/deming/config.fr/#notifi
 
 ## Configuration de Keycloak (optionnel)
 
-Pour configurer Keycloak, suivez ces étapes :
+Pour configurer [Keycloak](https://www.keycloak.org), suivez ces étapes :
 
 - Ouvrez votre fichier .env.
 - Modifiez les paramètres de configuration de Keycloak comme suit :

INSTALL.md

@@ -42,7 +42,7 @@ Install MariaDB (works also with ProgresSQL and MySQL)
 
     sudo apt install mariadb-server
 
-Start database client 
+Start database client
 
     sudo mariadb
 
@@ -199,7 +199,7 @@ Don't forget to [configure](https://dbarzin.github.io/deming/config/#notificatio
 
 ## Keycloak Configuration (optional)
 
-To configure Keycloak, follow these steps:
+To configure [Keycloak](https://www.keycloak.org), follow these steps:
 
 - Open your `.env` file.
 - Modify the Keycloak configuration settings as follows:

app/Http/Controllers/ControlController.php

@@ -1656,7 +1656,7 @@ public function tempo(Request $request) {
             $controls=null;
 
         $measures = DB::Table('measures')
-            ->select('id','name')
+            ->select('id','name','clause')
             ->orderby('name')->get();
 
         // return view

app/Http/Controllers/UserController.php

@@ -55,10 +55,10 @@ public function store(Request $request)
 
         // Validate request data
         $this->validate($request, [
-            'login' => 'required|min:1|max:30',
+            'login' => 'required|unique:users|min:1|max:30',
             'name' => 'required|min:1|max:90',
             'title' => 'required|min:1|max:30',
-            'email' => 'required|email:rfc',
+            'email' => 'required|unique:users|email:rfc',
             'role' => 'required',
         ]);
 
@@ -136,7 +136,11 @@ public function update(Request $request, User $user)
         // Validate request data
         $this->validate($request, [
             'name' => 'required|min:1|max:40',
-            'email' => 'required|email:rfc',
+            'login' => 'required|min:1|max:30|unique:users,login,'.$user->id,
+            'name' => 'required|min:1|max:90',
+            'title' => 'required|min:1|max:30',
+            'email' => 'required|email:rfc|unique:users,email,'.$user->id,
+            'role' => 'required'
         ]);
 
         // Custom password validation if LDAP is not enabled
@@ -152,6 +156,7 @@ public function update(Request $request, User $user)
 
         // Update user information
         $user->name = $request->input('name');
+        $user->login = $request->input('login');
         $user->email = $request->input('email');
         if ($this->isAdmin()) {
             $user->role = $request->input('role');

resources/views/radar/measures.blade.php

@@ -6,16 +6,16 @@
         <div data-role="panel" data-title-caption="Tableau de bord" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">
 
         <div class="row">
-            <div class="cell-7">
-                <strong>{{ trans("cruds.measure.title") }}</strong>
+            <div class="cell-2">
+                <strong>{{ trans("cruds.measure.fields.clause") }}</strong>
                 <select name="measures" data-role="select" id="measures">
                     <option></option>
                     @foreach ($measures as $measure)
                     <option id='{{ $measure->id }}'
                         @if (request()->get('id')==(string)$measure->id)
                             selected
                         @endif >
-                        {{ $measure->name }}
+                        {{ $measure->clause }}
                     </option>
                     @endforeach
                 </select>