-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
10102 shift start contains handed over values in the previous shift #10112
Merged
GSMgeeth
merged 87 commits into
development
from
10102-shift-start-contains-handed-over-values-in-the-previous-shift
Jan 16, 2025
Merged
10102 shift start contains handed over values in the previous shift #10112
GSMgeeth
merged 87 commits into
development
from
10102-shift-start-contains-handed-over-values-in-the-previous-shift
Jan 16, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…10027-export-amp-list # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H B Ariyaratne <[email protected]>
… 10003-collection-cente-bill-wise-detail-report-bugs
Signed-off-by: Pubudu-Piyankara <[email protected]>
…ttps://github.com/hmislk/hmis.git into #10050_Grn_return_improvement
… #10036_Grn_report # Conflicts: # src/main/java/com/divudi/bean/pharmacy/GoodsReturnController.java
… #10036_Grn_report
Signed-off-by: Pubudu-Piyankara <[email protected]>
Signed-off-by: DamithDeshan <[email protected]>
…0064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…ions-are-not-listed-in-inpatient-medicine-issue-summary
…064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…//github.com/hmislk/hmis.git into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
Signed-off-by: Isuru Ranaweera <[email protected]>
Signed-off-by: Buddhika Ariyaratne <[email protected]> **Pull Request Comment** **Summary of Changes** - **Type Visibility**: Restricted the “Type” column to be visible only for admin users. - **True/False Replacement**: Replaced the boolean “true”/“false” text with appropriate icons (“✓” for true, “✕” for false). - **Enhanced Search**: Extended the search functionality to include the “Value” column, making it easier to find specific application options. **Verification & Testing** 1. **Login as Admin**: Confirm that the “Type” column is visible, and icons replace the previous true/false text. 2. **Login as Non-Admin**: Verify that the “Type” column is hidden. 3. **Search**: Ensure searching by the option’s key or value (including yes/no) yields expected results. All changes have been completed and verified locally. Signed-off-by: Buddhika Ariyaratne <[email protected]>
…to 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/webapp/admin/lims/report_template_availability.xhtml Signed-off-by: Buddhika Ariyaratne <[email protected]>
…thub.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/webapp/lab/patient_report.xhtml Signed-off-by: Buddhika Ariyaratne <[email protected]>
…d_print_report' of https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/collecting_centre/courier/patient_report_print.xhtml # src/main/webapp/lab/patient_report.xhtml # src/main/webapp/lab/patient_report_print.xhtml Signed-off-by: Buddhika Ariyaratne <[email protected]>
…10077-improvements-for-bht-direct-issue-from-pharmacy
… 10077-improvements-for-bht-direct-issue-from-pharmacy
Signed-off-by: Buddhika Ariyaratne <[email protected]>
… 10077-improvements-for-bht-direct-issue-from-pharmacy
Signed-off-by: Buddhika Ariyaratne <[email protected]>
… 6264-add-expences-for-pharmacy-direct-purchase # Conflicts: # src/main/resources/META-INF/persistence.xml
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
… 6264-add-expences-for-pharmacy-direct-purchase
… 10077-improvements-for-bht-direct-issue-from-pharmacy
https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/admin/institutions/admin_mange_application_options.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…mislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy
…om/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/reports/inventoryReports/slow_fast_none_movement.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/webapp/resources/css/ohmis.css Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…no-in-application-options-page' of https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy
…s://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…om/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
GSMgeeth
approved these changes
Jan 16, 2025
@@ -2404,20 +2404,24 @@ public String navigateToCreateShiftEndSummaryBillForHandover() { | |||
shiftPayments.stream() | |||
.forEach(p -> p.setTransientPaymentHandover(PaymentHandover.USER_COLLECTED)); | |||
} | |||
System.out.println("shiftPayments = " + shiftPayments); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better to either remove before committing or use a logging library / framework to log information or errors.
The System.out.println("")
method can cause performance issues and also not designed for thread-safety among other weaknesses when compared to a logging framework.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now when handing over completed to another user, they do not appear in the summaries for the next shift.
Please check @DeshaniPubudu