From cef9c7bc781e8aea8e14e9e89c5615889e29e739 Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Mon, 5 Sep 2022 19:37:16 +0300
Subject: [PATCH] updates

---
 pages/components/Header/index.js              |  1 +
 .../change/components/Comparison/index.js     | 10 +++++-
 pages/contract/components/InnerMenu/index.js  | 24 +++++++-------
 pages/settings/admin.js                       |  2 +-
 pages/settings/components/InnerMenu/index.js  | 33 +++++++++++++++----
 pages/support/components/InnerMenu/index.js   | 26 ++++++++++++---
 .../components/SuccessMessage/index.js        |  2 +-
 7 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/pages/components/Header/index.js b/pages/components/Header/index.js
index 3c3bd05..f55d7e7 100644
--- a/pages/components/Header/index.js
+++ b/pages/components/Header/index.js
@@ -53,6 +53,7 @@ class Header extends React.Component
 		if (route.indexOf("/documents/") > -1) return "Взаиморасчеты и закрывающие документы";
 		if (route.indexOf("/settings/") > -1) return "Настройки";
 		if (route.indexOf("/contract") === 0) return "Договоры";
+		if (route.indexOf("/support") === 0) return "Обращения";
 
 		return null;
 	};
diff --git a/pages/contract/change/components/Comparison/index.js b/pages/contract/change/components/Comparison/index.js
index e8d0117..654fe4f 100644
--- a/pages/contract/change/components/Comparison/index.js
+++ b/pages/contract/change/components/Comparison/index.js
@@ -96,6 +96,14 @@ export default class Comparison extends React.Component
 		this.setState({ show_previous: true });
 	}
 
+	_handle_onDownloadPDF = () => 
+	{
+		console.log("this.props");
+		console.log(this.props);
+		console.log("this.state");
+		console.log(this.state);
+	}
+
 	render() 
 	{
 		const { calculation, mixed_index, today, show_previous, signatories_show_all } = this.state;
@@ -108,7 +116,7 @@ export default class Comparison extends React.Component
 						Выбранный(ые) варианты изменения графика
 						<a className="interactive" onClick={ this._handle_onOptions }>Вернуться к параметрам изменения графика</a>
 					</p>
-					<button className="button button-blue">Скачать PDF</button>
+					<button className="button button-blue" onClick={ this._handle_onDownloadPDF }>Скачать PDF</button>
 				</div>
 				<div className="compare_data">
 					{ calculation !== undefined && calculation !== null && calculation.fix_last_payment_available_comment !== null && (
diff --git a/pages/contract/components/InnerMenu/index.js b/pages/contract/components/InnerMenu/index.js
index 67a153e..387bde4 100644
--- a/pages/contract/components/InnerMenu/index.js
+++ b/pages/contract/components/InnerMenu/index.js
@@ -15,18 +15,11 @@ export default class InnerMenu extends React.Component
 		};
 	}
 
-	_handle_onToggleMenu = () => 
-	{
-		this.setState({
-			menuOpened: !this.state.menuOpened,
-		});
-	};
-
 	componentDidMount()
 	{
 		let l = 0;
 		let m = 0;
-		const menu = ["payments", "services", "agreement", "documents", "materials","events","change"];
+		const menu = ["payments", "services", "agreement", "documents", "materials", "events", "change"];
 
 		for(let i in menu)
 		{
@@ -44,6 +37,13 @@ export default class InnerMenu extends React.Component
 		this.menuRef.current.scrollLeft = l - 50;
 	}
 
+	_handle_onToggleMenu = () => 
+	{
+		this.setState({
+			menuOpened: !this.state.menuOpened,
+		});
+	};
+
 	_getActiveLink = (route) => 
 	{
 		if (route.indexOf("/payments") > -1) return "График платежей";
@@ -60,15 +60,15 @@ export default class InnerMenu extends React.Component
 
 	render()
 	{
-		const { menuOpened, count_events, count_fines } = this.state;
 		const { number, status } = this.props;
+		const { menuOpened, count_events, count_fines } = this.state;
 
 		return (
 			<aside>
-				<button className="nav_toggle" onClick={this._handle_onToggleMenu}>
-					{ this.props.router && this._getActiveLink(this.props.router.route) }
+				<button className="nav_toggle" onClick={ this._handle_onToggleMenu }>
+					{ this.props.router && this._getActiveLink(this.props.router.asPath) }
 				</button>
-				<ul className={menuOpened ? "aside_nav open" : "aside_nav"} ref={ this.menuRef }>
+				<ul className={ menuOpened ? "aside_nav open" : "aside_nav" } ref={ this.menuRef }>
 					<li>
 						<Link href={`/contract/${ number }/payments`} shallow>
 							<a className={ this.props.router && this.props.router.asPath.indexOf("payments") > -1 ? "active" : "" }>График платежей</a>
diff --git a/pages/settings/admin.js b/pages/settings/admin.js
index 6c2860d..2f06b8a 100644
--- a/pages/settings/admin.js
+++ b/pages/settings/admin.js
@@ -423,7 +423,7 @@ class AdminPage extends React.Component
 												return (
 													<div className="table_row" key={ index }>
 														<div className="table_cell" data-title="ФИО пользователя">{ entry.name } (Вы)</div>
-														<div className="table_cell" data-title="Почта">{ entry.email } [{user.email}]</div>
+														<div className="table_cell" data-title="Почта">{ entry.email }</div>
 														<div className="table_cell" data-title="Роль">{ entry.is_admin ? "Администратор" : "Пользователь" }</div>
 														<div className="table_cell" data-title="Доступные организации">Все организации</div>
 														<div className="table_cell" data-title="Статус">{ entry.is_admin ? "Активен" : entry.last !== null ? "Активен" : "Приглашен" }</div>
diff --git a/pages/settings/components/InnerMenu/index.js b/pages/settings/components/InnerMenu/index.js
index 3e89123..260ffb8 100644
--- a/pages/settings/components/InnerMenu/index.js
+++ b/pages/settings/components/InnerMenu/index.js
@@ -12,12 +12,11 @@ export default class InnerMenu extends React.Component
 	constructor(props)
 	{
 		super(props);
+		this.state = {
+			menuOpened: false,
+		};
+		
 		this.menuRef = React.createRef();
-
-		menu.forEach(item => 
-		{
-			this[item.id] = React.createRef();
-		});
 	}
 
 	componentDidMount()
@@ -41,6 +40,22 @@ export default class InnerMenu extends React.Component
 		this.menuRef.current.scrollLeft = l - 50;
 	}
 
+	_handle_onToggleMenu = () => 
+	{
+		this.setState({
+			menuOpened: !this.state.menuOpened,
+		});
+	};
+
+	_getActiveLink = (route) => 
+	{
+		if (route.indexOf("/phone") > -1) return "Номер телефона";
+		if (route.indexOf("/password") > -1) return "Пароль";
+		if (route.indexOf("/admin") > -1) return "Настройки доступа";
+
+		return null;
+	};
+
 	scrollToCategory = id => {
 		
 	};
@@ -48,16 +63,20 @@ export default class InnerMenu extends React.Component
 	render()
 	{
 		const { user, observer } = this.props;
+		const { menuOpened, } = this.state;
 
 		return (
 			<aside>
-				<ul className="aside_nav" ref={ this.menuRef }>
+				<button className="nav_toggle" onClick={ this._handle_onToggleMenu }>
+					{ this.props.router && this._getActiveLink(this.props.router.asPath) }
+				</button>
+				<ul className={ menuOpened ? "aside_nav open" : "aside_nav" } ref={ this.menuRef }>
 					{ menu.map(item => 
 					{
 						if(item.type === "admin" && !observer && !user.is_admin) { return null; }
 
 						return (
-							<li key = {item.id} ref={this[item.id]} onClick={() => this.scrollToCategory(item.id)}>
+							<li key = {item.id} ref={this[item.id]}>
 								<Link 
 									href={item.link}
 									shallow
diff --git a/pages/support/components/InnerMenu/index.js b/pages/support/components/InnerMenu/index.js
index 48ee111..84f11e1 100644
--- a/pages/support/components/InnerMenu/index.js
+++ b/pages/support/components/InnerMenu/index.js
@@ -25,11 +25,10 @@ class InnerMenu extends React.Component
 	{
 		let l = 0;
 		let m = 0;
-		const menu = ["events","faq"];
 
 		for(let i in menu)
 		{
-			if(this.props.router.asPath.indexOf(menu[i]) > -1)
+			if(this.props.router.asPath.indexOf(menu[i].link) > -1)
 			{
 				m = i;
 			}
@@ -43,6 +42,21 @@ class InnerMenu extends React.Component
 		this.menuRef.current.scrollLeft = l - 50;
 	}
 
+	_handle_onToggleMenu = () => 
+	{
+		this.setState({
+			menuOpened: !this.state.menuOpened,
+		});
+	};
+
+	_getActiveLink = (route) => 
+	{
+		if (route.indexOf("/faq") > -1) return "FAQ";
+		if (route.indexOf("/appeals") > -1) return "Мои обращения";
+	
+		return null;
+	};
+
 	_handle_onNewAppeal = () => 
 	{
 		this.props.router.push('/support/request/');
@@ -50,13 +64,15 @@ class InnerMenu extends React.Component
 
 	render()
 	{
-		const { appeals } = this.state;
+		const { menuOpened, appeals } = this.state;
 		const { number } = this.props;
 
 		return (
 			<aside className="flex">
-				<button className="nav_toggle">Меню</button>
-				<ul className="aside_nav" ref={ this.menuRef }>
+				<button className="nav_toggle" onClick={ this._handle_onToggleMenu }>
+					{ this.props.router && this._getActiveLink(this.props.router.asPath) }
+				</button>
+				<ul className={ menuOpened ? "aside_nav open" : "aside_nav" } ref={ this.menuRef }>
 					<li>
 						<Link href={`/support/faq`} shallow>
 							<a className={ this.props.router && this.props.router.asPath.indexOf("faq") > -1 ? "active" : "" }>FAQ</a></Link>
diff --git a/pages/support/components/SuccessMessage/index.js b/pages/support/components/SuccessMessage/index.js
index 4da5903..42f1084 100644
--- a/pages/support/components/SuccessMessage/index.js
+++ b/pages/support/components/SuccessMessage/index.js
@@ -19,7 +19,7 @@ export default class SuccessMessage extends React.Component
 				<div className="compare_message">
 					<p>{ comment }</p>
 					<br/>
-					<p>Сообщение успешно отправлено, ожидайте, пожалуйста, ответа от ответсвенного сотрудника Отдела <br/>по работе с клиентами.<br/><br/><Link href={`/support/appeals`}>Перейти к списку обращений</Link></p>
+					<p>Сообщение успешно отправлено, ожидайте, пожалуйста, ответа от ответственного сотрудника Службы клиентского сервиса.<br/><br/>После обработки обращение появится<br/> в <Link href={`/support/appeals`}>списке обращений</Link>.</p>
 				</div>
 			</article>
 		);