Yimaru/Yimaru-Mobile
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Apply UAT fixes

Browse Source
This commit is contained in:
BisratHailu 2026-05-07 16:57:19 +03:00
parent 343626242e
commit 0f1b2fbfc2
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ui/views/profile_detail/profile_detail_view.dart
View File

@ -40,7 +40,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
'last_name': lastNameController.text,
'country': viewModel.selectedCountry,
'first_name': firstNameController.text,
'occupation': occupationController.text,
'occupation': viewModel.selectedOccupation,
'birth_day': DateFormat('yyyy-MM-dd').format(DateTime.now()),
};
@ -67,7 +67,8 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
);
void _checkRegion(ProfileDetailViewModel viewModel){
if(viewModel.checkRegion(viewModel.user?.region ?? '')){
bool region = viewModel.checkRegion(region:viewModel.user?.region ?? 'Addis Ababa',country:viewModel.user?.country ?? 'Ethiopia' );
if(region){
viewModel.setSelectedRegion(viewModel.user?.region ?? 'Addis Ababa');
}else{
regionController.text = viewModel.user?.region ?? '';
@ -78,13 +79,12 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
void _onModelReady(ProfileDetailViewModel viewModel) {
phoneNumberController.text = '251900000000';
emailController.text = viewModel.user?.email ?? '';
lastNameController.text = viewModel.user?.lastName ?? '';
firstNameController.text = viewModel.user?.firstName ?? '';
occupationController.text = viewModel.user?.occupation ?? '';
_checkRegion(viewModel);
viewModel.clearUserData();
viewModel.setGender(viewModel.user?.gender ?? '');
viewModel.setSelectedGender(viewModel.user?.gender ?? '');
viewModel.setSelectedOccupation(viewModel.user?.occupation ?? '');
viewModel.setSelectedCountry(viewModel.user?.country ?? 'Ethiopia');
}
@ -370,7 +370,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
Widget _buildMaleRadioButton(ProfileDetailViewModel viewModel) =>
RadioGroup<String?>(
groupValue: viewModel.selectedGender,
onChanged: (value) => viewModel.setGender(value ?? ''),
onChanged: (value) => viewModel.setSelectedGender(value ?? ''),
child: _buildMaleRadioTileWrapper(viewModel));
Widget _buildMaleRadioTileWrapper(ProfileDetailViewModel viewModel) =>
@ -399,7 +399,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
Widget _buildFemaleRadioButton(ProfileDetailViewModel viewModel) =>
RadioGroup<String?>(
groupValue: viewModel.selectedGender,
onChanged: (value) => viewModel.setGender(value ?? ''),
onChanged: (value) => viewModel.setSelectedGender(value ?? ''),
child: _buildFemaleRadioTileWrapper(viewModel));
Widget _buildFemaleRadioTileWrapper(ProfileDetailViewModel viewModel) =>

9
lib/ui/views/profile_detail/profile_detail_viewmodel.dart
View File

@ -100,7 +100,7 @@ class ProfileDetailViewModel extends ReactiveViewModel
}
// Gender
void setGender(String value) {
void setSelectedGender(String value) {
_selectedGender = value;
rebuildUi();
}
@ -321,8 +321,11 @@ class ProfileDetailViewModel extends ReactiveViewModel
'Tigray',
];
bool checkRegion(String value){
return getRegions().contains(value);
bool checkRegion({required String region,required String country}){
if(country == 'Ethiopia'){
return getRegions().contains(region);
}
return false;
}
void setSelectedRegion(String value) {