HWPV-195: View & Edit individual claim page #650
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,151 @@ | ||
| function totalApproved () { | ||
| let approvedCost = 0 | ||
| const manuallyProcessed = 0 | ||
| let deduction = 0 | ||
|
|
||
| function isValidValue (value) { | ||
| return !isNaN(value) && value.trim().length !== 0 && value.indexOf('e') === -1 && value.indexOf('E') === -1 | ||
| } | ||
|
|
||
| if ($('#unassign').length) { | ||
|
There was a problem hiding this comment. Not sure how I missed this, the code inside the |
||
| $('.approved-amount').each(function () { | ||
| const value = $(this).val() | ||
| if (isValidValue(value)) { | ||
| approvedCost += parseFloat(value) | ||
| } | ||
| approvedCost += +$(this).text().replace('£', '').trim() | ||
|
There was a problem hiding this comment. Actually this doesn't make sense, you're using |
||
| }) | ||
| } else { | ||
| $('.approved-amount').each(function () { | ||
| const value = $(this).val() | ||
| if (isValidValue(value)) { | ||
| approvedCost += parseFloat(value) | ||
| } | ||
| approvedCost += +$(this).text().replace('£', '').trim() | ||
| }) | ||
| } | ||
|
|
||
| $('.deduction').each(function () { | ||
| deduction += +$(this).text().replace(' £', '') | ||
| }) | ||
|
|
||
| const totalCost = approvedCost + manuallyProcessed + deduction | ||
|
|
||
| const formattedCost = totalCost < 0 ? '- £' + Math.abs(totalCost).toFixed(2) : '£' + totalCost.toFixed(2) | ||
| $('.claim-expense-approvedCostText').text(formattedCost) | ||
|
|
||
| if (totalCost < 0) { | ||
| $('.claim-expense-approvedCostText').addClass('claim-table-negative') | ||
| } else { | ||
| $('.claim-expense-approvedCostText').removeClass('claim-table-negative') | ||
| } | ||
| } | ||
|
|
||
| $(document).ready(function () { | ||
| function initializeState () { | ||
| if ($('#unassign').length) { | ||
| // setting initial state for when assigned | ||
| $('.claim-expense-status').each(function () { | ||
| const id = $(this).attr('data-id') | ||
| const value = $(this).val() | ||
| if (value === 'APPROVED') { | ||
| $(`#text-for-${id}-approved-cost`).text($(`#claimed-expense-for-${id}`).text().trim()) | ||
| } else if (value === 'APPROVED-DIFF-AMOUNT') { | ||
| $(`#text-for-${id}-approved-cost`).addClass('js-hidden').removeClass('approved-amount') | ||
| $(`.input-container-for-${id}-approve-different-cost`).removeClass('js-hidden') | ||
| $(`.input-value-for-${id}-approve-different-cost`).addClass('approved-amount') | ||
| } | ||
| }) | ||
| } | ||
| $('#additional-info-reject').each(function () { | ||
| if (this[this.selectedIndex].value === 'Other') { | ||
| $('.rejection-reason-other').removeClass('js-hidden') | ||
| } | ||
| }) | ||
| $('#release-date-is-set').each(function () { | ||
| if ($(this).is(':checked')) { | ||
| $('#release').removeClass('js-hidden') | ||
| } | ||
| }) | ||
| $('#is-trusted-checkbox').each(function () { | ||
| if ($(this).is(':checked')) { | ||
| $('.reject-auto-approval').addClass('js-hidden') | ||
| } else { | ||
| $('.reject-auto-approval').removeClass('js-hidden') | ||
| } | ||
| }) | ||
| totalApproved() | ||
| } | ||
| initializeState() | ||
|
|
||
| $(function () { | ||
| $('.claim-expense-status').change(function () { | ||
| const id = $(this).attr('data-id') | ||
| const value = $(this).val() | ||
| if (value === 'APPROVED') { | ||
| $(`#text-for-${id}-approved-cost`).removeClass('js-hidden').addClass('approved-amount').text($(`#claimed-expense-for-${id}`).text()) | ||
| $(`.input-container-for-${id}-approve-different-cost`).addClass('js-hidden') | ||
| $(`.input-value-for-${id}-approve-different-cost`).removeClass('approved-amount').val($(`#claimed-expense-for-${id}`).text().replace('£', '')) | ||
| $(`.claim-expense-${id}-approvedcost`).val($(`#claimed-expense-for-${id}`).text()) | ||
| } else if (value === 'APPROVED-DIFF-AMOUNT') { | ||
| $(`#text-for-${id}-approved-cost`).addClass('js-hidden').removeClass('approved-amount') | ||
| $(`.input-container-for-${id}-approve-different-cost`).removeClass('js-hidden') | ||
| $(`.input-value-for-${id}-approve-different-cost`).addClass('approved-amount').val($(`#claimed-expense-for-${id}`).text().replace('£', '')) | ||
| } else { | ||
| $(`#text-for-${id}-approved-cost`).addClass('js-hidden').addClass('approved-amount').text('0.00') | ||
| $(`.input-container-for-${id}-approve-different-cost`).addClass('js-hidden') | ||
| $(`.input-value-for-${id}-approve-different-cost`).removeClass('approved-amount').val('0.00') | ||
| } | ||
| totalApproved() | ||
| }) | ||
|
|
||
| $('.input-for-different-cost').on('input', function () { | ||
| totalApproved() | ||
| }) | ||
|
|
||
| $('input[value="Remove"]').parent().parent().find('td.deduction').addClass('approved-amount') | ||
|
|
||
| $('#overpayment-toggle').change(function () { | ||
| showClosedClaimActionSection('#overpayment-input') | ||
| }) | ||
|
|
||
| $('#close-toggle').change(function () { | ||
| showClosedClaimActionSection('#close-advanced-claim-input') | ||
| }) | ||
|
|
||
| $('#request-new-payment-details-toggle').change(function () { | ||
| showClosedClaimActionSection('#request-new-payment-details-input') | ||
| }) | ||
|
|
||
| $('#additional-info-reject').change(function () { | ||
| if (this[this.selectedIndex].value === 'Other') { | ||
| $('.rejection-reason-other').removeClass('js-hidden') | ||
| } else { | ||
| $('.rejection-reason-other').addClass('js-hidden') | ||
| } | ||
| }) | ||
|
|
||
| $('#is-trusted-checkbox').on('click', function () { | ||
| if ($(this).is(':checked')) { | ||
| $('.reject-auto-approval').addClass('js-hidden') | ||
| } else { | ||
| $('.reject-auto-approval').removeClass('js-hidden') | ||
| } | ||
| }) | ||
|
|
||
| $('#release-date-is-set').on('click', function () { | ||
| if ($(this).is(':checked')) { | ||
| $('#release').removeClass('js-hidden') | ||
| } else { | ||
| $('#release').addClass('js-hidden') | ||
| } | ||
| }) | ||
| }) | ||
|
|
||
| function showClosedClaimActionSection (id) { | ||
| $('#overpayment-input').addClass('js-hidden') | ||
| $('#close-advanced-claim-input').addClass('js-hidden') | ||
| $('#request-new-payment-details-input').addClass('js-hidden') | ||
| $(id).removeClass('js-hidden') | ||
| } | ||
| }) | ||
Oops, something went wrong.
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.
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.
Sorry I seem to spot things after re-reading. Is
valuea string or Number?isNandoesn't make sense if you're also usingtrimon a string?isNaNwill be OK with1e3for example.