From eef15f311f142020a2b9098d4e4430f06cfb2a0e Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 24 Sep 2019 14:34:05 -0400 Subject: [PATCH] Remove logic for validating PoP date range out of clin-fields vue component --- js/components/clin_fields.js | 118 ----------------------------------- 1 file changed, 118 deletions(-) diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 03102025..00ca9c45 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -1,7 +1,3 @@ -import * as R from 'ramda' -import { format } from 'date-fns' - -import DateSelector from './date_selector' import { emitEvent } from '../lib/emitters' import Modal from '../mixins/modal' import optionsinput from './options_input' @@ -11,16 +7,12 @@ import PopDateRange from './pop_date_range' const TOTAL_AMOUNT = 'total_amount' const OBLIGATED_AMOUNT = 'obligated_amount' -const START_DATE = 'start_date' -const END_DATE = 'end_date' -const POP = 'period_of_performance' const NUMBER = 'number' export default { name: 'clin-fields', components: { - DateSelector, optionsinput, textinput, clindollaramount, @@ -39,79 +31,26 @@ export default { type: Number, default: 0, }, - initialStartDate: { - type: String, - default: null, - }, - initialEndDate: { - type: String, - default: null, - }, initialClinNumber: { type: String, default: null, }, - contractStart: { - type: String, - required: true, - }, - contractEnd: { - type: String, - required: true, - }, }, data: function() { - const start = !!this.initialStartDate - ? new Date(this.initialStartDate) - : undefined - const end = !!this.initialEndDate - ? new Date(this.initialEndDate) - : undefined const fundingValidation = this.initialObligated && this.initialTotal ? this.initialObligated <= this.initialTotal : true - const popValidation = !this.initialStartDate ? false : start < end const clinNumber = !!this.initialClinNumber ? this.initialClinNumber : undefined - const contractStartDate = new Date(this.contractStart) - const contractEndDate = new Date(this.contractEnd) return { clinIndex: this.initialClinIndex, clinNumber: clinNumber, - startDate: start, - endDate: end, - popValid: popValidation, - startDateValid: false, - endDateValid: false, - contractStartDate: contractStartDate, - contractEndDate: contractEndDate, clinNumber: clinNumber, showClin: true, - popErrors: [], - validations: [ - { - func: this.popDateOrder, - message: 'PoP start date must be before end date.', - }, - { - func: this.popStartsAfterContract, - message: `PoP start date must be on or after ${format( - contractStartDate, - 'MMM D, YYYY' - )}.`, - }, - { - func: this.popEndsBeforeContract, - message: `PoP end date must be before or on ${format( - contractEndDate, - 'MMM D, YYYY' - )}.`, - }, - ], totalAmount: this.initialTotal || 0, obligatedAmount: this.initialObligated || 0, fundingValid: fundingValidation, @@ -129,11 +68,6 @@ export default { obligatedAmount: this.initialObligated, totalAmount: this.initialTotal, }) - emitEvent('field-mount', this, { - optional: false, - name: 'clins-' + this.clinIndex + '-' + POP, - valid: this.checkPopValid(), - }) }, methods: { @@ -145,50 +79,6 @@ export default { }) }, - checkPopValid: function() { - return ( - this.popDateOrder() && - this.popStartsAfterContract() && - this.popEndsBeforeContract() - ) - }, - - validatePop: function() { - this.popValid = this.checkPopValid() - emitEvent('field-change', this, { - name: 'clins-' + this.clinIndex + '-' + POP, - valid: this.popValid, - }) - - this.popErrors = R.pipe( - R.map(validation => - !validation.func() ? validation.message : undefined - ), - R.filter(Boolean) - )(this.validations) - }, - - popStartsAfterContract: function() { - if (this.startDateValid) { - return this.startDate >= this.contractStartDate - } - return true - }, - - popEndsBeforeContract: function() { - if (this.endDateValid) { - return this.endDate <= this.contractEndDate - } - return true - }, - - popDateOrder: function() { - if (!!this.startDate && !!this.endDate) { - return this.startDate < this.endDate - } - return true - }, - checkFundingValid: function() { return this.obligatedAmount <= this.totalAmount }, @@ -207,14 +97,6 @@ export default { } else if (event.name.includes(OBLIGATED_AMOUNT)) { this.obligatedAmount = parseFloat(event.value) this.validateFunding() - } else if (event.name.includes(START_DATE)) { - if (!!event.value) this.startDate = new Date(event.value) - if (!!event.valid) this.startDateValid = event.valid - this.validatePop() - } else if (event.name.includes(END_DATE)) { - if (!!event.value) this.endDate = new Date(event.value) - if (!!event.valid) this.endDateValid = event.valid - this.validatePop() } else if (event.name.includes(NUMBER)) { this.clinNumber = event.value }