Merge branch 'zaid_development_new' into sikander-development

design_3.0_demo_module
Sikander Saleem 3 years ago
commit 8736e68c27

@ -51,6 +51,7 @@ class URLs {
static get updateRegularVisits => "$_baseUrl/Visit/UpdateVisits"; // get static get updateRegularVisits => "$_baseUrl/Visit/UpdateVisits"; // get
static get getSingleServiceRequest => "$_baseUrl/return/call/information"; // get static get getSingleServiceRequest => "$_baseUrl/return/call/information"; // get
static get getSuppliersAutoComplete => "$_baseUrl/Supplier/GetSuppliersAutoComplete";
static get getNotifications => "$_baseUrl/return/user/notification"; // get static get getNotifications => "$_baseUrl/return/user/notification"; // get
static get getRecentNotifications => "$_baseUrl/return/user/recent/notification"; // get static get getRecentNotifications => "$_baseUrl/return/user/recent/notification"; // get
static get createRequest => "$_baseUrl/CallRequest/AddCallRequest"; // get static get createRequest => "$_baseUrl/CallRequest/AddCallRequest"; // get

@ -74,10 +74,7 @@ class DeviceTransferProvider extends ChangeNotifier {
body["pageSize"] = pageItemNumber; body["pageSize"] = pageItemNumber;
body.addAll(deviceTransferSearch.toMap()); body.addAll(deviceTransferSearch.toMap());
response = await ApiManager.instance.post( response = await ApiManager.instance.post(URLs.getDeviceTransfer, body: body);
URLs.getDeviceTransfer,
body: body,
);
stateCode = response.statusCode; stateCode = response.statusCode;
if (stateCode >= 200 && stateCode < 300) { if (stateCode >= 200 && stateCode < 300) {
@ -87,8 +84,7 @@ class DeviceTransferProvider extends ChangeNotifier {
items ??= []; items ??= [];
items.addAll(itemsPage.toSet().toList()); items.addAll(itemsPage.toSet().toList());
sortMostRecent(items, deviceTransferSearch.mostRecent); sortMostRecent(items, deviceTransferSearch.mostRecent);
notifyListeners();
print(listJson);
if (itemsPage.length == pageItemNumber) { if (itemsPage.length == pageItemNumber) {
nextPage = true; nextPage = true;
} else { } else {

@ -77,6 +77,7 @@ class GasRefillProvider extends ChangeNotifier {
} }
items.addAll(itemsPage); items.addAll(itemsPage);
sortMostRecent(items, mostRecent); sortMostRecent(items, mostRecent);
notifyListeners();
if (itemsPage.length == pageItemNumber) { if (itemsPage.length == pageItemNumber) {
nextPage = true; nextPage = true;
} else { } else {

@ -13,7 +13,7 @@ import 'package:test_sa/models/visits/visits_search.dart';
class RegularVisitsProvider extends ChangeNotifier { class RegularVisitsProvider extends ChangeNotifier {
// number of items call in each request // number of items call in each request
final pageItemNumber = 20; final pageItemNumber = 12;
//reset provider data //reset provider data
void reset() { void reset() {
@ -52,7 +52,7 @@ class RegularVisitsProvider extends ChangeNotifier {
}) async { }) async {
if (isLoading == true) return -2; if (isLoading == true) return -2;
isLoading = true; isLoading = true;
if (visits == null) notifyListeners(); if (visits?.isEmpty ?? true) notifyListeners();
Response response; Response response;
//userId = 397.toString(); // testing id to view data //userId = 397.toString(); // testing id to view data
@ -77,11 +77,12 @@ class RegularVisitsProvider extends ChangeNotifier {
// client's request was successfully received // client's request was successfully received
try { try {
List requestsListJson = json.decode(response.body)["data"]; List requestsListJson = json.decode(response.body)["data"];
List<Visit> _visits = requestsListJson.map((request) => Visit.fromJson(request)).toList(); List<Visit> visits = requestsListJson.map((request) => Visit.fromJson(request)).toList();
visits ??= []; this.visits ??= [];
sortMostRecent(_visits); this.visits.addAll(visits);
visits.addAll(_visits); sortMostRecent(this.visits);
if (_visits.length == pageItemNumber) { notifyListeners();
if (visits.length == pageItemNumber) {
nextPage = true; nextPage = true;
} else { } else {
nextPage = false; nextPage = false;

@ -57,7 +57,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
Future<int> getRequests({@required int hospitalId}) async { Future<int> getRequests({@required int hospitalId}) async {
if (isLoading == true) return -2; if (isLoading == true) return -2;
isLoading = true; isLoading = true;
if (serviceRequests == null) notifyListeners(); if (serviceRequests?.isEmpty ?? false) notifyListeners();
Response response; Response response;
try { try {
Map<String, dynamic> body = {}; Map<String, dynamic> body = {};
@ -76,8 +76,9 @@ class ServiceRequestsProvider extends ChangeNotifier {
List requestsListJson = json.decode(response.body)["data"]; List requestsListJson = json.decode(response.body)["data"];
List<ServiceRequest> serviceRequestsPage = requestsListJson.map((request) => ServiceRequest.fromJson(request)).toList(); List<ServiceRequest> serviceRequestsPage = requestsListJson.map((request) => ServiceRequest.fromJson(request)).toList();
serviceRequests ??= []; serviceRequests ??= [];
sortMostRecent(serviceRequestsPage);
serviceRequests.addAll(serviceRequestsPage); serviceRequests.addAll(serviceRequestsPage);
sortMostRecent(serviceRequests);
notifyListeners();
if (serviceRequestsPage.length == pageItemNumber) { if (serviceRequestsPage.length == pageItemNumber) {
nextPage = true; nextPage = true;
} else { } else {

@ -0,0 +1,53 @@
import 'dart:convert';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart';
import 'package:test_sa/controllers/api_routes/api_manager.dart';
import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
class VendorProvider extends ChangeNotifier {
void reset() {
_vendors = null;
_loading = null;
_stateCode = null;
}
int _stateCode;
int get stateCode => _stateCode;
List<Supplier> _vendors;
List<Supplier> get vendors => _vendors;
bool _loading;
bool get isLoading => _loading;
set isLoading(bool isLoading) {
_loading = isLoading;
notifyListeners();
}
Future<int> getVendors(String text) async {
if (_loading == true) return -2;
_loading = true;
notifyListeners();
Response response;
try {
response = await ApiManager.instance.get("${URLs.getSuppliersAutoComplete}?searchText=$text");
_stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) {
// client's request was successfully received
List suppliersJson = json.decode(response.body)["data"];
_vendors = suppliersJson.map((type) => Supplier.fromJson(type)).toList();
}
_loading = false;
notifyListeners();
return response.statusCode;
} catch (error) {
_loading = false;
_stateCode = -1;
notifyListeners();
return -1;
}
}
}

@ -63,6 +63,7 @@ import 'controllers/providers/api/status_drop_down/report/service_report_repair_
import 'controllers/providers/api/status_drop_down/report/service_report_status_provider.dart'; import 'controllers/providers/api/status_drop_down/report/service_report_status_provider.dart';
import 'controllers/providers/api/status_drop_down/report/service_report_types_provider.dart'; import 'controllers/providers/api/status_drop_down/report/service_report_types_provider.dart';
import 'controllers/providers/api/status_drop_down/report/service_types_provider.dart'; import 'controllers/providers/api/status_drop_down/report/service_types_provider.dart';
import 'controllers/providers/api/status_drop_down/report/vendor_provider.dart';
import 'controllers/providers/api/user_provider.dart'; import 'controllers/providers/api/user_provider.dart';
import 'controllers/providers/settings/setting_provider.dart'; import 'controllers/providers/settings/setting_provider.dart';
import 'views/pages/device_transfer/request_device_transfer.dart'; import 'views/pages/device_transfer/request_device_transfer.dart';
@ -81,15 +82,17 @@ void main() async {
} }
runApp(ChangeNotifierProvider( runApp(ChangeNotifierProvider(
create: (_) => SettingProvider(), create: (_) => SettingProvider(),
child: MyApp(), child: const MyApp(),
)); ));
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({Key key}) : super(key: key);
// This widget is the root of your application. // This widget is the root of your application.
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final _settingProvider = Provider.of<SettingProvider>(context); final settingProvider = Provider.of<SettingProvider>(context);
return MultiProvider( return MultiProvider(
providers: [ providers: [
ChangeNotifierProvider(create: (_) => UserProvider()), ChangeNotifierProvider(create: (_) => UserProvider()),
@ -131,6 +134,7 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider(create: (_) => ServiceReportMaintenanceSituationProvider()), ChangeNotifierProvider(create: (_) => ServiceReportMaintenanceSituationProvider()),
ChangeNotifierProvider(create: (_) => ServiceReportUsersProvider()), ChangeNotifierProvider(create: (_) => ServiceReportUsersProvider()),
ChangeNotifierProvider(create: (_) => ServiceReportAssistantsEmployeeProvider()), ChangeNotifierProvider(create: (_) => ServiceReportAssistantsEmployeeProvider()),
ChangeNotifierProvider(create: (_) => VendorProvider()),
], ],
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
@ -160,7 +164,7 @@ class MyApp extends StatelessWidget {
Locale('en'), Locale('en'),
Locale('ar'), Locale('ar'),
], ],
locale: Locale(_settingProvider.language ?? 'en'), locale: Locale(settingProvider.language ?? 'en'),
initialRoute: SplashScreen.id, initialRoute: SplashScreen.id,
routes: { routes: {
SplashScreen.id: (_) => const SplashScreen(), SplashScreen.id: (_) => const SplashScreen(),

@ -1,49 +1,64 @@
import '../lookup.dart'; import 'package:test_sa/models/device/device.dart';
import '../hospital.dart';
class DeviceTransferSearch { class DeviceTransferSearch {
String assetName, assetNumber, site; Device device;
String title, room;
bool mostRecent; bool mostRecent;
Lookup dateOperator; Hospital hospital;
String from, to; Buildings building;
List<Buildings> buildingsList;
Floors floor;
List<Floors> floorsList;
Departments department;
List<Departments> departmentsList;
DeviceTransferSearch({ DeviceTransferSearch({
this.assetName, this.device,
this.assetNumber, this.hospital,
this.site, this.building,
this.floor,
this.department,
this.room,
this.title,
this.mostRecent, this.mostRecent,
this.dateOperator,
this.from,
this.to,
}); });
Map<String, dynamic> toMap() { Map<String, dynamic> toMap() {
Map<String, dynamic> search = {}; Map<String, dynamic> search = {};
if (assetName != null && assetName.isNotEmpty) { if (title != null && title.isNotEmpty) {
search["assetName"] = assetName; search["transferCode"] = title;
}
if (device != null) {
search["assetId"] = device.id;
}
if (hospital?.id != null) {
search["destSiteId"] = hospital.id;
} }
if (assetNumber != null && assetNumber.isNotEmpty) { if (building?.id != null) {
search["assetNumber"] = assetNumber; search["destBuildingId"] = building.id;
} }
if (site != null && site.isNotEmpty) { if (floor?.id != null) {
search["site"] = site; search["destFloorId"] = floor.id;
} }
if (dateOperator != null && from != null) { if (department?.id != null) {
search["requestedDateSymbol"] = dateOperator.toMap(); search["destDepartmentId"] = department.id;
search["requestedDateFrom"] = from;
} }
if (dateOperator != null && to != null) { if (room != null && room.isNotEmpty) {
search["requestedDateTo"] = to; search["destRoom"] = department.id;
} }
return search; return search;
} }
void fromSearch(DeviceTransferSearch newSearch) { void fromSearch(DeviceTransferSearch newSearch) {
assetName = newSearch.assetName; title = newSearch.title;
assetNumber = newSearch.assetNumber; room = newSearch.room;
site = newSearch.site;
mostRecent = newSearch.mostRecent; mostRecent = newSearch.mostRecent;
from = newSearch.from; device = newSearch.device;
to = newSearch.to; hospital = newSearch.hospital;
dateOperator = newSearch.dateOperator; building = newSearch.building;
floor = newSearch.floor;
department = newSearch.department;
} }
} }

@ -286,7 +286,7 @@ class SearchWorkOrder {
if (repairLocation?.id != null) { if (repairLocation?.id != null) {
map['repairLocation'] = repairLocation.toMap(); map['repairLocation'] = repairLocation.toMap();
} }
if (reason != null) { if (reason != null && reason.id != null) {
map['reason'] = reason.toMap(); map['reason'] = reason.toMap();
} }
// map['startofWorkTime'] = startofWorkTime; // map['startofWorkTime'] = startofWorkTime;
@ -308,7 +308,7 @@ class SearchWorkOrder {
if (attachmentsWorkOrder != null) { if (attachmentsWorkOrder != null) {
map['attachmentsWorkOrder'] = attachmentsWorkOrder.map((v) => v.toJson()).toList(); map['attachmentsWorkOrder'] = attachmentsWorkOrder.map((v) => v.toJson()).toList();
} }
if (equipmentStatus != null) { if (equipmentStatus != null && equipmentStatus.id != null) {
map['equipmentStatus'] = equipmentStatus.toMap(); map['equipmentStatus'] = equipmentStatus.toMap();
} }
if (suppEngineerWorkOrders != null) { if (suppEngineerWorkOrders != null) {
@ -2719,29 +2719,42 @@ class Supplier {
Supplier({ Supplier({
this.id, this.id,
this.suppliername, this.suppliername,
this.suppPersons,
}); });
Supplier.fromJson(dynamic json) { Supplier.fromJson(dynamic json) {
id = json['id']; id = json['id'];
suppliername = json['suppliername']; suppliername = json['suppliername'];
if (json['suppPersons'] != null) {
suppPersons = [];
json['suppPersons'].forEach((v) {
suppPersons.add(SuppPersons.fromJson(v));
});
}
} }
num id; num id;
String suppliername; String suppliername;
List<SuppPersons> suppPersons;
SupplierModel copyWith({ SupplierModel copyWith({
num id, num id,
String suppliername, String suppliername,
List<SuppPersons> suppPersons,
}) => }) =>
SupplierModel( SupplierModel(
id: id ?? this.id, id: id ?? this.id,
suppliername: suppliername ?? this.suppliername, suppliername: suppliername ?? this.suppliername,
suppPersons: suppPersons ?? this.suppPersons,
); );
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
map['id'] = id ?? 0; map['id'] = id ?? 0;
map['suppliername'] = suppliername; map['suppliername'] = suppliername;
if (suppPersons != null) {
map['suppPersons'] = suppPersons.map((v) => v.toJson()).toList();
}
return map; return map;
} }
} }

@ -72,11 +72,12 @@ class _TrackDeviceTransferPageState extends State<TrackDeviceTransferPage> with
backgroundColor: AColors.white, backgroundColor: AColors.white,
onPressed: () async { onPressed: () async {
DeviceTransferSearch temp = await showModalBottomSheet( DeviceTransferSearch temp = await showModalBottomSheet(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
builder: (context) { builder: (context) {
return AssetTransferSearchDialog(initialSearchValue: _deviceTransferProvider.deviceTransferSearch); return AssetTransferSearchDialog(initialSearchValue: _deviceTransferProvider.deviceTransferSearch);
}); },
);
if (temp != null) { if (temp != null) {
_deviceTransferProvider.deviceTransferSearch = temp; _deviceTransferProvider.deviceTransferSearch = temp;
_deviceTransferProvider.reset(); _deviceTransferProvider.reset();

@ -0,0 +1,85 @@
import 'package:flutter/material.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import '../../../controllers/providers/api/status_drop_down/report/vendor_provider.dart';
import '../../app_style/colors.dart';
import '../../app_style/sizing.dart';
class AutoGeneratedVendorName extends StatefulWidget {
final String initialValue;
final Function(Supplier) onSearch;
const AutoGeneratedVendorName({Key key, this.initialValue, this.onSearch}) : super(key: key);
@override
State<AutoGeneratedVendorName> createState() => _AutoGeneratedVendorNameState();
}
class _AutoGeneratedVendorNameState extends State<AutoGeneratedVendorName> {
TextEditingController _controller;
@override
void initState() {
super.initState();
_controller = TextEditingController(text: widget.initialValue ?? "");
}
@override
void didUpdateWidget(covariant AutoGeneratedVendorName oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.initialValue != widget.initialValue) {
_controller = TextEditingController(text: widget.initialValue ?? "");
}
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final vendorProvider = Provider.of<VendorProvider>(context, listen: false);
return Container(
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
color: AColors.inputFieldBackgroundColor,
border: Border.all(
color: const Color(0xffefefef),
),
borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
// boxShadow: [
// AppStyle.boxShadow
// ]
),
child: TypeAheadField<Supplier>(
textFieldConfiguration: TextFieldConfiguration(
style: Theme.of(context).textTheme.titleLarge,
controller: _controller,
textAlign: TextAlign.center,
decoration: const InputDecoration(
hintText: "Vendor Name",
border: InputBorder.none,
disabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
),
textInputAction: TextInputAction.search,
),
suggestionsCallback: (vale) async {
await vendorProvider.getVendors(_controller.text.trim());
return vendorProvider.vendors;
},
itemBuilder: (context, vendor) {
return ListTile(title: Text(vendor.suppliername));
},
onSuggestionSelected: (hospital) {
widget.onSearch(hospital);
},
),
);
}
}

@ -58,6 +58,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
callRequest: CallRequest(id: widget?.workOrder?.callRequest?.id), callRequest: CallRequest(id: widget?.workOrder?.callRequest?.id),
currentSituation: null, currentSituation: null,
supplier: null, supplier: null,
parentWOId: widget.workOrder.id,
); );
_serviceReport = ServiceReport(id: widget.workOrder.id, type: widget.workOrder.assetType, equipmentStatus: widget.workOrder.equipmentStatus); _serviceReport = ServiceReport(id: widget.workOrder.id, type: widget.workOrder.assetType, equipmentStatus: widget.workOrder.equipmentStatus);
_isLoading = true; _isLoading = true;
@ -313,7 +314,6 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
child: AButton( child: AButton(
text: subtitle.create, text: subtitle.create,
onPressed: () async { onPressed: () async {
_subWorkOrders.parentWOId = widget.workOrder.id;
_validate = true; _validate = true;
setState(() {}); setState(() {});
if (validate()) { if (validate()) {

@ -8,11 +8,13 @@ import 'package:test_sa/views/widgets/buttons/app_button.dart';
import 'package:test_sa/views/widgets/status/report/service_report_assistant_employee_menu.dart'; import 'package:test_sa/views/widgets/status/report/service_report_assistant_employee_menu.dart';
import 'package:test_sa/views/widgets/status/report/service_report_maintenance_situation.dart'; import 'package:test_sa/views/widgets/status/report/service_report_maintenance_situation.dart';
import 'package:test_sa/views/widgets/status/report/service_report_repair_location.dart'; import 'package:test_sa/views/widgets/status/report/service_report_repair_location.dart';
import 'package:test_sa/views/widgets/status/service_request/supplier_engineers_menu.dart';
import '../../../controllers/localization/localization.dart'; import '../../../controllers/localization/localization.dart';
import '../../../controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart'; import '../../../controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart';
import '../../widgets/timer/app_timer.dart'; import '../../widgets/timer/app_timer.dart';
import '../../widgets/titles/app_sub_title.dart'; import '../../widgets/titles/app_sub_title.dart';
import 'auto_generated_vendor_name.dart';
class WorkOrderDetailsBottomSheet extends StatefulWidget { class WorkOrderDetailsBottomSheet extends StatefulWidget {
final SearchWorkOrder subWorkOrder; final SearchWorkOrder subWorkOrder;
@ -25,12 +27,18 @@ class WorkOrderDetailsBottomSheet extends StatefulWidget {
class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomSheet> { class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomSheet> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final SearchWorkOrder _workOrder = SearchWorkOrder(); final SearchWorkOrder _workOrder = SearchWorkOrder();
bool _showVendorFields = false;
SuppEngineerWorkOrders engineer;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_workOrder.copyFrom(widget.subWorkOrder); _workOrder.copyFrom(widget.subWorkOrder);
if (_workOrder.calllastSituation?.name?.toLowerCase()?.contains("under repair-vendor") ?? false) {
_showVendorFields = true;
_workOrder.supplier ??= SupplierModel(id: _workOrder?.supplier?.id);
}
if (context.mounted) { if (context.mounted) {
Provider.of<ServiceReportMaintenanceSituationProvider>(context, listen: false).reset(); Provider.of<ServiceReportMaintenanceSituationProvider>(context, listen: false).reset();
} }
@ -118,6 +126,14 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
ServiceReportMaintenanceSituation( ServiceReportMaintenanceSituation(
initialValue: _workOrder.calllastSituation, initialValue: _workOrder.calllastSituation,
onSelect: (status) { onSelect: (status) {
if (status.name.toLowerCase().contains("under repair-vendor")) {
_showVendorFields = true;
_workOrder.supplier ??= SupplierModel(id: _workOrder?.supplier?.id);
engineer = null;
} else {
_showVendorFields = false;
}
setState(() {});
if (status?.value == 12 || _workOrder.calllastSituation?.value == 12) { if (status?.value == 12 || _workOrder.calllastSituation?.value == 12) {
_workOrder.calllastSituation = status; _workOrder.calllastSituation = status;
setState(() {}); setState(() {});
@ -125,8 +141,30 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
_workOrder.calllastSituation = status; _workOrder.calllastSituation = status;
} }
}, },
woId: widget.subWorkOrder?.callRequest?.id?.toString(), woId: widget.subWorkOrder?.parentWOId?.toString(),
), ),
if (_showVendorFields) const SizedBox(height: 8),
if (_showVendorFields)
AutoGeneratedVendorName(
initialValue: _workOrder.supplier?.suppliername,
onSearch: (supplier) {
_workOrder.supplier.id = supplier.id;
_workOrder.supplier.suppliername = supplier.suppliername;
_workOrder.supplier.suppPersons = supplier.suppPersons;
setState(() {});
},
),
if (_showVendorFields) const SizedBox(height: 8),
if (_showVendorFields)
SupplierEngineersMenu(
initialValue: engineer,
engineers: _workOrder.supplier.suppPersons,
onSelect: (engineer) {
if (engineer != null) {
this.engineer = engineer;
}
},
),
const SizedBox(height: 8), const SizedBox(height: 8),
const ASubTitle("Repair Location"), const ASubTitle("Repair Location"),
const SizedBox(height: 4), const SizedBox(height: 4),
@ -158,6 +196,16 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
await Fluttertoast.showToast(msg: "Working Hours Timer Isn't Started"); await Fluttertoast.showToast(msg: "Working Hours Timer Isn't Started");
return; return;
} }
if (_showVendorFields && (_workOrder.supplier.suppliername == null || _workOrder.supplier.suppliername.isEmpty)) {
await Fluttertoast.showToast(msg: "Vendor Name is Required");
return;
}
if (_showVendorFields && _workOrder.suppEngineerWorkOrders == null) {
await Fluttertoast.showToast(msg: "Vendor Engineer is Required");
return;
}
_workOrder.suppEngineerWorkOrders ?? [];
_workOrder.suppEngineerWorkOrders.add(engineer..id = 0);
_formKey.currentState.save(); _formKey.currentState.save();
widget.subWorkOrder.copyFrom(_workOrder); widget.subWorkOrder.copyFrom(_workOrder);
Navigator.pop(context); Navigator.pop(context);

@ -90,7 +90,7 @@ class _DepartmentTypeMenuState extends State<DepartmentTypeMenu> {
return DropdownMenuItem<Departments>( return DropdownMenuItem<Departments>(
value: value, value: value,
child: Text( child: Text(
value.name, value?.name ?? "",
style: Theme.of(context).textTheme.subtitle1.copyWith( style: Theme.of(context).textTheme.subtitle1.copyWith(
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
fontSize: 11, fontSize: 11,

@ -5,12 +5,15 @@ import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/app_style/sizing.dart';
import 'package:test_sa/views/widgets/buttons/app_button.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart';
import 'package:test_sa/views/widgets/buttons/app_small_button.dart'; import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
import 'package:test_sa/views/widgets/equipment/device_button.dart';
import '../../../controllers/providers/api/hospitals_provider.dart';
import '../app_text_form_field.dart'; import '../app_text_form_field.dart';
import '../date_and_time/date_picker.dart'; import '../gas_refill/building_type_menu.dart';
import '../status/report/service_report_visit_date_operator.dart'; import '../gas_refill/department_type_menu.dart';
import '../gas_refill/floor_type_menu.dart';
import '../hospitals/hospital_auto_complete_field.dart';
import '../switch_button.dart'; import '../switch_button.dart';
import '../titles/app_sub_title.dart';
class AssetTransferSearchDialog extends StatefulWidget { class AssetTransferSearchDialog extends StatefulWidget {
final DeviceTransferSearch initialSearchValue; final DeviceTransferSearch initialSearchValue;
@ -25,6 +28,7 @@ class AssetTransferSearchDialog extends StatefulWidget {
class AssetTransferSearchDialogState extends State<AssetTransferSearchDialog> with TickerProviderStateMixin { class AssetTransferSearchDialogState extends State<AssetTransferSearchDialog> with TickerProviderStateMixin {
DeviceTransferSearch _search; DeviceTransferSearch _search;
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
bool _isLoading = false;
@override @override
void initState() { void initState() {
@ -36,165 +40,161 @@ class AssetTransferSearchDialogState extends State<AssetTransferSearchDialog> wi
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Subtitle subtitle = AppLocalization.of(context).subtitle; Subtitle subtitle = AppLocalization.of(context).subtitle;
return SizedBox( return Padding(
height: MediaQuery.of(context).size.height / 1.3, padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: Form( child: ClipRRect(
key: _formKey, borderRadius: const BorderRadius.only(topLeft: Radius.circular(15), topRight: Radius.circular(15)),
child: ListView( clipBehavior: Clip.antiAliasWithSaveLayer,
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), child: Container(
children: [ color: Colors.white,
Row( height: MediaQuery.of(context).size.height / 1.3,
mainAxisAlignment: MainAxisAlignment.spaceBetween, padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 20),
child: Form(
key: _formKey,
child: ListView(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
children: [ children: [
ASmallButton( Row(
text: subtitle.cancel, mainAxisAlignment: MainAxisAlignment.spaceBetween,
onPressed: () { children: [
Navigator.of(context).pop(); 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);
},
)
],
),
ASwitchButton(
title: "Most Recent",
value: _search.mostRecent ?? false,
onChange: (value) {
_search.mostRecent = value;
setState(() {});
}, },
), ),
ASmallButton( SizedBox(height: 8.0 * AppStyle.getScaleFactor(context)),
text: subtitle.search, DeviceButton(
onPressed: () { device: _search.device,
onDevicePick: (device) {
_search.device = device;
setState(() {});
},
),
SizedBox(height: 8.0 * AppStyle.getScaleFactor(context)),
ATextFormField(
initialValue: _search.title,
hintText: subtitle.title,
style: Theme.of(context).textTheme.titleLarge,
textInputAction: TextInputAction.search,
onAction: () {
if (!_formKey.currentState.validate()) { if (!_formKey.currentState.validate()) {
return; return;
} }
_formKey.currentState.save(); _formKey.currentState.save();
Navigator.of(context).pop(_search); Navigator.of(context).pop(_search);
}, },
) onSaved: (value) {
], _search.title = value;
), },
ASwitchButton(
title: "Most Recent",
value: _search.mostRecent ?? false,
onChange: (value) {
_search.mostRecent = value;
setState(() {});
},
),
SizedBox(
height: 8.0 * AppStyle.getScaleFactor(context),
),
ATextFormField(
initialValue: _search.assetNumber,
hintText: subtitle.assetNumber,
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.assetNumber = value;
},
),
SizedBox(
height: 8.0 * AppStyle.getScaleFactor(context),
),
ATextFormField(
initialValue: _search.assetName,
hintText: subtitle.assetName,
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.site = value;
},
),
SizedBox(
height: 8.0 * AppStyle.getScaleFactor(context),
),
ATextFormField(
initialValue: _search.site,
hintText: subtitle.site,
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.assetName = value;
},
),
SizedBox(
height: 8.0 * 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: [
if (_search?.dateOperator?.name?.toLowerCase()?.contains("between") ?? false) 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), SizedBox(height: 8.0 * AppStyle.getScaleFactor(context)),
if (_search?.dateOperator?.name?.toLowerCase()?.contains("between") ?? false) HospitalAutoCompleteField(
Expanded( initialValue: _search?.hospital?.name,
child: Column( onSearch: (selected) async {
crossAxisAlignment: CrossAxisAlignment.stretch, _search.building = null;
children: [ _search.floor = null;
const ASubTitle("To"), _search.department = null;
ADatePicker( _search.buildingsList = null;
date: DateTime.tryParse(_search.to ?? ""), _search.floorsList = null;
from: DateTime(1950), _search.departmentsList = null;
onDatePicker: (date) { _isLoading = true;
_search.to = date?.toIso8601String(); setState(() {});
setState(() {}); await HospitalsProvider().getHospitalsListByVal(searchVal: selected?.name ?? "").then((value) {
}, _search.hospital = value?.firstWhere((element) => element.name == selected.name, orElse: () => null);
), _search.buildingsList = _search.hospital?.buildings;
], });
), _isLoading = false;
), setState(() {});
], },
), ),
const SizedBox(width: 16), const SizedBox(height: 8),
Visibility( BuildingTypeMenu(
visible: _search.toMap().isNotEmpty, initialValue: _search?.building,
child: Padding( building: _search.buildingsList,
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), enabled: !_isLoading,
child: AButton( onSelect: (status) {
padding: EdgeInsets.zero, _search.building = status;
text: subtitle.clearSearch, _search.floorsList = status?.floors;
onPressed: () { setState(() {});
_search = DeviceTransferSearch(); },
),
const SizedBox(height: 8),
FloorTypeMenu(
initialValue: _search?.floor,
floors: _search.floorsList,
enabled: !_isLoading,
onSelect: (status) {
_search.floor = status;
_search.departmentsList = _search.floor?.departments;
setState(() {});
},
),
const SizedBox(height: 8),
DepartmentTypeMenu(
initialValue: _search?.department,
departments: _search.departmentsList,
enabled: !_isLoading,
onSelect: (status) {
_search.department = status;
setState(() {});
},
),
SizedBox(height: 8.0 * AppStyle.getScaleFactor(context)),
ATextFormField(
initialValue: _search.room,
hintText: subtitle.room,
style: Theme.of(context).textTheme.titleLarge,
textInputAction: TextInputAction.search,
onAction: () {
if (!_formKey.currentState.validate()) {
return;
}
_formKey.currentState.save();
Navigator.of(context).pop(_search); Navigator.of(context).pop(_search);
}, },
onSaved: (value) {
_search.room = value;
},
), ),
), SizedBox(height: 16.0 * AppStyle.getScaleFactor(context)),
Visibility(
visible: _search.toMap().isNotEmpty,
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
child: AButton(
padding: EdgeInsets.zero,
text: subtitle.clearSearch,
onPressed: () {
_search = DeviceTransferSearch();
Navigator.of(context).pop(_search);
},
),
),
),
],
), ),
], ),
), ),
), ),
); );

@ -0,0 +1,118 @@
import 'package:flutter/material.dart';
import 'package:test_sa/models/service_request/search_work_order.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/app_style/sizing.dart';
class SupplierEngineersMenu extends StatefulWidget {
final List<SuppPersons> engineers;
final SuppEngineerWorkOrders initialValue;
final Function(SuppEngineerWorkOrders) onSelect;
const SupplierEngineersMenu({Key key, this.engineers, this.onSelect, this.initialValue}) : super(key: key);
@override
SingleAssistantEmployeeMenuState createState() => SingleAssistantEmployeeMenuState();
}
class SingleAssistantEmployeeMenuState extends State<SupplierEngineersMenu> {
SuppPersons _selectedEngineer;
@override
void setState(VoidCallback fn) {
if (mounted) super.setState(fn);
}
@override
void didUpdateWidget(covariant SupplierEngineersMenu oldWidget) {
if (widget.initialValue != null) {
final result = widget.engineers?.where((element) {
return element?.id == widget.initialValue?.supplierContactId;
});
if (result.isNotEmpty) {
_selectedEngineer = result.first;
} else {
_selectedEngineer = null;
}
if ((widget.initialValue?.supplierContactId ?? "") != (_selectedEngineer?.id ?? "")) {
onSelect(_selectedEngineer);
}
} else {
_selectedEngineer = null;
}
super.didUpdateWidget(oldWidget);
}
@override
void initState() {
if (widget.initialValue != null) {
final result = widget.engineers?.where((element) {
return element?.id == widget.initialValue?.supplierContactId;
});
if (result.isNotEmpty) _selectedEngineer = result.first;
if (widget.initialValue?.supplierContactId != _selectedEngineer?.id) {
onSelect(_selectedEngineer);
}
}
super.initState();
}
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
color: AColors.inputFieldBackgroundColor,
border: Border.all(
color: const Color(0xffefefef),
),
borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
// boxShadow: const [
// AppStyle.boxShadow
// ]
),
child: DropdownButton<SuppPersons>(
value: _selectedEngineer,
iconSize: 24,
icon: const Icon(Icons.keyboard_arrow_down_rounded),
elevation: 0,
isExpanded: true,
hint: Text("Vendor Engineer", style: Theme.of(context).textTheme.titleMedium),
style: TextStyle(color: Theme.of(context).primaryColor),
underline: const SizedBox.shrink(),
onChanged: (SuppPersons newValue) {
setState(() {
_selectedEngineer = newValue;
});
onSelect(newValue);
},
items: widget.engineers?.map<DropdownMenuItem<SuppPersons>>((SuppPersons value) {
return DropdownMenuItem<SuppPersons>(
value: value,
child: Text(
value?.personName ?? "NULL",
style: Theme.of(context).textTheme.titleMedium.copyWith(
color: Theme.of(context).primaryColor,
fontSize: 11,
//fontWeight: FontWeight.bold
),
),
);
})?.toList(),
),
);
}
void onSelect(SuppPersons engineer) {
widget.onSelect(
SuppEngineerWorkOrders(
id: engineer?.supplierId,
supplierContactId: engineer?.id,
personName: engineer?.personName,
contact: engineer?.contact,
externalEngCode: engineer?.externalEngCode,
email: engineer?.email,
),
);
}
}
Loading…
Cancel
Save