Reorder serialized data for better readability

NightDreamGames · Apr 5, 2024 · 5335f56 · 5335f56
1 parent 0cdaae1
commit 5335f56
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/calculations/subject.dart b/lib/calculations/subject.dart
@@ -115,12 +115,12 @@ class Subject extends CalculationObject {
  }
 
  Map<String, dynamic> toJson() => {
- "tests": tests,
- "children": children,
  "name": name,
  "coefficient": weight,
+ "speakingWeight": speakingWeight,
  "bonus": bonus,
  "type": isGroup,
- "speakingWeight": speakingWeight,
+ "children": children.toList(),
+ "tests": tests,
  };
 }
diff --git a/lib/calculations/term.dart b/lib/calculations/term.dart
@@ -85,8 +85,8 @@ class Term extends CalculationObject {
  }
 
  Map<String, dynamic> toJson() => {
- "subjects": subjects,
  "coefficient": weight,
  "isExam": isExam,
+ "subjects": subjects.toList(),
  };
 }
diff --git a/lib/calculations/test.dart b/lib/calculations/test.dart
@@ -68,9 +68,9 @@ class Test extends CalculationObject {
  }
 
  Map<String, dynamic> toJson() => {
+ "name": name,
  "grade1": numerator,
  "grade2": denominator,
- "name": name,
  "coefficient": weight,
  "isSpeaking": isSpeaking,
  "timestamp": timestamp,

diff --git a/lib/calculations/year.dart b/lib/calculations/year.dart
@@ -240,17 +240,17 @@ class Year extends CalculationObject {
  }
 
  Map<String, dynamic> toJson() => {
- "terms": terms,
- "term_template": termTemplate,
  "name": name,
+ "term_count": termCount,
+ "max_grade": maxGrade,
+ "rounding_mode": roundingMode,
+ "round_to": roundTo,
  "validated_school_system": validatedSchoolSystem,
  "validated_lux_system": validatedLuxSystem,
  "validated_year": validatedYear,
  "validated_section": validatedSection,
  "validated_variant": validatedVariant,
- "term_count": termCount,
- "max_grade": maxGrade,
- "rounding_mode": roundingMode,
- "round_to": roundTo,
+ "terms": terms,
+ "term_template": termTemplate.toList(),
  };
 }