fully finished total grade calculator

This commit is contained in:
Kima 2023-11-21 21:47:09 +01:00
parent aba39505d9
commit 3410e410d2
2 changed files with 98 additions and 53 deletions

View File

@ -10,14 +10,20 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
class GradeTile extends StatelessWidget {
const GradeTile(this.grade,
{Key? key, this.onTap, this.padding, this.censored = false})
: super(key: key);
const GradeTile(
this.grade, {
Key? key,
this.onTap,
this.padding,
this.censored = false,
this.viewOverride = false,
}) : super(key: key);
final Grade grade;
final void Function()? onTap;
final EdgeInsetsGeometry? padding;
final bool censored;
final bool viewOverride;
@override
Widget build(BuildContext context) {
@ -26,7 +32,8 @@ class GradeTile extends StatelessWidget {
bool isTitleItalic = false;
bool isSubtitleItalic = false;
EdgeInsets leadingPadding = EdgeInsets.zero;
bool isSubjectView = SubjectGradesContainer.of(context) != null;
bool isSubjectView =
SubjectGradesContainer.of(context) != null || viewOverride;
String subjectName =
grade.subject.renamedTo ?? grade.subject.name.capital();
String modeDescription = grade.mode.description.capital();

View File

@ -2,6 +2,7 @@ import 'dart:math';
import 'package:auto_size_text/auto_size_text.dart';
import 'package:filcnaplo/api/providers/update_provider.dart';
import 'package:filcnaplo/ui/widgets/grade/grade_tile.dart';
// import 'package:filcnaplo_kreta_api/client/api.dart';
// import 'package:filcnaplo_kreta_api/client/client.dart';
import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
@ -88,6 +89,7 @@ class _GradesPageState extends State<GradesPage> {
Map<GradeSubject, double> subjectAvgs = {};
if (!gradeCalcMode) {
tiles.addAll(subjects.map((subject) {
List<Grade> subjectGrades = getSubjectGrades(subject);
@ -97,8 +99,9 @@ class _GradesPageState extends State<GradesPage> {
if (avgDropValue != 0) {
List<Grade> gradesBefore =
getSubjectGrades(subject, days: avgDropValue);
averageBefore =
avgDropValue == 0 ? 0.0 : AverageHelper.averageEvals(gradesBefore);
averageBefore = avgDropValue == 0
? 0.0
: AverageHelper.averageEvals(gradesBefore);
}
var nullavg = GroupAverage(average: 0.0, subject: subject, uid: "0");
double groupAverage = gradeProvider.groupAverages
@ -118,20 +121,54 @@ class _GradesPageState extends State<GradesPage> {
},
);
}));
} else {
tiles.clear();
if (tiles.isNotEmpty) {
List<Grade> ghostGrades = calculatorProvider.ghosts;
ghostGrades.sort((a, b) => -a.date.compareTo(b.date));
List<GradeTile> _gradeTiles = [];
for (Grade grade in ghostGrades) {
_gradeTiles.add(GradeTile(
grade,
viewOverride: true,
));
}
tiles.add(
_gradeTiles.isNotEmpty
? Panel(
key: ValueKey(gradeCalcMode),
title: Text(
"Ghost Grades".i18n,
),
child: Column(
children: _gradeTiles,
),
)
: const SizedBox(),
);
}
if (tiles.isNotEmpty || gradeCalcMode) {
tiles.insert(0, yearlyGraph);
tiles.insert(1, gradesCount);
if (!gradeCalcMode) {
tiles.insert(2, FailWarning(subjectAvgs: subjectAvgs));
tiles.insert(
3,
PanelTitle(
title: Text(avgDropValue == 0
? "Subjects".i18n
: "Subjects_changes".i18n)));
title: Text(
avgDropValue == 0 ? "Subjects".i18n : "Subjects_changes".i18n,
)),
);
tiles.insert(4, const PanelHeader(padding: EdgeInsets.only(top: 12.0)));
tiles.add(const PanelFooter(padding: EdgeInsets.only(bottom: 12.0)));
tiles.add(const Padding(padding: EdgeInsets.only(bottom: 24.0)));
}
tiles.add(Padding(
padding: EdgeInsets.only(bottom: !gradeCalcMode ? 24.0 : 250.0),
));
} else {
tiles.insert(
0,
@ -165,7 +202,7 @@ class _GradesPageState extends State<GradesPage> {
gradeProvider.groupAverages.length
: 0.0;
if (subjectAvg > 0) {
if (subjectAvg > 0 && !gradeCalcMode) {
tiles.add(Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -243,7 +280,7 @@ class _GradesPageState extends State<GradesPage> {
? gradeProvider.grades
.where((e) => e.type == GradeType.midYear)
.toList()
: calculatorProvider.grades.toList());
: calculatorProvider.grades);
final prevStudentAvg = AverageHelper.averageEvals(gradeProvider.grades
.where((e) => e.type == GradeType.midYear)
@ -323,6 +360,7 @@ class _GradesPageState extends State<GradesPage> {
snap: false,
surfaceTintColor: Theme.of(context).scaffoldBackgroundColor,
actions: [
if (!gradeCalcMode)
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 5.0, vertical: 0.0),