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

[imaging_browser] Fix bugs in imaging browser's MRI feedback popup #9716

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[imaging_browser] Fix bugs in imaging browser's MRI feedback popup #9716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a15a2
Fix bugs reported for the imaging browser module
nicolasbrossard Mar 18, 2025
ad83388
Fixes for phan
nicolasbrossard Mar 18, 2025
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
8 changes: 2 additions & 6 deletions modules/imaging_browser/php/feedback_mri_popup.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ class Feedback_MRI_Popup extends \NDB_Page
);
}

if (is_array($comment_array)) {
$CommentTpl['name'] = $comment_array['name'];
}
$CommentTpl['name'] = $comment_array['name'];

// get the list of predefined feedbackObj for the current type
$predefined_comments = $feedbackObj->getAllPredefinedComments(
Expand Down Expand Up @@ -304,9 +302,7 @@ class Feedback_MRI_Popup extends \NDB_Page
}

// save all comment status fields
if (isset($values['saveCommentStatusField'])
&& is_array($values['saveCommentStatusField'])
) {
if (isset($values['saveCommentStatusField'])) {
foreach ($values['saveCommentStatusField'] as $status_field => $value) {
$feedbackObj->setMRIValue($status_field, $value);
}
Expand Down
95 changes: 45 additions & 50 deletions php/libraries/FeedbackMRI.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,14 @@ class FeedbackMRI

$comments = [];
// build the output array
if (is_array($result)) {
foreach ($result as $row) {
$CTID = $row['CommentTypeID'];
$PredefinedID = $row['PredefinedCommentID'];

if (empty($row['Comment'])) {
$comments[$CTID]['predefined'][$PredefinedID] = true;
} else {
$comments[$CTID]['text'] = stripslashes($row['Comment']);
}
foreach ($result as $row) {
$CTID = $row['CommentTypeID'];
$PredefinedID = $row['PredefinedCommentID'];

if (empty($row['Comment'])) {
$comments[$CTID]['predefined'][$PredefinedID] = true;
} else {
$comments[$CTID]['text'] = stripslashes($row['Comment']);
}
}

Expand Down Expand Up @@ -193,13 +191,11 @@ class FeedbackMRI

// build the output array
$comments = [];
if (is_array($result)) {
foreach ($result as $row) {
$PredefinedID = $row['PredefinedCommentID'];
$preDefinedComments = [];
$preDefinedComments['Comment'] = stripslashes($row['Comment']);
$comments[$PredefinedID] = $preDefinedComments;
}
foreach ($result as $row) {
$PredefinedID = $row['PredefinedCommentID'];
$preDefinedComments = [];
$preDefinedComments['Comment'] = stripslashes($row['Comment']);
$comments[$PredefinedID] = $preDefinedComments;
}

// return the output array
Expand Down Expand Up @@ -340,41 +336,40 @@ class FeedbackMRI
// build the output array and keep overall section at the end of the array
$commentNames = [];
$overallName = [];
$overallType = [];
if (is_array($result)) {
foreach ($result as $row) {
$CommentName = $row['CommentName'];
$CTID = $row['CommentTypeID'];
$statusField = [];
// deal with CommentStatusField
if (!empty($row['CommentStatusField'])) {
$statusField = unserialize($row['CommentStatusField']);
}

// if CommentName is overall, don't add them yet to
// commentNames array we want them only at the end
if ($CommentName == "Overall") {
$overallType = $CTID;
$overallName = [
'name' => stripslashes($CommentName),
'field' => $statusField['field'] ?? 'overall',
'values' => $statusField['values'] ?? '',
];
} else {
// add a row to the output array
$commentNames[$CTID] = [
'name' => stripslashes($CommentName) ?? '',
'field' => $statusField['field'] ?? '',
'values' => $statusField['values'] ?? '',
];
}

unset($statusField);
$overallType = null;
foreach ($result as $row) {
$CommentName = $row['CommentName'];
$CTID = $row['CommentTypeID'];
$statusField = [];
// deal with CommentStatusField
if (!empty($row['CommentStatusField'])) {
$statusField = unserialize($row['CommentStatusField']);
}
// add overall row to the end of the output array
if ($overallType !== '' && !empty($overallName)) {
$commentNames[$overallType] = $overallName;

// if CommentName is overall, don't add them yet to
// commentNames array we want them only at the end
if ($CommentName == "Overall") {
$overallType = $CTID;
$overallName = [
'name' => stripslashes($CommentName),
'field' => $statusField['field'] ?? 'overall',
'values' => $statusField['values'] ?? '',
];
} else {
// add a row to the output array
$commentNames[$CTID] = [
'name' => stripslashes($CommentName) ?? '',
'field' => $statusField['field'] ?? '',
'values' => $statusField['values'] ?? '',
];
}

unset($statusField);
}

// add overall row to the end of the output array
if (!is_null($overallType) && !empty($overallName)) {
$commentNames[$overallType] = $overallName;
}

// return the output array
Expand Down
Loading