Enhancements

pull/2/head
zaid_daoud 3 years ago
parent 7d7594a3ab
commit 575005ebdd

@ -55,7 +55,7 @@ class ServiceRequestFaultDescriptionProvider extends ChangeNotifier {
if (response.statusCode >= 200 && response.statusCode < 300) {
// client's request was successfully received
List listJson = json.decode(response.body)["data"]['asset']['modelDefinition']['modelDefRelatedDefects'];
_items = listJson.map((type) => FaultDescription.fromJson(type)).toList();
_items = listJson?.map((type) => FaultDescription.fromJson(type))?.toList() ?? [];
}
_loading = false;
notifyListeners();

@ -250,7 +250,7 @@ class SearchWorkOrder {
}
map['visitDate'] = visitDate;
if (assistantEmployees != null) {
map['assistantEmployees'] = assistantEmployees.map((v) => v?.user?.id).toList();
map['assistantEmployees'] = assistantEmployees.map((v) => v?.toJson()).toList();
}
if (supplier != null) {
map['supplier'] = supplier.toJson();
@ -1516,7 +1516,7 @@ class Asset {
systemID = json['systemID'];
assetNumber = json['assetNumber'];
modelDefinition = json['modelDefinition'] != null ? ModelDefinition.fromJson(json['modelDefinition']) : null;
supplier = json['supplier'] != null ? SupplierModel.fromJson(json['supplier']) : null;
supplier = json['supplier'] != null ? Supplier.fromJson(json['supplier']) : null;
ipAddress = json['ipAddress'];
macAddress = json['macAddress'];
portNumber = json['portNumber'];
@ -1570,7 +1570,7 @@ class Asset {
String systemID;
String assetNumber;
ModelDefinition modelDefinition;
SupplierModel supplier;
Supplier supplier;
String ipAddress;
String macAddress;
String portNumber;

@ -182,7 +182,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
height: 4,
),
ServiceReportFaultDescription(
requestId: widget.workOrder.callRequest.id.toString(),
requestId: widget.workOrder?.id?.toString(),
initialValue: _subWorkOrders.faultDescription,
onSelect: (status) {
_subWorkOrders.faultDescription = status;
@ -195,15 +195,11 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ASubTitle("Solution"),
const ASubTitle("Solution"),
const SizedBox(
height: 4,
),
ATextFormField(
labelText: _subWorkOrders.faultDescription?.workPerformed??"",
textInputType: TextInputType.multiline,
enable:false
),
ATextFormField(labelText: _subWorkOrders.faultDescription?.workPerformed ?? "", textInputType: TextInputType.multiline, enable: false),
],
),
const SizedBox(height: 8),
@ -287,19 +283,14 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
_validate = true;
setState(() {});
if (validate()) {
if(_subWorkOrders.startofWorkTime == null)
{
Fluttertoast.showToast(msg: subtitle.startDate + " required");
if (_subWorkOrders.startofWorkTime == null) {
Fluttertoast.showToast(msg: "${subtitle.startDate} required");
return;
} else
if(_subWorkOrders.endofWorkTime == null)
{
Fluttertoast.showToast(msg: subtitle.endDate + " required");
} else if (_subWorkOrders.endofWorkTime == null) {
Fluttertoast.showToast(msg: "${subtitle.endDate} required");
return;
} else
if(_subWorkOrders.calllastSituation == null)
{
Fluttertoast.showToast(msg: subtitle.callLastSituation + " required");
} else if (_subWorkOrders.calllastSituation == null) {
Fluttertoast.showToast(msg: "${subtitle.callLastSituation} required");
return;
}
_validate = false;

@ -85,7 +85,7 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
ADateTimePicker(
date: DateTime.tryParse(_workOrder.startofWorkTime ?? ""),
from: DateTime.now().subtract(const Duration(days: 365)),
to: DateTime.now().add(const Duration(days: 365)),
to: DateTime.now(),
onDateTimePicker: (date) {
_workOrder.startofWorkTime = date?.toIso8601String();
setState(() {});
@ -106,7 +106,7 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
ADateTimePicker(
date: DateTime.tryParse(_workOrder.endofWorkTime ?? ""),
from: DateTime.now().subtract(const Duration(days: 365)),
to: DateTime.now().add(const Duration(days: 365)),
to: DateTime.now(),
onDateTimePicker: (date) {
_workOrder.endofWorkTime = date?.toIso8601String();
setState(() {});
@ -121,9 +121,8 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
ASubTitle(subtitle.workingHours),
const SizedBox(height: 4),
ATextFormField(
initialValue: null,
textAlign: TextAlign.center,
hintText: _workOrder.startofWorkTime == null
labelText: _workOrder.startofWorkTime == null
? "0"
: ((DateTime.tryParse(_workOrder.endofWorkTime ?? "")?.difference(DateTime.tryParse(_workOrder.startofWorkTime ?? ""))?.inMinutes ?? 0) / 60)
?.toStringAsFixed(2)
@ -134,7 +133,11 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
// validator: (value) => Validator.isNumeric(value) ? null : _subtitle.requiredWord,
textInputType: TextInputType.number,
onSaved: (value) {
_workOrder.workingHours = double.tryParse(value);
_workOrder.workingHours = double.tryParse(
((DateTime.tryParse(_workOrder.endofWorkTime ?? "")?.difference(DateTime.tryParse(_workOrder.startofWorkTime ?? ""))?.inMinutes ?? 0) / 60)
?.toStringAsFixed(2)
?.toString() ??
"0");
},
),
const SizedBox(height: 8),

Loading…
Cancel
Save