diff --git a/components/questionnaire/AddressSuggests.js b/components/questionnaire/AddressSuggests.js index 6c5cf1f..d45ace9 100644 --- a/components/questionnaire/AddressSuggests.js +++ b/components/questionnaire/AddressSuggests.js @@ -46,10 +46,14 @@ export default class AddressSuggests extends React.Component const { onChange } = this.props; onChange({ name: value, fias_id: "" }); - if(focused) + this.setState({ focused: true }, () => { this._getAddress(value); - } + }); + + //if(focused) + //{ + //} } _handle_onSelect = (value) => @@ -57,31 +61,23 @@ export default class AddressSuggests extends React.Component const { fias, focused } = this.state; const { onChange } = this.props; - onChange({ name: value, fias_id: fias[value] }); - - setTimeout(() => + this.setState({ focused: false }, () => { - this.setState({ focused: false }); - }, 200); + onChange({ name: value, fias_id: fias[value] }); + }); } _handle_onFocus = (event) => { - event.preventDefault(); - event.stopPropagation(); - this.setState({ focused: true }); } _handle_onBlur = (event) => { - event.preventDefault(); - event.stopPropagation(); - setTimeout(() => { this.setState({ focused: false }); - }, 200); + }, 100); } _getAddress = (text) => @@ -141,6 +137,8 @@ export default class AddressSuggests extends React.Component onChange={ (event) => this._handle_onChange(event.target.value) } onFocus={ this._handle_onFocus } onBlur={ this._handle_onBlur } + onMouseDown={ (event) => { this._handle_onFocus(event); } } + onTouchStart={ (event) => { this._handle_onFocus(event); } } required={ required } disabled={ disabled } /> @@ -149,7 +147,13 @@ export default class AddressSuggests extends React.Component
{ options.map((option, index) => ( -
{ event.preventDefault(); this._handle_onSelect(option.value); } }>{ option.value }
+
{ event.preventDefault(); this._handle_onSelect(option.value); } } + onTouchStart={ (event) => { event.preventDefault(); this._handle_onSelect(option.value); } } + >{ option.value }
)) }
diff --git a/components/questionnaire/SuggestsInput.js b/components/questionnaire/SuggestsInput.js index c1750ec..27dee14 100644 --- a/components/questionnaire/SuggestsInput.js +++ b/components/questionnaire/SuggestsInput.js @@ -69,10 +69,10 @@ export default class SuggestsInput extends React.Component const { onChange } = this.props; onChange(value); - if(focused) + this.setState({ focused: true }, () => { this._getValue(value); - } + }); } _handle_onSelect = (value) => @@ -85,12 +85,12 @@ export default class SuggestsInput extends React.Component }); } - _handle_onFocus = () => + _handle_onFocus = (event) => { this.setState({ focused: true }); } - _handle_onBlur = () => + _handle_onBlur = (event) => { setTimeout(() => { @@ -189,7 +189,13 @@ export default class SuggestsInput extends React.Component
{ options.map((option, index) => ( -
this._handle_onSelect(option.value) }>{ option.value }
+
{ event.preventDefault(); this._handle_onSelect(option.value); } } + onTouchStart={ (event) => { event.preventDefault(); this._handle_onSelect(option.value); } } + >{ option.value }
)) }
diff --git a/pages/api/questionnaire/send.js b/pages/api/questionnaire/send.js index 9fe4bac..5a3bcc4 100644 --- a/pages/api/questionnaire/send.js +++ b/pages/api/questionnaire/send.js @@ -84,7 +84,7 @@ export default async function handler(req, res) let payload = { ...parsed.main, ...{ head_person: parsed.head_person }, ...{ signatory_person: parsed.signatory_person }, }; - payload.questionnaire_sign_type = parsed.sign.digital ? "eds" : "paper"; + payload.questionnaire_sign_type = digital ? "eds" : "paper"; payload.telephone = checkNullEmpty(payload.telephone) ? payload.telephone.replace(/[^0-9]/g, '') : null; payload.individual_executive_inn = checkNullEmpty(payload.individual_executive_inn) ? payload.individual_executive_inn.replace(/[^0-9]/g, '') : null; @@ -99,7 +99,7 @@ export default async function handler(req, res) { payload.head_person.no_middle_name = true; } - payload.head_person.identity_document.citizenship_code = payload.head_person.identity_document.citizenship.code; + payload.head_person.identity_document.citizenship_code = payload.head_person.identity_document.citizenship.code.toString(); payload.head_person.telephone = checkNullEmpty(payload.head_person.telephone) ? payload.head_person.telephone.replace(/[^0-9]/g, '') : null; payload.head_person.identity_document.issuedate = checkNullEmpty(payload.head_person.identity_document.issuedate) ? moment(payload.head_person.identity_document.issuedate).format("YYYY-MM-DD") : null; payload.head_person.evo_assignment_date = checkNullEmpty(payload.head_person.evo_assignment_date) ? moment(payload.head_person.evo_assignment_date).format("YYYY-MM-DD") : null; @@ -121,7 +121,7 @@ export default async function handler(req, res) "lastname", "firstname", "middlename", "no_middle_name", "jobtitle", "telephone", "email", "identity_document", "evo_assignment_date", "evo_credentials_dateend", "evo_indefinite", ]) }; } - payload.signatory_person.identity_document.citizenship_code = payload.signatory_person.identity_document.citizenship.code; + payload.signatory_person.identity_document.citizenship_code = payload.signatory_person.identity_document.citizenship.code.toString(); payload.signatory_person.telephone = checkNullEmpty(payload.signatory_person.telephone) ? payload.signatory_person.telephone.replace(/[^0-9]/g, '') : null; payload.signatory_person.identity_document.issuedate = checkNullEmpty(payload.signatory_person.identity_document.issuedate) ? moment(payload.signatory_person.identity_document.issuedate).format("YYYY-MM-DD") : null; payload.signatory_person.docdate = checkNullEmpty(payload.signatory_person.docdate) ? moment(payload.signatory_person.docdate).format("YYYY-MM-DD") : null; @@ -134,6 +134,7 @@ export default async function handler(req, res) founder_persons[i].founder_number = parseInt(i, 10) + 1; founder_persons[i].telephone = checkNullEmpty(founder_persons[i].telephone) ? founder_persons[i].telephone.replace(/[^0-9]/g, '') : null; founder_persons[i].identity_document.issuedate = checkNullEmpty(founder_persons[i].identity_document.issuedate) ? moment(founder_persons[i].identity_document.issuedate).format("YYYY-MM-DD") : null; + founder_persons[i].identity_document.citizenship_code = founder_persons[i].identity_document.citizenship.code.toString(); if(founder_persons[i].middlename !== "" && founder_persons[i].middlename !== null) { @@ -206,7 +207,7 @@ export default async function handler(req, res) files_to_send.push({ ...{ name: local_filename, filename: local_filename, - }, ...{ number: 161, } }); + }, ...{ number: digital ? 162 : 161, } }); console.log("@".repeat(200)); console.log(payload);