updates

lib/config/config.dart

@@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders';
 var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
  // var  BASE_URL = 'http://10.50.100.198:2018/';
- // var  BASE_URL = 'https://uat.hmgwebservices.com/';
-var BASE_URL = 'https://hmgwebservices.com/';
+ var  BASE_URL = 'https://uat.hmgwebservices.com/';
+// var BASE_URL = 'https://hmgwebservices.com/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';

lib/uitl/utils.dart

@@ -788,13 +788,14 @@ class Utils {
           overflow: TextOverflow.ellipsis,
           style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
         ),
-        SizedBox(height: 12),
+        SizedBox(height: 8),
         AutoSizeText(
           flowChartText,
           maxLines: 1,
           minFontSize: 6,
           style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
         ),
+        SizedBox(height: 12),
         if (!isLast)
           Divider(
             height: 1,

lib/widgets/charts/show_chart.dart

@@ -114,21 +114,21 @@ class ShowChart extends StatelessWidget {
             fontSize: 10,
           ),
           rotateAngle: -65,
-          margin: 22,
+          margin: 8,
           getTitles: (value) {
             if (isWeeklyOrMonthly) {
               return '${timeSeries[value.toInt()].time.day}/ ${timeSeries[value.toInt()].time.month}';
             } else {
               if (timeSeries.length < 15) {
                 if (timeSeries.length > value.toInt()) {
-                  return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
+                  return '${timeSeries[value.toInt()].time.day}/${timeSeries[value.toInt()].time.month}/${timeSeries[value.toInt()].time.year.toString().substring(2,4)}';
                 } else
                   return '';
               } else {
-                if (value.toInt() == 0) return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
-                if (value.toInt() == timeSeries.length - 1) return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
+                if (value.toInt() == 0) return '${timeSeries[value.toInt()].time.day}/${timeSeries[value.toInt()].time.month}/${timeSeries[value.toInt()].time.year.toString().substring(2,4)}';
+                if (value.toInt() == timeSeries.length - 1) return '${timeSeries[value.toInt()].time.day}/${timeSeries[value.toInt()].time.month}/${timeSeries[value.toInt()].time.year.toString().substring(2,4)}';
                 if (xAxixs.contains(value.toInt())) {
-                  return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
+                  return '${timeSeries[value.toInt()].time.day}/${timeSeries[value.toInt()].time.month}/${timeSeries[value.toInt()].time.year.toString().substring(2,4)}';
                 }
               }
               return '';