Skip to content

Commit

Permalink
Merge pull request #460 from CityOfNewYork/feature/OP-1471
Browse files Browse the repository at this point in the history 
Feature/OP-1471: 508 Changes for Custom Forms
  • Loading branch information
@joelbcastillo
joelbcastillo authored Jan 30, 2019
2 parents ca70a46 + 74d702d commit 736b060
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 20 deletions.
9 changes: 7 additions & 2 deletions app/static/js/request/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,20 @@ function updateCustomRequestFormDropdowns() {
// loop through each request type dropdown
$(".request-type").each(function () {
var requestTypeOptions = "#" + this.id + " > option";
if (this.value !== "") { // if the dropdown is not exmpty execute this block
if (this.value !== "") { // if the dropdown is not empty execute this block
$(requestTypeOptions).each(function () { // loop through each option in the dropdown
if (this.text !== "" && this.text !== categoryDividerText) { // only update options that actually have text
var originalText = originalFormNames[this.value]; // get the actual form name
if (backwards[this.value] === 0) { // if there are no instances of the form keep the text at 0
$(this).text(originalText + " (" + (backwards[this.value]).toString() + " of " + maxRepeatable[this.value].toString() + ")");
}
else { // use the following formula, maxRepeatable[this.value] - backwards[this.value] - repeatableCounter[this.value] + 1 to calculate what instance number is currently being processed
$(this).text(originalText + " (" + (maxRepeatable[this.value] - backwards[this.value] - repeatableCounter[this.value] + 1).toString() + " of " + maxRepeatable[this.value].toString() + ")");
if (showMultipleRequestTypes) {
$(this).text(originalText + " (" + (maxRepeatable[this.value] - backwards[this.value] - repeatableCounter[this.value] + 1).toString() + " of " + maxRepeatable[this.value].toString() + ")");
}
else { // use original text if only one custom form can display
$(this).text(originalText);
}
}
if (backwards[this.value] > 1) { // update the backwards counter for the next time you see the same form selected in another dropdown
backwards[this.value]--;
Expand Down
4 changes: 3 additions & 1 deletion app/static/js/request/new-request-agency.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $(document).ready(function () {
// append a new dropdown and content div every time the additional content button is clicked
$("#custom-request-form-additional-content").click(function () {
customRequestFormCounter = customRequestFormCounter + 1;
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type'></select><br></div>";
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type' aria-label='Request Type " + customRequestFormCounter + "'></select><br></div>";
var contentTemplate = "<div class='panel-body' id='custom-request-form-content-" + customRequestFormCounter + "' hidden></div></div>";
$(dropdownTemplate + contentTemplate).insertBefore("#custom-request-form-additional-content");
$("#custom-request-form-additional-content").hide();
Expand All @@ -97,6 +97,8 @@ $(document).ready(function () {

previousValues[customRequestFormCounter - 1] = "";
currentValues[customRequestFormCounter - 1] = "";

$("#request-type-" + customRequestFormCounter).focus();
});

// jQuery mask plugin to format fields
Expand Down
4 changes: 3 additions & 1 deletion app/static/js/request/new-request-anon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ $(document).ready(function () {
// append a new dropdown and content div every time the additional content button is clicked
$("#custom-request-form-additional-content").click(function () {
customRequestFormCounter = customRequestFormCounter + 1;
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type'></select><br></div>";
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type' aria-label='Request Type " + customRequestFormCounter + "'></select><br></div>";
var contentTemplate = "<div class='panel-body' id='custom-request-form-content-" + customRequestFormCounter + "' hidden></div></div>";
$(dropdownTemplate + contentTemplate).insertBefore("#custom-request-form-additional-content");
$("#custom-request-form-additional-content").hide();
Expand All @@ -123,6 +123,8 @@ $(document).ready(function () {

previousValues[customRequestFormCounter - 1] = "";
currentValues[customRequestFormCounter - 1] = "";

$("#request-type-" + customRequestFormCounter).focus();
});

// jQuery mask plugin to format fields
Expand Down
4 changes: 3 additions & 1 deletion app/static/js/request/new-request-user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $(document).ready(function () {
// append a new dropdown and content div every time the additional content button is clicked
$("#custom-request-form-additional-content").click(function () {
customRequestFormCounter = customRequestFormCounter + 1;
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type'></select><br></div>";
var dropdownTemplate = "<div class='panel panel-default appended-div' id='custom-request-panel-" + customRequestFormCounter + "'><div class='panel-heading' id='custom-request-forms-" + customRequestFormCounter + "' style='display: block;'><label class='request-heading request-type-label' for='request_type'>Request Type (optional)</label><button type='button' class='close panel-dismiss' id='panel-dismiss-button-" + customRequestFormCounter + "' data-target='#panel-dismiss-modal' data-toggle='modal'><span aria-hidden='true'>&times;</span><span class='sr-only'>Close</span></button><select class='input-block-level request-type' id='request-type-" + customRequestFormCounter + "' name='request_type' aria-label='Request Type " + customRequestFormCounter + "'></select><br></div>";
var contentTemplate = "<div class='panel-body' id='custom-request-form-content-" + customRequestFormCounter + "' hidden></div></div>";
$(dropdownTemplate + contentTemplate).insertBefore("#custom-request-form-additional-content");
$("#custom-request-form-additional-content").hide();
Expand All @@ -105,6 +105,8 @@ $(document).ready(function () {

previousValues[customRequestFormCounter - 1] = "";
currentValues[customRequestFormCounter - 1] = "";

$("#request-type-" + customRequestFormCounter).focus();
});

// Apply parsley validation styles to the input forms for a new request.
Expand Down
5 changes: 0 additions & 5 deletions app/templates/request/new_request_agency.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ <h1>Request a Record</h1>
<div class="panel panel-default" id="custom-request-panel-1" hidden>
<div class="panel-heading" id="custom-request-forms-1" hidden>
{{ form.request_type.label(class="request-heading request-type-label") }}
<span data-toggle="popover" data-placement="right" data-trigger="hover" title="Request Type"
data-content="List of all agency specific request types that can be made within OpenRecords."
aria-label="List of all agency specific request types that can be made within OpenRecords."
class="glyphicon glyphicon-question-sign">
</span>
{{ form.request_type(id="request-type-1", class="input-block-level request-type") }}<br>
</div>
<div class="panel-body" id="custom-request-form-content-1" hidden>
Expand Down
5 changes: 0 additions & 5 deletions app/templates/request/new_request_anon.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ <h1>Request a Record</h1>
<div class="panel panel-default" id="custom-request-panel-1" hidden>
<div class="panel-heading" id="custom-request-forms-1" hidden>
{{ form.request_type.label(class="request-heading request-type-label") }}
<span data-toggle="popover" data-placement="right" data-trigger="hover" title="Request Type"
data-content="List of all agency specific request types that can be made within OpenRecords."
aria-label="List of all agency specific request types that can be made within OpenRecords."
class="glyphicon glyphicon-question-sign">
</span>
{{ form.request_type(id="request-type-1", class="input-block-level request-type") }}<br>
</div>
<div class="panel-body" id="custom-request-form-content-1" hidden>
Expand Down
5 changes: 0 additions & 5 deletions app/templates/request/new_request_user.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ <h1>Request a Record</h1>
<div class="panel panel-default" id="custom-request-panel-1" hidden>
<div class="panel-heading" id="custom-request-forms-1" hidden>
{{ form.request_type.label(class="request-heading request-type-label") }}
<span data-toggle="popover" data-placement="right" data-trigger="hover" title="Request Type"
data-content="List of all agency specific request types that can be made within OpenRecords."
aria-label="List of all agency specific request types that can be made within OpenRecords."
class="glyphicon glyphicon-question-sign">
</span>
{{ form.request_type(id="request-type-1", class="input-block-level request-type") }}<br>
</div>
<div class="panel-body" id="custom-request-form-content-1" hidden>
Expand Down

0 comments on commit 736b060

Please sign in to comment.