From 99c4ebffb07e581c0742999b9d9fcba4e4d9d4a8 Mon Sep 17 00:00:00 2001 From: merelendor Date: Sun, 11 Jun 2023 20:43:37 +0300 Subject: [PATCH] questionnaire licenses --- actions/questionnaireActions.js | 6 +- .../questionnaire/forms/Form_1_Main/index.js | 42 +++++- lib/evo_anketa_v2.pdf | Bin 0 -> 132138 bytes pages/api/questionnaire/download.js | 13 +- pages/api/questionnaire/get.js | 132 +++++++++++++----- pages/api/questionnaire/licenses/get.js | 84 +++++++++++ pages/api/questionnaire/send.js | 1 + reducers/initialState.js | 3 +- 8 files changed, 240 insertions(+), 41 deletions(-) create mode 100644 lib/evo_anketa_v2.pdf create mode 100644 pages/api/questionnaire/licenses/get.js diff --git a/actions/questionnaireActions.js b/actions/questionnaireActions.js index eb2ce00..4c222d5 100644 --- a/actions/questionnaireActions.js +++ b/actions/questionnaireActions.js @@ -54,7 +54,6 @@ export const getQuestionnaire = ({ dispatch, id }) => { //console.log("ACTION", "questionnaire", "getQuestionnaire()", "response", response.data); - const founder_persons_template = { signatory_id: null, lastname: "", @@ -224,6 +223,7 @@ export const getQuestionnaire = ({ dispatch, id }) => questionnaire.main.is_individual_executive = true; } + questionnaire.licenses = response.data.licenses; //questionnaire.founder_persons = { ...questionnaire.head_person, ...response.data.head_person }; //console.log("questionnairequestionnairequestionnaire FROM JSON", questionnaire); @@ -445,8 +445,8 @@ export const downloadQuestionnaire = ({ filename, download = true, base64 = fals //console.log("questionnaire", questionnaire); - const { main, contacts, signatory_person, founder_persons, head_person, non_profit, } = questionnaire; - const payload = { main, contacts, signatory_person, founder_persons, head_person, non_profit, }; + const { main, contacts, signatory_person, founder_persons, head_person, non_profit, licenses, } = questionnaire; + const payload = { main, contacts, signatory_person, founder_persons, head_person, non_profit, licenses }; //console.log({ payload }); diff --git a/components/questionnaire/forms/Form_1_Main/index.js b/components/questionnaire/forms/Form_1_Main/index.js index e9f6433..dced84c 100644 --- a/components/questionnaire/forms/Form_1_Main/index.js +++ b/components/questionnaire/forms/Form_1_Main/index.js @@ -55,6 +55,7 @@ class Form_1_Main extends QuestionnaireForm fin_goals_trucks: "", fin_goals_special: "", }, + licenses: null, step: 1, status: "empty", loading: false, @@ -63,12 +64,14 @@ class Form_1_Main extends QuestionnaireForm this.ref_form = React.createRef(); this.ref_submit = React.createRef(); + this.ref_licenses_field = React.createRef(); } static getDerivedStateFromProps(nextProps, prevState) { return { main: nextProps.questionnaire.main, + licenses: nextProps.questionnaire.licenses, step: nextProps.questionnaire.step, status: nextProps.questionnaire.status, }; @@ -76,6 +79,26 @@ class Form_1_Main extends QuestionnaireForm componentDidMount() { + const { licenses } = this.state; + //if(licenses !== null && licenses !== undefined && licenses !== "") + //{ + this.ref_licenses_field.current.style.height = (this.ref_licenses_field.current.scrollHeight + 10) + "px"; + //} + } + + componentDidUpdate(prevProps, prevState) + { + if(this.ref_licenses_field.current.scrollHeight - parseInt(this.ref_licenses_field.current.style.height, 10) > 6) + { + this.ref_licenses_field.current.style.height = (this.ref_licenses_field.current.scrollHeight + 6) + "px"; + } + else + { + if(this.ref_licenses_field.current.scrollHeight - parseInt(this.ref_licenses_field.current.style.height, 10) > 6) + { + this.ref_licenses_field.current.style.height = (this.ref_licenses_field.current.scrollHeight + 6) + "px"; + } + } } _handle_onNextPage = (event) => @@ -87,6 +110,7 @@ class Form_1_Main extends QuestionnaireForm const { main } = this.state; const { company } = this.props; const check = ["title", "inn", "kpp", "email", "telephone", "financial_loan"]; + if(company.inn.length > 10) { check.splice(check.indexOf("kpp"), 1); @@ -170,7 +194,7 @@ class Form_1_Main extends QuestionnaireForm render() { const { company, checking } = this.props; - const { loading, main, status, errors, } = this.state; + const { loading, main, licenses, status, errors, } = this.state; const firstLetter = /(?!.*[DFIOQU])[A-VXY]/i; const letter = /(?!.*[DFIOQU])[A-Z]/i; const digit = /[0-9]/; @@ -298,6 +322,22 @@ class Form_1_Main extends QuestionnaireForm

сумма текущих ежемесячных платежей по действующим кредитам/договорам лизинга

+
+ +