From dc6f9ce052c2d5e036abc3d90c3cd7fcb1a5b3b2 Mon Sep 17 00:00:00 2001 From: merelendor Date: Wed, 31 Aug 2022 03:49:41 +0300 Subject: [PATCH] updates for graphic changes, manager --- pages/components/Manager/index.js | 2 +- .../components/CalculationsList/index.js | 2 +- .../change/components/Options/index.js | 4 +-- pages/support/index.js | 4 ++- pages/support/request.js | 36 +++++++++++++++---- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/pages/components/Manager/index.js b/pages/components/Manager/index.js index 9ff5433..ec57c1b 100644 --- a/pages/components/Manager/index.js +++ b/pages/components/Manager/index.js @@ -68,7 +68,7 @@ class Manager extends React.Component
{ company.manager_email } { company.manager_mobilephone !== undefined && company.manager_mobilephone !== null && company.manager_mobilephone !== "" && ( - { company.manager_mobilephone } + { company.manager_mobilephone } ) } { company.manager_telegram !== undefined && company.manager_telegram !== null && company.manager_telegram !== "" && ( { `@${ company.manager_telegram.replace("@", "")}` } diff --git a/pages/contract/change/components/CalculationsList/index.js b/pages/contract/change/components/CalculationsList/index.js index a6f63bf..cad8a20 100644 --- a/pages/contract/change/components/CalculationsList/index.js +++ b/pages/contract/change/components/CalculationsList/index.js @@ -50,7 +50,7 @@ export default class CalculationsList extends React.Component dots: false, infinite: false, speed: 500, - slidesToShow: 2.5, + slidesToShow: 2.3, slidesToScroll: 1, centerMode: false, variableWidth: false, diff --git a/pages/contract/change/components/Options/index.js b/pages/contract/change/components/Options/index.js index ce2182c..d3dd1dc 100644 --- a/pages/contract/change/components/Options/index.js +++ b/pages/contract/change/components/Options/index.js @@ -291,7 +291,7 @@ class SumSelector extends React.Component const { onOption } = this.props; const { min, max } = this.state; - const value = parseFloat(event.target.value.replace('/[^\d]/m', '')); + const value = parseFloat(event.target.value.replace(/[^\d]/mg, '')); if(value >= min && value <= max && !isNaN(value)) { this.setState({ value: value }, () => @@ -380,7 +380,7 @@ class InsurancePriceSelector extends React.Component //} //else //{ - const value = parseFloat(event.target.value.replace('/[^\d]/m', '')); + const value = parseFloat(event.target.value.replace(/[^\d]/mg, '')); if(value >= min && value <= max && !isNaN(value)) { this.setState({ value: value }, () => diff --git a/pages/support/index.js b/pages/support/index.js index 42ea6cb..5c0e1f0 100644 --- a/pages/support/index.js +++ b/pages/support/index.js @@ -191,7 +191,9 @@ class ContractPage extends React.Component
) } - + { question.request && ( + + ) } diff --git a/pages/support/request.js b/pages/support/request.js index a134f84..74f8bb1 100644 --- a/pages/support/request.js +++ b/pages/support/request.js @@ -113,6 +113,7 @@ class SupportRequestPage extends React.Component loading: false, contracts: null, themes: null, + themes_filtered: null, name: "", phone: "", email: "", @@ -169,7 +170,26 @@ class SupportRequestPage extends React.Component opened_theme++; } - this.setState({ loading: false, opened_theme: found ? opened_theme : 0, opened_question: found ? opened_question : 0 }); + let themes_filtered = []; + for(let t in this.state.themes) + { + let questions = []; + + for(let q in this.state.themes[t].questions) + { + if(this.state.themes[t].questions[q].request) + { + questions.push(this.state.themes[t].questions[q]); + } + } + + if(questions.length > 0) + { + themes_filtered.push({ ...this.state.themes[t], ...{ questions } }); + } + } + + this.setState({ loading: false, themes_filtered, opened_theme: found ? opened_theme : 0, opened_question: found ? opened_question : 0 }); }) .catch(() => {}); }); @@ -301,7 +321,7 @@ class SupportRequestPage extends React.Component _renderForm = () => { - const { loading, contracts, themes, name, phone, email, question, file, files, opened_theme, opened_question } = this.state; + const { loading, contracts, themes, themes_filtered, name, phone, email, question, file, files, opened_theme, opened_question } = this.state; const contracts_list = []; for(let i in contracts) @@ -346,9 +366,11 @@ class SupportRequestPage extends React.Component render() { const { number } = this.props; - const { loading, success, themes, opened_theme, opened_question } = this.state; + const { loading, success, themes, themes_filtered, opened_theme, opened_question } = this.state; - const procedure = themes !== undefined && themes !== null ? themes[opened_theme].questions[opened_question] : undefined; + const procedure = themes_filtered !== undefined && themes_filtered !== null ? themes_filtered[ opened_theme ].questions[ opened_question ] : undefined; + + console.log("themes_filtered", themes_filtered); return ( @@ -379,9 +401,9 @@ class SupportRequestPage extends React.Component
- { themes !== undefined && themes !== null && themes.map((theme, theme_index) => + { themes_filtered !== undefined && themes_filtered !== null && themes_filtered.map((theme, theme_index) => ( - +
this._handle_onChangeTheme(theme_index) }>

{ theme.name }

@@ -400,7 +422,7 @@ class SupportRequestPage extends React.Component )) }
- { themes !== undefined && themes !== null && ( + { themes_filtered !== undefined && themes_filtered !== null && (

Процедура