Skip to content

Commit becb30a

Browse files
dbarzindbarzin
authored
Merge pull request #341 from dbarzin/dev
Dev
2 parents fd67ade + 29aa33f commit becb30a

File tree

5 files changed

+116
-118
lines changed

5 files changed

+116
-118
lines changed

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2025.04.29",
2+
"version": "2025.05.09",
33
"license": "GPL-3.0",
44
"author": "Didier Barzin",
55
"repository": "https://www.github.com/dbarzin/deming",

‎resources/views/measures/edit.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<div class="row">
118118
<div class="cell-5">
119119
<button type="submit" class="button success">
120-
<span class="mif-floppy-disk"></span>
120+
<span class="mif-floppy-disk2"></span>
121121
&nbsp;
122122
{{ trans('common.save') }}
123123
</button>

‎resources/views/measures/show.blade.php‎

Lines changed: 111 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,157 @@
11
@extends("layout")
22

33
@section("content")
4-
<div data-role="panel" data-title-caption="{{ trans('cruds.measure.show') }}" data-collapsible="true" data-title-icon="<span class='mif-books'></span>">
5-
@if (count($errors))
6-
<div class="grid">
7-
<div class="cell-5 bg-red fg-white">
8-
<ul>
9-
@foreach ($errors->all() as $error)
10-
<li>{{ $error }}</li>
11-
@endforeach
12-
</ul>
13-
</div>
14-
</div>
15-
@endif
4+
<div data-role="panel" data-title-caption="{{ trans('cruds.measure.show') }}" data-collapsible="true" data-title-icon="<span class='mif-books'></span>">
165

17-
<div class="grid">
6+
@if (count($errors))
7+
<div class="remark alert">
8+
<span class="mif-report icon"></span>
9+
@foreach ($errors->all() as $error)
10+
{{ $error }}<br>
11+
@endforeach
12+
</div>
13+
@endif
14+
15+
<div class="grid">
1816
<div class="row">
1917
<div class="cell-1">
20-
<strong>{{ trans('cruds.measure.fields.domain') }}</strong>
21-
</div>
22-
<div class="cell-6">
23-
<a href="/domains/{{$measure->domain_id}}">
24-
{{ $measure->domain->title ?? ""}}
25-
</a>
26-
-
27-
{{ $measure->domain->description ?? "" }}
28-
</div>
29-
</div>
18+
<strong>{{ trans('cruds.measure.fields.domain') }}</strong>
19+
</div>
20+
<div class="cell-6">
21+
<a href="/domains/{{$measure->domain_id}}">
22+
{{ $measure->domain->title ?? ""}}
23+
</a>
24+
-
25+
{{ $measure->domain->description ?? "" }}
26+
</div>
27+
</div>
3028

3129
<div class="row">
32-
<div class="cell-1">
33-
<strong>{{ trans('cruds.measure.fields.clause') }}</strong>
34-
</div>
35-
<div class="cell-6">
36-
{{ $measure->clause }}
37-
</div>
38-
</div>
30+
<div class="cell-1">
31+
<strong>{{ trans('cruds.measure.fields.clause') }}</strong>
32+
</div>
33+
<div class="cell-6">
34+
{{ $measure->clause }}
35+
</div>
36+
</div>
3937

4038
<div class="row">
41-
<div class="cell-1">
42-
<strong>{{ trans('cruds.measure.fields.name') }}</strong>
43-
</div>
44-
<div class="cell-6">
45-
{{ $measure->name }}
46-
</div>
47-
</div>
39+
<div class="cell-1">
40+
<strong>{{ trans('cruds.measure.fields.name') }}</strong>
41+
</div>
42+
<div class="cell-6">
43+
{{ $measure->name }}
44+
</div>
45+
</div>
4846

4947
<div class="row">
50-
<div class="cell-1">
51-
<strong>{{ trans('cruds.measure.fields.objective') }}</strong>
52-
</div>
53-
<div class="cell-6">
48+
<div class="cell-1">
49+
<strong>{{ trans('cruds.measure.fields.objective') }}</strong>
50+
</div>
51+
<div class="cell-6">
5452
{!! \Parsedown::instance()->text($measure->objective) !!}
55-
</div>
56-
</div>
53+
</div>
54+
</div>
5755

58-
@if ($measure->attributes!=null)
56+
@if ($measure->attributes!=null)
5957
<div class="row">
6058
<div class="cell-1">
61-
<strong>{{ trans("cruds.measure.fields.attributes") }}</strong>
62-
</div>
59+
<strong>{{ trans("cruds.measure.fields.attributes") }}</strong>
60+
</div>
6361
<div class="cell-6">
64-
{{ $measure->attributes }}
62+
{{ $measure->attributes }}
6563
</div>
6664
</div>
6765
@endif
6866

6967
<div class="row">
70-
<div class="cell-1">
71-
<strong>{{ trans('cruds.measure.fields.input') }}</strong>
72-
</div>
73-
<div class="cell-6">
68+
<div class="cell-1">
69+
<strong>{{ trans('cruds.measure.fields.input') }}</strong>
70+
</div>
71+
<div class="cell-6">
7472
{!! \Parsedown::instance()->text($measure->input) !!}
75-
</div>
76-
</div>
73+
</div>
74+
</div>
7775

7876
<div class="row">
79-
<div class="cell-1">
80-
<strong>{{ trans('cruds.measure.fields.model') }}</strong>
81-
</div>
82-
<div class="cell-6">
83-
<pre>{{ $measure->model }}</pre>
84-
</div>
85-
</div>
77+
<div class="cell-1">
78+
<strong>{{ trans('cruds.measure.fields.model') }}</strong>
79+
</div>
80+
<div class="cell-6">
81+
<pre>{{ $measure->model }}</pre>
82+
</div>
83+
</div>
8684

8785

8886
<div class="row">
89-
<div class="cell-1">
90-
<strong>{{ trans('cruds.measure.fields.indicator') }}</strong>
91-
</div>
92-
<div class="cell-6">
93-
<pre>{{ $measure->indicator }}</pre>
94-
</div>
95-
</div>
87+
<div class="cell-1">
88+
<strong>{{ trans('cruds.measure.fields.indicator') }}</strong>
89+
</div>
90+
<div class="cell-6">
91+
<pre>{{ $measure->indicator }}</pre>
92+
</div>
93+
</div>
9694

9795
<div class="row">
98-
<div class="cell-1">
99-
<strong>{{ trans('cruds.measure.fields.action_plan') }}</strong>
100-
</div>
101-
<div class="cell-6">
96+
<div class="cell-1">
97+
<strong>{{ trans('cruds.measure.fields.action_plan') }}</strong>
98+
</div>
99+
<div class="cell-6">
102100
{!! \Parsedown::instance()->text($measure->action_plan) !!}
103-
</div>
104-
</div>
101+
</div>
102+
</div>
105103

106104
<div class="row">
107-
<div class="cell-1">
108-
</div>
109-
</div>
105+
<div class="cell-1">
106+
</div>
107+
</div>
110108

111-
<div class="row">
109+
<div class="row">
112110
<div class="cell-8">
113-
@if (Auth::User()->role === 1)
111+
@if (Auth::User()->role === 1)
114112
<a class="button info" href="/alice/plan/{{ $measure->id }}">
115-
<span class="mif-calendar"></span>
116-
&nbsp;
117-
{{ trans('common.plan') }}
113+
<span class="mif-calendar"></span>
114+
&nbsp;
115+
{{ trans('common.plan') }}
118116
</a>
119-
&nbsp;
117+
&nbsp;
120118
<a class="button primary" href="/alice/{{ $measure->id }}/edit">
121-
<span class="mif-wrench"></span>
122-
&nbsp;
123-
{{ trans('common.edit') }}
119+
<span class="mif-wrench"></span>
120+
&nbsp;
121+
{{ trans('common.edit') }}
124122
</a>
125-
&nbsp;
123+
&nbsp;
126124
<a class="button warning" href="/alice/clone/{{ $measure->id }}">
127-
<span class="mif-plus"></span>
128-
&nbsp;
129-
{{ trans('common.clone') }}
125+
<span class="mif-plus"></span>
126+
&nbsp;
127+
{{ trans('common.clone') }}
130128
</a>
131-
&nbsp;
132-
<form action="/alice/delete/{{ $measure->id }}" class="d-inline" method="POST" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
129+
&nbsp;
130+
<form action="/alice/delete/{{ $measure->id }}" class="d-inline" method="POST" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
133131
@csrf
134-
<button class="button alert" type="submit">
135-
<span class="mif-fire"></span>
136-
&nbsp;
137-
{{ trans('common.delete') }}
138-
</button>
139-
</form>
140-
&nbsp;
141-
@endif
142-
@if (Auth::User()->role === 5)
143-
<a href="/bob/index" class="button">
144-
<span class="mif-cancel"></span>
145-
&nbsp;
146-
{{ trans('common.cancel') }}
147-
</a>
148-
@else
149-
<a href="/alice/index" class="button">
150-
<span class="mif-cancel"></span>
151-
&nbsp;
152-
{{ trans('common.cancel') }}
153-
</a>
154-
@endif
132+
<button class="button alert" type="submit">
133+
<span class="mif-fire"></span>
134+
&nbsp;
135+
{{ trans('common.delete') }}
136+
</button>
137+
</form>
138+
&nbsp;
139+
@endif
140+
@if (Auth::User()->role === 5)
141+
<a href="/bob/index" class="button">
142+
<span class="mif-cancel"></span>
143+
&nbsp;
144+
{{ trans('common.cancel') }}
145+
</a>
146+
@else
147+
<a href="/alice/index" class="button">
148+
<span class="mif-cancel"></span>
149+
&nbsp;
150+
{{ trans('common.cancel') }}
151+
</a>
152+
@endif
153+
</div>
155154
</div>
156-
</div>
157155
</div>
158156
</div>
159157
<div>

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.04.29
1+
2025.05.09

0 commit comments

Comments
 (0)
⚡