Add Project Affiliations Menu to Main Interface #9417

NadaElmasry · 2024-10-22T13:21:30Z

Description

This PR introduces a Project Affiliations menu to the application's main interface, mirroring the existing Site Affiliations menu.

Changes Implemented

User Class Enhancements
- Fetch Projects by User ID:
  - Updated the User class to retrieve associated projects using the user's ID using user_projects_query.
Template Modifications
- Added a new Project Affiliations menu item to the main template.
- Expanded the existing Affiliations Menu to include a Project Affiliations section.
Middleware Adjustments
- User Page Middleware Integration:
  - Updated the user page middleware to incorporate the newly fetched project affiliations from the User class.using getProjectIDs() and >getProjectNames()).

GUI

Affiliations Menus with single project or site

Affiliations Menus with multiple projects or sites

Suggested Changes

Affiliations drop-down menu with fixed hieight and scrollable option

Removed separate Project and Sites Menus

Related Issue

Issue [Menu bar] add Project affiliations #9279

laemtl · 2024-10-25T15:12:26Z

php/libraries/User.class.inc

+                Store examiner's centerID with active status and radiologist flag,
+                ensuring centerID is a string
+                */
+                $examiner_info[(string)$val['centerID']] = [


Do we need that change? Does it solve an error?

it was to stay consistent with my changes when I used to cast the projects and sites into strings but it doesn't affect functionality so it can removed.

laemtl · 2024-10-25T15:12:51Z

php/libraries/User.class.inc

-        if (!empty($examiner_check) && !is_null($examiner_check)) {
+        $examiner_info = [];
+
+        if (!empty($examiner_check)&& !is_null($examiner_check)) {


Add back the space before &&

christinerogers · 2024-10-25T15:19:08Z

Notes from Oct. 25 EEG meeting discussion :

hide Project Affiliations: 1 and Site Affiliations: 1 elements -- just leave the one drop-down.
Limit the height of the drop-down, make it scrollable -- see Laetitia
add a screenshot to show what it looks like with multiple site and multiple projects
add note in the PR header to explain why changes (very important for merge)

laemtl · 2024-10-25T15:20:20Z

php/libraries/User.class.inc

            );
        } else {
-            return $this->userInfo[$var];
+            return $this->userInfo[$var] ?? null;


Can you explain the reasoning behind this change?

it's to prevent an error if the key doesn't exist in the userinfo.

a change like this impacts many more modules -- it was designed to return the empty string for other modules.
this change isn't needed -- please error-check returns where needed.

jeffersoncasimir

Looks good! I will pull and test after code changes are made

jeffersoncasimir · 2024-10-31T17:57:26Z

src/Middleware/UserPageDecorationMiddleware.php

        $tpl_data['user'] = [];
        $tpl_data['user']['Real_name']            = $this->user->getFullName();
        $tpl_data['user']['permissions']          = $this->user->getPermissions();
        $tpl_data['user']['user_from_study_site'] = $oneIsStudySite;


Suggested change

$tpl_data['user']['user_from_study_site'] = $oneIsStudySite;

$tpl_data['user']['user_from_study_site'] = $this->user->hasStudySite();

This can and should be inlined (includes deleting a line above)

this is a quick 2 line change

php/libraries/User.class.inc

christinerogers

still to do:

revert comment changes where it's not for code you change
minimize changes to User class per others' review comments

christinerogers · 2024-11-04T21:26:49Z

HI @NadaElmasry 2 things to tidy up this thread as we prepare to merge:

Please edit the PR description to remove screenshots that don't show just either Before or after,
please check boxes below to show what's been addressed from above.

Notes from Oct. 25 EEG meeting discussion :

hide Project Affiliations: 1 and Site Affiliations: 1 elements -- just leave the one drop-down.
Limit the height of the drop-down, make it scrollable -- see Laetitia
add a screenshot to show what it looks like with multiple site and multiple projects
add note in the PR header to explain why changes (very important for merge)

nov.1 still to do:

revert comment changes where it's not for code you change
minimize changes to User class per others' review comments

CamilleBeau · 2024-11-11T16:16:47Z

@NadaElmasry Can you fix the tests and then @jeffersoncasimir can you re-review?

smarty/templates/main.tpl

christinerogers · 2025-02-21T17:41:37Z

@jeffersoncasimir is this ready for re-review ?
If it seems like a quick merge could you try finding a reviewer and update here?

christinerogers · 2025-02-21T18:18:57Z

@jeffersoncasimir per testing meeting feb. 21
clean out the auto changes to reduce the diff to something reasonable and then re-review it yourself

Co-authored-by: jeffersoncasimir <[email protected]>

…to scrollable menu

Addressed

jeffersoncasimir

The feature works as expected!

I made some minor css tweaks and minimized the diff by reverting some comment changes and other differences that did not directly contribute to the feature

christinerogers · 2025-02-24T16:36:21Z

The feature works as expected!

I made some minor css tweaks and minimized the diff by reverting some comment changes and other differences that did not directly contribute to the feature

Thanks @NadaElmasry - Jefferson has completed the touch-ups and we've merged your feature contribution for the 27 LORIS release.

NadaElmasry requested review from CamilleBeau and laemtl October 22, 2024 13:34

christinerogers requested a review from jeffersoncasimir October 25, 2024 15:05

laemtl reviewed Oct 25, 2024

View reviewed changes

christinerogers requested review from jeffersoncasimir and laemtl and removed request for jeffersoncasimir October 28, 2024 20:41

jeffersoncasimir previously requested changes Oct 31, 2024

View reviewed changes

christinerogers previously requested changes Nov 1, 2024

View reviewed changes

christinerogers removed the request for review from CamilleBeau November 4, 2024 21:21

CamilleBeau assigned NadaElmasry Nov 11, 2024

CamilleBeau assigned jeffersoncasimir Nov 11, 2024

jeffersoncasimir reviewed Nov 14, 2024

View reviewed changes

smarty/templates/main.tpl Outdated Show resolved Hide resolved

christinerogers added the 26.0.0-bugs Issues that were raised during the release testing for 26.0.0 label Feb 21, 2025

christinerogers requested a review from jeffersoncasimir February 21, 2025 17:43

christinerogers added this to the 27.0.0 milestone Feb 21, 2025

christinerogers removed the 26.0.0-bugs Issues that were raised during the release testing for 26.0.0 label Feb 21, 2025

NadaElmasry and others added 6 commits February 24, 2025 09:02

added project affiliations menu to nav bar

5f9c2ef

added projects to user tests.

16ec18f

removed centerID string casting

4b5215a

Update php/libraries/User.class.inc

5f16117

Co-authored-by: jeffersoncasimir <[email protected]>

removed null return for user variable in getData function

b23dc18

made user study site call inline

e76a791

NadaElmasry and others added 5 commits February 24, 2025 09:02

removed separate projects and sites menus, changed affiliations menu …

b9f04e9

…to scrollable menu

fix docker integration test

e7ad8fe

Apply suggestions from code review

e4f033c

Fix css

909f012

Minimize diff

8ec7436

jeffersoncasimir force-pushed the project-affiliations branch from 510adc3 to 8ec7436 Compare February 24, 2025 14:56

jeffersoncasimir added 2 commits February 24, 2025 10:08

Minimize diff

93cc024

Remove dev files

166f217

jeffersoncasimir approved these changes Feb 24, 2025

View reviewed changes

driusan merged commit fa8c490 into aces:main Feb 24, 2025
19 checks passed

	$tpl_data['user']['user_from_study_site'] = $oneIsStudySite;
	$tpl_data['user']['user_from_study_site'] = $this->user->hasStudySite();

Add Project Affiliations Menu to Main Interface #9417

Add Project Affiliations Menu to Main Interface #9417

Uh oh!

Conversation

NadaElmasry commented Oct 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes Implemented

GUI

Affiliations Menus with single project or site

Affiliations Menus with multiple projects or sites

Suggested Changes

Affiliations drop-down menu with fixed hieight and scrollable option

Removed separate Project and Sites Menus

Related Issue

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

christinerogers commented Oct 25, 2024 • edited by NadaElmasry Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeffersoncasimir left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeffersoncasimir Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

christinerogers left a comment

Choose a reason for hiding this comment

Uh oh!

christinerogers commented Nov 4, 2024 • edited by NadaElmasry Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CamilleBeau commented Nov 11, 2024

Uh oh!

Uh oh!

christinerogers commented Feb 21, 2025

Uh oh!

christinerogers commented Feb 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jeffersoncasimir left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

christinerogers commented Feb 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

NadaElmasry commented Oct 22, 2024 •

edited

Loading

christinerogers commented Oct 25, 2024 •

edited by NadaElmasry

Loading

jeffersoncasimir Oct 31, 2024 •

edited

Loading

christinerogers commented Nov 4, 2024 •

edited by NadaElmasry

Loading

christinerogers commented Feb 21, 2025 •

edited

Loading