Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[bvl_feedback][dashboard] Add project/site specs to widget #7848

Merged
merged 3 commits into from
Dec 13, 2022
Merged

[bvl_feedback][dashboard] Add project/site specs to widget #7848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b17859
[bvl_feedback][dashboard] Add project/site specs to widget
CamilleBeau Nov 23, 2021
50e8ff2
Change log & phpcs
CamilleBeau Nov 23, 2021
d1aefdd
Fix changelog
CamilleBeau Dec 12, 2022
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ changes in the following format: PR #1234***
- Rename subproject to Cohort (PR #7817)
- Create new CohortData and CohortController classes to use as data access model
and transfer object (PR #7817)
-
- BVL Feedback widget only shows notifications for the users sites / projects (PR #7848)

#### Bug Fixes
- placeholder
Expand Down
23 changes: 19 additions & 4 deletions modules/bvl_feedback/php/module.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,31 @@ class Module extends \Module

$last_login = $user->getLastLogin($DB);

$bvl_feedback = $DB->pselect(
"SELECT fbt.Name, fbe.Testdate, fbe.Comment, fbth.FieldName,
// Base query
$query = "SELECT fbt.Name, fbe.Testdate, fbe.Comment, fbth.FieldName,
fbth.CommentID, fbth.SessionID, fbth.CandID, fbth.Feedback_level
FROM feedback_bvl_entry fbe
JOIN feedback_bvl_thread fbth USING (FeedbackID)
JOIN feedback_bvl_type fbt USING (Feedback_type)
WHERE fbth.Status='opened' AND fbth.Active='Y'
ORDER BY Testdate DESC LIMIT 4",
JOIN session s ON s.ID=fbth.SessionID
WHERE fbth.Status='opened' AND fbth.Active='Y'";

// Add centerID restriction if needed
if (!$user->hasPermission('access_all_profiles')) {
$site_arr = implode(",", $user->getCenterIDs());
$query .= " AND s.CenterID IN ({$site_arr}) ";
}

// Add project restriction & order BY
$project_arr = implode(",", $user->getProjectIDs());
$query .= " AND s.ProjectID IN ({$project_arr})
ORDER BY Testdate DESC LIMIT 4";

$bvl_feedback = $DB->pselect(
$query,
[]
);

$frontend_feedback = [];
foreach ($bvl_feedback as $row) {
if (new \DateTime($row['Testdate']) > $last_login) {
Expand Down