From 829f7b4c4b807356ef2a0531527a73f3b2b115a1 Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Tue, 10 Oct 2023 12:22:32 +0300
Subject: [PATCH] updates for deals

---
 components/DealsStatus/DealsListDeal.js |  8 +++-
 components/DealsStatus/SingleDeal.js    | 13 +-----
 components/FileDropzoneDeals/index.js   | 61 +++++++++++++++----------
 css/main/style.css                      | 28 ++++++++++--
 css/main/style.less                     | 40 ++++++++++++++--
 5 files changed, 104 insertions(+), 46 deletions(-)

diff --git a/components/DealsStatus/DealsListDeal.js b/components/DealsStatus/DealsListDeal.js
index fab3c68..d75a80e 100644
--- a/components/DealsStatus/DealsListDeal.js
+++ b/components/DealsStatus/DealsListDeal.js
@@ -67,7 +67,7 @@ export default class DealsListDeal extends React.Component
 				</div>
 				<div>
 					<p>
-						{ statuses[ statuscode_id ].index === undefined ? "Не начата" : `${ statuses[ statuscode_id ].index } ${ pluralize(step, 'этапа', 'этап', 'этапа', 'этапов') } ${ pluralize(statuses[ statuscode_id ].index, 'пройдено', 'пройден', 'пройдено', 'пройдено') }` } 
+						{ statuses[ statuscode_id ].index === undefined ? "Новая сделка" : `${ statuses[ statuscode_id ].index } ${ pluralize(step, 'этапа', 'этап', 'этапа', 'этапов') } ${ pluralize(statuses[ statuscode_id ].index, 'пройдено', 'пройден', 'пройдено', 'пройдено') }` } 
 						{/*}
 						<svg xmlns="http://www.w3.org/2000/svg" width={18} height={18} fill="none">
 							<path stroke="#8E94A7" strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M14.625 6.75 9 12.375 3.375 6.75" />
@@ -82,7 +82,11 @@ export default class DealsListDeal extends React.Component
 				</div>
 				<div>
 					<button className="button" onClick={() => { onSelectDeal(opp_number, index) }} >
-						Еще { statuses[ statuscode_id ].index !== undefined ? (7 - statuses[ statuscode_id ].index) : 7 } { pluralize(statuses[ statuscode_id ].index !== undefined ? (7 - statuses[ statuscode_id ].index) : 7, 'этапа', 'этап', 'этапа', 'этапов') }
+						{ statuscode_id === 105 || statuscode_id === 107 ? (
+							"Подробнее"
+						) : (
+							<>Еще { statuses[ statuscode_id ].index !== undefined ? (6 - statuses[ statuscode_id ].index) : 6 } { pluralize(statuses[ statuscode_id ].index !== undefined ? (6 - statuses[ statuscode_id ].index) : 6, 'этапа', 'этап', 'этапа', 'этапов') }</>
+						) }
 						<svg xmlns="http://www.w3.org/2000/svg" width={18} height={18} fill="none">
 							<path stroke="#1C01A9" strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M14.625 6.75 9 12.375 3.375 6.75" />
 						</svg>
diff --git a/components/DealsStatus/SingleDeal.js b/components/DealsStatus/SingleDeal.js
index d3599fa..83b7da9 100644
--- a/components/DealsStatus/SingleDeal.js
+++ b/components/DealsStatus/SingleDeal.js
@@ -564,7 +564,7 @@ class DocumentsForm extends Step
 										{
 											console.log({ document });
 											return (
-												<div className="block" key={ index }>
+												<div className="block deal_documents_form_group" key={ index }>
 													<div className="left">
 														<p><b><span>{ document.name }</span>:</b></p>
 													</div>
@@ -575,6 +575,7 @@ class DocumentsForm extends Step
 																files={ files[ document.doc_id ] !== undefined ? files[ document.doc_id ] : [] } 
 																onAddFile={ (file) => { this._handle_onAddFile(document.doc_id, file) } } 
 																onDeleteFile={ (file) => this._handle_onDeleteFile(document.doc_id, file) } 
+																document={ document } 
 															/>
 														) : (
 															<>
@@ -598,16 +599,6 @@ class DocumentsForm extends Step
 								{/*}
 								<div className="message documents">
 									<div className="doc_list">
-										<div className="docs_list medium-icon">
-											<div className="row">
-												<p className="doc_name i-pdf i-medium">№123/2023 от 01.01.2023</p>
-											</div>
-										</div>
-										<div className="docs_list medium-icon">
-											<div className="row">
-												<p className="doc_name i-pdf i-medium">№123/2023 от 01.01.2023</p>
-											</div>
-										</div>
 									</div>
 									<p>Документы, отправленные Вами принадлежат другой организации бла бла коммент от менеджера</p>
 								</div>
diff --git a/components/FileDropzoneDeals/index.js b/components/FileDropzoneDeals/index.js
index cf125a5..0e0d910 100644
--- a/components/FileDropzoneDeals/index.js
+++ b/components/FileDropzoneDeals/index.js
@@ -4,41 +4,52 @@ import moment from "moment";
 import { SpinnerCircular } from 'spinners-react';
 
 const LIMIT = 10000000;
-const LIMIT_FILES = 1;
+const LIMIT_FILES = 10;
 
 export default class FileDropzoneDeals extends FileDropzone
 {
 	render()
 	{
-		const { files, onAddFile, onDeleteFile, uploading, } = this.props;
+		const { files, onAddFile, onDeleteFile, uploading, document, } = this.props;
+		console.log("FileDropzoneDeals", { document });
 
 		return (
 			<>
 				{ files.length > 0 && (
-					<div className="horizontal_dropzone_files">
-						{ files.map((file, index) => (
-							<div className="file" key={ index }>
-								{ file.sent ? (
-									<div className="delete" onClick={ () => onDeleteFile(file) }>
-										<div className="icon"></div>
+					<div className="horizontal_dropzone_files_wrapper">
+						<div className="horizontal_dropzone_files horizontal_dropzone_files_item">
+							{ files.map((file, index) => 
+							{
+								return (
+									<div className="file" key={ index }>
+										{ file.sent ? (
+											<div className="delete" onClick={ () => onDeleteFile(file) }>
+												<div className="icon"></div>
+											</div>
+										) : (
+											<div className="loading">
+												<SpinnerCircular size={ 22 } thickness={ 100 } speed={ 100 } color="rgba(255, 255, 255, 1)" secondaryColor="rgba(168, 2, 107, 0.5)" style={{ marginTop: "8px" }}/>
+											</div>
+										) }
+										<div className="doc_icon">
+											<span className="extension">PDF</span>
+										</div>
+										<div className="title">
+											<span>{ file.name }</span>
+											<span>{ moment().format("DD.MM.YYYY") }</span>
+										</div>
 									</div>
-								) : (
-									<div className="loading">
-										<SpinnerCircular size={ 22 } thickness={ 100 } speed={ 100 } color="rgba(255, 255, 255, 1)" secondaryColor="rgba(168, 2, 107, 0.5)" style={{ marginTop: "8px" }}/>
-									</div>
-								) }
-								<div className="doc_icon">
-									<span className="extension">PDF</span>
-								</div>
-								<div className="title">
-									<span>{ file.name }</span>
-									<span>{ moment().format("DD.MM.YYYY") }</span>
-								</div>
+								) 
+							} ) }
+						</div>
+						{ document.comment !== null && document.comment !== "" && (
+							<div className="horizontal_dropzone_files_item">
+								<p className="horizontal_dropzone_files_comment">
+									<span>{ document.check }</span>
+									<span>{ document.comment }</span>
+								</p>
 							</div>
-						)) }
-						{/*}
-							<p key={ index }>{ file.size > LIMIT && (<span style={{ color: "#A8026B", }}>Ошибка, превышен допустимый размер файла в 10 мб.</span>) } { file.name } - { parseFloat(file.size / 1000000).toFixed(file.size < 100000 ? 3 : 2) } мб. <small style={{ color: "#A8026B", textDecoration: "underline", cursor: "pointer" }} onClick={ () => onDeleteFile(file.name) }>[ удалить ]</small></p>
-						{*/}
+						)}
 					</div>
 				) }
 				{ !uploading && files.length < LIMIT_FILES && (
@@ -48,7 +59,7 @@ export default class FileDropzoneDeals extends FileDropzone
 								<div className={`files`}></div>
 								<div className={`horizontal_dropzone_inner`}>
 									<p data-sm-text="Выберите файлы">
-										<span>Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера </span>
+										<span>Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера</span>
 									</p>
 									<label htmlFor="" className="button button-blue">Загрузить файл</label>
 								</div>
diff --git a/css/main/style.css b/css/main/style.css
index 7b71043..6a845dd 100644
--- a/css/main/style.css
+++ b/css/main/style.css
@@ -5328,7 +5328,6 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
 .contractStatus_list .list_item div:nth-child(2) p {
   cursor: pointer;
   color: var(--text_not_active);
-  min-width: 120px;
 }
 .contractStatus_list .list_item div:nth-child(2):before {
   content: "";
@@ -5394,7 +5393,7 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
   white-space: nowrap;
   gap: 0 8px;
 }
-.contractStatus_list .list_item :first-child {
+.contractStatus_list .list_item div:first-child {
   min-width: 60px;
 }
 .contractStatus_list .list_item:not(:last-child) {
@@ -6095,7 +6094,6 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
 .horizontal_dropzone_files .file {
   display: flex;
   flex-direction: row;
-  width: 40%;
 }
 .horizontal_dropzone_files .file .delete {
   margin-left: 0px;
@@ -6162,6 +6160,25 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
   margin-top: 2px;
   color: #8e94a7;
 }
+.horizontal_dropzone_files_wrapper {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  gap: 0px 20px;
+  padding-top: 15px;
+}
+.horizontal_dropzone_files_wrapper .horizontal_dropzone_files_item {
+  width: 50%;
+}
+.horizontal_dropzone_files_comment {
+  background: rgba(131, 3, 84, 0.1);
+  padding: 15px 25px;
+  display: flex;
+  flex-direction: column;
+}
+.horizontal_dropzone_files_comment span:first-child {
+  font-weight: 600;
+}
 .deals_contracts {
   display: flex;
   flex-direction: column;
@@ -6394,3 +6411,8 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
   padding-top: 10px;
   padding-bottom: 20px;
 }
+.deal_documents_form_group {
+  padding-top: 15px;
+  padding-bottom: 15px;
+  border-top: solid 1px #edeff5;
+}
diff --git a/css/main/style.less b/css/main/style.less
index 82bdd89..4ca95ee 100644
--- a/css/main/style.less
+++ b/css/main/style.less
@@ -6030,7 +6030,6 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
                 p {
                     cursor: pointer;
                     color: var(--text_not_active);
-					min-width: 120px;
                 }
 
                 &:before {
@@ -6105,10 +6104,10 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
                     gap: 0 8px;
                 }
             }
-        }
 
-		:first-child {
-			min-width: 60px;
+			&:first-child {
+				min-width: 60px;
+			}	
 		}
 
         &:not(:last-child) {
@@ -7012,7 +7011,6 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
 	.file {
 		display: flex;
 		flex-direction: row;
-		width: 40%;
 
 		.delete { 
 			margin-left: 0px;
@@ -7091,6 +7089,32 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
 	}
 }
 
+.horizontal_dropzone_files_wrapper {
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	gap: 0px 20px;
+	padding-top: 15px;
+
+	.horizontal_dropzone_files_item {
+		width: 50%;
+	}
+}
+
+.horizontal_dropzone_files_comment {
+	background: rgba(131, 3, 84, 0.10);
+	padding: 15px 25px;
+	display: flex;
+	flex-direction: column;
+
+	span {
+		&:first-child {
+			font-weight: 600;
+		}
+	}
+}
+
+
 .deals_contracts {
 	display: flex;
 	flex-direction: column;
@@ -7383,4 +7407,10 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
 	padding-top: 10px;
 	padding-bottom: 20px;
 //	margin-top: 30px;
+}
+
+.deal_documents_form_group {
+	padding-top: 15px;
+    padding-bottom: 15px;
+    border-top: solid 1px #edeff5;
 }
\ No newline at end of file