lib/views/appoinments/add_new_service_appointment_page.dart

@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:developer';
+import 'package:car_provider_app/main.dart';
 import 'package:car_provider_app/views/dashboard/widget/general_appointment_widget.dart';
 import 'package:car_provider_app/views/branch_management/schedule/widgets/chips_picker_item.dart';
 import 'package:flutter/cupertino.dart';
@@ -9,6 +11,8 @@ import 'package:mc_common_app/models/general_models/generic_resp_model.dart';
 import 'package:mc_common_app/view_models/service_view_model.dart';
 import 'package:car_provider_app/views/appoinments/widget/select_items_sheet.dart';
 import 'package:flutter/material.dart';
+import 'package:mc_common_app/config/dependency_injection.dart';
+import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:mc_common_app/models/appointments_models/appointment_list_model.dart';
@@ -329,6 +333,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
                             return;
                           }
                         }
+
                         try {
                           Utils.showLoading(context);
                           GenericRespModel res = await serviceVM!.addNewServiceInAppointment(postParams);

lib/views/appoinments/appointment_page.dart

@@ -116,36 +116,38 @@ class _AppointmentPageState extends State<AppointmentPage> {
                         Center(child: CircularProgressIndicator()),
                       ],
                     ),
-                  ] else ...[
-                    if (appointmentsVM.myFilteredAppointmentsForProvider.isEmpty)
-                      EmptyWidget(
-                        spacerWidget: const SizedBox(height: 25),
-                        text: LocaleKeys.noAppointmentFound.tr(),
-                      )
-                    else ...[
-                      ListView.separated(
-                        itemBuilder: (context, index) {
-                          return GeneralAppointmentWidget(
-                            isNeedToShowItems: true,
-                            appointmentListModel: appointmentsVM.myFilteredAppointmentsForProvider[index],
-                            isNeedTotalPayment: false,
-                            onTap: () {
-                              appointmentsVM.selectedAppointmentIndex = index;
-                              navigateWithName(
-                                context,
-                                AppRoutes.appointmentDetailList,
+                  ] else
+                    ...[
+                      if (appointmentsVM.myFilteredAppointmentsForProvider.isEmpty)
+                        EmptyWidget(
+                          spacerWidget: const SizedBox(height: 25),
+                          text: LocaleKeys.noAppointmentFound.tr(),
+                        )
+                      else
+                        ...[
+                          ListView.separated(
+                            itemBuilder: (context, index) {
+                              return GeneralAppointmentWidget(
+                                isNeedToShowItems: true,
+                                appointmentListModel: appointmentsVM.myFilteredAppointmentsForProvider[index],
+                                isNeedTotalPayment: false,
+                                onTap: () {
+                                  appointmentsVM.selectedAppointmentIndex = index;
+                                  navigateWithName(
+                                    context,
+                                    AppRoutes.appointmentDetailList,
+                                  );
+                                },
                               );
                             },
-                          );
-                        },
-                        separatorBuilder: (context, snapchat) => 21.height,
-                        itemCount: appointmentsVM.myFilteredAppointmentsForProvider.length,
-                        physics: const NeverScrollableScrollPhysics(),
-                        shrinkWrap: true,
-                        padding: const EdgeInsets.all(21),
-                      ),
+                            separatorBuilder: (context, snapchat) => 21.height,
+                            itemCount: appointmentsVM.myFilteredAppointmentsForProvider.length,
+                            physics: const NeverScrollableScrollPhysics(),
+                            shrinkWrap: true,
+                            padding: const EdgeInsets.all(21),
+                          ),
+                        ],
                     ],
-                  ],
                 ],
               ),
             ),
@@ -169,9 +171,9 @@ class _AppointmentPageState extends State<AppointmentPage> {
           children: [
             Expanded(
               child: LocaleKeys.slotsOverview.tr().toText(
-                    fontSize: 16,
-                    fontWeight: FontWeight.bold,
-                  ),
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+              ),
             ),
             Row(
               children: [
@@ -193,7 +195,7 @@ class _AppointmentPageState extends State<AppointmentPage> {
               ),
             )
                 .onPress(
-              () async {
+                  () async {
                 String date = await Utils.pickDateFromDatePicker(context, firstDate: DateTime(2023));
                 appointmentsVM.selectedDateForAppointments = date;
                 await appointmentsVM.getAppointmentSlotsInfo(branchID: widget.branch.id!);
@@ -221,10 +223,10 @@ class _AppointmentPageState extends State<AppointmentPage> {
                       color: Colors.white,
                     ),
                     (appointmentsVM.appointmentSlots?.emptySlots ?? 0).toString().toText(
-                          fontSize: 9,
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
+                      fontSize: 9,
+                      fontWeight: FontWeight.bold,
+                      color: Colors.white,
+                    ),
                   ],
                 ).toContainer(
                   backgroundColor: MyColors.darkIconColor,
@@ -243,10 +245,10 @@ class _AppointmentPageState extends State<AppointmentPage> {
                       color: Colors.white,
                     ),
                     (appointmentsVM.appointmentSlots?.occupiedSlots ?? 0).toString().toText(
-                          fontSize: 9,
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
+                      fontSize: 9,
+                      fontWeight: FontWeight.bold,
+                      color: Colors.white,
+                    ),
                   ],
                 ).toContainer(
                   backgroundColor: MyColors.darkIconColor,
@@ -262,13 +264,13 @@ class _AppointmentPageState extends State<AppointmentPage> {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   LocaleKeys.totalSlots.tr().toText(
-                        fontSize: 13,
-                        fontWeight: FontWeight.bold,
-                      ),
+                    fontSize: 13,
+                    fontWeight: FontWeight.bold,
+                  ),
                   (appointmentsVM.appointmentSlots?.totalSlots ?? 0).toString().toText(
-                        fontSize: 24,
-                        fontWeight: FontWeight.bold,
-                      ),
+                    fontSize: 24,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ],
               ),
               backgroundColor: MyColors.lightGreyEAColor,

lib/views/branch_management/services/create_services_page3.dart

@@ -47,6 +47,7 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
   int? serviceId = -1;
   DropValue? category;
   DropValue? service;
+
   bool isEditDisabled = false;
   bool isServiceActive = false;
 

lib/views/dashboard/widget/general_appointment_widget.dart

@@ -54,7 +54,7 @@ class GeneralAppointmentWidget extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
             showServices(
-              "${appointmentListModel.appointmentServicesList!.first.providerServiceName} ${appointmentListModel.appointmentServicesList!.first.serviceId != 0 ? '- ${appointmentListModel.appointmentServicesList!.first.serviceId}' : ""}",
+              "${appointmentListModel.appointmentServicesList!.first.providerServiceDescription} - ${appointmentListModel.appointmentServicesList!.first.serviceId}",
               MyAssets.modificationsIcon,
             ),
             if (isNeedToShowItems) ...itemsList,
@@ -77,9 +77,7 @@ class GeneralAppointmentWidget extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             showServices(
-              "${appointmentListModel.appointmentServicesList![index].providerServiceName} ${appointmentListModel.appointmentServicesList![index].serviceId != 0 ? '- ${appointmentListModel.appointmentServicesList![index].serviceId}' : ""}",
-              MyAssets.modificationsIcon,
-            ),
+                "${appointmentListModel.appointmentServicesList![index].providerServiceDescription} - ${appointmentListModel.appointmentServicesList![index].serviceId}", MyAssets.modificationsIcon),
             if (isNeedToShowItems) ...itemsList,
           ],
         ).paddingOnly(bottom: 6);

lib/views/dashboard/widget/my_service_provider.dart

@@ -28,9 +28,9 @@ class ServiceProviderWidget extends StatelessWidget {
             return const Center(child: CircularProgressIndicator());
           } else {
             return serviceVM.branches == null || serviceVM.branches!.data == null
-                ? Center(child: LocaleKeys.noBranchFound.tr().toText(fontSize: 16, color: MyColors.lightTextColor))
+                ? Center(child: LocaleKeys.noBranchFound.tr().toText(fontSize: 16, color: MyColors.lightTextColor, fontWeight: MyFonts.Medium))
                 : serviceVM.homePageBranches.isEmpty
-                    ? Center(child: LocaleKeys.no_branch.tr().toText(fontSize: 16, color: MyColors.lightTextColor))
+                    ? Center(child: LocaleKeys.no_branch.tr().toText(fontSize: 16, color: MyColors.lightTextColor, fontWeight: MyFonts.Medium))
                     : ListView.builder(
                         itemCount: serviceVM.homePageBranches.length,
                         scrollDirection: Axis.horizontal,