firka/student-plus
firka/student-plus
6
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

progress in new goal planner

Browse Source
This commit is contained in:
Kima 2024-06-03 20:15:47 +02:00
parent 3df07a00c2
commit a45c5b11a7
3 changed files with 246 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/ui/mobile/goal_planner/goal_input.dart
View File

@ -61,45 +61,45 @@ class GoalInput extends StatelessWidget {
), ),
); );
}), }),
const SizedBox(height: 12.0), // const SizedBox(height: 12.0),
Row( // Row(
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: presets.map((e) { // children: presets.map((e) {
final pv = (value * 10).round() / 10; // final pv = (value * 10).round() / 10;
final selected = gradeToAvg(e) == pv; // final selected = gradeToAvg(e) == pv;
return Padding( // return Padding(
padding: const EdgeInsets.symmetric(horizontal: 12.0), // padding: const EdgeInsets.symmetric(horizontal: 12.0),
child: Container( // child: Container(
decoration: BoxDecoration( // decoration: BoxDecoration(
borderRadius: BorderRadius.circular(99.0), // borderRadius: BorderRadius.circular(99.0),
color: // color:
gradeColor(e, settings).withOpacity(selected ? 1.0 : 0.2), // gradeColor(e, settings).withOpacity(selected ? 1.0 : 0.2),
border: Border.all(color: gradeColor(e, settings), width: 4), // border: Border.all(color: gradeColor(e, settings), width: 4),
), // ),
child: Material( // child: Material(
type: MaterialType.transparency, // type: MaterialType.transparency,
child: InkWell( // child: InkWell(
borderRadius: BorderRadius.circular(99.0), // borderRadius: BorderRadius.circular(99.0),
onTap: () => setValue(gradeToAvg(e)), // onTap: () => setValue(gradeToAvg(e)),
child: Padding( // child: Padding(
padding: const EdgeInsets.symmetric( // padding: const EdgeInsets.symmetric(
vertical: 2.0, horizontal: 24.0), // vertical: 2.0, horizontal: 24.0),
child: Text( // child: Text(
e.toString(), // e.toString(),
style: TextStyle( // style: TextStyle(
color: // color:
selected ? Colors.white : gradeColor(e, settings), // selected ? Colors.white : gradeColor(e, settings),
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
fontSize: 24.0, // fontSize: 24.0,
), // ),
), // ),
), // ),
), // ),
), // ),
), // ),
); // );
}).toList(), // }).toList(),
) // )
], ],
); );
} }

180
lib/ui/mobile/goal_planner/goal_track_popup.dart
View File

@ -9,9 +9,13 @@ import 'package:refilc_kreta_api/models/subject.dart';
import 'package:refilc_kreta_api/providers/grade_provider.dart'; import 'package:refilc_kreta_api/providers/grade_provider.dart';
import 'package:refilc_mobile_ui/common/average_display.dart'; import 'package:refilc_mobile_ui/common/average_display.dart';
import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart'; import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart';
import 'package:refilc_plus/models/premium_scopes.dart';
import 'package:refilc_plus/providers/plus_provider.dart';
import 'package:refilc_plus/ui/mobile/goal_planner/goal_input.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_input.dart';
import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart';
import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.dart';
import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.i18n.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
import 'package:refilc_plus/ui/mobile/goal_planner/route_option.dart';
class GoalTrackPopup extends StatefulWidget { class GoalTrackPopup extends StatefulWidget {
const GoalTrackPopup({super.key, required this.subject}); const GoalTrackPopup({super.key, required this.subject});
@ -45,6 +49,8 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
Plan? selectedRoute; Plan? selectedRoute;
List<Plan> otherPlans = []; List<Plan> otherPlans = [];
bool plansPage = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -69,6 +75,75 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
return await dbProvider.userQuery.subjectGoalPinDates(userId: user.id!); return await dbProvider.userQuery.subjectGoalPinDates(userId: user.id!);
} }
PlanResult getResult() {
final currentAvg = GoalPlannerHelper.averageEvals(grades);
recommended = null;
fastest = null;
otherPlans = [];
if (currentAvg >= goalValue) return PlanResult.reached;
final planner = GoalPlanner(goalValue, grades);
final plans = planner.solve();
plans.sort((a, b) => (a.avg - (2 * goalValue + 5) / 3)
.abs()
.compareTo(b.avg - (2 * goalValue + 5) / 3));
try {
final singleSolution = plans.every((e) => e.sigma == 0);
recommended =
plans.where((e) => singleSolution ? true : e.sigma > 0).first;
plans.removeWhere((e) => e == recommended);
} catch (_) {}
plans.sort((a, b) => a.plan.length.compareTo(b.plan.length));
try {
fastest = plans.removeAt(0);
} catch (_) {}
// print((recommended?.plan.length ?? 0).toString() + '-kuki');
// print((fastest?.plan.length ?? 0).toString() + '--asd');
if ((((recommended?.plan.length ?? 0) - (fastest?.plan.length ?? 0)) >=
5) &&
fastest != null) {
recommended = fastest;
}
if (recommended == null) {
recommended = null;
fastest = null;
otherPlans = [];
selectedRoute = null;
return PlanResult.unsolvable;
}
// print(recommended!.plan.length.toString() + '--------');
if (recommended!.plan.length > 20) {
recommended = null;
fastest = null;
otherPlans = [];
selectedRoute = null;
return PlanResult.unreachable;
}
otherPlans = List.from(plans);
// only save 2 items if not plus member
if (!Provider.of<PlusProvider>(context)
.hasScope(PremiumScopes.unlimitedGoalPlanner)) {
if (otherPlans.length > 2) {
otherPlans.removeRange(2, otherPlans.length - 1);
}
}
return PlanResult.available;
}
void getGrades() { void getGrades() {
grades = getSubjectGrades(widget.subject).toList(); grades = getSubjectGrades(widget.subject).toList();
} }
@ -77,12 +152,20 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
gradeProvider = Provider.of<GradeProvider>(context); gradeProvider = Provider.of<GradeProvider>(context);
getGrades();
final currentAvg = GoalPlannerHelper.averageEvals(grades); final currentAvg = GoalPlannerHelper.averageEvals(grades);
final result = getResult();
List<Grade> subjectGrades = getSubjectGrades(widget.subject); List<Grade> subjectGrades = getSubjectGrades(widget.subject);
double avg = AverageHelper.averageEvals(subjectGrades); double avg = AverageHelper.averageEvals(subjectGrades);
double listLength = (otherPlans.length +
(recommended != null ? 1 : 0) +
(fastest != null && fastest != recommended ? 1 : 0));
return Container( return Container(
padding: const EdgeInsets.only(top: 24.0), padding: const EdgeInsets.only(top: 24.0),
child: SafeArea( child: SafeArea(
@ -113,10 +196,28 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
scale: 1.3, scale: 1.3,
), ),
], ],
) ),
const SizedBox(
height: 14.0,
),
Text(
plansPage
? 'goalplan_plans_title'.i18n
: 'goalplan_title'.i18n,
style: const TextStyle(
fontSize: 20.0, fontWeight: FontWeight.w700),
textAlign: TextAlign.center),
Text(
plansPage
? 'goalplan_plans_subtitle'.i18n
: 'goalplan_subtitle'.i18n,
style: const TextStyle(
fontSize: 16.0, fontWeight: FontWeight.w500),
textAlign: TextAlign.center),
], ],
), ),
const SizedBox(height: 24.0), const SizedBox(height: 24.0),
if (!plansPage)
GoalInput( GoalInput(
value: goalValue, value: goalValue,
currentAverage: currentAvg, currentAverage: currentAvg,
@ -125,11 +226,86 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
goalValue = v; goalValue = v;
}), }),
), ),
if (plansPage && listLength > 2)
SizedBox(
height: (MediaQuery.of(context).size.height * 0.5),
child: SingleChildScrollView(
child: Column(
children: [
if (recommended != null)
RouteOption(
plan: recommended!,
mark: RouteMark.recommended,
selected: selectedRoute == recommended!,
onSelected: () => setState(() {
selectedRoute = recommended;
}),
),
if (fastest != null && fastest != recommended)
RouteOption(
plan: fastest!,
mark: RouteMark.fastest,
selected: selectedRoute == fastest!,
onSelected: () => setState(() {
selectedRoute = fastest;
}),
),
...otherPlans.map((e) => RouteOption(
plan: e,
selected: selectedRoute == e,
onSelected: () => setState(() {
selectedRoute = e;
}),
)),
if (result != PlanResult.available)
Text(result.name.i18n),
],
),
),
),
if (plansPage && listLength <= 2)
Column(
children: [
if (recommended != null)
RouteOption(
plan: recommended!,
mark: RouteMark.recommended,
selected: selectedRoute == recommended!,
onSelected: () => setState(() {
selectedRoute = recommended;
}),
),
if (fastest != null && fastest != recommended)
RouteOption(
plan: fastest!,
mark: RouteMark.fastest,
selected: selectedRoute == fastest!,
onSelected: () => setState(() {
selectedRoute = fastest;
}),
),
...otherPlans.map((e) => RouteOption(
plan: e,
selected: selectedRoute == e,
onSelected: () => setState(() {
selectedRoute = e;
}),
)),
if (result != PlanResult.available) Text(result.name.i18n),
],
),
const SizedBox(height: 24.0), const SizedBox(height: 24.0),
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
child: RawMaterialButton( child: RawMaterialButton(
onPressed: () async { onPressed: () async {
if (!plansPage) {
setState(() {
plansPage = true;
});
return;
}
if (selectedRoute == null) { if (selectedRoute == null) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('${"pick_route".i18n}...'))); SnackBar(content: Text('${"pick_route".i18n}...')));
@ -170,7 +346,7 @@ class GoalTrackPopupState extends State<GoalTrackPopup> {
shape: const StadiumBorder(), shape: const StadiumBorder(),
padding: const EdgeInsets.symmetric(vertical: 8.0), padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Text( child: Text(
"track_it".i18n, plansPage ? "track_it".i18n : "show_my_ways".i18n,
style: const TextStyle( style: const TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 20.0, fontSize: 20.0,

39
lib/ui/mobile/goal_planner/route_option.dart
View File

@ -19,8 +19,9 @@ class RouteOption extends StatelessWidget {
final bool selected; final bool selected;
final void Function() onSelected; final void Function() onSelected;
Widget markLabel() { Widget markLabel({Color? colorOverride}) {
const style = TextStyle(fontWeight: FontWeight.bold); TextStyle style =
TextStyle(fontWeight: FontWeight.bold, color: colorOverride);
switch (mark!) { switch (mark!) {
case RouteMark.recommended: case RouteMark.recommended:
@ -95,7 +96,7 @@ class RouteOption extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
side: selected side: selected
? BorderSide(color: markColor(context), width: 4.0) ? BorderSide(color: markColor(context), width: 1.5)
: BorderSide.none, : BorderSide.none,
), ),
child: InkWell( child: InkWell(
@ -109,21 +110,23 @@ class RouteOption extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (mark != null) ...[ if (mark != null) ...[
Chip( // Chip(
label: markLabel(), // label: markLabel(),
visualDensity: VisualDensity.compact, // visualDensity: VisualDensity.compact,
backgroundColor: // backgroundColor:
selected ? markColor(context) : Colors.transparent, // selected ? markColor(context) : Colors.transparent,
labelPadding: const EdgeInsets.symmetric(horizontal: 8.0), // labelPadding: const EdgeInsets.symmetric(horizontal: 8.0),
labelStyle: // labelStyle:
TextStyle(color: selected ? Colors.white : null), // TextStyle(color: selected ? Colors.white : null),
shape: StadiumBorder( // shape: StadiumBorder(
side: BorderSide( // side: BorderSide(
color: markColor(context), // color: markColor(context),
width: 3.0, // width: 3.0,
), // ),
), // ),
), // ),
markLabel(
colorOverride: selected ? markColor(context) : null),
const SizedBox(height: 6.0), const SizedBox(height: 6.0),
], ],
Wrap( Wrap(