From 87f87a2460f074ade9d17d6d308d6adf29681f29 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 14 Feb 2022 14:17:02 +0500
Subject: [PATCH 1/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D0=BA=D0=B2=D0=B0=D0=B6=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/AdminPanel/WellController/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/AdminPanel/WellController/index.jsx b/src/pages/AdminPanel/WellController/index.jsx
index 3d9b30e..9d98958 100644
--- a/src/pages/AdminPanel/WellController/index.jsx
+++ b/src/pages/AdminPanel/WellController/index.jsx
@@ -128,7 +128,7 @@ export const WellController = () => {
                 dataSource={wells}
                 pagination={defaultPagination}
                 onRowAdd={hasPermission('AdminWell.edit') && makeActionHandler('insert', handlerProps, recordParser, 'Добавление скважины')}
-                onRowEdit={hasPermission('AdminWell.edit') && makeActionHandler('put', handlerProps, recordParser, 'Редактирование скважины')}
+                onRowEdit={hasPermission('AdminWell.edit') && makeActionHandler('update', handlerProps, recordParser, 'Редактирование скважины')}
                 onRowDelete={hasPermission('AdminWell.delete') && makeActionHandler('delete', handlerProps, null, 'Удаление скважины')}
                 //additionalButtons={addititonalButtons}
                 buttonsWidth={95}

From e3c2e376c5ea75d3d9ab10140c25bb10a48b39a3 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 14 Feb 2022 14:43:27 +0500
Subject: [PATCH 2/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=81=D0=B1=D1=80=D0=BE=D1=81=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B2=D0=B0=D0=B6=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/AdminPanel/WellController/TelemetrySelect.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/AdminPanel/WellController/TelemetrySelect.jsx b/src/pages/AdminPanel/WellController/TelemetrySelect.jsx
index 9890e10..f33484e 100644
--- a/src/pages/AdminPanel/WellController/TelemetrySelect.jsx
+++ b/src/pages/AdminPanel/WellController/TelemetrySelect.jsx
@@ -5,6 +5,7 @@ import { getTelemetryLabel } from '@components/views'
 
 export const TelemetrySelect = memo(({ telemetry, value, onChange }) => (
     <Select
+        allowClear
         value={value?.id}
         onChange={(id) => onChange?.(telemetry.find((row) => row.id === id))}
         dropdownClassName={'telemetry_select'}

From 9dd6423a63af7efda5b904689baa00a661b4f3ec Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Tue, 29 Mar 2022 14:16:49 +0500
Subject: [PATCH 3/6] hofix

---
 .../WellCompositeEditor/WellCompositeSections.jsx        | 9 ++++++---
 src/pages/DrillingProgram/CategoryEditor.jsx             | 4 ++--
 src/pages/WellOperations/Tvd/index.jsx                   | 6 +++---
 src/styles/tvd.less                                      | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 6276ecf..0c55a33 100644
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -39,11 +39,10 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
   const [isTVDModalVisible, setIsTVDModalVisible] = useState(false)
   const [isOpsModalVisible, setIsOpsModalVisible] = useState(false)
   const [isParamsModalVisible, setIsParamsModalVisible] = useState(false)
+  const [paramsColumns, setParamsColumns] = useState([])
 
   const location = useLocation()
 
-  const paramsColumns = useMemo(async() => await getColumns(idWell), [idWell])
-
   const rows = useMemo(() => {
     const rows = []
     statsWells?.forEach((well) => {
@@ -102,6 +101,10 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
     return rows
   }, [statsWells])
 
+  useEffect(() => invokeWebApiWrapperAsync(
+    async () => setParamsColumns(await getColumns(idWell))
+  ), [idWell])
+
   useEffect(() => {
     if (isOpsModalVisible || selectedWellId <= 0) return
     invokeWebApiWrapperAsync(
@@ -252,7 +255,7 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
         width={1500}
         footer={null}
       >
-        <Tvd idWell={selectedWellId}/>
+        <Tvd idWell={selectedWellId} style={{ height: '80vh' }} />
       </Modal>
 
       <Modal
diff --git a/src/pages/DrillingProgram/CategoryEditor.jsx b/src/pages/DrillingProgram/CategoryEditor.jsx
index a9fedec..5a01b67 100644
--- a/src/pages/DrillingProgram/CategoryEditor.jsx
+++ b/src/pages/DrillingProgram/CategoryEditor.jsx
@@ -93,7 +93,7 @@ export const CategoryEditor = memo(({ idWell, visible, category, onClosed }) =>
     const changeUserStatus = useCallback((user, status) => invokeWebApiWrapperAsync(
         async () => {
             const userIdx = users?.findIndex(({ user: u }) => u.id === user.id)
-            if (!userIdx) return
+            if (userIdx <= -1) return
 
             if (status === 0) {
                 await DrillingProgramService.removeUser(idWell, user.id, category.idFileCategory, users[userIdx].status)
@@ -102,7 +102,7 @@ export const CategoryEditor = memo(({ idWell, visible, category, onClosed }) =>
             }
             setUsers((prevUsers) => {
                 prevUsers[userIdx].status = status
-                return prevUsers
+                return [...prevUsers]
             })
         },
         setShowLoader,
diff --git a/src/pages/WellOperations/Tvd/index.jsx b/src/pages/WellOperations/Tvd/index.jsx
index e0e2784..c35a2d3 100644
--- a/src/pages/WellOperations/Tvd/index.jsx
+++ b/src/pages/WellOperations/Tvd/index.jsx
@@ -114,7 +114,7 @@ const makeDataset = (data, label, color, borderWidth = 1.5, borderDash) => ({
     borderDash,
 })
 
-export const Tvd = memo(({ idWell, title }) => {
+export const Tvd = memo(({ idWell, title, ...other }) => {
     const [chart, setChart] = useState()
     const [xLabel, setXLabel] = useState('day')
     const [operations, setOperations] = useState({})
@@ -187,7 +187,7 @@ export const Tvd = memo(({ idWell, title }) => {
             chart.canvas.parentNode.style.width = '0'
             chart.resize()
         }
-	}, [chart, operations, xLabel, onPointClick])
+	}, [chart, operations, xLabel, onPointClick, other])
 
     const toogleTable = useCallback(() => {
         setOperations(pre => ({ ...pre }))
@@ -195,7 +195,7 @@ export const Tvd = memo(({ idWell, title }) => {
     }, [])
 
     return (
-        <div className={'container tvd-page'}>
+        <div className={'container tvd-page'} {...other}>
             <div className={'tvd-top'}>
                 <h2>{title || 'График Глубина-день'}</h2>
                 <div>
diff --git a/src/styles/tvd.less b/src/styles/tvd.less
index 2b51e90..a1d51b0 100644
--- a/src/styles/tvd.less
+++ b/src/styles/tvd.less
@@ -25,7 +25,7 @@
             > div {
                 position: absolute;
                 //pointer-events: none;
-                transition: all .25s ease-out;
+                transition: opacity .25s ease-out;
                 opacity: 1;
 
                 &:hover {

From 56e873323b2d0c4ca69f747cb6a04f0b044b58a2 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 14 Jul 2022 16:08:58 +0500
Subject: [PATCH 4/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20ROP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Telemetry/TelemetryView/index.jsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index 2189da5..07768d9 100755
--- a/src/pages/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/index.jsx
@@ -370,12 +370,16 @@ export default function TelemetryView() {
     'Задание состояния скважины'
   ), [idWell, wellData])
 
-  const columnAdditionalLabels = {
-    1: rop && [
-      `ROP сред: ${rop.ropAverage.toFixed(2)} м/ч`,
-      `ROP макс: ${rop.ropMax.toFixed(2)} м/ч`
-    ]
-  }
+  const columnAdditionalLabels = useMemo(() => {
+    if (!rop) return {}
+    const { ropAverage, ropMax } = rop
+    return {
+      1: rop && [
+        `ROP сред: ${ropAverage && ropAverage.toFixed?.(2) || '---'} м/ч`,
+        `ROP макс: ${ropMax && ropMax.toFixed?.(2) || '---'} м/ч`
+      ]
+    }
+  }, [rop])
 
   return (
     <LoaderPortal show={showLoader}>

From 122ab994bb7e9463a9ca38f7e70860370af33bdf Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Thu, 14 Jul 2022 16:47:27 +0500
Subject: [PATCH 5/6] fix last hotfix

---
 src/pages/Telemetry/TelemetryView/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index 07768d9..c2ab8b0 100755
--- a/src/pages/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/index.jsx
@@ -1,5 +1,5 @@
 import { Select } from 'antd'
-import { useState, useEffect, useCallback, useContext } from 'react'
+import { useState, useMemo, useEffect, useCallback, useContext } from 'react'
 
 import {
   DrillFlowChartService,

From c704bcd8420f7c16ed35791bdc7cb6cd979821f7 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Wed, 20 Jul 2022 12:35:43 +0500
Subject: [PATCH 6/6] =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D1=86=D0=B0=20=D0=91?=
 =?UTF-8?q?=D1=83=D1=80=D0=B8=D0=BB=D0=B0=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=20=D0=91=D1=83?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BB=D1=8C=D1=89=D0=B8=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Telemetry/Operations/OperationsTable.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Telemetry/Operations/OperationsTable.jsx b/src/pages/Telemetry/Operations/OperationsTable.jsx
index 2c67d18..c94c88e 100644
--- a/src/pages/Telemetry/Operations/OperationsTable.jsx
+++ b/src/pages/Telemetry/Operations/OperationsTable.jsx
@@ -23,7 +23,7 @@ const makeDrillerSorter = (key) => (a, b) => {
 }
 
 export const columns = [
-    makeTextColumn('Бурила', 'driller', null, makeDrillerSorter('driller'), drillerRender, { width: 200 }),
+    makeTextColumn('Бурильщик', 'driller', null, makeDrillerSorter('driller'), drillerRender, { width: 200 }),
     makeNumericColumn('Кол-во операций', 'count', null, null, (value) => parseInt(value), 150),
     makeNumericColumn('Среднее по ключевому показателю', 'averageValue', null, null, numericRender, 150),
     makeNumericColumn('Среднее целевого показателя', 'averageTargetValue', null, null, numericRender, 150),