Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

ATOMS-783 fixed

Browse Source
design_3.0_task_module_new
WaseemAbbasi22 6 months ago
parent b577343353
commit e3531d471d
4 changed files with 106 additions and 85 deletions
Show Stats Download Patch File Download Diff File

36
lib/controllers/providers/api/device_transfer_provider.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/models/device/asset.dart';
import 'package:test_sa/models/device/device_transfer.dart';
import 'package:test_sa/models/new_models/site.dart';
import 'package:test_sa/models/service_request/pending_service_request_model.dart';
import 'package:test_sa/models/user.dart';
@ -20,10 +21,18 @@ class DeviceTransferProvider extends ChangeNotifier {
final pageItemNumber = 12;
DeviceTransfer transferModel = DeviceTransfer();
bool isSiteLoading = false;
Asset ?_internalAssetDestination = Asset();
//reset provider data
Asset ?get internalAssetDestination => _internalAssetDestination;
set internalAssetDestination(Asset? value) {
_internalAssetDestination = value;
notifyListeners();
} //reset provider data
void reset() {
items = null;
isSiteLoading = false;
nextPage = true;
stateCode = null;
hospital = null;
@ -185,6 +194,31 @@ class DeviceTransferProvider extends ChangeNotifier {
return -1;
}
}
Future getSiteData({required int? siteId}) async {
isSiteLoading = true;
notifyListeners();
try {
Response response = await ApiManager.instance.get(URLs.getSiteAutoCompleteWithoutConditionSites + "?id=$siteId");
stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) {
List? siteData = json.decode(response.body)["data"];
if (siteData != null && siteData.isNotEmpty) {
internalAssetDestination?.site = Site.fromJson(siteData.first);
}
// internalAssetDestination?.building = internalAssetDestination?.site?.buildings?.firstWhere((element) => element.value == internalAssetDestination?.installationBuilding?.value, orElse: () => Building());
// taskRequestModel?.floor = taskRequestModel?.building?.floors?.firstWhere((element) => element.value == taskRequestModel?.installationFloor?.value, orElse: () => Floor());
// taskRequestModel?.department = taskRequestModel?.floor?.departments?.firstWhere((element) => element.name == taskRequestModel?.installationDepartment?.name, orElse: () => Department());
}
isSiteLoading = false;
notifyListeners();
return response.statusCode;
} catch (error) {
isSiteLoading = false;
stateCode = -1;
notifyListeners();
return -1;
}
}
}

40
lib/models/device/device_transfer.dart
Unescape Escape View File

@ -699,26 +699,26 @@ class DeviceTransfer {
senderMachineStatusValue = assetTransfer.senderMachineStatusValue;
receiverMachineStatusValue = assetTransfer.receiverMachineStatusValue;
}
Future<bool> validate(BuildContext context) async {
if (assetId == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}");
return false;
} else if (destSiteId == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.destinationSite}");
return false;
} else if (destBuildingId == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.building}");
return false;
} else if (destFloorId == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.floor}");
return false;
} else if (destDepartmentId == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.department}");
return false;
}
return true;
}
//
// Future<bool> validate(BuildContext context) async {
// if (assetId == null) {
// await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}");
// return false;
// } else if (destSiteId == null) {
// await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.destinationSite}");
// return false;
// } else if (destBuildingId == null) {
// await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.building}");
// return false;
// } else if (destFloorId == null) {
// await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.floor}");
// return false;
// } else if (destDepartmentId == null) {
// await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.department}");
// return false;
// }
// return true;
// }
}
class AssetTransferAssistantEmployees {

112
lib/views/pages/device_transfer/create__device_transfer_request.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart';
import 'package:test_sa/dashboard_latest/dashboard_provider.dart';
@ -12,6 +13,7 @@ import 'package:test_sa/models/device/asset.dart';
import 'package:test_sa/models/device/device_transfer.dart';
import 'package:test_sa/models/device/asset_transfer_attachment.dart';
import 'package:test_sa/models/enums/user_types.dart';
import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/new_models/department.dart';
import 'package:test_sa/models/new_models/floor.dart';
import 'package:test_sa/models/service_request/pending_service_request_model.dart';
@ -42,14 +44,13 @@ class CreateDeviceTransferRequest extends StatefulWidget {
class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferRequest> {
late DeviceTransferProvider _deviceTransferProvider;
final TextEditingController _requestedQuantityController = TextEditingController();
final DeviceTransfer _transferModel = DeviceTransfer(id: 0);
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
final TextEditingController _receiverNameController = TextEditingController(), _commentsController = TextEditingController();
final Asset _assetDestination = Asset();
Asset _assetDestination = Asset();
Asset? _pickedAsset;
final List<File> _deviceImages = [];
bool isInternal = true;
PendingAssetServiceRequest? pendingAssetServiceRequest;
@override
@ -71,13 +72,15 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
_transferModel.destDepartmentId = _assetDestination.department?.id;
_transferModel.destRoomId = _assetDestination.room?.id;
if (!_formKey.currentState!.validate() || !(await _transferModel.validate(context))) {
if (!_formKey.currentState!.validate() || !(await validateRequest())) {
return;
}
_formKey.currentState!.save();
List<AssetTransferAttachment> attachement = [];
for (var item in _deviceImages) {
attachement.add(AssetTransferAttachment(id: 0, attachmentName: "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}"));
attachement.add(AssetTransferAttachment(id: 0, attachmentName: "${item.path
.split("/")
.last}|${base64Encode(item.readAsBytesSync())}"));
}
_transferModel.attachments = attachement;
@ -85,16 +88,17 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
context: context,
model: _transferModel,
);
if(_deviceTransferProvider.stateCode==200){
DashBoardProvider dashBoardProvider = Provider.of<DashBoardProvider>(context,listen: false);
dashBoardProvider.refreshDashboard(context: context,userType: UsersTypes.nurse);
if (_deviceTransferProvider.stateCode == 200) {
DashBoardProvider dashBoardProvider = Provider.of<DashBoardProvider>(context, listen: false);
dashBoardProvider.refreshDashboard(context: context, userType: UsersTypes.nurse);
}
}
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) async {
Provider.of<PpmServiceProvider>(context, listen: false).getDate();
//need to get internal and external request type data..
await Provider.of<PpmServiceProvider>(context, listen: false).getDate();
});
super.initState();
}
@ -102,10 +106,7 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
@override
void dispose() {
_requestedQuantityController.dispose();
_deviceTransferProvider.reset();
_receiverNameController.dispose();
_commentsController.dispose();
super.dispose();
}
@ -134,27 +135,15 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
backgroundColor: AppColor.white936,
onPick: (asset) async {
_pickedAsset = asset;
// await checkAssetForPendingServiceRequest(asset.id!.toInt());
// if (_pickedAsset != null && pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
// showPendingRequestBottomSheet();
// }
if (_pickedAsset?.site != null && _transferModel.transferType?.value == 1) {
await _deviceTransferProvider.getSiteData(siteId: int.tryParse(_pickedAsset!.site!.id.toString()));
_assetDestination.site = _deviceTransferProvider.internalAssetDestination?.site;
_assetDestination.building = null;
_assetDestination.floor = null;
_assetDestination.department = null;
}
setState(() {});
}),
// if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
// 8.height,
// Row(
// children: [
// const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
// 8.width,
// Text(
// "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
// style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
// ).expanded,
// ],
// ).onPress(() {
// showPendingRequests();
// }),
// ],
21.height,
requestTypeWidget(context),
12.height,
@ -166,6 +155,8 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
title: context.translation.site,
initialValue: _assetDestination.site,
showShadow: false,
loading: _deviceTransferProvider.isSiteLoading,
enabled: !isInternal,
backgroundColor: AppColor.neutral100,
showAsBottomSheet: true,
onSelect: (value) {
@ -234,7 +225,6 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
),
8.height,
AppTextFormField(
controller: _commentsController,
backgroundColor: AppColor.neutral100,
labelText: context.translation.callComments,
labelStyle: AppTextStyles.textFieldLabelStyle,
@ -268,40 +258,13 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
);
}
Future<void> checkAssetForPendingServiceRequest(int assetId) async {
checkPendingRequest = true;
setState(() {});
pendingAssetServiceRequest = await _deviceTransferProvider.checkAssetPendingRequest(assetId);
await Future.delayed(const Duration(milliseconds: 250));
checkPendingRequest = false;
setState(() {});
}
void showPendingRequestBottomSheet() async {
bool view = (await showModalBottomSheet(
context: context,
isDismissible: false,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => PendingRequestBottomSheet(pendingAssetServiceRequest!, _pickedAsset!),
)) as bool;
if (view) {
showPendingRequests();
}
}
Widget requestTypeWidget(BuildContext context) {
return Consumer<PpmServiceProvider>(builder: (cxt, snapshot, _) {
try {
_transferModel.transferType ??= snapshot.items.first;
} catch (ex) {
print("snapshot.items:${snapshot.items.length}");
print(ex);
}
return Column(
@ -333,6 +296,9 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
groupValue: _transferModel.transferType,
onChanged: (state) {
_transferModel.transferType = element;
isInternal = !isInternal;
// _assetDestination = Asset();
setState(() {});
// });
}),
@ -347,4 +313,28 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
);
});
}
}
Future<bool> validateRequest() async {
if (_pickedAsset == null) {
await Fluttertoast.showToast(msg: "Please Select Asset");
return false;
}
if (_assetDestination.site == null) {
await Fluttertoast.showToast(msg: "Please Select Site");
return false;
}
if (_assetDestination.building == null) {
await Fluttertoast.showToast(msg: "Please Select Building");
return false;
}
if (_assetDestination.floor == null) {
await Fluttertoast.showToast(msg: "Please Select Floor");
return false;
}
if (_assetDestination.department == null) {
await Fluttertoast.showToast(msg: "Please Select Department");
return false;
}
return true;
}
}

3
lib/views/pages/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -204,10 +204,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
_internalRequestDetailsCard({StatusLabel? statusLabel}) {
bool isCurrentEngineerEligibleForEdit = _model?.senderAssignedEmployeeId == _userProvider!.user?.userID;
// bool isCurrentRequestEditAble = ((_model?.senderMachineStatusName?.toLowerCase().contains("close") ?? false));
bool isCurrentRequestEditAble = (!(_model?.senderMachineStatusValue==3));
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

Write Preview
Loading…
Cancel
Save