Add Docker support and enhance data models for tender details
- Introduced a .dockerignore file to optimize Docker builds by excluding unnecessary files. - Updated the Dockerfile to use a Flutter base image, enabling web builds for the application. - Added new data models for `Lot` and `OrganizationAddress` to represent tender details more accurately. - Enhanced the `Organization` model to include `companyId` and a nested `address` field. - Updated the `TenderData` model to include new fields such as `noticeTypeCode`, `formType`, and `lots`, reflecting the API response structure. - Regenerated necessary code for data models to ensure compatibility with the updated structures.
This commit is contained in:
AmirReza Jamali
@@ -4,14 +4,19 @@ import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/view_models/auth_view_model.dart';
|
||||
import 'package:tm_app/view_models/tender_detail_view_model.dart';
|
||||
import 'package:tm_app/views/detail/widgets/meeting_time_bottom_sheet.dart';
|
||||
import 'package:tm_app/views/detail/widgets/meeting_time_dialog.dart';
|
||||
// AI-NOTE (for PR reviewer): These three imports are kept (commented) because
|
||||
// the post-confirm navigation flow they supported (documents-completion routes
|
||||
// + meeting-time modals) is preserved as commented-out code below, not deleted.
|
||||
// The Accept flow now just shows a confirmation toast instead. Re-enable these
|
||||
// imports if/when the navigation flow is reinstated.
|
||||
// import 'package:tm_app/views/detail/widgets/meeting_time_bottom_sheet.dart';
|
||||
// import 'package:tm_app/views/detail/widgets/meeting_time_dialog.dart';
|
||||
import 'package:tm_app/views/shared/base_button.dart';
|
||||
import 'package:tm_app/views/shared/select_submission_bottom_sheet.dart';
|
||||
|
||||
import '../../../core/constants/tender_approval_status.dart';
|
||||
import '../../../core/constants/tender_submision_mode.dart';
|
||||
import '../../../core/routes/app_routes.dart';
|
||||
// import '../../../core/routes/app_routes.dart';
|
||||
import '../../../core/utils/app_toast.dart';
|
||||
import '../../../data/services/model/tender_data/tender_data.dart';
|
||||
import '../../shared/select_submission_dialog.dart';
|
||||
@@ -68,38 +73,37 @@ class _TenderDetailActionsState extends State<TenderDetailActions> {
|
||||
builder: (context) {
|
||||
return SelectSubmissionBottomSheet(
|
||||
onConfirm: (String value) {
|
||||
if (value ==
|
||||
TenderSubmissionMode.selfApply.value) {
|
||||
// viewModel.submitTenderApproval(
|
||||
// tenderId: widget.detail.id!,
|
||||
// submissionMode: value,
|
||||
// );
|
||||
|
||||
CompletionOfDocumentsRouteData(
|
||||
tenderId: widget.detail.id!,
|
||||
).push(context);
|
||||
} else if (value ==
|
||||
TenderSubmissionMode.partnership.value) {
|
||||
Future.delayed(Duration.zero, () {
|
||||
if (context.mounted) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
|
||||
builder: (_) {
|
||||
return MeetingTimeBottomSheet(
|
||||
onConfirm: (value) {
|
||||
// AppToast.success(
|
||||
// context,
|
||||
// TenderDetailsStrings
|
||||
// .meetingTimeSuccessfullySet,
|
||||
// );
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
// AI-NOTE (for PR reviewer): New behavior —
|
||||
// confirming the submission modal now just
|
||||
// shows a confirmation toast (no API call, no
|
||||
// navigation), per product request. The prior
|
||||
// navigation flow is preserved below for future
|
||||
// use and is intentionally NOT deleted.
|
||||
_showSubmissionReceivedToast();
|
||||
// if (value ==
|
||||
// TenderSubmissionMode.selfApply.value) {
|
||||
// // viewModel.submitTenderApproval(
|
||||
// // tenderId: widget.detail.id!,
|
||||
// // submissionMode: value,
|
||||
// // );
|
||||
// CompletionOfDocumentsRouteData(
|
||||
// tenderId: widget.detail.id!,
|
||||
// ).push(context);
|
||||
// } else if (value ==
|
||||
// TenderSubmissionMode.partnership.value) {
|
||||
// Future.delayed(Duration.zero, () {
|
||||
// if (context.mounted) {
|
||||
// showModalBottomSheet(
|
||||
// context: context,
|
||||
// builder: (_) {
|
||||
// return MeetingTimeBottomSheet(
|
||||
// onConfirm: (value) {},
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
},
|
||||
);
|
||||
},
|
||||
@@ -143,6 +147,17 @@ class _TenderDetailActionsState extends State<TenderDetailActions> {
|
||||
);
|
||||
}
|
||||
|
||||
// AI-NOTE (for PR reviewer): New helper added for the Accept flow. Shows a
|
||||
// success toast confirming the submission was received. Guards on `mounted`
|
||||
// because it runs from a modal callback after the sheet/dialog is popped.
|
||||
// Uses the State's own context (stable page context), not the popped modal's.
|
||||
void _showSubmissionReceivedToast() {
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
AppToast.success(context, TenderDetailsStrings.submissionReceived);
|
||||
}
|
||||
|
||||
Row _webActions(Role userRole) {
|
||||
return Row(
|
||||
children: [
|
||||
@@ -206,33 +221,37 @@ class _TenderDetailActionsState extends State<TenderDetailActions> {
|
||||
builder: (context) {
|
||||
return SelectSubmissionDialog(
|
||||
onConfirm: (String value) {
|
||||
if (value ==
|
||||
TenderSubmissionMode.selfApply.value) {
|
||||
if (context.mounted) {
|
||||
if (userRole == Role.analyst) {
|
||||
const FinalCompletionOfDocumentsRouteData()
|
||||
.push(context);
|
||||
} else {
|
||||
CompletionOfDocumentsRouteData(
|
||||
tenderId: widget.detail.id!,
|
||||
).push(context);
|
||||
}
|
||||
}
|
||||
} else if (value ==
|
||||
TenderSubmissionMode.partnership.value) {
|
||||
Future.delayed(Duration.zero, () {
|
||||
if (context.mounted) {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return MeetingTimeDialog(
|
||||
onConfirm: (value) {},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
// AI-NOTE (for PR reviewer): New behavior —
|
||||
// toast only (no API/navigation). Old role-aware
|
||||
// navigation preserved below for future use.
|
||||
_showSubmissionReceivedToast();
|
||||
// if (value ==
|
||||
// TenderSubmissionMode.selfApply.value) {
|
||||
// if (context.mounted) {
|
||||
// if (userRole == Role.analyst) {
|
||||
// const FinalCompletionOfDocumentsRouteData()
|
||||
// .push(context);
|
||||
// } else {
|
||||
// CompletionOfDocumentsRouteData(
|
||||
// tenderId: widget.detail.id!,
|
||||
// ).push(context);
|
||||
// }
|
||||
// }
|
||||
// } else if (value ==
|
||||
// TenderSubmissionMode.partnership.value) {
|
||||
// Future.delayed(Duration.zero, () {
|
||||
// if (context.mounted) {
|
||||
// showDialog(
|
||||
// context: context,
|
||||
// builder: (context) {
|
||||
// return MeetingTimeDialog(
|
||||
// onConfirm: (value) {},
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
},
|
||||
);
|
||||
},
|
||||
@@ -242,41 +261,34 @@ class _TenderDetailActionsState extends State<TenderDetailActions> {
|
||||
builder: (context) {
|
||||
return SelectSubmissionBottomSheet(
|
||||
onConfirm: (String value) {
|
||||
if (value ==
|
||||
TenderSubmissionMode.selfApply.value) {
|
||||
// viewModel.submitTenderApproval(
|
||||
// tenderId: widget.detail.id!,
|
||||
// submissionMode: value,
|
||||
// );
|
||||
if (context.mounted) {
|
||||
const FinalCompletionOfDocumentsRouteData()
|
||||
.push(context);
|
||||
}
|
||||
} else if (value ==
|
||||
TenderSubmissionMode.partnership.value) {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return MeetingTimeBottomSheet(
|
||||
onConfirm: (value) {
|
||||
AppToast.success(
|
||||
context,
|
||||
TenderDetailsStrings
|
||||
.meetingTimeSuccessfullySet,
|
||||
);
|
||||
},
|
||||
);
|
||||
// return MeetingTimeDialog(
|
||||
// onConfirm: (String value) {
|
||||
// if (context.mounted) {
|
||||
// const CompletionOfDocumentsRouteData()
|
||||
// .push(context);
|
||||
// }
|
||||
// },
|
||||
// );
|
||||
},
|
||||
);
|
||||
}
|
||||
// AI-NOTE (for PR reviewer): New behavior —
|
||||
// toast only (no API/navigation). Old flow
|
||||
// (final-completion route + meeting-time
|
||||
// bottom sheet) preserved below for future use.
|
||||
_showSubmissionReceivedToast();
|
||||
// if (value ==
|
||||
// TenderSubmissionMode.selfApply.value) {
|
||||
// if (context.mounted) {
|
||||
// const FinalCompletionOfDocumentsRouteData()
|
||||
// .push(context);
|
||||
// }
|
||||
// } else if (value ==
|
||||
// TenderSubmissionMode.partnership.value) {
|
||||
// showDialog(
|
||||
// context: context,
|
||||
// builder: (context) {
|
||||
// return MeetingTimeBottomSheet(
|
||||
// onConfirm: (value) {
|
||||
// AppToast.success(
|
||||
// context,
|
||||
// TenderDetailsStrings
|
||||
// .meetingTimeSuccessfullySet,
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// }
|
||||
},
|
||||
);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user