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

Fixed pagination for your tenders in home

Browse Source
This commit is contained in:
llsajjad
2025-09-07 10:43:54 +03:30
parent cd827ecbe4
commit 468556acb3
11 changed files with 486 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/data/repositories/home_repository.dart
+6 -3
View File
@@ -8,7 +8,7 @@ import '../services/model/feedback_stats_response/feedback_stat_response.dart';
class HomeRepository {
HomeRepository({required HomeService homeService})
: _homeService = homeService;
: _homeService = homeService;
final HomeService _homeService;
Future<Result<RecommendedTendersResponse>> getHomeRecommendedTenders({
@@ -18,8 +18,11 @@ class HomeRepository {
return _homeService.getRecommendedTenders(limit: limit, offset: offset);
}
Future<Result<TenderApprovalsResponse>> getYourTenders() {
return _homeService.getYourTenders();
Future<Result<TenderApprovalsResponse>> getYourTenders({
required int limit,
required int offset,
}) {
return _homeService.getYourTenders(limit: limit, offset: offset);
}
Future<Result<TenderApprovalsStateResponse>> getTendersApprovalsState() {
lib/data/services/api/home_api.dart
+9 -1
View File
@@ -7,7 +7,15 @@ class HomeApi {
return '$recommendedTenders?limit=$limit&offset=$offset';
}
static const String tenderApprovals = '/api/v1/tender-approvals';
static const String tenderApprovalsBase = '/api/v1/tender-approvals';
static String getYourTenders({
required int limit,
required int offset,
}) {
return '$tenderApprovalsBase?limit=$limit&offset=$offset';
}
static const String tenderApprovalStats = '/api/v1/tender-approvals/stats';
static const String statsCompany = '/api/v1/feedback/stats/company';
}
lib/data/services/home_service.dart
+7 -7
View File
@@ -9,7 +9,7 @@ import '../../core/network/network_manager.dart';
class HomeService {
HomeService({required NetworkManager networkManager})
: _networkManager = networkManager;
: _networkManager = networkManager;
final NetworkManager _networkManager;
Future<Result<RecommendedTendersResponse>> getRecommendedTenders({
@@ -24,24 +24,24 @@ class HomeService {
return result;
}
Future<Result<TenderApprovalsResponse>> getYourTenders() async {
Future<Result<TenderApprovalsResponse>> getYourTenders({
required int limit,
required int offset,
}) async {
final result = await _networkManager.makeRequest(
HomeApi.tenderApprovals,
HomeApi.getYourTenders(limit: limit, offset: offset),
(json) => TenderApprovalsResponse.fromJson(json),
method: 'GET',
);
return result;
}
Future<Result<TenderApprovalsStateResponse>>
getTendersApprovalsState() async {
Future<Result<TenderApprovalsStateResponse>> getTendersApprovalsState() async {
final result = await _networkManager.makeRequest(
HomeApi.tenderApprovalStats,
(json) => TenderApprovalsStateResponse.fromJson(json),
method: 'GET',
);
return result;
}
lib/data/services/model/tender_approvals_data_warpper/tender_approvals_data_wrapper.dart
+15 -1
View File
@@ -1,5 +1,4 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import '../tender_approvals_data/tender_approvals_data.dart';
part 'tender_approvals_data_wrapper.freezed.dart';
@@ -9,8 +8,23 @@ part 'tender_approvals_data_wrapper.g.dart';
abstract class TenderApprovalsDataWrapper with _$TenderApprovalsDataWrapper {
const factory TenderApprovalsDataWrapper({
required List<TenderApprovalsData>? tenders,
required Metadata? metadata,
}) = _TenderApprovalsDataWrapper;
factory TenderApprovalsDataWrapper.fromJson(Map<String, Object?> json) =>
_$TenderApprovalsDataWrapperFromJson(json);
}
@freezed
abstract class Metadata with _$Metadata {
const factory Metadata({
required int? total,
required int? limit,
required int? offset,
required int? page,
required int? pages,
}) = _Metadata;
factory Metadata.fromJson(Map<String, Object?> json) =>
_$MetadataFromJson(json);
}
lib/data/services/model/tender_approvals_data_warpper/tender_approvals_data_wrapper.freezed.dart
+324 -22
View File
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
/// @nodoc
mixin _$TenderApprovalsDataWrapper {
List<TenderApprovalsData>? get tenders;
List<TenderApprovalsData>? get tenders; Metadata? get metadata;
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $TenderApprovalsDataWrapperCopyWith<TenderApprovalsDataWrapper> get copyWith =>
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is TenderApprovalsDataWrapper&&const DeepCollectionEquality().equals(other.tenders, tenders));
return identical(this, other) || (other.runtimeType == runtimeType&&other is TenderApprovalsDataWrapper&&const DeepCollectionEquality().equals(other.tenders, tenders)&&(identical(other.metadata, metadata) || other.metadata == metadata));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(tenders));
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(tenders),metadata);
@override
String toString() {
return 'TenderApprovalsDataWrapper(tenders: $tenders)';
return 'TenderApprovalsDataWrapper(tenders: $tenders, metadata: $metadata)';
}
@@ -48,11 +48,11 @@ abstract mixin class $TenderApprovalsDataWrapperCopyWith<$Res> {
factory $TenderApprovalsDataWrapperCopyWith(TenderApprovalsDataWrapper value, $Res Function(TenderApprovalsDataWrapper) _then) = _$TenderApprovalsDataWrapperCopyWithImpl;
@useResult
$Res call({
List<TenderApprovalsData>? tenders
List<TenderApprovalsData>? tenders, Metadata? metadata
});
$MetadataCopyWith<$Res>? get metadata;
}
/// @nodoc
@@ -65,13 +65,26 @@ class _$TenderApprovalsDataWrapperCopyWithImpl<$Res>
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? tenders = freezed,}) {
@pragma('vm:prefer-inline') @override $Res call({Object? tenders = freezed,Object? metadata = freezed,}) {
return _then(_self.copyWith(
tenders: freezed == tenders ? _self.tenders : tenders // ignore: cast_nullable_to_non_nullable
as List<TenderApprovalsData>?,
as List<TenderApprovalsData>?,metadata: freezed == metadata ? _self.metadata : metadata // ignore: cast_nullable_to_non_nullable
as Metadata?,
));
}
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
$MetadataCopyWith<$Res>? get metadata {
if (_self.metadata == null) {
return null;
}
return $MetadataCopyWith<$Res>(_self.metadata!, (value) {
return _then(_self.copyWith(metadata: value));
});
}
}
@@ -153,10 +166,10 @@ return $default(_that);case _:
/// }
/// ```
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<TenderApprovalsData>? tenders)? $default,{required TResult orElse(),}) {final _that = this;
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<TenderApprovalsData>? tenders, Metadata? metadata)? $default,{required TResult orElse(),}) {final _that = this;
switch (_that) {
case _TenderApprovalsDataWrapper() when $default != null:
return $default(_that.tenders);case _:
return $default(_that.tenders,_that.metadata);case _:
return orElse();
}
@@ -174,10 +187,10 @@ return $default(_that.tenders);case _:
/// }
/// ```
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<TenderApprovalsData>? tenders) $default,) {final _that = this;
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<TenderApprovalsData>? tenders, Metadata? metadata) $default,) {final _that = this;
switch (_that) {
case _TenderApprovalsDataWrapper():
return $default(_that.tenders);case _:
return $default(_that.tenders,_that.metadata);case _:
throw StateError('Unexpected subclass');
}
@@ -194,10 +207,10 @@ return $default(_that.tenders);case _:
/// }
/// ```
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<TenderApprovalsData>? tenders)? $default,) {final _that = this;
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<TenderApprovalsData>? tenders, Metadata? metadata)? $default,) {final _that = this;
switch (_that) {
case _TenderApprovalsDataWrapper() when $default != null:
return $default(_that.tenders);case _:
return $default(_that.tenders,_that.metadata);case _:
return null;
}
@@ -209,7 +222,7 @@ return $default(_that.tenders);case _:
@JsonSerializable()
class _TenderApprovalsDataWrapper implements TenderApprovalsDataWrapper {
const _TenderApprovalsDataWrapper({required final List<TenderApprovalsData>? tenders}): _tenders = tenders;
const _TenderApprovalsDataWrapper({required final List<TenderApprovalsData>? tenders, required this.metadata}): _tenders = tenders;
factory _TenderApprovalsDataWrapper.fromJson(Map<String, dynamic> json) => _$TenderApprovalsDataWrapperFromJson(json);
final List<TenderApprovalsData>? _tenders;
@@ -221,6 +234,7 @@ class _TenderApprovalsDataWrapper implements TenderApprovalsDataWrapper {
return EqualUnmodifiableListView(value);
}
@override final Metadata? metadata;
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@@ -235,16 +249,16 @@ Map<String, dynamic> toJson() {
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is _TenderApprovalsDataWrapper&&const DeepCollectionEquality().equals(other._tenders, _tenders));
return identical(this, other) || (other.runtimeType == runtimeType&&other is _TenderApprovalsDataWrapper&&const DeepCollectionEquality().equals(other._tenders, _tenders)&&(identical(other.metadata, metadata) || other.metadata == metadata));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_tenders));
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_tenders),metadata);
@override
String toString() {
return 'TenderApprovalsDataWrapper(tenders: $tenders)';
return 'TenderApprovalsDataWrapper(tenders: $tenders, metadata: $metadata)';
}
@@ -255,11 +269,11 @@ abstract mixin class _$TenderApprovalsDataWrapperCopyWith<$Res> implements $Tend
factory _$TenderApprovalsDataWrapperCopyWith(_TenderApprovalsDataWrapper value, $Res Function(_TenderApprovalsDataWrapper) _then) = __$TenderApprovalsDataWrapperCopyWithImpl;
@override @useResult
$Res call({
List<TenderApprovalsData>? tenders
List<TenderApprovalsData>? tenders, Metadata? metadata
});
@override $MetadataCopyWith<$Res>? get metadata;
}
/// @nodoc
@@ -272,10 +286,298 @@ class __$TenderApprovalsDataWrapperCopyWithImpl<$Res>
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? tenders = freezed,}) {
@override @pragma('vm:prefer-inline') $Res call({Object? tenders = freezed,Object? metadata = freezed,}) {
return _then(_TenderApprovalsDataWrapper(
tenders: freezed == tenders ? _self._tenders : tenders // ignore: cast_nullable_to_non_nullable
as List<TenderApprovalsData>?,
as List<TenderApprovalsData>?,metadata: freezed == metadata ? _self.metadata : metadata // ignore: cast_nullable_to_non_nullable
as Metadata?,
));
}
/// Create a copy of TenderApprovalsDataWrapper
/// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
$MetadataCopyWith<$Res>? get metadata {
if (_self.metadata == null) {
return null;
}
return $MetadataCopyWith<$Res>(_self.metadata!, (value) {
return _then(_self.copyWith(metadata: value));
});
}
}
/// @nodoc
mixin _$Metadata {
int? get total; int? get limit; int? get offset; int? get page; int? get pages;
/// Create a copy of Metadata
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
$MetadataCopyWith<Metadata> get copyWith => _$MetadataCopyWithImpl<Metadata>(this as Metadata, _$identity);
/// Serializes this Metadata to a JSON map.
Map<String, dynamic> toJson();
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is Metadata&&(identical(other.total, total) || other.total == total)&&(identical(other.limit, limit) || other.limit == limit)&&(identical(other.offset, offset) || other.offset == offset)&&(identical(other.page, page) || other.page == page)&&(identical(other.pages, pages) || other.pages == pages));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(runtimeType,total,limit,offset,page,pages);
@override
String toString() {
return 'Metadata(total: $total, limit: $limit, offset: $offset, page: $page, pages: $pages)';
}
}
/// @nodoc
abstract mixin class $MetadataCopyWith<$Res> {
factory $MetadataCopyWith(Metadata value, $Res Function(Metadata) _then) = _$MetadataCopyWithImpl;
@useResult
$Res call({
int? total, int? limit, int? offset, int? page, int? pages
});
}
/// @nodoc
class _$MetadataCopyWithImpl<$Res>
implements $MetadataCopyWith<$Res> {
_$MetadataCopyWithImpl(this._self, this._then);
final Metadata _self;
final $Res Function(Metadata) _then;
/// Create a copy of Metadata
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? total = freezed,Object? limit = freezed,Object? offset = freezed,Object? page = freezed,Object? pages = freezed,}) {
return _then(_self.copyWith(
total: freezed == total ? _self.total : total // ignore: cast_nullable_to_non_nullable
as int?,limit: freezed == limit ? _self.limit : limit // ignore: cast_nullable_to_non_nullable
as int?,offset: freezed == offset ? _self.offset : offset // ignore: cast_nullable_to_non_nullable
as int?,page: freezed == page ? _self.page : page // ignore: cast_nullable_to_non_nullable
as int?,pages: freezed == pages ? _self.pages : pages // ignore: cast_nullable_to_non_nullable
as int?,
));
}
}
/// Adds pattern-matching-related methods to [Metadata].
extension MetadataPatterns on Metadata {
/// A variant of `map` that fallback to returning `orElse`.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case _:
/// return orElse();
/// }
/// ```
@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _Metadata value)? $default,{required TResult orElse(),}){
final _that = this;
switch (_that) {
case _Metadata() when $default != null:
return $default(_that);case _:
return orElse();
}
}
/// A `switch`-like method, using callbacks.
///
/// Callbacks receives the raw object, upcasted.
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case final Subclass2 value:
/// return ...;
/// }
/// ```
@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _Metadata value) $default,){
final _that = this;
switch (_that) {
case _Metadata():
return $default(_that);case _:
throw StateError('Unexpected subclass');
}
}
/// A variant of `map` that fallback to returning `null`.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case _:
/// return null;
/// }
/// ```
@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _Metadata value)? $default,){
final _that = this;
switch (_that) {
case _Metadata() when $default != null:
return $default(_that);case _:
return null;
}
}
/// A variant of `when` that fallback to an `orElse` callback.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case _:
/// return orElse();
/// }
/// ```
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int? total, int? limit, int? offset, int? page, int? pages)? $default,{required TResult orElse(),}) {final _that = this;
switch (_that) {
case _Metadata() when $default != null:
return $default(_that.total,_that.limit,_that.offset,_that.page,_that.pages);case _:
return orElse();
}
}
/// A `switch`-like method, using callbacks.
///
/// As opposed to `map`, this offers destructuring.
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case Subclass2(:final field2):
/// return ...;
/// }
/// ```
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int? total, int? limit, int? offset, int? page, int? pages) $default,) {final _that = this;
switch (_that) {
case _Metadata():
return $default(_that.total,_that.limit,_that.offset,_that.page,_that.pages);case _:
throw StateError('Unexpected subclass');
}
}
/// A variant of `when` that fallback to returning `null`
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case _:
/// return null;
/// }
/// ```
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int? total, int? limit, int? offset, int? page, int? pages)? $default,) {final _that = this;
switch (_that) {
case _Metadata() when $default != null:
return $default(_that.total,_that.limit,_that.offset,_that.page,_that.pages);case _:
return null;
}
}
}
/// @nodoc
@JsonSerializable()
class _Metadata implements Metadata {
const _Metadata({required this.total, required this.limit, required this.offset, required this.page, required this.pages});
factory _Metadata.fromJson(Map<String, dynamic> json) => _$MetadataFromJson(json);
@override final int? total;
@override final int? limit;
@override final int? offset;
@override final int? page;
@override final int? pages;
/// Create a copy of Metadata
/// with the given fields replaced by the non-null parameter values.
@override @JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
_$MetadataCopyWith<_Metadata> get copyWith => __$MetadataCopyWithImpl<_Metadata>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$MetadataToJson(this, );
}
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is _Metadata&&(identical(other.total, total) || other.total == total)&&(identical(other.limit, limit) || other.limit == limit)&&(identical(other.offset, offset) || other.offset == offset)&&(identical(other.page, page) || other.page == page)&&(identical(other.pages, pages) || other.pages == pages));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(runtimeType,total,limit,offset,page,pages);
@override
String toString() {
return 'Metadata(total: $total, limit: $limit, offset: $offset, page: $page, pages: $pages)';
}
}
/// @nodoc
abstract mixin class _$MetadataCopyWith<$Res> implements $MetadataCopyWith<$Res> {
factory _$MetadataCopyWith(_Metadata value, $Res Function(_Metadata) _then) = __$MetadataCopyWithImpl;
@override @useResult
$Res call({
int? total, int? limit, int? offset, int? page, int? pages
});
}
/// @nodoc
class __$MetadataCopyWithImpl<$Res>
implements _$MetadataCopyWith<$Res> {
__$MetadataCopyWithImpl(this._self, this._then);
final _Metadata _self;
final $Res Function(_Metadata) _then;
/// Create a copy of Metadata
/// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? total = freezed,Object? limit = freezed,Object? offset = freezed,Object? page = freezed,Object? pages = freezed,}) {
return _then(_Metadata(
total: freezed == total ? _self.total : total // ignore: cast_nullable_to_non_nullable
as int?,limit: freezed == limit ? _self.limit : limit // ignore: cast_nullable_to_non_nullable
as int?,offset: freezed == offset ? _self.offset : offset // ignore: cast_nullable_to_non_nullable
as int?,page: freezed == page ? _self.page : page // ignore: cast_nullable_to_non_nullable
as int?,pages: freezed == pages ? _self.pages : pages // ignore: cast_nullable_to_non_nullable
as int?,
));
}
lib/data/services/model/tender_approvals_data_warpper/tender_approvals_data_wrapper.g.dart
+24 -1
View File
@@ -13,8 +13,31 @@ _TenderApprovalsDataWrapper _$TenderApprovalsDataWrapperFromJson(
(json['tenders'] as List<dynamic>?)
?.map((e) => TenderApprovalsData.fromJson(e as Map<String, dynamic>))
.toList(),
metadata:
json['metadata'] == null
? null
: Metadata.fromJson(json['metadata'] as Map<String, dynamic>),
);
Map<String, dynamic> _$TenderApprovalsDataWrapperToJson(
_TenderApprovalsDataWrapper instance,
) => <String, dynamic>{'tenders': instance.tenders};
) => <String, dynamic>{
'tenders': instance.tenders,
'metadata': instance.metadata,
};
_Metadata _$MetadataFromJson(Map<String, dynamic> json) => _Metadata(
total: (json['total'] as num?)?.toInt(),
limit: (json['limit'] as num?)?.toInt(),
offset: (json['offset'] as num?)?.toInt(),
page: (json['page'] as num?)?.toInt(),
pages: (json['pages'] as num?)?.toInt(),
);
Map<String, dynamic> _$MetadataToJson(_Metadata instance) => <String, dynamic>{
'total': instance.total,
'limit': instance.limit,
'offset': instance.offset,
'page': instance.page,
'pages': instance.pages,
};
lib/data/services/model/tender_approvals_response/tender_approvals_response.dart
-1
View File
@@ -2,7 +2,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:tm_app/data/services/model/tender_approvals_data_warpper/tender_approvals_data_wrapper.dart';
import '../error/error_model.dart';
import '../tender_approvals_data/tender_approvals_data.dart';
part 'tender_approvals_response.freezed.dart';
part 'tender_approvals_response.g.dart';
lib/view_models/home_view_model.dart
+54 -36
View File
@@ -14,7 +14,7 @@ class HomeViewModel with ChangeNotifier {
final HomeRepository _homeRepository;
HomeViewModel({required HomeRepository homeRepository})
: _homeRepository = homeRepository {
: _homeRepository = homeRepository {
init();
}
@@ -36,7 +36,6 @@ class HomeViewModel with ChangeNotifier {
bool _isLoadingMore = false;
bool _hasMore = true;
/// آیا الان در حالت Recommended هستیم یا YourTenders
bool _isRecommendedMode = false;
List<TenderData> get tenders => _tenders;
@@ -46,11 +45,11 @@ class HomeViewModel with ChangeNotifier {
void init() async {
await getApprovedStates();
await getYourTenders();
await getYourTenders(reset: true);
await getFeedbackStats();
}
Future<void> getHomeRecommandTenders({bool reset = false}) async {
Future<void> getHomeRecommendTenders({bool reset = false}) async {
if (_isLoadingMore || (!_hasMore && !reset)) {
return;
}
@@ -63,7 +62,7 @@ class HomeViewModel with ChangeNotifier {
_isLoadingMore = true;
_errorMessage = null;
_isRecommendedMode = true; // ✅ اینجا یعنی در حالت Recommended هستیم
_isRecommendedMode = true;
notifyListeners();
final result = await _homeRepository.getHomeRecommendedTenders(
@@ -94,38 +93,58 @@ class HomeViewModel with ChangeNotifier {
notifyListeners();
}
Future<void> getYourTenders() async {
_isLoading = true;
_isRecommendedMode = false; // ✅ وقتی YourTenders میاد → بدون pagination
notifyListeners();
final result = await _homeRepository.getYourTenders();
switch (result) {
case Ok<TenderApprovalsResponse>():
data = result.value;
_errorMessage = null;
if (data?.data?.tenders!.isEmpty ?? true) {
// اگه YourTenders خالی بود → برو سمت Recommended
await getHomeRecommandTenders(reset: true);
} else {
_tenders.clear();
_tenders.addAll(
data!.data!.tenders!.map((e) => e.tender).whereType<TenderData>(),
);
}
case Error<TenderApprovalsResponse>():
_errorMessage = result.error.toString();
await getHomeRecommandTenders(reset: true);
break;
}
_isLoading = false;
notifyListeners();
Future<void> getYourTenders({bool reset = false}) async {
if (_isLoadingMore || (!_hasMore && !reset)) {
return;
}
if (reset) {
_currentPage = 0;
_hasMore = true;
_tenders.clear();
}
_isLoadingMore = true;
_errorMessage = null;
_isRecommendedMode = false;
notifyListeners();
final result = await _homeRepository.getYourTenders(
limit: _pageSize,
offset: _currentPage * _pageSize,
);
switch (result) {
case Ok<TenderApprovalsResponse>():
data = result.value;
final tendersList = data?.data?.tenders ?? [];
final metadata = data?.data?.metadata;
if (tendersList.isNotEmpty) {
_tenders.addAll(
tendersList.map((e) => e.tender).whereType<TenderData>(),
);
_currentPage++;
if (metadata != null && (_currentPage >= metadata.pages!)) {
_hasMore = false;
}
} else {
_hasMore = false;
}
break;
case Error<TenderApprovalsResponse>():
_errorMessage = result.error.toString();
break;
}
_isLoadingMore = false;
notifyListeners();
}
Future<void> getApprovedStates() async {
_isLoading = true;
_errorMessage = null;
@@ -166,7 +185,6 @@ class HomeViewModel with ChangeNotifier {
notifyListeners();
}
// Calculation methods for progress bars
double get partnershipCount {
return tenderApprovalsStateResponse?.data?.partnershipCount?.toDouble() ??
0.0;
lib/views/home/pages/d_home_page.dart
+17 -9
View File
@@ -169,7 +169,8 @@ class DesktopHomePage extends StatelessWidget {
}
Widget _yourTenderText(HomeViewModel homeViewModel) {
final isYourTenders = homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
final isYourTenders =
homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
return ConstrainedBox(
constraints: BoxConstraints(maxWidth: 740),
child: Align(
@@ -190,16 +191,23 @@ class DesktopHomePage extends StatelessWidget {
Widget _bottomListView(HomeViewModel homeViewModel) {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
if (!homeViewModel.isRecommendedMode) {
// YourTenders
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getYourTenders();
}
}
});
} else {
// Recommended
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommendTenders();
}
}
}
return SizedBox(
width: 740,
lib/views/home/pages/m_home_page.dart
+13 -3
View File
@@ -163,7 +163,8 @@ class MobileHomePage extends StatelessWidget {
}
Widget _yourTenderText(HomeViewModel homeViewModel) {
final isYourTenders = homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
final isYourTenders =
homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Text(
@@ -183,11 +184,20 @@ class MobileHomePage extends StatelessWidget {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (!homeViewModel.isRecommendedMode) {
// YourTenders
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
homeViewModel.getYourTenders();
}
}
} else {
// Recommended
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommendTenders();
}
}
}
lib/views/home/pages/t_home_page.dart
+17 -9
View File
@@ -195,7 +195,8 @@ class TabletHomePage extends StatelessWidget {
}
Widget _yourTenderText(HomeViewModel homeViewModel) {
final isYourTenders = homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
final isYourTenders =
homeViewModel.data?.data?.tenders!.isNotEmpty ?? false;
return Text(
isYourTenders ? HomeStrings.yourTenders : HomeStrings.recommendedTenders,
style: TextStyle(
@@ -209,16 +210,23 @@ class TabletHomePage extends StatelessWidget {
Widget _bottomListView(HomeViewModel homeViewModel) {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
if (!homeViewModel.isRecommendedMode) {
// YourTenders
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getYourTenders();
}
}
});
} else {
// Recommended
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommendTenders();
}
}
}
return SizedBox(
width: double.infinity,