Added #16887 - last updated date range for custom report

Signed-off-by: snipe <[email protected]>

Author: snipe

app/Http/Controllers/ReportsController.php

@@ -737,6 +737,11 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
             if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
+
+            if (($request->filled('last_updated_start')) && ($request->filled('last_updated_end'))) {
+                $assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]);
+            }
+
             if ($request->filled('exclude_archived')) {
                 $assets->notArchived();
             }

resources/views/reports/custom.blade.php

@@ -411,7 +411,7 @@ class="form-control"
           <!-- Purchase Date -->
             <div class="form-group purchase-range{{ ($errors->has('purchase_start') || $errors->has('purchase_end')) ? ' has-error' : '' }}">
               <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="purchase-range-datepicker">
                   <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ $template->textValue('purchase_start', old('purchase_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ $template->textValue('purchase_end', old('purchase_end')) }}">
@@ -427,9 +427,9 @@ class="form-control"
             </div>
 
             <!-- Created Date -->
-            <div class="form-group purchase-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
+            <div class="form-group created-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} </label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="created-range-datepicker">
                   <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ $template->textValue('created_start', old('created_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ $template->textValue('created_end', old('created_end')) }}">
@@ -446,7 +446,7 @@ class="form-control"
           <!-- Checkout Date -->
           <div class="form-group checkout-range{{ ($errors->has('checkout_date_start') || $errors->has('checkout_date_end')) ? ' has-error' : '' }}">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} </label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="checkout-range-datepicker">
                   <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $template->textValue('checkout_date_start', old('checkout_date_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $template->textValue('checkout_date_end', old('checkout_date_end')) }}">
@@ -464,7 +464,7 @@ class="form-control"
           <!-- Last Checkin Date -->
           <div class="form-group checkin-range{{ ($errors->has('checkin_date_start') || $errors->has('checkin_date_end')) ? ' has-error' : '' }}">
               <label for="checkin_date" class="col-md-3 control-label">{{ trans('admin/hardware/table.last_checkin_date') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="checkin-range-datepicker">
                   <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ $template->textValue('checkin_date_start', old('checkin_date_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ $template->textValue('checkin_date_end', old('checkin_date_end')) }}">
@@ -481,7 +481,7 @@ class="form-control"
             <!-- Expected Checkin Date -->
             <div class="form-group expected_checkin-range{{ ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end')) ? ' has-error' : '' }}">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="expected_checkin-range-datepicker">
                   <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $template->textValue('expected_checkin_start', old('expected_checkin_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $template->textValue('expected_checkin_end', old('expected_checkin_end')) }}">
@@ -499,7 +499,7 @@ class="form-control"
               <!-- EoL Date -->
               <div class="form-group asset_eol_date-range {{ ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end')) ? ' has-error' : '' }}">
                   <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="asset_eol_date-range-datepicker">
                       <input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start" value="{{ $template->textValue('asset_eol_date_start', old('asset_eol_date_start')) }}">
                       <span class="input-group-addon">to</span>
                       <input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end" value="{{ $template->textValue('asset_eol_date_end', old('asset_eol_date_end')) }}">
@@ -516,7 +516,7 @@ class="form-control"
               <!-- Last Audit Date -->
               <div class="form-group last_audit-range{{ ($errors->has('last_audit_start') || $errors->has('last_audit_end')) ? ' has-error' : '' }}">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="last_audit-range-datepicker">
                       <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $template->textValue('last_audit_start', old('last_audit_start')) }}">
                       <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                       <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $template->textValue('last_audit_end', old('last_audit_end')) }}">
@@ -533,7 +533,7 @@ class="form-control"
               <!-- Next Audit Date -->
               <div class="form-group next_audit-range{{ ($errors->has('next_audit_start') || $errors->has('next_audit_end')) ? ' has-error' : '' }}">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="next_audit-range-datepicker">
                       <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ $template->textValue('next_audit_start', old('next_audit_start')) }}">
                       <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                       <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $template->textValue('next_audit_end', old('next_audit_end')) }}">
@@ -547,6 +547,24 @@ class="form-control"
                   @endif
               </div>
 
+              <!-- Last updated Date -->
+              <div class="form-group last_updated-range{{ ($errors->has('last_updated_start') || $errors->has('last_updated_end')) ? ' has-error' : '' }}">
+                  <label for="last_updated_start" class="col-md-3 control-label">{{ trans('general.updated_at') }}</label>
+                  <div class="input-daterange input-group col-md-7" id="last_updated-range-datepicker">
+                      <input type="text" class="form-control" name="last_updated_start" aria-label="last_updated_start" value="{{ $template->textValue('last_updated_start', old('last_updated_start')) }}">
+                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                      <input type="text" class="form-control" name="last_updated_end" aria-label="last_updated_end" value="{{ $template->textValue('last_updated_end', old('last_updated_end')) }}">
+                  </div>
+
+                  @if ($errors->has('last_updated_start') || $errors->has('last_updated_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('last_updated_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('last_updated_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
+
+              </div>
+
             <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
                 <input type="checkbox" name="exclude_archived" value="1" @checked($template->checkmarkValue('exclude_archived', '0')) />
@@ -759,6 +777,14 @@ class="form-control"
           format: 'yyyy-mm-dd'
       });
 
+      $('.last_updated-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate:'0d',
+          format: 'yyyy-mm-dd'
+      });
+
+
       $("#checkAll").change(function () {
         $("#included_fields_wrapper input:checkbox").prop('checked', $(this).prop("checked"));
       });