From d9a2dd4fcba52084286ad51cdedb3437ba17c447 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Wed, 22 Apr 2026 11:39:00 +0300 Subject: [PATCH] fixing jira bugs --- lib/view_models/schedule_view_model.dart | 14 ++--- .../add_new_service_appointment_page.dart | 51 ++++++++++++++----- .../schedule/widgets/select_days_sheet.dart | 2 +- 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/lib/view_models/schedule_view_model.dart b/lib/view_models/schedule_view_model.dart index d91b445..b0cb14e 100644 --- a/lib/view_models/schedule_view_model.dart +++ b/lib/view_models/schedule_view_model.dart @@ -8,13 +8,13 @@ import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/view_models/base_view_model.dart'; List initDaysList = [ - PickerItem(id: 1, title: "Monday", isSelected: false), - PickerItem(id: 2, title: "Tuesday", isSelected: false), - PickerItem(id: 3, title: "Wednesday", isSelected: false), - PickerItem(id: 4, title: "Thursday", isSelected: false), - PickerItem(id: 5, title: "Friday", isSelected: false), - PickerItem(id: 6, title: "Saturday", isSelected: false), - PickerItem(id: 7, title: "Sunday", isSelected: false), + PickerItem(id: 1, title: "Sunday", isSelected: false), + PickerItem(id: 2, title: "Monday", isSelected: false), + PickerItem(id: 3, title: "Tuesday", isSelected: false), + PickerItem(id: 4, title: "Wednesday", isSelected: false), + PickerItem(id: 5, title: "Thursday", isSelected: false), + PickerItem(id: 6, title: "Friday", isSelected: false), + PickerItem(id: 7, title: "Saturday", isSelected: false), ]; class ScheduleVM extends BaseVM { diff --git a/lib/views/appoinments/add_new_service_appointment_page.dart b/lib/views/appoinments/add_new_service_appointment_page.dart index e6bb02a..ae092cc 100644 --- a/lib/views/appoinments/add_new_service_appointment_page.dart +++ b/lib/views/appoinments/add_new_service_appointment_page.dart @@ -49,6 +49,14 @@ class _AddNewServiceAppointmentPageState extends State? pickedItems; ServiceVM? serviceVM; + // Currency dropdown + DropValue? selectedCurrency; + List currencies = [ + DropValue(1, 'SAR', 'SAR'), + DropValue(2, 'AED', 'AED'), + DropValue(3, 'USD', 'USD'), + ]; + @override void initState() { // TODO: implement initState @@ -142,19 +150,34 @@ class _AddNewServiceAppointmentPageState extends State serviceVm.updateCustomServiceTitle(v), ), 8.height, - TxtField( - postfixWidget: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - LocaleKeys.sar.tr().toText(fontWeight: MyFonts.Medium, fontSize: 15, color: borderColor, textAlign: TextAlign.center), - ], - ), - value: serviceVm.customServicePrice, - errorValue: serviceVm.customServicePriceError, - keyboardType: TextInputType.number, - numbersOnly: true, - hint: LocaleKeys.price.tr(), - onChanged: (v) => serviceVm.updateCustomServicePrice(v), + Row( + children: [ + Expanded( + flex: 2, + child: TxtField( + value: serviceVm.customServicePrice, + errorValue: serviceVm.customServicePriceError, + keyboardType: TextInputType.number, + numbersOnly: true, + hint: LocaleKeys.price.tr(), + onChanged: (v) => serviceVm.updateCustomServicePrice(v), + ), + ), + 8.width, + Expanded( + flex: 1, + child: DropdownField( + (DropValue value) { + setState(() { + selectedCurrency = value; + }); + }, + dropdownValue: selectedCurrency, + list: currencies, + hint: 'Currency', + ), + ), + ], ), 8.height, TxtField( @@ -166,7 +189,7 @@ class _AddNewServiceAppointmentPageState extends State) onSelected; - const SelectDaysSheet({Key? key, required this.onSelected}) : super(key: key); + const SelectDaysSheet({super.key, required this.onSelected}); @override State createState() => _SelectDaysSheetState();