Skip to content

Commit 9c044b7

Browse files
authored
Merge pull request #391 from dbarzin/dev
update packages + action index
2 parents 5935aa1 + d1419db commit 9c044b7

File tree

5 files changed

+86
-6
lines changed

5 files changed

+86
-6
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"mockery/mockery": "^1.6",
2626
"nunomaduro/collision": "^8.0",
2727
"nunomaduro/phpinsights": "^2.12",
28+
"phpstan/phpstan": "*",
2829
"phpunit/phpunit": "^11.0.1"
2930
},
3031
"autoload": {

composer.lock

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

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"easymde": "^2.18.0",
3636
"fontawesome-free": "^1.0.4",
3737
"less": "^4.3.0",
38-
"moment": "^2.30.1"
38+
"moment": "^2.30.1",
39+
"simplemde": "^1.11.2"
3940
}
4041
}

resources/views/actions/index.blade.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
@foreach($actions as $action)
9999
<tr>
100100
<td>
101-
{{ $action->reference }}
101+
<b><a href="/action/show/{{ $action->id }}">{{ $action->reference }}<a>
102102
</td>
103103
<td>
104104
{{ $action->type }}
@@ -115,14 +115,22 @@
115115
@endif
116116
</td>
117117
<td>
118-
<b><a href="/action/show/{{ $action->id }}">{{ $action->name }}</a></b>
118+
{{ $action->name }}</a></b>
119119
{!! \Parsedown::instance()->text($action->cause) !!}
120120
</td>
121121
<td>
122122
{{ $action->scope }}
123123
</td>
124124
<td>
125-
{{ $action->due_date }}
125+
@if ($action->due_date!==null)
126+
<b>
127+
@if (today()->lte($action->due_date))
128+
<font color="green">{{ $action->due_date }}</font>
129+
@else
130+
<font color="red">{{ $action->due_date }}</font>
131+
@endif
132+
</b>
133+
@endif
126134
</td>
127135
</tr>
128136
@endforeach

0 commit comments

Comments
 (0)