From d49fd87c4d9b543958c71bc7046a60073dedbac7 Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Sat, 27 Aug 2022 02:28:27 +0300
Subject: [PATCH] update for contract graphic changes block

---
 .../change/components/VariantsList/index.js   | 37 +++++++++----------
 pages/contract/change/index.js                |  9 ++---
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/pages/contract/change/components/VariantsList/index.js b/pages/contract/change/components/VariantsList/index.js
index 5b969eb..c1a19c3 100644
--- a/pages/contract/change/components/VariantsList/index.js
+++ b/pages/contract/change/components/VariantsList/index.js
@@ -68,7 +68,6 @@ export default class VariantsList extends React.Component
 	render() 
 	{
 		const { number, variants, variants_types, selected, blocked, loading } = this.props;
-		console.log("variants_typesvariants_typesvariants_typesvariants_typesvariants_types");
 		console.log(variants_types);
 
 		return (
@@ -86,25 +85,25 @@ export default class VariantsList extends React.Component
 									<input type="checkbox" hidden id={ `variant_${ index }` } name="variants" disabled={ disabled } checked={ selected.indexOf(variant.type) > -1 ? true : false } onChange={ () => { this._handle_onVariant(variant.type) } }/>
 									<label htmlFor={ `variant_${ index }` } className="unselectable" 
 									style={ disabled ? { color: "#A8026B", textDecoration: "line-through", } : {} }>{ variant.title }</label>
-									<div className="help_tooltip">
-										<div className="help_icon">
-											<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg" >
-												<path d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
-												<path d="M11.25 11.25H12v5.25h.75" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
-												<path d="M12 9a1.125 1.125 0 1 0 0-2.25A1.125 1.125 0 0 0 12 9Z" fill="#8E94A7" />
-											</svg>
-										</div>
-										{ help !== null && (
-											<div className="help_content">
-											{" "}
-												{/* opened */}
-												<div>
-													<p dangerouslySetInnerHTML={{ __html: help }}/>
-													<p className="button">Закрыть</p>
-												</div>
+									{ help !== null && (
+										<div className="help_tooltip">
+											<div className="help_icon">
+												<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg" >
+													<path d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
+													<path d="M11.25 11.25H12v5.25h.75" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
+													<path d="M12 9a1.125 1.125 0 1 0 0-2.25A1.125 1.125 0 0 0 12 9Z" fill="#8E94A7" />
+												</svg>
 											</div>
-										) }
-									</div>
+												<div className="help_content">
+												{" "}
+													{/* opened */}
+													<div>
+														<p dangerouslySetInnerHTML={{ __html: help }}/>
+														<p className="button">Закрыть</p>
+													</div>
+												</div>
+										</div>
+									) }
 								</div>
 							)
 						}) }
diff --git a/pages/contract/change/index.js b/pages/contract/change/index.js
index 849d9c5..ad86ef9 100644
--- a/pages/contract/change/index.js
+++ b/pages/contract/change/index.js
@@ -347,11 +347,8 @@ class ChangeGraphicPage extends React.Component
 													<>
 														{ variants.enable_addcontract === false ? (
 															<div className="block alert">
-																<p>
-																	Внимание! Существует активное неподписанное дополнительное
-																	соглашение. Расчёт новых изменений невозможен
-																</p>
-																<Link href={`/contract/${ number }/agreement`}><a>Подробнее</a></Link>
+																<p>{ variants.comment !== null ? variants.comment : "Внимание! Существует активное неподписанное дополнительное соглашение. Расчёт новых изменений невозможен." }</p>
+																{ variants.comment === null && (<Link href={`/contract/${ number }/agreement`}><a>Подробнее</a></Link>) }
 															</div>
 														) : (
 															<></>
@@ -376,7 +373,7 @@ class ChangeGraphicPage extends React.Component
 															variants_types={ variants_types } 
 															selected={ variants_selected } 
 															loading={ variants_loading } 
-															blocked={ variants.enable_addcontract === false ? false : false } 
+															blocked={ variants.enable_addcontract === false ? true : false } 
 														/>
 														{/*}
 														{ variants.enable_addcontract !== false && (