From 7a06f251be96a7aa5e132ed6890f1f715ff9a306 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Tue, 31 Oct 2023 12:24:44 +0300 Subject: [PATCH] Create New Work Order Done --- lib/models/service_request/service_report.dart | 6 +++--- .../user/requests/work_order/create_service_report.dart | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/models/service_request/service_report.dart b/lib/models/service_request/service_report.dart index 71966b8b..cc59f679 100644 --- a/lib/models/service_request/service_report.dart +++ b/lib/models/service_request/service_report.dart @@ -269,8 +269,8 @@ class ServiceReport { if (reason != null) { map['reason'] = reason.toJson(); } - map['startofWorkTime'] = "2023-10-30T10:14:07.032021"; - map['endofWorkTime'] = "2023-10-30T10:15:07.032021"; + map['startofWorkTime'] = startofWorkTime; + map['endofWorkTime'] = endofWorkTime; map['workingHours'] = workingHours; map['travelingHours'] = travelingHours; map['travelingExpenses'] = travelingExpenses; @@ -283,7 +283,7 @@ class ServiceReport { map['reviewComment'] = reviewComment; map['comment'] = comment; if (attachmentsWorkOrder != null) { - map['attachmentsWorkOrder'] = attachmentsWorkOrder.map((v) => v.toJson()).toList(); + map['attachmentsWorkOrder'] = attachmentsWorkOrder.map((v) => {"name": v.name}).toList(); } if (equipmentStatus != null) { map['equipmentStatus'] = equipmentStatus.toJson(); diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index 0764b1c2..d1e5956d 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:developer'; import 'dart:io'; import 'package:flutter/material.dart'; @@ -180,8 +179,7 @@ class _CreateServiceReportState extends State with TickerPr assetId: _serviceReport.callRequest?.asset?.id, initialValue: (_serviceReport.assistantEmployees?.isNotEmpty ?? false) ? _serviceReport.assistantEmployees?.first : null, onSelect: (employee) { - log(employee.toJson().toString()); - _serviceReport.assistantEmployees = [employee]; + _serviceReport.assistantEmployees = [employee.copyWith(id: 0)]; }, ), 8.height, @@ -238,7 +236,7 @@ class _CreateServiceReportState extends State with TickerPr _serviceReport.attachmentsWorkOrder ??= []; if (_files.isEmpty) _serviceReport.attachmentsWorkOrder = []; for (var file in _files) { - _serviceReport.attachmentsWorkOrder.add(Attachment(name: "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}")); + _serviceReport.attachmentsWorkOrder.add(Attachment(id: 0, name: "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}")); } final user = Provider.of(context, listen: false).user; await _serviceRequestsProvider.createServiceReport(context, report: _serviceReport, request: widget.request, user: user);