From dae0765b573523f8b1ae1379465e8210a3316178 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Fri, 22 Jan 2021 15:14:07 +0300
Subject: [PATCH] show cbxRecalcWithRevision && convert to checkbox

---
 src/client/Containers/Calculation/Info/infoList.ts   |  9 ++-------
 .../Calculation/lib/elements/components.ts           |  2 +-
 .../Calculation/lib/elements/elementsProps.ts        |  6 ++++++
 .../Containers/Calculation/lib/elements/titles.ts    |  1 -
 src/client/Elements/Checkbox.jsx                     | 12 ++++++++++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/client/Containers/Calculation/Info/infoList.ts b/src/client/Containers/Calculation/Info/infoList.ts
index d38075d..cb497a3 100644
--- a/src/client/Containers/Calculation/Info/infoList.ts
+++ b/src/client/Containers/Calculation/Info/infoList.ts
@@ -5,16 +5,11 @@ export const controlsList: IGroup[] = [
     title: 'Выбор Интереса/ЛС',
     blocks: [
       {
-        elements: ['selectLead', 'selectOpportunity', 'selectQuote'],
+        elements: ['selectLead', 'selectOpportunity'],
       },
-      // {
-      //   elements: ['cbxRecalcWithRevision'],
-      //   layout: {
-      //     newLine: true,
-      //   },
-      // },
     ],
   },
+  { blocks: [{ elements: ['cbxRecalcWithRevision', 'selectQuote'] }] },
   {
     blocks: [
       {
diff --git a/src/client/Containers/Calculation/lib/elements/components.ts b/src/client/Containers/Calculation/lib/elements/components.ts
index 51ac0c0..b35bfc9 100644
--- a/src/client/Containers/Calculation/lib/elements/components.ts
+++ b/src/client/Containers/Calculation/lib/elements/components.ts
@@ -137,7 +137,7 @@ const elementsComponents: TElements<Component> = {
   selectLead: Select,
   selectOpportunity: Select,
   selectQuote: Select,
-  cbxRecalcWithRevision: Switch,
+  cbxRecalcWithRevision: Checkbox,
   btnCalculate: Button,
   tbxIRR_Perc: InputNumber,
   labelIrrInfo: Label,
diff --git a/src/client/Containers/Calculation/lib/elements/elementsProps.ts b/src/client/Containers/Calculation/lib/elements/elementsProps.ts
index 701881d..ada029d 100644
--- a/src/client/Containers/Calculation/lib/elements/elementsProps.ts
+++ b/src/client/Containers/Calculation/lib/elements/elementsProps.ts
@@ -328,6 +328,12 @@ const elementsProps: TElements<ElementProps> = {
     step: 100,
     precision: 2,
   },
+  cbxRecalcWithRevision: {
+    text: 'Пересчет без пересмотра',
+    containerStyle: {
+      marginBottom: '8px',
+    },
+  },
 };
 
 const resultElementsProps: TElements<ElementProps> = [
diff --git a/src/client/Containers/Calculation/lib/elements/titles.ts b/src/client/Containers/Calculation/lib/elements/titles.ts
index 55ab7fe..12550ac 100644
--- a/src/client/Containers/Calculation/lib/elements/titles.ts
+++ b/src/client/Containers/Calculation/lib/elements/titles.ts
@@ -5,7 +5,6 @@ const elementsTitles: TElements<string> = {
   selectLead: 'Интерес',
   selectOpportunity: 'Лизинговая сделка',
   selectQuote: 'Предложение',
-  cbxRecalcWithRevision: 'Пересчет без пересмотра',
   selectTemplate: 'Выбор шаблона',
   selectChannel: 'Канал привлечения',
   tbxNewClient: 'Новый контрагент',
diff --git a/src/client/Elements/Checkbox.jsx b/src/client/Elements/Checkbox.jsx
index 8002cc7..c8b9505 100644
--- a/src/client/Elements/Checkbox.jsx
+++ b/src/client/Elements/Checkbox.jsx
@@ -8,16 +8,24 @@ const Checkbox = ({
   status,
   validateStatus,
   message,
+  text,
+  containerStyle,
   ...props
 }) => {
   return (
-    <Form.Item validateStatus={validateStatus} help={message}>
+    <Form.Item
+      validateStatus={validateStatus}
+      help={message}
+      style={containerStyle}
+    >
       <AntCheckbox
         {...props}
         disabled={status === ElementStatus.Disabled}
         checked={value}
         onChange={e => setCurrentValue(e.target.checked)}
-      />
+      >
+        {text}
+      </AntCheckbox>
     </Form.Item>
   );
 };