12 feb,2025

lib/views/appoinments/add_new_service_appointment_page.dart

@@ -1,6 +1,4 @@
 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';
@@ -11,8 +9,6 @@ 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';
@@ -333,7 +329,6 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
                             return;
                           }
                         }
-
                         try {
                           Utils.showLoading(context);
                           GenericRespModel res = await serviceVM!.addNewServiceInAppointment(postParams);

lib/views/appoinments/appointment_page.dart

@@ -116,15 +116,13 @@ class _AppointmentPageState extends State<AppointmentPage> {
                         Center(child: CircularProgressIndicator()),
                       ],
                     ),
-                  ] else
-                    ...[
+                  ] else ...[
                     if (appointmentsVM.myFilteredAppointmentsForProvider.isEmpty)
                       EmptyWidget(
                         spacerWidget: const SizedBox(height: 25),
                         text: LocaleKeys.noAppointmentFound.tr(),
                       )
-                      else
-                        ...[
+                    else ...[
                       ListView.separated(
                         itemBuilder: (context, index) {
                           return GeneralAppointmentWidget(

lib/views/branch_management/services/create_services_page3.dart

@@ -47,7 +47,6 @@ 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.providerServiceDescription} - ${appointmentListModel.appointmentServicesList!.first.serviceId}",
+              "${appointmentListModel.appointmentServicesList!.first.providerServiceName} ${appointmentListModel.appointmentServicesList!.first.serviceId != 0 ? '- ${appointmentListModel.appointmentServicesList!.first.serviceId}' : ""}",
               MyAssets.modificationsIcon,
             ),
             if (isNeedToShowItems) ...itemsList,
@@ -77,7 +77,9 @@ class GeneralAppointmentWidget extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             showServices(
-                "${appointmentListModel.appointmentServicesList![index].providerServiceDescription} - ${appointmentListModel.appointmentServicesList![index].serviceId}", MyAssets.modificationsIcon),
+              "${appointmentListModel.appointmentServicesList![index].providerServiceName} ${appointmentListModel.appointmentServicesList![index].serviceId != 0 ? '- ${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, fontWeight: MyFonts.Medium))
+                ? Center(child: LocaleKeys.noBranchFound.tr().toText(fontSize: 16, color: MyColors.lightTextColor))
                 : serviceVM.homePageBranches.isEmpty
-                    ? Center(child: LocaleKeys.no_branch.tr().toText(fontSize: 16, color: MyColors.lightTextColor, fontWeight: MyFonts.Medium))
+                    ? Center(child: LocaleKeys.no_branch.tr().toText(fontSize: 16, color: MyColors.lightTextColor))
                     : ListView.builder(
                         itemCount: serviceVM.homePageBranches.length,
                         scrollDirection: Axis.horizontal,