removed submit and reject tender ability every where except tender details
This commit is contained in:
@@ -77,74 +77,65 @@ class _TenderDetailDesktopPageState extends State<TenderDetailDesktopPage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopScope(
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
viewModel.updateTenderApprovals(widget.tenderId);
|
||||
});
|
||||
},
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.secondary50),
|
||||
);
|
||||
}
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.secondary50),
|
||||
);
|
||||
}
|
||||
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(
|
||||
child: Text(TenderDetailsStrings.tenderNoData),
|
||||
);
|
||||
}
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(child: Text(TenderDetailsStrings.tenderNoData));
|
||||
}
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
const DesktopNavigationWidget(
|
||||
currentIndex: 1, // Home index
|
||||
),
|
||||
Expanded(
|
||||
child: SingleChildScrollView(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 740,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(32.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const TabletDesktopAppbar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
SizedBox(height: 32.0.h()),
|
||||
TenderDetailHeader(
|
||||
isScreenBig: true,
|
||||
detail: detail,
|
||||
),
|
||||
SizedBox(height: 32.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(
|
||||
isScreenBig: true,
|
||||
detail: detail,
|
||||
),
|
||||
],
|
||||
),
|
||||
return Column(
|
||||
children: [
|
||||
const DesktopNavigationWidget(
|
||||
currentIndex: 1, // Home index
|
||||
),
|
||||
Expanded(
|
||||
child: SingleChildScrollView(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 740,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(32.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const TabletDesktopAppbar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
SizedBox(height: 32.0.h()),
|
||||
TenderDetailHeader(
|
||||
isScreenBig: true,
|
||||
detail: detail,
|
||||
),
|
||||
SizedBox(height: 32.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(
|
||||
isScreenBig: true,
|
||||
detail: detail,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
@@ -76,65 +75,52 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopScope(
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (kIsWeb) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
context.read<TenderDetailViewModel>().updateTenderApprovals(
|
||||
widget.tenderId,
|
||||
);
|
||||
});
|
||||
}
|
||||
},
|
||||
child: Directionality(
|
||||
textDirection: TextDirection.rtl,
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
appBar: appBar(
|
||||
context: context,
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(
|
||||
color: AppColors.secondary50,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(
|
||||
child: Text(TenderDetailsStrings.tenderNoData),
|
||||
);
|
||||
}
|
||||
|
||||
return SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 16.0.w(),
|
||||
vertical: 16.0.h(),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TenderDetailHeader(isScreenBig: false, detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(isScreenBig: false, detail: detail),
|
||||
],
|
||||
),
|
||||
),
|
||||
return Directionality(
|
||||
textDirection: TextDirection.rtl,
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
appBar: appBar(
|
||||
context: context,
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.secondary50),
|
||||
);
|
||||
},
|
||||
),
|
||||
}
|
||||
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(
|
||||
child: Text(TenderDetailsStrings.tenderNoData),
|
||||
);
|
||||
}
|
||||
|
||||
return SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 16.0.w(),
|
||||
vertical: 16.0.h(),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TenderDetailHeader(isScreenBig: false, detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(isScreenBig: false, detail: detail),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
@@ -79,70 +78,58 @@ class _TenderDetailTabletPageState extends State<TenderDetailTabletPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final GlobalKey<ScaffoldState> key = GlobalKey();
|
||||
return PopScope(
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (kIsWeb) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
viewModel.updateTenderApprovals(widget.tenderId);
|
||||
});
|
||||
}
|
||||
},
|
||||
key: key,
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
appBar: tabletAppBar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
key: key,
|
||||
),
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
appBar: tabletAppBar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
key: key,
|
||||
),
|
||||
|
||||
drawer: const TabletNavigationWidget(
|
||||
currentIndex: 1, // Home is index 0
|
||||
),
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.secondary50),
|
||||
);
|
||||
}
|
||||
drawer: const TabletNavigationWidget(
|
||||
currentIndex: 1, // Home is index 0
|
||||
),
|
||||
body: Consumer<TenderDetailViewModel>(
|
||||
builder: (context, tenderViewModel, child) {
|
||||
if (tenderViewModel.isLoading) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.secondary50),
|
||||
);
|
||||
}
|
||||
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
if (tenderViewModel.errorMessage != null) {
|
||||
return Center(child: Text(tenderViewModel.errorMessage!));
|
||||
}
|
||||
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(
|
||||
child: Text(TenderDetailsStrings.tenderNoData),
|
||||
);
|
||||
}
|
||||
return SingleChildScrollView(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 768,
|
||||
final detail = tenderViewModel.tenderDetail;
|
||||
if (detail == null) {
|
||||
return const Center(child: Text(TenderDetailsStrings.tenderNoData));
|
||||
}
|
||||
return SingleChildScrollView(
|
||||
child: Center(
|
||||
child: SizedBox(
|
||||
width: 768,
|
||||
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const TabletDesktopAppbar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
SizedBox(height: 28.0.h()),
|
||||
TenderDetailHeader(isScreenBig: true, detail: detail),
|
||||
SizedBox(height: 28.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(isScreenBig: true, detail: detail),
|
||||
],
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const TabletDesktopAppbar(
|
||||
title: TenderDetailsStrings.tenderDetailTitle,
|
||||
),
|
||||
SizedBox(height: 28.0.h()),
|
||||
TenderDetailHeader(isScreenBig: true, detail: detail),
|
||||
SizedBox(height: 28.0.h()),
|
||||
TenderDetailCard(detail: detail),
|
||||
SizedBox(height: 24.0.h()),
|
||||
TenderDetailActions(isScreenBig: true, detail: detail),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/data/services/model/liked_tender_feedback/liked_tender_feedback.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_data/tender_approvals_data.dart';
|
||||
import 'package:tm_app/view_models/liked_tenders_view_model.dart';
|
||||
import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart';
|
||||
import 'package:tm_app/views/shared/page_selection_dialog.dart';
|
||||
@@ -216,15 +215,7 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
|
||||
itemCount: feedback.length,
|
||||
itemBuilder: (context, index) {
|
||||
final item = feedback[index];
|
||||
TenderApprovalsData? approval;
|
||||
bool hasApproval = viewModel.hasTenderApprovalForTender(
|
||||
item.tenderId!,
|
||||
);
|
||||
if (hasApproval) {
|
||||
approval = viewModel.getApprovalStatusForTender(item.tenderId!);
|
||||
} else {
|
||||
approval = null;
|
||||
}
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(bottom: 20.0.h()),
|
||||
child: Dismissible(
|
||||
@@ -240,11 +231,7 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
|
||||
viewModel.removeTenderById(item.tenderId!);
|
||||
}
|
||||
},
|
||||
child: LikedListItem(
|
||||
tender: item.tender!,
|
||||
approval: approval,
|
||||
isDesktop: true,
|
||||
),
|
||||
child: LikedListItem(tender: item.tender!, isDesktop: true),
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
@@ -6,7 +6,6 @@ import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/theme/colors.dart';
|
||||
import 'package:tm_app/core/utils/app_toast.dart';
|
||||
import 'package:tm_app/core/utils/size_config.dart';
|
||||
import 'package:tm_app/data/services/model/tender_approvals_data/tender_approvals_data.dart';
|
||||
import 'package:tm_app/view_models/liked_tenders_view_model.dart';
|
||||
import 'package:tm_app/views/liked_tenders/strings/liked_tenders_strings.dart';
|
||||
import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart';
|
||||
@@ -196,17 +195,6 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
|
||||
itemBuilder: (context, index) {
|
||||
if (index < feedback.length) {
|
||||
final item = feedback[index];
|
||||
TenderApprovalsData? approval;
|
||||
bool hasApproval = viewModel.hasTenderApprovalForTender(
|
||||
item.tenderId!,
|
||||
);
|
||||
if (hasApproval) {
|
||||
approval = viewModel.getApprovalStatusForTender(
|
||||
item.tenderId!,
|
||||
);
|
||||
} else {
|
||||
approval = null;
|
||||
}
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(bottom: 20.0.h()),
|
||||
@@ -229,10 +217,7 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
|
||||
viewModel.removeTenderById(item.tenderId!);
|
||||
}
|
||||
},
|
||||
child: LikedListItem(
|
||||
tender: item.tender!,
|
||||
approval: approval,
|
||||
),
|
||||
child: LikedListItem(tender: item.tender!),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
|
||||
@@ -13,7 +13,6 @@ import 'package:tm_app/views/shared/page_selection_dialog.dart';
|
||||
import 'package:tm_app/views/shared/tender_app_bar.dart';
|
||||
|
||||
import '../../../core/utils/app_toast.dart';
|
||||
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
|
||||
import '../../shared/tablet_desktop_appbar.dart';
|
||||
import '../../shared/tablet_navigation_widget.dart';
|
||||
import '../widgets/like_filters_bottom_sheet.dart';
|
||||
@@ -231,15 +230,7 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
|
||||
itemCount: feedback.length,
|
||||
itemBuilder: (context, index) {
|
||||
final item = feedback[index];
|
||||
TenderApprovalsData? approval;
|
||||
bool hasApproval = viewModel.hasTenderApprovalForTender(
|
||||
item.tenderId!,
|
||||
);
|
||||
if (hasApproval) {
|
||||
approval = viewModel.getApprovalStatusForTender(item.tenderId!);
|
||||
} else {
|
||||
approval = null;
|
||||
}
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(bottom: 20.0.h()),
|
||||
child: Dismissible(
|
||||
@@ -259,7 +250,7 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
|
||||
viewModel.removeTenderById(item.tenderId!);
|
||||
}
|
||||
},
|
||||
child: LikedListItem(tender: item.tender!, approval: approval),
|
||||
child: LikedListItem(tender: item.tender!),
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
@@ -9,21 +8,16 @@ import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
import 'package:tm_app/view_models/liked_tenders_view_model.dart';
|
||||
import 'package:tm_app/views/home/strings/home_strings.dart';
|
||||
|
||||
import '../../../core/constants/tender_submision_mode.dart';
|
||||
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
|
||||
import '../../../core/utils/date_utils.dart';
|
||||
import '../../shared/flag.dart';
|
||||
import '../../shared/select_submission_bottom_sheet.dart';
|
||||
import '../../shared/select_submission_dialog.dart';
|
||||
|
||||
class LikedListItem extends StatelessWidget {
|
||||
const LikedListItem({
|
||||
required this.tender,
|
||||
this.approval,
|
||||
this.isDesktop = false,
|
||||
super.key,
|
||||
});
|
||||
final TenderData tender;
|
||||
final TenderApprovalsData? approval;
|
||||
|
||||
final bool isDesktop;
|
||||
|
||||
@@ -170,100 +164,8 @@ class LikedListItem extends StatelessWidget {
|
||||
? Flag(countryCode: tender.countryCode!)
|
||||
: const Flag(countryCode: ''),
|
||||
const Spacer(),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
viewModel.rejectTenderApproval(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: TenderSubmissionMode.selfApply.value,
|
||||
);
|
||||
},
|
||||
child: Container(
|
||||
width: 32.0.w(),
|
||||
height: 32.0.h(),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color:
|
||||
viewModel.isTenderRejected(tender.id!)
|
||||
? AppColors.errorColor
|
||||
: AppColors.grey60,
|
||||
width: 1.5.w(),
|
||||
),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Icon(
|
||||
Icons.close,
|
||||
color:
|
||||
viewModel.isTenderRejected(tender.id!)
|
||||
? AppColors.errorColor
|
||||
: AppColors.grey60,
|
||||
size: 16,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(width: 30.0.w()),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (viewModel.isTenderSubmitted(tender.id!)) {
|
||||
viewModel.submitTenderApproval(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: TenderSubmissionMode.selfApply.value,
|
||||
);
|
||||
} else {
|
||||
(kIsWeb && MediaQuery.sizeOf(context).width > 600)
|
||||
? showDialog(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return SelectSubmissionDialog(
|
||||
onConfirm: (value) {
|
||||
viewModel.submitTenderApproval(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: value,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
)
|
||||
: showModalBottomSheet(
|
||||
isDismissible: true,
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return SelectSubmissionBottomSheet(
|
||||
onConfirm: (value) {
|
||||
viewModel.submitTenderApproval(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: value,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
},
|
||||
child: Container(
|
||||
width: 32.0.w(),
|
||||
height: 32.0.h(),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color:
|
||||
viewModel.isTenderSubmitted(tender.id!)
|
||||
? AppColors.successColor
|
||||
: AppColors.grey60,
|
||||
width: 1.5.w(),
|
||||
),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Icon(
|
||||
Icons.check,
|
||||
color:
|
||||
viewModel.isTenderSubmitted(tender.id!)
|
||||
? AppColors.successColor
|
||||
: AppColors.grey60,
|
||||
size: 16,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
@@ -272,12 +174,3 @@ class LikedListItem extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String timeConvertor(int time) {
|
||||
DateTime date = DateTime.fromMillisecondsSinceEpoch(time);
|
||||
|
||||
String formattedDate =
|
||||
"${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}";
|
||||
|
||||
return formattedDate;
|
||||
}
|
||||
|
||||
@@ -37,9 +37,6 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
|
||||
if (viewModel.feedbackErrorMessage != null) {
|
||||
AppToast.error(context, viewModel.feedbackErrorMessage!);
|
||||
}
|
||||
if (viewModel.tenderApprovalErrorMessage != null) {
|
||||
AppToast.error(context, viewModel.tenderApprovalErrorMessage!);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -30,9 +30,6 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
|
||||
if (viewModel.feedbackErrorMessage != null) {
|
||||
AppToast.error(context, viewModel.feedbackErrorMessage!);
|
||||
}
|
||||
if (viewModel.tenderApprovalErrorMessage != null) {
|
||||
AppToast.error(context, viewModel.tenderApprovalErrorMessage!);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -76,9 +76,6 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
|
||||
if (!viewModel.hasFeedbackForTender(previousTenderId)) {
|
||||
viewModel.getTenderFeedback(previousTenderId);
|
||||
}
|
||||
if (!viewModel.hasTenderApprovalForTender(previousTenderId)) {
|
||||
viewModel.getTenderApprovals(previousTenderId);
|
||||
}
|
||||
}
|
||||
|
||||
void _goToNextPage() {
|
||||
@@ -105,9 +102,6 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
|
||||
if (!viewModel.hasFeedbackForTender(nextTenderId)) {
|
||||
viewModel.getTenderFeedback(nextTenderId);
|
||||
}
|
||||
if (!viewModel.hasTenderApprovalForTender(nextTenderId)) {
|
||||
viewModel.getTenderApprovals(nextTenderId);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -147,9 +141,6 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
|
||||
if (!viewModel.hasFeedbackForTender(id)) {
|
||||
viewModel.getTenderFeedback(id);
|
||||
}
|
||||
if (!viewModel.hasTenderApprovalForTender(id)) {
|
||||
viewModel.getTenderApprovals(id);
|
||||
}
|
||||
|
||||
if (index >= widget.tenders.length - 1 &&
|
||||
viewModel.hasMoreData &&
|
||||
|
||||
@@ -4,13 +4,9 @@ import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
import 'package:tm_app/view_models/tenders_view_model.dart';
|
||||
|
||||
import '../../../core/constants/assets.dart';
|
||||
import '../../../core/constants/tender_approval_status.dart';
|
||||
import '../../../core/constants/tender_feedback.dart';
|
||||
import '../../../core/constants/tender_submision_mode.dart';
|
||||
import '../../../core/theme/colors.dart';
|
||||
import '../../../core/utils/size_config.dart';
|
||||
import '../../shared/select_submission_bottom_sheet.dart';
|
||||
import '../../shared/select_submission_dialog.dart';
|
||||
import '../strings/tenders_strings.dart';
|
||||
import '../widgets/animated_feedback_button.dart';
|
||||
|
||||
@@ -35,12 +31,7 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
|
||||
// Dislike button
|
||||
_dislikeButton(viewModel),
|
||||
isDesktop ? Container() : SizedBox(width: 32.0.w()),
|
||||
//reject button
|
||||
isDesktop ? Container() : _rejectButton(viewModel),
|
||||
isDesktop ? Container() : SizedBox(width: 32.0.w()),
|
||||
//submit button
|
||||
isDesktop ? Container() : _submitButton(viewModel, context),
|
||||
|
||||
SizedBox(width: isDesktop ? 16.0.h() : 32.0.w()),
|
||||
// Like button
|
||||
_likeButton(viewModel),
|
||||
@@ -50,155 +41,6 @@ class TenderActionButtonsRow extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _rejectButton(TendersViewModel viewModel) {
|
||||
// Find approval for this specific tender
|
||||
if (tender.id == null) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
final approval = viewModel.getTenderApprovalForTender(tender.id!);
|
||||
final isRejected = approval?.status == TenderApprovalStatus.rejected.value;
|
||||
|
||||
return Tooltip(
|
||||
message: TendersStrings.reject,
|
||||
child: InkWell(
|
||||
splashColor: Colors.transparent,
|
||||
onTap: () {
|
||||
viewModel.toggleApprovals(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: TenderSubmissionMode.selfApply.value,
|
||||
status: TenderApprovalStatus.rejected.value,
|
||||
);
|
||||
},
|
||||
child: Column(
|
||||
children: [
|
||||
Container(
|
||||
width: 24.0.w(),
|
||||
height: 24.0.w(),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color: isRejected ? AppColors.errorColor : AppColors.grey60,
|
||||
width: 1.5.w(),
|
||||
),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Icon(
|
||||
Icons.close,
|
||||
color: isRejected ? AppColors.errorColor : AppColors.grey60,
|
||||
size: 16,
|
||||
),
|
||||
),
|
||||
SizedBox(height: 8.0.h()),
|
||||
if (!isDesktop)
|
||||
Text(
|
||||
TendersStrings.reject,
|
||||
style: TextStyle(
|
||||
fontSize: 12.0.sp(),
|
||||
fontWeight: FontWeight.w400,
|
||||
color: isRejected ? AppColors.errorColor : AppColors.grey60,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _submitButton(TendersViewModel viewModel, BuildContext context) {
|
||||
// Find approval for this specific tender
|
||||
if (tender.id == null) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
final approval = viewModel.getTenderApprovalForTender(tender.id!);
|
||||
final isApproved = approval?.status == TenderApprovalStatus.submitted.value;
|
||||
|
||||
return Tooltip(
|
||||
message: TendersStrings.submit,
|
||||
child: InkWell(
|
||||
splashColor: Colors.transparent,
|
||||
onTap: () {
|
||||
if (isApproved) {
|
||||
viewModel.toggleApprovals(
|
||||
tenderId: tender.id!,
|
||||
submissionMode:
|
||||
(approval?.submissionMode?.isNotEmpty == true)
|
||||
? approval!.submissionMode!
|
||||
: TenderSubmissionMode.selfApply.value,
|
||||
status: TenderApprovalStatus.submitted.value,
|
||||
);
|
||||
} else {
|
||||
final isMobile = MediaQuery.sizeOf(context).width < 600;
|
||||
if (isMobile) {
|
||||
showModalBottomSheet(
|
||||
isDismissible: true,
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return SelectSubmissionBottomSheet(
|
||||
onConfirm: (value) {
|
||||
viewModel.toggleApprovals(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: value,
|
||||
status: TenderApprovalStatus.submitted.value,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
} else {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return SelectSubmissionDialog(
|
||||
onConfirm: (String value) {
|
||||
viewModel.toggleApprovals(
|
||||
tenderId: tender.id!,
|
||||
submissionMode: value,
|
||||
status: TenderApprovalStatus.submitted.value,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
children: [
|
||||
Container(
|
||||
width: 24.0.w(),
|
||||
height: 24.0.w(),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color: isApproved ? AppColors.successColor : AppColors.grey60,
|
||||
width: 1.5.w(),
|
||||
),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: Icon(
|
||||
Icons.check,
|
||||
color: isApproved ? AppColors.successColor : AppColors.grey60,
|
||||
size: 16,
|
||||
),
|
||||
),
|
||||
SizedBox(height: 8.0.h()),
|
||||
if (!isDesktop)
|
||||
Text(
|
||||
TendersStrings.submit,
|
||||
style: TextStyle(
|
||||
fontSize: 12.0.sp(),
|
||||
fontWeight: FontWeight.w400,
|
||||
color: isApproved ? AppColors.successColor : AppColors.grey60,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _dislikeButton(TendersViewModel viewModel) {
|
||||
if (tender.id == null) {
|
||||
return const SizedBox.shrink();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:flutter/material.dart' hide DateUtils;
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
|
||||
|
||||
@@ -8,7 +7,6 @@ import '../../../core/constants/assets.dart';
|
||||
import '../../../core/theme/colors.dart';
|
||||
import '../../../core/utils/date_utils.dart';
|
||||
import '../../../core/utils/size_config.dart';
|
||||
import '../../../view_models/tenders_view_model.dart';
|
||||
import '../../detail/strings/tender_details_strings.dart';
|
||||
import '../../shared/flag.dart';
|
||||
import '../strings/tenders_strings.dart';
|
||||
@@ -268,13 +266,7 @@ class TenderCard extends StatelessWidget {
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
if (tender.id != null) {
|
||||
TenderDetailRouteData(tenderId: tender.id!).push(context).then((
|
||||
value,
|
||||
) {
|
||||
if (context.mounted) {
|
||||
context.read<TendersViewModel>().getTenderApprovals(tender.id!);
|
||||
}
|
||||
});
|
||||
TenderDetailRouteData(tenderId: tender.id!).push(context);
|
||||
}
|
||||
},
|
||||
child: Container(
|
||||
|
||||
Reference in New Issue
Block a user