From a1941511a05ab95e6f802268e3c1eec8e77ac61b Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 23 Jul 2024 15:24:43 +0300 Subject: [PATCH] call comments are mandatory now. --- .../service_request/service_request.dart | 3 + .../requests/create_service_request_page.dart | 58 ++++++++++--------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart index eebb3271..67fadb61 100644 --- a/lib/models/service_request/service_request.dart +++ b/lib/models/service_request/service_request.dart @@ -178,6 +178,9 @@ class ServiceRequest { } else if (type == null) { await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.requestType}"); return false; + } else if ((callComments ?? "").isEmpty) { + await Fluttertoast.showToast(msg: "Please add comments"); + return false; } return true; } diff --git a/lib/views/pages/user/requests/create_service_request_page.dart b/lib/views/pages/user/requests/create_service_request_page.dart index fed31c89..2c454fdf 100644 --- a/lib/views/pages/user/requests/create_service_request_page.dart +++ b/lib/views/pages/user/requests/create_service_request_page.dart @@ -1,3 +1,4 @@ +import 'dart:convert'; import 'dart:io'; import 'package:flutter/cupertino.dart'; @@ -179,6 +180,7 @@ class CreateServiceRequestPageState extends State { Text(context.translation.priority, style: Theme.of(context).textTheme.bodyLarge), Consumer(builder: (cxt, snapshot, _) { _serviceRequest?.priority ??= snapshot.items?.firstWhere((element) => element.value == 0, orElse: () => null); + return Transform.scale( scale: 0.8, child: CupertinoSwitch( @@ -241,7 +243,7 @@ class CreateServiceRequestPageState extends State { ], ) ], - ), + ).toShimmer(isShow: snapshot.loading), ], ); }), @@ -380,32 +382,32 @@ class CreateServiceRequestPageState extends State { _serviceRequest?.requestedThrough = Provider.of(context, listen: false).items?.firstWhere((element) => element.value == 3, orElse: () => null); _serviceRequest?.type = Provider.of(context, listen: false).items?.firstWhere((element) => element.value == 1, orElse: () => null); - print("_serviceRequest?.requestedThrough:${_serviceRequest?.requestedThrough.toJson()}"); - print("_serviceRequest?.type:${_serviceRequest?.type.toJson()}"); - print("_serviceRequest?.priority:${_serviceRequest?.priority.toJson()}"); - return; - - // if (_formKey.currentState.validate() && await _serviceRequest.validateNewRequest(context)) { - // _formKey.currentState.save(); - // - // bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id); - // if (!canSubmitRequest) { - // return; - // } - // - // _serviceRequest.devicePhotos = _deviceImages.map((e) => _isLocalUrl(e.path) ? "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}" : e.path).toList(); - // if (_serviceRequest.audio != null) { - // if (_isLocalUrl(_serviceRequest.audio)) { - // final File file = File(_serviceRequest.audio); - // _serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}"; - // } - // } - // await _serviceRequestsProvider.createRequest( - // context: context, - // user: _userProvider.user, - // host: _settingProvider.host, - // serviceRequest: _serviceRequest, - // ); - // } + // print("_serviceRequest?.requestedThrough:${_serviceRequest?.requestedThrough.toJson()}"); + // print("_serviceRequest?.type:${_serviceRequest?.type.toJson()}"); + // print("_serviceRequest?.priority:${_serviceRequest?.priority.toJson()}"); + // return; + + if (_formKey.currentState.validate() && await _serviceRequest.validateNewRequest(context)) { + _formKey.currentState.save(); + + // bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id); + // if (!canSubmitRequest) { + // return; + // } + + _serviceRequest.devicePhotos = _deviceImages.map((e) => _isLocalUrl(e.path) ? "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}" : e.path).toList(); + if (_serviceRequest.audio != null) { + if (_isLocalUrl(_serviceRequest.audio)) { + final File file = File(_serviceRequest.audio); + _serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}"; + } + } + await _serviceRequestsProvider.createRequest( + context: context, + user: _userProvider.user, + host: _settingProvider.host, + serviceRequest: _serviceRequest, + ); + } } }