From 47ccf68b3ade64a39fa2acc078051bebc5ddfa11 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 8 Nov 2023 13:56:08 +0300 Subject: [PATCH] updates --- lib/config/config.dart | 4 ++-- lib/uitl/utils.dart | 3 ++- lib/widgets/charts/show_chart.dart | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index cf605410..0990ec82 100644 --- a/lib/config/config.dart +++ b/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/'; diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index c7f57f9d..1f45290c 100644 --- a/lib/uitl/utils.dart +++ b/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, diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart index 4d69cd84..c9872092 100644 --- a/lib/widgets/charts/show_chart.dart +++ b/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 '';