Enhancements

pull/1/head
zaid_daoud 3 years ago
parent 8e8cdb6bfe
commit 53c1f83bac

@ -1,5 +1,6 @@
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/models/device/device.dart'; import 'package:test_sa/models/device/device.dart';
import 'package:test_sa/models/engineer.dart'; import 'package:test_sa/models/engineer.dart';
@ -150,13 +151,16 @@ class ServiceReport {
return _map; return _map;
} }
bool validate() { Future<bool> validate() async {
print("visitDate:$visitDate"); print("visitDate:$visitDate");
print("equipmentStatus:$equipmentStatus"); print("equipmentStatus:${equipmentStatus?.toMap()}");
print("callLastSituation:${callLastSituation.toMap()}"); print("callLastSituation:${callLastSituation?.toMap()}");
print("parts:$parts"); print("parts:$parts");
print("reason:${reason.toMap()}"); print("reason:${reason?.toMap()}");
if (visitDate == null) return false; if (visitDate == null) {
await Fluttertoast.showToast(msg: "Visit Date Required");
return false;
}
//if(serviceType == null) return false; //if(serviceType == null) return false;
if (equipmentStatus == null) return false; if (equipmentStatus == null) return false;
//if (type == null && assetType == null) return false; //if (type == null && assetType == null) return false;

@ -605,6 +605,12 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
ASubTitle(_subtitle.reasons), ASubTitle(_subtitle.reasons),
_validate && _serviceReport.reason?.id == null
? ASubTitle(
_subtitle.requiredWord,
color: Colors.red,
)
: const SizedBox.shrink(),
const SizedBox(height: 4), const SizedBox(height: 4),
ServiceReportReasonsMenu( ServiceReportReasonsMenu(
initialValue: _serviceReport.reason, initialValue: _serviceReport.reason,
@ -904,7 +910,10 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
// setState(() {}); // setState(() {});
// return; // return;
// } // }
if (!_serviceReport.validate()) return; if (!(await _serviceReport.validate())) {
setState(() {});
return;
}
_formKey.currentState.save(); _formKey.currentState.save();
_isLoading = true; _isLoading = true;

@ -73,7 +73,8 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
_subtitle = AppLocalization.of(context).subtitle; _subtitle = AppLocalization.of(context).subtitle;
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
body: LoadingManager( body: SafeArea(
child: LoadingManager(
isLoading: _devicesProvider.isLoading, isLoading: _devicesProvider.isLoading,
stateCode: _devicesProvider.stateCode, stateCode: _devicesProvider.stateCode,
isFailedLoading: _devicesProvider.devices == null, isFailedLoading: _devicesProvider.devices == null,
@ -83,7 +84,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
}, },
child: Column( child: Column(
children: [ children: [
const SizedBox(height: 48), const SizedBox(height: 16),
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
child: Column( child: Column(
@ -150,6 +151,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
], ],
), ),
), ),
),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
heroTag: "some tag 2", heroTag: "some tag 2",
child: const Icon(Icons.qr_code_scanner), child: const Icon(Icons.qr_code_scanner),

Loading…
Cancel
Save