Pfe master fixed #1041

XavierPaquet-Rapold · 2024-08-10T03:12:23Z

⁉️ Related Issue

📖 Description

🧪 How Has This Been Tested?

☑️ Checklist before requesting a review

I have performed a self-review of my code.
If it is a core feature, I have added thorough tests.
If needed, I added analytics.
Make sure to add either one of the following labels: version: Major,version: Minor or version: Patch.

🖼️ Screenshots (if useful):

* implementation of seperate widgets for about_view * implementation of seperation widget of author_view * impementation of seperation widget of choose_language_view * implementation of seperation widget of contributors_view * implementation of seperation widget of emergency_view * implementation of seperation widget of faq_view * implementation of seperation widget of feedback view * implementation of seperation widget of more_view * implementation of seperation widget of grade_view * implementation of seperation widget of grade_details_view +contributors * implementation of seperation widget of login_view * [BOT] Applying format. * fix for test to pass * change name grade session courses * change in more_view * [BOT] Applying format. * change for warning and imports * [BOT] Applying format. * change test more_view * change moreview model * change more view model * implementation of seperation widget of dashboard_view * fix so app works but need insert the widgets * [BOT] Applying format. * Fix more viewmodels tests * [BOT] Update golden files --------- Co-authored-by: charlcl180 <[email protected]> Co-authored-by: Xavier Paquet-Rapold <[email protected]> Co-authored-by: XavierPaquet-Rapold <[email protected]>

…er2-FE2.3 # Conflicts: # .gitignore # lib/features/app/error/outage/outage_view.dart # lib/features/dashboard/dashboard_view.dart # lib/features/ets/events/report-news/report_news_widget.dart # lib/features/more/feedback/feedback_view.dart # test/features/app/analytics/analytics_service_mock.mocks.dart # test/features/app/analytics/remote_config_service_mock.mocks.dart # test/features/app/error/internal_info_service_mock.mocks.dart # test/features/app/integration/mocks/github_api_mock.mocks.dart # test/features/app/integration/mocks/launch_url_service_mock.mocks.dart # test/features/app/integration/mocks/networking_service_mock.mocks.dart # test/features/app/navigation/navigation_service_mock.mocks.dart # test/features/app/presentation/rive_animation_service_mock.mocks.dart # test/features/app/repository/mocks/author_repository_mock.mocks.dart # test/features/app/repository/mocks/course_repository_mock.mocks.dart # test/features/app/repository/mocks/news_repository_mock.mocks.dart # test/features/app/repository/mocks/quick_links_repository_mock.mocks.dart # test/features/app/repository/mocks/user_repository_mock.mocks.dart # test/features/app/storage/mocks/cache_manager_mock.mocks.dart # test/features/app/storage/mocks/flutter_secure_storage_mock.mocks.dart # test/features/app/storage/mocks/preferences_service_mock.mocks.dart # test/features/app/storage/mocks/siren_flutter_service_mock.mocks.dart # test/features/app/widgets/mocks/app_widget_service_mock.mocks.dart # test/features/app/widgets/mocks/home_widget_mock.mocks.dart # test/features/more/feedback/mocks/in_app_review_service_mock.mocks.dart # test/features/more/settings/mocks/settings_manager_mock.mocks.dart

…nto PFE-Master2-FE2.3

XavierPaquet-Rapold · 2024-08-10T03:26:53Z

lib/features/ets/events/author/widget/back_button_widget.dart

Put in shared widget folder

And use it for everything related to back button

XavierPaquet-Rapold · 2024-08-10T03:30:40Z

lib/features/ets/quick-link/quick_links_view.dart

+                    refresh,
+                    _controller,
+                    _animation,
+                    false),


Put variable name

XavierPaquet-Rapold · 2024-08-10T03:32:38Z

lib/features/ets/quick-link/widgets/security-info/widgets/security_map.dart

+
+Widget securityMap(BuildContext context, SecurityViewModel model) {
+  const CameraPosition etsLocation = CameraPosition(
+      target: LatLng(45.49449875, -73.56246144109338), zoom: 17.0);


Put into variables

XavierPaquet-Rapold · 2024-08-10T03:33:46Z

lib/features/more/about/about_view.dart

+import 'package:notredame/features/more/about/widget/easter_egg_icon.dart'; // Importez le widget extrait
+import 'package:notredame/features/more/about/widget/social_icons_row.dart'; // Importez le widget extrait


Remove comments

XavierPaquet-Rapold · 2024-08-10T03:34:03Z

lib/features/more/about/about_view.dart

@@ -49,6 +46,10 @@ class _AboutViewState extends State<AboutView> with TickerProviderStateMixin {

  @override
  Widget build(BuildContext context) {
+    return newMethod(context);


Change method name

Or remove it completely

XavierPaquet-Rapold · 2024-08-10T23:22:25Z

lib/features/student/grades/grade_details/widget/grade_evaluations.dart

+  Widget _buildSummaryCard(BuildContext context) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(20.0),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: <Widget>[
+            Expanded(
+              flex: 50,
+              child: GradeCircularProgress(
+                1.0,
+                completed: completed,
+                key: const Key("GradeCircularProgress_summary"),
+                finalGrade: model.course.grade,
+                studentGrade: Utils.getGradeInPercentage(
+                  model.course.summary?.currentMark,
+                  model.course.summary?.markOutOf,
+                ),
+                averageGrade: Utils.getGradeInPercentage(
+                  model.course.summary?.passMark,
+                  model.course.summary?.markOutOf,
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 40,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  GradesSummary(
+                    currentGrade: model.course.summary?.currentMark,
+                    maxGrade: model.course.summary?.markOutOf,
+                    recipient: AppIntl.of(context)!.grades_current_rating,
+                    color: Colors.green,
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(top: 15.0),
+                    child: GradesSummary(
+                      currentGrade: model.course.summary?.passMark,
+                      maxGrade: model.course.summary?.markOutOf,
+                      recipient: AppIntl.of(context)!.grades_average,
+                      color: Colors.red,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }


Create widget

XavierPaquet-Rapold · 2024-08-10T23:22:40Z

lib/features/student/grades/grade_details/widget/grade_evaluations.dart

+  Widget _buildAdditionalSummary(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: <Widget>[
+        Expanded(
+          flex: 3,
+          child: CourseGradeSummary(
+            title: AppIntl.of(context)!.grades_median,
+            number: model.course.summary?.median.toString() ??
+                AppIntl.of(context)!.grades_not_available,
+          ),
+        ),
+        Expanded(
+          flex: 3,
+          child: CourseGradeSummary(
+            title: AppIntl.of(context)!.grades_standard_deviation,
+            number: model.course.summary?.standardDeviation.toString() ??
+                AppIntl.of(context)!.grades_not_available,
+          ),
+        ),
+        Expanded(
+          flex: 3,
+          child: CourseGradeSummary(
+            title: AppIntl.of(context)!.grades_percentile_rank,
+            number: model.course.summary?.percentileRank.toString() ??
+                AppIntl.of(context)!.grades_not_available,
+          ),
+        ),
+      ],
+    );
+  }


XavierPaquet-Rapold · 2024-08-10T23:22:51Z

lib/features/student/grades/grade_details/widget/grade_evaluations.dart

+  Widget _buildEvaluationTiles() {
+    return Column(
+      children: <Widget>[
+        for (final CourseEvaluation evaluation
+            in model.course.summary?.evaluations ?? [])
+          GradeEvaluationTile(
+            evaluation,
+            completed: completed,
+            key: Key("GradeEvaluationTile_${evaluation.title}"),
+            isFirstEvaluation:
+                evaluation == model.course.summary?.evaluations.first,
+          ),
+      ],
+    );


XavierPaquet-Rapold · 2024-08-10T23:27:57Z

lib/features/student/profile/widgets/profile_program_completion_card.dart

+CircularPercentIndicator getLoadingIndicator(
+    ProfileViewModel model, BuildContext context) {
+  final double percentage = model.programProgression;
+
+  return CircularPercentIndicator(
+    animation: true,
+    animationDuration: 1100,
+    radius: 40,
+    lineWidth: 10,
+    percent: percentage / 100,
+    circularStrokeCap: CircularStrokeCap.round,
+    center: Text(
+      percentage != 0
+          ? '$percentage%'
+          : AppIntl.of(context)!.profile_program_completion_not_available,
+      style: const TextStyle(fontSize: 20),
+    ),
+    progressColor: Colors.green,
+  );
+}


Create widget

XavierPaquet-Rapold · 2024-08-10T23:30:07Z

lib/features/welcome/login/widget/login_widget.dart

rename to logo_widget

AntoineLemelin and others added 24 commits July 4, 2024 10:36

Split widgets in others files

831c2d0

Feature first, test

54cb079

test

9cd8769

gitignore update

b17b634

Fix errors

2a04a27

Remove.mocks.dart

d70f9de

Fix gitignore

b536ca9

Fix gitignore

c5d0a90

Merge branch 'PFE-master2' of https://github.com/ApplETS/Notre-Dame i…

ea63909

…nto PFE-Master2-FE2.3

fix imports duplicates

f17f3f3

Merge branch 'master' into PFE-Master2-FE2.3

8af1cb7

update

f688054

remove app_widget_service

d7ee3e2

reorganize new tests to fite feature-first structure

0937336

update

8caed33

Merge branch 'master' into PFE-Master2-FE2.3

590ed16

Fixed the last branch

ed8e78f

Update pubspec and ios pt1

f5fd9be

Use recommended settings ios

434a3b1

Update pubspec pt2

325698f

Rollback LastUpgradeVersion

5e4aa1c

test-fix

bb02197

XavierPaquet-Rapold commented Aug 10, 2024

View reviewed changes

XavierPaquet-Rapold added 3 commits August 10, 2024 19:47

Fix tests imports

967c017

Merge branch 'master' into PFE-Master-Fixed

52814ce

Downgrade share plus

6cd1c9e

XavierPaquet-Rapold marked this pull request as ready for review August 26, 2024 19:46

XavierPaquet-Rapold requested a review from a team as a code owner August 26, 2024 19:46

XavierPaquet-Rapold marked this pull request as draft September 6, 2024 12:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pfe master fixed #1041

Pfe master fixed #1041

XavierPaquet-Rapold commented Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

XavierPaquet-Rapold Aug 10, 2024

		import 'package:notredame/features/more/about/widget/easter_egg_icon.dart'; // Importez le widget extrait
		import 'package:notredame/features/more/about/widget/social_icons_row.dart'; // Importez le widget extrait

Pfe master fixed #1041

Are you sure you want to change the base?

Pfe master fixed #1041

Conversation

XavierPaquet-Rapold commented Aug 10, 2024

⁉️ Related Issue

📖 Description

🧪 How Has This Been Tested?

☑️ Checklist before requesting a review

🖼️ Screenshots (if useful):

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment