sender and receiver comment fixed

design_3.0_task_module_new
Sikander Saleem 7 months ago
parent e66ae78c83
commit b34014e24f

@ -178,10 +178,9 @@ class AssetTransfer {
receiverAttachments!.add(AssetTransferAttachment.fromJson(v)); receiverAttachments!.add(AssetTransferAttachment.fromJson(v));
}); });
} }
if(senderAttachments!=null){ if (senderAttachments != null) {
attachments = senderAttachments; attachments = senderAttachments;
} } else if (receiverAttachments != null) {
else if(receiverAttachments!=null){
attachments = receiverAttachments; attachments = receiverAttachments;
} }
print('sender attachment i got is ${senderAttachments?.length}'); print('sender attachment i got is ${senderAttachments?.length}');
@ -544,7 +543,7 @@ class AssetTransfer {
map['id'] = id; map['id'] = id;
map['statusValue'] = statusValue; map['statusValue'] = statusValue;
map['isSender'] = isSender; map['isSender'] = isSender;
map['techComment'] = comment; map['techComment'] = isSender! ? senderComment : receiverComment;
map['assetTransferAssistantEmployees'] = modelAssistantEmployees; map['assetTransferAssistantEmployees'] = modelAssistantEmployees;
map['assetTransferEngineerTimers'] = assetTransferEngineerTimers; map['assetTransferEngineerTimers'] = assetTransferEngineerTimers;
if (attachments != null) { if (attachments != null) {
@ -554,10 +553,10 @@ class AssetTransfer {
map['assetTransferEngineerTimers'] = assetTransferEngineerTimers!.map((v) => v.toJson()).toList(); map['assetTransferEngineerTimers'] = assetTransferEngineerTimers!.map((v) => v.toJson()).toList();
} }
if (modelAssistantEmployees != null) { if (modelAssistantEmployees != null) {
if(modelAssistantEmployees!.employeeId!=null) { if (modelAssistantEmployees!.employeeId != null) {
map['assetTransferAssistantEmployees'] = [modelAssistantEmployees!.toJson()]; map['assetTransferAssistantEmployees'] = [modelAssistantEmployees!.toJson()];
}else { } else {
map['assetTransferAssistantEmployees'] =[]; map['assetTransferAssistantEmployees'] = [];
} }
} }
return map; return map;

@ -1,4 +1,3 @@
//older code. //older code.
// import 'dart:convert'; // import 'dart:convert';
// import 'dart:io'; // import 'dart:io';
@ -334,6 +333,7 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -355,6 +355,7 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/status/report/service_report_assistant_employee_menu.dart'; import 'package:test_sa/views/widgets/status/report/service_report_assistant_employee_menu.dart';
import '../../../extensions/text_extensions.dart'; import '../../../extensions/text_extensions.dart';
import '../../../models/ppm/ppm.dart'; import '../../../models/ppm/ppm.dart';
import '../../../new_views/app_style/app_color.dart'; import '../../../new_views/app_style/app_color.dart';
@ -637,12 +638,11 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
employeeList = widget.formModel!.assetTransferAssistantEmployeesReceiver ?? []; employeeList = widget.formModel!.assetTransferAssistantEmployeesReceiver ?? [];
} }
widget.formModel?.modelAssistantEmployees = employeeList.isEmpty ? AssetTransferAssistantEmployees() : employeeList[0];
widget.formModel?.modelAssistantEmployees = employeeList.isEmpty ? AssetTransferAssistantEmployees():employeeList[0];
AssignedEmployee? assignedUser = AssignedEmployee(); AssignedEmployee? assignedUser = AssignedEmployee();
if(employeeList.isNotEmpty){ if (employeeList.isNotEmpty) {
assignedUser= AssignedEmployee( assignedUser = AssignedEmployee(
id: employeeList[0].employeeId, id: employeeList[0].employeeId,
name: employeeList[0].employeeName, name: employeeList[0].employeeName,
); );

Loading…
Cancel
Save