mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'check_conflicts' (#98) from check_conflicts into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/98
This commit is contained in:
a.ghabeli
2025-09-05 13:13:17 +03:30
parent 6ea9856551 0a7c11286d
commit 142c53f7aa
9 changed files with 294 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view_models/liked_tenders_view_model.dart
+105
View File
@@ -6,6 +6,8 @@ import 'package:tm_app/data/services/model/liked_tender_feedback/liked_tender_fe
import 'package:tm_app/data/services/model/liked_tenders_response/liked_tenders_response.dart'; import 'package:tm_app/data/services/model/liked_tenders_response/liked_tenders_response.dart';
import '../data/services/model/feedback_response/feedback_response.dart'; import '../data/services/model/feedback_response/feedback_response.dart';
import '../data/services/model/tender_approvals_by_id_response/tender_approvals_by_id_response.dart';
import '../data/services/model/tender_approvals_data/tender_approvals_data.dart';
class LikedTendersViewModel with ChangeNotifier { class LikedTendersViewModel with ChangeNotifier {
final LikedTendersRepository _likedTendersRepository; final LikedTendersRepository _likedTendersRepository;
@@ -21,6 +23,11 @@ class LikedTendersViewModel with ChangeNotifier {
bool hasMore = true; bool hasMore = true;
String? errorMessage; String? errorMessage;
LikedTendersResponse? data; LikedTendersResponse? data;
TenderApprovalsData? _tenderApprovalData;
TenderApprovalsData? get tenderApprovalData => _tenderApprovalData;
List<TenderApprovalsData> tenderApprovals = [];
int _offset = 0; int _offset = 0;
final int _limit = 7; final int _limit = 7;
@@ -60,6 +67,10 @@ class LikedTendersViewModel with ChangeNotifier {
final incoming = result.value; final incoming = result.value;
final incomingList = incoming.data?.feedback ?? []; final incomingList = incoming.data?.feedback ?? [];
for (var element in incomingList) {
await getTenderApproval(element.tenderId!);
}
if (reset) { if (reset) {
data = incoming; data = incoming;
} else { } else {
@@ -151,4 +162,98 @@ class LikedTendersViewModel with ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future<void> getTenderApproval(String tenderId) async {
errorMessage = null;
notifyListeners();
final result = await _tendersRepository.getTenderApprovals(
tenderId: tenderId,
);
switch (result) {
case Ok<TenderApprovalsByIdResponse>():
_tenderApprovalData = result.value.data;
tenderApprovals.add(_tenderApprovalData!);
break;
case Error<TenderApprovalsByIdResponse>():
errorMessage = result.error.toString();
break;
}
notifyListeners();
errorMessage = null;
notifyListeners();
}
TenderApprovalsData? getApprovalStatusForTender(String tenderId) {
try {
return tenderApprovals.firstWhere((a) => a.tenderId == tenderId);
} catch (e) {
return null;
}
}
/// Check if tender approval exists for a specific tender
bool hasTenderApprovalForTender(String tenderId) {
return tenderApprovals.any((a) => a.tenderId == tenderId);
}
// Future<void> submitTenderApproval({
// required String tenderId,
// required String submissionMode,
// }) async {
// errorMessage = null;
// notifyListeners();
// final result = await _tendersRepository.toggleApprovals(
// tenderId: tenderId,
// status: 'submitted',
// submissionMode: submissionMode,
// );
// switch (result) {
// case Ok<TenderApprovalsToggleResponse>():
// approvalStatus = true;
// _status = result.value.data?.status ?? '';
// break;
// case Error<TenderApprovalsToggleResponse>():
// _errorMessage = result.error.toString();
// approvalStatus = false;
// break;
// }
// _isSubmitApprovalLoading = false;
// notifyListeners();
// _errorMessage = null;
// approvalStatus = false;
// notifyListeners();
// }
// Future<void> rejectTenderApproval({
// required String tenderId,
// required String submissionMode,
// }) async {
// _isRejectApprovalLoading = true;
// _errorMessage = null;
// notifyListeners();
// final result = await _tendersRepository.toggleApprovals(
// tenderId: tenderId,
// status: 'rejected',
// submissionMode: submissionMode,
// );
// switch (result) {
// case Ok<TenderApprovalsToggleResponse>():
// approvalStatus = true;
// _status = result.value.data?.status ?? '';
// break;
// case Error<TenderApprovalsToggleResponse>():
// _errorMessage = result.error.toString();
// approvalStatus = false;
// break;
// }
// _isRejectApprovalLoading = false;
// notifyListeners();
// _errorMessage = null;
// approvalStatus = false;
// notifyListeners();
// }
} }
lib/views/detail/pages/detail_mobile_page.dart
+4 -1
View File
@@ -119,7 +119,10 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
return SingleChildScrollView( return SingleChildScrollView(
child: Padding( child: Padding(
padding: const EdgeInsets.all(16.0), padding: EdgeInsets.symmetric(
horizontal: 16.0.w(),
vertical: 16.0.h(),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
lib/views/home/pages/d_home_page.dart
+1 -1
View File
@@ -174,7 +174,7 @@ class DesktopHomePage extends StatelessWidget {
backgroundColor: AppColors.orange10, backgroundColor: AppColors.orange10,
iconPath: AssetsManager.shield, iconPath: AssetsManager.shield,
title: HomeStrings.tenderValue, title: HomeStrings.tenderValue,
amount: '3', amount: '0',
textColor: AppColors.orange, textColor: AppColors.orange,
enableTap: true, enableTap: true,
width: 178, width: 178,
lib/views/home/pages/m_home_page.dart
+1 -1
View File
@@ -139,7 +139,7 @@ class MobileHomePage extends StatelessWidget {
backgroundColor: AppColors.orange10, backgroundColor: AppColors.orange10,
iconPath: AssetsManager.shield, iconPath: AssetsManager.shield,
title: HomeStrings.tenderValue, title: HomeStrings.tenderValue,
amount: '3', amount: '0',
textColor: AppColors.orange, textColor: AppColors.orange,
enableTap: true, enableTap: true,
onTap: () {}, onTap: () {},
lib/views/home/pages/t_home_page.dart
+1 -1
View File
@@ -185,7 +185,7 @@ class TabletHomePage extends StatelessWidget {
backgroundColor: AppColors.orange10, backgroundColor: AppColors.orange10,
iconPath: AssetsManager.shield, iconPath: AssetsManager.shield,
title: HomeStrings.tenderValue, title: HomeStrings.tenderValue,
amount: '3', amount: '0',
textColor: AppColors.orange, textColor: AppColors.orange,
enableTap: true, enableTap: true,
width: double.infinity, width: double.infinity,
lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart
+32
View File
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.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/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/liked_tenders/widgets/liked_tenders_list_item.dart';
@@ -84,12 +85,43 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
itemCount: feedback.length, itemCount: feedback.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final item = feedback[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( return Padding(
padding: EdgeInsets.only(bottom: 20.0.h()), padding: EdgeInsets.only(bottom: 20.0.h()),
child: Dismissible(
key: ValueKey(item.tenderId ?? index),
direction: DismissDirection.endToStart,
background: Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.symmetric(
horizontal: 20.0.w(),
),
child: SvgPicture.asset(
AssetsManager.trash,
),
),
onDismissed: (_) {
if (item.tenderId != null) {
viewModel.removeTenderById(
item.tenderId!,
);
}
},
child: LikedListItem( child: LikedListItem(
tender: item.tender!, tender: item.tender!,
approval: approval,
isDesktop: true, isDesktop: true,
), ),
),
); );
}, },
), ),
lib/views/liked_tenders/pages/liked_tenders_mobile_page.dart
+17 -1
View File
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.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/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/strings/liked_tenders_strings.dart';
import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart'; import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart';
@@ -93,6 +94,18 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (index < feedback.length) { if (index < feedback.length) {
final item = feedback[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( return Padding(
padding: EdgeInsets.only(bottom: 20.0.h()), padding: EdgeInsets.only(bottom: 20.0.h()),
child: Dismissible( child: Dismissible(
@@ -110,7 +123,10 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
viewModel.removeTenderById(item.tenderId!); viewModel.removeTenderById(item.tenderId!);
} }
}, },
child: LikedListItem(tender: item.tender!), child: LikedListItem(
tender: item.tender!,
approval: approval,
),
), ),
); );
} else { } else {
lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart
+16 -1
View File
@@ -10,6 +10,7 @@ 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/strings/liked_tenders_strings.dart';
import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart'; import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart';
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
import '../../shared/tablet_navigation_widget.dart'; import '../../shared/tablet_navigation_widget.dart';
import '../../shared/tender_app_bar.dart'; import '../../shared/tender_app_bar.dart';
@@ -91,6 +92,17 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
itemCount: feedback.length, itemCount: feedback.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final item = feedback[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( return Padding(
padding: EdgeInsets.only(bottom: 20.0.h()), padding: EdgeInsets.only(bottom: 20.0.h()),
child: Dismissible( child: Dismissible(
@@ -113,7 +125,10 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
); );
} }
}, },
child: LikedListItem(tender: item.tender!), child: LikedListItem(
tender: item.tender!,
approval: approval!,
),
), ),
); );
}, },
lib/views/liked_tenders/widgets/liked_tenders_list_item.dart
+45 -9
View File
@@ -9,13 +9,18 @@ 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/view_models/liked_tenders_view_model.dart';
import 'package:tm_app/views/home/strings/home_strings.dart'; import 'package:tm_app/views/home/strings/home_strings.dart';
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
class LikedListItem extends StatelessWidget { class LikedListItem extends StatelessWidget {
const LikedListItem({ const LikedListItem({
required this.tender, required this.tender,
super.key, this.approval,
this.isDesktop = false, this.isDesktop = false,
super.key,
}); });
final TenderData tender; final TenderData tender;
final TenderApprovalsData? approval;
final bool isDesktop; final bool isDesktop;
@override @override
@@ -36,8 +41,8 @@ class LikedListItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 10.0.h()), SizedBox(height: 10.0.h()),
isDesktop ? isDesktop
Row( ? Row(
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
@@ -74,7 +79,11 @@ class LikedListItem extends StatelessWidget {
), ),
SizedBox(width: 8.0.w()), SizedBox(width: 8.0.w()),
InkWell( InkWell(
child: SvgPicture.asset(AssetsManager.trash,width: 32.0.w(),height: 32.0.h(),), child: SvgPicture.asset(
AssetsManager.trash,
width: 32.0.w(),
height: 32.0.h(),
),
onTap: () { onTap: () {
if (tender.id != null) { if (tender.id != null) {
viewModel.removeTenderById(tender.id!); viewModel.removeTenderById(tender.id!);
@@ -82,7 +91,8 @@ class LikedListItem extends StatelessWidget {
}, },
), ),
], ],
) : Container( )
: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10.0.w(), horizontal: 10.0.w(),
vertical: 5.0.h(), vertical: 5.0.h(),
@@ -167,10 +177,23 @@ class LikedListItem extends StatelessWidget {
height: 32.0.h(), height: 32.0.h(),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all(color: AppColors.grey60, width: 1.5.w()), border: Border.all(
color:
approval?.status == 'rejected'
? AppColors.errorColor
: AppColors.grey60,
width: 1.5.w(),
),
), ),
alignment: Alignment.center, alignment: Alignment.center,
child: Icon(Icons.close, color: AppColors.grey60, size: 16), child: Icon(
Icons.close,
color:
approval?.status == 'rejected'
? AppColors.errorColor
: AppColors.grey60,
size: 16,
),
), ),
SizedBox(width: 30.0.w()), SizedBox(width: 30.0.w()),
Container( Container(
@@ -178,10 +201,23 @@ class LikedListItem extends StatelessWidget {
height: 32.0.h(), height: 32.0.h(),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all(color: AppColors.grey60, width: 1.5.w()), border: Border.all(
color:
approval?.status == 'submitted'
? AppColors.successColor
: AppColors.grey60,
width: 1.5.w(),
),
), ),
alignment: Alignment.center, alignment: Alignment.center,
child: Icon(Icons.check, color: AppColors.grey60, size: 16), child: Icon(
Icons.check,
color:
approval?.status == 'submitted'
? AppColors.successColor
: AppColors.grey60,
size: 16,
),
), ),
], ],
), ),