liquid-development/game-tracker
3
1
Fork 0
Code Issues 7 Pull Requests 4 Actions Releases 1 Activity

Teamspiele implementieren #217

Open
flixcoo wants to merge 55 commits from feature/168-teamspiele-implementieren into development
pull from: feature/168-teamspiele-implementieren
merge into: liquid-development:development
Conversation 7 Commits 55 Files Changed 55 +10 -2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7d36787ce - Show all commits

6
lib/data/models/game.dart
View File

@@ -73,7 +73,11 @@ class Game {
orElse: () => Ruleset.singleWinner, orElse: () => Ruleset.singleWinner,
), ),
description = json['description'], description = json['description'],
color = AppColor.values.firstWhere((e) => e.name == json['color']), color = AppColor.values.firstWhere(
(value) =>
value.name == json['color'] || value.toString() == json['color'],
orElse: () => AppColor.blue,
),
icon = json['icon']; icon = json['icon'];
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {

6
lib/data/models/team.dart
View File

@@ -71,7 +71,11 @@ class Team {
: id = json['id'], : id = json['id'],
name = json['name'], name = json['name'],
createdAt = DateTime.parse(json['createdAt']), createdAt = DateTime.parse(json['createdAt']),
color = AppColor.values.byName(json['color'] ?? AppColor.blue.name), color = AppColor.values.firstWhere(
(value) =>
value.name == json['color'] || value.toString() == json['color'],
orElse: () => AppColor.blue,
),
score = json['score'] ?? 0, score = json['score'] ?? 0,
members = []; // Populated during import via DataTransferService members = []; // Populated during import via DataTransferService