From 2ff2ae7d98f2a5eeb1dcd5beeb44f450542f8d86 Mon Sep 17 00:00:00 2001 From: pml68 Date: Sat, 24 Feb 2024 21:22:33 +0100 Subject: [PATCH 1/3] fix: afternoon hours start from 12 PM, not 10 AM --- refilc_desktop_ui/lib/pages/home/home_page.dart | 2 +- refilc_mobile_ui/lib/pages/home/home_page.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/refilc_desktop_ui/lib/pages/home/home_page.dart b/refilc_desktop_ui/lib/pages/home/home_page.dart index e75476e..46804de 100644 --- a/refilc_desktop_ui/lib/pages/home/home_page.dart +++ b/refilc_desktop_ui/lib/pages/home/home_page.dart @@ -56,7 +56,7 @@ class _HomePageState extends State greeting = "happynewyear"; } else if (now.hour >= 18) { greeting = "goodevening"; - } else if (now.hour >= 10) { + } else if (now.hour >= 12) { greeting = "goodafternoon"; } else if (now.hour >= 4) { greeting = "goodmorning"; diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart index 11d5607..2031398 100644 --- a/refilc_mobile_ui/lib/pages/home/home_page.dart +++ b/refilc_mobile_ui/lib/pages/home/home_page.dart @@ -154,7 +154,7 @@ class HomePageState extends State with TickerProviderStateMixin { customWelcome = true; } else if (now.hour >= 18) { greeting = "goodevening"; - } else if (now.hour >= 10) { + } else if (now.hour >= 12) { greeting = "goodafternoon"; } else if (now.hour >= 4) { greeting = "goodmorning"; From c5526a41d3229e31b7c38cb1a8666658034d48a7 Mon Sep 17 00:00:00 2001 From: pml68 Date: Sat, 24 Feb 2024 21:32:18 +0100 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20"hi=C3=A1nyz=C3=A1said"=20instead=20?= =?UTF-8?q?of=20"hi=C3=A1nyaid"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart | 2 +- refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart index 2b37c00..2ced11e 100644 --- a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart @@ -22,7 +22,7 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "empty": "Nincsenek hiányaid.", + "empty": "Nincsenek hiányzásaid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart index 5abdcd2..e56de35 100644 --- a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart @@ -23,7 +23,7 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "empty": "Nincsenek hiányaid.", + "empty": "Nincsenek hiányzásaid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", From 310636413e700d25424392bb29b1203745fd6950 Mon Sep 17 00:00:00 2001 From: pml68 Date: Sat, 24 Feb 2024 22:58:33 +0100 Subject: [PATCH 3/3] fix: separate the "misses" and "delays" empty case strings --- refilc_desktop_ui/lib/pages/absences/absences_page.dart | 2 +- .../lib/pages/absences/absences_page.i18n.dart | 9 ++++++--- refilc_mobile_ui/lib/pages/absences/absences_page.dart | 2 +- .../lib/pages/absences/absences_page.i18n.dart | 9 ++++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/refilc_desktop_ui/lib/pages/absences/absences_page.dart b/refilc_desktop_ui/lib/pages/absences/absences_page.dart index 58eb33e..c9afb82 100644 --- a/refilc_desktop_ui/lib/pages/absences/absences_page.dart +++ b/refilc_desktop_ui/lib/pages/absences/absences_page.dart @@ -395,7 +395,7 @@ class _AbsencesPageState extends State child: filterWidgets[index - (activeData <= 1 ? 1 : 0)], ); } else { - return Empty(subtitle: "empty".i18n); + return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n); } }, ), diff --git a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart index 2ced11e..4ee3da7 100644 --- a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart @@ -7,7 +7,8 @@ extension ScreensLocalization on String { "Absences": "Absences", "Delays": "Delays", "Misses": "Misses", - "empty": "You have no absences.", + "emptyDelays": "You have no absences.", + "emptyMisses": "You have no absences.", "stat_1": "Excused Absences", "stat_2": "Unexcused Absences", "stat_3": "Excused Delay", @@ -22,7 +23,8 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "empty": "Nincsenek hiányzásaid.", + "emptyDelays": "Nincsenek hiányzásaid.", + "emptyMisses": "Nincsenek hiányaid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", @@ -37,7 +39,8 @@ extension ScreensLocalization on String { "Absences": "Fehlen", "Delays": "Verspätung", "Misses": "Fehlt", - "empty": "Sie haben keine Fehlen.", + "emptyDelays": "Sie haben keine Fehlen.", + "emptyMisses": "Sie haben keine Fehlen.", "stat_1": "Entschuldigte Fehlen", "stat_2": "Unentschuldigte Fehlen", "stat_3": "Entschuldigte Verspätung", diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.dart index c95f185..5e9c2cd 100644 --- a/refilc_mobile_ui/lib/pages/absences/absences_page.dart +++ b/refilc_mobile_ui/lib/pages/absences/absences_page.dart @@ -423,7 +423,7 @@ class AbsencesPageState extends State child: filterWidgets[index - (activeData <= 1 ? 1 : 0)], ); } else { - return Empty(subtitle: "empty".i18n); + return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n); } }, ), diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart index e56de35..31282e8 100644 --- a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart @@ -7,7 +7,8 @@ extension ScreensLocalization on String { "Absences": "Absences", "Delays": "Delays", "Misses": "Misses", - "empty": "You have no absences.", + "emptyDelays": "You have no absences.", + "emptyMisses": "You have no absences.", "stat_1": "Excused Absences", "stat_2": "Unexcused Absences", "stat_3": "Excused Delay", @@ -23,7 +24,8 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "empty": "Nincsenek hiányzásaid.", + "emptyDelays": "Nincsenek hiányzásaid.", + "emptyMisses": "Nincsenek hiányaid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", @@ -39,7 +41,8 @@ extension ScreensLocalization on String { "Absences": "Fehlen", "Delays": "Verspätung", "Misses": "Fehlt", - "empty": "Sie haben keine Fehlen.", + "emptyDelays": "Sie haben keine Fehlen.", + "emptyMisses": "Sie haben keine Fehlen.", "stat_1": "Entschuldigte Fehlen", "stat_2": "Unentschuldigte Fehlen", "stat_3": "Entschuldigte Verspätung",