devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

did everything, like really

Browse Source
This commit is contained in:
Kima
2024-05-04 23:31:15 +02:00
parent 6d8d11cd87
commit 25a72da3a8
16 changed files with 450 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
refilc_mobile_ui/lib/pages/grades/grades_page.dart
View File

@@ -33,7 +33,6 @@ import 'package:refilc_mobile_ui/pages/grades/fail_warning.dart';
import 'package:refilc_mobile_ui/pages/grades/grades_count.dart';
import 'package:refilc_mobile_ui/pages/grades/graph.dart';
import 'package:refilc_mobile_ui/pages/grades/grade_subject_view.dart';
import 'package:refilc_mobile_ui/pages/timetable/timetable_page.dart';
import 'package:refilc_mobile_ui/screens/navigation/navigation_route_handler.dart';
import 'package:refilc_mobile_ui/screens/navigation/navigation_screen.dart';
import 'package:refilc_plus/models/premium_scopes.dart';
@@ -640,27 +639,6 @@ class GradesPageState extends State<GradesPage> {
}
void showQuickSettings(BuildContext context) {
// _sheetController = _scaffoldKey.currentState?.showBottomSheet(
// (context) => RoundedBottomSheet(
// borderRadius: 14.0,
// child: BottomSheetMenu(items: [
// SwitchListTile(
// title: Text('show_lesson_num'.i18n),
// value:
// Provider.of<SettingsProvider>(context).qTimetableLessonNum,
// onChanged: (v) {
// Provider.of<SettingsProvider>(context, listen: false)
// .update(qTimetableLessonNum: v);
// })
// ])),
// backgroundColor: const Color(0x00000000),
// elevation: 12.0,
// );
// _sheetController!.closed.then((value) {
// // Show fab and grades
// if (mounted) {}
// });
showRoundedModalBottomSheet(
context,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,

26
refilc_mobile_ui/lib/pages/grades/graph.dart
View File

@@ -161,6 +161,11 @@ class GradeGraphState extends State<GradeGraph> {
final x = halfYearGrade.writeDate.month +
(halfYearGrade.writeDate.day / 31) +
((halfYearGrade.writeDate.year - data.last.writeDate.year) * 12);
List<Grade> dataBeforeMidYr = data
.where((e) => e.writeDate.isBefore(halfYearGrade.writeDate))
.toList();
if (x <= maxX) {
extraLinesV.add(
VerticalLine(
@@ -170,7 +175,9 @@ class GradeGraphState extends State<GradeGraph> {
label: VerticalLineLabel(
labelResolver: (_) => " ${"mid".i18n} ​", // <- zwsp for padding
show: true,
alignment: Alignment.topLeft,
alignment: dataBeforeMidYr.length < 2
? Alignment.topRight
: Alignment.topLeft,
style: TextStyle(
backgroundColor: Theme.of(context).colorScheme.background,
color: AppColors.of(context).text,
@@ -218,11 +225,12 @@ class GradeGraphState extends State<GradeGraph> {
horizontalLines: extraLinesH),
lineBarsData: [
LineChartBarData(
preventCurveOverShooting: true,
preventCurveOverShooting: false,
spots: subjectSpots,
isCurved: true,
colors: averageColors.reversed.toList(),
barWidth: 8,
barWidth: 6,
curveSmoothness: 0.2,
isStrokeCapRound: true,
dotData: FlDotData(show: false),
belowBarData: BarAreaData(
@@ -339,11 +347,13 @@ class GradeGraphState extends State<GradeGraph> {
ghostData.isNotEmpty ? ghostData : data;
tData.sort((a, b) =>
a.writeDate.compareTo(b.writeDate));
return tData.first.writeDate
.add(const Duration(days: 120))
.isBefore(tData.last.writeDate)
? 2.0
: 1.0;
return ghostData.isNotEmpty
? 3.0
: tData.first.writeDate
.add(const Duration(days: 120))
.isBefore(tData.last.writeDate)
? 2.0
: 2.5;
}(),
checkToShowTitle: (double minValue,
double maxValue,