missing attributes added for recurrent task

design_3.0_latest
WaseemAbbasi22 1 year ago
parent 7b620b9f6e
commit 8c9b1b3c46

@ -38,6 +38,8 @@ class RecurrentWo {
class RecurrentWoData { class RecurrentWoData {
int? id; int? id;
String? title;
String? taskNo;
Engineer? engineer; Engineer? engineer;
String? scheduleDate; String? scheduleDate;
Status? status; Status? status;
@ -53,6 +55,8 @@ class RecurrentWoData {
RecurrentWoData( RecurrentWoData(
{this.id, {this.id,
this.title,
this.taskNo,
this.engineer, this.engineer,
this.scheduleDate, this.scheduleDate,
this.status, this.status,
@ -68,6 +72,8 @@ class RecurrentWoData {
RecurrentWoData.fromJson(Map<String, dynamic> json) { RecurrentWoData.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
title = json['title'];
taskNo = json['taskNo'];
engineer = json['engineer'] != null ? new Engineer.fromJson(json['engineer']) : null; engineer = json['engineer'] != null ? new Engineer.fromJson(json['engineer']) : null;
scheduleDate = json['scheduleDate']; scheduleDate = json['scheduleDate'];
status = json['status'] != null ? Status.fromJson(json['status']) : null; status = json['status'] != null ? Status.fromJson(json['status']) : null;

@ -47,9 +47,9 @@ class RecurrentWoItemView extends StatelessWidget {
], ],
), ),
8.height, 8.height,
(requestDetails?.nameOfType ?? context.translation.ppmRequest).heading5(context), (requestDetails?.nameOfType ?? context.translation.recurrentWo).heading5(context),
8.height, 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.site}: ${requestDetails!.site}'.bodyText(context),
// '${context.translation.code}: ${request.code}'.bodyText(context), // '${context.translation.code}: ${request.code}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),

@ -37,9 +37,9 @@ class RecurrentTaskInfoWidget extends StatelessWidget {
backgroundColor: AppColor.getRequestStatusColorByName(context, model?.status?.name), backgroundColor: AppColor.getRequestStatusColorByName(context, model?.status?.name),
), ),
8.height, 8.height,
model!.site!.siteName!.bodyText(context).custom(color: AppColor.black10), model!.title!.bodyText(context).custom(color: AppColor.black10),
2.height, 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.site}: ${model!.site!.siteName!}'.bodyText2(context).custom(color: AppColor.neutral120),
'${context.translation.assignEngineer}: ${model!.engineer!.userName ?? ""}'.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), '${context.translation.scheduledDate}: ${model!.scheduleDate!.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120),

@ -17,7 +17,7 @@ import '../../../../../../controllers/providers/api/all_requests_provider.dart';
import 'components/room_tabs_widget.dart'; import 'components/room_tabs_widget.dart';
class RecurrentWorkOrderView extends StatefulWidget { class RecurrentWorkOrderView extends StatefulWidget {
static const String id = "/recurrent_wo"; static const String routeName = "/recurrent_wo";
final int? taskId; final int? taskId;
RecurrentWorkOrderView({Key? key, required this.taskId}) : super(key: key); RecurrentWorkOrderView({Key? key, required this.taskId}) : super(key: key);
@ -51,7 +51,7 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
body: allRequestsProvider!.isLoading body: allRequestsProvider!.isLoading
? const ALoading() ? const ALoading()
: requestProvider.recurrentWoData != null : requestProvider.recurrentWoData != null
? Stack( ? Stack (
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
child: Column( child: Column(
@ -128,7 +128,7 @@ void _updateTask({required BuildContext context, required int status}) async {
status: status, status: status,
).whenComplete((){ ).whenComplete((){
if(status==1){// when click complete then this request remove from the list and status changes to closed.. 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.getAllRequests(context,typeTransaction: 5);
} }
allRequestsProvider.recurrentWoData?.recurrentWoTimerModel=null; allRequestsProvider.recurrentWoData?.recurrentWoTimerModel=null;

Loading…
Cancel
Save