balint1414/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

firka: ignore % grades and half year / end year grades

Browse Source 
Closes: #22
This commit is contained in:
4831c0
2026-03-05 13:19:25 +01:00
parent bfb06d3e5f
commit 0675a5109a
3 changed files with 115 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
firka_common/lib/ui/components/grade_helpers.dart
View File

@@ -94,37 +94,47 @@ Color getGradeColor(
extension GradeListExtension on List<Grade> {
double getAverageBySubject(Subject subject) {
final subjectGrades = where((g) => g.subject.uid == subject.uid).toList();
if (subjectGrades.isEmpty) return double.nan;
final feleviOrEvvegi = subjectGrades.where((g) {
final typeName = g.type.name?.toLowerCase() ?? '';
return typeName == 'felevi_jegy_ertekeles' ||
typeName == 'evvegi_jegy_ertekeles';
}).toList();
final hasOtherType = subjectGrades.any((g) {
final typeName = g.type.name?.toLowerCase() ?? '';
return typeName != 'felevi_jegy_ertekeles' &&
typeName != 'evvegi_jegy_ertekeles';
});
if (!hasOtherType && feleviOrEvvegi.isNotEmpty) {
final withValue = feleviOrEvvegi
.where((g) => g.numericValue != null && g.numericValue! > 0)
.toList();
if (withValue.isEmpty) return double.nan;
withValue.sort((a, b) => a.recordDate.compareTo(b.recordDate));
return withValue.last.numericValue!.toDouble();
}
var weightTotal = 0.00;
var sum = 0.00;
for (var grade in this) {
if (grade.subject.uid == subject.uid) {
final valueTypeName = grade.valueType.name?.toLowerCase() ?? '';
final isPercentage =
valueTypeName.contains('szazalek') ||
valueTypeName.contains('percent');
final typeName = grade.type.name?.toLowerCase() ?? '';
final isHalfYear = typeName == 'felevi_jegy_ertekeles';
final isEndYear = typeName == 'evvegi_jegy_ertekeles';
if (isPercentage || isHalfYear || isEndYear) {
continue;
}
if (grade.numericValue != null) {
var weight = (grade.weightPercentage ?? 100) / 100.0;
weightTotal += weight;
sum += grade.numericValue! * weight;
}
for (var grade in subjectGrades) {
final valueTypeName = grade.valueType.name?.toLowerCase() ?? '';
final isPercentage =
valueTypeName.contains('szazalek') ||
valueTypeName.contains('percent');
final typeName = grade.type.name?.toLowerCase() ?? '';
final isHalfYear = typeName == 'felevi_jegy_ertekeles';
final isEndYear = typeName == 'evvegi_jegy_ertekeles';
if (isPercentage || isHalfYear || isEndYear) continue;
if (grade.numericValue != null) {
var weight = (grade.weightPercentage ?? 100) / 100.0;
weightTotal += weight;
sum += grade.numericValue! * weight;
}
}
if (weightTotal == 0) {
return double.nan;
}
if (weightTotal == 0) return double.nan;
return sum / weightTotal;
}
}