Andrei mirica19/replace year week number

android/fastlane/metadata/android/en-GB/changelogs/10041.txt

@@ -0,0 +1,2 @@
+Added:
+     -Users can now choose from setting if they want to see in the week indicator,from the timetable,the academic week number.

android/fastlane/metadata/android/en-US/changelogs/10041.txt

@@ -0,0 +1,2 @@
+Added:
+     -Users can now choose from setting if they want to see in the week indicator,from the timetable,the academic week number.

android/fastlane/metadata/android/ro/changelogs/10041.txt

@@ -0,0 +1,2 @@
+Adăugat:
+    -Utilizatorii pot alege din setări dacă vor să vadă în timetable numărul săptămânii din calendarul academic.

lib/generated/intl/messages_en.dart

@@ -288,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "settingsFeedbackForm" : MessageLookupByLibrary.simpleMessage("Contact us"),
     "settingsItemAdmin" : MessageLookupByLibrary.simpleMessage("Admin Panel"),
     "settingsItemDarkMode" : MessageLookupByLibrary.simpleMessage("Dark Mode"),
+    "settingsAcademicWeekNumber":MessageLookupByLibrary.simpleMessage("Academic week number"),
+    "settingsAcademicWeekNumberSubtitle":MessageLookupByLibrary.simpleMessage("Show number of week in the semester instead of the calendar year"),
     "settingsItemEditingPermissions" : MessageLookupByLibrary.simpleMessage("Your editing permissions"),
     "settingsItemLanguage" : MessageLookupByLibrary.simpleMessage("Language"),
     "settingsItemLanguageAuto" : MessageLookupByLibrary.simpleMessage("Auto"),

lib/generated/intl/messages_ro.dart

@@ -288,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "settingsFeedbackForm" : MessageLookupByLibrary.simpleMessage("Contactează-ne"),
     "settingsItemAdmin" : MessageLookupByLibrary.simpleMessage("Panoul Administratorului"),
     "settingsItemDarkMode" : MessageLookupByLibrary.simpleMessage("Mod Întunecat"),
+    "settingsAcademicWeekNumber":MessageLookupByLibrary.simpleMessage("Săptămâni academice"),
+    "settingsAcademicWeekNumberSubtitle":MessageLookupByLibrary.simpleMessage("Afișează săptămână din semestru în loc de cea din an"),
     "settingsItemEditingPermissions" : MessageLookupByLibrary.simpleMessage("Permisiunile tale de editare"),
     "settingsItemLanguage" : MessageLookupByLibrary.simpleMessage("Limbă"),
     "settingsItemLanguageAuto" : MessageLookupByLibrary.simpleMessage("Auto"),

lib/l10n/intl_en.arb

@@ -215,7 +215,9 @@
 
   "settingsTitlePersonalization": "Personalization",
   "settingsItemDarkMode": "Dark Mode",
+  "settingsAcademicWeekNumber":"Academic week number",
   "settingsTitleLocalization": "Localization",
+  "settingsAcademicWeekNumberSubtitle":"Show number of week in the semester instead of the calendar year"
   "settingsTitleDataControl": "Data control",
   "settingsItemEditingPermissions": "Your editing permissions",
   "settingsPermissionsNone": "No special permissions",

lib/l10n/intl_ro.arb

@@ -215,9 +215,11 @@
 
   "settingsTitlePersonalization": "Personalizare",
   "settingsItemDarkMode": "Mod Întunecat",
+  "settingsAcademicWeekNumber":"Săptămâni academice",
   "settingsTitleLocalization": "Localizare",
   "settingsTitleDataControl": "Control date",
   "settingsItemEditingPermissions": "Permisiunile tale de editare",
+  "settingsAcademicWeekNumberSubtitle":"Afișează săptămână din semestru în loc de cea din an"
   "settingsPermissionsNone": "Fără permisiuni speciale",
   "settingsPermissionsAdd": "Permisiune pentru adăugare de date publice",
   "settingsPermissionsEdit": "Permisiune pentru editare de date publice",

lib/pages/settings/view/settings_page.dart

@@ -5,6 +5,7 @@ import 'package:acs_upb_mobile/generated/l10n.dart';
 import 'package:acs_upb_mobile/navigation/routes.dart';
 import 'package:acs_upb_mobile/pages/settings/service/request_provider.dart';
 import 'package:acs_upb_mobile/pages/timetable/service/uni_event_provider.dart';
+import 'package:acs_upb_mobile/pages/timetable/view/lead_header.dart';
 import 'package:acs_upb_mobile/resources/locale_provider.dart';
 import 'package:acs_upb_mobile/resources/utils.dart';
 import 'package:acs_upb_mobile/widgets/icon_text.dart';
@@ -149,6 +150,22 @@ class _SettingsPageState extends State<SettingsPage> {
                     subtitle: Text(S.current.infoExportToGoogleCalendar),
                   ),
                 ),
+                Column(
+                  children: [
+                    SwitchPreference(
+                      S.current.settingsAcademicWeekNumber,
+                      'Academic week number',
+                      onEnable: () {
+                        LeadHeader.academicWeekNumber = true;
+                      },
+                      onDisable: () {
+                        LeadHeader.academicWeekNumber = false;
+                      },
+                      defaultVal: false,
+                      desc: S.current.settingsAcademicWeekNumberSubtitle,
+                    ),
+                  ],
+                ),
                 PreferenceTitle(S.current.labelFeedback),
                 ListTile(
                   key: const ValueKey('feedback_and_issues'),

lib/pages/timetable/model/academic_calendar.dart

@@ -1,4 +1,5 @@
 import 'package:acs_upb_mobile/pages/timetable/model/events/all_day_event.dart';
+import 'package:acs_upb_mobile/pages/timetable/view/lead_header.dart';
 import 'package:acs_upb_mobile/resources/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:time_machine/time_machine.dart';
@@ -77,4 +78,45 @@ class AcademicCalendar {
 
     return weeksByYear.values.expand((e) => e).toSet();
   }
+
+  int semesterForDate(LocalDate date) {
+    for (final semester in semesters) {
+      if (date._isBeforeOrDuring(semester)) {
+        return 1 + int.tryParse(semester.id[semester.id.length - 1]);
+      }
+    }
+    return -1;
+  }
+
+  String getWeekNumber(LocalDate date) {
+    final week = ((date.dayOfYear - date.dayOfWeek.value + 10) / 7).floor();
+    if (LeadHeader.academicWeekNumber == false) return week.toString();
+    final int finalWeekOfFirstSem = ((semesters[0].endDate.dayOfYear -
+                semesters[0].endDate.dayOfWeek.value +
+                10) /
+            7)
+        .floor();
+    if (!nonHolidayWeeks.contains(week)) {
+      return 'H';
+    } else {
+      if (semesterForDate(date) == 1) {
+        return (nonHolidayWeeks.toList().indexOf(week) + 1).toString();
+      } else {
+        return ((nonHolidayWeeks.toList().indexOf(week) + 1) -
+                (nonHolidayWeeks.toList().indexOf(finalWeekOfFirstSem) + 1))
+            .toString();
+      }
+    }
+  }
+}
+
+extension LocalDateComparisons on LocalDate {
+  bool _isDuring(AllDayUniEvent semester) {
+    return DateInterval(semester.startDate, semester.endDate).contains(this);
+  }
+
+  bool _isBeforeOrDuring(AllDayUniEvent semester) {
+    if (compareTo(semester.startDate) < 0) return true;
+    return _isDuring(semester);
+  }
 }

lib/pages/timetable/view/events/add_event_view.dart

@@ -109,22 +109,18 @@ class _AddEventViewState extends State<AddEventView> {
                 ? 2
                 : 1;
       } else {
-        bool foundSemester = false;
-        for (final calendar in calendars.entries) {
-          for (final semester in calendar.value.semesters) {
-            final LocalDate date =
-                widget.initialEvent.start.calendarDate ?? LocalDate.today();
-            if (date.isBeforeOrDuring(semester)) {
-              // semester.id is represented as "semesterN", where "semester0" is the first semester
-              selectedSemester =
-                  1 + int.tryParse(semester.id[semester.id.length - 1]);
-              selectedCalendar = calendar.key;
-              foundSemester = true;
-              break;
-            }
+        const bool foundSemester = false;
+        final LocalDate date =
+            widget.initialEvent.start.calendarDate ?? LocalDate.today();
+        calendars.forEach((key, value) {
+          final semester = value.semesterForDate(date);
+          if (semester != -1) {
+            selectedCalendar = key;
+            selectedSemester = semester;
+            return;
           }
-          if (foundSemester) break;
-        }
+        });
+
         if (!foundSemester) {
           selectedCalendar = calendars.entries.last.value.id;
           selectedSemester = 2;

lib/pages/timetable/view/lead_header.dart

@@ -0,0 +1,92 @@
+import 'package:acs_upb_mobile/authentication/model/user.dart';
+import 'package:acs_upb_mobile/authentication/service/auth_provider.dart';
+import 'package:acs_upb_mobile/pages/classes/model/class.dart';
+import 'package:acs_upb_mobile/pages/classes/service/class_provider.dart';
+import 'package:acs_upb_mobile/pages/people/model/person.dart';
+import 'package:acs_upb_mobile/pages/people/service/person_provider.dart';
+import 'package:acs_upb_mobile/pages/timetable/model/academic_calendar.dart';
+import 'package:acs_upb_mobile/pages/timetable/service/uni_event_provider.dart';
+import 'package:black_hole_flutter/black_hole_flutter.dart';
+import 'package:flutter/material.dart';
+import 'package:time_machine/time_machine.dart';
+
+import 'package:timetable/src/theme.dart';
+
+// ignore: implementation_imports
+import 'package:provider/provider.dart';
+
+class LeadHeader extends StatefulWidget {
+  const LeadHeader(this.date, {Key key}) : super(key: key);
+  final LocalDate date;
+  static var academicWeekNumber = false;
+
+  @override
+  _LeadHeaderState createState() => _LeadHeaderState();
+}
+
+class _LeadHeaderState extends State<LeadHeader> {
+  List<ClassHeader> classHeaders = [];
+  List<Person> classTeachers = [];
+  User user;
+  AcademicCalendar calendar;
+  Map<String, AcademicCalendar> calendars = {};
+  int academicWeek;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = context.theme;
+    final timetableTheme = context.timetableTheme;
+    final defaultBackgroundColor = theme.contrastColor.withOpacity(0.12);
+    final textStyle = timetableTheme?.weekIndicatorTextStyle ??
+        TextStyle(
+            color: defaultBackgroundColor
+                .alphaBlendOn(theme.scaffoldBackgroundColor)
+                .mediumEmphasisOnColor,
+            fontSize: 14);
+    final filteredCalendars = calendars?.values
+        ?.where((calendar) => calendar.semesterForDate(widget.date) != -1);
+    final calendar = filteredCalendars.isEmpty ? null : filteredCalendars.first;
+    return Container(
+      child: Center(
+        child: Container(
+          width: 27,
+          height: 20,
+          decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(2),
+              color: defaultBackgroundColor,
+              border: Border.all(color: defaultBackgroundColor, width: 1)),
+          child: calendar == null
+              ? Container()
+              : Text(
+                  calendar.getWeekNumber(widget.date),
+                  style: textStyle,
+                  textAlign: TextAlign.center,
+                ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  void initState() {
+    if (!mounted) {
+      return;
+    }
+    super.initState();
+    user =
+        Provider.of<AuthProvider>(context, listen: false).currentUserFromCache;
+    Provider.of<ClassProvider>(context, listen: false)
+        .fetchClassHeaders(uid: user.uid)
+        .then((headers) => setState(() => classHeaders = headers));
+    Provider.of<PersonProvider>(context, listen: false)
+        .fetchPeople()
+        .then((teachers) => setState(() => classTeachers = teachers));
+    Provider.of<UniEventProvider>(context, listen: false)
+        .fetchCalendars()
+        .then((calendars) {
+      setState(() {
+        this.calendars = calendars;
+      });
+    });
+  }
+}

lib/pages/timetable/view/timetable_page.dart

@@ -22,6 +22,7 @@ import 'package:provider/provider.dart';
 import 'package:recase/recase.dart';
 import 'package:time_machine/time_machine.dart';
 import 'package:timetable/timetable.dart';
+import 'lead_header.dart';
 
 class TimetablePage extends StatefulWidget {
   const TimetablePage({Key key}) : super(key: key);
@@ -98,6 +99,8 @@ class _TimetablePageState extends State<TimetablePage> {
         child: Stack(
           children: [
             Timetable<UniEventInstance>(
+              leadingHeaderBuilder: (_, date) =>
+                  LeadHeader(date ?? LocalDate.today()),
               controller: _controller,
               dateHeaderBuilder: (_, date) => DateHeader(date),
               eventBuilder: (event) => UniEventWidget(event),

pubspec.yaml

@@ -13,7 +13,7 @@ description: A mobile application for students at ACS UPB.
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 #
 # ACS UPB Mobile uses semantic versioning. You can read more in the CONTRIBUTING.md file.
-version: 1.3.1+41
+version: 1.3.1+42
 
 environment:
   sdk: ">=2.7.0 <3.0.0"