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

ready for initial testing

Browse Source
design_3.0_latest
muhammad.abbasi 1 year ago
parent 0dd4a0f254
commit 044eadaacc
6 changed files with 132 additions and 162 deletions
Show Stats Download Patch File Download Diff File

1
lib/models/helper_data_models/maintenance_request/activity_maintenance_model.dart
Unescape Escape View File

@ -71,6 +71,7 @@ class ActivityMaintenanceHelperModel {
data['supplierStartTime'] = supplierStartTime?.toIso8601String(); data['supplierStartTime'] = supplierStartTime?.toIso8601String();
data['supplierEndTime'] = supplierEndTime?.toIso8601String(); data['supplierEndTime'] = supplierEndTime?.toIso8601String();
data['supplierWorkingHour'] = supplierWorkingHour; data['supplierWorkingHour'] = supplierWorkingHour;
print('model i got is ${modelAssistantEmployees?.toJson()}');
if (assignedEmployee != null&&assignedEmployee?.userId!=null) { if (assignedEmployee != null&&assignedEmployee?.userId!=null) {
data['assistantEmployees'] = [modelAssistantEmployees?.toJson()]; data['assistantEmployees'] = [modelAssistantEmployees?.toJson()];
} }

268
lib/models/new_models/work_order_detail_model.dart
Unescape Escape View File

@ -30,8 +30,7 @@ class WorkOrderDetail {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"data": data?.toJson(), "data": data?.toJson(),
"message": message, "message": message,
"title": title, "title": title,
@ -88,47 +87,47 @@ class WorkOrderData {
}); });
int? requestId; int? requestId;
String? workOrderNo; String? workOrderNo;
WorkOrderAssignedEmployee? workOrderCreatedBy; WorkOrderAssignedEmployee? workOrderCreatedBy;
DateTime? requestedDate; DateTime? requestedDate;
WorkOrderAsset? asset; WorkOrderAsset? asset;
Lookup? assetGroup; Lookup? assetGroup;
Lookup? manufacturer; Lookup? manufacturer;
Lookup? model; Lookup? model;
Lookup? assetNdModel; Lookup? assetNdModel;
Site? site; Site? site;
Lookup? building; Lookup? building;
Lookup? floor; Lookup? floor;
AssetGroup? department; AssetGroup? department;
int? room; int? room;
Lookup? assetType; Lookup? assetType;
WorkOrderAssignedEmployee? assignedEmployee; WorkOrderAssignedEmployee? assignedEmployee;
String? lastActivityStatus; String? lastActivityStatus;
Lookup? status; Lookup? status;
Lookup? nextStep; Lookup? nextStep;
int? assetVerificationType; int? assetVerificationType;
List<WorkOrderContactPerson> workOrderContactPerson; List<WorkOrderContactPerson> workOrderContactPerson;
Lookup? equipmentStatus; Lookup? equipmentStatus;
Lookup? priority; Lookup? priority;
Lookup? requestedThrough; Lookup? requestedThrough;
Lookup? typeofRequest; Lookup? typeofRequest;
Lookup? loanAvailablity; Lookup? loanAvailablity;
Lookup? assetLoan; Lookup? assetLoan;
Lookup? safety; Lookup? safety;
Lookup? problemDescription; Lookup? problemDescription;
String? comments; String? comments;
String? voiceNote; String? voiceNote;
List<WorkOrderAttachments> workOrderAttachments; List<WorkOrderAttachments> workOrderAttachments;
String? returnToService; String? returnToService;
Lookup? serviceType; Lookup? serviceType;
Lookup? failureReasone; Lookup? failureReasone;
Lookup? solution; Lookup? solution;
String? totalWorkingHours; String? totalWorkingHours;
DateTime? needAVisitDateTime; DateTime? needAVisitDateTime;
String?needAVisitComment; String? needAVisitComment;
List<WorkOrderHistory> workOrderHistory; List<WorkOrderHistory> workOrderHistory;
List<Activities> activities; List<Activities> activities;
List<dynamic> activityAssetToBeRetireds; List<dynamic> activityAssetToBeRetireds;
factory WorkOrderData.fromJson(Map<String, dynamic> json) { factory WorkOrderData.fromJson(Map<String, dynamic> json) {
return WorkOrderData( return WorkOrderData(
@ -163,7 +162,7 @@ class WorkOrderData {
problemDescription: json["problemDescription"] == null ? null : Lookup.fromJson(json["problemDescription"]), problemDescription: json["problemDescription"] == null ? null : Lookup.fromJson(json["problemDescription"]),
comments: json["comments"], comments: json["comments"],
voiceNote: json["voiceNote"], voiceNote: json["voiceNote"],
workOrderAttachments: json["workOrderAttachments"] == null ? [] : List.from(json['workOrderAttachments']).map((e)=>WorkOrderAttachments.fromJson(e)).toList(), workOrderAttachments: json["workOrderAttachments"] == null ? [] : List.from(json['workOrderAttachments']).map((e) => WorkOrderAttachments.fromJson(e)).toList(),
returnToService: json["returnToService"], returnToService: json["returnToService"],
serviceType: json["serviceType"] == null ? null : Lookup.fromJson(json["serviceType"]), serviceType: json["serviceType"] == null ? null : Lookup.fromJson(json["serviceType"]),
failureReasone: json["failureReasone"] == null ? null : Lookup.fromJson(json["failureReasone"]), failureReasone: json["failureReasone"] == null ? null : Lookup.fromJson(json["failureReasone"]),
@ -177,8 +176,7 @@ class WorkOrderData {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": requestId, "id": requestId,
"workOrderNo": workOrderNo, "workOrderNo": workOrderNo,
"workOrderCreatedBy": workOrderCreatedBy?.toJson(), "workOrderCreatedBy": workOrderCreatedBy?.toJson(),
@ -211,7 +209,7 @@ class WorkOrderData {
"problemDescription": problemDescription?.toJson(), "problemDescription": problemDescription?.toJson(),
"comments": comments, "comments": comments,
"voiceNote": voiceNote, "voiceNote": voiceNote,
"workOrderAttachments": workOrderAttachments.map((e)=>e.toJson()).toList(), "workOrderAttachments": workOrderAttachments.map((e) => e.toJson()).toList(),
"returnToService": returnToService, "returnToService": returnToService,
"serviceType": serviceType?.toJson(), "serviceType": serviceType?.toJson(),
"failureReasone": failureReasone?.toJson(), "failureReasone": failureReasone?.toJson(),
@ -221,22 +219,33 @@ class WorkOrderData {
"activities": activities.map((x) => x.toJson()).toList(), "activities": activities.map((x) => x.toJson()).toList(),
"activityAssetToBeRetireds": activityAssetToBeRetireds.map((x) => x).toList(), "activityAssetToBeRetireds": activityAssetToBeRetireds.map((x) => x).toList(),
}; };
Map<String, dynamic> toFixRemotelyJson() { Map<String, dynamic> toFixRemotelyJson() {
return {'workOrderId': workOrderNo, 'startDate': workOrderHistory.isNotEmpty? workOrderHistory[0].fixRemotlyStartTime:'', 'endDate': workOrderHistory.isNotEmpty? workOrderHistory[0].fixRemotlyEndTime:'', 'workingHour':'', 'comment': comments}; return {
'workOrderId': workOrderNo,
'startDate': workOrderHistory.isNotEmpty ? workOrderHistory[0].fixRemotlyStartTime : '',
'endDate': workOrderHistory.isNotEmpty ? workOrderHistory[0].fixRemotlyEndTime : '',
'workingHour': '',
'comment': comments
};
} }
//TODO feedback not defined... //TODO feedback not defined...
Map<String, dynamic> toMarkAsFixedJson() { Map<String, dynamic> toMarkAsFixedJson() {
return {'workOrderId': workOrderNo, 'feedback': comments}; return {'workOrderId': workOrderNo, 'feedback': comments};
} }
Map<String, dynamic> toNeedVisitJson() { Map<String, dynamic> toNeedVisitJson() {
return {'workOrderId': workOrderNo, 'visitDate': workOrderHistory.isNotEmpty? workOrderHistory[0].needAVisitDateTime:'', 'comment': comments}; return {'workOrderId': workOrderNo, 'visitDate': workOrderHistory.isNotEmpty ? workOrderHistory[0].needAVisitDateTime : '', 'comment': comments};
} }
//TODO signatureNurse not defined... //TODO signatureNurse not defined...
Map<String, dynamic> toNurseActionJson() { Map<String, dynamic> toNurseActionJson() {
return {'workOrderId': workOrderNo, 'feedback': '', 'signatureNurse': 'signatureNurse'}; return {'workOrderId': workOrderNo, 'feedback': '', 'signatureNurse': 'signatureNurse'};
} }
Map<String, dynamic> toWorkOrderJson() { Map<String, dynamic> toWorkOrderJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
data['workOrderId'] = requestId; data['workOrderId'] = requestId;
data['equipmentStatusId'] = equipmentStatus?.id; data['equipmentStatusId'] = equipmentStatus?.id;
data['returnToService'] = returnToService; data['returnToService'] = returnToService;
@ -256,8 +265,8 @@ class WorkOrderAsset {
required this.assetNumber, required this.assetNumber,
}); });
int? id; int? id;
String? assetNumber; String? assetNumber;
factory WorkOrderAsset.fromJson(Map<String, dynamic> json) { factory WorkOrderAsset.fromJson(Map<String, dynamic> json) {
return WorkOrderAsset( return WorkOrderAsset(
@ -266,8 +275,7 @@ class WorkOrderAsset {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": id, "id": id,
"assetNumber": assetNumber, "assetNumber": assetNumber,
}; };
@ -279,8 +287,8 @@ class AssetGroup {
required this.name, required this.name,
}); });
int? id; int? id;
String? name; String? name;
factory AssetGroup.fromJson(Map<String, dynamic> json) { factory AssetGroup.fromJson(Map<String, dynamic> json) {
return AssetGroup( return AssetGroup(
@ -289,8 +297,7 @@ class AssetGroup {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": id, "id": id,
"name": name, "name": name,
}; };
@ -304,10 +311,10 @@ class WorkOrderAssignedEmployee {
required this.languageId, required this.languageId,
}); });
dynamic userId; dynamic userId;
String? userName; String? userName;
String? email; String? email;
int? languageId; int? languageId;
factory WorkOrderAssignedEmployee.fromJson(Map<String, dynamic> json) { factory WorkOrderAssignedEmployee.fromJson(Map<String, dynamic> json) {
return WorkOrderAssignedEmployee( return WorkOrderAssignedEmployee(
@ -318,14 +325,14 @@ class WorkOrderAssignedEmployee {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"userId": userId, "userId": userId,
"userName": userName, "userName": userName,
"email": email, "email": email,
"languageId": languageId, "languageId": languageId,
}; };
} }
class Activities { class Activities {
int? id; int? id;
int? orderNo; int? orderNo;
@ -334,32 +341,20 @@ class Activities {
ActivitySparePart? activitySparePart; ActivitySparePart? activitySparePart;
String? activityType; String? activityType;
Activities( Activities({this.id, this.orderNo, this.activityStatus, this.activityMaintenance, this.activityType, this.activitySparePart});
{this.id,
this.orderNo,
this.activityStatus,
this.activityMaintenance,
this.activityType,
this.activitySparePart});
Activities.fromJson(Map<String, dynamic> json) { Activities.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
orderNo = json['orderNo']; orderNo = json['orderNo'];
activityStatus = json['activityStatus'] != null activityStatus = json['activityStatus'] != null ? Lookup.fromJson(json['activityStatus']) : null;
? Lookup.fromJson(json['activityStatus']) activityMaintenance = json['activityMaintenance'] != null ? ActivityMaintenance.fromJson(json['activityMaintenance']) : null;
: null; if (activityMaintenance != null) {
activityMaintenance = json['activityMaintenance'] != null activityType = 'Maintenance Request';
? ActivityMaintenance.fromJson(json['activityMaintenance'])
: null;
if(activityMaintenance!=null){
activityType='Maintenance Request';
} }
activitySparePart = json['activitySparePart'] != null activitySparePart = json['activitySparePart'] != null ? ActivitySparePart.fromJson(json['activitySparePart']) : null;
? ActivitySparePart.fromJson(json['activitySparePart']) if (activitySparePart != null) {
: null; activityType = 'Spare Part Request';
if(activitySparePart!=null){
activityType='Spare Part Request';
} }
} }
@ -409,18 +404,11 @@ class ActivitySparePart {
String? comment; String? comment;
List<SparePartAttachments>? acitiySparePartAttachments; List<SparePartAttachments>? acitiySparePartAttachments;
ActivitySparePart( ActivitySparePart({this.id, this.partCatalogItem, this.quantity, this.comment, this.acitiySparePartAttachments});
{this.id,
this.partCatalogItem,
this.quantity,
this.comment,
this.acitiySparePartAttachments});
ActivitySparePart.fromJson(Map<String, dynamic> json) { ActivitySparePart.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
partCatalogItem = json['partCatalogItem'] != null partCatalogItem = json['partCatalogItem'] != null ? new PartCatalogItem.fromJson(json['partCatalogItem']) : null;
? new PartCatalogItem.fromJson(json['partCatalogItem'])
: null;
quantity = json['quantity']; quantity = json['quantity'];
comment = json['comment']; comment = json['comment'];
if (json['acitiySparePartAttachments'] != null) { if (json['acitiySparePartAttachments'] != null) {
@ -440,8 +428,7 @@ class ActivitySparePart {
data['quantity'] = quantity; data['quantity'] = quantity;
data['comment'] = comment; data['comment'] = comment;
if (acitiySparePartAttachments != null) { if (acitiySparePartAttachments != null) {
data['acitiySparePartAttachments'] = data['acitiySparePartAttachments'] = acitiySparePartAttachments!.map((v) => v.toJson()).toList();
acitiySparePartAttachments!.map((v) => v.toJson()).toList();
} }
return data; return data;
} }
@ -451,13 +438,15 @@ class PartCatalogItem {
int? id; int? id;
String? partName; String? partName;
String? partNumber; String? partNumber;
String? oracleCode;
PartCatalogItem({this.id, this.partName, this.partNumber}); PartCatalogItem({this.id, this.partName, this.partNumber,this.oracleCode});
PartCatalogItem.fromJson(Map<String, dynamic> json) { PartCatalogItem.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
partName = json['partName']; partName = json['partName'];
partNumber = json['partNumber']; partNumber = json['partNumber'];
oracleCode = json['oracleCode'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -469,15 +458,14 @@ class PartCatalogItem {
} }
} }
class Site { class Site {
Site({ Site({
required this.id, required this.id,
required this.siteName, required this.siteName,
}); });
int? id; int? id;
String? siteName; String? siteName;
factory Site.fromJson(Map<String, dynamic> json) { factory Site.fromJson(Map<String, dynamic> json) {
return Site( return Site(
@ -486,8 +474,7 @@ class Site {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": id, "id": id,
"siteName": siteName, "siteName": siteName,
}; };
@ -505,14 +492,14 @@ class WorkOrderContactPerson {
required this.contactUser, required this.contactUser,
}); });
int? id; int? id;
String? name; String? name;
String? employeeId; String? employeeId;
String? position; String? position;
dynamic extension; dynamic extension;
String? email; String? email;
dynamic mobilePhone; dynamic mobilePhone;
WorkOrderAssignedEmployee? contactUser; WorkOrderAssignedEmployee? contactUser;
factory WorkOrderContactPerson.fromJson(Map<String, dynamic> json) { factory WorkOrderContactPerson.fromJson(Map<String, dynamic> json) {
return WorkOrderContactPerson( return WorkOrderContactPerson(
@ -527,8 +514,7 @@ class WorkOrderContactPerson {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": id, "id": id,
"name": name, "name": name,
"employeeId": employeeId, "employeeId": employeeId,
@ -555,17 +541,17 @@ class WorkOrderHistory {
required this.needAVisitDateTime, required this.needAVisitDateTime,
}); });
int? id; int? id;
Lookup? workorderStatus; Lookup? workorderStatus;
dynamic activityStatus; dynamic activityStatus;
DateTime? date; DateTime? date;
WorkOrderAssignedEmployee? user; WorkOrderAssignedEmployee? user;
Lookup? step; Lookup? step;
DateTime? fixRemotlyStartTime; DateTime? fixRemotlyStartTime;
DateTime? fixRemotlyEndTime; DateTime? fixRemotlyEndTime;
num? fixRemotlyWorkingHours; num? fixRemotlyWorkingHours;
String? comments; String? comments;
DateTime? needAVisitDateTime; DateTime? needAVisitDateTime;
factory WorkOrderHistory.fromJson(Map<String, dynamic> json) { factory WorkOrderHistory.fromJson(Map<String, dynamic> json) {
return WorkOrderHistory( return WorkOrderHistory(
@ -583,8 +569,7 @@ class WorkOrderHistory {
); );
} }
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() => {
{
"id": id, "id": id,
"workorderStatus": workorderStatus?.toJson(), "workorderStatus": workorderStatus?.toJson(),
"activityStatus": activityStatus, "activityStatus": activityStatus,
@ -598,6 +583,7 @@ class WorkOrderHistory {
"needAVisitDateTime": needAVisitDateTime?.toIso8601String(), "needAVisitDateTime": needAVisitDateTime?.toIso8601String(),
}; };
} }
class ActivityMaintenance { class ActivityMaintenance {
int? id; int? id;
ActivityStatus? activityStatus; ActivityStatus? activityStatus;
@ -635,22 +621,16 @@ class ActivityMaintenance {
this.assistantEmployees}); this.assistantEmployees});
ActivityMaintenance.fromJson(Map<String, dynamic> json) { ActivityMaintenance.fromJson(Map<String, dynamic> json) {
print('activity status i got is ${json['activityStatus']}'); print('activity status i got is ${json['activityStatus']}');
id = json['id']; id = json['id'];
activityStatus = json['activityStatus'] != null activityStatus = json['activityStatus'] != null ? ActivityStatus.fromJson(json['activityStatus']) : null;
? ActivityStatus.fromJson(json['activityStatus'])
: null;
startTime = json['startTime']; startTime = json['startTime'];
endTime = json['endTime']; endTime = json['endTime'];
workingHours = json['workingHours']; workingHours = json['workingHours'];
travelHours = json['travelHours']; travelHours = json['travelHours'];
lastSituation = json['lastSituation'] != null ? Lookup.fromJson(json['lastSituation']) : null; lastSituation = json['lastSituation'] != null ? Lookup.fromJson(json['lastSituation']) : null;
repairLocation = json['repairLocation'] != null repairLocation = json['repairLocation'] != null ? Lookup.fromJson(json['repairLocation']) : null;
? Lookup.fromJson(json['repairLocation']) assignedEmployee = json['assignedEmployee'] != null ? AssignedEmployee.fromJson(json['assignedEmployee']) : null;
: null;
assignedEmployee = json['assignedEmployee'] != null
? AssignedEmployee.fromJson(json['assignedEmployee'])
: null;
technicalComment = json['technicalComment']; technicalComment = json['technicalComment'];
//json["supplier"] == null ? null : Lookup.fromJson(json["supplier"]), //json["supplier"] == null ? null : Lookup.fromJson(json["supplier"]),
supplier = json["supplier"] == null ? null : Lookup.fromJson(json["supplier"]); supplier = json["supplier"] == null ? null : Lookup.fromJson(json["supplier"]);
@ -662,7 +642,7 @@ class ActivityMaintenance {
if (json['assistantEmployees'] != null) { if (json['assistantEmployees'] != null) {
assistantEmployees = <ActivityMaintenanceAssistantEmployees>[]; assistantEmployees = <ActivityMaintenanceAssistantEmployees>[];
json['assistantEmployees'].forEach((v) { json['assistantEmployees'].forEach((v) {
assistantEmployees!.add( ActivityMaintenanceAssistantEmployees.fromJson(v)); assistantEmployees!.add(ActivityMaintenanceAssistantEmployees.fromJson(v));
}); });
} }
} }
@ -688,8 +668,7 @@ class ActivityMaintenance {
data['supplierEndTime'] = supplierEndTime; data['supplierEndTime'] = supplierEndTime;
data['supplierWorkingHours'] = supplierWorkingHours; data['supplierWorkingHours'] = supplierWorkingHours;
if (assistantEmployees != null) { if (assistantEmployees != null) {
data['assistantEmployees'] = data['assistantEmployees'] = assistantEmployees!.map((v) => v.toJson()).toList();
assistantEmployees!.map((v) => v.toJson()).toList();
} }
return data; return data;
} }
@ -749,22 +728,14 @@ class ActivityMaintenanceAssistantEmployees {
String? technicalComment; String? technicalComment;
AssignedEmployee? user; AssignedEmployee? user;
ActivityMaintenanceAssistantEmployees({this.startDate, this.endDate, this.workingHours, this.technicalComment, this.user});
ActivityMaintenanceAssistantEmployees(
{this.startDate,
this.endDate,
this.workingHours,
this.technicalComment,
this.user});
ActivityMaintenanceAssistantEmployees.fromJson(Map<String, dynamic> json) { ActivityMaintenanceAssistantEmployees.fromJson(Map<String, dynamic> json) {
startDate = json['startDate']!=null?DateTime.parse(json['startDate']):null; startDate = json['startDate'] != null ? DateTime.parse(json['startDate']) : null;
endDate = json['endDate']!=null?DateTime.parse(json['endDate']):null; endDate = json['endDate'] != null ? DateTime.parse(json['endDate']) : null;
workingHours = json['workingHours']; workingHours = json['workingHours'];
technicalComment = json['technicalComment']; technicalComment = json['technicalComment'];
user = json['user'] != null user = json['user'] != null ? AssignedEmployee.fromJson(json['user']) : null;
? AssignedEmployee.fromJson(json['user'])
: null;
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -779,4 +750,3 @@ class ActivityMaintenanceAssistantEmployees {
return data; return data;
} }
} }

7
lib/service_request_latest/views/components/activities_list_view.dart
Unescape Escape View File

@ -167,7 +167,8 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
sparePart: SparePart( sparePart: SparePart(
id: activity.activitySparePart?.partCatalogItem?.id, id: activity.activitySparePart?.partCatalogItem?.id,
partName: activity.activitySparePart?.partCatalogItem?.partName, partName: activity.activitySparePart?.partCatalogItem?.partName,
partNo: activity.activitySparePart?.partCatalogItem?.partNumber), partNo: activity.activitySparePart?.partCatalogItem?.partNumber,
oracleCode: activity.activitySparePart?.partCatalogItem?.oracleCode),
quantity: activity.activitySparePart?.quantity, quantity: activity.activitySparePart?.quantity,
activityStatusId: activity.activityStatus?.id, activityStatusId: activity.activityStatus?.id,
//TODO commets are missing in api response.. //TODO commets are missing in api response..
@ -260,7 +261,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
"edit_icon".toSvgAsset(height: 21, width: 21).onPress(() { "edit_icon".toSvgAsset(height: 21, width: 21).onPress(() {
onEditPress(context: context, requestDetailProvider: requestDetailProvider, activity: activity); onEditMaintenanceRequestPress(context: context, requestDetailProvider: requestDetailProvider, activity: activity);
}), }),
24.width, 24.width,
"delete_icon".toSvgAsset(height: 21, width: 21).onPress(() async { "delete_icon".toSvgAsset(height: 21, width: 21).onPress(() async {
@ -322,7 +323,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
}); });
} }
void onEditPress({required BuildContext context, required RequestDetailProvider requestDetailProvider, required Activities activity}) async { void onEditMaintenanceRequestPress({required BuildContext context, required RequestDetailProvider requestDetailProvider, required Activities activity}) async {
Map<String, dynamic> assistEmpData = {}; Map<String, dynamic> assistEmpData = {};
try { try {
if (activity.activityMaintenance?.assistantEmployees != null && activity.activityMaintenance!.assistantEmployees!.isNotEmpty) { if (activity.activityMaintenance?.assistantEmployees != null && activity.activityMaintenance!.assistantEmployees!.isNotEmpty) {

2
lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart
Unescape Escape View File

@ -90,7 +90,7 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = []; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [];
} else { } else {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)]; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)];
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user?.userId=employee.user?.id; requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user= AssignedEmployee(userId: employee.user?.id,userName:employee.user?.name );
} }
}, },

2
lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart
Unescape Escape View File

@ -247,7 +247,7 @@ class _ExternalMaintenanceRequestState extends State<ExternalMaintenanceRequest>
int hours = calculateWorkingHours(requestDetailProvider.activityMaintenanceHelperModel!.supplierStartTime, requestDetailProvider.activityMaintenanceHelperModel!.supplierEndTime); int hours = calculateWorkingHours(requestDetailProvider.activityMaintenanceHelperModel!.supplierStartTime, requestDetailProvider.activityMaintenanceHelperModel!.supplierEndTime);
if (hours != -1) { if (hours != -1) {
_workingHoursController.text = hours.toString(); _workingHoursController.text = hours.toString();
requestDetailProvider.activityMaintenanceHelperModel!.workingHour = hours; requestDetailProvider.activityMaintenanceHelperModel!.supplierWorkingHour = hours;
} }
} }
} }

14
lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
Unescape Escape View File

@ -187,12 +187,6 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
files: _files, files: _files,
buttonIcon: 'quotation_icon'.toSvgAsset(), buttonIcon: 'quotation_icon'.toSvgAsset(),
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onChange: (List<MultiFilesPickerModel> list) {
for (var element in list) {
print('path is ${element.file.path}');
}
},
), ),
], ],
).paddingAll(16), ).paddingAll(16),
@ -225,8 +219,12 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
//this is for hide the dialoge... //this is for hide the dialoge...
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context); Navigator.pop(context);
ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context); //show this only for add form..
SizedBox().flushBar(context: context, title: context.translation.sparePartActivitySuccess, message: ''); if(_requestDetailProvider?.sparePartHelperModel?.id==0){
ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context);
SizedBox().flushBar(context: context, title: context.translation.sparePartActivitySuccess, message: '');
}
} else { } else {
Navigator.pop(context); Navigator.pop(context);
} }

Write Preview
Loading…
Cancel
Save