Back Button on Landing Page 1

merge-requests/439/merge
Mirza.Shafique 3 years ago
parent d48a4ff4e3
commit 9c7e8e3637

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

@ -610,21 +610,28 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
changeCurrentTab(1); changeCurrentTab(1);
}, },
), ),
MedicalProfilePageNew(onTap: (){ MedicalProfilePageNew(
changeCurrentTab(0); onTap: () {
},), changeCurrentTab(0);
Search(onBackClick: (){ },
changeCurrentTab(0); ),
},), Search(
onBackClick: () {
changeCurrentTab(0);
},
),
MyFamily( MyFamily(
isAppbarVisible: false, isAppbarVisible: false,
onBackClick: () { onBackClick: () {
changeCurrentTab(0); changeCurrentTab(0);
}, },
), ),
ToDo(isShowAppBar: true,onBackClick: (){ ToDo(
changeCurrentTab(0); isShowAppBar: true,
},), onBackClick: () {
changeCurrentTab(0);
},
),
], // Please do not remove the BookingOptions from this array ], // Please do not remove the BookingOptions from this array
), ),
RobotIcon() RobotIcon()

@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart'; import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import 'package:diplomaticquarterapp/widgets/charts/show_chart.dart'; import 'package:diplomaticquarterapp/widgets/charts/show_chart.dart';
import 'package:diplomaticquarterapp/widgets/charts/sync_fu_chart.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -53,12 +54,13 @@ class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
shape: cardRadius(12), shape: cardRadius(12),
elevation: 1, elevation: 1,
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8), margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: ShowChart( // child: ShowChart(
title: widget.name, // title: widget.name,
timeSeries: timeSeriesData, // timeSeries: timeSeriesData,
indexes: timeSeriesData.length ~/ 5.5, // indexes: timeSeriesData.length ~/ 5.5,
horizontalInterval: 8, // horizontalInterval: 8,
), // ),
child: SyncFuChart(),
), ),
Card( Card(
shape: cardRadius(12), shape: cardRadius(12),

@ -0,0 +1,69 @@
import 'package:flutter/material.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
import 'package:syncfusion_flutter_charts/sparkcharts.dart';
class SyncFuChart extends StatelessWidget {
List<_SalesData> data = [
_SalesData('Jan', 35),
_SalesData('Feb', 28),
_SalesData('Mar', 34),
_SalesData('Apr', 32),
_SalesData('May', 40),
];
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Syncfusion Flutter chart'),
),
body: Column(
children: [
//Initialize the chart widget
SfCartesianChart(
primaryXAxis: CategoryAxis(),
// Chart title
title: ChartTitle(text: 'Half yearly sales analysis'),
// Enable legend
legend: Legend(isVisible: true),
// Enable tooltip
tooltipBehavior: TooltipBehavior(enable: true),
series: <ChartSeries<_SalesData, String>>[
LineSeries<_SalesData, String>(
dataSource: data,
xValueMapper: (_SalesData sales, _) => sales.year,
yValueMapper: (_SalesData sales, _) => sales.sales,
name: 'Sales',
// Enable data label
dataLabelSettings: DataLabelSettings(isVisible: true))
]),
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
//Initialize the spark charts widget
child: SfSparkLineChart.custom(
//Enable the trackball
trackball: SparkChartTrackball(activationMode: SparkChartActivationMode.tap),
//Enable marker
marker: SparkChartMarker(displayMode: SparkChartMarkerDisplayMode.all),
//Enable data label
labelDisplayMode: SparkChartLabelDisplayMode.all,
xValueMapper: (int index) => data[index].year,
yValueMapper: (int index) => data[index].sales,
dataCount: 5,
),
),
)
],
),
);
}
}
class _SalesData {
_SalesData(this.year, this.sales);
final String year;
final double sales;
}

@ -104,6 +104,7 @@ dependencies:
# Calendar # Calendar
# table_calendar: ^2.3.0 # table_calendar: ^2.3.0
syncfusion_flutter_calendar: ^18.4.49 syncfusion_flutter_calendar: ^18.4.49
syncfusion_flutter_charts: any
# SVG Images # SVG Images
flutter_svg: ^0.18.0 flutter_svg: ^0.18.0

Loading…
Cancel
Save