Fix some bugs, add some ui improvements and improve the algorithm for finding the rising star of a team

SiekamCebule · SiekamCebule · commit c8709ee23789 · 2024-07-26T09:47:32.000+02:00
diff --git a/jumpers_female.json b/jumpers_female.json
@@ -1 +1 @@
-[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":22,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":14,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":21,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
+[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":37,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
diff --git a/jumpers_male.json b/jumpers_male.json
@@ -1 +1 @@
-[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":0,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":0,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":27,"name":"Andrzej","surname":"Stękała","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":68.0,"qualityOnLargerHills":84.0,"landingStyle":2,"jumpsConsistency":-2}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":0,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Konrad","surname":"Kubacki","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
+[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":0,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":0,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":27,"name":"Andrzej","surname":"Stękała","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":68.0,"qualityOnLargerHills":84.0,"landingStyle":2,"jumpsConsistency":-2}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":0,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Dawid","surname":"Kubacki","country":"pl","sex":0,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
diff --git a/lib/bloc/database_editing/copied_local_db_cubit.dart b/lib/bloc/database_editing/copied_local_db_cubit.dart
@@ -45,9 +45,11 @@ class CopiedLocalDbCubit extends Cubit<LocalDbRepo?> {
 
   Future<void> _saveChangesByType<T>(BuildContext context) async {
     originalDb.editableByGenericType<T>().set(state!.editableByGenericType<T>().last);
-    _saveItemsToJsonByType<T>(
+    final file = databaseFile(
+        context.read(), context.read<DbFileSystemEntityNames>().byGenericType<T>());
+    await _saveItemsToJsonByType<T>(
       context: context,
-      file: File(context.read<DbFileSystemEntityNames>().byGenericType<T>()),
+      file: file,
     );
   }
 
@@ -82,7 +84,7 @@ class CopiedLocalDbCubit extends Cubit<LocalDbRepo?> {
     final parameters = context.read<DbItemsJsonConfiguration<T>>();
     await saveItemsListToJsonFile(
       file: file,
-      items: state!.editableByGenericType<T>().last,
+      items: originalDb.editableByGenericType<T>().last,
       toJson: parameters.toJson,
     );
   }
@@ -96,5 +98,6 @@ class CopiedLocalDbCubit extends Cubit<LocalDbRepo?> {
 
   void dispose() {
     originalDb.dispose();
+    state?.dispose();
   }
 }
diff --git a/lib/models/db/local_db_repo.dart b/lib/models/db/local_db_repo.dart
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:sj_manager/enums/db_editable_item_type.dart';
 import 'package:sj_manager/json/db_items_json.dart';
-import 'package:sj_manager/json/json_types.dart';
 
 import 'package:sj_manager/models/db/country/country.dart';
 import 'package:sj_manager/models/db/db_file_system_entity_names.dart';
diff --git a/lib/setup/set_up_app.dart b/lib/setup/set_up_app.dart
@@ -10,7 +10,6 @@ import 'package:sj_manager/models/db/db_file_system_entity_names.dart';
 import 'package:sj_manager/models/db/hill/hill.dart';
 import 'package:sj_manager/models/db/jumper/jumper.dart';
 import 'package:sj_manager/models/db/local_db_repo.dart';
-import 'package:sj_manager/models/db/team/country_team.dart';
 import 'package:sj_manager/models/db/team/team.dart';
 import 'package:sj_manager/repositories/generic/db_items_json_configuration.dart';
 import 'package:sj_manager/ui/dialogs/loading_items_failed_dialog.dart';
@@ -110,8 +109,6 @@ class AppConfigurator {
     await _tryLoadItems<FemaleJumper>(dialogTitleText: 'Błąd wczytywania skoczkiń');
     await _tryLoadItems<Hill>(dialogTitleText: 'Błąd wczytywania skoczni');
     await _tryLoadItems<Team>(dialogTitleText: 'Błąd wczytywania zespołów');
-
-    // _processCountries(); // TODO, maybe remove the function and its components
   }
 
   Future<void> _tryLoadItems<T>({required String dialogTitleText}) async {
@@ -150,47 +147,6 @@ class AppConfigurator {
     _context.read<LocalDbRepo>().countries.set(countriesWithLowerCaseCodes);
   }
 
-  void _processCountries() {
-    final repo = _context.read<LocalDbRepo>().countries;
-    final noneCountry = repo.none;
-    _filterCountriesByTeams();
-    _sortCountries();
-    repo.set([noneCountry, ...repo.last]);
-  }
-
-  void _filterCountriesByTeams() {
-    final countries = _context.read<LocalDbRepo>().countries.last;
-    final teams = _context.read<LocalDbRepo>().teams.last.cast<CountryTeam>();
-    final countriesHavingTeam = <Country>{};
-    for (var team in teams) {
-      if (!countries.contains(team.country)) {
-        throw StateError(
-            'Team has country, which is not contained in loaded countries list (team\'s country: ${team.country})');
-      }
-      countriesHavingTeam.add(team.country);
-    }
-    _context.read<LocalDbRepo>().countries.set(countriesHavingTeam.toList());
-  }
-
-  void _sortCountries() {
-    final teams = _context.read<LocalDbRepo>().teams.last.cast<CountryTeam>();
-    final countryStars = {
-      for (var team in teams) team.country: team.facts.stars,
-    };
-    final countries = countryStars.keys.toList();
-
-    countries.sort((first, second) {
-      final starsComparsion = countryStars[first]!.compareTo(countryStars[second]!);
-      if (starsComparsion == 0) {
-        return first.name.compareTo(second.name);
-      } else {
-        return starsComparsion;
-      }
-    });
-
-    _context.read<LocalDbRepo>().countries.set(countries);
-  }
-
   Future<void> _loadItems<T>() async {
     final parameters = _context.read<DbItemsJsonConfiguration<T>>();
     final loaded = await loadItemsListFromJsonFile(
diff --git a/lib/ui/database_item_editors/jumper_editor.dart b/lib/ui/database_item_editors/jumper_editor.dart
@@ -41,10 +41,6 @@ class JumperEditor extends StatefulWidget {
   final bool enableEditingName;
   final CountriesRepo countriesRepo;
 
-  /// Callback executed when some fields change.
-  ///
-  /// Returns 'null', if has some nullable fields (so jumper is unfinished)
-  /// Returns [Jumper] object, if the current jumper is ready to use
   final Function(Jumper? current) onChange;
 
   @override
diff --git a/lib/ui/screens/main_screen/large/simulation_wizard/simulation_wizard_dialog.dart b/lib/ui/screens/main_screen/large/simulation_wizard/simulation_wizard_dialog.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -27,7 +26,8 @@ import 'package:sj_manager/ui/screens/main_screen/large/widgets/generic/main_men
 import 'package:sj_manager/ui/screens/main_screen/large/simulation_wizard/widgets/simulation_wizard_option_button.dart';
 import 'package:sj_manager/ui/screens/main_screen/large/widgets/generic/main_menu_text_content_button_body.dart';
 import 'package:sj_manager/utils/file_dialogs.dart';
-import 'package:sj_manager/utils/team_preview_creator.dart';
+import 'package:sj_manager/utils/team_preview_creator/default_team_preview_creator.dart';
+import 'package:sj_manager/utils/team_preview_creator/team_preview_creator.dart';
 
 part 'screens/__mode_screen.dart';
 part 'screens/__team_screen.dart';
diff --git a/lib/ui/screens/main_screen/large/simulation_wizard/widgets/__footer.dart b/lib/ui/screens/main_screen/large/simulation_wizard/widgets/__footer.dart
@@ -32,7 +32,10 @@ class _FooterState extends State<_Footer> {
                         stream: navPermissions.canGoBackStream,
                         builder: (context, snapshot) {
                           return Visibility(
-                            maintainState: false,
+                            maintainAnimation: true,
+                            maintainSize: true,
+                            maintainState: true,
+                            maintainInteractivity: false,
                             visible: navPermissions.canGoBack,
                             child: SizedBox(
                               width: 80,
@@ -64,7 +67,10 @@ class _FooterState extends State<_Footer> {
                         stream: navPermissions.canGoForwardStream,
                         builder: (context, snapshot) {
                           return Visibility(
-                            maintainState: false,
+                            maintainAnimation: true,
+                            maintainSize: true,
+                            maintainState: true,
+                            maintainInteractivity: false,
                             visible: navPermissions.canGoForward,
                             child: SizedBox(
                               width: 80,
diff --git a/lib/ui/screens/main_screen/large/simulation_wizard/widgets/country_screen/__team_preview.dart b/lib/ui/screens/main_screen/large/simulation_wizard/widgets/country_screen/__team_preview.dart
@@ -24,8 +24,11 @@ class _TeamPreview extends StatelessWidget {
     final largestHillText = previewCreator.largestHill(team)?.toString() ?? 'Brak';
 
     return Container(
+      decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surfaceContainerLowest,
+          borderRadius: BorderRadius.only(
+              bottomLeft: Radius.circular(20), topLeft: Radius.circular(20))),
       padding: const EdgeInsets.only(left: 10),
-      color: Theme.of(context).colorScheme.surfaceContainerLow,
       child: Column(
         children: [
           const Gap(15),
diff --git a/lib/utils/team_preview_creator/default_team_preview_creator.dart b/lib/utils/team_preview_creator/default_team_preview_creator.dart
@@ -6,18 +6,8 @@ import 'package:sj_manager/models/db/jumps/simple_jump.dart';
 import 'package:sj_manager/models/db/local_db_repo.dart';
 import 'package:sj_manager/models/db/sex.dart';
 import 'package:sj_manager/models/db/team/country_team.dart';
-import 'package:sj_manager/models/db/team/team.dart';
 import 'package:sj_manager/utils/db_items.dart';
-
-abstract class TeamPreviewCreator<T extends Team> {
-  const TeamPreviewCreator();
-
-  int? stars(T team);
-  SimpleJump? record(T team);
-  Jumper? bestJumper(T team);
-  Jumper? risingStar(T team);
-  Hill? largestHill(T team);
-}
+import 'package:sj_manager/utils/team_preview_creator/team_preview_creator.dart';
 
 class DefaultCountryTeamPreviewCreator extends TeamPreviewCreator<CountryTeam> {
   const DefaultCountryTeamPreviewCreator({
@@ -47,36 +37,67 @@ class DefaultCountryTeamPreviewCreator extends TeamPreviewCreator<CountryTeam> {
 
   @override
   Jumper? bestJumper(CountryTeam team) {
-    final jumpers =
-        team.sex == Sex.male ? database.maleJumpers.last : database.femaleJumpers.last;
+    final jumpers = _jumpersBySex(team.sex);
     final jumpersFromCountry = jumpers.fromCountryByCode(team.country.code);
     if (jumpersFromCountry.isEmpty) return null;
     final jumperRatings = {
       for (var jumper in jumpersFromCountry) jumper: _calculateRating(jumper),
     };
-    return _bestJumper(jumperRatings);
+    return _atPositionFromRatings(jumperRatings, position: 1);
   }
 
   @override
   Jumper? risingStar(CountryTeam team) {
-    final jumpers =
-        team.sex == Sex.male ? database.maleJumpers.last : database.femaleJumpers.last;
+    final jumpers = _jumpersBySex(team.sex);
     final jumpersFromCountry = jumpers.fromCountryByCode(team.country.code);
     if (jumpersFromCountry.isEmpty) return null;
+
     final jumperRatings = {
       for (var jumper in jumpersFromCountry)
         jumper: _calculateRatingForRisingStar(jumper),
     };
-    return _bestJumper(jumperRatings);
+    final best = bestJumper(team);
+    final bestForRisingStar = _atPositionFromRatings(jumperRatings, position: 1);
+    if (jumperRatings.values.every((rating) => rating == 0) ||
+        (best == bestForRisingStar && jumperRatings.length == 1)) {
+      return null;
+    } else if (best == bestForRisingStar) {
+      return _atPositionFromRatings(jumperRatings, position: 2);
+    } else {
+      return bestForRisingStar;
+    }
+  }
+
+  List<Jumper> _jumpersBySex(Sex sex) {
+    return sex == Sex.male ? database.maleJumpers.last : database.femaleJumpers.last;
   }
 
   double _calculateRatingForRisingStar(Jumper jumper) {
     final base = _calculateRating(jumper);
     final age = jumper.age;
-    const k = 27;
-    final multiplierByAge = (age == 17) ? 1.0 : (1.0 / (1.0 + (age - 18).abs() / k));
-    print('multiplier by age ($age): $multiplierByAge');
-    return base * multiplierByAge;
+    final multiplierByAge = _multiplierByAge(age);
+    print('$jumper multiplier by age ($age): $multiplierByAge');
+    final rating = base * multiplierByAge;
+    print('$jumper: rating: $rating');
+    return rating;
+  }
+
+  double _multiplierByAge(int age) {
+    return switch (age) {
+      12 => 1.0,
+      13 => 1.0,
+      14 => 1.0,
+      15 => 1.0,
+      16 => 1.05,
+      17 => 1.05,
+      18 => 1.1,
+      19 => 1.1,
+      20 => 1.05,
+      21 => 0.95,
+      22 => 0.9,
+      23 => 0.8,
+      _ => 0.0
+    };
   }
 
   double _calculateRating(Jumper jumper) {
@@ -105,7 +126,14 @@ class DefaultCountryTeamPreviewCreator extends TeamPreviewCreator<CountryTeam> {
     return rating;
   }
 
-  Jumper _bestJumper(Map<Jumper, double> jumperRatings) {
-    return jumperRatings.entries.reduce((a, b) => a.value > b.value ? a : b).key;
+  Jumper _atPositionFromRatings(Map<Jumper, double> jumperRatings,
+      {required int position}) {
+    if (position < 1 || position > jumperRatings.length) {
+      throw ArgumentError('Position out of range');
+    }
+    List<MapEntry<Jumper, double>> sortedEntries = jumperRatings.entries.toList()
+      ..sort((a, b) => b.value.compareTo(a.value));
+
+    return sortedEntries[position - 1].key;
   }
 }
diff --git a/lib/utils/team_preview_creator/team_preview_creator.dart b/lib/utils/team_preview_creator/team_preview_creator.dart
@@ -0,0 +1,14 @@
+import 'package:sj_manager/models/db/hill/hill.dart';
+import 'package:sj_manager/models/db/jumper/jumper.dart';
+import 'package:sj_manager/models/db/jumps/simple_jump.dart';
+import 'package:sj_manager/models/db/team/team.dart';
+
+abstract class TeamPreviewCreator<T extends Team> {
+  const TeamPreviewCreator();
+
+  Hill? largestHill(T team);
+  int? stars(T team);
+  SimpleJump? record(T team);
+  Jumper? bestJumper(T team);
+  Jumper? risingStar(T team);
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":22,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":14,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":21,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
	`1`	+[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":37,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]