From 4efa7cdfd9f6db764add4f6baddbc8fc689be788 Mon Sep 17 00:00:00 2001 From: Blackchai Date: Thu, 23 Apr 2020 09:27:25 -0600 Subject: [PATCH] [Parent][RC 3.2] Hotfix changes (#755) --- apps/flutter_parent/lib/models/grading_period.dart | 2 +- apps/flutter_parent/lib/models/grading_period.g.dart | 12 ++++++------ .../dashboard/student_horizontal_list_view.dart | 2 +- apps/flutter_parent/pubspec.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/flutter_parent/lib/models/grading_period.dart b/apps/flutter_parent/lib/models/grading_period.dart index a359835384..164eac575e 100644 --- a/apps/flutter_parent/lib/models/grading_period.dart +++ b/apps/flutter_parent/lib/models/grading_period.dart @@ -41,5 +41,5 @@ abstract class GradingPeriod implements Built { result.add(null); } else { result.add(serializers.serialize(object.weight, - specifiedType: const FullType(int))); + specifiedType: const FullType(double))); } return result; } @@ -88,7 +88,7 @@ class _$GradingPeriodSerializer implements StructuredSerializer { break; case 'weight': result.weight = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; + specifiedType: const FullType(double)) as double; break; } } @@ -107,7 +107,7 @@ class _$GradingPeriod extends GradingPeriod { @override final DateTime endDate; @override - final int weight; + final double weight; factory _$GradingPeriod([void Function(GradingPeriodBuilder) updates]) => (new GradingPeriodBuilder()..update(updates)).build(); @@ -174,9 +174,9 @@ class GradingPeriodBuilder DateTime get endDate => _$this._endDate; set endDate(DateTime endDate) => _$this._endDate = endDate; - int _weight; - int get weight => _$this._weight; - set weight(int weight) => _$this._weight = weight; + double _weight; + double get weight => _$this._weight; + set weight(double weight) => _$this._weight = weight; GradingPeriodBuilder(); diff --git a/apps/flutter_parent/lib/screens/dashboard/student_horizontal_list_view.dart b/apps/flutter_parent/lib/screens/dashboard/student_horizontal_list_view.dart index 3134c6f904..ea2de6388e 100644 --- a/apps/flutter_parent/lib/screens/dashboard/student_horizontal_list_view.dart +++ b/apps/flutter_parent/lib/screens/dashboard/student_horizontal_list_view.dart @@ -120,7 +120,7 @@ class StudentHorizontalListViewState extends State { onPressed: () async { locator().logEvent(AnalyticsEventConstants.ADD_STUDENT_DASHBOARD); bool studentPaired = await _addStudentDialog(context); - if (studentPaired) { + if (studentPaired == true) { widget.onAddStudent(); } }, diff --git a/apps/flutter_parent/pubspec.yaml b/apps/flutter_parent/pubspec.yaml index 0e7b2c6933..061fb607d5 100644 --- a/apps/flutter_parent/pubspec.yaml +++ b/apps/flutter_parent/pubspec.yaml @@ -25,7 +25,7 @@ description: Canvas Parent # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.2.0+30 +version: 3.2.0+31 module: androidX: true