diff --git a/apcd-cms/Makefile b/apcd-cms/Makefile index b4b1daaa..d4899628 100644 --- a/apcd-cms/Makefile +++ b/apcd-cms/Makefile @@ -8,7 +8,7 @@ DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --ta #.PHONY: build build: - docker-compose -f docker-compose.dev.yml build + docker compose -f docker-compose.dev.yml build .PHONY: build-full build-full: @@ -27,12 +27,12 @@ publish-latest: .PHONY: start start: - docker-compose -f docker-compose.dev.yml up + docker compose -f docker-compose.dev.yml up .PHONY: stop stop: - docker-compose -f docker-compose.dev.yml down + docker compose -f docker-compose.dev.yml down .PHONY: stop-full stop-v: - docker-compose -f docker-compose.dev.yml down -v + docker compose -f docker-compose.dev.yml down -v diff --git a/apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css b/apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css index 9895523f..8cce22b4 100644 --- a/apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css +++ b/apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css @@ -13,8 +13,15 @@ input[id^="threshold-requested"]::-webkit-outer-spin-button -moz-appearance:textfield; } +[id^="required_threshold"] { + background-color: #e9ecef; + color: #6c757d; + border-color: #ced4da; + cursor: not-allowed; +} + /* Field Sizes */ -[id^="threshold-requested"], [id^="expiration-date"] { +[id^="threshold-requested"], [id^="expiration-date"], [id^="required_threshold"] { min-width: 15ch; } /* To make sure sup values are not cut off when set as a label*/ diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html index d0b50f3c..d26c7193 100644 --- a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html +++ b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html @@ -7,201 +7,180 @@
{% include "nav_cms_breadcrumbs.html" %} - -
-
-

Threshold Exception Request

-
- -

- This form should be completed and submitted only by entities who are - eligible for an exception to certain data submission requirements under H.B. 2090 (87(R)) - and associated regulations. Please review the legislation and regulation before - submitting this form. Links to both can be found on the - Texas All-Payor Claims Database - website. -

-
- -
-
- {% csrf_token %} - -
- - -
-

Requested Threshold Reduction

-
-
- - - - -
-
- - - - - - + {% for submitter in submitters %} + - -
-
- - + {% endfor %} + +
+
+ - -
-
-
- + - - -
- + - % -
- -
-
-
-
-
- -
- -
- -
- -
- - -
-

Request and Justification

-
-

Provide rationale for the exception request, outlining the reasons why the - organization is unable to comply with the relevant requirements. Provide as - much detail as possible regarding the exception request, indicating the - specific submission requirements for which relief is being sought. If applicable, - indicate how the organization plans to become compliant.**

+ - + - -
- 2000 character limit -
+ + + + +
+
+ + +
-
-

Acknowledgment of Terms

-
- +
- - + +
-
-
- -
- - - -
-
- -
-
-
- - - - - {# Hidden links for future pages #} - {# TODO: Allow this template to render CMS admin-entered markup #} - +
+ +
+ +
{# Scripts #} @@ -317,7 +296,20 @@

Acknowledgment of Terms

+
+
+ + + +
+ + % +
+
` }; return exceptions @@ -337,12 +329,16 @@

Acknowledgment of Terms

}; // Removes helper text and field select options function clearDataOnFileChange(exceptions) { - helpText = $(`#help-text-threshold-requested_${exceptions}`) + helpText = $(`#help-text-threshold-requested_${exceptions}`); fieldDropDown = $(`#field-threshold-exception_${exceptions}`); + requiredThreshold = $(`#required_threshold_${exceptions}`); for (let i = 0; i < fieldDropDown.length; i++) { fieldDropDown[i].innerHTML = ""; helpText[i].innerHTML = ""; }; + if (requiredThreshold.length > 0) { + requiredThreshold.val(''); + } }; // To access previously hiddenexception blocks and populate with info from AJAX call. // Ppulates based on sliced id name of select element to get exception block number @@ -381,6 +377,7 @@

Acknowledgment of Terms

function getHelpText(fieldSelection, file_type, exceptions) { helpText = document.getElementById(`help-text-threshold-requested_${exceptions}`); thresholdInput = document.getElementById(`threshold-requested_${exceptions}`) + requiredThreshold = document.getElementById(`required_threshold_${exceptions}`) $.ajax({ url: "{% url 'exception:get-cdls' %}", type: 'GET', @@ -395,6 +392,7 @@

Acknowledgment of Terms

thresholdInput.max = cdls[i].threshold_value helpText.innerHTML = ""; helpText.innerHTML = `Must be less than the ${cdls[i].threshold_value}% required.` + requiredThreshold.value = `${cdls[i].threshold_value}`; }; }, error: function(xhr, status, error) { @@ -478,9 +476,6 @@

Acknowledgment of Terms

* Exceptions cannot be granted for periods longer than a year.
** Exceptions cannot be granted "from any requirement in insurance code Chapter 38".
-
- - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py index a7de7268..fde97513 100644 --- a/apcd-cms/src/apps/utils/apcd_database.py +++ b/apcd-cms/src/apps/utils/apcd_database.py @@ -840,8 +840,9 @@ def create_threshold_exception(form, iteration, sub_data): field_number, requested_threshold, explanation_justification, - status - ) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) + status, + required_threshold + ) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) """ values = ( _clean_value(form['business-name_{}'.format(iteration)]), @@ -856,7 +857,8 @@ def create_threshold_exception(form, iteration, sub_data): _clean_value(form['field-threshold-exception_{}'.format(iteration)]), _clean_value(form['threshold-requested_{}'.format(iteration)]), _clean_value(form['justification']), - "pending" + "pending", + _clean_value((form['required_threshold_{}'.format(iteration)])), ) cur = conn.cursor() cur.execute(operation, values)