BUG FIXES

lib/config/config.dart

@@ -13,8 +13,8 @@ const PACKAGES_CUSTOMER = '/api/customers';
 const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
 const PACKAGES_ORDERS = '/api/orders';
 
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
+//const BASE_URL = 'https://hmgwebservices.com/';
 
 // Pharmacy UAT URLs
 const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart

@@ -64,6 +64,7 @@ class _BloodCholesterolState extends State<BloodCholesterol> {
     return AppScaffold(
       isShowAppBar: true,
       appBarTitle: TranslationBase.of(context).bloodCholesterol,
+      isShowDecPage: false,
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: SingleChildScrollView(

lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart

@@ -66,6 +66,7 @@ class _TriglyceridesState extends State<Triglycerides> {
     return AppScaffold(
       isShowAppBar: true,
       appBarTitle: TranslationBase.of(context).triglycerides,
+      isShowDecPage: false,
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: SingleChildScrollView(

lib/pages/AlHabibMedicalService/my_web_view.dart

@@ -8,7 +8,8 @@ class MyWebView extends StatelessWidget {
   final String title;
   final String selectedUrl;
 
-  final Completer<WebViewController> _controller = Completer<WebViewController>();
+  final Completer<WebViewController> _controller =
+      Completer<WebViewController>();
 
   MyWebView({
     @required this.title,
@@ -20,6 +21,7 @@ class MyWebView extends StatelessWidget {
     return AppScaffold(
         isShowAppBar: true,
         appBarTitle: title,
+        isShowDecPage: false,
         body: WebView(
           initialUrl: selectedUrl,
           javascriptMode: JavascriptMode.unrestricted,

lib/pages/BookAppointment/components/DocAvailableAppointments.dart

@@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:table_calendar/table_calendar.dart';
-import "package:collection/collection.dart";
+
 import '../../../uitl/date_uitl.dart';
 
 class DocAvailableAppointments extends StatefulWidget {
@@ -22,7 +22,6 @@ class DocAvailableAppointments extends StatefulWidget {
   static String selectedTime;
   bool isLiveCareAppointment;
   final dynamic doctorSchedule;
-
   DocAvailableAppointments(
       {@required this.doctor,
       this.doctorSchedule,
@@ -53,7 +52,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
   dynamic freeSlotsResponse;
 
   ScrollController _scrollController;
-  Map freeSlotMap;
+
   var language;
 
   @override
@@ -108,24 +107,6 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
   void _onVisibleDaysChanged(
       DateTime first, DateTime last, CalendarFormat format) {
     print('CALLBACK: _onVisibleDaysChanged');
-    GifLoaderDialogUtils.showMyDialog(context);
-    freeSlotsResponse = freeSlotMap[first.month];
-    _getJSONSlots().then((value) {
-      setState(() => {
-            _events.clear(),
-            _events = value,
-            // if (widget.doctorSchedule != null)
-            //   {
-            //     _calendarController.setSelectedDay(
-            //         DateUtil.convertStringToDate(widget.doctorSchedule['Date']),
-            //         isProgrammatic: true),
-            //     // _onDaySelected(
-            //     //     DateUtil.convertStringToDate(widget.doctorSchedule['Date']),
-            //     //     List())
-            //   }
-          });
-      GifLoaderDialogUtils.hideDialog(context);
-    });
   }
 
   void _onCalendarCreated(
@@ -275,11 +256,9 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
     DateTime dateStartObj = new DateTime(
         dateStart.year, dateStart.month, dateStart.day, 0, 0, 0, 0, 0);
 
-    //freeSlots.forEach((v) {
-    for (var x = 0; x < freeSlots.length; x++) {
-      if (freeSlots[x].start == dateStartObj) dayEvents.add(freeSlots[x]);
-    }
-    //});
+    freeSlots.forEach((v) {
+      if (v.start == dateStartObj) dayEvents.add(v);
+    });
 
     setState(() {
       if (dayEvents.length != 0)
@@ -302,7 +281,6 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
     DateTime date;
     final DateFormat formatter = DateFormat('HH:mm');
     final DateFormat dateFormatter = DateFormat('yyyy-MM-dd');
-    docFreeSlots = [];
     for (var i = 0; i < freeSlotsResponse.length; i++) {
       date = DateUtil.convertStringToDate(freeSlotsResponse[i]);
       slotsList.add(FreeSlot(date, ['slot']));
@@ -370,8 +348,10 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
       if (res['MessageStatus'] == 1) {
         if (res['FreeTimeSlots'].length != 0) {
           DocAvailableAppointments.areAppointmentsAvailable = true;
+          freeSlotsResponse = res['FreeTimeSlots'];
+          print("res['FreeTimeSlots']");
+          print(res['FreeTimeSlots'].length);
 
-          filterByMonths(res['FreeTimeSlots']);
           _getJSONSlots().then((value) {
             setState(() => {
                   _events.clear(),
@@ -463,11 +443,4 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
       ),
     );
   }
-
-  filterByMonths(freeSlots) {
-    freeSlotMap =
-        groupBy(freeSlots, (obj) => DateUtil.convertStringToDate(obj).month);
-
-    freeSlotsResponse = freeSlotMap[DateTime.now().month];
-  }
 }

lib/pages/settings/InfoPage.dart

@@ -0,0 +1,14 @@
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+
+class AboutApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+        isShowAppBar: true,
+        appBarTitle: TranslationBase.of(context).aboutApp,
+        isShowDecPage: false,
+        body: Container());
+  }
+}

lib/pages/settings/settings.dart

@@ -33,6 +33,14 @@ class _Settings extends State<Settings> with TickerProviderStateMixin {
     AppGlobal.context = context;
     return Scaffold(
       appBar: AppBar(
+        actions: [
+          IconButton(
+            icon: Icon(Icons.info, color: Colors.white),
+            onPressed: () {
+              //openInfoPage()
+            },
+          )
+        ],
         bottom: TabBar(
           // isScrollable: true,
 
@@ -51,8 +59,7 @@ class _Settings extends State<Settings> with TickerProviderStateMixin {
           controller: _tabController,
         ),
         title: Text(TranslationBase.of(context).settings,
-            style:
-                TextStyle(color: Theme.of(context).textTheme.bodyText2.color)),
+            style: TextStyle(color: Colors.white)),
         leading: Builder(
           builder: (BuildContext context) {
             return ArrowBack();