From 0a6fca7f63cae1c212304c0073becdf824567d76 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 2 Mar 2026 11:36:50 +0300 Subject: [PATCH] room model changed to json. --- lib/controllers/api_routes/urls.dart | 2 +- lib/models/new_models/work_order_detail_model.dart | 6 +++--- .../views/components/service_request_detail_view.dart | 2 +- pubspec.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index da6dd6d0..193e3bc0 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -1,7 +1,7 @@ class URLs { URLs._(); - static const String appReleaseBuildNumber = "34"; + static const String appReleaseBuildNumber = "35"; static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url diff --git a/lib/models/new_models/work_order_detail_model.dart b/lib/models/new_models/work_order_detail_model.dart index 25519bd6..1936113a 100644 --- a/lib/models/new_models/work_order_detail_model.dart +++ b/lib/models/new_models/work_order_detail_model.dart @@ -127,7 +127,7 @@ class WorkOrderData { Lookup? building; Lookup? floor; AssetGroup? department; - int? room; + Lookup? room; Lookup? assetType; WorkOrderAssignedEmployee? assignedEmployee; Lookup? lastActivityStatus; @@ -195,7 +195,7 @@ class WorkOrderData { building: json["building"] == null ? null : Lookup.fromJson(json["building"]), floor: json["floor"] == null ? null : Lookup.fromJson(json["floor"]), department: json["department"] == null ? null : AssetGroup.fromJson(json["department"]), - room: json["room"], + room: json["room"] == null ? null : Lookup.fromJson(json["room"]), rejectComment: json["rejectComment"], callResponse: json["callResponse"], descriptionOfFinding: json["descriptionOfFinding"], @@ -263,7 +263,7 @@ class WorkOrderData { "building": building?.toJson(), "floor": floor?.toJson(), "department": department?.toJson(), - "room": room, + "room": room?.toJson(), "assetType": assetType?.toJson(), "assignedEmployee": assignedEmployee?.toJson(), "lastActivityStatus": lastActivityStatus, diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index e70f7de4..1310fb79 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -232,7 +232,7 @@ class _ServiceRequestDetailViewState extends State { style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ), Text( - '${context.translation.room}: ${(workOrder.room?.toString() ?? "").cleanupWhitespace?.capitalizeFirstOfEach}', + '${context.translation.room}: ${(workOrder.room?.name ?? "").cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index 1c939e03..a3814153 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.7.0+34 +version: 1.7.1+35 environment: sdk: ">=3.5.0 <4.0.0"