Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Behavioural_QC] Display profile level feedbacks #9192

Merged
merged 5 commits into from
Apr 11, 2024
Merged

[Behavioural_QC] Display profile level feedbacks #9192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f0baf5
[Behavioural_QC] Display profile level feedbacks
CamilleBeau Apr 4, 2024
740def0
Add to changelog & fix site coalesce
CamilleBeau Apr 4, 2024
1fa9f64
Merge branch 'main' into 2024_04_04_bvl_feedback_profile_entries
CamilleBeau Apr 4, 2024
2f3e9d6
missing semicolon
CamilleBeau Apr 4, 2024
de616bf
Merge remote-tracking branch 'origin/2024_04_04_bvl_feedback_profile_…
CamilleBeau Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ changes in the following format: PR #1234***
- bvl_feedback updates in real-time (PR #8966)
- DoB and DoD format respected in candidate parameters (PR #9001)
- Fix delete file in upload (PR #9181)
- Fix profile level feedback display in behavioural QC module (PR #9192)

## LORIS 25.0 (Release Date: ????-??-??)
### Core
Expand Down
4 changes: 4 additions & 0 deletions modules/behavioural_qc/jsx/tabs_content/behaviouralFeedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ class BehaviouralFeedback extends Component {
'&sessionID=' +
rowData['sessionID'];
bvlLevel ='Visit : ' + rowData['Visit'];
} else {
bvlLink = this.props.baseURL +
'/' + rowData['DCCID'];
bvlLevel ='Profile : ' + rowData['PSCID'];
}
reactElement = (
<td>
Expand Down
11 changes: 5 additions & 6 deletions modules/behavioural_qc/php/provisioners/behaviouralprovisioner.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class BehaviouralProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisione
fb.CandID AS _candID,
ca.PSCID AS _pscID,
s.Visit_label AS _visit,
s.ProjectID AS _project,
COALESCE(s.ProjectID, ca.RegistrationProjectID) AS _project,
s.CohortID AS _cohort,
psc.CenterID AS _site,
COALESCE(psc.CenterID, psc2.CenterID) AS _site,
fb.FeedbackID AS _feedbackID,
fb.SessionID AS _sessionID,
fb.CommentID AS _commentID,
Expand All @@ -42,10 +42,9 @@ class BehaviouralProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisione
FROM
feedback_bvl_thread AS fb
JOIN candidate ca ON (ca.CandID = fb.CandID)
JOIN session s ON (s.ID = fb.SessionID)
JOIN psc ON (s.CenterID = psc.CenterID)
JOIN project_cohort_rel psr ON
(s.CohortID = psr.CohortID)
LEFT JOIN session s ON (s.ID = fb.SessionID)
LEFT JOIN psc ON (s.CenterID = psc.CenterID)
LEFT JOIN psc psc2 ON (ca.RegistrationCenterID=psc2.CenterID)
LEFT JOIN flag f ON (fb.CommentID = f.CommentID)
LEFT JOIN test_names tn ON (tn.Test_name = f.Test_name)
WHERE
Expand Down
Loading