Skip to content

LIB-166, add out-of-stock checkbox #388

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

LIB-166, add out-of-stock checkbox #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions configuration/pih/htmlforms/dispensing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
var scrolled = false;

var requiredAndEmpty = function(jqEl) {
// medication-instructions is optional
// medication-instructions and out-of-stock are optional
// duration and duration-units are optional if frequency = STAT
// everything else is required
var empty = !jqEl.val() && jqEl.siblings('input[type="hidden"]').length == 0 || jqEl.siblings('input[type="hidden"]').attr("value") == "";
if ( (jqEl.prop("type") == 'checkbox') && jqEl.prop("checked") == false) {
empty = true;
}
var optional = false;
if (jqEl.closest('.medication-instructions').length) {
if (jqEl.closest('.medication-instructions').length || jqEl.closest('.medication-status').length) {
optional = true;
} else if (jqEl.closest('.duration').length || jqEl.closest('.duration-unit').length) {
var freq = jqEl.closest('.medication').find('.frequency select')[0];
Expand All @@ -28,8 +31,8 @@
var numFilledFields = 0;
jq(this).find('input, select').each(function() {
jq(this).removeClass('emptyValue');

if (jq(this).val()) {
// for checkbox the val returns the answerConceptId, so we have to check if the checkbox is checked
if (( jq(this).prop("type") !== 'checkbox' && jq(this).val() ) || ((jq(this).prop("type") == 'checkbox') && jq(this).prop("checked") == true) ) {
numFilledFields += 1;
} else {
numEmptyFields += 1;
Expand All @@ -39,6 +42,7 @@
var anyErrors = false;
if (numFilledFields > 0) {
jq(this).find('input, select').each(function () {
debugger
Copy link
Member

@lnball lnball Nov 7, 2022

Choose a reason for hiding this comment

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

Remove debugger ;)

if (requiredAndEmpty(jq(this))) {
if (!jq(this).hasClass('illegalValue')) {
jq(this).addClass('emptyValue');
Expand Down Expand Up @@ -218,6 +222,15 @@
</label>
<obs id="amount{0}" conceptId="PIH:9071"/>
</p>
<p>
<label>
<uimessage code="pihcore.status"/>
</label>
<obs id="stockout{0}" class="medication-status"
style="checkbox"
conceptId="PIH:14368" answerConceptId="CIEL:1754"
answerCode="pihcore.stockout"/>
</p>
<p>
<label>
<uimessage code="mirebalais.dispensing.medicationInstructions"/>
Expand Down