balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

setted goal plans can be saved now

Browse Source
This commit is contained in:
Kima 2023-08-28 02:33:39 +02:00
parent 3e470981a8
commit 0ac0586fba
7 changed files with 467 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filcnaplo/lib/database/init.dart
View File

@ -46,6 +46,8 @@ const userDataDB = DatabaseStruct("user_data", {
"renamed_teachers": String,
// "subject_lesson_count": String, // non kreta data
"last_seen_grade": int,
// goal plans // non kreta data
"goal_plans": String,
});
Future<void> createTable(Database db, DatabaseStruct struct) =>
@ -97,6 +99,8 @@ Future<Database> initDB(DatabaseProvider database) async {
"renamed_teachers": "{}",
// "subject_lesson_count": "{}", // non kreta data
"last_seen_grade": 0,
// goal plans // non kreta data
"goal_plans": "{}",
});
} catch (error) {
print("ERROR: migrateDB: $error");

11
filcnaplo/lib/database/query.dart
View File

@ -213,4 +213,15 @@ class UserDatabaseQuery {
return (jsonDecode(renamedTeachersJson) as Map)
.map((key, value) => MapEntry(key.toString(), value.toString()));
}
Future<Map<String, String>> subjectGoalPlans({required String userId}) async {
List<Map> userData =
await db.query("user_data", where: "id = ?", whereArgs: [userId]);
if (userData.isEmpty) return {};
String? goalPlansJson =
userData.elementAt(0)["goal_plans"] as String?;
if (goalPlansJson == null) return {};
return (jsonDecode(goalPlansJson) as Map)
.map((key, value) => MapEntry(key.toString(), value.toString()));
}
}

7
filcnaplo/lib/database/store.dart
View File

@ -140,4 +140,11 @@ class UserDatabaseStore {
await db.update("user_data", {"renamed_teachers": renamedTeachersJson},
where: "id = ?", whereArgs: [userId]);
}
Future<void> storeSubjectGoalPlans(Map<String, String> plans,
{required String userId}) async {
String goalPlansJson = jsonEncode(plans);
await db.update("user_data", {"goal_plans": goalPlansJson},
where: "id = ?", whereArgs: [userId]);
}
}

4
filcnaplo_mobile_ui/lib/common/round_border_icon.dart
View File

@ -8,7 +8,7 @@ class RoundBorderIcon extends StatelessWidget {
const RoundBorderIcon(
{Key? key,
this.color = Colors.black,
this.width = 16.0,
this.width = 1.5,
required this.icon})
: super(key: key);
@ -20,7 +20,7 @@ class RoundBorderIcon extends StatelessWidget {
borderRadius: BorderRadius.circular(50.0),
),
child: Padding(
padding: EdgeInsets.zero,
padding: const EdgeInsets.all(5.0),
child: icon,
),
);

57
filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart
View File

@ -1,6 +1,8 @@
import 'dart:math';
import 'package:animations/animations.dart';
import 'package:filcnaplo/api/providers/database_provider.dart';
import 'package:filcnaplo/api/providers/user_provider.dart';
import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/utils/format.dart';
import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
@ -21,7 +23,7 @@ import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_pro
import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart';
import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart';
import 'package:filcnaplo_premium/ui/mobile/goal_planner/test.dart';
import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.dart';
import 'package:filcnaplo_premium/models/premium_scopes.dart';
import 'package:filcnaplo_premium/providers/premium_provider.dart';
import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
@ -62,12 +64,16 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
late GradeProvider gradeProvider;
late GradeCalculatorProvider calculatorProvider;
late SettingsProvider settingsProvider;
late DatabaseProvider dbProvider;
late UserProvider user;
late double average;
late Widget gradeGraph;
bool gradeCalcMode = false;
String plan = '';
List<Grade> getSubjectGrades(Subject subject) => !gradeCalcMode
? gradeProvider.grades.where((e) => e.subject == subject).toList()
: calculatorProvider.grades.where((e) => e.subject == subject).toList();
@ -151,6 +157,20 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
gradeTiles = List.castFrom(tiles);
}
@override
void initState() {
super.initState();
user = Provider.of<UserProvider>(context, listen: false);
dbProvider = Provider.of<DatabaseProvider>(context, listen: false);
}
void fetchGoalPlans() async {
plan = (await dbProvider.userQuery
.subjectGoalPlans(userId: user.id!))[widget.subject.id] ??
'';
setState(() {});
}
@override
Widget build(BuildContext context) {
gradeProvider = Provider.of<GradeProvider>(context);
@ -196,6 +216,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
buildTiles(ghostGrades);
}
fetchGoalPlans();
return Scaffold(
key: _scaffoldKey,
floatingActionButtonLocation: ExpandableFab.location,
@ -213,6 +235,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
),
children: [
FloatingActionButton.small(
heroTag: "btn_ghost_grades",
child: const Icon(FeatherIcons.plus),
backgroundColor: Theme.of(context).colorScheme.secondary,
onPressed: () {
@ -220,6 +243,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
},
),
FloatingActionButton.small(
heroTag: "btn_goal_planner",
child: const Icon(FeatherIcons.flag, size: 20.0),
backgroundColor: Theme.of(context).colorScheme.secondary,
onPressed: () {
@ -235,7 +259,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
Navigator.of(context).push(CupertinoPageRoute(
builder: (context) =>
GoalPlannerTest(subject: widget.subject)));
GoalPlannerScreen(subject: widget.subject)));
},
),
],
@ -261,6 +285,35 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
const SizedBox(width: 6.0),
if (average != 0)
Center(child: AverageDisplay(average: average)),
const SizedBox(width: 6.0),
if (plan != '')
Center(
child: GestureDetector(
onTap: () {
Navigator.of(context).push(CupertinoPageRoute(
builder: (context) =>
GoalPlannerScreen(subject: widget.subject)));
},
child: Container(
width: 54.0,
padding: const EdgeInsets.symmetric(
horizontal: 5.0, vertical: 8.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(45.0),
color: Theme.of(context)
.colorScheme
.primary
.withOpacity(.15),
),
child: Icon(
FeatherIcons.flag,
size: 17.0,
weight: 2.5,
color: Theme.of(context).colorScheme.primary,
),
),
),
),
const SizedBox(width: 12.0),
],
icon: SubjectIcon.resolveVariant(

8
filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner.dart
View File

@ -138,6 +138,14 @@ class Plan {
Plan(this.plan);
String get dbString {
var finalString = '';
for (var i in plan) {
finalString += "$i,";
}
return finalString;
}
@override
bool operator ==(other) => other is Plan && listEquals(plan, other.plan);

160
filcnaplo_premium/lib/ui/mobile/goal_planner/test.dart → filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner_screen.dart
View File

@ -1,3 +1,5 @@
import 'package:filcnaplo/api/providers/database_provider.dart';
import 'package:filcnaplo/api/providers/user_provider.dart';
import 'package:filcnaplo/helpers/average_helper.dart';
import 'package:filcnaplo/helpers/subject.dart';
import 'package:filcnaplo/models/settings.dart';
@ -22,19 +24,21 @@ enum PlanResult {
reached, // Goal already reached
}
class GoalPlannerTest extends StatefulWidget {
class GoalPlannerScreen extends StatefulWidget {
final Subject subject;
const GoalPlannerTest({Key? key, required this.subject}) : super(key: key);
const GoalPlannerScreen({Key? key, required this.subject}) : super(key: key);
@override
State<GoalPlannerTest> createState() => _GoalPlannerTestState();
State<GoalPlannerScreen> createState() => _GoalPlannerScreenState();
}
class _GoalPlannerTestState extends State<GoalPlannerTest> {
class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
late GradeProvider gradeProvider;
late GradeCalculatorProvider calculatorProvider;
late SettingsProvider settingsProvider;
late DatabaseProvider dbProvider;
late UserProvider user;
bool gradeCalcMode = false;
@ -50,6 +54,17 @@ class _GoalPlannerTestState extends State<GoalPlannerTest> {
Plan? selectedRoute;
List<Plan> otherPlans = [];
@override
void initState() {
super.initState();
user = Provider.of<UserProvider>(context, listen: false);
dbProvider = Provider.of<DatabaseProvider>(context, listen: false);
}
Future<Map<String, String>> fetchGoalPlans() async {
return await dbProvider.userQuery.subjectGoalPlans(userId: user.id!);
}
PlanResult getResult() {
final currentAvg = GoalPlannerHelper.averageEvals(grades);
@ -170,17 +185,21 @@ class _GoalPlannerTestState extends State<GoalPlannerTest> {
context: context,
subject: widget.subject,
),
size: 10,
size: 18,
weight: 1.5,
),
),
const SizedBox(
width: 5.0,
),
Text(
(widget.subject.isRenamed
? widget.subject.renamedTo
: widget.subject.name) ??
'goal_planner_title'.i18n,
style: const TextStyle(
fontSize: 17.0,
fontWeight: FontWeight.w500,
fontSize: 20.0,
fontWeight: FontWeight.w700,
),
),
],
@ -196,67 +215,56 @@ class _GoalPlannerTestState extends State<GoalPlannerTest> {
],
),
const SizedBox(height: 12.0),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"set_a_goal".i18n,
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20.0,
),
),
const SizedBox(height: 4.0),
Text(
goalValue.toString(),
style: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 42.0,
color: gradeColor(goalValue.round(), settingsProvider),
),
),
],
),
// Column(
// mainAxisAlignment: MainAxisAlignment.center,
// children: [
// Text(
// "select_subject".i18n,
// style: const TextStyle(
// fontWeight: FontWeight.bold,
// fontSize: 20.0,
// ),
// ),
// const SizedBox(height: 4.0),
// Column(
// children: [
// Icon(
// SubjectIcon.resolveVariant(
// context: context,
// subject: widget.subject,
// ),
// size: 48.0,
// ),
// Text(
// (widget.subject.isRenamed
// ? widget.subject.renamedTo
// : widget.subject.name) ??
// '',
// style: const TextStyle(
// fontSize: 17.0,
// fontWeight: FontWeight.w500,
// ),
// )
// ],
// )
// ],
// )
],
Text(
"set_a_goal".i18n,
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20.0,
),
),
const SizedBox(height: 4.0),
Text(
goalValue.toString(),
style: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 48.0,
color: gradeColor(goalValue.round(), settingsProvider),
),
),
// Column(
// mainAxisAlignment: MainAxisAlignment.center,
// children: [
// Text(
// "select_subject".i18n,
// style: const TextStyle(
// fontWeight: FontWeight.bold,
// fontSize: 20.0,
// ),
// ),
// const SizedBox(height: 4.0),
// Column(
// children: [
// Icon(
// SubjectIcon.resolveVariant(
// context: context,
// subject: widget.subject,
// ),
// size: 48.0,
// ),
// Text(
// (widget.subject.isRenamed
// ? widget.subject.renamedTo
// : widget.subject.name) ??
// '',
// style: const TextStyle(
// fontSize: 17.0,
// fontWeight: FontWeight.w500,
// ),
// )
// ],
// )
// ],
// )
const SizedBox(height: 24.0),
Text(
"pick_route".i18n,
@ -331,9 +339,21 @@ class _GoalPlannerTestState extends State<GoalPlannerTest> {
SizedBox(
width: double.infinity,
child: RawMaterialButton(
onPressed: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text("Hamarosan...")));
onPressed: () async {
if (selectedRoute == null) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text('${"pick_route".i18n}...')));
}
final goalPlans = await fetchGoalPlans();
goalPlans[widget.subject.id] =
selectedRoute!.dbString;
await dbProvider.userStore.storeSubjectGoalPlans(
goalPlans,
userId: user.id!);
Navigator.of(context).pop();
},
fillColor: Theme.of(context).colorScheme.primary,
shape: const StadiumBorder(),