itg form status added.

design_3.0_task_module_new
Sikander Saleem 6 months ago
parent b4587a6347
commit e3b63c76ba

@ -3,6 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart'; import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
import '../controllers/providers/settings/setting_provider.dart';
import '../controllers/providers/settings/setting_provider.dart'; import '../controllers/providers/settings/setting_provider.dart';
extension BuildContextExtension on BuildContext { extension BuildContextExtension on BuildContext {
@ -14,6 +15,9 @@ extension BuildContextExtension on BuildContext {
bool get isAr => Provider.of<SettingProvider>(this).language == "ar"; bool get isAr => Provider.of<SettingProvider>(this).language == "ar";
SettingProvider get settingProvider => Provider.of<SettingProvider>(this, listen: false);
// UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog( void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog(
context: this, context: this,
builder: (BuildContext cxt) => ConfirmDialog( builder: (BuildContext cxt) => ConfirmDialog(

@ -99,6 +99,7 @@ class WorkOrderData {
required this.workOrderHistory, required this.workOrderHistory,
required this.activities, required this.activities,
required this.activityAssetToBeRetireds, required this.activityAssetToBeRetireds,
this.itgFormWorkOrderStatus,
}); });
int? requestId; int? requestId;
@ -159,6 +160,7 @@ class WorkOrderData {
List<WorkOrderHistory> workOrderHistory; List<WorkOrderHistory> workOrderHistory;
List<Activities> activities; List<Activities> activities;
List<dynamic> activityAssetToBeRetireds; List<dynamic> activityAssetToBeRetireds;
String? itgFormWorkOrderStatus;
factory WorkOrderData.fromJson(Map<String, dynamic> json) { factory WorkOrderData.fromJson(Map<String, dynamic> json) {
return WorkOrderData( return WorkOrderData(
@ -217,6 +219,7 @@ class WorkOrderData {
activities: json["activities"] == null ? [] : List<Activities>.from(json["activities"]!.map((x) => Activities.fromJson(x))), activities: json["activities"] == null ? [] : List<Activities>.from(json["activities"]!.map((x) => Activities.fromJson(x))),
needAVisitDateTime: DateTime.tryParse(json["needAVisitDateTime"] ?? ""), needAVisitDateTime: DateTime.tryParse(json["needAVisitDateTime"] ?? ""),
needAVisitComment: json["needAVisitComment"], needAVisitComment: json["needAVisitComment"],
itgFormWorkOrderStatus: json["itgFormWorkOrderStatus"],
activityAssetToBeRetireds: json["activityAssetToBeRetireds"] == null ? [] : List<dynamic>.from(json["activityAssetToBeRetireds"]!.map((x) => x)), activityAssetToBeRetireds: json["activityAssetToBeRetireds"] == null ? [] : List<dynamic>.from(json["activityAssetToBeRetireds"]!.map((x) => x)),
); );
} }
@ -264,6 +267,7 @@ class WorkOrderData {
"workOrderHistory": workOrderHistory.map((x) => x.toJson()).toList(), "workOrderHistory": workOrderHistory.map((x) => x.toJson()).toList(),
"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(),
"itgFormWorkOrderStatus": itgFormWorkOrderStatus,
}; };
} }

@ -79,7 +79,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
return Column( return Column(
children: [ children: [
(activities.isEmpty && reOrderActivities.isEmpty) (activities.isEmpty && reOrderActivities.isEmpty)
? NoDataFound(message: context.translation.noDataFound).expanded ? NoDataFound(message: context.translation.noDataFound).center.expanded
: :
// : showReorderView // : showReorderView
// ? ReorderableListView( // ? ReorderableListView(

@ -120,6 +120,16 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
), ),
8.width, 8.width,
], ],
if(workOrder.itgFormWorkOrderStatus!=null)...[
StatusLabel(
label: workOrder.itgFormWorkOrderStatus,
id: 0,
radius: 4,
textColor: AppColor.getPriorityStatusTextColor(context, 82),
backgroundColor: AppColor.getPriorityStatusColor(context, 0),
),
8.width,
],
StatusLabel( StatusLabel(
radius: 4, radius: 4,
label: workOrder.status!.name, label: workOrder.status!.name,

@ -72,7 +72,6 @@ class _AssetRetiredState extends State<AssetRetired> with TickerProviderStateMix
child: Card( child: Card(
child: Column( child: Column(
children: [ children: [
12.height,
SingleItemDropDownMenu<Lookup, RetirementTypeProvider>( SingleItemDropDownMenu<Lookup, RetirementTypeProvider>(
context: context, context: context,
title: context.translation.retirementType, title: context.translation.retirementType,

Loading…
Cancel
Save