Merge remote-tracking branch 'origin/master' into people

# Conflicts:
#	pubspec.lock
#	pubspec.yaml

lib/authentication/model/user.dart

@@ -11,6 +11,7 @@ class User {
   String year;
   String series;
   String group;
+  String subgroup;
 
   int permissionLevel;
 
@@ -23,6 +24,7 @@ class User {
       this.year,
       this.series,
       this.group,
+      this.subgroup,
       int permissionLevel})
       : this.permissionLevel = permissionLevel ?? 0;
 

lib/authentication/service/auth_provider.dart

@@ -29,12 +29,14 @@ extension DatabaseUser on User {
     String year;
     String series;
     String group;
+    String subgroup;
     if (snap.data.containsKey('class')) {
       degree = snap.data['class']['degree'];
       domain = snap.data['class']['domain'];
       year = snap.data['class']['year'];
       series = snap.data['class']['series'];
       group = snap.data['class']['group'];
+      subgroup = snap.data['class']['subgroup'];
     }
 
     return User(
@@ -46,6 +48,7 @@ extension DatabaseUser on User {
         year: year,
         series: series,
         group: group,
+        subgroup: subgroup,
         permissionLevel: snap.data['permissionLevel']);
   }
 
@@ -56,6 +59,7 @@ extension DatabaseUser on User {
     if (year != null) classInfo['year'] = year;
     if (series != null) classInfo['series'] = series;
     if (group != null) classInfo['group'] = group;
+    if (subgroup != null) classInfo['subgroup'] = subgroup;
 
     return {
       'name': {'first': firstName, 'last': lastName},
@@ -342,6 +346,8 @@ class AuthProvider with ChangeNotifier {
           filter.localizedLevelNames[3][LocaleProvider.localeString]);
       String group = info.getIfPresent(
           filter.localizedLevelNames[4][LocaleProvider.localeString]);
+      String subgroup = info.getIfPresent(
+          filter.localizedLevelNames[5][LocaleProvider.localeString]);
 
       if (email == null || email == '') {
         AppToast.show(S.of(context).errorInvalidEmail);
@@ -362,7 +368,8 @@ class AuthProvider with ChangeNotifier {
         AppToast.show(S.of(context).errorMissingLastName);
         return false;
       }
-      if (!await AppValidator.isStrongPassword(password: password, context: context)) {
+      if (!await AppValidator.isStrongPassword(
+          password: password, context: context)) {
         return false;
       }
 
@@ -388,7 +395,8 @@ class AuthProvider with ChangeNotifier {
           domain: domain,
           year: year,
           series: series,
-          group: group);
+          group: group,
+          subgroup: subgroup);
 
       DocumentReference ref =
           Firestore.instance.collection('users').document(user.uid);