From 0817308822e773267f84f3003227ec607f30c8f3 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Oct 2022 16:58:49 -0700 Subject: [PATCH] Added start/end to edit/view screens Signed-off-by: snipe --- resources/views/users/edit.blade.php | 4 ++++ resources/views/users/view.blade.php | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index ac8294958..6fde28012 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -358,6 +358,10 @@ @include ('partials.forms.edit.department-select', ['translated_name' => trans('general.department'), 'fieldname' => 'department_id']) + @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.start_date'), 'fieldname' => 'start_date']) + + @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date']) +
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index c257bae1a..589c9b603 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -343,6 +343,30 @@
+ + @if ($user->start_date) +
+
+ {{ trans('general.start_date') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->start_date, 'date', false) }} +
+
+ @endif + + + @if ($user->end_date) +
+
+ {{ trans('general.end_date') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->end_date, 'date', false) }} +
+
+ @endif + @if ($user->jobtitle)