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.

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

10111 retail sale medicine search optimization #10113

Merged
merged 88 commits into from
Jan 16, 2025

Conversation

buddhika75
Copy link
Member

Now listing medicines in retail sale optimized.

Need to set the configuration options
Display Total Stock when listing medicines for Retail Sale
Medicine Identification Codes Used

Only Retail Sale 1 is Fixed. Have to fix Other Retail Sales.

buddhika75 and others added 30 commits January 6, 2025 09:30
…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]>
… #10036_Grn_report

# Conflicts:
#	src/main/java/com/divudi/bean/pharmacy/GoodsReturnController.java
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]>
buddhika75 and others added 26 commits January 13, 2025 19:04
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]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
@buddhika75 buddhika75 linked an issue Jan 16, 2025 that may be closed by this pull request
@GSMgeeth GSMgeeth merged commit 7baa16f into development Jan 16, 2025
@GSMgeeth GSMgeeth deleted the 10111-retail-sale-medicine-search-optimization branch January 16, 2025 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Retail sale medicine search optimization
8 participants