diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index ac82949586..6fde28012e 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 c257bae1ae..589c9b603b 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)