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

Jump to bottom

(Ready for Review) Replacement Inbox #38

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

(Ready for Review) Replacement Inbox #38

wants to merge 2 commits into from

Conversation

kk-chung
Copy link
Contributor

The new inbox can be accessed by pressing the "Alt" key, then clicking Inbox.

The new inbox is designed to be a drop in replacement for the existing inbox. The intent is that all existing functionality is present, and that there are no compelling reasons for why someone should prefer the old inbox.

This new inbox has been the default for several weeks now. All issues have been already addressed. No users are electing to use the old inbox despite having continued access to it.

@D3V41
Squashed commit of the following:
ca82eea 
commit f11997e
Merge: 1bbbe5e 492a023
Author: Deval Italiya <[email protected]>
Date:   Wed Feb 12 18:25:08 2025 +0000

    :twisted_rightwards_arrows: Merge branch 'main' into feature/inbox-final

commit 1bbbe5e
Author: Deval Italiya <[email protected]>
Date:   Wed Feb 12 18:23:58 2025 +0000

    ⚡️ Increase page size to 100 to reduce older versions

commit 96e849d
Merge: ed44baa 293018b
Author: Deval Italiya <[email protected]>
Date:   Thu Jan 23 23:24:53 2025 +0000

    :twisted_rightwards_arrows: Merge branch 'main' into feature/inbox-final

commit ed44baa
Author: Deval Italiya <[email protected]>
Date:   Thu Jan 23 03:49:36 2025 +0000

    :sparkles: Updated the `popupInboxManager` function to accept `height` and `width` as optional parameters, with default values of 700 and 1215 respectively.

commit 259946f
Author: Deval Italiya <[email protected]>
Date:   Wed Jan 22 17:00:59 2025 +0000

    :lipstick: Fix the width of 'Sex', 'Result Status', 'Label', and 'Ack #' columns

commit cb484e5
Author: Deval Italiya <[email protected]>
Date:   Wed Jan 22 16:58:26 2025 +0000

    :lipstick: Add no-wrap property to the inbox columns

commit f227b9c
Author: Deval Italiya <[email protected]>
Date:   Wed Jan 22 16:56:22 2025 +0000

    :lipstick: Remove the Health Number and Order Priority columns from the new inbox and add the Label column

commit a69b124
Author: Deval Italiya <[email protected]>
Date:   Wed Jan 22 16:24:05 2025 +0000

    :lipstick: Add a horizontal scroll bar for the inbox data

commit c09b062
Author: Deval Italiya <[email protected]>
Date:   Wed Jan 22 16:22:49 2025 +0000

    :lipstick: Decrease the width of the new inbox search bar

commit 2824f3f
Merge: 1e7adbb b6aad69
Author: Deval Italiya <[email protected]>
Date:   Thu Jan 16 20:12:07 2025 +0000

    :twisted_rightwards_arrows: Merge branch 'main' into feature/inbox-final

commit 1e7adbb
Author: Deval Italiya <[email protected]>
Date:   Tue Jan 14 21:39:57 2025 +0000

    :children_crossing: Change the default sort to date, from newest to oldest, in the new inbox.

commit dd16704
Author: Deval Italiya <[email protected]>
Date:   Tue Jan 14 21:32:16 2025 +0000

    :lipstick: Add the missing last update date for documents in the new inbox

commit 8125679
Author: Deval Italiya <[email protected]>
Date:   Tue Jan 14 21:11:09 2025 +0000

    :bug: Fix sorting in new inbox

commit 9b67f2a
Merge: a0097c1 070dcff
Author: Deval Italiya <[email protected]>
Date:   Thu Jan 9 14:28:12 2025 +0000

    Merge branch 'main' into feature/inbox-final

commit a0097c1
Author: Deval Italiya <[email protected]>
Date:   Mon Jan 6 20:17:04 2025 +0000

    :bug: Display correct results count in new inbox

commit 5e6e1af
Author: Deval Italiya <[email protected]>
Date:   Mon Jan 6 19:27:05 2025 +0000

    :bug: Ensure the Unmatched Results section displays when the unmatched HRM count is greater than 0

commit eef3df4
Merge: a0c2e08 2188422
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 18:44:02 2024 +0000

    Merge branch 'main' into feature/inbox-final

commit a0c2e08
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 18:42:33 2024 +0000

    Filter lab results in the new inbox to display only the latest version per entry within each paginated set of 20 results.

commit d9d2bdb
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 17:13:45 2024 +0000

    Display the correct acknowledgment data in the new inbox.

commit 950866f
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 17:11:46 2024 +0000

    Display the correct discipline for documents in the new inbox.

commit 49e3a5b
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 17:09:33 2024 +0000

    Use <c:out> to display the output.

commit 09636fb
Author: Deval Italiya <[email protected]>
Date:   Mon Dec 30 17:07:31 2024 +0000

    Removing a document from the new inbox upon acknowledgment

commit f549066
Author: Deval Italiya <[email protected]>
Date:   Fri Dec 20 16:38:21 2024 +0000

    Display the total number of documents in the new inbox.

commit 89d79ee
Author: Deval Italiya <[email protected]>
Date:   Fri Dec 20 15:12:11 2024 +0000

    Hide the document with a slide-up animation upon successful acknowledgment.

commit 015febf
Author: Deval Italiya <[email protected]>
Date:   Fri Dec 20 15:05:04 2024 +0000

    Fix the E-Chart button bug in the new inbox. Once the E-Chart window is open, the user cannot refresh it from another document.

commit 8ca646a
Merge: 49b6b18 e253ae1
Author: Deval Italiya <[email protected]>
Date:   Tue Dec 17 15:22:35 2024 +0000

    Merge branch 'main' into feature/inbox-final

commit 49b6b18
Author: Deval Italiya <[email protected]>
Date:   Thu Nov 14 17:36:33 2024 +0000

    Add log message for undefined method

commit dba5b91
Author: Deval Italiya <[email protected]>
Date:   Thu Nov 14 02:49:32 2024 +0000

    Refactoring the enum value conversion logic and simplifying the abnormal boolean check to improve code maintainability

commit cc3d72b
Author: Deval Italiya <[email protected]>
Date:   Thu Nov 14 02:12:40 2024 +0000

    Make the lobDocs variable local.

commit 9bcdf09
Author: Deval Italiya <[email protected]>
Date:   Thu Nov 14 02:11:36 2024 +0000

    Use the OWASP Encoder.

commit 845c52f
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:48:09 2024 +0000

    Modify search logic for HRM documents linked to specific demographics to fetch correct results.

commit b9de174
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:46:30 2024 +0000

    Pass an empty string when searching for any provider to retrieve the correct HRM list.

commit c5d8657
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:44:27 2024 +0000

    Correctly identify if inbox search is searching for a patient and update UI options accordingly.

commit 00833e8
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:43:16 2024 +0000

    Implement StringEscapeUtils.escapeSql() to escape special characters in SQL parameters for better security and to prevent SQL injection vulnerabilities in raw SQL queries.

commit 475d1a5
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:35:01 2024 +0000

    Add URL encoding for all parameters to prevent XSS vulnerabilities

commit 80bcefa
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 23:32:20 2024 +0000

    Use thread-safe DateTimeFormatter instead of SimpleDateFormat

commit be48fd6
Merge: a9620d6 d4832d9
Author: Deval Italiya <[email protected]>
Date:   Wed Nov 13 15:37:54 2024 +0000

    Merge branch 'main' into feature/inbox-final

commit a9620d6
Author: Deval Italiya <[email protected]>
Date:   Mon Nov 11 18:59:58 2024 +0000

    Use enum instead of string constants.

commit a515671
Author: Deval Italiya <[email protected]>
Date:   Mon Nov 11 18:59:15 2024 +0000

    Replace <object> with <iframe> for improved document display and security.

commit 84cb3e4
Merge: d7adf05 8520520
Author: Deval Italiya <[email protected]>
Date:   Mon Nov 4 22:17:32 2024 +0000

    Merge branch 'main' into feature/inbox-final

commit d7adf05
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 16 19:58:42 2024 +0000

    Minor changes

commit c3d9b07
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 16 16:44:11 2024 +0000

    Optimize SQL query for patient HRM(matched) count

commit 337dceb
Author: Deval Italiya <[email protected]>
Date:   Fri Oct 11 19:21:52 2024 +0000

    Optimize unmatched HRM count sql query in Inbox

commit 863454a
Author: Deval Italiya <[email protected]>
Date:   Fri Oct 11 17:51:44 2024 +0000

    Re-Update the unmatched and matched HRM count query to display the correct count.

commit 13d3e00
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 10 22:53:26 2024 +0000

    Optimize addDataInInboxhubListTable method in new InboxHub

commit 3b65c33
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 10 22:31:31 2024 +0000

    Minor changes in progress bar

commit 18db0d2
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 9 21:59:04 2024 +0000

    Minor change

commit d4a0c21
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 9 19:57:44 2024 +0000

    Partially reverting commit 0af8ee8 because it is slowing down the inbox.

commit ca226f9
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 9 19:22:01 2024 +0000

    Minor fix: small adjustment to the progress bar.

commit 35fafba
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 9 19:20:07 2024 +0000

    Unbold the category list label on click if it is bold, and reset the list view.

commit 17b37a0
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 9 00:59:23 2024 +0000

    Move the preview button outside of the search form.

commit f1daf9e
Author: Deval Italiya <[email protected]>
Date:   Tue Oct 8 22:14:30 2024 +0000

    Correctly filter data based on the selected label from category data in the new inbox.
    Display the correct document count according to the selected types in the new inbox form.
    Hide categories and types in category data based on the selected types in the new inbox form.

commit a062a5b
Author: Deval Italiya <[email protected]>
Date:   Mon Oct 7 18:23:32 2024 +0000

    Add a progress bar with a 'Stop' button in the new inbox.

commit 6d025bd
Author: Deval Italiya <[email protected]>
Date:   Sat Oct 5 01:48:02 2024 +0000

    Fix lab counting issue in getLabCountForPatientSearch

commit 457b61d
Author: Deval Italiya <[email protected]>
Date:   Fri Oct 4 17:59:13 2024 +0000

    Minor change: added missing characters.

commit e49ae43
Author: Deval Italiya <[email protected]>
Date:   Fri Oct 4 01:13:04 2024 +0000

    Fetch correct results when the unclaimed parameter is set to 1.

commit 0af8ee8
Author: Deval Italiya <[email protected]>
Date:   Fri Oct 4 01:12:01 2024 +0000

    Update the unmatched and matched HRM count query to display the correct count. Add the 'HRMDocumentToProvider.viewed' condition in the 'getHRMDocumentCountForPatient' and 'getHRMDocumentCountForUnmatched' methods, and update the condition's value based on the status. Also, update the 'HRMDocumentToProvider.signedOff' condition's value based on the status.

commit 7384539
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 3 19:34:34 2024 +0000

    Display the provider name in the correct format in the new Inboxhub, along with some other minor changes.

commit 865c490
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 3 19:12:38 2024 +0000

    Minor change: adjust the placement of the ShowSpin() method.

commit 541aa5a
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 3 19:11:28 2024 +0000

    Use OWASP encoding for lab links.

commit 7be1a81
Author: Deval Italiya <[email protected]>
Date:   Thu Oct 3 18:34:13 2024 +0000

    Change the new Inboxhub page size to 20 to match the old inbox.

commit 5f7188f
Author: Deval Italiya <[email protected]>
Date:   Wed Oct 2 21:50:29 2024 +0000

    Inboxhub bugfixes and changes:
    - Hide HRMs while fetching 'abnormal' results
    - Display results not linked to any demographic in a different color
    - Show '*' before unread results
    - Display unmatched and matched HRMs count as 0 while fetching 'abnormal' results
    - Add spinner during data loading
    - Show toast error message on AJAX request failure
    - Ensure correct table sorting order when adding data
    - Optimize AJAX requests
    - Display document preview in full-page view

commit a95b488
Merge: da06488 f186c19
Author: Deval Italiya <[email protected]>
Date:   Tue Oct 1 19:12:22 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit da06488
Author: Deval Italiya <[email protected]>
Date:   Sat Sep 28 04:41:02 2024 +0000

    Inboxhub enhancements and changes:

    Replaced $ with jQuery
    Minor formatting and UI improvements in SearchProvider.jsp
    Added Bootstrap classes to ensure they apply when imported into the parent page
    Applied Bootstrap card classes and other styling to the forward feature's jQuery dialog for better appearance

commit c01dd33
Author: Deval Italiya <[email protected]>
Date:   Thu Sep 26 20:38:08 2024 +0000

    - Add the HRM option to the Matched and Unmatched category lists.
    - Fetch and filter data according to the selected option from the category list.
    - Display the correct count in the Matched and Unmatched category lists.
    - Increase the item preview height.

commit 7dec06f
Author: Deval Italiya <[email protected]>
Date:   Thu Sep 26 20:43:14 2024 +0000

    - Correct the page size when fetching the HRMDocumentToProvider list page by page.
    - Fetch the unmatched HRMDocumentToProvider list (HRM documents that are not linked to any demographic) when the demographic number is 0.

commit 8be2091
Merge: 90fe8af 9f2ddb6
Author: Deval Italiya <[email protected]>
Date:   Sat Sep 28 04:43:30 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 90fe8af
Author: Deval Italiya <[email protected]>
Date:   Wed Sep 25 21:40:53 2024 +0000

    Inboxhub Enhancements:
    - Optimized data loading
    - Minor updates to preview item URLs
    - Used OWASP encoder for data encoding
    - Replaced scriptlets with EL
    - Removed unused JS scripts and JSP pages
    - Improved item preview by adding a card view
    - Implemented object tag for displaying previews

commit 8185039
Author: Deval Italiya <[email protected]>
Date:   Sat Sep 21 03:54:47 2024 +0000

    Use EL instead of scriptlets and apply OWASP encoder for sanitization.

commit 90ca6f9
Merge: 31510f5 9ee916a
Author: Deval Italiya <[email protected]>
Date:   Wed Sep 25 21:43:09 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 31510f5
Author: Deval Italiya <[email protected]>
Date:   Fri Sep 20 17:23:54 2024 +0000

    - Use EL instead of JSP scriptlets in InboxhubForm.jsp
    - Optimize JavaScript code in InboxhubForm.jsp
    - Add validation for specific patient option
    - Implement accordion for 'Unmatched' and 'Matched' data with custom CSS

commit 7feaf95
Author: Deval Italiya <[email protected]>
Date:   Wed Sep 18 02:52:57 2024 +0000

    Re-MOP41: value of result_status='A' added for Abnormal patients

commit d4b09b0
Merge: 4bdc746 887a017
Author: Deval Italiya <[email protected]>
Date:   Wed Sep 18 02:51:15 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 4bdc746
Author: Deval Italiya <[email protected]>
Date:   Thu Sep 12 22:51:53 2024 +0000

    Add an accordion for the Search feature.

commit 25ae0a1
Merge: 4166d37 376341e
Author: Deval Italiya <[email protected]>
Date:   Sat Sep 14 05:24:48 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 4166d37
Author: Deval Italiya <[email protected]>
Date:   Thu Sep 12 21:15:12 2024 +0000

    UI changes in InboxHub.

commit 181dedc
Merge: fefa561 03a6cff
Author: Deval Italiya <[email protected]>
Date:   Fri Sep 13 21:31:56 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit fefa561
Merge: 885dbdc b61db52
Author: Deval Italiya <[email protected]>
Date:   Wed Sep 4 18:54:02 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 885dbdc
Merge: 7150510 e83fec9
Author: Deval Italiya <[email protected]>
Date:   Thu Jul 11 16:21:58 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit e83fec9
Merge: e8dece5 d8733ab
Author: Keith Chung <[email protected]>
Date:   Thu Jul 11 03:49:15 2024 +0000

    Merged openoscar/oscar:master into MagentaHealth/oscar:master

commit e8dece5
Merge: ad5c9bf cb2ea8e
Author: Keith Chung <[email protected]>
Date:   Wed Jul 10 01:36:21 2024 +0000

    Merged openoscar/oscar:master into MagentaHealth/oscar:master

commit 7150510
Author: KimoonLeeCA <[email protected]>
Date:   Fri May 17 15:14:59 2024 +0000

    Don't show HRM option in Review Status in BC region

commit e74303c
Author: KimoonLeeCA <[email protected]>
Date:   Fri May 17 13:20:50 2024 +0000

    Added the code to apply patient's option properly

commit 07fa773
Author: KimoonLeeCA <[email protected]>
Date:   Wed May 15 17:08:15 2024 +0000

    Set the value of provider and apply specific provider value correctly

commit 6814794
Author: KimoonLeeCA <[email protected]>
Date:   Wed May 15 13:34:08 2024 +0000

    Add default check status to the type's radio button

commit 2e9065d
Author: KimoonLeeCA <[email protected]>
Date:   Fri May 10 23:43:55 2024 +0000

    Add string and change the string to use resource properties

commit bbcd797
Author: KimoonLeeCA <[email protected]>
Date:   Wed May 8 15:25:06 2024 +0000

    Add a radio button named All in review status and show the default checked radio button in review status and result status

commit c6b2d17
Author: KimoonLeeCA <[email protected]>
Date:   Wed May 8 13:54:02 2024 +0000

    Add the missed code which cause the UI error

commit 2601825
Author: KimoonLeeCA <[email protected]>
Date:   Mon May 6 17:20:50 2024 +0000

    Adjust the margin and change to keep the status of review and result status.

commit fe68278
Author: KimoonLeeCA <[email protected]>
Date:   Sun May 5 05:38:06 2024 +0000

    Disable automatic search when the radio and checkbox buttons are clicked

commit dbe9958
Author: KimoonLeeCA <[email protected]>
Date:   Thu May 2 16:14:17 2024 +0000

    Search is triggered automatically

commit 30dff57
Author: KimoonLeeCA <[email protected]>
Date:   Thu May 2 15:11:13 2024 +0000

    Modification to align with input field

commit 655b03d
Author: KimoonLeeCA <[email protected]>
Date:   Wed May 1 16:13:59 2024 +0000

    Adjust the margin and the size of the list

commit 143c382
Author: KimoonLeeCA <[email protected]>
Date:   Mon Apr 29 16:28:14 2024 +0000

    Rearranged the search menu for new inbox

commit 0f65be8
Author: KimoonLeeCA <[email protected]>
Date:   Fri Apr 26 22:29:51 2024 +0000

    Adjust Provider, Patient and Date Range options in new inbox

commit f558b8d
Author: KimoonLeeCA <[email protected]>
Date:   Sun Apr 21 16:55:09 2024 +0000

    Add string for new inbox UI

commit 9519347
Author: KimoonLeeCA <[email protected]>
Date:   Sat Apr 13 09:29:44 2024 +0000

    Adjust the text align which comes from peer review

commit 3822c12
Merge: 544499d 4a81980
Author: KimoonLeeCA <[email protected]>
Date:   Thu Apr 11 16:14:04 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit 544499d
Author: KimoonLeeCA <[email protected]>
Date:   Thu Apr 11 15:04:18 2024 +0000

    Fixed the column width issue with Bootstrap

    - When the size of the window is changed, the width of the columns in the
    header do not match width of the columns in table body

commit 2803310
Author: KimoonLeeCA <[email protected]>
Date:   Wed Apr 10 16:34:54 2024 +0000

    Deleted the code which request resubmission of form data

commit ee414a6
Author: KimoonLeeCA <[email protected]>
Date:   Sun Apr 7 16:16:04 2024 +0000

    Chagne the string and code after peer review with Deval

commit 4c71bdc
Author: KimoonLeeCA <[email protected]>
Date:   Fri Apr 5 12:43:42 2024 +0000

    Adjust the font and provider name in input field

commit e1b68ad
Author: KimoonLeeCA <[email protected]>
Date:   Wed Apr 3 15:07:28 2024 +0000

    Enable input area when it can be editable and stored radio status using the seession storage

commit ad9ee20
Author: KimoonLeeCA <[email protected]>
Date:   Mon Apr 1 16:29:48 2024 +0000

    Add patients value when clicking the raido patients button

commit d5532ea
Author: KimoonLeeCA <[email protected]>
Date:   Fri Mar 29 15:49:16 2024 +0000

    Add provider value when click the provider radio button

commit a43eb32
Author: KimoonLeeCA <[email protected]>
Date:   Sun Mar 24 09:10:07 2024 +0000

    Adjust the format of date to yyyy-mm-dd and change the icon from close to clear

commit 79a607f
Merge: e77510e 9989999
Author: KimoonLeeCA <[email protected]>
Date:   Tue Mar 19 16:29:26 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit e77510e
Author: KimoonLeeCA <[email protected]>
Date:   Tue Mar 19 16:24:01 2024 +0000

    Adjust the margin of the input and disabled the input box when it does
    not use

commit ef45fa7
Author: KimoonLeeCA <[email protected]>
Date:   Mon Mar 18 15:37:31 2024 +0000

    Add the search button at the bottom of the search filters' area.

commit f3f42ac
Author: KimoonLeeCA <[email protected]>
Date:   Sun Mar 17 14:54:23 2024 +0000

    Add strings for the inbox UI and adjust the margion of the serch area

commit 013c5db
Author: KimoonLeeCA <[email protected]>
Date:   Sat Mar 16 14:47:00 2024 +0000

    Change the Date Range to add image such as calendar and closed btn

commit b4fb505
Author: KIMOONLEE <[email protected]>
Date:   Wed Feb 28 14:57:23 2024 +0000

    Access the new inbox UI using alt + click instead of ctrl + click
    ctrl + click is not open the popup of new tab in firefox browser

commit 91c94d0
Merge: d0e2b8b 26cc561
Author: KIMOONLEE <[email protected]>
Date:   Wed Feb 28 14:13:52 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit d0e2b8b
Author: KIMOONLEE <[email protected]>
Date:   Fri Feb 23 17:12:21 2024 +0000

    Access the new inbox UI using ctrl + click

commit ccbbe57
Merge: fc4cd54 b2b1676
Author: KIMOONLEE <[email protected]>
Date:   Fri Feb 23 13:51:30 2024 +0000

    Merge branch 'master' into feature/inbox-final

commit fc4cd54
Author: KIMOONLEE <[email protected]>
Date:   Tue Feb 20 16:14:32 2024 +0000

    Change the path of the code from dms to documentManager

commit 5c1f40d
Author: KIMOONLEE <[email protected]>
Date:   Fri Feb 16 17:35:22 2024 +0000

    Fixed error related to path of the bootstrap and update the table after resizing winddow

commit eb8b94c
Author: KIMOONLEE <[email protected]>
Date:   Thu Feb 15 16:51:40 2024 +0000

    Adjust right side of the table when the window is 1280 wide

commit ef57793
Author: KIMOONLEE <[email protected]>
Date:   Thu Feb 15 15:57:22 2024 +0000

    Adjust the left table when the window is 1280 wide

commit 2eed17b
Author: KIMOONLEE <[email protected]>
Date:   Sat Feb 10 02:57:52 2024 +0000

    Improve formatting of table when the window is 1280 wide

commit e699c1d
Author: KIMOONLEE <[email protected]>
Date:   Fri Feb 9 14:39:24 2024 +0000

    Remove DataTables-1.13.2 which was added in this branch, and use the existing DastabTable-1.13.4 that is in master branch alrealdy.

commit 2b508c8
Merge: 5ebe5e6 9658683
Author: KIMOONLEE <[email protected]>
Date:   Fri Feb 9 08:49:37 2024 +0000

    Merge branch 'inbox-final' into feature/inbox-final

commit 9658683
Merge: daab750 9f22656
Author: Icedawn <[email protected]>
Date:   Thu Dec 14 03:13:07 2023 +0000

    Merged master into inbox-final

commit daab750
Merge: f04f8a1 5a25da4
Author: Keith Chung <[email protected]>
Date:   Thu Dec 7 19:01:42 2023 +0000

    Merge branch 'master' into inbox-final

commit f04f8a1
Author: Andrew Friesen <[email protected]>
Date:   Fri Oct 6 07:45:26 2023 +0000

    Changed inbox to use existing jquery version.

commit 40dfb50
Merge: 8f41a7b 83c6e2f
Author: Andrew Friesen <[email protected]>
Date:   Fri Oct 6 07:38:49 2023 +0000

    Merged openoscar/oscar:master into MagentaHealth/oscar:inbox-final

commit 8f41a7b
Merge: 8210939 f44dd06
Author: Icedawn <[email protected]>
Date:   Thu Sep 21 21:32:51 2023 +0000

    Merged master into inbox-final

commit 8210939
Author: Andrew Friesen <[email protected]>
Date:   Thu Apr 13 12:48:11 2023 -0400

    Added additional language support to inboxhub.

commit dd3e513
Author: Andrew Friesen <[email protected]>
Date:   Thu Apr 20 15:59:57 2023 +0000

    Fixed broken forward & file functions

commit a4a98fc
Author: Andrew Friesen <[email protected]>
Date:   Mon Apr 3 13:09:38 2023 -0400

    * Forward & file implementation.
    * Changed code formatting & css.
    * Removed css on forward modal.
    * Added new inbox to the main menu.

commit 9143ac9
Author: Andrew Friesen <[email protected]>
Date:   Thu Mar 30 13:22:24 2023 -0400

    Initial document upload implementation.

commit f99ec64
Author: Andrew Friesen <[email protected]>
Date:   Mon Mar 27 16:27:48 2023 -0400

    Initial lazy load implementation.

commit 4af2979
Author: Andrew Friesen <[email protected]>
Date:   Mon Mar 20 19:10:58 2023 +0000

    Initial implementation of inboxhub view + preview toggle.

commit 820f0a8
Author: Qasim <[email protected]>
Date:   Wed Mar 8 23:44:04 2023 +0000

    MOP41: value of result_status='A' added for Abnormal patients

commit baea8b5
Author: Andrew Friesen <[email protected]>
Date:   Thu Mar 2 19:22:49 2023 +0000

    MOP-31 Implementation of addition search features & document.
    *Split up new inbox files.
    *Added document counts for docs, labs, unmatched, abnormal, normal.
    *Added date search using jQuery DatePicker

commit 5f7e5a8
Author: Andrew Friesen <[email protected]>
Date:   Thu Mar 2 15:14:11 2023 +0000

    MOP-38 Added jQuery data-table without pagination to new inbox.
    * Sorted all null or empty values to bottom to be more in line with previous inbox.

commit be9c527
Author: Andrew Friesen <[email protected]>
Date:   Mon Feb 6 19:24:30 2023 +0000

    MOP-22 Initial implementation of the inbox-hub.
    *Added the three main objects for the multi-sort. Include DOC, LAB, HRM. These can have multiple selected at the same time.
    *Can be viewed by navigating to /oscar/web/inboxhub/InboxManager.do?method=displayInboxForm

commit aefda89
Author: Andrew Friesen <[email protected]>
Date:   Thu Feb 9 17:56:01 2023 +0000

    Added latest version of DataTables.

commit 1504e3c
Author: Andrew Friesen <[email protected]>
Date:   Mon Feb 6 14:36:56 2023 +0000

    MOP-3 Added bootstrap 5.0.2
@kk-chung
Copy link
Contributor Author

@warrendennis for your review as discussed!

warrendennis
warrendennis requested changes Feb 28, 2025
View reviewed changes
src/main/java/org/oscarehr/hospitalReportManager/dao/HRMDocumentToProviderDao.java
hrmToDemographicJoinAndSearchSql.append(") ");
}
}
// If demographicNumber is 0, then search for unmatched HRM documents (not linked to any demographic).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be very amazing if the security flaws of past source code was fixed as changes are made.
Would you consider fixing this with a proper HQL parameterized query?

src/main/java/oscar/oscarMDS/data/CategoryData.java
+ " LEFT JOIN HRMDocumentToProvider hp ON h.id = hp.hrmDocumentId"
+ " LEFT JOIN demographic d ON hd.demographicNo = d.demographic_no"
+ " WHERE h.id IN (SELECT hrmDocumentId FROM HRMDocumentToDemographic hd)"
// String sql = " SELECT HIGH_PRIORITY demographic_no, first_name, last_name, COUNT( distinct h.id) as count "
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider updating to use parameterized queries with hibernate. We have been trying really hard to eliminate these "raw" JDBC queries along the way.

src/main/webapp/provider/appointmentprovideradminday.jsp
@@ -1618,7 +1615,7 @@
<td valign="top" width="<%=isWeekView?100/7:100/numProvider%>%">
<!-- for the first provider's schedule -->

<table bgcolor="#486ebd">
<table border="0" cellpadding="0" bgcolor="#486ebd" cellspacing="0" width="100%">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not valid attributes. Please use HTML5 with CSS

src/main/webapp/provider/appointmentprovideradminday.jsp
@@ -1482,11 +1479,11 @@
</td>
</tr>
</table>
<table id="scheduleTable" BGCOLOR="#C0C0C0">
<table id="scheduleTable" BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C0C0C0">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not valid attributes. Please use HTML5 with CSS

src/main/webapp/provider/appointmentprovideradminday.jsp

<tr>
<td colspan="3">
<table bgcolor="#486ebd" >
<table border="0" cellpadding="0" bgcolor="#486ebd" cellspacing="0" width="100%">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not valid attributes. Please use HTML5 with CSS

src/main/webapp/provider/mainMenu.jsp
@@ -443,6 +441,28 @@
<script type="text/javascript" src="${pageContext.servletContext.contextPath}/library/jquery/jquery-ui-1.12.1.min.js"></script>
<%-- TODO: new dialog window for the user preferences --%>
<script>
var originalInboxLinkClickEvent = "popupInboxManager('../documentManager/inboxManage.do?method=prepareForIndexPage&providerNo=<%=curUser_no%>');return false;";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

context path please.

src/main/webapp/web/css/Inboxhub.css

@CHARSET "UTF-8";
body {
font-size: small !important;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep fonts consistent throughout Open OSP.

The current Open OSP font standard is:

:root * {
	font-family: Arial, "Helvetica Neue", Helvetica, sans-serif !important;
	font-size: 12px;
	overscroll-behavior: none;
	-webkit-font-smoothing: antialiased;
	-moz-osx-font-smoothing: grayscale;
line-height: 1;
font-weight: normal;
}

Including all button text, autocomplete menus, select menus etc..

Page titles are: h2
Table column titles are: th
Subtext is: font-size:smaller;
Gutter margins are: 15px
Box border radius: 4px
Shadow: box-shadow: 0 2px 4px 0 rgba(38,40,42,0.3);

Please keep style in-line with the other currently redesigned pages: Tickler, Schedule, Encounter, etc.

src/main/webapp/web/inboxhub/InboxhubTopbar.jsp
<a href="javascript:reportWindow('${e:forHtml(contextPath)}/documentManager/documentUploader.jsp',800,1000)" class="nav-link"><bean:message key="inboxmanager.document.uploadDoc"/></a>
</c:if>

<a href="javascript:reportWindow('${e:forHtml(contextPath)}/documentManager/inboxManage.do?method=getDocumentsInQueues',700,1100)" class="nav-link"><bean:message key="inboxmanager.document.pendingDocs"/></a>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent work!

src/main/webapp/web/inboxhub/InboxhubViewMode.jsp
</c:if>
<c:if test="${page ge 1}">
<c:forEach var="labResult" items="${labDocs}" varStatus="loopStatus">
<c:set var="labResultTitle" value="${labResult.isDocument() ? 'Document: ' : (labResult.isHRM() ? 'HRM: ' : 'Lab: ')}"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the labResult object itself declare if it's a document, HRM, Lab or what have you?

src/main/webapp/web/inboxhub/InboxhubViewMode.jsp
loading="lazy"
title="Lab Result Document">
<p>Your browser does not support iframes. Unable to display the document.</p>
</iframe>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had hoped we could avoid these iframes.

@warrendennis
Copy link
Collaborator

Just a few humble requests. Please let me know if you can entertain.

@kk-chung
Copy link
Contributor Author

kk-chung commented Mar 2, 2025

@D3V41 kindly review and action what makes sense to you here. Feel free to discuss with me or @lacarmen anything you're not sure about. thx!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@warrendennis warrendennis warrendennis requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kk-chung @warrendennis @D3V41