diff --git a/lib/models/ppm/recurrent_wo.dart b/lib/models/ppm/recurrent_wo.dart index acea8df2..9241a518 100644 --- a/lib/models/ppm/recurrent_wo.dart +++ b/lib/models/ppm/recurrent_wo.dart @@ -38,6 +38,8 @@ class RecurrentWo { class RecurrentWoData { int? id; + String? title; + String? taskNo; Engineer? engineer; String? scheduleDate; Status? status; @@ -53,6 +55,8 @@ class RecurrentWoData { RecurrentWoData( {this.id, + this.title, + this.taskNo, this.engineer, this.scheduleDate, this.status, @@ -68,6 +72,8 @@ class RecurrentWoData { RecurrentWoData.fromJson(Map json) { id = json['id']; + title = json['title']; + taskNo = json['taskNo']; engineer = json['engineer'] != null ? new Engineer.fromJson(json['engineer']) : null; scheduleDate = json['scheduleDate']; status = json['status'] != null ? Status.fromJson(json['status']) : null; diff --git a/lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart b/lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart index 35e111ab..60ead276 100644 --- a/lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart +++ b/lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart @@ -47,9 +47,9 @@ class RecurrentWoItemView extends StatelessWidget { ], ), 8.height, - (requestDetails?.nameOfType ?? context.translation.ppmRequest).heading5(context), + (requestDetails?.nameOfType ?? context.translation.recurrentWo).heading5(context), 8.height, - '${context.translation.taskNo}: ${requestDetails!.id}'.bodyText(context), + // '${context.translation.taskNo}: ${requestDetails!.id}'.bodyText(context), '${context.translation.site}: ${requestDetails!.site}'.bodyText(context), // '${context.translation.code}: ${request.code}'.bodyText(context), '${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context), diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart index d3be2d64..bb52866c 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart @@ -37,9 +37,9 @@ class RecurrentTaskInfoWidget extends StatelessWidget { backgroundColor: AppColor.getRequestStatusColorByName(context, model?.status?.name), ), 8.height, - model!.site!.siteName!.bodyText(context).custom(color: AppColor.black10), + model!.title!.bodyText(context).custom(color: AppColor.black10), 2.height, - '${context.translation.taskNo}: ${model!.id!}'.bodyText2(context).custom(color: AppColor.neutral120), + '${context.translation.taskNo}: ${model!.taskNo!}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.site}: ${model!.site!.siteName!}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.assignEngineer}: ${model!.engineer!.userName ?? ""}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.scheduledDate}: ${model!.scheduleDate!.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120), diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart index 81cfc5cf..fc62b613 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart @@ -17,7 +17,7 @@ import '../../../../../../controllers/providers/api/all_requests_provider.dart'; import 'components/room_tabs_widget.dart'; class RecurrentWorkOrderView extends StatefulWidget { - static const String id = "/recurrent_wo"; + static const String routeName = "/recurrent_wo"; final int? taskId; RecurrentWorkOrderView({Key? key, required this.taskId}) : super(key: key); @@ -51,7 +51,7 @@ class _RecurrentWorkOrderViewState extends State { body: allRequestsProvider!.isLoading ? const ALoading() : requestProvider.recurrentWoData != null - ? Stack( + ? Stack ( children: [ SingleChildScrollView( child: Column( @@ -128,7 +128,7 @@ void _updateTask({required BuildContext context, required int status}) async { status: status, ).whenComplete((){ if(status==1){// when click complete then this request remove from the list and status changes to closed.. - //TODO some issues data not properly refreshed need to check waseem + allRequestsProvider.reset(); allRequestsProvider.getAllRequests(context,typeTransaction: 5); } allRequestsProvider.recurrentWoData?.recurrentWoTimerModel=null;