Skip to content

Commit a838b83

Browse files
committed
Work on dev
1 parent 4cc96be commit a838b83

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

INSTALL.fr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ N'oubliez pas de [configurer](https://dbarzin.github.io/deming/config.fr/#notifi
205205

206206
## Configuration de Keycloak (optionnel)
207207

208-
Pour configurer Keycloak, suivez ces étapes :
208+
Pour configurer [Keycloak](https://www.keycloak.org), suivez ces étapes :
209209

210210
- Ouvrez votre fichier .env.
211211
- Modifiez les paramètres de configuration de Keycloak comme suit :

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Install MariaDB (works also with ProgresSQL and MySQL)
4242

4343
sudo apt install mariadb-server
4444

45-
Start database client
45+
Start database client
4646

4747
sudo mariadb
4848

@@ -199,7 +199,7 @@ Don't forget to [configure](https://dbarzin.github.io/deming/config/#notificatio
199199

200200
## Keycloak Configuration (optional)
201201

202-
To configure Keycloak, follow these steps:
202+
To configure [Keycloak](https://www.keycloak.org), follow these steps:
203203

204204
- Open your `.env` file.
205205
- Modify the Keycloak configuration settings as follows:

app/Http/Controllers/ControlController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,7 @@ public function tempo(Request $request) {
16561656
$controls=null;
16571657

16581658
$measures = DB::Table('measures')
1659-
->select('id','name')
1659+
->select('id','name','clause')
16601660
->orderby('name')->get();
16611661

16621662
// return view

resources/views/radar/measures.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
<div data-role="panel" data-title-caption="Tableau de bord" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">
77

88
<div class="row">
9-
<div class="cell-7">
10-
<strong>{{ trans("cruds.measure.title") }}</strong>
9+
<div class="cell-2">
10+
<strong>{{ trans("cruds.measure.fields.clause") }}</strong>
1111
<select name="measures" data-role="select" id="measures">
1212
<option></option>
1313
@foreach ($measures as $measure)
1414
<option id='{{ $measure->id }}'
1515
@if (request()->get('id')==(string)$measure->id)
1616
selected
1717
@endif >
18-
{{ $measure->name }}
18+
{{ $measure->clause }}
1919
</option>
2020
@endforeach
2121
</select>

0 commit comments

Comments
 (0)