diff --git a/lib/models/service_request/service_request_search.dart b/lib/models/service_request/service_request_search.dart
index 3366f043..6df51b1a 100644
--- a/lib/models/service_request/service_request_search.dart
+++ b/lib/models/service_request/service_request_search.dart
@@ -1,7 +1,10 @@
 import 'package:test_sa/models/hospital.dart';
 import 'package:test_sa/models/lookup.dart';
 
+import '../call_request_for_work_order_model.dart';
+
 class ServiceRequestSearch {
+  String callId;
   String deviceSerialNumber;
   String deviceNumber;
   String deviceName;
@@ -9,6 +12,9 @@ class ServiceRequestSearch {
   String model;
   Lookup statusValue;
   bool mostRecent;
+  String from, to;
+  Lookup dateOperator;
+  AssignedEmployee assignedEmployee;
 
   ServiceRequestSearch({
     this.deviceSerialNumber,
@@ -18,6 +24,11 @@ class ServiceRequestSearch {
     this.model,
     this.hospital,
     this.mostRecent,
+    this.callId,
+    this.from,
+    this.to,
+    this.assignedEmployee,
+    this.dateOperator,
   });
 
   fromSearch(ServiceRequestSearch newSearch) {
@@ -27,6 +38,11 @@ class ServiceRequestSearch {
     hospital = newSearch.hospital;
     model = newSearch.model;
     mostRecent = newSearch.mostRecent;
+    callId = newSearch.callId;
+    from = newSearch.from;
+    to = newSearch.to;
+    assignedEmployee = newSearch.assignedEmployee;
+    dateOperator = newSearch.dateOperator;
   }
 
   Map<String, dynamic> toMap() {
@@ -51,9 +67,24 @@ class ServiceRequestSearch {
       search["site"] = hospital.name;
     }
 
-    if (model != null) {
+    if (model != null && model.isNotEmpty) {
       search["modelDefinition"] = model;
     }
+
+    if (callId != null && callId.isNotEmpty) {
+      search["callId"] = callId;
+    }
+
+    if (dateOperator != null && from != null) {
+      search["requestedDateSymbol"] = dateOperator.toMap();
+      search["requestedDateFrom"] = from;
+    }
+    if (dateOperator != null && to != null) {
+      search["requestedDateTo"] = to;
+    }
+    if (assignedEmployee != null) {
+      search["assignedEmployee"] = assignedEmployee.toJson();
+    }
     return search;
   }
 }
diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart
index 3ab26e39..f3f666ea 100644
--- a/lib/views/pages/user/land_page.dart
+++ b/lib/views/pages/user/land_page.dart
@@ -23,7 +23,6 @@ import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart';
 import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart';
-import 'package:test_sa/views/pages/sub_workorder/search_sub_workorder_page.dart';
 import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart';
 import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart';
 import 'package:test_sa/views/pages/user/requests/create_request.dart';
@@ -212,14 +211,14 @@ class _LandPageState extends State<LandPage> {
                           Navigator.of(context).pushNamed(TrackDeviceTransferPage.id);
                         },
                       ),
-                      if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.normal_user)
-                        LandPageItem(
-                          text: "Search Work Order",
-                          svgPath: "assets/images/sub_workorder_icon.svg",
-                          onPressed: () {
-                            Navigator.of(context).pushNamed(SearchSubWorkOrderPage.id);
-                          },
-                        ),
+                      // if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.normal_user)
+                      //   LandPageItem(
+                      //     text: "Search Work Order",
+                      //     svgPath: "assets/images/sub_workorder_icon.svg",
+                      //     onPressed: () {
+                      //       Navigator.of(context).pushNamed(SearchSubWorkOrderPage.id);
+                      //     },
+                      //   ),
                     ],
                   ),
                 ],
diff --git a/lib/views/widgets/search/service_request_search_bar.dart b/lib/views/widgets/search/service_request_search_bar.dart
index 9502d645..3ff29b7a 100644
--- a/lib/views/widgets/search/service_request_search_bar.dart
+++ b/lib/views/widgets/search/service_request_search_bar.dart
@@ -11,7 +11,12 @@ import 'package:test_sa/views/widgets/status/service_request/service_request_sta
 import 'package:test_sa/views/widgets/switch_button.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
 
+import '../../../models/call_request_for_work_order_model.dart';
+import '../../../models/engineer.dart';
 import '../app_text_form_field.dart';
+import '../date_and_time/date_picker.dart';
+import '../status/report/service_report_all_users.dart';
+import '../status/report/service_report_visit_date_operator.dart';
 
 class ServiceRequestsSearchDialog extends StatefulWidget {
   final ServiceRequestSearch initialSearchValue;
@@ -63,168 +68,239 @@ class _ServiceRequestsSearchDialogState extends State<ServiceRequestsSearchDialo
         key: _formKey,
         child: Padding(
           padding: const EdgeInsets.all(16.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  ASmallButton(
-                    text: _subtitle.cancel,
-                    onPressed: () {
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  ASmallButton(
-                    text: _subtitle.search,
-                    onPressed: () {
-                      if (!_formKey.currentState.validate()) {
-                        return;
-                      }
-                      _formKey.currentState.save();
-                      Navigator.of(context).pop(_search);
-                    },
-                  )
-                ],
-              ),
-              SizedBox(
-                height: 8.0 * AppStyle.getScaleFactor(context),
-              ),
-              ASwitchButton(
-                title: "Most Recent",
-                value: _search.mostRecent ?? false,
-                onChange: (value) {
-                  _search.mostRecent = value;
-                  setState(() {});
-                },
-              ),
-              SizedBox(
-                height: 8.0 * AppStyle.getScaleFactor(context),
-              ),
-              ATextFormField(
-                initialValue: _search.deviceSerialNumber,
-                hintText: _subtitle.serialNumber,
-                style: Theme.of(context).textTheme.headline6,
-                textInputAction: TextInputAction.search,
-                onAction: () {
-                  if (!_formKey.currentState.validate()) {
-                    return;
-                  }
-                  _formKey.currentState.save();
-                  Navigator.of(context).pop(_search);
-                },
-                onSaved: (value) {
-                  _search.deviceSerialNumber = value;
-                },
-              ),
-              SizedBox(
-                height: 8.0 * AppStyle.getScaleFactor(context),
-              ),
-              HospitalAutoCompleteField(
-                initialValue: _search.hospital?.name,
-                // onSave: (value){
-                //   _search.hospital = value;
-                // },
-                onSearch: (value) {
-                  _search.hospital = value;
-                  Navigator.of(context).pop(_search);
-                },
-              ),
-              SizedBox(
-                height: 8.0 * AppStyle.getScaleFactor(context),
-              ),
-              ATextFormField(
-                initialValue: _search.deviceName,
-                hintText: _subtitle.deviceName,
-                style: Theme.of(context).textTheme.headline6,
-                textInputAction: TextInputAction.search,
-                onAction: () {
-                  if (!_formKey.currentState.validate()) {
-                    return;
-                  }
-                  _formKey.currentState.save();
-                  Navigator.of(context).pop(_search);
-                },
-                onSaved: (value) {
-                  _search.deviceName = value;
-                },
-              ),
-              SizedBox(
-                height: 8.0 * AppStyle.getScaleFactor(context),
-              ),
-              ATextFormField(
-                initialValue: _search.model,
-                hintText: _subtitle.model,
-                style: Theme.of(context).textTheme.headline6,
-                textInputAction: TextInputAction.search,
-                onAction: () {
-                  if (!_formKey.currentState.validate()) {
-                    return;
-                  }
-                  _formKey.currentState.save();
-                  Navigator.of(context).pop(_search);
-                },
-                onSaved: (value) {
-                  _search.model = value;
-                },
-              ),
-              SizedBox(
-                height: 16 * AppStyle.getScaleFactor(context),
-              ),
-              const ASubTitle("Status"),
-              const SizedBox(
-                height: 4,
-              ),
-              ServiceRequestStatusMenu(
-                initialValue: _search.statusValue,
-                onSelect: (status) {
-                  _search.statusValue = status;
-                },
-              ),
-              // Padding(
-              //   padding: const EdgeInsets.symmetric(horizontal: 12),
-              //   child: Wrap(
-              //     spacing: 10,
-              //     runSpacing: 10,
-              //     alignment: WrapAlignment.spaceEvenly,
-              //     children: List.generate(
-              //         status.length,
-              //             (index) {
-              //           bool isSelected = _search.statusValue == status[index];
-              //           return FilterItem(
-              //             isSelected: isSelected,
-              //             onSelected: (){
-              //               if(isSelected) {
-              //                 _search.statusValue = null;
-              //               } else {
-              //                 _search.statusValue = status[index];
-              //               }
-              //
-              //               setState(() {});
-              //             },
-              //             status: status[index],
-              //           );
-              //         }
-              //
-              //     ),
-              //   ),
-              // ),
+          child: SingleChildScrollView(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    ASmallButton(
+                      text: _subtitle.cancel,
+                      onPressed: () {
+                        Navigator.of(context).pop();
+                      },
+                    ),
+                    ASmallButton(
+                      text: _subtitle.search,
+                      onPressed: () {
+                        if (!_formKey.currentState.validate()) {
+                          return;
+                        }
+                        _formKey.currentState.save();
+                        Navigator.of(context).pop(_search);
+                      },
+                    )
+                  ],
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                ASwitchButton(
+                  title: "Most Recent",
+                  value: _search.mostRecent ?? false,
+                  onChange: (value) {
+                    _search.mostRecent = value;
+                    setState(() {});
+                  },
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                ATextFormField(
+                  labelText: "Call ID",
+                  onSaved: (value) {
+                    _search.callId = value;
+                  },
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                ATextFormField(
+                  initialValue: _search.deviceSerialNumber,
+                  hintText: _subtitle.serialNumber,
+                  style: Theme.of(context).textTheme.headline6,
+                  textInputAction: TextInputAction.search,
+                  onAction: () {
+                    if (!_formKey.currentState.validate()) {
+                      return;
+                    }
+                    _formKey.currentState.save();
+                    Navigator.of(context).pop(_search);
+                  },
+                  onSaved: (value) {
+                    _search.deviceSerialNumber = value;
+                  },
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                HospitalAutoCompleteField(
+                  initialValue: _search.hospital?.name,
+                  // onSave: (value){
+                  //   _search.hospital = value;
+                  // },
+                  onSearch: (value) {
+                    _search.hospital = value;
+                    Navigator.of(context).pop(_search);
+                  },
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                ATextFormField(
+                  initialValue: _search.deviceName,
+                  hintText: _subtitle.deviceName,
+                  style: Theme.of(context).textTheme.headline6,
+                  textInputAction: TextInputAction.search,
+                  onAction: () {
+                    if (!_formKey.currentState.validate()) {
+                      return;
+                    }
+                    _formKey.currentState.save();
+                    Navigator.of(context).pop(_search);
+                  },
+                  onSaved: (value) {
+                    _search.deviceName = value;
+                  },
+                ),
+                SizedBox(
+                  height: 8.0 * AppStyle.getScaleFactor(context),
+                ),
+                ATextFormField(
+                  initialValue: _search.model,
+                  hintText: _subtitle.model,
+                  style: Theme.of(context).textTheme.headline6,
+                  textInputAction: TextInputAction.search,
+                  onAction: () {
+                    if (!_formKey.currentState.validate()) {
+                      return;
+                    }
+                    _formKey.currentState.save();
+                    Navigator.of(context).pop(_search);
+                  },
+                  onSaved: (value) {
+                    _search.model = value;
+                  },
+                ),
+                SizedBox(
+                  height: 16 * AppStyle.getScaleFactor(context),
+                ),
+                const ASubTitle("Status"),
+                const SizedBox(height: 4),
+                ServiceRequestStatusMenu(
+                  initialValue: _search.statusValue,
+                  onSelect: (status) {
+                    _search.statusValue = status;
+                  },
+                ),
+                SizedBox(
+                  height: 16 * AppStyle.getScaleFactor(context),
+                ),
+                ASubTitle(_subtitle.assignedEmployee),
+                const SizedBox(height: 4),
+                ServiceReportAllUsers(
+                  initialValue: _search.assignedEmployee == null ? null : Engineer(id: _search.assignedEmployee.id, name: _search.assignedEmployee.name),
+                  onSelect: (engineer) {
+                    _search.assignedEmployee = AssignedEmployee(id: engineer.id, name: engineer.name);
+                  },
+                ),
+                SizedBox(
+                  height: 16 * AppStyle.getScaleFactor(context),
+                ),
+                const ASubTitle("Request Date"),
+                const SizedBox(height: 4),
+                ServiceReportVisitDateOperator(
+                  initialValue: _search.dateOperator,
+                  onSelect: (status) {
+                    _search.dateOperator = status;
+                    setState(() {});
+                  },
+                ),
+                Row(
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: [
+                          const ASubTitle("From"),
+                          ADatePicker(
+                            date: DateTime.tryParse(_search.from ?? ""),
+                            from: DateTime(1950),
+                            onDatePicker: (date) {
+                              _search.from = date?.toIso8601String();
+                              setState(() {});
+                            },
+                          ),
+                        ],
+                      ),
+                    ),
+                    if (_search?.dateOperator?.name?.toLowerCase()?.contains("between") ?? false) const SizedBox(width: 16),
+                    if (_search?.dateOperator?.name?.toLowerCase()?.contains("between") ?? false)
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            const ASubTitle("To"),
+                            ADatePicker(
+                              date: DateTime.tryParse(_search.to ?? ""),
+                              from: DateTime(1950),
+                              onDatePicker: (date) {
+                                _search.to = date?.toIso8601String();
+                                setState(() {});
+                              },
+                            ),
+                          ],
+                        ),
+                      ),
+                  ],
+                ),
+                const SizedBox(width: 16),
+                // Padding(
+                //   padding: const EdgeInsets.symmetric(horizontal: 12),
+                //   child: Wrap(
+                //     spacing: 10,
+                //     runSpacing: 10,
+                //     alignment: WrapAlignment.spaceEvenly,
+                //     children: List.generate(
+                //         status.length,
+                //             (index) {
+                //           bool isSelected = _search.statusValue == status[index];
+                //           return FilterItem(
+                //             isSelected: isSelected,
+                //             onSelected: (){
+                //               if(isSelected) {
+                //                 _search.statusValue = null;
+                //               } else {
+                //                 _search.statusValue = status[index];
+                //               }
+                //
+                //               setState(() {});
+                //             },
+                //             status: status[index],
+                //           );
+                //         }
+                //
+                //     ),
+                //   ),
+                // ),
 
-              Visibility(
-                visible: widget.initialSearchValue.toMap().isNotEmpty,
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-                  child: AButton(
-                    padding: EdgeInsets.zero,
-                    text: _subtitle.clearSearch,
-                    onPressed: () {
-                      _search = ServiceRequestSearch();
-                      Navigator.of(context).pop(_search);
-                    },
+                Visibility(
+                  visible: widget.initialSearchValue.toMap().isNotEmpty,
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                    child: AButton(
+                      padding: EdgeInsets.zero,
+                      text: _subtitle.clearSearch,
+                      onPressed: () {
+                        _search = ServiceRequestSearch();
+                        Navigator.of(context).pop(_search);
+                      },
+                    ),
                   ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),