Skip to content

Commit f762f22

Browse files
committed
fix(mobile): flowmotion_api sdk serializer dropping timezone info
1 parent d6f5069 commit f762f22

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

lib/screens/congestionRating.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flowmotion/models/rating_point.dart';
2+
import 'package:flowmotion/utilities/flowmotion_api_sgt.dart';
23
import 'package:flowmotion/widgets/congestionPointView.dart';
34
import 'package:flowmotion_api/flowmotion_api.dart';
45
import 'package:flutter/material.dart';
@@ -11,7 +12,6 @@ import '../utilities/firebase_calls.dart';
1112
import '../widgets/navigationBar.dart';
1213

1314
final FirebaseCalls firebaseCalls = FirebaseCalls();
14-
final api = FlowmotionApi().getCongestionApi();
1515

1616
class CongestionRatingScreen extends StatefulWidget {
1717
final String savedPlaceLabel;
@@ -74,7 +74,7 @@ class _CongestionRatingScreenState extends State<CongestionRatingScreen> {
7474
}
7575

7676
Future<void> fetchGraphRatings(String cameraId, String groupby, DateTime begin, DateTime end) async {
77-
final api = FlowmotionApi().getCongestionApi();
77+
final api = FlowmotionApi().getCongestionApiSgt();
7878
print("Fetching for camera ID: $cameraId");
7979
print("End time: $end");
8080
print("Start time: $begin");
@@ -112,7 +112,7 @@ class _CongestionRatingScreenState extends State<CongestionRatingScreen> {
112112
}
113113

114114
Future<void> fetchAllRatings() async {
115-
final api = FlowmotionApi().getCongestionApi();
115+
final api = FlowmotionApi().getCongestionApiSgt();
116116
try {
117117
final response = await api.congestionsGet();
118118
print(response.data!.length);

lib/screens/fullMapScreen.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import 'dart:async'; // Import Timer
22
import 'package:flowmotion/core/widget_keys.dart';
3+
import 'package:flowmotion/screens/congestionRating.dart';
4+
import 'package:flowmotion/utilities/flowmotion_api_sgt.dart';
35
import 'package:flutter/material.dart';
46
import 'package:flutter_map/flutter_map.dart';
57
import 'package:geolocator/geolocator.dart';
@@ -51,7 +53,7 @@ class _FullMapScreenState extends State<FullMapScreen> {
5153
}
5254

5355
Future<void> _fetchCongestionRatings() async {
54-
final api = FlowmotionApi().getCongestionApi();
56+
final api = FlowmotionApi().getCongestionApiSgt();
5557
try {
5658
final response = await api.congestionsGet();
5759

lib/screens/homeScreen.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
22
import 'package:firebase_auth/firebase_auth.dart';
33
import 'package:firebase_core/firebase_core.dart';
44
import 'package:flowmotion/screens/fullMapScreen.dart';
5+
import 'package:flowmotion/utilities/flowmotion_api_sgt.dart';
56
import 'package:flowmotion_api/flowmotion_api.dart';
67
import 'package:flutter/material.dart';
78
import 'package:geolocator/geolocator.dart';
@@ -279,7 +280,7 @@ class _HomeScreenState extends State<HomeScreen> {
279280
_isFetchingData = true; // Start fetching data
280281
});
281282

282-
final api = FlowmotionApi().getCongestionApi();
283+
final api = FlowmotionApi().getCongestionApiSgt();
283284
try {
284285
final response = await api.congestionsGet();
285286

@@ -676,4 +677,4 @@ class _HomeScreenState extends State<HomeScreen> {
676677
),
677678
);
678679
}
679-
}
680+
}

lib/widgets/congestionPointView.dart

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flowmotion_api/flowmotion_api.dart';
55
import 'package:intl/intl.dart';
66

77
import 'package:flutter/material.dart';
8+
import '../utilities/flowmotion_api_sgt.dart';
89

910
/// Visualize Congestion Point identified by the given cameraId
1011
class CongestionPointView extends StatelessWidget {
@@ -13,7 +14,7 @@ class CongestionPointView extends StatelessWidget {
1314

1415
Future<List<RatingPoint>> fetchGraphRatings(
1516
String cameraId, String groupby, DateTime begin, DateTime end) async {
16-
final api = FlowmotionApi().getCongestionApi();
17+
final api = FlowmotionApi().getCongestionApiSgt();
1718
print("Fetching for camera ID: $cameraId");
1819
print("End time: $end");
1920
print("Start time: $begin");
@@ -178,19 +179,14 @@ class CongestionPointView extends StatelessWidget {
178179

179180
@override
180181
Widget build(BuildContext context) {
181-
DateTime formatToSingaporeTime(DateTime date) {
182-
return date.toUtc().add(Duration(hours: 8));
183-
}
184-
185182
return Container(
186183
child: Column(children: [
187184
FutureBuilder<List<RatingPoint>>(
188185
future: fetchGraphRatings(
189186
cameraId,
190187
'hour', // groupby
191-
formatToSingaporeTime(
192-
DateTime.now().subtract(Duration(hours: 10))),
193-
formatToSingaporeTime(DateTime.now())),
188+
DateTime.now().subtract(Duration(hours: 10)),
189+
DateTime.now()),
194190
builder: (context, snapshot) {
195191
if (snapshot.connectionState == ConnectionState.waiting) {
196192
return CircularProgressIndicator();
@@ -218,9 +214,8 @@ class CongestionPointView extends StatelessWidget {
218214
future: fetchGraphRatings(
219215
cameraId,
220216
'day', // groupby
221-
formatToSingaporeTime(
222-
DateTime.now().subtract(Duration(days: 5))), // start time
223-
formatToSingaporeTime(DateTime.now()) // end time
217+
DateTime.now().subtract(Duration(days: 5)), // start time
218+
DateTime.now() // end time
224219
),
225220
builder: (context, snapshot) {
226221
if (snapshot.connectionState == ConnectionState.waiting) {

0 commit comments

Comments
 (0)