Compare commits

..

28 Commits
5.0.1 ... 5.0.2

Author SHA1 Message Date
Márton Kiss
93eaa5a74b Merge pull request #125 from refilc/dev
dev to master (v5.0.2 final)
2024-06-16 22:02:12 +02:00
Kima
5503b41be3 fix 2024-06-16 21:54:59 +02:00
Kima
bd716e1717 fixed shit 2024-06-16 21:48:32 +02:00
Márton Kiss
7f8b716712 Merge pull request #124 from refilc/master
master back to dev
2024-06-16 21:43:53 +02:00
Márton Kiss
1a7b59f2fc Merge pull request #123 from refilc/dev
dev to master (v5.0.2)
2024-06-16 21:43:07 +02:00
Kima
9f62e44b52 Revert "add wearos button"
This reverts commit 9d863e1ec0.
2024-06-16 21:42:37 +02:00
Kima
7c34552aa5 Revert "what"
This reverts commit 9b947256c8.
2024-06-16 21:40:35 +02:00
Kima
57d784443a changed version number 2024-06-16 21:36:22 +02:00
Kima
e73ee5a1f2 translation for grade importing 2024-06-16 21:36:00 +02:00
Kima
4277f0662a added back premium check 2024-06-16 21:33:33 +02:00
Kima
604e9dcaad Merge branch 'dev' of github.com:refilc/naplo into dev 2024-06-16 21:32:33 +02:00
Kima
c0dd84c665 finished grade importing and exporting totally 2024-06-16 21:32:27 +02:00
zypherift
7dc33d3b87 Merge branch 'dev' of github.com:refilc/naplo into dev 2024-06-16 20:09:12 +02:00
zypherift
9bee0daeb5 kill me 2024-06-16 20:08:59 +02:00
Kima
dd8a4430a9 translation fixes 2024-06-16 20:01:22 +02:00
zypherift
47934620ea fix again 2024-06-14 15:16:03 +02:00
zypherift
9e815aff2f maybe fix token spam 2024-06-14 15:05:17 +02:00
zypherift
d8393b24e1 fix multiple schools appearing in personal details menu 2024-06-14 15:02:10 +02:00
zypherift
1abe990847 yes 2024-06-14 14:55:35 +02:00
zypherift
3a92716019 add ger/eng export translation 2024-06-14 14:54:34 +02:00
zypherift
9b947256c8 what 2024-06-14 14:09:34 +02:00
zypherift
0586da3742 Merge branch 'master' of github.com:refilc/naplo 2024-06-14 14:09:28 +02:00
zypherift
9d863e1ec0 add wearos button 2024-06-14 14:08:13 +02:00
zypherift
e080800aa8 Merge pull request #121 from balint1414/dev
Hiba ablak szövegének megváltoztatása.
2024-06-14 11:35:08 +02:00
balint1414
e6f7728e42 Hiba ablak szövegének megváltoztatása. (3) 2024-06-14 11:27:29 +02:00
balint1414
ac11da1744 Hiba ablak szövegének megváltoztatása. (2) 2024-06-14 10:58:26 +02:00
balint1414
cad7bd19dc Hiba ablak szövegének megváltoztatása. (2) 2024-06-14 10:56:15 +02:00
balint1414
e1870b08e5 Hiba ablak szövegének megváltoztatása. 2024-06-14 10:44:10 +02:00
22 changed files with 325 additions and 96 deletions

View File

@@ -22,7 +22,7 @@ import 'package:intl/intl.dart';
import 'package:refilc_kreta_api/models/message.dart'; import 'package:refilc_kreta_api/models/message.dart';
// if you want to add a new category, also add it to the DB or else the app will probably crash // if you want to add a new category, also add it to the DB or else the app will probably crash
enum LastSeenCategory { enum LastSeenCategory {
grade, grade,
surprisegrade, surprisegrade,
absence, absence,

View File

@@ -0,0 +1,130 @@
import 'dart:math';
class Uwuifier {
final Map<String, double> _spacesModifier;
final double _wordsModifier;
final List<String> faces = [
"OwO",
"UwU",
">w<",
"^w^",
"^-^",
":3",
];
final List<List<String>> uwuMap = [
['(?:r|l)', 'w'],
['(?:R|L)', 'W'],
['na', 'nya'],
['ne', 'nye'],
['NA', 'NYA'],
['NE', 'NYE'],
['Na', 'Nya'],
['Ne', 'Nye'],
['no', 'nyo'],
['NO', 'NYO'],
['No', 'Nyo'],
['nO', 'NYo'],
['ove', 'uv'],
['no', 'nwo'],
];
final Map<String, String> _uwuCache = {};
Uwuifier({
Map<String, double>? spaces,
double? words,
}) : _spacesModifier = spaces ?? {
'faces': 0.05,
'actions': 0.0,
'stutters': 0.1,
},
_wordsModifier = words ?? 1.0;
String uwuifyWords(String sentence) {
final words = sentence.split(' ');
final uwuifiedSentence = words.map((word) {
if (isAt(word) || isUri(word)) return word;
var seed = Random().nextDouble();
for (final uwuMapEntry in uwuMap) {
final oldWord = RegExp(uwuMapEntry[0], caseSensitive: false);
final newWord = uwuMapEntry[1];
if (seed > _wordsModifier) continue;
word = word.replaceAll(oldWord, newWord);
}
return word;
}).join(' ');
return uwuifiedSentence;
}
String uwuifySpaces(String sentence) {
final words = sentence.split(' ');
final faceThreshold = _spacesModifier['faces']!;
final actionThreshold = _spacesModifier['actions']! + faceThreshold;
final stutterThreshold = _spacesModifier['stutters']! + actionThreshold;
final uwuifiedSentence = words.map((word) {
final seed = Random().nextDouble();
final firstCharacter = word[0];
if (seed <= faceThreshold && faces.isNotEmpty) {
word += ' ${faces[Random().nextInt(faces.length)]}';
} else if (seed <= actionThreshold) {
// Skip actions
} else if (seed <= stutterThreshold && !isUri(word)) {
if (Random().nextInt(10) == 0) {
final stutter = Random().nextInt(3);
return '${firstCharacter * (stutter + 1)}-$word';
}
}
return word;
}).join(' ');
return uwuifiedSentence;
}
String uwuifySentence(String sentence) {
if (_uwuCache.containsKey(sentence)) {
return _uwuCache[sentence]!;
}
var uwuifiedSentence = uwuifyWords(sentence);
uwuifiedSentence = uwuifySpaces(uwuifiedSentence);
_uwuCache[sentence] = uwuifiedSentence;
return uwuifiedSentence;
}
bool isAt(String value) {
return value.startsWith('@');
}
bool isUri(String? value) {
if (value == null) return false;
final split = RegExp(
r'''(?:([^:/?#]+):)?(?:\/\/([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?''')
.firstMatch(value);
if (split == null) return false;
final scheme = split.group(1);
final authority = split.group(2);
final path = split.group(3);
if (!(scheme?.isNotEmpty == true && path?.isNotEmpty == true)) return false;
if (authority != null && authority.isNotEmpty) {
if (!(path?.isEmpty == true || path!.startsWith('/'))) return false;
} else if (path?.startsWith('//') == true) {
return false;
}
if (!RegExp(r'''^[a-z][a-z0-9+\-\.]*$''', caseSensitive: false)
.hasMatch(scheme!.toLowerCase())) {
return false;
}
return true;
}
}

View File

@@ -3,7 +3,7 @@ description: "Egy nem hivatalos e-KRÉTA kliens, diákoktól diákoknak."
homepage: https://refilc.hu homepage: https://refilc.hu
publish_to: "none" publish_to: "none"
version: 5.0.1+265 version: 5.0.2+266
environment: environment:
sdk: ">=2.17.0 <=3.3.2" sdk: ">=2.17.0 <=3.3.2"

View File

@@ -80,8 +80,8 @@ class KretaClient {
_status.triggerRequest(res); _status.triggerRequest(res);
if (res.statusCode == 401) { if (res.statusCode == 401) {
await refreshLogin();
headerMap.remove("authorization"); headerMap.remove("authorization");
await refreshLogin();
} else { } else {
break; break;
} }
@@ -212,8 +212,8 @@ class KretaClient {
res = await request.send(); res = await request.send();
if (res.statusCode == 401) { if (res.statusCode == 401) {
headerMap.remove("authorization");
await refreshLogin(); await refreshLogin();
headerMap.remove("authorization");
} else { } else {
break; break;
} }

View File

@@ -1,6 +1,7 @@
// ignore_for_file: no_leading_underscores_for_local_identifiers // ignore_for_file: no_leading_underscores_for_local_identifiers
import 'package:refilc/utils/format.dart'; import 'package:refilc/utils/format.dart';
import 'package:uuid/uuid.dart';
import 'category.dart'; import 'category.dart';
import 'subject.dart'; import 'subject.dart';
import 'teacher.dart'; import 'teacher.dart';
@@ -75,6 +76,40 @@ class Grade {
); );
} }
factory Grade.fromExportJson(Map json) {
return Grade(
id: const Uuid().v4(),
date: json["date"] != null ? DateTime.parse(json["date"]) : DateTime(0),
value: GradeValue(
json["value"] ?? 0,
json["value_name"] ?? "",
json["value_name"] ?? "",
json["weight"] ?? 0,
percentage: false,
),
teacher: Teacher.fromString((json["teacher"] ?? "").trim()),
description: json["description"] ?? "",
type: json["type"] != null
? Category.getGradeType(json["type"]
.replaceAll("midYear", "evkozi_jegy_ertekeles")
.replaceAll("halfYear", "felevi_jegy_ertekeles")
.replaceAll("endYear", "evvegi_jegy_ertekeles"))
: GradeType.unknown,
groupId: const Uuid().v4(),
subject: GradeSubject(
id: const Uuid().v4(),
category: Category.fromJson({}),
name: json["subject"] ?? ""),
mode: Category.fromJson({}),
writeDate:
json["date"] != null ? DateTime.parse(json["date"]) : DateTime(0),
seenDate:
json["date"] != null ? DateTime.parse(json["date"]) : DateTime(0),
form: "",
json: json,
);
}
bool compareTo(dynamic other) { bool compareTo(dynamic other) {
if (runtimeType != other.runtimeType) return false; if (runtimeType != other.runtimeType) return false;

View File

@@ -155,8 +155,6 @@ class GradeProvider with ChangeNotifier {
} }
} }
print(gradeStreak);
user.gradeStreak = gradeStreak; user.gradeStreak = gradeStreak;
notifyListeners(); notifyListeners();
} }

View File

@@ -9,7 +9,7 @@ extension Localization on String {
"unexcused": "unexcused %s", "unexcused": "unexcused %s",
"absence": "absence", "absence": "absence",
"delay": "delay", "delay": "delay",
"minute": " minutes of ".one(" minute of "), "minute": " minute(s) of ",
}, },
"hu_hu": { "hu_hu": {
"excused": "igazolt %s", "excused": "igazolt %s",
@@ -25,7 +25,7 @@ extension Localization on String {
"unexcused": "unanerkannt %s", "unexcused": "unanerkannt %s",
"absence": "Abwesenheit", "absence": "Abwesenheit",
"delay": "Verspätung", "delay": "Verspätung",
"minute": " Minuten ".one(" Minute "), "minute": " Minute(n) ",
} }
}; };

View File

@@ -9,7 +9,7 @@ extension Localization on String {
"Mode": "Mode", "Mode": "Mode",
"Submit date": "Submit Date", "Submit date": "Submit Date",
"show in timetable": "Show in timetable", "show in timetable": "Show in timetable",
"minutes": "minutes".one("minute"), "minutes": "minute(s)",
"delay": "Delay", "delay": "Delay",
}, },
"hu_hu": { "hu_hu": {
@@ -27,7 +27,7 @@ extension Localization on String {
"Mode": "Typ", "Mode": "Typ",
"Submit date": "Datum einreichen", "Submit date": "Datum einreichen",
"show in timetable": "im Stundenplan anzeigen", "show in timetable": "im Stundenplan anzeigen",
"minutes": "Minuten".one("Minute"), "minutes": "Minute(n)",
"delay": "Verspätung", "delay": "Verspätung",
} }
}; };

View File

@@ -17,7 +17,7 @@ extension Localization on String {
"Messages": "Messages", "Messages": "Messages",
"Absences": "Absences", "Absences": "Absences",
"update_available": "Update Available", "update_available": "Update Available",
"missed_exams": "You missed %s exams this week.".one("You missed an exam this week."), "missed_exams": "You missed %s exam(s) this week.",
"missed_exam_contact": "Contact %s, to resolve it!", "missed_exam_contact": "Contact %s, to resolve it!",
}, },
"hu_hu": { "hu_hu": {
@@ -34,7 +34,7 @@ extension Localization on String {
"Messages": "Üzenetek", "Messages": "Üzenetek",
"Absences": "Hiányok", "Absences": "Hiányok",
"update_available": "Frissítés elérhető", "update_available": "Frissítés elérhető",
"missed_exams": "Ezen a héten hiányoztál %s dolgozatról.".one("Ezen a héten hiányoztál egy dolgozatról."), "missed_exams": "Ezen a héten hiányoztál %s dolgozatról.",
"missed_exam_contact": "Keresd %s-t, ha pótolni szeretnéd!", "missed_exam_contact": "Keresd %s-t, ha pótolni szeretnéd!",
}, },
"de_de": { "de_de": {
@@ -51,7 +51,7 @@ extension Localization on String {
"Messages": "Nachrichten", "Messages": "Nachrichten",
"Absences": "Fehlen", "Absences": "Fehlen",
"update_available": "Update verfügbar", "update_available": "Update verfügbar",
"missed_exams": "Diese Woche haben Sie %s Prüfungen verpasst.".one("Diese Woche haben Sie eine Prüfung verpasst."), "missed_exams": "Diese Woche haben Sie %s Prüfungen verpasst.",
"missed_exam_contact": "Wenden Sie sich an %s, um sie zu erneuern!", "missed_exam_contact": "Wenden Sie sich an %s, um sie zu erneuern!",
}, },
}; };

View File

@@ -1,9 +1,12 @@
// ignore_for_file: no_leading_underscores_for_local_identifiers // ignore_for_file: no_leading_underscores_for_local_identifiers
import 'dart:convert';
import 'dart:io';
import 'dart:math'; import 'dart:math';
import 'package:auto_size_text/auto_size_text.dart'; import 'package:auto_size_text/auto_size_text.dart';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:file_picker/file_picker.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:refilc/api/providers/update_provider.dart'; import 'package:refilc/api/providers/update_provider.dart';
import 'package:refilc/models/settings.dart'; import 'package:refilc/models/settings.dart';
@@ -89,19 +92,18 @@ class GradesPageState extends State<GradesPage> {
int avgDropValue = 0; int avgDropValue = 0;
bool gradeCalcMode = false; bool gradeCalcMode = false;
bool importedViewMode = false;
List<Grade> jsonGrades = [];
List<Grade> getSubjectGrades(GradeSubject subject, List<Grade> getSubjectGrades(GradeSubject subject,
{int days = 0}) => {int days = 0}) =>
!gradeCalcMode !gradeCalcMode
? gradeProvider ? (importedViewMode ? jsonGrades : gradeProvider.grades)
.grades
.where((e) => .where((e) =>
e e.subject == subject &&
.subject ==
subject &&
e.type == GradeType.midYear && e.type == GradeType.midYear &&
(days == (days == 0 ||
0 ||
e.date.isBefore( e.date.isBefore(
DateTime.now().subtract(Duration(days: days))))) DateTime.now().subtract(Duration(days: days)))))
.toList() .toList()
@@ -110,18 +112,19 @@ class GradesPageState extends State<GradesPage> {
.toList(); .toList();
void generateTiles() { void generateTiles() {
List<GradeSubject> subjects = gradeProvider.grades List<GradeSubject> subjects =
.map((e) => GradeSubject( (importedViewMode ? jsonGrades : gradeProvider.grades)
category: e.subject.category, .map((e) => GradeSubject(
id: e.subject.id, category: e.subject.category,
name: e.subject.name, id: e.subject.id,
renamedTo: e.subject.renamedTo, name: e.subject.name,
customRounding: e.subject.customRounding, renamedTo: e.subject.renamedTo,
teacher: e.teacher, customRounding: e.subject.customRounding,
)) teacher: e.teacher,
.toSet() ))
.toList() .toSet()
..sort((a, b) => a.name.compareTo(b.name)); .toList()
..sort((a, b) => a.name.compareTo(b.name));
List<Widget> tiles = []; List<Widget> tiles = [];
Map<GradeSubject, double> subjectAvgs = {}; Map<GradeSubject, double> subjectAvgs = {};
@@ -165,7 +168,8 @@ class GradesPageState extends State<GradesPage> {
e.subject.id == subject.id && e.writeDate.isAfter(DateTime.now())); e.subject.id == subject.id && e.writeDate.isAfter(DateTime.now()));
bool hasUnder = (hasHomework || nearestExam != null) && bool hasUnder = (hasHomework || nearestExam != null) &&
Provider.of<SettingsProvider>(context).qSubjectsSubTiles; Provider.of<SettingsProvider>(context, listen: false)
.qSubjectsSubTiles;
return Padding( return Padding(
padding: i > 1 ? const EdgeInsets.only(top: 9.0) : EdgeInsets.zero, padding: i > 1 ? const EdgeInsets.only(top: 9.0) : EdgeInsets.zero,
@@ -220,7 +224,8 @@ class GradesPageState extends State<GradesPage> {
height: 6.0, height: 6.0,
), ),
if (hasHomework && if (hasHomework &&
Provider.of<SettingsProvider>(context).qSubjectsSubTiles) Provider.of<SettingsProvider>(context, listen: false)
.qSubjectsSubTiles)
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
boxShadow: [ boxShadow: [
@@ -448,25 +453,28 @@ class GradesPageState extends State<GradesPage> {
.fold(0.0, (double a, double b) => a + b) / .fold(0.0, (double a, double b) => a + b) /
gradeProvider.groupAverages.length; gradeProvider.groupAverages.length;
final now = gradeProvider.grades.isNotEmpty final now =
? gradeProvider.grades (importedViewMode ? jsonGrades : gradeProvider.grades).isNotEmpty
.reduce((v, e) => e.date.isAfter(v.date) ? e : v) ? (importedViewMode ? jsonGrades : gradeProvider.grades)
.date .reduce((v, e) => e.date.isAfter(v.date) ? e : v)
: DateTime.now(); .date
: DateTime.now();
final currentStudentAvg = AverageHelper.averageEvals(!gradeCalcMode final currentStudentAvg = AverageHelper.averageEvals(!gradeCalcMode
? gradeProvider.grades ? (importedViewMode ? jsonGrades : gradeProvider.grades)
.where((e) => e.type == GradeType.midYear) .where((e) => e.type == GradeType.midYear)
.toList() .toList()
: calculatorProvider.grades); : calculatorProvider.grades);
final prevStudentAvg = AverageHelper.averageEvals(gradeProvider.grades final prevStudentAvg = AverageHelper.averageEvals((importedViewMode
? jsonGrades
: gradeProvider.grades)
.where((e) => e.type == GradeType.midYear) .where((e) => e.type == GradeType.midYear)
.where((e) => e.date.isBefore(now.subtract(const Duration(days: 30)))) .where((e) => e.date.isBefore(now.subtract(const Duration(days: 30))))
.toList()); .toList());
List<Grade> graphGrades = !gradeCalcMode List<Grade> graphGrades = !gradeCalcMode
? gradeProvider.grades ? (importedViewMode ? jsonGrades : gradeProvider.grades)
.where((e) => .where((e) =>
e.type == GradeType.midYear && e.type == GradeType.midYear &&
(avgDropValue == 0 || (avgDropValue == 0 ||
@@ -500,7 +508,7 @@ class GradesPageState extends State<GradesPage> {
// const SizedBox(width: 4.0), // const SizedBox(width: 4.0),
TrendDisplay( TrendDisplay(
previous: prevStudentAvg, current: currentStudentAvg), previous: prevStudentAvg, current: currentStudentAvg),
if (gradeProvider.grades if ((importedViewMode ? jsonGrades : gradeProvider.grades)
.where((e) => e.type == GradeType.midYear) .where((e) => e.type == GradeType.midYear)
.isNotEmpty) .isNotEmpty)
AverageDisplay(average: currentStudentAvg), AverageDisplay(average: currentStudentAvg),
@@ -632,7 +640,8 @@ class GradesPageState extends State<GradesPage> {
void gradeCalcTotal(BuildContext context) { void gradeCalcTotal(BuildContext context) {
calculatorProvider.clear(); calculatorProvider.clear();
calculatorProvider.addAllGrades(gradeProvider.grades); calculatorProvider
.addAllGrades((importedViewMode ? jsonGrades : gradeProvider.grades));
_sheetController = _scaffoldKey.currentState?.showBottomSheet( _sheetController = _scaffoldKey.currentState?.showBottomSheet(
(context) => const RoundedBottomSheet( (context) => const RoundedBottomSheet(
@@ -693,6 +702,64 @@ class GradesPageState extends State<GradesPage> {
const SizedBox( const SizedBox(
height: 10.0, height: 10.0,
), ),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0),
color: Theme.of(context).colorScheme.background),
child: ListTile(
title: Row(
children: [
const Icon(Icons.toll_rounded),
const SizedBox(
width: 10.0,
),
Text('import_grades'.i18n),
],
),
trailing: importedViewMode ? const Icon(FeatherIcons.x) : null,
onTap: () {
if (importedViewMode) {
importedViewMode = false;
generateTiles();
setState(() {});
Navigator.of(context, rootNavigator: true).pop();
return;
}
if (!Provider.of<PlusProvider>(context, listen: false)
.hasScope(PremiumScopes.gradeExporting)) {
PlusLockedFeaturePopup.show(
context: context, feature: PremiumFeature.gradeExporting);
return;
}
// show file picker
FilePicker.platform.pickFiles(
type: FileType.custom,
allowedExtensions: ['json'],
).then((value) {
if (value != null) {
final File file = File(value.files.single.path!);
final String content = file.readAsStringSync();
final List<dynamic> json = jsonDecode(content);
jsonGrades = json.map((e) => Grade.fromJson(e)).toList();
importedViewMode = true;
generateTiles();
setState(() {});
}
});
Navigator.of(context, rootNavigator: true).pop();
},
),
),
const SizedBox(
height: 10.0,
),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0), borderRadius: BorderRadius.circular(12.0),

View File

@@ -4,8 +4,9 @@ extension Localization on String {
static final _t = Translations.byLocale("hu_hu") + static final _t = Translations.byLocale("hu_hu") +
{ {
"en_en": { "en_en": {
"Grades": "Subjects", "Grades": "Grades",
"Ghost Grades": "Grades", "page_title_grades": "Subjects",
"Ghost Grades": "Ghost Grades",
"Subjects": "Your Subjects", "Subjects": "Your Subjects",
"Subjects_changes": "Subject Differences", "Subjects_changes": "Subject Differences",
"empty": "You don't have any subjects.", "empty": "You don't have any subjects.",
@@ -17,8 +18,7 @@ extension Localization on String {
"subjectavg": "Subject Average", "subjectavg": "Subject Average",
"classavg": "Class Average", "classavg": "Class Average",
"fail_warning": "Failure warning", "fail_warning": "Failure warning",
"fail_warning_description": "fail_warning_description": "You are failing %d subject(s)!",
"You are failing %d subjects!".one("You are failing a subject!"),
"data": "Data", "data": "Data",
"you_have_hw": "You have %s homework(s) to do", "you_have_hw": "You have %s homework(s) to do",
"grades_cnt": "Grade count: %s", "grades_cnt": "Grade count: %s",
@@ -29,6 +29,7 @@ extension Localization on String {
"grades": "Grades", "grades": "Grades",
"show_exams_homework": "Exams and Homework", "show_exams_homework": "Exams and Homework",
"grade_calc": "Grade Calculator", "grade_calc": "Grade Calculator",
"import_grades": "Import Grades (JSON)",
}, },
"hu_hu": { "hu_hu": {
"Grades": "Jegyek", "Grades": "Jegyek",
@@ -56,9 +57,11 @@ extension Localization on String {
"grades": "Jegyek", "grades": "Jegyek",
"show_exams_homework": "Dolgozatok és házik", "show_exams_homework": "Dolgozatok és házik",
"grade_calc": "Jegy kalkulátor", "grade_calc": "Jegy kalkulátor",
"import_grades": "Jegyek importálása (JSON)",
}, },
"de_de": { "de_de": {
"Grades": "Fächer", "Grades": "Klassen",
"page_title_grades": "Themen",
"Ghost Grades": "Geist Noten", "Ghost Grades": "Geist Noten",
"Subjects": "Ihre Themen", "Subjects": "Ihre Themen",
"Subjects_changes": "Betreff Änderungen", "Subjects_changes": "Betreff Änderungen",
@@ -82,6 +85,7 @@ extension Localization on String {
"grades": "Noten", "grades": "Noten",
"show_exams_homework": "Referate und Hausaufgaben", "show_exams_homework": "Referate und Hausaufgaben",
"grade_calc": "Noten-Rechner", "grade_calc": "Noten-Rechner",
"import_grades": "Noten importieren (JSON)",
}, },
}; };

View File

@@ -19,8 +19,7 @@ extension Localization on String {
"Messages": "Messages", "Messages": "Messages",
"Absences": "Absences", "Absences": "Absences",
"update_available": "Update Available", "update_available": "Update Available",
"missed_exams": "You missed %s exams this week." "missed_exams": "You missed %s exam(s) this week.",
.one("You missed an exam this week."),
"missed_exam_contact": "Contact %s to resolve it!", "missed_exam_contact": "Contact %s to resolve it!",
}, },
"hu_hu": { "hu_hu": {
@@ -39,8 +38,7 @@ extension Localization on String {
"Messages": "Üzenetek", "Messages": "Üzenetek",
"Absences": "Hiányzások", "Absences": "Hiányzások",
"update_available": "Frissítés elérhető", "update_available": "Frissítés elérhető",
"missed_exams": "Ezen a héten hiányoztál %s dolgozatról." "missed_exams": "Ezen a héten hiányoztál %s dolgozatról.",
.one("Ezen a héten hiányoztál egy dolgozatról."),
"missed_exam_contact": "Keresd %s tanár urat/hölgyet, hogy pótold!", "missed_exam_contact": "Keresd %s tanár urat/hölgyet, hogy pótold!",
}, },
"de_de": { "de_de": {
@@ -59,8 +57,7 @@ extension Localization on String {
"Messages": "Nachrichten", "Messages": "Nachrichten",
"Absences": "Fehlen", "Absences": "Fehlen",
"update_available": "Update verfügbar", "update_available": "Update verfügbar",
"missed_exams": "Diese Woche haben Sie %s Prüfungen verpasst." "missed_exams": "Diese Woche haben Sie %s Prüfungen verpasst.",
.one("Diese Woche haben Sie eine Prüfung verpasst."),
"missed_exam_contact": "Wenden Sie sich an %s, um sie zu erneuern!", "missed_exam_contact": "Wenden Sie sich an %s, um sie zu erneuern!",
}, },
}; };

View File

@@ -5,8 +5,8 @@ extension Localization on String {
{ {
"en_en": { "en_en": {
"next": "Next", "next": "Next",
"remaining min": "%d mins".one("%d min"), "remaining min": "%d min(s)",
"remaining sec": "%d secs".one("%d sec"), "remaining sec": "%d sec(s)",
"break": "Break", "break": "Break",
"go to room": "Go to room %s.", "go to room": "Go to room %s.",
"go ground floor": "Go to the ground floor.", "go ground floor": "Go to the ground floor.",
@@ -27,8 +27,8 @@ extension Localization on String {
}, },
"hu_hu": { "hu_hu": {
"next": "Következő", "next": "Következő",
"remaining min": "%d perc".one("%d perc"), "remaining min": "%d perc",
"remaining sec": "%d másodperc".one("%d másodperc"), "remaining sec": "%d másodperc",
"break": "Szünet", "break": "Szünet",
"go to room": "Menj a(z) %s terembe.", "go to room": "Menj a(z) %s terembe.",
"go ground floor": "Menj a földszintre.", "go ground floor": "Menj a földszintre.",
@@ -49,8 +49,8 @@ extension Localization on String {
}, },
"de_de": { "de_de": {
"next": "Nächste", "next": "Nächste",
"remaining min": "%d Minuten".one("%d Minute"), "remaining min": "%d Minute(n)",
"remaining sec": "%d Sekunden".one("%d Sekunden"), "remaining sec": "%d Sekunde(n)",
"break": "Pause", "break": "Pause",
"go to room": "Geh in den Raum %s.", "go to room": "Geh in den Raum %s.",
"go ground floor": "Geh dir Treppe hinunter.", "go ground floor": "Geh dir Treppe hinunter.",

View File

@@ -276,4 +276,4 @@ class ErrorDetail extends StatelessWidget {
), ),
); );
} }
} }

View File

@@ -5,7 +5,7 @@ extension SettingsLocalization on String {
{ {
"en_en": { "en_en": {
"ekretaYou": "e-KRÉTA, you", "ekretaYou": "e-KRÉTA, you",
"description": "An error occurred!", "description": "Unexpected error while using the application!",
"submit": "Submit", "submit": "Submit",
"goback": "Go back", "goback": "Go back",
"details": "Details", "details": "Details",
@@ -15,11 +15,11 @@ extension SettingsLocalization on String {
"stack": "Stack Trace", "stack": "Stack Trace",
"done": "Done", "done": "Done",
"smth_went_wrong": "smth_went_wrong":
"Something went wrong, it is of course the fault of Educational Development Informatikai Zrt. (e-KRÉTA) in any case! /s", "An unexpected error occurred while using the app.",
}, },
"hu_hu": { "hu_hu": {
"ekretaYou": "e-KRÉTA, te", "ekretaYou": "e-KRÉTA, te",
"description": "Fasz-emulátor hivatásos balfasz!", "description": "Váratlan hiba az alkalmazás használata közben!",
"submit": "Hiba jelentése", "submit": "Hiba jelentése",
"goback": "Vissza", "goback": "Vissza",
"details": "Részletek", "details": "Részletek",
@@ -29,11 +29,11 @@ extension SettingsLocalization on String {
"stack": "Stacktrace", "stack": "Stacktrace",
"done": "Kész", "done": "Kész",
"smth_went_wrong": "smth_went_wrong":
"Valami probléma történt, ez természetesen az Educational Development Informatikai Zrt. (e-KRÉTA) hibája minden esetben! /s", "Nem várt hiba következett be az alkalmazás használata közben.",
}, },
"de_de": { "de_de": {
"ekretaYou": "e-KRÉTA, du", "ekretaYou": "e-KRÉTA, du",
"description": "Ein Fehler ist aufgetreten!", "description": "Unerwarteter Fehler bei der Benutzung der Anwendung!",
"submit": "Abschicken", "submit": "Abschicken",
"goback": "Zurück", "goback": "Zurück",
"details": "Details", "details": "Details",
@@ -43,7 +43,7 @@ extension SettingsLocalization on String {
"stack": "Stack Trace", "stack": "Stack Trace",
"done": "Fertig", "done": "Fertig",
"smth_went_wrong": "smth_went_wrong":
"Irgendetwas ist schief gelaufen, es ist natürlich auf jeden Fall die Schuld der Educational Development Informatikai Zrt. (e-KRÉTA)! /s", "Bei der Benutzung der Anwendung ist ein unerwarteter Fehler aufgetreten.",
}, },
}; };

View File

@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:refilc_kreta_api/client/api.dart'; import 'package:refilc_kreta_api/client/api.dart';
@@ -60,7 +61,10 @@ class _KretenLoginScreenState extends State<KretenLoginScreen> {
"grant_type": "authorization_code", "grant_type": "authorization_code",
}); });
if (res != null) { if (res != null) {
print(res); if (kDebugMode) {
print(res);
}
// if (res.containsKey("error")) { // if (res.containsKey("error")) {
// if (res["error"] == "invalid_grant") { // if (res["error"] == "invalid_grant") {
// print("ERROR: invalid_grant"); // print("ERROR: invalid_grant");

View File

@@ -59,10 +59,6 @@ class AccountView extends StatelessWidget {
const SizedBox( const SizedBox(
height: 10.0, height: 10.0,
), ),
// Detail(
// title: "parents".i18n,
// description: user.student.parents.join(", ")),
Detail(title: "school".i18n, description: user.student.school.name),
], ],
), ),
); );

View File

@@ -8,22 +8,22 @@ extension Localization on String {
"school": "School", "school": "School",
"class": "Class", "class": "Class",
"address": "Home address", "address": "Home address",
"parents": "Parents".one("Parent"), "parents": "Parent(s)",
"parents_phone": "Parents' phone number: ".one("Parent"), "parents_phone": "Parents' phone number: ",
}, },
"hu_hu": { "hu_hu": {
"birthdate": "Születési dátum", "birthdate": "Születési dátum",
"school": "Iskola", "school": "Iskola",
"class": "Osztály", "class": "Osztály",
"address": "Lakcím", "address": "Lakcím",
"parents": "Szülők".one("Szülő"), "parents": "Szülő(k)",
}, },
"de_de": { "de_de": {
"birthdate": "Geburtsdatum", "birthdate": "Geburtsdatum",
"school": "Schule", "school": "Schule",
"class": "Klasse", "class": "Klasse",
"address": "Wohnanschrift", "address": "Wohnanschrift",
"parents": "Eltern", "parents": "Elter(n)",
}, },
}; };

View File

@@ -4,6 +4,8 @@ extension SettingsLocalization on String {
static final _t = Translations.byLocale("hu_hu") + static final _t = Translations.byLocale("hu_hu") +
{ {
"en_en": { "en_en": {
"heads_up": "Heads up!",
"export_warning": "Exported grades are currently not yet viewable in reFilc, you'll only be able to view them manually in JSON format. In the future, this functionality will be extended and you will be able to view the tickets in the app interface.",
"personal_details": "Personal Details", "personal_details": "Personal Details",
"open_dkt": "Open DCS", "open_dkt": "Open DCS",
"edit_nickname": "Edit Nickname", "edit_nickname": "Edit Nickname",
@@ -126,6 +128,8 @@ extension SettingsLocalization on String {
"grade_exporting": "Grade Exporting", "grade_exporting": "Grade Exporting",
}, },
"hu_hu": { "hu_hu": {
"heads_up": "Figyelem!",
"export_warning": "Az exportált jegyek jelenleg még nem megtekinthetők a reFilc-ben, csak te magad tudod átnézni őket JSON formátumban. A jövőben ez a funkció bővülni fog, és a jegyeket meg is tekintheted majd a reFilc felületén.",
"personal_details": "Személyes információk", "personal_details": "Személyes információk",
"open_dkt": "DKT megnyitása", "open_dkt": "DKT megnyitása",
"edit_nickname": "Becenév szerkesztése", "edit_nickname": "Becenév szerkesztése",
@@ -248,6 +252,8 @@ extension SettingsLocalization on String {
"grade_exporting": "Jegy exportálás", "grade_exporting": "Jegy exportálás",
}, },
"de_de": { "de_de": {
"heads_up": "Achtung!",
"export_warning": "Exportierte Tickets sind derzeit noch nicht in reFilc einsehbar, Sie können sie nur selbst im JSON- Format überprüfen. In Zukunft wird diese Funktionalität erweitert und Sie werden die Tickets in der reFilc-Oberfläche anzeigen können",
"personal_details": "Persönliche Angaben", "personal_details": "Persönliche Angaben",
"open_dkt": "Öffnen RDZ", "open_dkt": "Öffnen RDZ",
"edit_nickname": "Spitznamen bearbeiten", "edit_nickname": "Spitznamen bearbeiten",

View File

@@ -24,26 +24,17 @@ extension SettingsLocalization on String {
"dontfelt": "You didn't like this...", "dontfelt": "You didn't like this...",
"youlate": "You're late!", "youlate": "You're late!",
// allsum page // allsum page
"test": "tests" "test": "test(s)",
.one("test"), "closingtest": "module test(s)",
"closingtest": "module tests" "grade": "grade(s)",
.one("module test"), "hw": "homework(s)",
"grade": "grades" "subject": "subject(s)",
.one("grade"), "lesson": "lesson(s)",
"hw": "homeworks" "absence_sum": "absence(s)",
.one("homework"),
"subject": "subjects"
.one("subject"),
"lesson": "lessons"
.one("lesson"),
"absence_sum": "absences"
.one("absence"),
"excused": "excused", "excused": "excused",
"unexcused": "unexcused", "unexcused": "unexcused",
"delay_sum": "delays" "delay_sum": "delay(s)",
.one("delay"), "min": "minute(s)",
"min": "minutes"
.one("minute"),
// personality page // personality page
"click_reveal": "Click to reveal...", "click_reveal": "Click to reveal...",
}, },

View File

@@ -72,6 +72,7 @@ dependencies:
carousel_slider: ^4.2.1 carousel_slider: ^4.2.1
flutter_portal: ^1.1.4 flutter_portal: ^1.1.4
webview_flutter: ^4.8.0 webview_flutter: ^4.8.0
file_picker: ^6.2.1
dev_dependencies: dev_dependencies:
flutter_lints: ^3.0.1 flutter_lints: ^3.0.1