From 82183532b810e69494a68a7eb62de98cad94f490 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 28 Mar 2022 16:15:43 +0500
Subject: [PATCH 01/49] =?UTF-8?q?=D0=9C=D0=BE=D0=BD=D0=B8=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3,=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B0=D1=80=D1=85=D0=B8?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=83=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D1=8F.=20?=
 =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20Setpoints,?=
 =?UTF-8?q?=20=D1=82=D0=B0=D0=BA=20=D0=B6=D0=B5=20=D0=BE=D0=BD=D0=B8=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D1=8E=20=D0=B2=20TelemetryView?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Telemetry/Archive/ArchiveColumn.jsx |  31 +++
 .../Telemetry/Archive/ArchiveDisplay.jsx      |  66 +++++++
 src/pages/Telemetry/Archive/index.jsx         | 185 ++++++++++++++++++
 src/pages/{ => Telemetry}/Messages.jsx        |   0
 .../TelemetryView/ActiveMessagesOnline.jsx    |   2 +-
 .../TelemetryView/ChartTimeOnlineFooter.jsx   |   0
 .../TelemetryView/CustomColumn.jsx            |   0
 .../TelemetryView/ModeDisplay.jsx             |   0
 .../TelemetryView/MonitoringColumn.jsx        |   0
 .../TelemetryView/RigMnemo.jsx                |   0
 .../Setpoints}/SetpointSender.jsx             |  30 +--
 .../Setpoints}/SetpointViewer.jsx             |   2 +
 .../TelemetryView/Setpoints/index.jsx}        |  40 ++--
 .../TelemetryView/UserOfWells.jsx             |   0
 .../{ => Telemetry}/TelemetryView/index.jsx   |   0
 src/pages/Telemetry/index.jsx                 |  52 +++++
 src/pages/Well.jsx                            |  22 +--
 src/utils/permissions.ts                      |   8 +-
 18 files changed, 383 insertions(+), 55 deletions(-)
 create mode 100644 src/pages/Telemetry/Archive/ArchiveColumn.jsx
 create mode 100644 src/pages/Telemetry/Archive/ArchiveDisplay.jsx
 create mode 100644 src/pages/Telemetry/Archive/index.jsx
 rename src/pages/{ => Telemetry}/Messages.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/ActiveMessagesOnline.jsx (97%)
 rename src/pages/{ => Telemetry}/TelemetryView/ChartTimeOnlineFooter.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/CustomColumn.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/ModeDisplay.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/MonitoringColumn.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/RigMnemo.jsx (100%)
 rename src/pages/{TelemetryView => Telemetry/TelemetryView/Setpoints}/SetpointSender.jsx (85%)
 rename src/pages/{TelemetryView => Telemetry/TelemetryView/Setpoints}/SetpointViewer.jsx (98%)
 rename src/pages/{TelemetryView/Setpoints.jsx => Telemetry/TelemetryView/Setpoints/index.jsx} (84%)
 rename src/pages/{ => Telemetry}/TelemetryView/UserOfWells.jsx (100%)
 rename src/pages/{ => Telemetry}/TelemetryView/index.jsx (100%)
 create mode 100644 src/pages/Telemetry/index.jsx

diff --git a/src/pages/Telemetry/Archive/ArchiveColumn.jsx b/src/pages/Telemetry/Archive/ArchiveColumn.jsx
new file mode 100644
index 0000000..6f7ebfb
--- /dev/null
+++ b/src/pages/Telemetry/Archive/ArchiveColumn.jsx
@@ -0,0 +1,31 @@
+import { memo, useMemo } from 'react'
+
+import { Grid, GridItem } from '@components/Grid'
+import { Column } from '@components/charts/Column'
+
+export const ArchiveColumn = memo(({ lineGroup, data, interval, style, headerHeight, yStart }) => {
+  const lgws = useMemo(() => lineGroup.filter(cfg => !cfg.isShape), [lineGroup])
+  const pv = useMemo(() => lgws.filter(line => line.showLabels).map(line => ({
+    color: line.color,
+    label: line.label
+  })), [lgws])
+
+  return (
+    <div style={style}>
+      <Grid style={{ height: headerHeight, margin: 0 }}>
+        {pv?.map((v, idx) => (
+          <GridItem className={'display_chart_label'} key={idx} row={idx} col={1} style={{ color: v.color, padding: '0 8px' }}>{v.label}</GridItem>
+        ))}
+      </Grid>
+      <Column
+        data={data}
+        lineGroup={lgws}
+        interval={interval}
+        yDisplay={false}
+        yStart={yStart}
+      />
+    </div>
+  )
+})
+
+export default ArchiveColumn
diff --git a/src/pages/Telemetry/Archive/ArchiveDisplay.jsx b/src/pages/Telemetry/Archive/ArchiveDisplay.jsx
new file mode 100644
index 0000000..c3310ba
--- /dev/null
+++ b/src/pages/Telemetry/Archive/ArchiveDisplay.jsx
@@ -0,0 +1,66 @@
+import { memo, useMemo } from 'react'
+
+import { Grid, GridItem } from '@components/Grid'
+
+import { paramsGroups } from '../TelemetryView'
+import { ArchiveColumn } from './ArchiveColumn'
+
+const interpolationSearch = (data, begin, end, accessor) => {
+    const fy = (i) => new Date(data[i]?.[accessor] ?? 0)
+    const fx = (y, b, e) => Math.round(b + (y - fy(b)) * (e - b) / (fy(e) - fy(b)))
+    const findIdx = (val, startIdx, c) => {
+        let x = startIdx
+        let endIdx = data.length - 1
+        if(val < fy(startIdx))
+          return startIdx
+        if(val > fy(endIdx))
+          return endIdx
+        for(let i = 0; i < c; i++){
+          x = fx(val, startIdx, endIdx)
+          if(fy(x) < val)
+            startIdx = x
+          else
+            endIdx = x
+          if ((startIdx === endIdx)||(fy(startIdx) === fy(endIdx)))
+            return x
+        }
+        return x
+      }
+      let x0 = findIdx(begin, 0, 5)
+      let x1 = findIdx(end, x0, 3)
+      return { start: x0, end: x1, count: x1 - x0 }
+}
+
+export const cutData = (data, beginDate, endDate) => {
+    if (data?.length > 0) {
+        let { start, end } = interpolationSearch(data, beginDate, endDate, 'date')
+        if (start > 0) start--
+        if (end + 1 < end.length) end++
+        return data.slice(start, end)
+    }
+    return data
+}
+
+export const ArchiveDisplay = memo(({data, startDate, interval, onWheel}) => {
+    const endDate = useMemo(() => new Date(+startDate + interval), [startDate, interval])
+    const chartData = useMemo(() => cutData(data, startDate, endDate), [data, startDate, endDate])
+
+    return (
+        <Grid onWheel={onWheel}>
+            {paramsGroups.map((group, index) => (
+                <GridItem col={index + 1} row={'1'} className={'border_small'} key={`${group.label}${index}`} style={{ padding: 0 }}>
+                    <ArchiveColumn
+                        style={{ width: '15vw' }}
+                        data={chartData}
+                        lineGroup={group}
+                        interval={interval}
+                        headerHeight={'50px'}
+                        yStart={startDate}
+                    />
+                </GridItem>
+            ))}
+        </Grid>
+    )
+})
+
+export default ArchiveDisplay
diff --git a/src/pages/Telemetry/Archive/index.jsx b/src/pages/Telemetry/Archive/index.jsx
new file mode 100644
index 0000000..4c37e9f
--- /dev/null
+++ b/src/pages/Telemetry/Archive/index.jsx
@@ -0,0 +1,185 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { useState, useEffect, memo, useCallback } from 'react'
+
+import { Flex } from '@components/Grid'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { DatePickerWrapper, makeDateSorter } from '@components/Table'
+import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
+import { TelemetryDataSaubService } from '@api'
+
+import { normalizeData } from '../TelemetryView'
+import { ArchiveDisplay, cutData } from './ArchiveDisplay'
+
+const DATA_COUNT = 2048 // Колличество точек на подгрузку графика
+const ADDITIVE_PAGES = 2 // Дополнительные данные для графиков
+const LOADING_TRIGGER = 0.5
+const WHEEL_SENSITIVITY = 1 / 530
+
+const getLoadingInterval = (loaded, startDate, interval) => {
+    // Если данные загружены и дата не заходит за тригер дозагрузка не требуется
+    if (
+        loaded &&
+        +startDate - interval * LOADING_TRIGGER > loaded.start &&
+        +startDate + interval * (LOADING_TRIGGER + 1) < loaded.end
+    )
+        return { loadingStartDate: startDate, newLoaded: loaded, loadingInterval: 0 }
+
+    let loadingStartDate = +startDate - interval * ADDITIVE_PAGES
+    let loadingEndDate = +startDate + interval * (ADDITIVE_PAGES + 1)
+
+    const newLoaded = {
+        start: loadingStartDate,
+        end: loadingEndDate
+    }
+
+    if (loaded) {
+        if (loadingStartDate >= loaded.start)
+            loadingStartDate = loaded.end
+        if (loadingEndDate <= loaded.end)
+            loadingEndDate = loaded.start
+        newLoaded.start = Math.min(loaded.start, loadingStartDate)
+        newLoaded.end = Math.max(loaded.end, loadingEndDate)
+    }
+
+    const loadingInterval = Math.trunc((loadingEndDate - loadingStartDate) / 1000)
+
+    return {
+        loadingStartDate: new Date(loadingStartDate),
+        newLoaded: {
+            start: new Date(newLoaded.start),
+            end: new Date(newLoaded.end)
+        },
+        loadingInterval
+    }
+}
+
+const range = (start, end) => {
+    const result = []
+    for (let i = start; i < end; i++)
+        result.push(i)
+    return result
+}
+
+export const Archive = memo(({ idWell }) => {
+    const [dataSaub, setDataSaub] = useState([])
+    const [dateLimit, setDateLimit] = useState({ from: 0, to: new Date() })
+    const [chartInterval, setChartInterval] = useState(parseInt(defaultPeriod) * 1000)
+    const [startDate, setStartDate] = useState(new Date(Date.now() - chartInterval))
+    const [showLoader, setShowLoader] = useState(false)
+    const [loaded, setLoaded] = useState(null)
+
+    const onGraphWheel = useCallback((e) => {
+        if (loaded && dateLimit.from && dateLimit.to) {
+            setStartDate((prevStartDate) => {
+                const offset = e.deltaY * chartInterval * WHEEL_SENSITIVITY
+                const nextStartDate = +prevStartDate + offset
+                const firstPossibleDate = Math.max(loaded.start, dateLimit.from)
+                const lastPossibleDate = Math.min(dateLimit.to, (loaded.end ?? Date.now())) - chartInterval
+                return new Date(Math.max(firstPossibleDate, Math.min(nextStartDate, lastPossibleDate)))
+            })
+        }
+    }, [loaded, dateLimit, chartInterval])
+
+    const isDateDisabled = useCallback((date) => {
+        if (!date) return false
+        const dt = new Date(date).setHours(0, 0, 0, 0)
+        return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
+    }, [dateLimit])
+
+    const isDateTimeDisabled = useCallback((date) => ({
+        disabledHours: () => range(0, 24).filter(h => {
+            if (!date) return false
+            const dt = +new Date(date).setHours(h)
+            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
+        }),
+        disabledMinutes: () => range(0, 60).filter(m => {
+            if (!date) return false
+            const dt = +new Date(date).setMinutes(m)
+            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
+        }),
+        disabledSeconds: () => range(0, 60).filter(s => {
+            if (!date) return false
+            const dt = +new Date(date).setSeconds(s)
+            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
+        })
+    }), [dateLimit])
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => {
+            let dates = await TelemetryDataSaubService.getDataDatesRange(idWell)
+            dates = {
+                from: new Date(dates?.from ?? 0),
+                to: new Date(dates?.to ?? 0)
+            }
+            setDateLimit(dates)
+            setStartDate(new Date(Math.max(dates.from, +dates.to - chartInterval)))
+        },
+        setShowLoader,
+        `Не удалось загрузить диапозон телеметрии для скважины "${idWell}"`,
+        'Загрузка диапозона телеметрии'
+    ), [])
+
+    useEffect(() => {
+        setStartDate((startDate) => new Date(Math.min(Date.now() - chartInterval, startDate)))
+        setDataSaub([])
+    }, [chartInterval])
+
+    useEffect(() => {
+        if (showLoader) return
+        const { loadingStartDate, loadingInterval, newLoaded } = getLoadingInterval(loaded, startDate, chartInterval)
+        if (loadingInterval <= 0) return
+        invokeWebApiWrapperAsync(
+            async () => {
+                const data = await TelemetryDataSaubService.getData(idWell, loadingStartDate.toISOString(), loadingInterval, DATA_COUNT)
+
+                const loadedStartDate = new Date(Math.max(+newLoaded.start, +startDate - chartInterval * ADDITIVE_PAGES))
+                const loadedEndDate = new Date(Math.min(+newLoaded.end, +startDate + chartInterval * (ADDITIVE_PAGES + 1)))
+                setLoaded({ start: loadedStartDate, end: loadedEndDate })
+
+                if (data) {
+                    data.forEach(elm => elm.date = new Date(elm.date))
+                    setDataSaub((prevDataSaub) => {
+                        const newData = [...prevDataSaub, ...normalizeData(data)]
+                        newData.sort(makeDateSorter('date'))
+                        return cutData(newData, loadedStartDate, loadedEndDate)
+                    })
+                }
+
+            },
+            setShowLoader,
+            `Не удалось загрузить данные по скважине "${idWell}" c ${startDate.toISOString()} по ${new Date(+startDate + chartInterval).toISOString()}`,
+            'Загрузка телеметрий в диапозоне'
+        )
+    }, [idWell, chartInterval, loaded, startDate])
+
+    return (
+        <>
+            <Flex style={{margin: '8px 8px 0'}}>
+                <div>
+                    Начальная дата:&nbsp;
+                    <DatePickerWrapper
+                        value={startDate}
+                        disabledDate={isDateDisabled}
+                        disabledTime={isDateTimeDisabled}
+                        onChange={(startDate) => setStartDate(new Date(startDate))}
+                    />
+                </div>
+                <div style={{ marginLeft: '1rem' }}>
+                    Период:&nbsp;
+                    <PeriodPicker onChange={(val) => setChartInterval(val * 1000)} />
+                </div>
+            </Flex>
+            <LoaderPortal show={showLoader}>
+                <ArchiveDisplay
+                    data={dataSaub}
+                    startDate={startDate}
+                    interval={chartInterval}
+                    onWheel={onGraphWheel}
+                />
+            </LoaderPortal>
+        </>
+    )
+})
+
+export default Archive
diff --git a/src/pages/Messages.jsx b/src/pages/Telemetry/Messages.jsx
similarity index 100%
rename from src/pages/Messages.jsx
rename to src/pages/Telemetry/Messages.jsx
diff --git a/src/pages/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
similarity index 97%
rename from src/pages/TelemetryView/ActiveMessagesOnline.jsx
rename to src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index ec888ea..db5c547 100644
--- a/src/pages/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -6,7 +6,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { Subscribe } from '@services/signalr'
 import { MessageService } from '@api'
 
-import { columns } from '@pages/Messages'
+import { columns } from '../Messages'
 
 import '@styles/message.css'
 
diff --git a/src/pages/TelemetryView/ChartTimeOnlineFooter.jsx b/src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
similarity index 100%
rename from src/pages/TelemetryView/ChartTimeOnlineFooter.jsx
rename to src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
diff --git a/src/pages/TelemetryView/CustomColumn.jsx b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
similarity index 100%
rename from src/pages/TelemetryView/CustomColumn.jsx
rename to src/pages/Telemetry/TelemetryView/CustomColumn.jsx
diff --git a/src/pages/TelemetryView/ModeDisplay.jsx b/src/pages/Telemetry/TelemetryView/ModeDisplay.jsx
similarity index 100%
rename from src/pages/TelemetryView/ModeDisplay.jsx
rename to src/pages/Telemetry/TelemetryView/ModeDisplay.jsx
diff --git a/src/pages/TelemetryView/MonitoringColumn.jsx b/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
similarity index 100%
rename from src/pages/TelemetryView/MonitoringColumn.jsx
rename to src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
diff --git a/src/pages/TelemetryView/RigMnemo.jsx b/src/pages/Telemetry/TelemetryView/RigMnemo.jsx
similarity index 100%
rename from src/pages/TelemetryView/RigMnemo.jsx
rename to src/pages/Telemetry/TelemetryView/RigMnemo.jsx
diff --git a/src/pages/TelemetryView/SetpointSender.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
similarity index 85%
rename from src/pages/TelemetryView/SetpointSender.jsx
rename to src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
index 27bceae..0073b9d 100644
--- a/src/pages/TelemetryView/SetpointSender.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { memo, useCallback, useMemo, useState } from 'react'
 import { Select, Modal, Input, InputNumber } from 'antd'
 
 import { SetpointsService } from '@api'
@@ -8,13 +8,13 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeNumericRender, EditableTable } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 
-export const SetpointSender = ({ idWell, onClose, visible, setpointNames }) => {
+export const SetpointSender = memo(({ idWell, onClose, visible, setpointNames }) => {
     const [expirePeriod, setExpirePeriod] = useState(defaultPeriod)
     const [comment, setComment] = useState('')
     const [setpoints, setSetpoints] = useState([])
     const [isLoading, setIsLoading] = useState(false)
 
-    const addingColumns = [
+    const addingColumns = useMemo(() => [
         {
             title: 'Наименование уставки',
             dataIndex: 'name',
@@ -33,27 +33,27 @@ export const SetpointSender = ({ idWell, onClose, visible, setpointNames }) => {
             render: makeNumericRender(1),
             align: 'right'
         }
-    ]
+    ], [setpointNames])
 
-    const onAdd = async (sp) => setSetpoints((prevSp) => {
+    const onAdd = useCallback(async (sp) => setSetpoints((prevSp) => {
         sp.key = Date.now()
         prevSp.push(sp)
         return prevSp
-    })
+    }), [])
 
-    const onEdit = async (sp) => setSetpoints((prevSp) => {
+    const onEdit = useCallback(async (sp) => setSetpoints((prevSp) => {
         const idx = prevSp.findIndex((val) => val.key === sp.key)
         prevSp[idx] = sp
         return prevSp
-    })
+    }), [])
 
-    const onDelete = async (sp) => setSetpoints((prevSp) => {
+    const onDelete = useCallback(async (sp) => setSetpoints((prevSp) => {
         const idx = prevSp.findIndex((val) => val.key === sp.key)
         prevSp.splice(idx, 1)
         return prevSp
-    })
+    }), [])
 
-    const onModalOk = () => invokeWebApiWrapperAsync(
+    const onModalOk = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
             const setpointsObject = setpoints.reduce((obj, sp) => {
                 obj[sp.name] = sp.value
@@ -66,12 +66,12 @@ export const SetpointSender = ({ idWell, onClose, visible, setpointNames }) => {
                 comment: comment
             }
             await SetpointsService.insert(idWell, request)
-            onClose(true)
+            await onClose(true)
         },
         setIsLoading,
         `Не удалось отправить уставки по скважине "${idWell}"`,
         `Рекомендация новыой уставки`
-    )
+    ), [idWell, setpoints, comment, expirePeriod, onClose])
 
     return (
         <Modal
@@ -115,4 +115,6 @@ export const SetpointSender = ({ idWell, onClose, visible, setpointNames }) => {
             </LoaderPortal>
         </Modal>
     )
-}
+})
+
+export default SetpointSender
diff --git a/src/pages/TelemetryView/SetpointViewer.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx
similarity index 98%
rename from src/pages/TelemetryView/SetpointViewer.jsx
rename to src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx
index 7a0fa75..d22ccf2 100644
--- a/src/pages/TelemetryView/SetpointViewer.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx
@@ -72,3 +72,5 @@ export const SetpointViewer = memo(({ setpoint, visible, onClose, setpointNames
         </Modal>
     )
 })
+
+export default SetpointViewer
diff --git a/src/pages/TelemetryView/Setpoints.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
similarity index 84%
rename from src/pages/TelemetryView/Setpoints.jsx
rename to src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
index a74f9e5..2339ea2 100644
--- a/src/pages/TelemetryView/Setpoints.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
@@ -1,19 +1,19 @@
-import moment from 'moment'
 import { Button, Modal } from 'antd'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo, useCallback, useMemo } from 'react'
 
 import { Table } from '@components/Table'
 import { UserView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
+import { hasPermission } from '@utils/permissions'
 import { makeStringCutter } from '@utils/string'
+import { formatDate } from '@utils'
 import { SetpointsService } from '@api'
 
-import { SetpointSender } from './SetpointSender'
+import SetpointSender from './SetpointSender'
 import { SetpointViewer, getSetpointStatus } from './SetpointViewer'
-import { hasPermission } from '@asb/utils/permissions'
 
-export const Setpoints = ({ idWell, ...other }) => {
+export const Setpoints = memo(({ idWell, ...other }) => {
     const [isModalVisible, setIsModalVisible] = useState(false)
     const [isSenderVisible, setIsSenderVisible] = useState(false)
     const [isViewerVisible, setIsViewerVisible] = useState(false)
@@ -37,21 +37,21 @@ export const Setpoints = ({ idWell, ...other }) => {
         'Получение списка имён уставок'
     ), [idWell])
 
-    const showMore = (id) => {
+    const showMore = useCallback((id) => {
         const selected = setpoints.find((sp) => sp.id === id)
         setSelected(selected ?? {})
         setIsViewerVisible(true)
-    }
+    }, [setpoints])
 
-    const historyColumns = [
-        { title: 'Дата', dataIndex: 'uploadDate', render: item => moment(item).format('DD MMM YYYY, HH:mm:ss') },
+    const historyColumns = useMemo(() => [
+        { title: 'Дата', dataIndex: 'uploadDate', render: item => formatDate(item) },
         { title: 'Автор', dataIndex: 'author', render: (user) => <UserView user={user} /> },
         { title: 'Комментарий', dataIndex: 'comment', render: makeStringCutter() },
         { title: 'Статус', dataIndex: 'idState', render: (id) => getSetpointStatus(parseInt(id)) },
         { dataIndex: 'id', render: (id) => <Button onClick={() => showMore(id)}>Подробнее</Button> },
-    ]
+    ], [showMore])
 
-    const updateTable = async () => await invokeWebApiWrapperAsync(
+    const updateTable = useCallback(async () => await invokeWebApiWrapperAsync(
         async () => {
             const setpoints = await SetpointsService.getByIdWell(idWell)
             setSetpoints(setpoints)
@@ -59,19 +59,19 @@ export const Setpoints = ({ idWell, ...other }) => {
         setIsLoading,
         `Не удалось загрузить список для скважины  "${idWell}"`,
         'Получение списка скважин'
-    )
+    ), [idWell])
 
-    const onOpenClick = async () => {
+    const onOpenClick = useCallback(async () => {
         await updateTable()
         setIsModalVisible(true)
-    }
+    }, [updateTable])
 
-    const onSenderClose = (pushed) => {
-        if (pushed) updateTable()
+    const onSenderClose = useCallback(async (pushed) => {
+        if (pushed) await updateTable()
         setIsSenderVisible(false)
-    }
+    }, [updateTable])
 
-    return hasPermission('Setpoints.get') && (
+    return !hasPermission('Setpoints.get') ? null : (
         <div {...other}>
             <Button onClick={onOpenClick} loading={isLoading}>
                 Рекомендованные уставки
@@ -115,4 +115,6 @@ export const Setpoints = ({ idWell, ...other }) => {
             />
         </div>
     )
-}
+})
+
+export default Setpoints
diff --git a/src/pages/TelemetryView/UserOfWells.jsx b/src/pages/Telemetry/TelemetryView/UserOfWells.jsx
similarity index 100%
rename from src/pages/TelemetryView/UserOfWells.jsx
rename to src/pages/Telemetry/TelemetryView/UserOfWells.jsx
diff --git a/src/pages/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
similarity index 100%
rename from src/pages/TelemetryView/index.jsx
rename to src/pages/Telemetry/TelemetryView/index.jsx
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
new file mode 100644
index 0000000..551cbfb
--- /dev/null
+++ b/src/pages/Telemetry/index.jsx
@@ -0,0 +1,52 @@
+import { Switch, useParams } from 'react-router-dom'
+import { memo, useMemo } from 'react'
+import { Layout, Menu } from 'antd'
+import { AlertOutlined, FundViewOutlined, DatabaseOutlined } from '@ant-design/icons'
+
+import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/Private'
+
+import Archive from './Archive'
+import Messages from './Messages'
+import TelemetryView from './TelemetryView'
+
+import '@styles/index.css'
+
+const { Content } = Layout
+
+export const Telemetry = memo(({ idWell }) => {
+  const { tab } = useParams()
+  const rootPath = useMemo(() => `/well/${idWell}/telemetry`, [idWell])
+
+  return (
+    <Layout>
+      <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+        <PrivateMenuItem.Link root={rootPath} key={'monitoring'} path={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
+        <PrivateMenuItem.Link root={rootPath} key={'messages'} path={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
+        <PrivateMenuItem.Link root={rootPath} key={'archive'} path={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
+      </Menu>
+
+      <Layout>
+        <Content className={'site-layout-background'}>
+          <Switch>
+            <PrivateRoute path={`${rootPath}/monitoring`}>
+              <TelemetryView idWell={idWell} />
+            </PrivateRoute>
+            <PrivateRoute path={`${rootPath}/messages`}>
+              <Messages idWell={idWell} />
+            </PrivateRoute>
+            <PrivateRoute path={`${rootPath}/archive`}>
+              <Archive idWell={idWell} />
+            </PrivateRoute>
+            <PrivateDefaultRoute urls={[
+              `${rootPath}/monitoring`,
+              `${rootPath}/messages`,
+              `${rootPath}/archive`,
+            ]}/>
+          </Switch>
+        </Content>
+      </Layout>
+    </Layout>
+  )
+})
+
+export default Telemetry
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 5df9768..8c4aab8 100644
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -2,9 +2,7 @@ import { memo, useMemo } from 'react'
 import {
   FolderOutlined,
   FundViewOutlined,
-  AlertOutlined,
   FilePdfOutlined,
-  DatabaseOutlined,
   ExperimentOutlined,
   DeploymentUnitOutlined,
 } from '@ant-design/icons'
@@ -14,12 +12,10 @@ import { Switch, useParams } from 'react-router-dom'
 import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/Private'
 
 import Report from './Report'
-import Archive from './Archive'
 import Measure from './Measure'
-import Messages from './Messages'
 import Analytics from './Analytics'
 import Documents from './Documents'
-import TelemetryView from './TelemetryView'
+import Telemetry from './Telemetry'
 import WellOperations from './WellOperations'
 import DrillingProgram from './DrillingProgram'
 import TelemetryAnalysis from './TelemetryAnalysis'
@@ -35,12 +31,10 @@ export const Well = memo(() => {
   return (
     <Layout>
       <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-        <PrivateMenuItem.Link root={rootPath} key={'telemetry'} path={'telemetry'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
-        <PrivateMenuItem.Link root={rootPath} key={'message'} path={'message'} icon={<AlertOutlined/>} title={'Сообщения'} />
+        <PrivateMenuItem.Link root={rootPath} key={'telemetry'} path={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
         <PrivateMenuItem.Link root={rootPath} key={'report'} path={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
         <PrivateMenuItem.Link root={rootPath} key={'analytics'} path={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
         <PrivateMenuItem.Link root={rootPath} key={'operations'} path={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
-        <PrivateMenuItem.Link root={rootPath} key={'archive'} path={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
         {/* <PrivateMenuItem.Link root={rootPath} key={'telemetryAnalysis'} path={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
         <PrivateMenuItem.Link root={rootPath} key={'document'} path={'document'} icon={<FolderOutlined />} title={'Документы'} />
         <PrivateMenuItem.Link root={rootPath} key={'measure'} path={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
@@ -50,11 +44,8 @@ export const Well = memo(() => {
       <Layout>
         <Content className={'site-layout-background'}>
           <Switch>
-            <PrivateRoute path={`${rootPath}/telemetry`}>
-              <TelemetryView idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/message`}>
-              <Messages idWell={idWell} />
+            <PrivateRoute path={`${rootPath}/telemetry/:tab?`}>
+              <Telemetry idWell={idWell} />
             </PrivateRoute>
             <PrivateRoute path={`${rootPath}/report`}>
               <Report idWell={idWell} />
@@ -65,9 +56,6 @@ export const Well = memo(() => {
             <PrivateRoute path={`${rootPath}/operations/:tab?`}>
               <WellOperations idWell={idWell} />
             </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/archive`}>
-              <Archive idWell={idWell} />
-            </PrivateRoute>
             <PrivateRoute path={`${rootPath}/telemetryAnalysis/:tab?`}>
               <TelemetryAnalysis idWell={idWell} />
             </PrivateRoute>
@@ -82,11 +70,9 @@ export const Well = memo(() => {
             </PrivateRoute>
             <PrivateDefaultRoute urls={[
               `${rootPath}/telemetry`,
-              `${rootPath}/message`,
               `${rootPath}/report`,
               `${rootPath}/analytics`,
               `${rootPath}/operations`,
-              `${rootPath}/archive`,
               `${rootPath}/telemetryAnalysis`,
               `${rootPath}/document`,
               `${rootPath}/measure`,
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index c44a9a7..3eb7371 100644
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -92,9 +92,11 @@ export const requirements: PermissionRecord = {
             document: {
                 '*': ['Deposit.get', 'File.get'],
             },
-            archive: ['Deposit.get', 'TelemetryDataSaub.get'],
-            telemetry: ['Deposit.get', 'DrillFlowChart.get', 'TelemetryDataSaub.get', 'TelemetryDataSpin.get'],
-            message: ['Deposit.get', 'TelemetryDataSaub.get'],
+            telemetry: {
+                archive: ['Deposit.get', 'TelemetryDataSaub.get'],
+                monitoring: ['Deposit.get', 'DrillFlowChart.get', 'TelemetryDataSaub.get', 'TelemetryDataSpin.get'],
+                messages: ['Deposit.get', 'TelemetryDataSaub.get'],
+            },
             report: ['Deposit.get', 'Report.get'],
             analytics: {
                 composite: {

From de59cc65ce31e13ede866142ab250b428bb5d680 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 28 Mar 2022 17:36:58 +0500
Subject: [PATCH 02/49] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=20=D0=BA=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=B0=D0=BC=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=B4=20NTFS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                          |   0
 .vscode/launch.json                                 |   0
 .vscode/settings.json                               |   0
 README.md                                           |   0
 TODO.md                                             |   0
 concept/ImagesSrc/logo_32_Asb.png                   | Bin
 concept/ImagesSrc/logo_32_naftagaz.png              | Bin
 concept/ImagesSrc/logo_Asb.svg                      |   0
 concept/SludgeDiagram.jsx                           |   0
 concept/Smbo/EquipmentDetails.jsx                   |   0
 concept/Smbo/SmboPlate.jsx                          |   0
 concept/Smbo/images/RigPlan2.png                    | Bin
 concept/Smbo/images/TopDrive_Dummy.png              | Bin
 concept/Smbo/index.jsx                              |   0
 concept/TelemetryAnalysis.jsx                       |   0
 concept/WellStat.jsx                                |   0
 concept/WellTelemetryAnalysis.jsx                   |   0
 concept/readme.md                                   |   0
 craco.config.js                                     |   0
 doc/MSE_and_torqueStab_info.txt                     |   0
 package-lock.json                                   |   0
 package.json                                        |   0
 public/favicon.ico                                  | Bin
 public/images/logo_32.png                           | Bin
 public/index.html                                   |   0
 public/manifest.json                                |   0
 public/robots.txt                                   |   0
 src/App.js                                          |   0
 src/components/AnalysisOperationTime.jsx            |   0
 src/components/ChangePassword.tsx                   |   0
 src/components/Display.jsx                          |   0
 src/components/DownloadLink.tsx                     |   0
 src/components/ErrorFetch.js                        |   0
 src/components/Grid.tsx                             |   0
 src/components/Layout/AdminLayoutPortal.tsx         |   0
 src/components/Layout/LayoutPortal.tsx              |   0
 src/components/Layout/index.ts                      |   0
 src/components/LoaderPortal.tsx                     |   0
 src/components/PageHeader.tsx                       |   0
 src/components/Private/PrivateContent.tsx           |   0
 src/components/Private/PrivateDefaultRoute.tsx      |   0
 src/components/Private/PrivateMenuItem.tsx          |   0
 src/components/Private/PrivateRoute.tsx             |   0
 src/components/Private/index.ts                     |   0
 src/components/Table/Columns/date.tsx               |   0
 src/components/Table/Columns/index.ts               |   0
 src/components/Table/Columns/numeric.tsx            |   0
 src/components/Table/Columns/plan_fact.tsx          |   0
 src/components/Table/Columns/select.tsx             |   0
 src/components/Table/Columns/tag.tsx                |   0
 src/components/Table/Columns/text.tsx               |   0
 src/components/Table/Columns/timezone.tsx           |   0
 src/components/Table/DatePickerWrapper.tsx          |   0
 src/components/Table/DateRangeWrapper.tsx           |   0
 src/components/Table/EditableCell.tsx               |   0
 src/components/Table/EditableTable.jsx              |   0
 src/components/Table/Table.tsx                      |   0
 src/components/Table/TableSettingsChanger.tsx       |   0
 src/components/Table/index.tsx                      |   0
 src/components/Table/sorters.ts                     |   0
 src/components/UploadForm.jsx                       |   0
 src/components/UserMenu.tsx                         |   0
 src/components/charts/ChartOperationTime.jsx        |   0
 src/components/charts/ChartOperationTimeBase.tsx    |   0
 src/components/charts/ChartTelemetryDepthToDay.jsx  |   0
 .../charts/ChartTelemetryDepthToInterval.jsx        |   0
 .../charts/ChartTelemetryOperationsSummary.jsx      |   0
 src/components/charts/ChartTimeBase.tsx             |   0
 src/components/charts/Column.tsx                    |   0
 src/components/factory.ts                           |   0
 src/components/icons/Loader.tsx                     |   0
 src/components/icons/PointerIcon.tsx                |   0
 src/components/icons/WellIcon.tsx                   |   0
 src/components/icons/index.ts                       |   0
 src/components/selectors/PeriodPicker.tsx           |   0
 src/components/selectors/Poprompt.tsx               |   0
 src/components/selectors/TelemetrySelect.tsx        |   0
 src/components/selectors/WellSelector.jsx           |   0
 src/components/selectors/WellTreeSelector.tsx       |   0
 src/components/views/CompanyView.tsx                |   0
 src/components/views/PermissionView.tsx             |   0
 src/components/views/RoleView.tsx                   |   0
 src/components/views/TelemetryView.tsx              |   0
 src/components/views/UserView.tsx                   |   0
 src/components/views/index.ts                       |   0
 src/context/Context.js                              |   0
 src/images/ClusterIcon.svg                          |   0
 src/images/DempherOff.png                           | Bin
 src/images/DempherOn.png                            | Bin
 src/images/DepositIcon.svg                          |   0
 src/images/Logo.tsx                                 |   0
 src/images/SpinDisabled.png                         | Bin
 src/images/SpinEnabled.png                          | Bin
 src/images/las.png                                  | Bin
 src/index.js                                        |   0
 src/pages/AccessDenied.jsx                          |   0
 src/pages/AdminPanel/ClusterController.jsx          |   0
 src/pages/AdminPanel/CompanyController.jsx          |   0
 src/pages/AdminPanel/CompanyTypeController.jsx      |   0
 src/pages/AdminPanel/DepositController.jsx          |   0
 src/pages/AdminPanel/PermissionController.jsx       |   0
 src/pages/AdminPanel/RoleController.jsx             |   0
 src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx  |   0
 src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx  |   0
 src/pages/AdminPanel/Telemetry/index.jsx            |   0
 src/pages/AdminPanel/UserController/RoleTag.jsx     |   0
 src/pages/AdminPanel/UserController/index.jsx       |   0
 src/pages/AdminPanel/VisitLog.jsx                   |   0
 src/pages/AdminPanel/WellController/index.jsx       |   0
 src/pages/AdminPanel/index.jsx                      |   0
 src/pages/Analytics/Statistics.jsx                  |   0
 .../WellCompositeEditor/WellCompositeSections.jsx   |   0
 src/pages/Analytics/WellCompositeEditor/index.jsx   |   0
 src/pages/Analytics/index.jsx                       |   0
 src/pages/Archive/ArchiveColumn.jsx                 |   0
 src/pages/Archive/ArchiveDisplay.jsx                |   0
 src/pages/Archive/index.jsx                         |   0
 src/pages/Cluster/ClusterWells.jsx                  |   0
 src/pages/Cluster/WellOperationsTable.jsx           |   0
 src/pages/Cluster/index.jsx                         |   0
 src/pages/Deposit.jsx                               |   0
 src/pages/Documents/DocumentsTemplate.jsx           |   0
 src/pages/Documents/index.jsx                       |   0
 src/pages/DrillingProgram/CategoryAdder.jsx         |   0
 src/pages/DrillingProgram/CategoryEditor.jsx        |   0
 src/pages/DrillingProgram/CategoryHistory.jsx       |   0
 src/pages/DrillingProgram/CategoryRender.jsx        |   0
 src/pages/DrillingProgram/MarksCard.jsx             |   0
 src/pages/DrillingProgram/index.jsx                 |   0
 src/pages/Login.jsx                                 |   0
 src/pages/Main.jsx                                  |   0
 src/pages/Measure/InclinometryTable.jsx             |   0
 src/pages/Measure/MeasureTable.jsx                  |   0
 src/pages/Measure/View.jsx                          |   0
 src/pages/Measure/columnsCommon.js                  |   0
 src/pages/Measure/drillingFluidData.js              |   0
 src/pages/Measure/index.jsx                         |   0
 src/pages/Measure/mudDiagramData.js                 |   0
 src/pages/Measure/nnbData.js                        |   0
 src/pages/Register.jsx                              |   0
 src/pages/Report/ReportCreationNotify.jsx           |   0
 src/pages/Report/Reports.jsx                        |   0
 src/pages/Report/index.jsx                          |   0
 src/pages/SuspenseFallback.tsx                      |   0
 src/pages/Telemetry/Archive/ArchiveColumn.jsx       |   0
 src/pages/Telemetry/Archive/ArchiveDisplay.jsx      |   0
 src/pages/Telemetry/Archive/index.jsx               |   0
 src/pages/Telemetry/Messages.jsx                    |   0
 .../TelemetryView/ActiveMessagesOnline.jsx          |   0
 .../TelemetryView/ChartTimeOnlineFooter.jsx         |   0
 src/pages/Telemetry/TelemetryView/CustomColumn.jsx  |   0
 src/pages/Telemetry/TelemetryView/ModeDisplay.jsx   |   0
 .../Telemetry/TelemetryView/MonitoringColumn.jsx    |   0
 src/pages/Telemetry/TelemetryView/RigMnemo.jsx      |   0
 .../TelemetryView/Setpoints/SetpointSender.jsx      |   0
 .../TelemetryView/Setpoints/SetpointViewer.jsx      |   0
 .../Telemetry/TelemetryView/Setpoints/index.jsx     |   0
 src/pages/Telemetry/TelemetryView/UserOfWells.jsx   |   0
 src/pages/Telemetry/TelemetryView/index.jsx         |   0
 src/pages/Telemetry/index.jsx                       |   0
 .../TelemetryAnalysisDepthToDay.jsx                 |   0
 .../TelemetryAnalysisDepthToInterval.jsx            |   0
 .../TelemetryAnalysisOperationsSummary.jsx          |   0
 .../TelemetryAnalysisOperationsToInterval.jsx       |   0
 src/pages/TelemetryAnalysis/index.jsx               |   0
 src/pages/Well.jsx                                  |   0
 src/pages/WellOperations/DrillProcessFlow.jsx       |   0
 src/pages/WellOperations/ImportExportBar.jsx        |   0
 src/pages/WellOperations/ImportOperations.jsx       |   0
 src/pages/WellOperations/Tvd/AdditionalTables.jsx   |   0
 src/pages/WellOperations/Tvd/NetGraphExport.jsx     |   0
 src/pages/WellOperations/Tvd/NptTable.jsx           |   0
 src/pages/WellOperations/Tvd/index.jsx              |   0
 src/pages/WellOperations/WellDrillParams.jsx        |   0
 src/pages/WellOperations/WellOperationsEditor.jsx   |   0
 src/pages/WellOperations/WellSectionsStat.jsx       |   0
 src/pages/WellOperations/index.jsx                  |   0
 src/react-app-env.d.ts                              |   0
 src/reportWebVitals.js                              |   0
 src/services/AutoGenerateApi.md                     |   0
 src/services/UidGenerator.ts                        |   0
 src/services/signalr/index.ts                       |   0
 src/styles/App.less                                 |   0
 src/styles/charts.less                              |   0
 src/styles/components/telemetry_select.less         |   0
 src/styles/display.css                              |   0
 src/styles/drilling_program.less                    |   0
 src/styles/equipment_details.css                    |   0
 src/styles/index.css                                |   0
 src/styles/loader.css                               |   0
 src/styles/measure.css                              |   0
 src/styles/message.css                              |   0
 src/styles/message_telemetry.css                    |   0
 src/styles/smbo.css                                 |   0
 src/styles/statistics.less                          |   0
 src/styles/tvd.less                                 |   0
 src/styles/wellTreeSelect.css                       |   0
 src/utils/datetime.ts                               |   0
 src/utils/functions.tsx                             |   0
 src/utils/index.ts                                  |   0
 src/utils/permissions.ts                            |   0
 src/utils/storage.ts                                |   0
 src/utils/string.ts                                 |   0
 src/utils/table.ts                                  |   0
 src/utils/table_settings.ts                         |   0
 src/utils/validationRules.ts                        |   0
 tsconfig.json                                       |   0
 tsconfig.paths.json                                 |   0
 208 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .vscode/launch.json
 mode change 100644 => 100755 .vscode/settings.json
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 TODO.md
 mode change 100644 => 100755 concept/ImagesSrc/logo_32_Asb.png
 mode change 100644 => 100755 concept/ImagesSrc/logo_32_naftagaz.png
 mode change 100644 => 100755 concept/ImagesSrc/logo_Asb.svg
 mode change 100644 => 100755 concept/SludgeDiagram.jsx
 mode change 100644 => 100755 concept/Smbo/EquipmentDetails.jsx
 mode change 100644 => 100755 concept/Smbo/SmboPlate.jsx
 mode change 100644 => 100755 concept/Smbo/images/RigPlan2.png
 mode change 100644 => 100755 concept/Smbo/images/TopDrive_Dummy.png
 mode change 100644 => 100755 concept/Smbo/index.jsx
 mode change 100644 => 100755 concept/TelemetryAnalysis.jsx
 mode change 100644 => 100755 concept/WellStat.jsx
 mode change 100644 => 100755 concept/WellTelemetryAnalysis.jsx
 mode change 100644 => 100755 concept/readme.md
 mode change 100644 => 100755 craco.config.js
 mode change 100644 => 100755 doc/MSE_and_torqueStab_info.txt
 mode change 100644 => 100755 package-lock.json
 mode change 100644 => 100755 package.json
 mode change 100644 => 100755 public/favicon.ico
 mode change 100644 => 100755 public/images/logo_32.png
 mode change 100644 => 100755 public/index.html
 mode change 100644 => 100755 public/manifest.json
 mode change 100644 => 100755 public/robots.txt
 mode change 100644 => 100755 src/App.js
 mode change 100644 => 100755 src/components/AnalysisOperationTime.jsx
 mode change 100644 => 100755 src/components/ChangePassword.tsx
 mode change 100644 => 100755 src/components/Display.jsx
 mode change 100644 => 100755 src/components/DownloadLink.tsx
 mode change 100644 => 100755 src/components/ErrorFetch.js
 mode change 100644 => 100755 src/components/Grid.tsx
 mode change 100644 => 100755 src/components/Layout/AdminLayoutPortal.tsx
 mode change 100644 => 100755 src/components/Layout/LayoutPortal.tsx
 mode change 100644 => 100755 src/components/Layout/index.ts
 mode change 100644 => 100755 src/components/LoaderPortal.tsx
 mode change 100644 => 100755 src/components/PageHeader.tsx
 mode change 100644 => 100755 src/components/Private/PrivateContent.tsx
 mode change 100644 => 100755 src/components/Private/PrivateDefaultRoute.tsx
 mode change 100644 => 100755 src/components/Private/PrivateMenuItem.tsx
 mode change 100644 => 100755 src/components/Private/PrivateRoute.tsx
 mode change 100644 => 100755 src/components/Private/index.ts
 mode change 100644 => 100755 src/components/Table/Columns/date.tsx
 mode change 100644 => 100755 src/components/Table/Columns/index.ts
 mode change 100644 => 100755 src/components/Table/Columns/numeric.tsx
 mode change 100644 => 100755 src/components/Table/Columns/plan_fact.tsx
 mode change 100644 => 100755 src/components/Table/Columns/select.tsx
 mode change 100644 => 100755 src/components/Table/Columns/tag.tsx
 mode change 100644 => 100755 src/components/Table/Columns/text.tsx
 mode change 100644 => 100755 src/components/Table/Columns/timezone.tsx
 mode change 100644 => 100755 src/components/Table/DatePickerWrapper.tsx
 mode change 100644 => 100755 src/components/Table/DateRangeWrapper.tsx
 mode change 100644 => 100755 src/components/Table/EditableCell.tsx
 mode change 100644 => 100755 src/components/Table/EditableTable.jsx
 mode change 100644 => 100755 src/components/Table/Table.tsx
 mode change 100644 => 100755 src/components/Table/TableSettingsChanger.tsx
 mode change 100644 => 100755 src/components/Table/index.tsx
 mode change 100644 => 100755 src/components/Table/sorters.ts
 mode change 100644 => 100755 src/components/UploadForm.jsx
 mode change 100644 => 100755 src/components/UserMenu.tsx
 mode change 100644 => 100755 src/components/charts/ChartOperationTime.jsx
 mode change 100644 => 100755 src/components/charts/ChartOperationTimeBase.tsx
 mode change 100644 => 100755 src/components/charts/ChartTelemetryDepthToDay.jsx
 mode change 100644 => 100755 src/components/charts/ChartTelemetryDepthToInterval.jsx
 mode change 100644 => 100755 src/components/charts/ChartTelemetryOperationsSummary.jsx
 mode change 100644 => 100755 src/components/charts/ChartTimeBase.tsx
 mode change 100644 => 100755 src/components/charts/Column.tsx
 mode change 100644 => 100755 src/components/factory.ts
 mode change 100644 => 100755 src/components/icons/Loader.tsx
 mode change 100644 => 100755 src/components/icons/PointerIcon.tsx
 mode change 100644 => 100755 src/components/icons/WellIcon.tsx
 mode change 100644 => 100755 src/components/icons/index.ts
 mode change 100644 => 100755 src/components/selectors/PeriodPicker.tsx
 mode change 100644 => 100755 src/components/selectors/Poprompt.tsx
 mode change 100644 => 100755 src/components/selectors/TelemetrySelect.tsx
 mode change 100644 => 100755 src/components/selectors/WellSelector.jsx
 mode change 100644 => 100755 src/components/selectors/WellTreeSelector.tsx
 mode change 100644 => 100755 src/components/views/CompanyView.tsx
 mode change 100644 => 100755 src/components/views/PermissionView.tsx
 mode change 100644 => 100755 src/components/views/RoleView.tsx
 mode change 100644 => 100755 src/components/views/TelemetryView.tsx
 mode change 100644 => 100755 src/components/views/UserView.tsx
 mode change 100644 => 100755 src/components/views/index.ts
 mode change 100644 => 100755 src/context/Context.js
 mode change 100644 => 100755 src/images/ClusterIcon.svg
 mode change 100644 => 100755 src/images/DempherOff.png
 mode change 100644 => 100755 src/images/DempherOn.png
 mode change 100644 => 100755 src/images/DepositIcon.svg
 mode change 100644 => 100755 src/images/Logo.tsx
 mode change 100644 => 100755 src/images/SpinDisabled.png
 mode change 100644 => 100755 src/images/SpinEnabled.png
 mode change 100644 => 100755 src/images/las.png
 mode change 100644 => 100755 src/index.js
 mode change 100644 => 100755 src/pages/AccessDenied.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/ClusterController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/CompanyController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/CompanyTypeController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/DepositController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/PermissionController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/RoleController.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/Telemetry/index.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/UserController/RoleTag.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/UserController/index.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/VisitLog.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/WellController/index.jsx
 mode change 100644 => 100755 src/pages/AdminPanel/index.jsx
 mode change 100644 => 100755 src/pages/Analytics/Statistics.jsx
 mode change 100644 => 100755 src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
 mode change 100644 => 100755 src/pages/Analytics/WellCompositeEditor/index.jsx
 mode change 100644 => 100755 src/pages/Analytics/index.jsx
 mode change 100644 => 100755 src/pages/Archive/ArchiveColumn.jsx
 mode change 100644 => 100755 src/pages/Archive/ArchiveDisplay.jsx
 mode change 100644 => 100755 src/pages/Archive/index.jsx
 mode change 100644 => 100755 src/pages/Cluster/ClusterWells.jsx
 mode change 100644 => 100755 src/pages/Cluster/WellOperationsTable.jsx
 mode change 100644 => 100755 src/pages/Cluster/index.jsx
 mode change 100644 => 100755 src/pages/Deposit.jsx
 mode change 100644 => 100755 src/pages/Documents/DocumentsTemplate.jsx
 mode change 100644 => 100755 src/pages/Documents/index.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/CategoryAdder.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/CategoryEditor.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/CategoryHistory.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/CategoryRender.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/MarksCard.jsx
 mode change 100644 => 100755 src/pages/DrillingProgram/index.jsx
 mode change 100644 => 100755 src/pages/Login.jsx
 mode change 100644 => 100755 src/pages/Main.jsx
 mode change 100644 => 100755 src/pages/Measure/InclinometryTable.jsx
 mode change 100644 => 100755 src/pages/Measure/MeasureTable.jsx
 mode change 100644 => 100755 src/pages/Measure/View.jsx
 mode change 100644 => 100755 src/pages/Measure/columnsCommon.js
 mode change 100644 => 100755 src/pages/Measure/drillingFluidData.js
 mode change 100644 => 100755 src/pages/Measure/index.jsx
 mode change 100644 => 100755 src/pages/Measure/mudDiagramData.js
 mode change 100644 => 100755 src/pages/Measure/nnbData.js
 mode change 100644 => 100755 src/pages/Register.jsx
 mode change 100644 => 100755 src/pages/Report/ReportCreationNotify.jsx
 mode change 100644 => 100755 src/pages/Report/Reports.jsx
 mode change 100644 => 100755 src/pages/Report/index.jsx
 mode change 100644 => 100755 src/pages/SuspenseFallback.tsx
 mode change 100644 => 100755 src/pages/Telemetry/Archive/ArchiveColumn.jsx
 mode change 100644 => 100755 src/pages/Telemetry/Archive/ArchiveDisplay.jsx
 mode change 100644 => 100755 src/pages/Telemetry/Archive/index.jsx
 mode change 100644 => 100755 src/pages/Telemetry/Messages.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/CustomColumn.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/ModeDisplay.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/RigMnemo.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/UserOfWells.jsx
 mode change 100644 => 100755 src/pages/Telemetry/TelemetryView/index.jsx
 mode change 100644 => 100755 src/pages/Telemetry/index.jsx
 mode change 100644 => 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
 mode change 100644 => 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
 mode change 100644 => 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
 mode change 100644 => 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
 mode change 100644 => 100755 src/pages/TelemetryAnalysis/index.jsx
 mode change 100644 => 100755 src/pages/Well.jsx
 mode change 100644 => 100755 src/pages/WellOperations/DrillProcessFlow.jsx
 mode change 100644 => 100755 src/pages/WellOperations/ImportExportBar.jsx
 mode change 100644 => 100755 src/pages/WellOperations/ImportOperations.jsx
 mode change 100644 => 100755 src/pages/WellOperations/Tvd/AdditionalTables.jsx
 mode change 100644 => 100755 src/pages/WellOperations/Tvd/NetGraphExport.jsx
 mode change 100644 => 100755 src/pages/WellOperations/Tvd/NptTable.jsx
 mode change 100644 => 100755 src/pages/WellOperations/Tvd/index.jsx
 mode change 100644 => 100755 src/pages/WellOperations/WellDrillParams.jsx
 mode change 100644 => 100755 src/pages/WellOperations/WellOperationsEditor.jsx
 mode change 100644 => 100755 src/pages/WellOperations/WellSectionsStat.jsx
 mode change 100644 => 100755 src/pages/WellOperations/index.jsx
 mode change 100644 => 100755 src/react-app-env.d.ts
 mode change 100644 => 100755 src/reportWebVitals.js
 mode change 100644 => 100755 src/services/AutoGenerateApi.md
 mode change 100644 => 100755 src/services/UidGenerator.ts
 mode change 100644 => 100755 src/services/signalr/index.ts
 mode change 100644 => 100755 src/styles/App.less
 mode change 100644 => 100755 src/styles/charts.less
 mode change 100644 => 100755 src/styles/components/telemetry_select.less
 mode change 100644 => 100755 src/styles/display.css
 mode change 100644 => 100755 src/styles/drilling_program.less
 mode change 100644 => 100755 src/styles/equipment_details.css
 mode change 100644 => 100755 src/styles/index.css
 mode change 100644 => 100755 src/styles/loader.css
 mode change 100644 => 100755 src/styles/measure.css
 mode change 100644 => 100755 src/styles/message.css
 mode change 100644 => 100755 src/styles/message_telemetry.css
 mode change 100644 => 100755 src/styles/smbo.css
 mode change 100644 => 100755 src/styles/statistics.less
 mode change 100644 => 100755 src/styles/tvd.less
 mode change 100644 => 100755 src/styles/wellTreeSelect.css
 mode change 100644 => 100755 src/utils/datetime.ts
 mode change 100644 => 100755 src/utils/functions.tsx
 mode change 100644 => 100755 src/utils/index.ts
 mode change 100644 => 100755 src/utils/permissions.ts
 mode change 100644 => 100755 src/utils/storage.ts
 mode change 100644 => 100755 src/utils/string.ts
 mode change 100644 => 100755 src/utils/table.ts
 mode change 100644 => 100755 src/utils/table_settings.ts
 mode change 100644 => 100755 src/utils/validationRules.ts
 mode change 100644 => 100755 tsconfig.json
 mode change 100644 => 100755 tsconfig.paths.json

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.vscode/launch.json b/.vscode/launch.json
old mode 100644
new mode 100755
diff --git a/.vscode/settings.json b/.vscode/settings.json
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/TODO.md b/TODO.md
old mode 100644
new mode 100755
diff --git a/concept/ImagesSrc/logo_32_Asb.png b/concept/ImagesSrc/logo_32_Asb.png
old mode 100644
new mode 100755
diff --git a/concept/ImagesSrc/logo_32_naftagaz.png b/concept/ImagesSrc/logo_32_naftagaz.png
old mode 100644
new mode 100755
diff --git a/concept/ImagesSrc/logo_Asb.svg b/concept/ImagesSrc/logo_Asb.svg
old mode 100644
new mode 100755
diff --git a/concept/SludgeDiagram.jsx b/concept/SludgeDiagram.jsx
old mode 100644
new mode 100755
diff --git a/concept/Smbo/EquipmentDetails.jsx b/concept/Smbo/EquipmentDetails.jsx
old mode 100644
new mode 100755
diff --git a/concept/Smbo/SmboPlate.jsx b/concept/Smbo/SmboPlate.jsx
old mode 100644
new mode 100755
diff --git a/concept/Smbo/images/RigPlan2.png b/concept/Smbo/images/RigPlan2.png
old mode 100644
new mode 100755
diff --git a/concept/Smbo/images/TopDrive_Dummy.png b/concept/Smbo/images/TopDrive_Dummy.png
old mode 100644
new mode 100755
diff --git a/concept/Smbo/index.jsx b/concept/Smbo/index.jsx
old mode 100644
new mode 100755
diff --git a/concept/TelemetryAnalysis.jsx b/concept/TelemetryAnalysis.jsx
old mode 100644
new mode 100755
diff --git a/concept/WellStat.jsx b/concept/WellStat.jsx
old mode 100644
new mode 100755
diff --git a/concept/WellTelemetryAnalysis.jsx b/concept/WellTelemetryAnalysis.jsx
old mode 100644
new mode 100755
diff --git a/concept/readme.md b/concept/readme.md
old mode 100644
new mode 100755
diff --git a/craco.config.js b/craco.config.js
old mode 100644
new mode 100755
diff --git a/doc/MSE_and_torqueStab_info.txt b/doc/MSE_and_torqueStab_info.txt
old mode 100644
new mode 100755
diff --git a/package-lock.json b/package-lock.json
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
old mode 100644
new mode 100755
diff --git a/public/favicon.ico b/public/favicon.ico
old mode 100644
new mode 100755
diff --git a/public/images/logo_32.png b/public/images/logo_32.png
old mode 100644
new mode 100755
diff --git a/public/index.html b/public/index.html
old mode 100644
new mode 100755
diff --git a/public/manifest.json b/public/manifest.json
old mode 100644
new mode 100755
diff --git a/public/robots.txt b/public/robots.txt
old mode 100644
new mode 100755
diff --git a/src/App.js b/src/App.js
old mode 100644
new mode 100755
diff --git a/src/components/AnalysisOperationTime.jsx b/src/components/AnalysisOperationTime.jsx
old mode 100644
new mode 100755
diff --git a/src/components/ChangePassword.tsx b/src/components/ChangePassword.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Display.jsx b/src/components/Display.jsx
old mode 100644
new mode 100755
diff --git a/src/components/DownloadLink.tsx b/src/components/DownloadLink.tsx
old mode 100644
new mode 100755
diff --git a/src/components/ErrorFetch.js b/src/components/ErrorFetch.js
old mode 100644
new mode 100755
diff --git a/src/components/Grid.tsx b/src/components/Grid.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Layout/AdminLayoutPortal.tsx b/src/components/Layout/AdminLayoutPortal.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Layout/LayoutPortal.tsx b/src/components/Layout/LayoutPortal.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Layout/index.ts b/src/components/Layout/index.ts
old mode 100644
new mode 100755
diff --git a/src/components/LoaderPortal.tsx b/src/components/LoaderPortal.tsx
old mode 100644
new mode 100755
diff --git a/src/components/PageHeader.tsx b/src/components/PageHeader.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Private/PrivateContent.tsx b/src/components/Private/PrivateContent.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Private/PrivateDefaultRoute.tsx b/src/components/Private/PrivateDefaultRoute.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Private/PrivateMenuItem.tsx b/src/components/Private/PrivateMenuItem.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Private/PrivateRoute.tsx b/src/components/Private/PrivateRoute.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Private/index.ts b/src/components/Private/index.ts
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/date.tsx b/src/components/Table/Columns/date.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/index.ts b/src/components/Table/Columns/index.ts
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/numeric.tsx b/src/components/Table/Columns/numeric.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/plan_fact.tsx b/src/components/Table/Columns/plan_fact.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/select.tsx b/src/components/Table/Columns/select.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/tag.tsx b/src/components/Table/Columns/tag.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/text.tsx b/src/components/Table/Columns/text.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Columns/timezone.tsx b/src/components/Table/Columns/timezone.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/DatePickerWrapper.tsx b/src/components/Table/DatePickerWrapper.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/DateRangeWrapper.tsx b/src/components/Table/DateRangeWrapper.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/EditableCell.tsx b/src/components/Table/EditableCell.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/EditableTable.jsx b/src/components/Table/EditableTable.jsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/TableSettingsChanger.tsx b/src/components/Table/TableSettingsChanger.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
old mode 100644
new mode 100755
diff --git a/src/components/Table/sorters.ts b/src/components/Table/sorters.ts
old mode 100644
new mode 100755
diff --git a/src/components/UploadForm.jsx b/src/components/UploadForm.jsx
old mode 100644
new mode 100755
diff --git a/src/components/UserMenu.tsx b/src/components/UserMenu.tsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartOperationTime.jsx b/src/components/charts/ChartOperationTime.jsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartOperationTimeBase.tsx b/src/components/charts/ChartOperationTimeBase.tsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartTelemetryDepthToDay.jsx b/src/components/charts/ChartTelemetryDepthToDay.jsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartTelemetryDepthToInterval.jsx b/src/components/charts/ChartTelemetryDepthToInterval.jsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartTelemetryOperationsSummary.jsx b/src/components/charts/ChartTelemetryOperationsSummary.jsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/ChartTimeBase.tsx b/src/components/charts/ChartTimeBase.tsx
old mode 100644
new mode 100755
diff --git a/src/components/charts/Column.tsx b/src/components/charts/Column.tsx
old mode 100644
new mode 100755
diff --git a/src/components/factory.ts b/src/components/factory.ts
old mode 100644
new mode 100755
diff --git a/src/components/icons/Loader.tsx b/src/components/icons/Loader.tsx
old mode 100644
new mode 100755
diff --git a/src/components/icons/PointerIcon.tsx b/src/components/icons/PointerIcon.tsx
old mode 100644
new mode 100755
diff --git a/src/components/icons/WellIcon.tsx b/src/components/icons/WellIcon.tsx
old mode 100644
new mode 100755
diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
old mode 100644
new mode 100755
diff --git a/src/components/selectors/PeriodPicker.tsx b/src/components/selectors/PeriodPicker.tsx
old mode 100644
new mode 100755
diff --git a/src/components/selectors/Poprompt.tsx b/src/components/selectors/Poprompt.tsx
old mode 100644
new mode 100755
diff --git a/src/components/selectors/TelemetrySelect.tsx b/src/components/selectors/TelemetrySelect.tsx
old mode 100644
new mode 100755
diff --git a/src/components/selectors/WellSelector.jsx b/src/components/selectors/WellSelector.jsx
old mode 100644
new mode 100755
diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/CompanyView.tsx b/src/components/views/CompanyView.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/PermissionView.tsx b/src/components/views/PermissionView.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/RoleView.tsx b/src/components/views/RoleView.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/TelemetryView.tsx b/src/components/views/TelemetryView.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/UserView.tsx b/src/components/views/UserView.tsx
old mode 100644
new mode 100755
diff --git a/src/components/views/index.ts b/src/components/views/index.ts
old mode 100644
new mode 100755
diff --git a/src/context/Context.js b/src/context/Context.js
old mode 100644
new mode 100755
diff --git a/src/images/ClusterIcon.svg b/src/images/ClusterIcon.svg
old mode 100644
new mode 100755
diff --git a/src/images/DempherOff.png b/src/images/DempherOff.png
old mode 100644
new mode 100755
diff --git a/src/images/DempherOn.png b/src/images/DempherOn.png
old mode 100644
new mode 100755
diff --git a/src/images/DepositIcon.svg b/src/images/DepositIcon.svg
old mode 100644
new mode 100755
diff --git a/src/images/Logo.tsx b/src/images/Logo.tsx
old mode 100644
new mode 100755
diff --git a/src/images/SpinDisabled.png b/src/images/SpinDisabled.png
old mode 100644
new mode 100755
diff --git a/src/images/SpinEnabled.png b/src/images/SpinEnabled.png
old mode 100644
new mode 100755
diff --git a/src/images/las.png b/src/images/las.png
old mode 100644
new mode 100755
diff --git a/src/index.js b/src/index.js
old mode 100644
new mode 100755
diff --git a/src/pages/AccessDenied.jsx b/src/pages/AccessDenied.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/ClusterController.jsx b/src/pages/AdminPanel/ClusterController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/CompanyController.jsx b/src/pages/AdminPanel/CompanyController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/CompanyTypeController.jsx b/src/pages/AdminPanel/CompanyTypeController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/DepositController.jsx b/src/pages/AdminPanel/DepositController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/PermissionController.jsx b/src/pages/AdminPanel/PermissionController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/RoleController.jsx b/src/pages/AdminPanel/RoleController.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx b/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/Telemetry/index.jsx b/src/pages/AdminPanel/Telemetry/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/UserController/RoleTag.jsx b/src/pages/AdminPanel/UserController/RoleTag.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/UserController/index.jsx b/src/pages/AdminPanel/UserController/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/VisitLog.jsx b/src/pages/AdminPanel/VisitLog.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/WellController/index.jsx b/src/pages/AdminPanel/WellController/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/AdminPanel/index.jsx b/src/pages/AdminPanel/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Analytics/Statistics.jsx b/src/pages/Analytics/Statistics.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Analytics/index.jsx b/src/pages/Analytics/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Archive/ArchiveColumn.jsx b/src/pages/Archive/ArchiveColumn.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Archive/ArchiveDisplay.jsx b/src/pages/Archive/ArchiveDisplay.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Archive/index.jsx b/src/pages/Archive/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Cluster/WellOperationsTable.jsx b/src/pages/Cluster/WellOperationsTable.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Cluster/index.jsx b/src/pages/Cluster/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Deposit.jsx b/src/pages/Deposit.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Documents/index.jsx b/src/pages/Documents/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/CategoryAdder.jsx b/src/pages/DrillingProgram/CategoryAdder.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/CategoryEditor.jsx b/src/pages/DrillingProgram/CategoryEditor.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/MarksCard.jsx b/src/pages/DrillingProgram/MarksCard.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Main.jsx b/src/pages/Main.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/InclinometryTable.jsx b/src/pages/Measure/InclinometryTable.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/View.jsx b/src/pages/Measure/View.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/columnsCommon.js b/src/pages/Measure/columnsCommon.js
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/drillingFluidData.js b/src/pages/Measure/drillingFluidData.js
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/mudDiagramData.js b/src/pages/Measure/mudDiagramData.js
old mode 100644
new mode 100755
diff --git a/src/pages/Measure/nnbData.js b/src/pages/Measure/nnbData.js
old mode 100644
new mode 100755
diff --git a/src/pages/Register.jsx b/src/pages/Register.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Report/ReportCreationNotify.jsx b/src/pages/Report/ReportCreationNotify.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Report/Reports.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/SuspenseFallback.tsx b/src/pages/SuspenseFallback.tsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/Archive/ArchiveColumn.jsx b/src/pages/Telemetry/Archive/ArchiveColumn.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/Archive/ArchiveDisplay.jsx b/src/pages/Telemetry/Archive/ArchiveDisplay.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/Archive/index.jsx b/src/pages/Telemetry/Archive/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/Messages.jsx b/src/pages/Telemetry/Messages.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx b/src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/CustomColumn.jsx b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/ModeDisplay.jsx b/src/pages/Telemetry/TelemetryView/ModeDisplay.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx b/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/RigMnemo.jsx b/src/pages/Telemetry/TelemetryView/RigMnemo.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointViewer.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/UserOfWells.jsx b/src/pages/Telemetry/TelemetryView/UserOfWells.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/TelemetryAnalysis/index.jsx b/src/pages/TelemetryAnalysis/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/DrillProcessFlow.jsx b/src/pages/WellOperations/DrillProcessFlow.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/ImportExportBar.jsx b/src/pages/WellOperations/ImportExportBar.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/ImportOperations.jsx b/src/pages/WellOperations/ImportOperations.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/Tvd/AdditionalTables.jsx b/src/pages/WellOperations/Tvd/AdditionalTables.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/Tvd/NetGraphExport.jsx b/src/pages/WellOperations/Tvd/NetGraphExport.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/Tvd/NptTable.jsx b/src/pages/WellOperations/Tvd/NptTable.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/Tvd/index.jsx b/src/pages/WellOperations/Tvd/index.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx
old mode 100644
new mode 100755
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
old mode 100644
new mode 100755
diff --git a/src/reportWebVitals.js b/src/reportWebVitals.js
old mode 100644
new mode 100755
diff --git a/src/services/AutoGenerateApi.md b/src/services/AutoGenerateApi.md
old mode 100644
new mode 100755
diff --git a/src/services/UidGenerator.ts b/src/services/UidGenerator.ts
old mode 100644
new mode 100755
diff --git a/src/services/signalr/index.ts b/src/services/signalr/index.ts
old mode 100644
new mode 100755
diff --git a/src/styles/App.less b/src/styles/App.less
old mode 100644
new mode 100755
diff --git a/src/styles/charts.less b/src/styles/charts.less
old mode 100644
new mode 100755
diff --git a/src/styles/components/telemetry_select.less b/src/styles/components/telemetry_select.less
old mode 100644
new mode 100755
diff --git a/src/styles/display.css b/src/styles/display.css
old mode 100644
new mode 100755
diff --git a/src/styles/drilling_program.less b/src/styles/drilling_program.less
old mode 100644
new mode 100755
diff --git a/src/styles/equipment_details.css b/src/styles/equipment_details.css
old mode 100644
new mode 100755
diff --git a/src/styles/index.css b/src/styles/index.css
old mode 100644
new mode 100755
diff --git a/src/styles/loader.css b/src/styles/loader.css
old mode 100644
new mode 100755
diff --git a/src/styles/measure.css b/src/styles/measure.css
old mode 100644
new mode 100755
diff --git a/src/styles/message.css b/src/styles/message.css
old mode 100644
new mode 100755
diff --git a/src/styles/message_telemetry.css b/src/styles/message_telemetry.css
old mode 100644
new mode 100755
diff --git a/src/styles/smbo.css b/src/styles/smbo.css
old mode 100644
new mode 100755
diff --git a/src/styles/statistics.less b/src/styles/statistics.less
old mode 100644
new mode 100755
diff --git a/src/styles/tvd.less b/src/styles/tvd.less
old mode 100644
new mode 100755
diff --git a/src/styles/wellTreeSelect.css b/src/styles/wellTreeSelect.css
old mode 100644
new mode 100755
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
old mode 100644
new mode 100755
diff --git a/src/utils/functions.tsx b/src/utils/functions.tsx
old mode 100644
new mode 100755
diff --git a/src/utils/index.ts b/src/utils/index.ts
old mode 100644
new mode 100755
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
old mode 100644
new mode 100755
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
old mode 100644
new mode 100755
diff --git a/src/utils/string.ts b/src/utils/string.ts
old mode 100644
new mode 100755
diff --git a/src/utils/table.ts b/src/utils/table.ts
old mode 100644
new mode 100755
diff --git a/src/utils/table_settings.ts b/src/utils/table_settings.ts
old mode 100644
new mode 100755
diff --git a/src/utils/validationRules.ts b/src/utils/validationRules.ts
old mode 100644
new mode 100755
diff --git a/tsconfig.json b/tsconfig.json
old mode 100644
new mode 100755
diff --git a/tsconfig.paths.json b/tsconfig.paths.json
old mode 100644
new mode 100755

From 66ba02c14ab1f5acbc0f38d1227a499257eb7791 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 14:25:31 +0500
Subject: [PATCH 03/49] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=20=D1=85=D0=BE?=
 =?UTF-8?q?=D1=82=D1=84=D0=B8=D0=BA=D1=81=D0=B0=20=D0=BC=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 0d6e46d91f64c6ed3315c74a37327144e07c8c15 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 16:09:47 +0500
Subject: [PATCH 04/49] =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=81=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BC=D0=BE=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=8B,=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=BA=D0=BE=D0=BD=20=D1=81=D0=BE=D0=B3=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F/=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DrillingProgram/CategoryRender.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 50316be..d3a168e 100755
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -45,6 +45,8 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
     } = partData ?? {}
 
     const uploadUrl = useMemo(() => `/api/well/${idWell}/drillingProgram/part/${idFileCategory}`, [idWell, idFileCategory])
+    const approvedMarks = useMemo(() => file?.fileMarks?.filter((mark) => mark.idMarkType === 1), [file])
+    const rejectMarks = useMemo(() => file?.fileMarks?.filter((mark) => mark.idMarkType === 0), [file])
 
     const [isUploading, setIsUploading] = useState(false)
     const [isDeleting, setIsDeleting] = useState(false)
@@ -149,13 +151,13 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
                                     {permissionToApprove && (
                                         <CommentPrompt isRequired={false} text={'Согласовать'} title={'Согласование документа'} onDone={onApprove(true)} />
                                     )}
-                                    <MarksCard title={'Согласовано'} className={'approve_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 1)} />
+                                    <MarksCard title={'Список согласовавших'} className={'approve_panel'} marks={approvedMarks} />
                                 </div>
                                 <div className={'reject_list'}>
                                     {permissionToApprove && (
                                         <CommentPrompt text={'Отклонить'} title={'Отклонение документа'} onDone={onApprove(false)} />
                                     )}
-                                    <MarksCard title={'Отклонено'} className={'reject_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 0)} />
+                                    <MarksCard title={'Список отклонивших'} className={'reject_panel'} marks={rejectMarks} />
                                 </div>
                             </>
                         )}

From c44195229ed00dc4717813e4c277298bf4ecd75c Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 16:16:18 +0500
Subject: [PATCH 05/49] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BC=D0=B5=D1=82=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D0=B2=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=9F?=
 =?UTF-8?q?=D0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DrillingProgram/CategoryHistory.jsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx
index 2be6695..1df55ad 100755
--- a/src/pages/DrillingProgram/CategoryHistory.jsx
+++ b/src/pages/DrillingProgram/CategoryHistory.jsx
@@ -39,12 +39,15 @@ export const historyColumns = [
 
             return (
                 <div className={'history_approve_column'} >
-                    <div className={'approve_list'}>
-                        <MarksCard title={'Согласовано'} className={'approve_panel'} marks={approved} />
-                    </div>
-                    <div className={'reject_list'}>
-                        <MarksCard title={'Отклонено'} className={'reject_panel'} marks={rejected} />
-                    </div>
+                    {approved.length > 0 ? (
+                        <div className={'approve_list'}>
+                            <MarksCard title={'Список согласовавших'} className={'approve_panel'} marks={approved} />
+                        </div>
+                    ) : rejected.length > 0 ? (
+                        <div className={'reject_list'}>
+                            <MarksCard title={'Список отклонивших'} className={'reject_panel'} marks={rejected} />
+                        </div>
+                    ) : 'Нет отметок'}
                 </div>
             )
         }

From 54ada2298c8c6c46cb08737616999c9883c6544b Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 16:36:04 +0500
Subject: [PATCH 06/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=81=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=BC=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF.=20=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Analytics/WellCompositeEditor/WellCompositeSections.jsx  | 4 +++-
 src/pages/Analytics/WellCompositeEditor/index.jsx            | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 0c55a33..9dbe389 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -25,6 +25,8 @@ const filtersMinMax = [
   { text: 'max', value: 'max' },
 ]
 
+const sortBySectionId = (a, b) => a.sectionId - b.sectionId
+
 const filtersSectionsType = []
 const DAY_IN_MS = 1000 * 60 * 60 * 24
 
@@ -130,7 +132,7 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
     makeTextColumn('скв №', 'caption', null, null,
       (text, item) => <Link to={{ pathname: `/well/${item?.id}`, state: { from: location.pathname }}}>{text ?? '-'}</Link>
     ),
-    makeTextColumn('Секция', 'sectionType', filtersSectionsType, null, (text) => text ?? '-'),
+    makeTextColumn('Секция', 'sectionType', filtersSectionsType, sortBySectionId, (text) => text ?? '-'),
     makeNumericColumnPlanFact('Глубина, м', 'sectionWellDepth', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('Продолжительность, ч', 'sectionBuildDays', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('МСП, м/ч', 'sectionRateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
index cd2de0d..80f3534 100755
--- a/src/pages/Analytics/WellCompositeEditor/index.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/index.jsx
@@ -42,13 +42,14 @@ export const WellCompositeEditor = memo(({ idWell, rootPath }) => {
 
     useEffect(() => {
         const wellIds = selectedSections.map((value) => value.idWellSrc)
+            .filter((id, idx, arr) => arr.lastIndexOf(id) === idx)
         setSelectedIdWells(wellIds)
     }, [selectedSections])
 
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
-            const stats = await OperationStatService.getWellsStat(selectedIdWells)
-            setStatsWells(arrayOrDefault(stats))
+            const stats = arrayOrDefault(await OperationStatService.getWellsStat(selectedIdWells))
+            setStatsWells(stats)
         },
         setShowTabLoader,
         'Не удалось загрузить статистику по скважинам/секциям',

From 76d7ac9949158f737b8925550a509091158d47e9 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 17:03:04 +0500
Subject: [PATCH 07/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BF.=20=D1=81=D0=BA=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WellCompositeEditor/NewParamsTable.jsx    |  79 ++++++++++++++
 .../WellCompositeSections.jsx                 | 101 ++++--------------
 src/pages/WellOperations/WellDrillParams.jsx  |   8 +-
 3 files changed, 105 insertions(+), 83 deletions(-)
 create mode 100755 src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx

diff --git a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
new file mode 100755
index 0000000..6998087
--- /dev/null
+++ b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
@@ -0,0 +1,79 @@
+import { memo, useCallback, useEffect, useState } from 'react'
+import { Button, Modal, Popconfirm } from 'antd'
+
+import { Table } from '@components/Table'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { DrillParamsService } from '@api'
+
+import { getColumns } from '@pages/WellOperations/WellDrillParams'
+
+export const NewParamsTable = memo(({ idWell, selectedWellsKeys }) => {
+    const [params, setParams] = useState([])
+    const [paramsColumns, setParamsColumns] = useState([])
+    const [showParamsLoader, setShowParamsLoader] = useState(false)
+    const [isParamsModalVisible, setIsParamsModalVisible] = useState(false)
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => setParamsColumns(await getColumns(idWell))
+    ), [idWell])
+
+    useEffect(() => console.log(paramsColumns), [paramsColumns])
+
+    const onParamButtonClick = useCallback(() => invokeWebApiWrapperAsync(
+      async () => {
+        setIsParamsModalVisible(true)
+        const params = await DrillParamsService.getCompositeAll(idWell)
+        setParams(params)
+      },
+      setShowParamsLoader,
+      `Не удалось загрузить список режимов для скважины "${idWell}"`,
+      'Получение списка режимов скважины'
+    ), [idWell])
+
+    const onParamsAddClick = useCallback(() => invokeWebApiWrapperAsync(
+      async () => {
+        await DrillParamsService.save(idWell, params)
+        setIsParamsModalVisible(false)
+      },
+      setShowParamsLoader,
+      `Не удалось добавить режимы в список скважины "${idWell}"`,
+      'Добавление режима скважины'
+    ), [idWell, params])
+
+    return (
+        <>
+            <Button
+                size={'large'}
+                disabled={selectedWellsKeys.length <= 0}
+                onClick={onParamButtonClick}
+            >
+                Заполнить режимы текущей скважины
+            </Button>
+            <Modal
+                title={'Заполнить режимы текущей скважины'}
+                centered
+                visible={isParamsModalVisible}
+                onCancel={() => setIsParamsModalVisible(false)}
+                width={1700}
+                footer={(
+                    <Popconfirm title={'Заменить существующие режимы выбранными?'} onConfirm={onParamsAddClick}>
+                        <Button size={'large'} disabled={params.length <= 0}>Сохранить</Button>
+                    </Popconfirm>
+                )}
+            >
+                <LoaderPortal show={showParamsLoader}>
+                    <Table
+                        bordered
+                        size={'small'}
+                        columns={paramsColumns}
+                        dataSource={params}
+                        pagination={false}
+                    />
+                </LoaderPortal>
+            </Modal>
+        </>
+    )
+})
+
+export default NewParamsTable
diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 9dbe389..7e1505a 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -1,13 +1,13 @@
 import { Link, useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useCallback, useMemo } from 'react'
+import { useState, useEffect, memo, useMemo } from 'react'
 import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
-import { Table, Tag, Button, Badge, Divider, Modal, Row, Col, Popconfirm } from 'antd'
+import { Table, Tag, Button, Badge, Divider, Modal, Row, Col } from 'antd'
 
 import { CompanyView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
-import { DrillParamsService, WellCompositeService } from '@api'
+import { WellCompositeService } from '@api'
 import { hasPermission } from '@utils/permissions'
 import {
   calcAndUpdateStatsBySections,
@@ -16,9 +16,8 @@ import {
 } from '@utils/functions'
 
 import { Tvd } from '@pages/WellOperations/Tvd'
-import { getColumns } from '@pages/WellOperations/WellDrillParams'
 import WellOperationsTable from '@pages/Cluster/WellOperationsTable'
-
+import NewParamsTable from './NewParamsTable'
 
 const filtersMinMax = [
   { text: 'min', value: 'min' },
@@ -31,17 +30,13 @@ const filtersSectionsType = []
 const DAY_IN_MS = 1000 * 60 * 60 * 24
 
 export const WellCompositeSections = memo(({ idWell, statsWells, selectedSections }) => {
-  const [params, setParams] = useState([])
   const [selectedWells, setSelectedWells] = useState([])
   const [wellOperations, setWellOperations] = useState([])
   const [selectedWellsKeys, setSelectedWellsKeys] = useState([])
   const [selectedWellId, setSelectedWellId] = useState(0)
   const [showLoader, setShowLoader] = useState(false)
-  const [showParamsLoader, setShowParamsLoader] = useState(false)
   const [isTVDModalVisible, setIsTVDModalVisible] = useState(false)
   const [isOpsModalVisible, setIsOpsModalVisible] = useState(false)
-  const [isParamsModalVisible, setIsParamsModalVisible] = useState(false)
-  const [paramsColumns, setParamsColumns] = useState([])
 
   const location = useLocation()
 
@@ -103,10 +98,6 @@ 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(
@@ -128,6 +119,22 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
     setSelectedWellsKeys(selected.map((row) => row.key))
   }, [rows, selectedSections])
 
+  const rowSelection = useMemo(() => hasPermission('WellOperation.edit') && {
+    selectedRowKeys: selectedWellsKeys,
+    onChange: (keys, items) => invokeWebApiWrapperAsync(
+        async () => {
+            const selectedSections = items.map((row) => ({idWell, idWellSrc: row.id, idWellSectionType: row.sectionId}))
+            await WellCompositeService.save(idWell, selectedSections)
+
+            setSelectedWells(items)
+            setSelectedWellsKeys(keys)
+        },
+        setShowLoader,
+        `Не удалось сохранить изменения выбранных секций для композитной скважины "${idWell}"`,
+        'Изменение выбранных секций скважины'
+    )
+  }, [idWell, selectedWellsKeys])
+
   const columns = useMemo(() => [
     makeTextColumn('скв №', 'caption', null, null,
       (text, item) => <Link to={{ pathname: `/well/${item?.id}`, state: { from: location.pathname }}}>{text ?? '-'}</Link>
@@ -176,43 +183,6 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
     },
   ], [location.pathname])
 
-  const rowSelection = useMemo(() => hasPermission('WellOperation.edit') && {
-    selectedRowKeys: selectedWellsKeys,
-    onChange: (keys, items) => invokeWebApiWrapperAsync(
-      async () => {
-        const selectedSections = items.map((row) => ({idWell, idWellSrc: row.id, idWellSectionType: row.sectionId}))
-        await WellCompositeService.save(idWell, selectedSections)
-
-        setSelectedWells(items)
-        setSelectedWellsKeys(keys)
-      },
-      setShowParamsLoader,
-      `Не удалось сохранить изменения выбранных секций для композитной скважины "${idWell}"`,
-      'Изменение выбранных секций скважины'
-    )
-  }, [idWell, selectedWellsKeys])
-
-  const onParamButtonClick = useCallback(() => invokeWebApiWrapperAsync(
-    async () => {
-      setIsParamsModalVisible(true)
-      const params = await DrillParamsService.getCompositeAll(idWell)
-      setParams(params)
-    },
-    setShowParamsLoader,
-    `Не удалось загрузить список режимов для скважины "${idWell}"`,
-    'Получение списка режимов скважины'
-  ), [idWell])
-
-  const onParamsAddClick = useCallback(() => invokeWebApiWrapperAsync(
-    async () => {
-      await DrillParamsService.save(idWell, params)
-      setIsParamsModalVisible(false)
-    },
-    setShowLoader,
-    `Не удалось добавить режимы в список скважины "${idWell}"`,
-    'Добавление режима скважины'
-  ), [idWell, params])
-
   return (
     <>
       <Table
@@ -239,13 +209,7 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
       />
       <Row justify={'end'} style={{ margin: '1rem 0' }}>
         <Col>
-          <Button
-            size={'large'}
-            disabled={selectedWells.length <= 0}
-            onClick={onParamButtonClick}
-          >
-            Заполнить режимы текущей скважины
-          </Button>
+          <NewParamsTable idWell={idWell} selectedWellsKeys={selectedWellsKeys} />
         </Col>
       </Row>
 
@@ -272,29 +236,6 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
           <WellOperationsTable wellOperations={wellOperations} />
         </LoaderPortal>
       </Modal>
-
-      <Modal
-        title={'Заполнить режимы текущей скважины'}
-        centered
-        visible={isParamsModalVisible}
-        onCancel={() => setIsParamsModalVisible(false)}
-        width={1700}
-        footer={(
-          <Popconfirm title={'Заменить существующие режимы выбранными?'} onConfirm={onParamsAddClick}>
-            <Button size={'large'} disabled={params.length <= 0}>Сохранить</Button>
-          </Popconfirm>
-        )}
-      >
-        <LoaderPortal show={showParamsLoader}>
-          <Table
-            size={'small'}
-            bordered
-            columns={paramsColumns}
-            dataSource={params}
-            pagination={false}
-          />
-        </LoaderPortal>
-      </Modal>
     </>
   )
 })
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
index 8db51b6..b113209 100755
--- a/src/pages/WellOperations/WellDrillParams.jsx
+++ b/src/pages/WellOperations/WellDrillParams.jsx
@@ -5,6 +5,7 @@ import {
     makeSelectColumn,
     makeActionHandler,
     makeNumericAvgRange,
+    makeNumericSorter,
 } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -14,15 +15,16 @@ import { arrayOrDefault } from '@utils'
 
 export const getColumns = async (idWell) => {
     let sectionTypes = await WellOperationService.getSectionTypes(idWell)
-    sectionTypes = Object.keys(sectionTypes).map((id) => ({
-        label: sectionTypes[id],
-        value: id,
+    sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
+        label: value,
+        value: parseInt(id),
     }))
 
     return [
         makeSelectColumn('Конструкция секции','idWellSectionType', sectionTypes, null, {
             editable: true,
             width: 160,
+            sorter: makeNumericSorter('idWellSectionType'),
         }),
         makeNumericAvgRange('Нагрузка, т', 'axialLoad', 1),
         makeNumericAvgRange('Давление, атм', 'pressure', 1),

From 8107a4a3a5b202a77006a7c7a1cc42dbc240a3d7 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Tue, 29 Mar 2022 17:04:14 +0500
Subject: [PATCH 08/49] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=B8=D0=B9=20=D1=8D=D0=BA=D0=B7=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BB=D1=8F=D1=80=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Archive/ArchiveColumn.jsx  |  31 -----
 src/pages/Archive/ArchiveDisplay.jsx |  66 ----------
 src/pages/Archive/index.jsx          | 185 ---------------------------
 3 files changed, 282 deletions(-)
 delete mode 100755 src/pages/Archive/ArchiveColumn.jsx
 delete mode 100755 src/pages/Archive/ArchiveDisplay.jsx
 delete mode 100755 src/pages/Archive/index.jsx

diff --git a/src/pages/Archive/ArchiveColumn.jsx b/src/pages/Archive/ArchiveColumn.jsx
deleted file mode 100755
index 6f7ebfb..0000000
--- a/src/pages/Archive/ArchiveColumn.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { memo, useMemo } from 'react'
-
-import { Grid, GridItem } from '@components/Grid'
-import { Column } from '@components/charts/Column'
-
-export const ArchiveColumn = memo(({ lineGroup, data, interval, style, headerHeight, yStart }) => {
-  const lgws = useMemo(() => lineGroup.filter(cfg => !cfg.isShape), [lineGroup])
-  const pv = useMemo(() => lgws.filter(line => line.showLabels).map(line => ({
-    color: line.color,
-    label: line.label
-  })), [lgws])
-
-  return (
-    <div style={style}>
-      <Grid style={{ height: headerHeight, margin: 0 }}>
-        {pv?.map((v, idx) => (
-          <GridItem className={'display_chart_label'} key={idx} row={idx} col={1} style={{ color: v.color, padding: '0 8px' }}>{v.label}</GridItem>
-        ))}
-      </Grid>
-      <Column
-        data={data}
-        lineGroup={lgws}
-        interval={interval}
-        yDisplay={false}
-        yStart={yStart}
-      />
-    </div>
-  )
-})
-
-export default ArchiveColumn
diff --git a/src/pages/Archive/ArchiveDisplay.jsx b/src/pages/Archive/ArchiveDisplay.jsx
deleted file mode 100755
index c4bae7e..0000000
--- a/src/pages/Archive/ArchiveDisplay.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { memo, useMemo } from 'react'
-
-import { Grid, GridItem } from '@components/Grid'
-
-import { paramsGroups } from '@pages/TelemetryView'
-import { ArchiveColumn } from './ArchiveColumn'
-
-const interpolationSearch = (data, begin, end, accessor) => {
-    const fy = (i) => new Date(data[i]?.[accessor] ?? 0)
-    const fx = (y, b, e) => Math.round(b + (y - fy(b)) * (e - b) / (fy(e) - fy(b)))
-    const findIdx = (val, startIdx, c) => {
-        let x = startIdx
-        let endIdx = data.length - 1
-        if(val < fy(startIdx))
-          return startIdx
-        if(val > fy(endIdx))
-          return endIdx
-        for(let i = 0; i < c; i++){
-          x = fx(val, startIdx, endIdx)
-          if(fy(x) < val)
-            startIdx = x
-          else
-            endIdx = x
-          if ((startIdx === endIdx)||(fy(startIdx) === fy(endIdx)))
-            return x
-        }
-        return x
-      }
-      let x0 = findIdx(begin, 0, 5)
-      let x1 = findIdx(end, x0, 3)
-      return { start: x0, end: x1, count: x1 - x0 }
-}
-
-export const cutData = (data, beginDate, endDate) => {
-    if (data?.length > 0) {
-        let { start, end } = interpolationSearch(data, beginDate, endDate, 'date')
-        if (start > 0) start--
-        if (end + 1 < end.length) end++
-        return data.slice(start, end)
-    }
-    return data
-}
-
-export const ArchiveDisplay = memo(({data, startDate, interval, onWheel}) => {
-    const endDate = useMemo(() => new Date(+startDate + interval), [startDate, interval])
-    const chartData = useMemo(() => cutData(data, startDate, endDate), [data, startDate, endDate])
-
-    return (
-        <Grid onWheel={onWheel}>
-            {paramsGroups.map((group, index) => (
-                <GridItem col={index + 1} row={'1'} className={'border_small'} key={`${group.label}${index}`} style={{ padding: 0 }}>
-                    <ArchiveColumn
-                        style={{ width: '15vw' }}
-                        data={chartData}
-                        lineGroup={group}
-                        interval={interval}
-                        headerHeight={'50px'}
-                        yStart={startDate}
-                    />
-                </GridItem>
-            ))}
-        </Grid>
-    )
-})
-
-export default ArchiveDisplay
diff --git a/src/pages/Archive/index.jsx b/src/pages/Archive/index.jsx
deleted file mode 100755
index f969709..0000000
--- a/src/pages/Archive/index.jsx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* eslint-disable react-hooks/exhaustive-deps */
-import { useState, useEffect, memo, useCallback } from 'react'
-
-import { Flex } from '@components/Grid'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DatePickerWrapper, makeDateSorter } from '@components/Table'
-import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
-import { TelemetryDataSaubService } from '@api'
-
-import { normalizeData } from '@pages/TelemetryView'
-import { ArchiveDisplay, cutData } from './ArchiveDisplay'
-
-const DATA_COUNT = 2048 // Колличество точек на подгрузку графика
-const ADDITIVE_PAGES = 2 // Дополнительные данные для графиков
-const LOADING_TRIGGER = 0.5
-const WHEEL_SENSITIVITY = 1 / 530
-
-const getLoadingInterval = (loaded, startDate, interval) => {
-    // Если данные загружены и дата не заходит за тригер дозагрузка не требуется
-    if (
-        loaded &&
-        +startDate - interval * LOADING_TRIGGER > loaded.start &&
-        +startDate + interval * (LOADING_TRIGGER + 1) < loaded.end
-    )
-        return { loadingStartDate: startDate, newLoaded: loaded, loadingInterval: 0 }
-
-    let loadingStartDate = +startDate - interval * ADDITIVE_PAGES
-    let loadingEndDate = +startDate + interval * (ADDITIVE_PAGES + 1)
-
-    const newLoaded = {
-        start: loadingStartDate,
-        end: loadingEndDate
-    }
-
-    if (loaded) {
-        if (loadingStartDate >= loaded.start)
-            loadingStartDate = loaded.end
-        if (loadingEndDate <= loaded.end)
-            loadingEndDate = loaded.start
-        newLoaded.start = Math.min(loaded.start, loadingStartDate)
-        newLoaded.end = Math.max(loaded.end, loadingEndDate)
-    }
-
-    const loadingInterval = Math.trunc((loadingEndDate - loadingStartDate) / 1000)
-
-    return {
-        loadingStartDate: new Date(loadingStartDate),
-        newLoaded: {
-            start: new Date(newLoaded.start),
-            end: new Date(newLoaded.end)
-        },
-        loadingInterval
-    }
-}
-
-const range = (start, end) => {
-    const result = []
-    for (let i = start; i < end; i++)
-        result.push(i)
-    return result
-}
-
-export const Archive = memo(({ idWell }) => {
-    const [dataSaub, setDataSaub] = useState([])
-    const [dateLimit, setDateLimit] = useState({ from: 0, to: new Date() })
-    const [chartInterval, setChartInterval] = useState(parseInt(defaultPeriod) * 1000)
-    const [startDate, setStartDate] = useState(new Date(Date.now() - chartInterval))
-    const [showLoader, setShowLoader] = useState(false)
-    const [loaded, setLoaded] = useState(null)
-
-    const onGraphWheel = useCallback((e) => {
-        if (loaded && dateLimit.from && dateLimit.to) {
-            setStartDate((prevStartDate) => {
-                const offset = e.deltaY * chartInterval * WHEEL_SENSITIVITY
-                const nextStartDate = +prevStartDate + offset
-                const firstPossibleDate = Math.max(loaded.start, dateLimit.from)
-                const lastPossibleDate = Math.min(dateLimit.to, (loaded.end ?? Date.now())) - chartInterval
-                return new Date(Math.max(firstPossibleDate, Math.min(nextStartDate, lastPossibleDate)))
-            })
-        }
-    }, [loaded, dateLimit, chartInterval])
-
-    const isDateDisabled = useCallback((date) => {
-        if (!date) return false
-        const dt = new Date(date).setHours(0, 0, 0, 0)
-        return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
-    }, [dateLimit])
-
-    const isDateTimeDisabled = useCallback((date) => ({
-        disabledHours: () => range(0, 24).filter(h => {
-            if (!date) return false
-            const dt = +new Date(date).setHours(h)
-            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
-        }),
-        disabledMinutes: () => range(0, 60).filter(m => {
-            if (!date) return false
-            const dt = +new Date(date).setMinutes(m)
-            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
-        }),
-        disabledSeconds: () => range(0, 60).filter(s => {
-            if (!date) return false
-            const dt = +new Date(date).setSeconds(s)
-            return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
-        })
-    }), [dateLimit])
-
-    useEffect(() => invokeWebApiWrapperAsync(
-        async () => {
-            let dates = await TelemetryDataSaubService.getDataDatesRange(idWell)
-            dates = {
-                from: new Date(dates?.from ?? 0),
-                to: new Date(dates?.to ?? 0)
-            }
-            setDateLimit(dates)
-            setStartDate(new Date(Math.max(dates.from, +dates.to - chartInterval)))
-        },
-        setShowLoader,
-        `Не удалось загрузить диапозон телеметрии для скважины "${idWell}"`,
-        'Загрузка диапозона телеметрии'
-    ), [])
-
-    useEffect(() => {
-        setStartDate((startDate) => new Date(Math.min(Date.now() - chartInterval, startDate)))
-        setDataSaub([])
-    }, [chartInterval])
-
-    useEffect(() => {
-        if (showLoader) return
-        const { loadingStartDate, loadingInterval, newLoaded } = getLoadingInterval(loaded, startDate, chartInterval)
-        if (loadingInterval <= 0) return
-        invokeWebApiWrapperAsync(
-            async () => {
-                const data = await TelemetryDataSaubService.getData(idWell, loadingStartDate.toISOString(), loadingInterval, DATA_COUNT)
-
-                const loadedStartDate = new Date(Math.max(+newLoaded.start, +startDate - chartInterval * ADDITIVE_PAGES))
-                const loadedEndDate = new Date(Math.min(+newLoaded.end, +startDate + chartInterval * (ADDITIVE_PAGES + 1)))
-                setLoaded({ start: loadedStartDate, end: loadedEndDate })
-
-                if (data) {
-                    data.forEach(elm => elm.date = new Date(elm.date))
-                    setDataSaub((prevDataSaub) => {
-                        const newData = [...prevDataSaub, ...normalizeData(data)]
-                        newData.sort(makeDateSorter('date'))
-                        return cutData(newData, loadedStartDate, loadedEndDate)
-                    })
-                }
-
-            },
-            setShowLoader,
-            `Не удалось загрузить данные по скважине "${idWell}" c ${startDate.toISOString()} по ${new Date(+startDate + chartInterval).toISOString()}`,
-            'Загрузка телеметрий в диапозоне'
-        )
-    }, [idWell, chartInterval, loaded, startDate])
-
-    return (
-        <>
-            <Flex style={{margin: '8px 8px 0'}}>
-                <div>
-                    Начальная дата:&nbsp;
-                    <DatePickerWrapper
-                        value={startDate}
-                        disabledDate={isDateDisabled}
-                        disabledTime={isDateTimeDisabled}
-                        onChange={(startDate) => setStartDate(new Date(startDate))}
-                    />
-                </div>
-                <div style={{ marginLeft: '1rem' }}>
-                    Период:&nbsp;
-                    <PeriodPicker onChange={(val) => setChartInterval(val * 1000)} />
-                </div>
-            </Flex>
-            <LoaderPortal show={showLoader}>
-                <ArchiveDisplay
-                    data={dataSaub}
-                    startDate={startDate}
-                    interval={chartInterval}
-                    onWheel={onGraphWheel}
-                />
-            </LoaderPortal>
-        </>
-    )
-})
-
-export default Archive

From b94561aa62c00fcecfcf72ba461f3a248c669eb1 Mon Sep 17 00:00:00 2001
From: avsirotkin <av.sirotkin@autodrilling.ru>
Date: Tue, 5 Apr 2022 10:56:30 +0500
Subject: [PATCH 09/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login.jsx | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index ff53576..239cf08 100755
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -32,29 +32,31 @@ export const Login = memo(() => {
   ), [history, location])
 
   return (
-    <LoaderPortal show={showLoader} className={'loader-container login_page shadow'}>
+    <div className={'login_page shadow'}>
       <div style={{ display: 'flex', flexDirection: 'column' }}>
         <Logo style={{ marginBottom: '10px' }}/>
-        <Card title={'Система мониторинга'} className={'shadow'} bordered={true} style={{ width: 350 }}>
-          <Form onFinish={handleLogin}>
-            <Form.Item name={'login'} rules={loginRules}>
-              <Input placeholder={'Пользователь'} prefix={<UserOutlined />} />
-            </Form.Item>
-            <Form.Item name={'password'} rules={passwordRules}>
-              <Input.Password placeholder={'Пароль'} prefix={<LockOutlined />} />
-            </Form.Item>
-            <Form.Item>
-              <div className={'login-button'}>
-                <Button type={'primary'} htmlType={'submit'}>Вход</Button>
+        <LoaderPortal show={showLoader}>
+          <Card title={'Система мониторинга'} className={'shadow'} bordered={true} style={{ width: 350 }}>
+            <Form onFinish={handleLogin}>
+              <Form.Item name={'login'} rules={loginRules}>
+                <Input placeholder={'Пользователь'} prefix={<UserOutlined />} />
+              </Form.Item>
+              <Form.Item name={'password'} rules={passwordRules}>
+                <Input.Password placeholder={'Пароль'} prefix={<LockOutlined />} />
+              </Form.Item>
+              <Form.Item>
+                <div className={'login-button'}>
+                  <Button type={'primary'} htmlType={'submit'}>Вход</Button>
+                </div>
+              </Form.Item>
+              <div className={'text-align-center'}>
+                <Link to={`/register`}>Отправить заявку на регистрацию</Link>
               </div>
-            </Form.Item>
-            <div className={'text-align-center'}>
-              <Link to={`/register`}>Отправить заявку на регистрацию</Link>
-            </div>
-          </Form>
-        </Card>
+            </Form>
+          </Card>
+        </LoaderPortal>
       </div>
-    </LoaderPortal>
+    </div>
   )
 })
 

From fcb264b1228b2b50c25a0f89c1c1bc644d721469 Mon Sep 17 00:00:00 2001
From: avsirotkin <av.sirotkin@autodrilling.ru>
Date: Tue, 5 Apr 2022 11:25:57 +0500
Subject: [PATCH 10/49] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D1=81=D1=83?=
 =?UTF-8?q?=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=83=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Telemetry/TelemetryView/Setpoints/SetpointSender.jsx  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
index 0073b9d..12006ea 100755
--- a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
@@ -37,20 +37,19 @@ export const SetpointSender = memo(({ idWell, onClose, visible, setpointNames })
 
     const onAdd = useCallback(async (sp) => setSetpoints((prevSp) => {
         sp.key = Date.now()
-        prevSp.push(sp)
-        return prevSp
+        return [...prevSp, sp]
     }), [])
 
     const onEdit = useCallback(async (sp) => setSetpoints((prevSp) => {
         const idx = prevSp.findIndex((val) => val.key === sp.key)
         prevSp[idx] = sp
-        return prevSp
+        return [...prevSp]
     }), [])
 
     const onDelete = useCallback(async (sp) => setSetpoints((prevSp) => {
         const idx = prevSp.findIndex((val) => val.key === sp.key)
         prevSp.splice(idx, 1)
-        return prevSp
+        return [...prevSp]
     }), [])
 
     const onModalOk = useCallback(() => invokeWebApiWrapperAsync(
@@ -81,6 +80,7 @@ export const SetpointSender = memo(({ idWell, onClose, visible, setpointNames })
             onCancel={onClose}
             onOk={onModalOk}
             okText={'Отправить'}
+            okButtonProps={{ disabled: setpoints.length <= 0 }}
         >
             <LoaderPortal show={isLoading}>
                 <Grid>

From d37ceeb68feae6c05a83c96f8ae8417ead3e3460 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 12 Apr 2022 10:22:31 +0500
Subject: [PATCH 11/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
index 31991d9..c97333e 100755
--- a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
+++ b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
@@ -59,14 +59,13 @@ export const TelemetryMerger = memo(() => {
 
     const mergeTelemetry = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
-            await new Promise(res => setTimeout(res, 1000))
-            /// await AdminTelemetryService.mergeTelemetries(secondary.id, primary.id)
+            await AdminTelemetryService.mergeTelemetries(secondary.id, primary.id)
             await updateTelemetry()
         },
         setIsMerging,
         'Не удалось объединить телеметрии',
         'Объединение телеметрий',
-    ), [updateTelemetry])
+    ), [updateTelemetry, secondary.id, primary.id])
 
     useEffect(() => updateTelemetry(), [updateTelemetry])
 
@@ -76,7 +75,6 @@ export const TelemetryMerger = memo(() => {
         const secondaryId = parseInt(query.get('secondary') ?? null)
         const primary = isNaN(primaryId) ? null : telemetry.find((t) => t.id === primaryId)
         const secondary = isNaN(secondaryId) ? null : telemetry.find((t) => t.id === secondaryId)
-        console.log([primary, secondary])
         setPrimary(primary)
         setSecondary(secondary)
     }, [location, telemetry])

From dd781e41d32048dcba1d5d5e653e9f18a22c95d7 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 12 Apr 2022 10:23:03 +0500
Subject: [PATCH 12/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BD=D0=BE=D1=81=D0=BA=D0=B0=20"?=
 =?UTF-8?q?=D0=A2=D0=B0=D0=BB=D0=B5=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=82"=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D1=83=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B3=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/views/WirelineView.tsx         | 50 +++++++++++++++++++
 src/components/views/index.ts                 |  4 +-
 .../TelemetryView/WirelineRunOut.jsx          | 35 +++++++++++++
 src/pages/Telemetry/TelemetryView/index.jsx   |  2 +
 4 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 src/components/views/WirelineView.tsx
 create mode 100644 src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx

diff --git a/src/components/views/WirelineView.tsx b/src/components/views/WirelineView.tsx
new file mode 100644
index 0000000..5ea9bd0
--- /dev/null
+++ b/src/components/views/WirelineView.tsx
@@ -0,0 +1,50 @@
+import { Fragment, memo } from 'react'
+import { Button, ButtonProps, Tooltip, TooltipProps } from 'antd'
+
+import { TelemetryWirelineRunOutDto } from '@api'
+import { Grid, GridItem } from '../Grid'
+import { formatDate } from '@utils'
+
+const lables: Record<keyof TelemetryWirelineRunOutDto, string | {
+    label?: string,
+    formatter?: (v: any) => any,
+}> = {
+    dateTime: { label: 'Данные актуальны на', formatter: formatDate },
+    hauling: 'Наработка талевого каната с момента перетяжки каната, т*км',
+    haulingWarnSp: 'Наработка талевого каната до сигнализации о необходимости перетяжки, т*км',
+    replace: 'Наработка талевого каната с момента замены каната, т*км',
+    replaceWarnSp: 'Наработка талевого каната до сигнализации о необходимости замены, т*км',
+}
+
+export type WirelineViewProps = TooltipProps & {
+    wireline?: TelemetryWirelineRunOutDto
+    buttonProps?: ButtonProps
+}
+
+export const WirelineView = memo<WirelineViewProps>(({ wireline, buttonProps, ...other }) => (
+    <Tooltip
+        {...other}
+        title={wireline ? (
+            <Grid>
+                {(Object.keys(wireline) as Array<keyof TelemetryWirelineRunOutDto>).map((key, i) => {
+                    const label = lables[key]
+                    return typeof label === 'string' ? (
+                        <Fragment key={i}>
+                            <GridItem row={i+1} col={1}>{label}:</GridItem>
+                            <GridItem row={i+1} col={2}>{wireline[key]}</GridItem>
+                        </Fragment>
+                    ) : (
+                        <Fragment key={i}>
+                            <GridItem row={i+1} col={1}>{label?.label ?? key}:</GridItem>
+                            <GridItem row={i+1} col={2}>{label?.formatter?.(wireline?.[key]) ?? wireline?.[key]}</GridItem>
+                        </Fragment>
+                    )
+                })}
+            </Grid>
+        ) : 'Нет данных'}
+    >
+        <Button type={'link'} {...buttonProps}>Талевый канат</Button>
+    </Tooltip>
+))
+
+export default WirelineView
diff --git a/src/components/views/index.ts b/src/components/views/index.ts
index b535f0e..2c5e1b0 100755
--- a/src/components/views/index.ts
+++ b/src/components/views/index.ts
@@ -3,9 +3,11 @@ export type { TelemetryViewProps } from './TelemetryView'
 export type { CompanyViewProps } from './CompanyView'
 export type { RoleViewProps } from './RoleView'
 export type { UserViewProps } from './UserView'
+export type { WirelineViewProps } from './WirelineView'
 
 export { PermissionView } from './PermissionView'
 export { TelemetryView, getTelemetryLabel } from './TelemetryView'
 export { CompanyView } from './CompanyView'
 export { RoleView } from './RoleView'
-export { UserView } from './UserView'
\ No newline at end of file
+export { UserView } from './UserView'
+export { WirelineView } from './WirelineView'
diff --git a/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
new file mode 100644
index 0000000..81b31af
--- /dev/null
+++ b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
@@ -0,0 +1,35 @@
+import { memo, useCallback, useEffect, useState } from 'react'
+
+import { TelemetryWirelineRunOutService } from '@api'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { WirelineView } from '@components/views'
+
+export const WirelineRunOut = memo(({ idWell }) => {
+    const [twro, setTwro] = useState({})
+    const [isLoading, setIsLoading] = useState(false)
+
+    const update = useCallback(() => invokeWebApiWrapperAsync(
+        async () => {
+            const twro = await TelemetryWirelineRunOutService.getData(idWell)
+            setTwro(twro)
+        },
+        setIsLoading,
+        'Не удалось получить данные по талевому канату'
+    ), [idWell])
+
+    const onTooltipVisibleChanged = useCallback((visible) => {
+        if (visible) update()
+    }, [update])
+    
+    useEffect(update, [update])
+
+    return (
+        <WirelineView
+            wireline={twro}
+            onVisibleChange={onTooltipVisibleChanged}
+            buttonProps={{ loading: isLoading }}
+        />
+    )
+})
+
+export default WirelineRunOut
diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index 3a9f28e..87370e6 100755
--- a/src/pages/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/index.jsx
@@ -29,6 +29,7 @@ import SpinPicEnabled from '@images/SpinEnabled.png'
 import SpinPicDisabled from '@images/SpinDisabled.png'
 
 import '@styles/message.css'
+import WirelineRunOut from './WirelineRunOut'
 
 const { Option } = Select
 
@@ -393,6 +394,7 @@ export default function TelemetryView({ idWell }) {
             </div>
             <Setpoints idWell={idWell} style={{ marginLeft: '1rem' }} />
             <span style={{ flexGrow: 20 }}>&nbsp;</span>
+            <WirelineRunOut idWell={idWell} />
             <img src={isTorqueStabEnabled(dataSpin) ? MomentStabPicEnabled : MomentStabPicDisabled} style={{ marginRight: '15px' }} alt={'TorqueMaster'} />
             <img src={isSpinEnabled(dataSpin) ? SpinPicEnabled : SpinPicDisabled} style={{ marginRight: '15px' }} alt={'SpinMaster'} />
             <h2 style={{ marginBottom: 0, marginRight: '15px', fontWeight: 'bold', color: isMseEnabled(dataSaub) ? 'green' : 'lightgrey' }}>MSE</h2>

From 0e519ea03fa661140a5d4aa68ae191fa9b98e9c2 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 14 Apr 2022 11:06:07 +0500
Subject: [PATCH 13/49] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20si?=
 =?UTF-8?q?gnalr=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=20?=
 =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B6=D0=B5=D1=81=D1=82=D0=B2=D0=BE=D0=BC=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D0=B8=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Report/index.jsx                    |  10 +-
 .../TelemetryView/ActiveMessagesOnline.jsx    |   5 +-
 src/pages/Telemetry/TelemetryView/index.jsx   |  12 +--
 src/services/signalr/index.ts                 | 101 +++++++++---------
 4 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
index ce8a0d4..866ecdf 100755
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Report/index.jsx
@@ -69,12 +69,10 @@ export const Report = memo(({ idWell }) => {
         }
       }
 
-      const unSubscribeReportHub = Subscribe(
-        'hubs/reports',
-        'GetReportProgress',
-        `Report_${taskId}`,
-        handleReportProgress
-      )
+      const unSubscribeReportHub = Subscribe('hubs/reports', `Report_${taskId}`, {
+        methodName: 'GetReportProgress',
+        handler: handleReportProgress,
+      })
     },
     setShowLoader,
     `Не удалось создать отчет по скважине (${idWell}) c
diff --git a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index db5c547..b2fd566 100755
--- a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -29,7 +29,10 @@ export const ActiveMessagesOnline = memo(({ idWell }) => {
       `Не удалось загрузить сообщения по скважине "${idWell}"`,
       'Получение списка сообщений'
     )
-    return Subscribe('hubs/telemetry','ReceiveMessages', `well_${idWell}`, handleReceiveMessages)
+    return Subscribe('hubs/telemetry',`well_${idWell}`, {
+      methodName: 'ReceiveMessages',
+      handler: handleReceiveMessages,
+    })
   }, [idWell, handleReceiveMessages])
 
   return (
diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index 87370e6..c11ae6f 100755
--- a/src/pages/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/index.jsx
@@ -323,8 +323,11 @@ export default function TelemetryView({ idWell }) {
   const handleDataSpin = useCallback((data) => data && setDataSpin(data), [])
 
   useEffect(() => {
-    const unsubscribeSaub = Subscribe('hubs/telemetry', 'ReceiveDataSaub', `well_${idWell}`, handleDataSaub)
-    const unsubscribeSpin = Subscribe('hubs/telemetry', 'ReceiveDataSpin', `well_${idWell}`, handleDataSpin)
+    const unsubscribe = Subscribe(
+      'hubs/telemetry', `well_${idWell}`,
+      { methodName: 'ReceiveDataSaub', handler: handleDataSaub },
+      { methodName: 'ReceiveDataSpin', handler: handleDataSpin }
+    )
     invokeWebApiWrapperAsync(
       async () => {
         const flowChart = await DrillFlowChartService.get(idWell)
@@ -338,10 +341,7 @@ export default function TelemetryView({ idWell }) {
       `Не удалось получить данные по скважине "${idWell}"`,
       'Получение данных по скважине'
     )
-    return () => {
-      unsubscribeSaub()
-      unsubscribeSpin()
-    }
+    return unsubscribe
   }, [idWell, chartInterval, handleDataSpin, handleDataSaub])
 
   useEffect(() => invokeWebApiWrapperAsync(
diff --git a/src/services/signalr/index.ts b/src/services/signalr/index.ts
index a87a5e3..b55982a 100755
--- a/src/services/signalr/index.ts
+++ b/src/services/signalr/index.ts
@@ -1,25 +1,22 @@
-import { HubConnection, HubConnectionBuilder, HubConnectionState } from '@microsoft/signalr';
+import { getUserToken } from '@asb/utils/storage'
+import { HubConnection, HubConnectionBuilder, HubConnectionState } from '@microsoft/signalr'
 
 // SignalR js api:
 //https://docs.microsoft.com/ru-ru/javascript/api/@aspnet/signalr/?view=signalr-js-latest
 
 const ConnectionOptions = { 
-  accessTokenFactory: () => localStorage['token'],
-  transport:1,
+  accessTokenFactory: () => getUserToken() ?? '',
+  transport: 1,
 }
 
-type ConnectionsDict = {
-  [route: string]: HubConnection;
-};
+type ConnectionsDict = Record<string, HubConnection>
 
 //var baseUrl = `http://192.168.1.70:5000`
-var baseUrl = process.env.NODE_ENV === 'development'
-  ? require('../../../package.json').proxy
-  :''
+const baseUrl = process.env.NODE_ENV === 'development' ? require('../../../package.json').proxy : ''
 
 const Connections: ConnectionsDict = {
   'hubs/telemetry': new HubConnectionBuilder()
-    .withUrl(`${baseUrl}/hubs/telemetry`, ConnectionOptions)//
+    .withUrl(`${baseUrl}/hubs/telemetry`, ConnectionOptions)
     .withAutomaticReconnect()
     .build(),
 
@@ -31,57 +28,67 @@ const Connections: ConnectionsDict = {
 
 let connectionPromise: Promise<void>
 
-const GetConnectionAsync = async (hubUrl: string) => {
+export const GetConnectionAsync = async (hubUrl: string): Promise<HubConnection> => {
+  const Connection: HubConnection = Connections[hubUrl]
 
-    let Connection: HubConnection = Connections[hubUrl];
+  if (Connection.state === HubConnectionState.Disconnected)
+    connectionPromise = Connection.start()
 
-    if (Connection.state === HubConnectionState.Disconnected)
-      connectionPromise = Connection.start()
-  
-    if (Connection.state !== HubConnectionState.Connected)
-      await connectionPromise
-  
-    return Connection
-  }
+  if (Connection.state !== HubConnectionState.Connected)
+    await connectionPromise
 
-type handlerFunction = (...args: any[]) => void;
+  return Connection
+}
 
-type cleanFunction = (...args: any[]) => void;
+type handlerFunction = (...args: any[]) => void
+type cleanFunction = (...args: any[]) => void
+
+export type SubscribeGroup = {
+  methodName: string,
+  handler: handlerFunction,
+}
 
 const MakeUnsubscribeFunction = (
   connection: HubConnection, 
-  methodName: string, 
-  groupName: (string|null)):cleanFunction => {
-  return async() => {
-    if(connection.state === HubConnectionState.Connected)
-    {
-      if(groupName)
-        await connection.send('RemoveFromGroup', groupName)
-      connection.off(methodName)
+  groupName: string[] | string | null,
+  ...groups: SubscribeGroup[]
+): cleanFunction => async() => {
+  if(connection.state === HubConnectionState.Connected) {
+    if (groupName) {
+      if (Array.isArray(groupName)) {
+        for (const g of groupName)
+          await connection.send('RemoveFromGroup', g)
+      } else await connection.send('RemoveFromGroup', groupName)
     }
-    connection.stop()
+    for (const g of groups)
+      connection.off(g.methodName)
   }
+  connection.stop()
 }
 
 /** Subscribe on some SignalR method (topic).
- * @example useEffect(() => Subscribe('methodName', `${id}`, handleNewData), [id]);
- * @param {string} methodName name of the method
- * @param {string} groupName  name of the group
- * @param {handlerFunction} handler fires when got new data by subscription
+ * @example useEffect(() => SubscribeMultiple('/url/', `${id}`, { methodName: 'methodName', handler: handleNewData }), [id]);
+ * @param {string[] | string} groupName  name of the group(-s)
+ * @param {SubscribeGroup} groups groups obtains method name and handler which fires when got new data by subscription
  * @return {cleanFunction} unsubscribe function for useEffect cleanup.
  */ 
-const Subscribe = (
+export const Subscribe = (
   hubUrl: string,
-  methodName: string, 
-  groupName: string = '', 
-  handler: handlerFunction ):cleanFunction=>{
+  groupName: string[] | string = '',
+  ...groups: SubscribeGroup[]
+): cleanFunction => {
   GetConnectionAsync(hubUrl).then(async connection => {
-    if(groupName)
-      await connection.send('AddToGroup', groupName)  
-      connection.on(methodName, handler)
+    if (groupName) {
+      if (Array.isArray(groupName)) {
+        for (const g of groupName)
+          await connection.send('AddToGroup', g)    
+      } else await connection.send('AddToGroup', groupName)  
+    }
+    for (const g of groups)
+      connection.on(g.methodName, g.handler)
   })
   
-  return MakeUnsubscribeFunction(Connections[hubUrl],methodName,groupName)
+  return MakeUnsubscribeFunction(Connections[hubUrl], groupName, ...groups)
 }
 
 /** Invokes some SignalR method.
@@ -89,13 +96,9 @@ const Subscribe = (
  * @param {any[]} args methods arguments
  * @return {Promise<void>} Promise
  */ 
-const InvokeAsync = async (methodName:string, hubUrl: string, ...args:any[]) => {
+export const InvokeAsync = async (methodName: string, hubUrl: string, ...args: any[]) => {
   await GetConnectionAsync(hubUrl)
   await Connections[hubUrl].send(methodName, ...args)
 }
 
-export {
-  Subscribe,
-  InvokeAsync,
-  GetConnectionAsync,
-}
\ No newline at end of file
+export default Subscribe

From 7c3d46893a3daf58d37b203c63dc9f7988697805 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 15 Apr 2022 17:17:34 +0500
Subject: [PATCH 14/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B0=D1=88=D0=B1=D0=BE=D1=80=D0=B4=20?=
 =?UTF-8?q?=D1=81=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=BE=D0=BC=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=9D=D0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/widgets/BaseWidget.tsx         |  67 +++++
 .../widgets/WidgetSettingsWindow.tsx          |  65 +++++
 src/components/widgets/index.ts               |   5 +
 .../Telemetry/DashboardNNB/AddGroupWindow.jsx |  18 ++
 .../DashboardNNB/AddWidgetWindow.jsx          |  52 ++++
 src/pages/Telemetry/DashboardNNB/index.jsx    | 255 ++++++++++++++++++
 src/pages/Telemetry/index.jsx                 |   6 +
 src/styles/dashboard_nnb.less                 |  29 ++
 src/styles/widgets/base.less                  |  56 ++++
 src/utils/index.ts                            |   7 +-
 src/utils/storage.ts                          |  56 ++--
 11 files changed, 591 insertions(+), 25 deletions(-)
 create mode 100644 src/components/widgets/BaseWidget.tsx
 create mode 100644 src/components/widgets/WidgetSettingsWindow.tsx
 create mode 100644 src/components/widgets/index.ts
 create mode 100644 src/pages/Telemetry/DashboardNNB/AddGroupWindow.jsx
 create mode 100644 src/pages/Telemetry/DashboardNNB/AddWidgetWindow.jsx
 create mode 100644 src/pages/Telemetry/DashboardNNB/index.jsx
 create mode 100644 src/styles/dashboard_nnb.less
 create mode 100644 src/styles/widgets/base.less

diff --git a/src/components/widgets/BaseWidget.tsx b/src/components/widgets/BaseWidget.tsx
new file mode 100644
index 0000000..c17ff10
--- /dev/null
+++ b/src/components/widgets/BaseWidget.tsx
@@ -0,0 +1,67 @@
+import { Button } from 'antd'
+import { memo, ReactNode, useMemo } from 'react'
+import { CloseOutlined, SettingOutlined } from '@ant-design/icons'
+
+import '@styles/widgets/base.less'
+
+export type WidgetSettings<T = any> = {
+    id?: number,
+    unit?: string,
+    label?: string,
+    formatter?: ((v: T) => ReactNode) | null,
+    defaultValue?: ReactNode,
+
+    labelColor?: string,
+    valueColor?: string,
+    backgroundColor?: string,
+    unitColor?: string,
+}
+
+export const defaultSettings: WidgetSettings = {
+    unit: '----',
+    label: 'Виджет',
+    formatter: v => isNaN(v) ? v : parseFloat(v).toFixed(2),
+
+    labelColor: '#000000',
+    valueColor: '#000000',
+    backgroundColor: '#f6f6f6',
+    unitColor: '#a0a0a0',
+}
+
+export type BaseWidgetProps<T = any> = WidgetSettings<T> & {
+    value: T,
+    onRemove: (settings: WidgetSettings<T>) => void,
+    onEdit: (settings: WidgetSettings<T>) => void,
+}
+
+export const BaseWidget = memo<BaseWidgetProps>(({ value, onRemove, onEdit, ...settings }) => {
+    const sets = useMemo<WidgetSettings>(() => ({ ...defaultSettings, ...settings }), [settings])
+
+    return (
+        <div className={'number_widget'} style={{ background: sets.backgroundColor }}>
+            <div className={'widget_head'}>
+                <Button
+                    type={'text'}
+                    onClick={() => onEdit(sets)}
+                    icon={<SettingOutlined />}
+                    style={{ visibility: !!onEdit ? 'visible' : 'hidden' }}
+                />
+                <div className={'widget_label'} style={{ color: sets.labelColor }}>{sets.label}</div>
+                <div className={'widget_close'}>
+                    <Button
+                        type={'link'}
+                        icon={<CloseOutlined />}
+                        onClick={() => onRemove(settings)}
+                        style={{ visibility: !!onRemove ? 'visible' : 'hidden' }}
+                    />
+                </div>
+            </div>
+            <div className={'widget_value'} style={{ color: sets.valueColor }}>
+                {(sets.formatter === null ? value : sets.formatter?.(value)) ?? sets.defaultValue ?? '----'}
+            </div>
+            <div className={'widget_units'} style={{ color: sets.unitColor }}>{sets.unit}</div>
+        </div>
+    )
+})
+
+export default BaseWidget
diff --git a/src/components/widgets/WidgetSettingsWindow.tsx b/src/components/widgets/WidgetSettingsWindow.tsx
new file mode 100644
index 0000000..16b70be
--- /dev/null
+++ b/src/components/widgets/WidgetSettingsWindow.tsx
@@ -0,0 +1,65 @@
+import { memo, useEffect } from 'react'
+import { Form, Input, Modal, ModalProps } from 'antd'
+
+import { WidgetSettings } from './BaseWidget'
+
+export type WidgetSettingsWindowProps<T = any> = ModalProps & {
+    settings: WidgetSettings<T>
+    onEdit: (settings: WidgetSettings<T>) => void
+}
+
+const { Item } = Form
+
+export const WidgetSettingsWindow = memo<WidgetSettingsWindowProps>(({ settings, onEdit, ...other }) => {
+    const [form] = Form.useForm()
+
+    useEffect(() => {
+        if (settings) form.setFieldsValue(settings)
+    }, [form, settings])
+
+    return (
+        <Modal
+            {...other}
+            visible={!!settings}
+            title={(
+                <>
+                    Настройка виджета {settings?.label ? `"${settings?.label}"` : ''}
+                    <span style={{ color: '#a0a0a0'}}> (id: {settings?.id})</span>
+                </>
+            )}
+            onOk={form.submit}
+            getContainer={false}
+        >
+            <Form form={form} onFinish={onEdit}>
+                <Item name={'id'} hidden><Input type={'hidden'} /></Item>
+                <Item
+                    label={'Заголовок поля'}
+                    name={'label'}
+                    rules={[{ required: true, message: 'Пожалуйста, введите заголовок!' }]}
+                >
+                    <Input />
+                </Item>
+                <Item
+                    label={'Единицы измерения'}
+                    name={'unit'}
+                >
+                    <Input />
+                </Item>
+                <Item label={'Цвет заголовка'} name={'labelColor'}>
+                    <Input type={'color'} />
+                </Item>
+                <Item label={'Цвет значения'} name={'valueColor'}>
+                    <Input type={'color'} />
+                </Item>
+                <Item label={'Цвет фона'} name={'backgroundColor'}>
+                    <Input type={'color'} />
+                </Item>
+                <Item label={'Цвет единиц измерения'} name={'unitColor'}>
+                    <Input type={'color'} />
+                </Item>
+            </Form>
+        </Modal>
+    )
+})
+
+export default WidgetSettingsWindow
diff --git a/src/components/widgets/index.ts b/src/components/widgets/index.ts
new file mode 100644
index 0000000..c73bcc7
--- /dev/null
+++ b/src/components/widgets/index.ts
@@ -0,0 +1,5 @@
+export { WidgetSettingsWindow } from './WidgetSettingsWindow'
+export { BaseWidget } from './BaseWidget'
+
+export type { WidgetSettingsWindowProps } from './WidgetSettingsWindow'
+export type { WidgetSettings, BaseWidgetProps } from './BaseWidget'
diff --git a/src/pages/Telemetry/DashboardNNB/AddGroupWindow.jsx b/src/pages/Telemetry/DashboardNNB/AddGroupWindow.jsx
new file mode 100644
index 0000000..96ce88e
--- /dev/null
+++ b/src/pages/Telemetry/DashboardNNB/AddGroupWindow.jsx
@@ -0,0 +1,18 @@
+import { PlusOutlined } from '@ant-design/icons'
+import { Form, Input } from 'antd'
+import { memo } from 'react'
+
+import Poprompt from '@components/selectors/Poprompt'
+
+const addGroupRules = [{ required: true, message: 'Пожалуйста, введите название группы' }]
+const addGroupButtonProps = { type: 'link', className: 'add_group', icon: <PlusOutlined /> }
+
+export const AddGroupWindow = memo(({ addGroup, initialValue = 'Новая группа' }) => (
+    <Poprompt placement={'right'} text={'Добавить группу'} buttonProps={addGroupButtonProps} onDone={addGroup}>
+        <Form.Item initialValue={initialValue} rules={addGroupRules} name={'groupName'} label={'Название группы'}>
+            <Input type={'text'} />
+        </Form.Item>
+    </Poprompt>
+))
+
+export default AddGroupWindow
diff --git a/src/pages/Telemetry/DashboardNNB/AddWidgetWindow.jsx b/src/pages/Telemetry/DashboardNNB/AddWidgetWindow.jsx
new file mode 100644
index 0000000..1cd15cd
--- /dev/null
+++ b/src/pages/Telemetry/DashboardNNB/AddWidgetWindow.jsx
@@ -0,0 +1,52 @@
+import { PlusOutlined } from '@ant-design/icons'
+import { Form, Select } from 'antd'
+import { memo, useCallback, useMemo } from 'react'
+
+import Poprompt from '@components/selectors/Poprompt'
+
+export const createWidgetId = (witsRecord, dt = false) => `${witsRecord.recordId}_${witsRecord.itemId}` + (dt ? `_${Date.now()}` : '')
+
+export const makeWidgetFromWits = (witsRecord) => ({
+    id: createWidgetId(witsRecord, true),
+    witsId: witsRecord.longMnemonic.toLowerCase(),
+    recordId: witsRecord.recordId,
+    unit: witsRecord.metricUnits,
+    label: witsRecord.longMnemonic,
+})
+
+const addWidgetRules = [{ required: true, message: 'Пожалуйста, выберите виджет' }]
+const addWidgetButtonProps = { type: 'link', className: 'add_group', icon: <PlusOutlined /> }
+
+export const AddWidgetWindow = memo(({ witsInfo, onAdded }) => {
+    const options = useMemo(() => witsInfo?.map((witsRecord) => ({
+        label: `Record #${witsRecord.recordId}: ${witsRecord.longMnemonic}`,
+        value: createWidgetId(witsRecord),
+    })) ?? [], [witsInfo])
+
+    const onFormFinish = useCallback((value) => {
+        if (!value?.widget) return
+        const record = witsInfo.find((witsRecord) => createWidgetId(witsRecord) === value.widget)
+        if (record)
+            onAdded?.(makeWidgetFromWits(record))
+    }, [onAdded, witsInfo])
+
+    return (
+        <Poprompt
+            placement={'right'}
+            onDone={onFormFinish}
+            text={'Добавить виджет'}
+            buttonProps={addWidgetButtonProps}
+            overlayInnerStyle={{ width: '300px' }}
+        >
+            <Form.Item rules={addWidgetRules} name={'widget'} label={'Виджет'}>
+                <Select
+                    showSearch
+                    options={options}
+                    filterOption={(input, option) => option.label.toLowerCase().includes(input.toLowerCase())}
+                />
+            </Form.Item>
+        </Poprompt>
+    )
+})
+
+export default AddWidgetWindow
diff --git a/src/pages/Telemetry/DashboardNNB/index.jsx b/src/pages/Telemetry/DashboardNNB/index.jsx
new file mode 100644
index 0000000..eb5f8b8
--- /dev/null
+++ b/src/pages/Telemetry/DashboardNNB/index.jsx
@@ -0,0 +1,255 @@
+import { memo, useCallback, useEffect, useMemo, useReducer, useState } from 'react'
+import { useHistory, useParams } from 'react-router-dom'
+import { CloseOutlined } from '@ant-design/icons'
+import { Button, Menu, Popconfirm } from 'antd'
+
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { BaseWidget, WidgetSettingsWindow } from '@components/widgets'
+import { getJSON, setJSON } from '@utils/storage'
+import { arrayOrDefault } from '@utils'
+import Subscribe from '@services/signalr'
+import {
+    WitsInfoService,
+    WitsRecord1Service,
+    WitsRecord7Service,
+    WitsRecord8Service,
+    WitsRecord50Service,
+    WitsRecord60Service,
+    WitsRecord61Service,
+} from '@api'
+
+import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow'
+
+import '@styles/dashboard_nnb.less'
+import AddGroupWindow from './AddGroupWindow'
+
+const getWitsInfo = async () => {
+    // TODO: Добавить expire с принудительным обновлением
+    if ('witsInfo' in localStorage)
+        return getJSON('witsInfo')
+    const info = arrayOrDefault(await WitsInfoService.getItems())
+    setJSON('witsInfo', info)
+    return info
+}
+
+const STORAGE_NAME = 'nnbWidgets'
+
+const defaultGroups = [
+    { id: '1', name: 'General Time-Based', editable: false },
+    { id: '7', name: 'Survey/Directional', editable: false },
+    { id: '8', name: 'MWD Formation Evaluation', editable: false },
+    { id: '50', name: 'Резистивиметр MCR', editable: false },
+    { id: '60', name: 'Передача полных', editable: false },
+    { id: '61', name: 'Резистивиметр Corvet', editable: false },
+]
+
+const makeGroup = (settings) => ({
+    widgets: [],
+    editable: true,
+    id: '' + Date.now(),
+    name: 'Новая группа',
+    ...settings,
+})
+
+const groupsReducer = (groups, action) => {
+    let newGroups = [ ...groups ]
+    const { groupId, widgetId, value, type, witsInfo } = action
+
+    const groupIdx = newGroups.findIndex(({ id }) => `${id}` === groupId)
+    const widgetIdx = groupIdx < 0 ? -1 : newGroups[groupIdx].widgets.findIndex(({ id }) => id === widgetId)
+
+    switch (type) {
+        case 'set': return value
+        case 'clear':
+            localStorage.removeItem(STORAGE_NAME)
+            if (!witsInfo) return []
+            // break намеренно пропущен, далее должен срабатывать init
+        case 'init': // eslint-disable-line no-fallthrough
+            if (STORAGE_NAME in localStorage)
+                return getJSON(STORAGE_NAME)
+            newGroups = defaultGroups.map((group) => ({
+                ...group,
+                widgets: witsInfo.filter(({ recordId }) => `${recordId}` === group.id).map(makeWidgetFromWits)
+            }))
+            break
+
+        case 'add_group':
+            newGroups.push(makeGroup(value))
+            break
+        case 'edit_group':
+            if (groupIdx >= 0)
+                newGroups[groupIdx] = { ...newGroups[groupIdx], ...value }
+            break
+        case 'remove_group':
+            if (groupIdx >= 0)
+                newGroups.splice(groupIdx, 1)
+            break
+
+        case 'add_widget':
+            if (groupIdx >= 0)
+                newGroups[groupIdx].widgets.push(value)
+            break
+        case 'edit_widget':
+            if (widgetIdx >= 0)
+                newGroups[groupIdx].widgets[widgetIdx] = { ...newGroups[groupIdx].widgets[widgetIdx], ...value }
+            break
+        case 'remove_widget':
+            if (widgetIdx >= 0)
+                newGroups[groupIdx].widgets.splice(widgetIdx, 1)
+            break
+
+        default: return newGroups
+    }
+    setJSON('nnbWidgets', newGroups)
+    return newGroups
+}
+
+export const DashboardNNB = memo(({ idWell }) => {
+    const [groups, dispatchGroups] = useReducer(groupsReducer, [])
+    const [witsInfo, setWitsInfo] = useState([])
+    const [isLoading, setIsLoading] = useState(false)
+    const [selectedSettings, setSelectedSettings] = useState(null)
+    const [values, setValues] = useState({})
+
+    const root = useMemo(() => `/well/${idWell}/telemetry/dashboard_nnb`, [idWell])
+    const history = useHistory()
+    const { tab: selectedGroup } = useParams()
+
+    if (!selectedGroup && groups?.length > 0)
+        history.push(`${root}/${groups[0].id}`)
+
+
+    const group = useMemo(() => ({
+        editable: true,
+        ...groups.find(({ id }) => `${id}` === selectedGroup),
+    }), [groups, selectedGroup])
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => {
+            const info = await getWitsInfo()
+            setWitsInfo(info)
+            dispatchGroups({ type: 'init', witsInfo: info })
+        },
+        setIsLoading,
+        'Не удалось загрузить информацию о параметрах ННБ',
+        'Получение информации о параметрах ННБ'
+    ), [])
+
+    const handleData = useCallback((data, recordId) => {
+        const mergedData = data.reduce((out, record) => ({ ...out, ...record }), {})
+        setValues((pre) => ({
+            ...pre,
+            [recordId]: { ...pre[recordId], ...mergedData },
+        }))
+    }, [])
+
+    useEffect(() => {
+        invokeWebApiWrapperAsync(
+            async () => {
+                handleData(await WitsRecord1Service.getLastData(idWell), '1')
+                handleData(await WitsRecord7Service.getLastData(idWell), '7')
+                handleData(await WitsRecord8Service.getLastData(idWell), '8')
+                handleData(await WitsRecord50Service.getLastData(idWell), '50')
+                handleData(await WitsRecord60Service.getLastData(idWell), '60')
+                handleData(await WitsRecord61Service.getLastData(idWell), '61')
+            },
+            setIsLoading,
+            'Не удалось загрузить последние данные',
+            'Получение данных WITS',
+        )
+        return Subscribe('hubs/telemetry', `well_${idWell}_wits`,
+            { methodName: 'ReceiveWitsRecord1', handler: (data) => handleData(data, '1') },
+            { methodName: 'ReceiveWitsRecord7', handler: (data) => handleData(data, '7') },
+            { methodName: 'ReceiveWitsRecord8', handler: (data) => handleData(data, '8') },
+            { methodName: 'ReceiveWitsRecord50', handler: (data) => handleData(data, '50') },
+            { methodName: 'ReceiveWitsRecord60', handler: (data) => handleData(data, '60') },
+            { methodName: 'ReceiveWitsRecord61', handler: (data) => handleData(data, '61') },
+        )
+    }, [idWell, handleData])
+
+    const addGroup = useCallback((values) => dispatchGroups({ type: 'add_group', value: { name: values.groupName } }), [])
+
+    const removeGroup = useCallback((id) => {
+        dispatchGroups({ type: 'remove_group', groupId: `${id}` })
+        if (id === selectedGroup) history.push(`${root}`)
+    }, [root, history, selectedGroup])
+
+    const addWidget = useCallback((settings) => dispatchGroups({
+        type: 'add_widget',
+        groupId: selectedGroup,
+        value: settings,
+    }), [selectedGroup])
+
+    const onEdit = useCallback((settings) => {
+        dispatchGroups({
+            type: 'edit_widget',
+            groupId: selectedGroup,
+            widgetId: settings.id,
+            value: settings,
+        })
+        setSelectedSettings(null)
+    }, [selectedGroup])
+
+    const removeWidget = useCallback((settings) => dispatchGroups({
+        type: 'remove_widget',
+        groupId: selectedGroup,
+        widgetId: settings.id,
+    }), [selectedGroup])
+
+    return (
+        <LoaderPortal show={isLoading}>
+            <div className={'dashboard_nnb'}>
+                <Menu
+                    className={'dashboard_menu'}
+                    mode={'vertical'}
+                    selectable={true}
+                    selectedKeys={[selectedGroup]}
+                >
+                    <Menu.Item key={'add_group'}>
+                        <AddGroupWindow addGroup={addGroup} />
+                    </Menu.Item>
+                    {group?.editable && (
+                        <Menu.Item key={'add_widget'}>
+                            <AddWidgetWindow witsInfo={witsInfo} onAdded={addWidget} />
+                        </Menu.Item>
+                    )}
+                    {groups.map(({ id, name, editable }) => (
+                        <Menu.Item key={id}>
+                            {editable && (
+                                <Popconfirm
+                                    title={'Вы уверены, что хотите удалить группу, это действие невозможно отменить?'}
+                                    onConfirm={() => removeGroup(id)}
+                                    okText={'Удалить'}
+                                    cancelText={'Отмена'}
+                                >
+                                    <Button type={'link'} icon={<CloseOutlined />} />
+                                </Popconfirm>
+                            )}
+                            <Button type={'text'} style={{ paddingLeft: 0 }} onClick={() => history.push(`${root}/${id}`)}>{name}</Button>
+                        </Menu.Item>
+                    ))}
+                </Menu>
+                <div className={'widgets'}>
+                    {group.widgets?.map((widget) => (
+                        <BaseWidget
+                            key={widget.id}
+                            // onEdit={group.editable && setSelectedSettings} // TODO: Доделать редактирование
+                            onRemove={group.editable && removeWidget}
+                            {...widget}
+                            value={values[widget.recordId]?.[widget.witsId]}
+                        />
+                    ))}
+                    <WidgetSettingsWindow
+                        visible={!!selectedSettings}
+                        onCancel={() => setSelectedSettings(null)}
+                        settings={selectedSettings}
+                        onEdit={onEdit}
+                    />
+                </div>
+            </div>
+        </LoaderPortal>
+    )
+})
+
+export default DashboardNNB
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 551cbfb..524fef1 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -7,6 +7,7 @@ import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/
 
 import Archive from './Archive'
 import Messages from './Messages'
+import DashboardNNB from './DashboardNNB'
 import TelemetryView from './TelemetryView'
 
 import '@styles/index.css'
@@ -23,6 +24,7 @@ export const Telemetry = memo(({ idWell }) => {
         <PrivateMenuItem.Link root={rootPath} key={'monitoring'} path={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
         <PrivateMenuItem.Link root={rootPath} key={'messages'} path={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
         <PrivateMenuItem.Link root={rootPath} key={'archive'} path={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
+        <PrivateMenuItem.Link root={rootPath} key={'dashboard_nnb'} path={'dashboard_nnb'} title={'ННБ'} />
       </Menu>
 
       <Layout>
@@ -37,10 +39,14 @@ export const Telemetry = memo(({ idWell }) => {
             <PrivateRoute path={`${rootPath}/archive`}>
               <Archive idWell={idWell} />
             </PrivateRoute>
+            <PrivateRoute path={`${rootPath}/dashboard_nnb/:tab?`}>
+              <DashboardNNB idWell={idWell} />
+            </PrivateRoute>
             <PrivateDefaultRoute urls={[
               `${rootPath}/monitoring`,
               `${rootPath}/messages`,
               `${rootPath}/archive`,
+              `${rootPath}/dashboard_nnb`,
             ]}/>
           </Switch>
         </Content>
diff --git a/src/styles/dashboard_nnb.less b/src/styles/dashboard_nnb.less
new file mode 100644
index 0000000..6291a9b
--- /dev/null
+++ b/src/styles/dashboard_nnb.less
@@ -0,0 +1,29 @@
+.dashboard_nnb {
+    display: flex;
+    flex-direction: row;
+    max-height: 80vh;
+
+    & > .dashboard_menu {
+        flex: 1;
+        max-height: 100%;
+        overflow-y: auto;
+
+        & .add_group {
+            //
+        }
+    }
+
+    & .widgets {
+        flex: 5;
+        display: flex;
+        flex-wrap: wrap;
+        overflow-y: auto;
+
+        & .add_widget {
+            border-radius: 5px;
+            margin: 10px;
+            width: 13vh;
+            height: 13vh;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/styles/widgets/base.less b/src/styles/widgets/base.less
new file mode 100644
index 0000000..ee611c9
--- /dev/null
+++ b/src/styles/widgets/base.less
@@ -0,0 +1,56 @@
+
+@size: 9.9vh;
+.number_widget {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: stretch;
+    margin: 10px;
+    padding: 5px 10px;
+    border-radius: 5px;
+    background: #00000009;
+    height: @size;
+    min-width: @size * 1.75;
+
+    & > .widget_head {
+        display: grid;
+        grid-gap: 10px;
+
+        & > .widget_settings {
+            grid-row: 1;
+            grid-column: 1;
+        }
+
+        & > .widget_label {
+            grid-row: 1;
+            grid-column: 2;
+            color: black;
+            font-size: @size * 0.175;
+            //line-height: @size * 0.175;
+            text-align: center;
+        }
+
+        & > .widget_close {
+            grid-row: 1;
+            grid-column: 3;
+            display: flex;
+            flex-direction: row-reverse;
+        }
+    }
+
+    & > .widget_value {
+        flex: 2;
+        color: black;
+        font-size: @size * 0.45;
+        line-height: @size * 0.45;
+        text-align: center;
+    }
+
+    & > .widget_units {
+        flex: 1;
+        text-align: right;
+        font-size: @size * 0.15;
+        line-height: @size * 0.15;
+        color: #A0A0A0;
+    }
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 03f1ed6..48ec383 100755
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -10,9 +10,14 @@ export const mainFrameSize = () => ({
 
 export const arrayOrDefault = <T extends unknown>(arr?: unknown, def: T[] = []): T[] => Array.isArray(arr) ? arr : def
 
+export const deepCopy = <T extends any>(data: T): T => JSON.parse(JSON.stringify(data ?? null))
+
+export const wrapValues = <T, R>(data: Record<string, T>, handler: (data: T, key: string, object: Record<string, T>) => R): Record<string, R> =>
+    Object.fromEntries(Object.entries(data).map(([key, value]) => [key, handler(value, key, data)]))
+
 /**
  * Объединить типы, исключив совпадающие поля справа
  * @param T Тип, передаваемый полностью
  * @param R Аддитивный тип
  */
- export type OmitExtends<T, R> = T & Omit<R, keyof T>
+export type OmitExtends<T, R> = T & Omit<R, keyof T>
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index ffaa17e..2838aad 100755
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,4 +1,5 @@
 import { OpenAPI, UserTokenDto } from '@api'
+import { wrapValues } from '.'
 import { Role, Permission } from './permissions'
 import { normalizeColumn, optimizeColumn, TableSettings, TableSettingsStore } from './table_settings'
 
@@ -9,6 +10,8 @@ export enum StorageNames {
     permissions = 'permissions',
     roles = 'roles',
     tableSettings = 'tableSettings',
+    dashboardNNB = 'dashboardNNB',
+    witsInfo = 'witsInfo'
 }
 
 export const getArrayFromLocalStorage = <T extends string = string>(name: string, sep: string | RegExp = ','): T[] | null => {
@@ -17,6 +20,23 @@ export const getArrayFromLocalStorage = <T extends string = string>(name: string
     return raw.split(sep).map<T>(elm => elm as T)
 }
 
+export const getJSON = <T extends any>(name: StorageNames): T | null => {
+    const raw = localStorage.getItem(name)
+    if (!raw) return null
+    try {
+        return JSON.parse(raw)
+    } catch {}
+    return null
+}
+
+export const setJSON = <T extends any>(name: StorageNames, data: T | null): boolean => {
+    try {
+        localStorage.setItem(name, JSON.stringify(data))
+        return true
+    } catch {}
+    return false
+}
+
 export const getUserRoles = (): Role[] => getArrayFromLocalStorage<Role>(StorageNames.roles) ?? []
 export const getUserPermissions = (): Permission[] => getArrayFromLocalStorage<Permission>(StorageNames.permissions) ?? []
 export const getUserId = () => Number(localStorage.getItem(StorageNames.userId)) || null
@@ -43,31 +63,19 @@ export const removeUser = () => {
 }
 
 export const getTableSettings = (tableName: string): TableSettings => {
-    const tablesJSON = localStorage.getItem(StorageNames.tableSettings)
-    if (!tablesJSON) return {}
-    try {
-        const tables: TableSettingsStore = JSON.parse(tablesJSON)
-        if (tableName in tables) {
-            const columns = tables[tableName] ?? {}
-            for (const [name, column] of Object.entries(columns))
-                columns[name] = normalizeColumn(column, name)
-            return columns
-        }
-    } catch {}
-    return {}
+    const tables = getJSON<TableSettingsStore>(StorageNames.tableSettings) ?? {}
+    if (!(tableName in tables)) return {}
+    return wrapValues(tables[tableName] ?? {}, normalizeColumn)
 }
 
 export const setTableSettings = (tableName: string, settings?: TableSettings | null): boolean => {
-    const currentJSON = localStorage.getItem(StorageNames.tableSettings)
-    try {
-        const currentStore: TableSettingsStore = currentJSON ? JSON.parse(currentJSON) : {}
-        const newSettings = settings ?? null
-        if (newSettings)
-            for (const [name, column] of Object.entries(newSettings))
-                newSettings[name] = optimizeColumn(column)
-        currentStore[tableName] = newSettings
-        localStorage.setItem(StorageNames.tableSettings, JSON.stringify(currentStore))
-        return true
-    } catch {}
-    return false
+    const currentStore = getJSON<TableSettingsStore>(StorageNames.tableSettings) ?? {}
+    currentStore[tableName] = wrapValues(settings ?? {}, optimizeColumn)
+    return setJSON(StorageNames.tableSettings, currentStore)
 }
+
+export type DataDashboardNNB = {
+
+}
+
+export const getDashboardNNB = () => getJSON<DataDashboardNNB>(StorageNames.dashboardNNB)

From 7f9a9c92d990c5c2c6e2f9319982556cfd2a2403 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 15 Apr 2022 17:17:51 +0500
Subject: [PATCH 15/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20MSE=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Telemetry/TelemetryView/CustomColumn.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Telemetry/TelemetryView/CustomColumn.jsx b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
index f3ac368..9da3fea 100755
--- a/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
+++ b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
@@ -11,6 +11,7 @@ const params = [
   { label: 'Расход, м³/ч', accessorName: 'flow', isArrowVisible: true },
   { label: 'Расход х.х., м³/ч', accessorName: 'flowIdle', isArrowVisible: true },
   { label: 'Время', accessorName: 'date', format: 'HH:mm:ss' },
+  { label: 'MSE, %', accessorName: 'mse', format: 2 },
 ]
 
 export const CustomColumn = memo(({ data }) => {
@@ -26,8 +27,8 @@ export const CustomColumn = memo(({ data }) => {
           label={param.label}
           value={param.value}
           suffix={param.units}
-          format = {param.format}
-          isArrowVisible = {param.isArrowVisible}
+          format={param.format}
+          isArrowVisible={param.isArrowVisible}
         />
       ))}
       <RigMnemo

From 2b437b6995d27837fcbd3e1eb59a484da904a886 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 15 Apr 2022 17:18:18 +0500
Subject: [PATCH 16/49] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=BE=D1=80=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2=20=D1=81=20dev-=D1=81?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/AutoGenerateApi.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/AutoGenerateApi.md b/src/services/AutoGenerateApi.md
index 7b27bed..edc61e4 100755
--- a/src/services/AutoGenerateApi.md
+++ b/src/services/AutoGenerateApi.md
@@ -1 +1 @@
-npx openapi -i http://46.146.209.148/swagger/v1/swagger.json -o src/services/api
\ No newline at end of file
+npx openapi -i http://46.146.209.148:89/swagger/v1/swagger.json -o src/services/api
\ No newline at end of file

From 905036cc71aaf884ebce8e61cf16d812f0b6990f Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 15 Apr 2022 17:50:55 +0500
Subject: [PATCH 17/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=80=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=B0=20=D0=BA=20=D0=9D=D0=9D=D0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/permissions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index 3eb7371..09f3d86 100755
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -96,6 +96,7 @@ export const requirements: PermissionRecord = {
                 archive: ['Deposit.get', 'TelemetryDataSaub.get'],
                 monitoring: ['Deposit.get', 'DrillFlowChart.get', 'TelemetryDataSaub.get', 'TelemetryDataSpin.get'],
                 messages: ['Deposit.get', 'TelemetryDataSaub.get'],
+                dashboard_nnb: ['Deposit.get'], //'WitsInfo.get', 'WitsRecord1.get', 'WitsRecord7.get', 'WitsRecord8.get', 'WitsRecord50.get', 'WitsRecord60.get', 'WitsRecord61.get'],
             },
             report: ['Deposit.get', 'Report.get'],
             analytics: {

From 6d833c75c51fbf1c845dea329a538b2d53fe5972 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Mon, 18 Apr 2022 10:51:50 +0500
Subject: [PATCH 18/49] =?UTF-8?q?*=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D1=8C=20=D1=81?=
 =?UTF-8?q?=D0=BA=D1=80=D1=8B=D1=82=20=D0=B2=20TimezoneSelect=20*=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20falsy=20=D0=B7?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20DatePicke?=
 =?UTF-8?q?rWrapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/Columns/timezone.tsx  | 13 +++++--------
 src/components/Table/DatePickerWrapper.tsx |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/Columns/timezone.tsx b/src/components/Table/Columns/timezone.tsx
index affae17..79025b7 100755
--- a/src/components/Table/Columns/timezone.tsx
+++ b/src/components/Table/Columns/timezone.tsx
@@ -37,14 +37,11 @@ export const TimezoneSelect = memo<TimezoneSelectProps>(({ onChange, value, defa
     useEffect(() => setDefaultTimezone(defaultValue ? findTimezoneId(defaultValue) : null), [defaultValue])
     useEffect(() => setId(value ? findTimezoneId(value) : null), [value])
 
-    const onValueChanged = useCallback((id: TimezoneId | null) => {
-        console.log(id)
-        onChange?.({
-            timezoneId: id,
-            hours: id ? rawTimezones[id] : 0,
-            isOverride: false,
-        })
-    }, [onChange])
+    const onValueChanged = useCallback((id: TimezoneId | null) => onChange?.({
+        timezoneId: id,
+        hours: id ? rawTimezones[id] : 0,
+        isOverride: false,
+    }), [onChange])
 
     return (<Select {...other} onChange={onValueChanged} value={id} defaultValue={defaultTimezone} />)
 })
diff --git a/src/components/Table/DatePickerWrapper.tsx b/src/components/Table/DatePickerWrapper.tsx
index a453fbc..9fa14d1 100755
--- a/src/components/Table/DatePickerWrapper.tsx
+++ b/src/components/Table/DatePickerWrapper.tsx
@@ -18,7 +18,7 @@ export const DatePickerWrapper = memo<DatePickerWrapperProps>(({ value, onChange
     format={defaultFormat}
     defaultValue={moment()}
     onChange={(date) => onChange?.(date)}
-    value={isUTC ? moment.utc(value).local() : moment(value)}
+    value={value && (isUTC ? moment.utc(value).local() : moment(value))}
     {...other}
   />
 ))

From e9eaa96388555c1ef0e7ed1b4f3daa9336e689b7 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Mon, 18 Apr 2022 17:36:57 +0500
Subject: [PATCH 19/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D1=8F?=
 =?UTF-8?q?=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D1=81=D1=83=D1=82?=
 =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/DailyReport/ReportEditor.jsx      | 155 ++++++++++++++++++
 src/pages/Reports/DailyReport/index.jsx       |  97 +++++++++++
 .../DiagramReport}/ReportCreationNotify.jsx   |   0
 .../DiagramReport}/Reports.jsx                |   4 +-
 .../DiagramReport}/index.jsx                  |  10 +-
 src/pages/Reports/index.jsx                   |  44 +++++
 src/pages/Well.jsx                            |   8 +-
 src/utils/permissions.ts                      |   5 +-
 8 files changed, 311 insertions(+), 12 deletions(-)
 create mode 100644 src/pages/Reports/DailyReport/ReportEditor.jsx
 create mode 100644 src/pages/Reports/DailyReport/index.jsx
 rename src/pages/{Report => Reports/DiagramReport}/ReportCreationNotify.jsx (100%)
 mode change 100755 => 100644
 rename src/pages/{Report => Reports/DiagramReport}/Reports.jsx (100%)
 mode change 100755 => 100644
 rename src/pages/{Report => Reports/DiagramReport}/index.jsx (97%)
 mode change 100755 => 100644
 create mode 100644 src/pages/Reports/index.jsx

diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx
new file mode 100644
index 0000000..383df80
--- /dev/null
+++ b/src/pages/Reports/DailyReport/ReportEditor.jsx
@@ -0,0 +1,155 @@
+import { useForm } from 'antd/lib/form/Form'
+import { ConfigProvider, Descriptions, Divider, Form, Input, InputNumber, Modal, Select, Space, Table, Tag } from 'antd'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { DatePickerWrapper, makeColumn, makeGroupColumn } from '@components/Table'
+import { formatDate } from '@utils'
+
+const { Item } = Form
+const { Summary } = Table
+
+const table1Columns = [
+    makeGroupColumn('Отчётный период', [
+        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (date) => formatDate(date) ?? '---' }),
+    ]),
+    makeGroupColumn('Забой за отчётный период, м', [
+        makeColumn('От', 'depthStart', { width: 200, render: () => (
+            <Item name={'wellDepthIntervalStartDate'} style={{ margin: 0 }}>
+                <InputNumber style={{ width: '100%' }} />
+            </Item>
+        )}),
+        makeColumn('До', 'depthEnd', { width: 200, render: () => (
+            <Item name={'wellDepthIntervalEndDate'} style={{ margin: 0 }}>
+                <InputNumber style={{ width: '100%' }} />
+            </Item>
+        )}),
+    ])
+]
+
+const table2Columns = [
+    makeColumn('Работа модулей САУБ', 'label', { width: 500 }),
+    makeColumn('Часов:', 'hours', { width: 200, render: (data) => (
+        <Item name={data.name} style={{ margin: 0 }}>
+            <InputNumber style={{ width: '100%' }} />
+        </Item>
+    )}),
+    makeColumn('Метров:', 'meters', { width: 200, render: (data) => (
+        <Item name={data.name} style={{ margin: 0 }}>
+            <InputNumber style={{ width: '100%' }} />
+        </Item>
+    )}),
+]
+
+const table2Data = [
+    { label: 'АПД (автоматическая подача долота), ч/м:', hours: 'workTimeSaub', meters: 'drilledMetersSaub' },
+    { label: 'Спин Мастер (осцилляция), ч/м:', hours: 'workTimeSpinMaster', meters: 'drilledMetersSpinMaster' },
+    { label: 'Торк Мастер (демпфирование), ч/м:', hours: 'workTimeTorkMaster', meters: 'drilledMetersTorkMaster' },
+]
+
+const table2Summary = () => (
+    <Summary.Row>
+        <Summary.Cell>МСЕ, колличество запусков, раз:</Summary.Cell>
+        <Summary.Cell colSpan={2}>
+            <Item name={'countLaunchesMSE'} style={{ margin: 0 }}>
+                <InputNumber style={{ width: '100%' }} />
+            </Item>
+        </Summary.Cell>
+    </Summary.Row>
+)
+
+export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
+    const [form] = useForm()
+    const [isInvalid, setIsInvalid] = useState(false)
+    const [isLoading, setIsLoading] = useState(false)
+
+    useEffect(() => form.setFieldsValue(data), [data])
+
+    const onFormChange = useCallback(async () => await form.validateFields()
+        .then(() => setIsInvalid(false))
+        .catch(() => setIsInvalid(true))
+    , [form])
+
+    const onFormFinish = useCallback((data) => invokeWebApiWrapperAsync(
+        async () => {
+            onDone?.(data)
+        },
+        setIsLoading,
+        'Не удалось сохранить суточный рапорт',
+        'Сохранение суточного рапорта',
+    ), [onDone])
+
+    const table1Data = useMemo(() => [{ dateStart: form.getFieldValue('reportDate') }], [form])
+
+    return (
+        <Modal
+            centered
+            width={1200}
+            visible={visible}
+            onCancel={onCancel}
+            okText={'Сохранить'}
+            title={data ? `Суточная сводка бурения скважины № ${data.wellName} куст № ${data.clusterName}`:  'Новая суточная сводка бурения'}
+            onOk={form.submit}
+            okButtonProps={{
+                disabled: isInvalid,
+                loading: isLoading,
+            }}
+        >
+            <LoaderPortal show={isLoading}>
+                <Form
+                    form={form}
+                    onFinish={onFormFinish}
+                    onChange={onFormChange}
+                >
+                    <Item name={'reportDate'} label={'Дата рапорта'} rules={[{ required: true }]}>
+                        <DatePickerWrapper showTime={false} disabled={!!data}/>
+                    </Item>
+                    <Divider />
+                    <p>Суточная сводка бурения скважины № {data?.wellName} куст № {data?.clusterName}</p>
+                    <Item name={'customer'} label={'Заказчик'}><Input /></Item>
+                    <Item name={'contractor'} label={'Подрядчик'}><Input /></Item>
+                    <Table
+                        bordered
+                        size={'small'}
+                        columns={table1Columns}
+                        dataSource={table1Data}
+                        pagination={false}
+                        style={{ marginBottom: '15px' }}
+                    />
+                    <Item label={'Бурильщик 1 смена'} name={'firstDriller'}><Input /></Item>
+                    <Item label={'Бурильщик 2 смена'} name={'firstDriller'}><Input /></Item>
+
+                    <Table
+                        bordered
+                        size={'small'}
+                        columns={table2Columns}
+                        dataSource={table2Data}
+                        summary={table2Summary}
+                        pagination={false}
+                        style={{ marginBottom: '15px' }}
+                    />
+
+                    <Item name={'bhaDescription'}>
+                        <Input.TextArea rows={4} />
+                    </Item>
+
+                    <Descriptions column={1} size={'small'} bordered>
+                        <Descriptions.Item label={'Бурение в роторе:'}>
+                            <Item name={'rotaryDrillingModes'} style={{ margin: 0 }}>
+                                <Select mode={'tags'} style={{ width: '100%' }} />
+                            </Item>
+                        </Descriptions.Item>
+                        <Descriptions.Item label={'Бурение в слайде:'}>
+                            <Item name={'slideDrillingModes'} style={{ margin: 0 }}>
+                                <Select mode={'tags'} style={{ width: '100%' }} />
+                            </Item>
+                        </Descriptions.Item>
+                    </Descriptions>
+                </Form>
+            </LoaderPortal>
+        </Modal>
+    )
+})
+
+export default ReportEditor
diff --git a/src/pages/Reports/DailyReport/index.jsx b/src/pages/Reports/DailyReport/index.jsx
new file mode 100644
index 0000000..c67a3be
--- /dev/null
+++ b/src/pages/Reports/DailyReport/index.jsx
@@ -0,0 +1,97 @@
+import moment from 'moment'
+import { Button } from 'antd'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { FileExcelOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
+
+import LoaderPortal from '@components/LoaderPortal'
+import DateRangeWrapper from '@components/Table/DateRangeWrapper'
+import { Table, makeDateColumn, makeColumn } from '@components/Table'
+import { download, invokeWebApiWrapperAsync } from '@components/factory'
+import { arrayOrDefault } from '@utils'
+
+import ReportEditor from './ReportEditor'
+
+export const DailyReport = memo(({ idWell }) => {
+    const [data, setData] = useState([])
+    const [isLoading, setIsLoading] = useState(false)
+    const [searchDate, setSearchDate] = useState(null)
+    const [selectedReport, setSelectedReport] = useState(null)
+    const [isEditorVisible, setIsEditorVisible] = useState(true)
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => {
+            const data = [{ date: '2022-10-01' }] // arrayOrDefault(await DailyreportService.getData(idWell))
+            setData(data)
+        },
+        setIsLoading,
+        'Не удалось загрузить список суточных рапортов',
+        'Получение списка суточных рапортов',
+    ), [idWell])
+
+    const columns = useMemo(() => [
+        makeDateColumn('Дата', 'date', undefined, undefined, { width: 300 }),
+        makeColumn('', '', { width: 200, render: (_, report, idx) => (
+            <>
+                <Button
+                    type={'link'}
+                    icon={<FileExcelOutlined />}
+                    onClick={async () => await download(`/api/daily_report/${report.id}`)}
+                >
+                    Скачать XLSX
+                </Button>
+                <Button
+                    type={'link'}
+                    icon={<EditOutlined />}
+                    onClick={() => {
+                        setSelectedReport(report)
+                        setIsEditorVisible(true)
+                    }}
+                >
+                    Редактировать
+                </Button>
+            </>
+        )}),
+    ], [])
+    
+    const filteredData = useMemo(() => {
+        if (!searchDate) return data
+        return data.filter((row) => moment(row.date).isBetween(...searchDate))
+    }, [data, searchDate])
+
+    return (
+        <>
+            <LoaderPortal show={isLoading}>
+                <div className={'w-100 mt-20px mb-20px d-flex'} style={{ justifyContent: 'space-between' }}>
+                    <div>
+                        <div>
+                            <div>Диапозон дат отчёта</div>
+                            <DateRangeWrapper onCalendarChange={setSearchDate} />
+                        </div>
+                    </div>
+                    <div style={{ display: 'flex', alignItems: 'end' }}>
+                        <Button
+                            icon={<PlusOutlined />}
+                            onClick={() => {
+                                setSelectedReport(null)
+                                setIsEditorVisible(true)
+                            }}
+                        />
+                    </div>
+                </div>
+                <Table
+                    bordered
+                    size={'small'}
+                    columns={columns} 
+                    dataSource={filteredData}
+                />
+            </LoaderPortal>
+            <ReportEditor
+                data={selectedReport}
+                visible={isEditorVisible}
+                onCancel={() => setIsEditorVisible(false)}
+            />
+        </>
+    )
+})
+
+export default DailyReport
diff --git a/src/pages/Report/ReportCreationNotify.jsx b/src/pages/Reports/DiagramReport/ReportCreationNotify.jsx
old mode 100755
new mode 100644
similarity index 100%
rename from src/pages/Report/ReportCreationNotify.jsx
rename to src/pages/Reports/DiagramReport/ReportCreationNotify.jsx
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Reports/DiagramReport/Reports.jsx
old mode 100755
new mode 100644
similarity index 100%
rename from src/pages/Report/Reports.jsx
rename to src/pages/Reports/DiagramReport/Reports.jsx
index cf44431..71db9e9
--- a/src/pages/Report/Reports.jsx
+++ b/src/pages/Reports/DiagramReport/Reports.jsx
@@ -2,11 +2,11 @@ import { Button, Tooltip } from 'antd'
 import { useState, useEffect, memo } from 'react'
 import { FilePdfOutlined, FileTextOutlined } from '@ant-design/icons'
 
-import { ReportService } from '@api'
-import { formatDate, periodToString } from '@utils'
 import LoaderPortal from '@components/LoaderPortal'
 import { Table, makeDateSorter, makeNumericSorter } from '@components/Table'
 import { invokeWebApiWrapperAsync, downloadFile } from '@components/factory'
+import { formatDate, periodToString } from '@utils'
+import { ReportService } from '@api'
 
 const imgPaths = {
   '.pdf': <FilePdfOutlined/>,
diff --git a/src/pages/Report/index.jsx b/src/pages/Reports/DiagramReport/index.jsx
old mode 100755
new mode 100644
similarity index 97%
rename from src/pages/Report/index.jsx
rename to src/pages/Reports/DiagramReport/index.jsx
index 866ecdf..ce3637f
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Reports/DiagramReport/index.jsx
@@ -3,11 +3,11 @@ import moment from 'moment'
 import { useState, useEffect, memo, useCallback } from 'react'
 import { Radio, Button, Select, notification } from 'antd'
 
-import { ReportService } from '@api'
-import { Subscribe } from '@services/signalr'
 import { LoaderPortal } from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DateRangeWrapper } from 'components/Table/DateRangeWrapper'
+import { DateRangeWrapper } from '@components/Table/DateRangeWrapper'
+import { Subscribe } from '@services/signalr'
+import { ReportService } from '@api'
 
 import { Reports } from './Reports'
 import { ReportCreationNotify } from './ReportCreationNotify'
@@ -32,7 +32,7 @@ const reportFormats = [
   { value: 1, label: 'LAS' },
 ]
 
-export const Report = memo(({ idWell }) => {
+export const DiagramReport = memo(({ idWell }) => {
   const [aviableDateRange, setAviableDateRange] = useState([moment(), moment()])
   const [filterDateRange, setFilterDateRange] = useState([
     moment().subtract(1, 'days').startOf('day'),
@@ -171,4 +171,4 @@ export const Report = memo(({ idWell }) => {
   )
 })
 
-export default Report
+export default DiagramReport
diff --git a/src/pages/Reports/index.jsx b/src/pages/Reports/index.jsx
new file mode 100644
index 0000000..056eb9b
--- /dev/null
+++ b/src/pages/Reports/index.jsx
@@ -0,0 +1,44 @@
+import { Switch, useParams } from 'react-router-dom'
+import { memo, useMemo } from 'react'
+import { Layout, Menu } from 'antd'
+import { FilePdfOutlined } from '@ant-design/icons'
+
+import { PrivateMenuItemLink, PrivateRoute, PrivateDefaultRoute } from '@components/Private'
+
+import DailyReport from './DailyReport'
+import DiagramReport from './DiagramReport'
+
+const { Content } = Layout
+
+export const Reports = memo(({ idWell }) => {
+    const { tab } = useParams()
+    const rootPath = useMemo(() => `/well/${idWell}/reports`, [idWell])
+
+    return (
+        <Layout>
+            <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+                <PrivateMenuItemLink root={rootPath} key={'diagram_report'} path={'diagram_report'} icon={<FilePdfOutlined />} title={'Диаграмма'}/>
+                <PrivateMenuItemLink root={rootPath} key={'daily_report'} path={'daily_report'} title={'Суточный рапорт'} />
+            </Menu>
+
+            <Layout>
+                <Content className={'site-layout-background'}>
+                <Switch>
+                    <PrivateRoute path={`${rootPath}/diagram_report`}>
+                        <DiagramReport idWell={idWell} />
+                    </PrivateRoute>
+                    <PrivateRoute path={`${rootPath}/daily_report`}>
+                        <DailyReport idWell={idWell} />
+                    </PrivateRoute>
+                    <PrivateDefaultRoute urls={[
+                        `${rootPath}/diagram_report`,
+                        `${rootPath}/daily_report`,
+                    ]}/>
+                </Switch>
+                </Content>
+            </Layout>
+        </Layout>
+    )
+})
+
+export default Reports
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 8c4aab8..4ef9496 100755
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -11,8 +11,8 @@ import { Switch, useParams } from 'react-router-dom'
 
 import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/Private'
 
-import Report from './Report'
 import Measure from './Measure'
+import Reports from './Reports'
 import Analytics from './Analytics'
 import Documents from './Documents'
 import Telemetry from './Telemetry'
@@ -32,7 +32,7 @@ export const Well = memo(() => {
     <Layout>
       <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
         <PrivateMenuItem.Link root={rootPath} key={'telemetry'} path={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
-        <PrivateMenuItem.Link root={rootPath} key={'report'} path={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
+        <PrivateMenuItem.Link root={rootPath} key={'reports'} path={'reports'} icon={<FilePdfOutlined />} title={'Рапорта'} />
         <PrivateMenuItem.Link root={rootPath} key={'analytics'} path={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
         <PrivateMenuItem.Link root={rootPath} key={'operations'} path={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
         {/* <PrivateMenuItem.Link root={rootPath} key={'telemetryAnalysis'} path={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
@@ -47,8 +47,8 @@ export const Well = memo(() => {
             <PrivateRoute path={`${rootPath}/telemetry/:tab?`}>
               <Telemetry idWell={idWell} />
             </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/report`}>
-              <Report idWell={idWell} />
+            <PrivateRoute path={`${rootPath}/reports/:tab?`}>
+              <Reports idWell={idWell} />
             </PrivateRoute>
             <PrivateRoute path={`${rootPath}/analytics/:tab?`}>
               <Analytics idWell={idWell} rootPath={`${rootPath}/analytics`}/>
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index 09f3d86..4618a07 100755
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -98,7 +98,10 @@ export const requirements: PermissionRecord = {
                 messages: ['Deposit.get', 'TelemetryDataSaub.get'],
                 dashboard_nnb: ['Deposit.get'], //'WitsInfo.get', 'WitsRecord1.get', 'WitsRecord7.get', 'WitsRecord8.get', 'WitsRecord50.get', 'WitsRecord60.get', 'WitsRecord61.get'],
             },
-            report: ['Deposit.get', 'Report.get'],
+            reports: {
+                diagram_report: ['Deposit.get', 'Report.get'],
+                daily_report: ['Deposit.get'],
+            },
             analytics: {
                 composite: {
                     wells: ['Deposit.get', 'OperationStat.get', 'WellComposite.get'],

From 4b55f0e8912ad69c9cfc122fbbc7166644337c11 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 12:51:30 +0500
Subject: [PATCH 20/49] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=80=D0=BE=D1=83=D1=82=D0=B8=D0=BD=D0=B3.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20PrivateMenu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Private/PrivateMenu.tsx        | 45 +++++++++++++++++++
 src/components/Private/PrivateMenuItem.tsx    | 10 ++---
 src/components/Private/index.ts               | 10 +++--
 src/pages/AdminPanel/Telemetry/index.jsx      | 12 ++---
 src/pages/AdminPanel/index.jsx                | 28 ++++++------
 .../Analytics/WellCompositeEditor/index.jsx   | 12 ++---
 src/pages/Analytics/index.jsx                 | 12 ++---
 src/pages/Documents/index.jsx                 | 12 +++--
 src/pages/Telemetry/index.jsx                 | 17 +++----
 src/pages/TelemetryAnalysis/index.jsx         | 17 ++++---
 src/pages/Well.jsx                            | 24 +++++-----
 src/pages/WellOperations/index.jsx            | 20 ++++-----
 12 files changed, 132 insertions(+), 87 deletions(-)
 create mode 100644 src/components/Private/PrivateMenu.tsx

diff --git a/src/components/Private/PrivateMenu.tsx b/src/components/Private/PrivateMenu.tsx
new file mode 100644
index 0000000..1a06311
--- /dev/null
+++ b/src/components/Private/PrivateMenu.tsx
@@ -0,0 +1,45 @@
+import { join } from 'path'
+import { Menu, MenuItemProps, MenuProps } from 'antd'
+import { Children, cloneElement, memo, ReactElement } from 'react'
+import { Link, useLocation } from 'react-router-dom'
+
+import { isURLAvailable } from '@utils/permissions'
+
+export type PrivateMenuProps = MenuProps & { root?: string }
+
+export type PrivateMenuLinkProps = MenuItemProps & {
+    tabName?: string
+    path?: string
+    title: string
+    visible?: boolean 
+}
+
+export const PrivateMenuLink = memo<PrivateMenuLinkProps>(({ tabName = '', path = '', title, ...other }) => {
+    const location = useLocation()
+    return (
+        <Menu.Item key={tabName} {...other}>
+            <Link to={{ pathname: path, state: { from: location.pathname }}}>{title}</Link>
+        </Menu.Item>
+    )
+})
+
+const PrivateMenuMain = memo<PrivateMenuProps>(({ root = '', children, ...other }) => {
+    const items = Children.toArray(children).map((child) => {
+        const element = child as ReactElement
+        let key = element.key?.toString()
+        const visible: boolean | undefined = element.props.visible
+        if (key && visible !== false) {
+            key = key.slice(key.lastIndexOf('$') + 1) // Ключ автоматический преобразуется в "(.+)\$ключ"
+            const path = join(root, key)
+            if (visible || isURLAvailable(path))
+                return cloneElement(element, { key, path, tabName: key })
+        }
+        return null
+    })
+
+    return <Menu children={items} {...other} />
+})
+
+export const PrivateMenu = Object.assign(PrivateMenuMain, { Link: PrivateMenuLink })
+
+export default PrivateMenu
diff --git a/src/components/Private/PrivateMenuItem.tsx b/src/components/Private/PrivateMenuItem.tsx
index fd48ee9..1d0d101 100755
--- a/src/components/Private/PrivateMenuItem.tsx
+++ b/src/components/Private/PrivateMenuItem.tsx
@@ -1,22 +1,22 @@
 import { join } from 'path'
 import { Menu, MenuItemProps } from 'antd'
 import { memo, NamedExoticComponent } from 'react'
+import { Link, useLocation } from 'react-router-dom'
 
 import { isURLAvailable } from '@utils/permissions'
-import { Link, useLocation } from 'react-router-dom'
 
 export type PrivateMenuItemProps = MenuItemProps & {
     root: string
     path: string
 }
 
-export type PrivateMenuLinkProps = MenuItemProps & {
+export type PrivateMenuItemLinkProps = MenuItemProps & {
     root?: string
     path: string
     title: string
 }
 
-export const PrivateMenuItemLink = memo<PrivateMenuLinkProps>(({ root = '', path, title, ...other }) => {
+export const PrivateMenuItemLink = memo<PrivateMenuItemLinkProps>(({ root = '', path, title, ...other }) => {
     const location = useLocation()
     return (
         <PrivateMenuItem key={path} root={root} path={path} {...other}>
@@ -26,9 +26,9 @@ export const PrivateMenuItemLink = memo<PrivateMenuLinkProps>(({ root = '', path
 })
 
 export const PrivateMenuItem: NamedExoticComponent<PrivateMenuItemProps> & {
-    Link: NamedExoticComponent<PrivateMenuLinkProps>
+    Link: NamedExoticComponent<PrivateMenuItemLinkProps>
 } = Object.assign(memo<PrivateMenuItemProps>(({ root, path, ...other }) =>
-    isURLAvailable(join(root, path)) ? <Menu.Item key={path} {...other}/> : null
+    <Menu.Item key={path} hidden={!isURLAvailable(join(root, path))} {...other} />
 ), {
     Link: PrivateMenuItemLink
 })
diff --git a/src/components/Private/index.ts b/src/components/Private/index.ts
index d37eb64..61de54c 100755
--- a/src/components/Private/index.ts
+++ b/src/components/Private/index.ts
@@ -1,9 +1,11 @@
 export { PrivateRoute, defaultRedirect } from './PrivateRoute'
-export { PrivateContent } from './PrivateContent'
-export { PrivateMenuItem, PrivateMenuItemLink } from './PrivateMenuItem'
+export { PrivateContent } from './PrivateContent' // TODO: Remove
+export { PrivateMenuItem, PrivateMenuItemLink } from './PrivateMenuItem' // TODO: Remove
 export { PrivateDefaultRoute } from './PrivateDefaultRoute'
+export { PrivateMenu, PrivateMenuLink } from './PrivateMenu'
 
 export type { PrivateRouteProps } from './PrivateRoute'
-export type { PrivateContentProps } from './PrivateContent'
-export type { PrivateMenuItemProps, PrivateMenuLinkProps } from './PrivateMenuItem'
+export type { PrivateContentProps } from './PrivateContent' // TODO: Remove
+export type { PrivateMenuItemProps, PrivateMenuItemLinkProps } from './PrivateMenuItem' // TODO: Remove
 export type { PrivateDefaultRouteProps } from './PrivateDefaultRoute'
+export type { PrivateMenuProps, PrivateMenuLinkProps } from './PrivateMenu'
diff --git a/src/pages/AdminPanel/Telemetry/index.jsx b/src/pages/AdminPanel/Telemetry/index.jsx
index 0db46d6..7ad8b46 100755
--- a/src/pages/AdminPanel/Telemetry/index.jsx
+++ b/src/pages/AdminPanel/Telemetry/index.jsx
@@ -1,8 +1,8 @@
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { lazy, memo, Suspense } from 'react'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateMenuItem, PrivateRoute, PrivateDefaultRoute } from '@components/Private'
+import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
 
 import { SuspenseFallback } from '@pages/SuspenseFallback'
 
@@ -16,10 +16,10 @@ export const Telemetry = memo(() => {
 
     return (
         <Layout>
-            <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
-                <PrivateMenuItem.Link root={rootPath} key={'viewer'} path={'viewer'} title={'Просмотр'} />
-                <PrivateMenuItem.Link root={rootPath} key={'merger'} path={'merger'} title={'Объединение'} />
-            </Menu>
+            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
+                <PrivateMenu.Link key={'viewer'} title={'Просмотр'} />
+                <PrivateMenu.Link key={'merger'} title={'Объединение'} />
+            </PrivateMenu>
 
             <Layout>
                 <Layout.Content className={'site-layout-background'}>
diff --git a/src/pages/AdminPanel/index.jsx b/src/pages/AdminPanel/index.jsx
index 6be3a32..124ec08 100755
--- a/src/pages/AdminPanel/index.jsx
+++ b/src/pages/AdminPanel/index.jsx
@@ -1,8 +1,8 @@
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { lazy, memo, Suspense } from 'react'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateMenuItem, PrivateRoute, PrivateDefaultRoute } from '@components/Private'
+import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
 
 import { SuspenseFallback } from '@pages/SuspenseFallback'
 
@@ -24,18 +24,18 @@ export const AdminPanel = memo(() => {
 
     return (
         <Layout>
-            <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
-                <PrivateMenuItem.Link root={rootPath} key={'deposit'     } path={'deposit'     } title={'Месторождения'   } />
-                <PrivateMenuItem.Link root={rootPath} key={'cluster'     } path={'cluster'     } title={'Кусты'           } />
-                <PrivateMenuItem.Link root={rootPath} key={'well'        } path={'well'        } title={'Скважины'        } />
-                <PrivateMenuItem.Link root={rootPath} key={'user'        } path={'user'        } title={'Пользователи'    } />
-                <PrivateMenuItem.Link root={rootPath} key={'company'     } path={'company'     } title={'Компании'        } />
-                <PrivateMenuItem.Link root={rootPath} key={'company_type'} path={'company_type'} title={'Типы компаний'   } />
-                <PrivateMenuItem.Link root={rootPath} key={'role'        } path={'role'        } title={'Роли'            } />
-                <PrivateMenuItem.Link root={rootPath} key={'permission'  } path={'permission'  } title={'Разрешения'      } />
-                <PrivateMenuItem.Link root={rootPath} key={'telemetry'   } path={'telemetry'   } title={'Телеметрия'      } />
-                <PrivateMenuItem.Link root={rootPath} key={'visit_log'   } path={'visit_log'   } title={'Журнал посещений'} />
-            </Menu>
+            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
+                <PrivateMenu.Link key={'deposit'     } title={'Месторождения'   } />
+                <PrivateMenu.Link key={'cluster'     } title={'Кусты'           } />
+                <PrivateMenu.Link key={'well'        } title={'Скважины'        } />
+                <PrivateMenu.Link key={'user'        } title={'Пользователи'    } />
+                <PrivateMenu.Link key={'company'     } title={'Компании'        } />
+                <PrivateMenu.Link key={'company_type'} title={'Типы компаний'   } />
+                <PrivateMenu.Link key={'role'        } title={'Роли'            } />
+                <PrivateMenu.Link key={'permission'  } title={'Разрешения'      } />
+                <PrivateMenu.Link key={'telemetry'   } title={'Телеметрия'      } />
+                <PrivateMenu.Link key={'visit_log'   } title={'Журнал посещений'} />
+            </PrivateMenu>
 
             <Layout>
                 <Layout.Content className={'site-layout-background'}>
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
index 80f3534..8035989 100755
--- a/src/pages/Analytics/WellCompositeEditor/index.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/index.jsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, memo } from 'react'
 import { Switch, useParams } from 'react-router-dom'
-import { Col, Layout, Menu, Row } from 'antd'
+import { Col, Layout, Row } from 'antd'
 
 import {
     OperationStatService,
@@ -10,7 +10,7 @@ import { arrayOrDefault } from '@utils'
 import LoaderPortal from '@components/LoaderPortal'
 import WellSelector from '@components/selectors/WellSelector'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { PrivateDefaultRoute, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
+import { PrivateDefaultRoute, PrivateMenu, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
 
 import ClusterWells from '@pages/Cluster/ClusterWells'
 import { WellCompositeSections } from './WellCompositeSections'
@@ -67,10 +67,10 @@ export const WellCompositeEditor = memo(({ idWell, rootPath }) => {
                     />
                 </Col>
                 <Col span={6}>
-                    <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                        <PrivateMenuItemLink root={rootPath} key={'wells'} path={'wells'} title={'Статистика по скважинам'} />
-                        <PrivateMenuItemLink root={rootPath} key={'sections'} path={'sections'} title={'Статистика по секциям'} />
-                    </Menu>
+                    <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
+                        <PrivateMenuItemLink key={'wells'} title={'Статистика по скважинам'} />
+                        <PrivateMenuItemLink key={'sections'} title={'Статистика по секциям'} />
+                    </PrivateMenu>
                 </Col>
             </Row>
             <Layout>
diff --git a/src/pages/Analytics/index.jsx b/src/pages/Analytics/index.jsx
index bac5683..bbe5243 100755
--- a/src/pages/Analytics/index.jsx
+++ b/src/pages/Analytics/index.jsx
@@ -1,8 +1,8 @@
 import { memo, useMemo } from 'react'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateDefaultRoute, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
+import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
 
 import WellCompositeEditor from './WellCompositeEditor'
 import Statistics from './Statistics'
@@ -13,10 +13,10 @@ export const Analytics = memo(({ idWell }) => {
 
     return (
         <Layout>
-            <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                <PrivateMenuItemLink root={rootPath} key={'composite'} path={'composite'} title={'Композитная скважина'} />
-                <PrivateMenuItemLink root={rootPath} key={'statistics'} path={'statistics'} title={'Оценка по ЦБ'} />
-            </Menu>
+            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
+                <PrivateMenu.Link key={'composite'} title={'Композитная скважина'} />
+                <PrivateMenu.Link key={'statistics'} title={'Оценка по ЦБ'} />
+            </PrivateMenu>
             <Layout>
                 <Layout.Content>
                     <Switch>
diff --git a/src/pages/Documents/index.jsx b/src/pages/Documents/index.jsx
index 5452d63..e429b20 100755
--- a/src/pages/Documents/index.jsx
+++ b/src/pages/Documents/index.jsx
@@ -1,10 +1,10 @@
 import { join } from 'path'
 import { memo, useMemo } from 'react'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { FolderOutlined } from '@ant-design/icons'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateDefaultRoute, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
+import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
 
 import DocumentsTemplate from './DocumentsTemplate'
 
@@ -29,18 +29,16 @@ export const MenuDocuments = memo(({ idWell }) => {
 
   return (
     <>
-      <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[category]}>
+      <PrivateMenu root={root} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[category]}>
         {documentCategories.map(category => (
-          <PrivateMenuItemLink
-            root={root}
+          <PrivateMenu.Link
             key={`${category.key}`}
-            path={`${category.key}`}
             className={'ant-menu-item'}
             icon={<FolderOutlined/>}
             title={category.title}
           />
         ))}
-      </Menu>
+      </PrivateMenu>
       <Layout>
         <Content className={'site-layout-background'}>
           <Switch>
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 524fef1..77026e1 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -1,9 +1,10 @@
 import { Switch, useParams } from 'react-router-dom'
 import { memo, useMemo } from 'react'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { AlertOutlined, FundViewOutlined, DatabaseOutlined } from '@ant-design/icons'
 
-import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/Private'
+import PrivateMenu from '@components/Private/PrivateMenu'
+import { PrivateRoute, PrivateDefaultRoute } from '@components/Private'
 
 import Archive from './Archive'
 import Messages from './Messages'
@@ -20,12 +21,12 @@ export const Telemetry = memo(({ idWell }) => {
 
   return (
     <Layout>
-      <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-        <PrivateMenuItem.Link root={rootPath} key={'monitoring'} path={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
-        <PrivateMenuItem.Link root={rootPath} key={'messages'} path={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
-        <PrivateMenuItem.Link root={rootPath} key={'archive'} path={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
-        <PrivateMenuItem.Link root={rootPath} key={'dashboard_nnb'} path={'dashboard_nnb'} title={'ННБ'} />
-      </Menu>
+      <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+        <PrivateMenu.Link key={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
+        <PrivateMenu.Link key={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
+        <PrivateMenu.Link key={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
+        <PrivateMenu.Link key={'dashboard_nnb'} title={'ННБ'} />
+      </PrivateMenu>
 
       <Layout>
         <Content className={'site-layout-background'}>
diff --git a/src/pages/TelemetryAnalysis/index.jsx b/src/pages/TelemetryAnalysis/index.jsx
index 3c7e8ca..1cd423c 100755
--- a/src/pages/TelemetryAnalysis/index.jsx
+++ b/src/pages/TelemetryAnalysis/index.jsx
@@ -1,10 +1,9 @@
 import { memo } from 'react'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { FolderOutlined } from '@ant-design/icons'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateDefaultRoute, PrivateRoute } from '@components/Private'
-import { PrivateMenuItemLink } from '@components/Private/PrivateMenuItem'
+import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
 
 import TelemetryAnalysisDepthToDay from './TelemetryAnalysisDepthToDay'
 import TelemetryAnalysisDepthToInterval from './TelemetryAnalysisDepthToInterval'
@@ -19,12 +18,12 @@ export const TelemetryAnalysis = memo(({ idWell }) => {
 
     return (
         <>
-            <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                <PrivateMenuItemLink root={rootPath} icon={<FolderOutlined />} key={'depthToDay'} path={'depthToDay'} title={'Глубина-день'} />
-                <PrivateMenuItemLink root={rootPath} icon={<FolderOutlined />} key={'depthToInterval'} path={'depthToInterval'} title={'Глубина-интервал'} />
-                <PrivateMenuItemLink root={rootPath} icon={<FolderOutlined />} key={'operationsSummary'} path={'operationsSummary'} title={'Все операции'} />
-                <PrivateMenuItemLink root={rootPath} icon={<FolderOutlined />} key={'operationsToInterval'} path={'operationsToInterval'} title={'Операции-интервал'} />
-            </Menu>
+            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
+                <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToDay'} title={'Глубина-день'} />
+                <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToInterval'} title={'Глубина-интервал'} />
+                <PrivateMenu.Link icon={<FolderOutlined />} key={'operationsSummary'} title={'Все операции'} />
+                <PrivateMenu.Link icon={<FolderOutlined />} key={'operationsToInterval'} title={'Операции-интервал'} />
+            </PrivateMenu>
 
             <Layout>
                 <Content className={'site-layout-background'}>
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 8c4aab8..41bae5e 100755
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -6,10 +6,10 @@ import {
   ExperimentOutlined,
   DeploymentUnitOutlined,
 } from '@ant-design/icons'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateRoute, PrivateDefaultRoute, PrivateMenuItem } from '@components/Private'
+import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
 
 import Report from './Report'
 import Measure from './Measure'
@@ -30,16 +30,16 @@ export const Well = memo(() => {
 
   return (
     <Layout>
-      <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-        <PrivateMenuItem.Link root={rootPath} key={'telemetry'} path={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
-        <PrivateMenuItem.Link root={rootPath} key={'report'} path={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
-        <PrivateMenuItem.Link root={rootPath} key={'analytics'} path={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
-        <PrivateMenuItem.Link root={rootPath} key={'operations'} path={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
-        {/* <PrivateMenuItem.Link root={rootPath} key={'telemetryAnalysis'} path={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
-        <PrivateMenuItem.Link root={rootPath} key={'document'} path={'document'} icon={<FolderOutlined />} title={'Документы'} />
-        <PrivateMenuItem.Link root={rootPath} key={'measure'} path={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
-        <PrivateMenuItem.Link root={rootPath} key={'drillingProgram'} path={'drillingProgram'} icon={<FolderOutlined />} title={'Программа бурения'} />
-      </Menu>
+      <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+        <PrivateMenu.Link key={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
+        <PrivateMenu.Link key={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
+        <PrivateMenu.Link key={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
+        <PrivateMenu.Link key={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
+        {/* <PrivateMenu.Link key={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
+        <PrivateMenu.Link key={'document'} icon={<FolderOutlined />} title={'Документы'} />
+        <PrivateMenu.Link key={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
+        <PrivateMenu.Link key={'drillingProgram'} icon={<FolderOutlined />} title={'Программа бурения'} />
+      </PrivateMenu>
 
       <Layout>
         <Content className={'site-layout-background'}>
diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx
index cedad37..5e14dd3 100755
--- a/src/pages/WellOperations/index.jsx
+++ b/src/pages/WellOperations/index.jsx
@@ -1,5 +1,5 @@
 import { memo, useCallback } from 'react'
-import { Layout, Menu } from 'antd'
+import { Layout } from 'antd'
 import { Switch, useParams, useHistory, useLocation } from 'react-router-dom'
 import {
   BarChartOutlined,
@@ -9,7 +9,7 @@ import {
   TableOutlined,
 } from '@ant-design/icons'
 
-import { PrivateDefaultRoute, PrivateRoute, PrivateMenuItemLink } from '@components/Private'
+import { PrivateDefaultRoute, PrivateRoute, PrivateMenu } from '@components/Private'
 
 import { Tvd } from './Tvd'
 import { ImportExportBar } from './ImportExportBar'
@@ -36,14 +36,14 @@ export const WellOperations = memo(({ idWell }) => {
   return(
     <>
       <Flex style={{ width: '100%' }}>
-        <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]} style={{ flex: 1 }}>
-          <PrivateMenuItemLink root={rootPath} icon={<LineChartOutlined />} key={'tvd'} path={'tvd'} title={'TVD'} />
-          <PrivateMenuItemLink root={rootPath} icon={<BuildOutlined />} key={'sections'} path={'sections'} title={'Секции'} />
-          <PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'plan'} path={'plan'} title={'План'} />
-          <PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'fact'} path={'fact'} title={'Факт'} />
-          <PrivateMenuItemLink root={rootPath} icon={<BarChartOutlined />} key={'drillProcessFlow'} path={'drillProcessFlow'} title={'РТК'} />
-          <PrivateMenuItemLink root={rootPath} icon={<ControlOutlined />} key={'params'} path={'params'} title={'Режимы'} />
-        </Menu>
+        <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]} style={{ flex: 1 }}>
+          <PrivateMenu.Link icon={<LineChartOutlined />} key={'tvd'} title={'TVD'} />
+          <PrivateMenu.Link icon={<BuildOutlined />} key={'sections'} title={'Секции'} />
+          <PrivateMenu.Link icon={<TableOutlined />} key={'plan'} title={'План'} />
+          <PrivateMenu.Link icon={<TableOutlined />} key={'fact'} title={'Факт'} />
+          <PrivateMenu.Link icon={<BarChartOutlined />} key={'drillProcessFlow'} title={'РТК'} />
+          <PrivateMenu.Link icon={<ControlOutlined />} key={'params'} title={'Режимы'} />
+        </PrivateMenu>
         <ImportExportBar idWell={idWell} disabled={isIEBarDisabled} onImported={onImported}/>
       </Flex>
       <Layout>

From 30f33e407657bbb487f6c7799ee0225b7deb98bb Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 15:38:53 +0500
Subject: [PATCH 21/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81=D1=82?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20rootPath=20=D0=B8=20idWell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 concept/Smbo/EquipmentDetails.jsx             |  8 +-
 src/components/Private/PrivateMenu.tsx        | 14 ++-
 src/components/Private/PrivateSwitch.tsx      | 75 +++++++++++++++
 src/components/Private/index.ts               |  2 +
 src/pages/AdminPanel/Telemetry/index.jsx      | 48 +++++-----
 src/pages/AdminPanel/UserController/index.jsx |  2 +-
 src/pages/AdminPanel/index.jsx                | 88 ++++++++----------
 src/pages/Analytics/Statistics.jsx            |  8 +-
 .../WellCompositeEditor/NewParamsTable.jsx    |  7 +-
 .../WellCompositeSections.jsx                 | 11 ++-
 .../Analytics/WellCompositeEditor/index.jsx   | 36 +++-----
 src/pages/Analytics/index.jsx                 | 45 +++++----
 src/pages/Documents/DocumentsTemplate.jsx     |  9 +-
 src/pages/Documents/index.jsx                 | 34 +++----
 src/pages/DrillingProgram/CategoryAdder.jsx   |  8 +-
 src/pages/DrillingProgram/CategoryEditor.jsx  |  8 +-
 src/pages/DrillingProgram/CategoryHistory.jsx |  7 +-
 src/pages/DrillingProgram/CategoryRender.jsx  |  7 +-
 src/pages/DrillingProgram/index.jsx           | 16 ++--
 src/pages/Main.jsx                            | 58 ++++++------
 src/pages/Measure/MeasureTable.jsx            |  7 +-
 src/pages/Measure/index.jsx                   |  8 +-
 src/pages/Report/Reports.jsx                  |  7 +-
 src/pages/Report/index.jsx                    |  9 +-
 src/pages/Telemetry/Archive/index.jsx         |  7 +-
 src/pages/Telemetry/DashboardNNB/index.jsx    | 20 ++--
 src/pages/Telemetry/Messages.jsx              | 49 +++-------
 .../TelemetryView/ActiveMessagesOnline.jsx    |  7 +-
 .../Setpoints/SetpointSender.jsx              |  8 +-
 .../TelemetryView/Setpoints/index.jsx         |  8 +-
 .../TelemetryView/WirelineRunOut.jsx          |  8 +-
 src/pages/Telemetry/TelemetryView/index.jsx   | 13 ++-
 src/pages/Telemetry/index.jsx                 | 63 ++++++-------
 .../TelemetryAnalysisDepthToDay.jsx           |  8 +-
 .../TelemetryAnalysisDepthToInterval.jsx      | 12 ++-
 .../TelemetryAnalysisOperationsSummary.jsx    |  8 +-
 .../TelemetryAnalysisOperationsToInterval.jsx |  2 +-
 src/pages/TelemetryAnalysis/index.jsx         | 46 ++++------
 src/pages/Well.jsx                            | 92 ++++++++-----------
 src/pages/WellOperations/DrillProcessFlow.jsx |  8 +-
 src/pages/WellOperations/Tvd/index.jsx        |  8 +-
 src/pages/WellOperations/WellDrillParams.jsx  |  8 +-
 .../WellOperations/WellOperationsEditor.jsx   |  8 +-
 src/pages/WellOperations/WellSectionsStat.jsx | 10 +-
 src/pages/WellOperations/index.jsx            | 61 +++++-------
 45 files changed, 530 insertions(+), 446 deletions(-)
 create mode 100644 src/components/Private/PrivateSwitch.tsx

diff --git a/concept/Smbo/EquipmentDetails.jsx b/concept/Smbo/EquipmentDetails.jsx
index 5178236..24b18a7 100755
--- a/concept/Smbo/EquipmentDetails.jsx
+++ b/concept/Smbo/EquipmentDetails.jsx
@@ -1,8 +1,10 @@
 import {Row, Col} from 'antd'
-import Documents from '../Documents/DocumentsTemplate'
-import '../../styles/equipment_details.css'
 
-export default function EquipmentDetails({id, equipmentTimers, equipmentSensors}) {
+import Documents from '../Documents/DocumentsTemplate'
+
+import '@styles/equipment_details.css'
+
+export default function EquipmentDetails({ id, equipmentTimers, equipmentSensors }) {
   let stateOfEquipmentDetails = equipmentTimers.map(timer => {
     return(
       <p key={timer.label}>{timer.label}: <span className="right-text"><b>{timer.value} {timer.unit}</b></span></p>
diff --git a/src/components/Private/PrivateMenu.tsx b/src/components/Private/PrivateMenu.tsx
index 1a06311..6894518 100644
--- a/src/components/Private/PrivateMenu.tsx
+++ b/src/components/Private/PrivateMenu.tsx
@@ -1,9 +1,10 @@
 import { join } from 'path'
 import { Menu, MenuItemProps, MenuProps } from 'antd'
-import { Children, cloneElement, memo, ReactElement } from 'react'
+import { Children, cloneElement, memo, ReactElement, useContext, useMemo } from 'react'
 import { Link, useLocation } from 'react-router-dom'
 
 import { isURLAvailable } from '@utils/permissions'
+import { RootPathContext } from '@pages/Main'
 
 export type PrivateMenuProps = MenuProps & { root?: string }
 
@@ -23,19 +24,22 @@ export const PrivateMenuLink = memo<PrivateMenuLinkProps>(({ tabName = '', path
     )
 })
 
-const PrivateMenuMain = memo<PrivateMenuProps>(({ root = '', children, ...other }) => {
-    const items = Children.toArray(children).map((child) => {
+const PrivateMenuMain = memo<PrivateMenuProps>(({ root, children, ...other }) => {
+    const rootContext = useContext(RootPathContext)
+    const rootPath = useMemo(() => root ?? rootContext ?? '', [root, rootContext])
+
+    const items = useMemo(() => Children.toArray(children).map((child) => {
         const element = child as ReactElement
         let key = element.key?.toString()
         const visible: boolean | undefined = element.props.visible
         if (key && visible !== false) {
             key = key.slice(key.lastIndexOf('$') + 1) // Ключ автоматический преобразуется в "(.+)\$ключ"
-            const path = join(root, key)
+            const path = join(rootPath, key)
             if (visible || isURLAvailable(path))
                 return cloneElement(element, { key, path, tabName: key })
         }
         return null
-    })
+    }), [children, rootPath])
 
     return <Menu children={items} {...other} />
 })
diff --git a/src/components/Private/PrivateSwitch.tsx b/src/components/Private/PrivateSwitch.tsx
new file mode 100644
index 0000000..57911ed
--- /dev/null
+++ b/src/components/Private/PrivateSwitch.tsx
@@ -0,0 +1,75 @@
+import { join } from 'path'
+import { Location } from 'history'
+import { Children, cloneElement, memo, ReactElement, ReactNode, useCallback, useContext, useMemo } from 'react'
+
+import { Redirect, Route, Switch, SwitchProps, useLocation } from 'react-router-dom'
+import { isURLAvailable } from '@utils/permissions'
+import { getUserId } from '@utils/storage'
+
+import { RootPathContext } from '@pages/Main'
+
+export type PrivateSwitchProps = SwitchProps & {
+    root?: string
+    redirect?: (location?: Location<unknown>) => ReactNode
+    elseRedirect?: string | string[]
+}
+
+const getDefaultRedirectPath = () => getUserId() ? '/access_denied' : '/login'
+
+export const defaultRedirect = (location?: Location<unknown>) => (
+    <Redirect to={{ pathname: getDefaultRedirectPath(), state: { from: location?.pathname } }} />
+)
+
+export const PrivateSwitch = memo<PrivateSwitchProps>(({ root, elseRedirect, redirect = defaultRedirect, children }) => {
+    const rootContext = useContext(RootPathContext)
+    const rootPath = useMemo(() => root ?? rootContext ?? '', [root, rootContext])
+
+    const location = useLocation()
+
+    const toAbsolute = useCallback((path: string) => path.startsWith('/') ? path : join(rootPath, path), [rootPath])
+
+    const items = useMemo(() => Children.toArray(children).map((child) => {
+        const element = child as ReactElement
+        let key = element.key?.toString()
+        if (!key) return null
+        key = key.slice(key.lastIndexOf('$') + 1).replaceAll('=2', ':')
+        // Ключ автоматический преобразуется в "(.+)\$ключ"
+        // Все ":" в ключе заменяются на "=2"
+        // TODO: улучшить метод нормализации ключа
+        const path = toAbsolute(key)
+        return (
+            <Route
+                key={key}
+                path={path}
+                render={({ location }) => isURLAvailable(path) ? cloneElement(element) : redirect(location)}
+            />
+        )
+    }), [children, redirect, toAbsolute])
+
+    const defaultRoute = useMemo(() => {
+        if (!elseRedirect) {
+            const path = items.map((elm) => elm?.props.path).find((path) => path && isURLAvailable(path))
+            if (path) return path
+        } else if (Array.isArray(elseRedirect)) {
+            const path = elseRedirect.find((path) => {
+                if (!path) return false
+                return isURLAvailable(toAbsolute(path))
+            })
+            if (path) return toAbsolute(path)
+        } else if(elseRedirect && isURLAvailable(toAbsolute(elseRedirect))) {
+            return toAbsolute(elseRedirect)
+        }
+        return getDefaultRedirectPath()
+    }, [items, elseRedirect, toAbsolute])
+
+    return (
+        <Switch>
+            {items}
+            <Route path={'/'}>
+                <Redirect to={{ pathname: defaultRoute, state: { from: location.pathname } }} />
+            </Route>
+        </Switch>
+    )
+})
+
+export default PrivateSwitch
diff --git a/src/components/Private/index.ts b/src/components/Private/index.ts
index 61de54c..b9cd980 100755
--- a/src/components/Private/index.ts
+++ b/src/components/Private/index.ts
@@ -3,9 +3,11 @@ export { PrivateContent } from './PrivateContent' // TODO: Remove
 export { PrivateMenuItem, PrivateMenuItemLink } from './PrivateMenuItem' // TODO: Remove
 export { PrivateDefaultRoute } from './PrivateDefaultRoute'
 export { PrivateMenu, PrivateMenuLink } from './PrivateMenu'
+export { PrivateSwitch } from './PrivateSwitch'
 
 export type { PrivateRouteProps } from './PrivateRoute'
 export type { PrivateContentProps } from './PrivateContent' // TODO: Remove
 export type { PrivateMenuItemProps, PrivateMenuItemLinkProps } from './PrivateMenuItem' // TODO: Remove
 export type { PrivateDefaultRouteProps } from './PrivateDefaultRoute'
 export type { PrivateMenuProps, PrivateMenuLinkProps } from './PrivateMenu'
+export type { PrivateSwitchProps } from './PrivateSwitch'
diff --git a/src/pages/AdminPanel/Telemetry/index.jsx b/src/pages/AdminPanel/Telemetry/index.jsx
index 7ad8b46..9a145e0 100755
--- a/src/pages/AdminPanel/Telemetry/index.jsx
+++ b/src/pages/AdminPanel/Telemetry/index.jsx
@@ -1,41 +1,41 @@
 import { Layout } from 'antd'
-import { lazy, memo, Suspense } from 'react'
-import { Switch, useParams } from 'react-router-dom'
+import { lazy, memo, Suspense, useContext, useMemo } from 'react'
+import { useParams } from 'react-router-dom'
 
-import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import { SuspenseFallback } from '@pages/SuspenseFallback'
+import { RootPathContext } from '@pages/Main'
 
 const TelemetryViewer = lazy(() => import('./TelemetryViewer'))
 const TelemetryMerger = lazy(() => import('./TelemetryMerger'))
 
-const rootPath = '/admin/telemetry'
-
 export const Telemetry = memo(() => {
     const { tab } = useParams()
 
-    return (
-        <Layout>
-            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
-                <PrivateMenu.Link key={'viewer'} title={'Просмотр'} />
-                <PrivateMenu.Link key={'merger'} title={'Объединение'} />
-            </PrivateMenu>
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/telemetry`, [root])
 
+    return (
+        <RootPathContext.Provider value={rootPath}>
             <Layout>
-                <Layout.Content className={'site-layout-background'}>
-                    <Suspense fallback={<SuspenseFallback />}>
-                        <Switch>
-                            <PrivateRoute path={`${rootPath}/viewer`} component={TelemetryViewer} />
-                            <PrivateRoute path={`${rootPath}/merger`} component={TelemetryMerger} />
-                            <PrivateDefaultRoute urls={[
-                                `${rootPath}/viewer`,
-                                `${rootPath}/merger`,
-                            ]}/>
-                        </Switch>
-                    </Suspense>
-                </Layout.Content>
+                <PrivateMenu mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
+                    <PrivateMenu.Link key={'viewer'} title={'Просмотр'} />
+                    <PrivateMenu.Link key={'merger'} title={'Объединение'} />
+                </PrivateMenu>
+
+                <Layout>
+                    <Layout.Content className={'site-layout-background'}>
+                        <Suspense fallback={<SuspenseFallback />}>
+                            <PrivateSwitch elseRedirect={['viewer', 'merger']}>
+                                <TelemetryViewer key={'viewer'} />
+                                <TelemetryMerger key={'merger'} />
+                            </PrivateSwitch>
+                        </Suspense>
+                    </Layout.Content>
+                </Layout>
             </Layout>
-        </Layout>
+        </RootPathContext.Provider>
     )
 })
 
diff --git a/src/pages/AdminPanel/UserController/index.jsx b/src/pages/AdminPanel/UserController/index.jsx
index 2152cd4..c090d73 100755
--- a/src/pages/AdminPanel/UserController/index.jsx
+++ b/src/pages/AdminPanel/UserController/index.jsx
@@ -188,7 +188,7 @@ export const UserController = memo(() => {
                     allowClear
                     placeholder={'Введите текст для поиска (по всем полям за исключением ролей)...'}
                     onChange={onSearchTextChange}
-                    style={{ marginBottom: '15px' }}
+                    style={{ margin: '15px 0' }}
                     loading={isSearching}
                 />
                 <EditableTable
diff --git a/src/pages/AdminPanel/index.jsx b/src/pages/AdminPanel/index.jsx
index 124ec08..8963f67 100755
--- a/src/pages/AdminPanel/index.jsx
+++ b/src/pages/AdminPanel/index.jsx
@@ -1,9 +1,10 @@
 import { Layout } from 'antd'
-import { lazy, memo, Suspense } from 'react'
-import { Switch, useParams } from 'react-router-dom'
+import { lazy, memo, Suspense, useContext, useMemo } from 'react'
+import { useParams } from 'react-router-dom'
 
-import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
+import { RootPathContext } from '@pages/Main'
 import { SuspenseFallback } from '@pages/SuspenseFallback'
 
 const     ClusterController = lazy(() => import(    './ClusterController'))
@@ -17,57 +18,48 @@ const  PermissionController = lazy(() => import( './PermissionController'))
 const      TelemetrySection = lazy(() => import(            './Telemetry'))
 const              VisitLog = lazy(() => import(             './VisitLog'))
 
-const rootPath = '/admin'
-
 export const AdminPanel = memo(() => {
     const { tab } = useParams()
 
-    return (
-        <Layout>
-            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
-                <PrivateMenu.Link key={'deposit'     } title={'Месторождения'   } />
-                <PrivateMenu.Link key={'cluster'     } title={'Кусты'           } />
-                <PrivateMenu.Link key={'well'        } title={'Скважины'        } />
-                <PrivateMenu.Link key={'user'        } title={'Пользователи'    } />
-                <PrivateMenu.Link key={'company'     } title={'Компании'        } />
-                <PrivateMenu.Link key={'company_type'} title={'Типы компаний'   } />
-                <PrivateMenu.Link key={'role'        } title={'Роли'            } />
-                <PrivateMenu.Link key={'permission'  } title={'Разрешения'      } />
-                <PrivateMenu.Link key={'telemetry'   } title={'Телеметрия'      } />
-                <PrivateMenu.Link key={'visit_log'   } title={'Журнал посещений'} />
-            </PrivateMenu>
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/admin`, [root])
 
+    return (
+        <RootPathContext.Provider value={rootPath}>
             <Layout>
-                <Layout.Content className={'site-layout-background'}>
-                    <Suspense fallback={<SuspenseFallback />}>
-                        <Switch>
-                            <PrivateRoute path={`${rootPath}/deposit`        } component={    DepositController} />
-                            <PrivateRoute path={`${rootPath}/cluster`        } component={    ClusterController} />
-                            <PrivateRoute path={`${rootPath}/well`           } component={       WellController} />
-                            <PrivateRoute path={`${rootPath}/user`           } component={       UserController} />
-                            <PrivateRoute path={`${rootPath}/company`        } component={    CompanyController} />
-                            <PrivateRoute path={`${rootPath}/company_type`   } component={CompanyTypeController} />
-                            <PrivateRoute path={`${rootPath}/role`           } component={       RoleController} />
-                            <PrivateRoute path={`${rootPath}/permission`     } component={ PermissionController} />
-                            <PrivateRoute path={`${rootPath}/telemetry/:tab?`} component={TelemetrySection} />
-                            <PrivateRoute path={`${rootPath}/visit_log`      } component={VisitLog} />
-                            <PrivateDefaultRoute urls={[
-                                `${rootPath}/deposit`,
-                                `${rootPath}/cluster`,
-                                `${rootPath}/well`,
-                                `${rootPath}/user`,
-                                `${rootPath}/company`,
-                                `${rootPath}/company_type`,
-                                `${rootPath}/role`,
-                                `${rootPath}/permission`,
-                                `${rootPath}/telemetry`,
-                                `${rootPath}/visit_log`,
-                            ]}/>
-                        </Switch>
-                    </Suspense>
-                </Layout.Content>
+                <PrivateMenu mode={'horizontal'} selectable={true} selectedKeys={[tab]}>
+                    <PrivateMenu.Link key={'deposit'     } title={'Месторождения'   } />
+                    <PrivateMenu.Link key={'cluster'     } title={'Кусты'           } />
+                    <PrivateMenu.Link key={'well'        } title={'Скважины'        } />
+                    <PrivateMenu.Link key={'user'        } title={'Пользователи'    } />
+                    <PrivateMenu.Link key={'company'     } title={'Компании'        } />
+                    <PrivateMenu.Link key={'company_type'} title={'Типы компаний'   } />
+                    <PrivateMenu.Link key={'role'        } title={'Роли'            } />
+                    <PrivateMenu.Link key={'permission'  } title={'Разрешения'      } />
+                    <PrivateMenu.Link key={'telemetry'   } title={'Телеметрия'      } />
+                    <PrivateMenu.Link key={'visit_log'   } title={'Журнал посещений'} />
+                </PrivateMenu>
+
+                <Layout>
+                    <Layout.Content className={'site-layout-background'}>
+                        <Suspense fallback={<SuspenseFallback />}>
+                            <PrivateSwitch elseRedirect={['deposit', 'cluster', 'well', 'user', 'company', 'company_type', 'role', 'permission', 'telemetry', 'visit_log']}>
+                                <DepositController key={'deposit'} />
+                                <ClusterController key={'cluster'} />
+                                <WellController key={'well'} />
+                                <UserController key={'user'} />
+                                <CompanyController key={'company'} />
+                                <CompanyTypeController key={'company_type'} />
+                                <RoleController key={'role'} />
+                                <PermissionController key={'permission'} />
+                                <TelemetrySection key={'telemetry/:tab?'} />
+                                <VisitLog key={'visit_log'} />
+                            </PrivateSwitch>
+                        </Suspense>
+                    </Layout.Content>
+                </Layout>
             </Layout>
-        </Layout>
+        </RootPathContext.Provider>
     )
 })
 
diff --git a/src/pages/Analytics/Statistics.jsx b/src/pages/Analytics/Statistics.jsx
index c0ad71d..fabd3c1 100755
--- a/src/pages/Analytics/Statistics.jsx
+++ b/src/pages/Analytics/Statistics.jsx
@@ -1,5 +1,5 @@
 import { Table as RawTable, Typography } from 'antd'
-import { Fragment, memo, useCallback, useEffect, useState } from 'react'
+import { Fragment, memo, useCallback, useContext, useEffect, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -8,6 +8,8 @@ import { makeGroupColumn, makeNumericColumn, makeNumericRender, makeTextColumn,
 import { OperationStatService, WellOperationService } from '@api'
 import { arrayOrDefault } from '@utils'
 
+import { IdWellContext } from '../Well'
+
 import '@styles/index.css'
 import '@styles/statistics.less'
 
@@ -62,7 +64,7 @@ const getWellData = async (wellsList) => {
     return wellData
 }
 
-export const Statistics = memo(({ idWell }) => {
+export const Statistics = memo(() => {
     const [sectionTypes, setSectionTypes] = useState([])
     const [avgColumns, setAvgColumns] = useState(defaultColumns)
     const [cmpColumns, setCmpColumns] = useState(defaultColumns)
@@ -75,6 +77,8 @@ export const Statistics = memo(({ idWell }) => {
     const [cmpData, setCmpData] = useState([])
     const [avgRow, setAvgRow] = useState({})
 
+    const idWell = useContext(IdWellContext)
+
     const cmpSpeedRender = useCallback((key) => (section) => {
         let spanClass = ''
         // Дополнительная проверка на "null" необходима, чтобы значение "0" не стало исключением
diff --git a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
index 6998087..c353e4d 100755
--- a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
 import { Button, Modal, Popconfirm } from 'antd'
 
 import { Table } from '@components/Table'
@@ -6,14 +6,17 @@ import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DrillParamsService } from '@api'
 
+import { IdWellContext } from '@pages/Well'
 import { getColumns } from '@pages/WellOperations/WellDrillParams'
 
-export const NewParamsTable = memo(({ idWell, selectedWellsKeys }) => {
+export const NewParamsTable = memo(({ selectedWellsKeys }) => {
     const [params, setParams] = useState([])
     const [paramsColumns, setParamsColumns] = useState([])
     const [showParamsLoader, setShowParamsLoader] = useState(false)
     const [isParamsModalVisible, setIsParamsModalVisible] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => setParamsColumns(await getColumns(idWell))
     ), [idWell])
diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 7e1505a..38aa452 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -1,5 +1,5 @@
 import { Link, useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useMemo } from 'react'
+import { useState, useEffect, memo, useMemo, useContext } from 'react'
 import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
 import { Table, Tag, Button, Badge, Divider, Modal, Row, Col } from 'antd'
 
@@ -15,6 +15,7 @@ import {
   getOperations
 } from '@utils/functions'
 
+import { IdWellContext } from '@pages/Well'
 import { Tvd } from '@pages/WellOperations/Tvd'
 import WellOperationsTable from '@pages/Cluster/WellOperationsTable'
 import NewParamsTable from './NewParamsTable'
@@ -29,7 +30,7 @@ const sortBySectionId = (a, b) => a.sectionId - b.sectionId
 const filtersSectionsType = []
 const DAY_IN_MS = 1000 * 60 * 60 * 24
 
-export const WellCompositeSections = memo(({ idWell, statsWells, selectedSections }) => {
+export const WellCompositeSections = memo(({ statsWells, selectedSections }) => {
   const [selectedWells, setSelectedWells] = useState([])
   const [wellOperations, setWellOperations] = useState([])
   const [selectedWellsKeys, setSelectedWellsKeys] = useState([])
@@ -38,6 +39,8 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
   const [isTVDModalVisible, setIsTVDModalVisible] = useState(false)
   const [isOpsModalVisible, setIsOpsModalVisible] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   const location = useLocation()
 
   const rows = useMemo(() => {
@@ -208,9 +211,7 @@ export const WellCompositeSections = memo(({ idWell, statsWells, selectedSection
         pagination={false}
       />
       <Row justify={'end'} style={{ margin: '1rem 0' }}>
-        <Col>
-          <NewParamsTable idWell={idWell} selectedWellsKeys={selectedWellsKeys} />
-        </Col>
+        <Col><NewParamsTable selectedWellsKeys={selectedWellsKeys} /></Col>
       </Row>
 
       <Modal
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
index 8035989..8cecd33 100755
--- a/src/pages/Analytics/WellCompositeEditor/index.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/index.jsx
@@ -1,24 +1,23 @@
-import { useState, useEffect, memo } from 'react'
-import { Switch, useParams } from 'react-router-dom'
+import { useState, useEffect, memo, useContext } from 'react'
+import { useParams } from 'react-router-dom'
 import { Col, Layout, Row } from 'antd'
 
-import {
-    OperationStatService,
-    WellCompositeService,
-} from '@api'
 import { arrayOrDefault } from '@utils'
 import LoaderPortal from '@components/LoaderPortal'
 import WellSelector from '@components/selectors/WellSelector'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { PrivateDefaultRoute, PrivateMenu, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
+import { OperationStatService, WellCompositeService } from '@api'
 
+import { IdWellContext } from '@pages/Well'
 import ClusterWells from '@pages/Cluster/ClusterWells'
 import { WellCompositeSections } from './WellCompositeSections'
 
 const { Content } = Layout
 
-export const WellCompositeEditor = memo(({ idWell, rootPath }) => {
+export const WellCompositeEditor = memo(({ rootPath }) => {
     const { tab } = useParams()
+    const idWell = useContext(IdWellContext)
 
     const [statsWells, setStatsWells] = useState([])
     const [showLoader, setShowLoader] = useState(false)
@@ -68,27 +67,18 @@ export const WellCompositeEditor = memo(({ idWell, rootPath }) => {
                 </Col>
                 <Col span={6}>
                     <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                        <PrivateMenuItemLink key={'wells'} title={'Статистика по скважинам'} />
-                        <PrivateMenuItemLink key={'sections'} title={'Статистика по секциям'} />
+                        <PrivateMenu.Link key={'wells'} title={'Статистика по скважинам'} />
+                        <PrivateMenu.Link key={'sections'} title={'Статистика по секциям'} />
                     </PrivateMenu>
                 </Col>
             </Row>
             <Layout>
                 <Content className={'site-layout-background'}>
                     <LoaderPortal show={showTabLoader}>
-                        <Switch>
-                            <PrivateRoute path={`${rootPath}/wells`}>
-                                <ClusterWells statsWells={statsWells}/>
-                            </PrivateRoute>
-                            <PrivateRoute path={`${rootPath}/sections`}>
-                                <WellCompositeSections
-                                    idWell={idWell}
-                                    statsWells={statsWells}
-                                    selectedSections={selectedSections}
-                                />
-                            </PrivateRoute>
-                            <PrivateDefaultRoute urls={[`${rootPath}/wells`, `${rootPath}/sections`]}/>
-                        </Switch>
+                        <PrivateSwitch root={rootPath} elseRedirect={['wells', 'sections']}>
+                            <ClusterWells key={'wells'} statsWells={statsWells} />
+                            <WellCompositeSections key={'sections'} statsWells={statsWells} selectedSections={selectedSections} />
+                        </PrivateSwitch>
                     </LoaderPortal>
                 </Content>
             </Layout>
diff --git a/src/pages/Analytics/index.jsx b/src/pages/Analytics/index.jsx
index bbe5243..1a38c6a 100755
--- a/src/pages/Analytics/index.jsx
+++ b/src/pages/Analytics/index.jsx
@@ -1,36 +1,35 @@
-import { memo, useMemo } from 'react'
+import { memo, useContext, useMemo } from 'react'
+import { useParams } from 'react-router-dom'
 import { Layout } from 'antd'
-import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
-import WellCompositeEditor from './WellCompositeEditor'
 import Statistics from './Statistics'
+import WellCompositeEditor from './WellCompositeEditor'
+import { RootPathContext } from '@pages/Main'
 
-export const Analytics = memo(({ idWell }) => {
+export const Analytics = memo(() => {
     const { tab } = useParams()
-    const rootPath = useMemo(() => `/well/${idWell}/analytics`, [idWell])
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/analytics`, [root])
 
     return (
-        <Layout>
-            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                <PrivateMenu.Link key={'composite'} title={'Композитная скважина'} />
-                <PrivateMenu.Link key={'statistics'} title={'Оценка по ЦБ'} />
-            </PrivateMenu>
+        <RootPathContext.Provider value={rootPath}>
             <Layout>
-                <Layout.Content>
-                    <Switch>
-                        <PrivateRoute path={`${rootPath}/composite/:tab?`}>
-                            <WellCompositeEditor idWell={idWell} rootPath={`${rootPath}/composite`} />
-                        </PrivateRoute>
-                        <PrivateRoute path={`${rootPath}/statistics`}>
-                            <Statistics idWell={idWell} />
-                        </PrivateRoute>
-                        <PrivateDefaultRoute urls={[`${rootPath}/composite`]}/>
-                    </Switch>
-                </Layout.Content>
+                <PrivateMenu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
+                    <PrivateMenu.Link key={'composite'} title={'Композитная скважина'} />
+                    <PrivateMenu.Link key={'statistics'} title={'Оценка по ЦБ'} />
+                </PrivateMenu>
+                <Layout>
+                    <Layout.Content>
+                        <PrivateSwitch elseRedirect={'composite'}>
+                            <WellCompositeEditor key={'composite/:tab?'} rootPath={`${rootPath}/composite`} />
+                            <Statistics key={'statistics'} />
+                        </PrivateSwitch>
+                    </Layout.Content>
+                </Layout>
             </Layout>
-        </Layout>
+        </RootPathContext.Provider>
     )
 })
 
diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx
index f786551..dc98a2e 100755
--- a/src/pages/Documents/DocumentsTemplate.jsx
+++ b/src/pages/Documents/DocumentsTemplate.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo, useCallback } from 'react'
+import { useState, useEffect, useMemo, useCallback, useContext } from 'react'
 import { DatePicker, Button, Input } from 'antd'
 
 import { FileService } from '@api'
@@ -9,6 +9,8 @@ import { EditableTable, makeColumn, makeDateColumn, makeNumericColumn, makePagin
 import { invokeWebApiWrapperAsync, downloadFile, formatBytes } from '@components/factory'
 import { hasPermission } from '@utils/permissions'
 
+import { IdWellContext } from '@pages/Well'
+
 const pageSize = 12
 const { RangePicker } = DatePicker
 const { Search } = Input
@@ -30,7 +32,7 @@ const columns = [
   makeColumn('Компания', 'company', { render: (_, record) => <CompanyView company={record?.author?.company}/> })
 ]
 
-export const DocumentsTemplate = ({ idCategory, idWell, accept, headerChild, customColumns, beforeTable, onChange, tableName }) => {
+export const DocumentsTemplate = ({ idCategory, idWell: wellId, accept, headerChild, customColumns, beforeTable, onChange, tableName }) => {
   const [page, setPage] = useState(1)
   const [filterDataRange, setFilterDataRange] = useState([])
   const [filterCompanyName, setFilterCompanyName] = useState([])
@@ -39,6 +41,9 @@ export const DocumentsTemplate = ({ idCategory, idWell, accept, headerChild, cus
   const [files, setFiles] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
+  const idwellContext = useContext(IdWellContext)
+  const idWell = useMemo(() => wellId ?? idwellContext, [wellId])
+
   const uploadUrl = useMemo(() => `/api/well/${idWell}/files/?idCategory=${idCategory}`, [idWell, idCategory])
 
   const mergedColumns = useMemo(() => [...columns, ...(customColumns ?? [])], [customColumns])
diff --git a/src/pages/Documents/index.jsx b/src/pages/Documents/index.jsx
index e429b20..3c79213 100755
--- a/src/pages/Documents/index.jsx
+++ b/src/pages/Documents/index.jsx
@@ -1,12 +1,12 @@
-import { join } from 'path'
-import { memo, useMemo } from 'react'
-import { Layout } from 'antd'
+import { useParams } from 'react-router-dom'
+import { memo, useContext, useMemo } from 'react'
 import { FolderOutlined } from '@ant-design/icons'
-import { Switch, useParams } from 'react-router-dom'
+import { Layout } from 'antd'
 
-import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import DocumentsTemplate from './DocumentsTemplate'
+import { RootPathContext } from '@pages/Main'
 
 const { Content } = Layout
 
@@ -23,13 +23,14 @@ export const documentCategories = [
   { id: 9, key: 'closingService', title: 'Сервис по заканчиванию скважины' },
 ]
 
-export const MenuDocuments = memo(({ idWell }) => {
+export const MenuDocuments = memo(() => {
   const { category } = useParams()
-  const root = useMemo(() => `/well/${idWell}/document`, [idWell])
+  const root = useContext(RootPathContext)
+  const rootPath = useMemo(() => `${root}/document`, [root])
 
   return (
-    <>
-      <PrivateMenu root={root} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[category]}>
+    <RootPathContext.Provider value={rootPath}>
+      <PrivateMenu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[category]}>
         {documentCategories.map(category => (
           <PrivateMenu.Link
             key={`${category.key}`}
@@ -41,17 +42,18 @@ export const MenuDocuments = memo(({ idWell }) => {
       </PrivateMenu>
       <Layout>
         <Content className={'site-layout-background'}>
-          <Switch>
+          <PrivateSwitch elseRedirect={documentCategories.map((cat) => cat.key)}>
             {documentCategories.map(category => (
-              <PrivateRoute path={join(root, category.key)} key={`${category.key}`}>
-                <DocumentsTemplate idCategory={category.id} idWell={idWell} tableName={`documents_${category.key}`} />
-              </PrivateRoute>
+              <DocumentsTemplate
+                key={category.key}
+                idCategory={category.id}
+                tableName={`documents_${category.key}`}
+              />
             ))}
-            <PrivateDefaultRoute urls={documentCategories.map((cat) => join(root, cat.key))}/>
-          </Switch>
+          </PrivateSwitch>
         </Content>
       </Layout>
-    </>
+    </RootPathContext.Provider>
   )
 })
 
diff --git a/src/pages/DrillingProgram/CategoryAdder.jsx b/src/pages/DrillingProgram/CategoryAdder.jsx
index dd45dad..66534e7 100755
--- a/src/pages/DrillingProgram/CategoryAdder.jsx
+++ b/src/pages/DrillingProgram/CategoryAdder.jsx
@@ -1,11 +1,13 @@
 import { Form, Select } from 'antd'
 import { FileAddOutlined } from '@ant-design/icons'
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
 import Poprompt from '@components/selectors/Poprompt'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DrillingProgramService } from '@api'
 
+import { IdWellContext } from '@pages/Well'
+
 import '@styles/drilling_program.less'
 
 const catSelectorRules = [{
@@ -13,12 +15,14 @@ const catSelectorRules = [{
     message: 'Пожалуйста, выберите категории'
 }]
 
-export const CategoryAdder = memo(({ categories, idWell, onUpdate, className, ...other }) => {
+export const CategoryAdder = memo(({ categories, onUpdate, className, ...other }) => {
     const [options, setOptions] = useState([])
     const [value, setValue] = useState([])
     const [showLoader, setShowLoader] = useState(false)
     const [showCatLoader, setShowCatLoader] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             setOptions(categories.map((category) => ({
diff --git a/src/pages/DrillingProgram/CategoryEditor.jsx b/src/pages/DrillingProgram/CategoryEditor.jsx
index 5a01b67..4bedc5e 100755
--- a/src/pages/DrillingProgram/CategoryEditor.jsx
+++ b/src/pages/DrillingProgram/CategoryEditor.jsx
@@ -1,5 +1,5 @@
 import { Input, Modal, Radio } from 'antd'
-import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { BehaviorSubject, debounceTime, distinctUntilChanged, filter, map } from 'rxjs'
 
 import { UserView } from '@components/views'
@@ -9,6 +9,8 @@ import { makeColumn, makeNumericSorter, Table } from '@components/Table'
 import { DrillingProgramService } from '@api'
 import { arrayOrDefault } from '@utils'
 
+import { IdWellContext } from '@pages/Well'
+
 const userRules = [
     { label: 'Нет', value: 0 },
     { label: 'Публикатор', value: 1 },
@@ -17,7 +19,7 @@ const userRules = [
 
 const SEARCH_TIMEOUT = 400
 
-export const CategoryEditor = memo(({ idWell, visible, category, onClosed }) => {
+export const CategoryEditor = memo(({ visible, category, onClosed }) => {
     const [title, setTitle] = useState()
     const [users, setUsers] = useState([])
     const [allUsers, setAllUsers] = useState([])
@@ -27,6 +29,8 @@ export const CategoryEditor = memo(({ idWell, visible, category, onClosed }) =>
     const [searchValue, setSearchValue] = useState('')
     const [subject, setSubject] = useState(null)
 
+    const idWell = useContext(IdWellContext)
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             const filteredUsers = users.filter(({ user }) => user && [
diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx
index 1df55ad..b9f1424 100755
--- a/src/pages/DrillingProgram/CategoryHistory.jsx
+++ b/src/pages/DrillingProgram/CategoryHistory.jsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 import { Button, DatePicker, Input, Modal } from 'antd'
 
 import { CompanyView } from '@components/views'
@@ -10,6 +10,7 @@ import { arrayOrDefault, formatDate } from '@utils'
 import { FileService } from '@api'
 
 import MarksCard from './MarksCard'
+import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
@@ -54,7 +55,7 @@ export const historyColumns = [
     })
 ]
 
-export const CategoryHistory = ({ idWell, idCategory, visible, onClose }) => {
+export const CategoryHistory = ({ idCategory, visible, onClose }) => {
     const [data, setData] = useState([])
     const [page, setPage] = useState(1)
     const [total, setTotal] = useState(0)
@@ -64,6 +65,8 @@ export const CategoryHistory = ({ idWell, idCategory, visible, onClose }) => {
     const [isLoading, setIsLoading] = useState(false)
     const [companyName, setCompanyName] = useState('')
 
+    const idWell = useContext(IdWellContext)
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             if (!visible) return
diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index d3a168e..92f6e27 100755
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useMemo, useState } from 'react'
+import { memo, useCallback, useContext, useMemo, useState } from 'react'
 import { Button, Input, Popconfirm, Form } from 'antd'
 import {
     DeleteOutlined,
@@ -16,6 +16,7 @@ import { DrillingProgramService } from '@api'
 import { formatDate } from '@utils'
 
 import MarksCard from './MarksCard'
+import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
@@ -34,7 +35,7 @@ const CommentPrompt = memo(({ isRequired = true, ...props }) => (
     </Poprompt>
 ))
 
-export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHistory, setIsLoading, ...other }) => {
+export const CategoryRender = memo(({ partData, onUpdate, onEdit, onHistory, setIsLoading, ...other }) => {
     const {
         idFileCategory,
         name: title, // Название категории
@@ -44,6 +45,8 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
         file // Информация о файле
     } = partData ?? {}
 
+    const idWell = useContext(IdWellContext)
+
     const uploadUrl = useMemo(() => `/api/well/${idWell}/drillingProgram/part/${idFileCategory}`, [idWell, idFileCategory])
     const approvedMarks = useMemo(() => file?.fileMarks?.filter((mark) => mark.idMarkType === 1), [file])
     const rejectMarks = useMemo(() => file?.fileMarks?.filter((mark) => mark.idMarkType === 0), [file])
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
index 303d240..1b08c73 100755
--- a/src/pages/DrillingProgram/index.jsx
+++ b/src/pages/DrillingProgram/index.jsx
@@ -8,7 +8,7 @@ import {
   ReloadOutlined,
   WarningOutlined,
 } from '@ant-design/icons'
-import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
@@ -19,6 +19,7 @@ import CategoryAdder from './CategoryAdder'
 import CategoryRender from './CategoryRender'
 import CategoryEditor from './CategoryEditor'
 import CategoryHistory from './CategoryHistory'
+import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
@@ -38,7 +39,7 @@ const stateString = {
   [idStateUnknown]: { icon: WarningOutlined, text: 'Неизвестно' },
 }
 
-export const DrillingProgram = memo(({ idWell }) => {
+export const DrillingProgram = memo(() => {
   const [selectedCategory, setSelectedCategory] = useState()
   const [historyVisible, setHistoryVisible] = useState(false)
   const [editorVisible, setEditorVisible] = useState(false)
@@ -46,6 +47,8 @@ export const DrillingProgram = memo(({ idWell }) => {
   const [categories, setCategories] = useState([])
   const [data, setData] = useState({})
 
+  const idWell = useContext(IdWellContext)
+
   const {
     idState,
     permissionToEdit,
@@ -99,11 +102,7 @@ export const DrillingProgram = memo(({ idWell }) => {
             <h3>Программа бурения</h3>
             {permissionToEdit && (
               <div>
-                <CategoryAdder
-                  idWell={idWell}
-                  categories={categories}
-                  onUpdate={updateData}
-                />
+                <CategoryAdder categories={categories} onUpdate={updateData} />
               </div>
             )}
           </div>
@@ -143,7 +142,6 @@ export const DrillingProgram = memo(({ idWell }) => {
         {parts?.map?.((part, idx) => part && (
           <CategoryRender
             key={`${idx}`}
-            idWell={idWell}
             partData={part}
             onEdit={permissionToEdit && onCategoryEdit}
             onUpdate={updateData}
@@ -154,7 +152,6 @@ export const DrillingProgram = memo(({ idWell }) => {
         {permissionToEdit && (
           <>
             <CategoryEditor
-              idWell={idWell}
               visible={editorVisible}
               onClosed={onEditorClosed}
               category={parts?.find((part) => part.idFileCategory === selectedCategory) ?? {}}
@@ -163,7 +160,6 @@ export const DrillingProgram = memo(({ idWell }) => {
         )}
 
         <CategoryHistory
-          idWell={idWell}
           idCategory={selectedCategory}
           onClose={() => setHistoryVisible(false)}
           visible={historyVisible}
diff --git a/src/pages/Main.jsx b/src/pages/Main.jsx
index e090edf..183da19 100755
--- a/src/pages/Main.jsx
+++ b/src/pages/Main.jsx
@@ -1,4 +1,4 @@
-import { memo } from 'react'
+import { createContext, memo } from 'react'
 import { Route, Switch } from 'react-router-dom'
 
 import { AdminLayoutPortal, LayoutPortal } from '@components/Layout'
@@ -10,33 +10,37 @@ import Deposit from './Deposit'
 import AdminPanel from './AdminPanel'
 import AccessDenied from './AccessDenied'
 
+export const RootPathContext = createContext('')
+
 export const Main = memo(() => (
-    <Switch>
-        <PrivateRoute path={'/admin/:tab?'}>
-            <AdminLayoutPortal title={'Администраторская панель'}>
-                <AdminPanel />
-            </AdminLayoutPortal>
-        </PrivateRoute>
-        <PrivateRoute path={'/deposit'}>
-            <LayoutPortal noSheet title='Месторождение'>
-                <Deposit />
-            </LayoutPortal>
-        </PrivateRoute>
-        <PrivateRoute path={'/cluster/:idCluster'}>
-            <LayoutPortal title={'Анализ скважин куста'}>
-                <Cluster />
-            </LayoutPortal>
-        </PrivateRoute>
-        <PrivateRoute path={'/well/:idWell/:tab?'}>
-            <LayoutPortal>
-                <Well />
-            </LayoutPortal>
-        </PrivateRoute>
-        <Route path={'/access_denied'}>
-            <AccessDenied />
-        </Route>
-        <PrivateDefaultRoute urls={['/deposit']} />
-    </Switch>
+    <RootPathContext.Provider value={''}>
+        <Switch>
+            <PrivateRoute path={'/admin/:tab?'}>
+                <AdminLayoutPortal title={'Администраторская панель'}>
+                    <AdminPanel />
+                </AdminLayoutPortal>
+            </PrivateRoute>
+            <PrivateRoute path={'/deposit'}>
+                <LayoutPortal noSheet title='Месторождение'>
+                    <Deposit />
+                </LayoutPortal>
+            </PrivateRoute>
+            <PrivateRoute path={'/cluster/:idCluster'}>
+                <LayoutPortal title={'Анализ скважин куста'}>
+                    <Cluster />
+                </LayoutPortal>
+            </PrivateRoute>
+            <PrivateRoute path={'/well/:idWell/:tab?'}>
+                <LayoutPortal>
+                    <Well />
+                </LayoutPortal>
+            </PrivateRoute>
+            <Route path={'/access_denied'}>
+                <AccessDenied />
+            </Route>
+            <PrivateDefaultRoute urls={['/deposit']} />
+        </Switch>
+    </RootPathContext.Provider>
 ))
 
 export default Main
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 25e7fd5..32bd830 100755
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, memo, useMemo, useCallback } from 'react'
+import { useState, useEffect, memo, useMemo, useCallback, useContext } from 'react'
 import { Button, Form, Input, Popconfirm, Timeline } from 'antd'
 import {
   CheckSquareOutlined,
@@ -16,6 +16,7 @@ import { formatDate } from '@utils'
 import { MeasureService } from '@api'
 
 import { View } from './View'
+import { IdWellContext } from '@pages/Well'
 
 import '@styles/index.css'
 import '@styles/measure.css'
@@ -25,13 +26,15 @@ const createEditingColumns = (cols, renderDelegate) =>
 
 const disabled = !hasPermission('Measure.edit')
 
-export const MeasureTable = memo(({ idWell, group, updateMeasuresFunc, additionalButtons }) => {
+export const MeasureTable = memo(({ group, updateMeasuresFunc, additionalButtons }) => {
   const [showLoader, setShowLoader] = useState(false)
   const [displayedValues, setDisplayedValues] = useState({})
   const [editingColumns, setEditingColumns] = useState(group.columns)
   const [isTableEditing, setIsTableEditing] = useState(false)
   const [editingActionName, setEditingActionName] = useState('')
 
+  const idWell = useContext(IdWellContext)
+
   const [measuresForm] = Form.useForm()
 
   const data = useMemo(() => group?.values?.length > 0 ? group.values : [group?.defaultValue], [group?.defaultValue, group?.values])
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index adf6b4c..af15e53 100755
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -1,5 +1,5 @@
 import { Button } from 'antd'
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 import { TableOutlined } from '@ant-design/icons'
 
 import { MeasureService } from '@api'
@@ -11,6 +11,7 @@ import { InclinometryTable } from './InclinometryTable'
 import { columnsNnb, nnbDefaultData } from './nnbData'
 import { columnsMudDiagram, mudDiagramDefaultData } from './mudDiagramData'
 import { columnsDrillingFluid, drillingFluidDefaultData } from './drillingFluidData'
+import { IdWellContext } from '@pages/Well'
 
 const defaultData = [
   {
@@ -41,12 +42,14 @@ const defaultData = [
   }
 ]
 
-export const Measure = memo(({ idWell }) => {
+export const Measure = memo(() => {
   const [showLoader, setShowLoader] = useState(false)
   const [isMeasuresUpdating, setIsMeasuresUpdating] = useState(true)
   const [data, setData] = useState(defaultData)
   const [tableIdx, setTableIdx] = useState(-1)
 
+  const idWell = useContext(IdWellContext)
+
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
       if (!isMeasuresUpdating) return
@@ -73,7 +76,6 @@ export const Measure = memo(({ idWell }) => {
       {data.map((group, idx) => (
         <MeasureTable
           key={idx}
-          idWell={idWell}
           group={group}
           updateMeasuresFunc={() => setIsMeasuresUpdating(true)}
           additionalButtons={group.additionalButtons?.(group, idx, setTableIdx)}
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Report/Reports.jsx
index cf44431..c5fb7ca 100755
--- a/src/pages/Report/Reports.jsx
+++ b/src/pages/Report/Reports.jsx
@@ -1,5 +1,5 @@
 import { Button, Tooltip } from 'antd'
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 import { FilePdfOutlined, FileTextOutlined } from '@ant-design/icons'
 
 import { ReportService } from '@api'
@@ -7,6 +7,7 @@ import { formatDate, periodToString } from '@utils'
 import LoaderPortal from '@components/LoaderPortal'
 import { Table, makeDateSorter, makeNumericSorter } from '@components/Table'
 import { invokeWebApiWrapperAsync, downloadFile } from '@components/factory'
+import { IdWellContext } from '@pages/Well'
 
 const imgPaths = {
   '.pdf': <FilePdfOutlined/>,
@@ -55,10 +56,12 @@ const columns = [
   },
 ]
 
-export const Reports = memo(({ idWell }) => {
+export const Reports = memo(() => {
   const [reports, setReports] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
       const reportsResponse = await ReportService.getAllReportsNamesByWell(idWell)
diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
index 866ecdf..0c1f2e0 100755
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Report/index.jsx
@@ -1,6 +1,6 @@
 import 'moment/locale/ru'
 import moment from 'moment'
-import { useState, useEffect, memo, useCallback } from 'react'
+import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Radio, Button, Select, notification } from 'antd'
 
 import { ReportService } from '@api'
@@ -11,6 +11,7 @@ import { DateRangeWrapper } from 'components/Table/DateRangeWrapper'
 
 import { Reports } from './Reports'
 import { ReportCreationNotify } from './ReportCreationNotify'
+import { IdWellContext } from '../Well'
 
 const timePeriodNames = [
   { label: '1 секунда', value: 1 },
@@ -32,7 +33,7 @@ const reportFormats = [
   { value: 1, label: 'LAS' },
 ]
 
-export const Report = memo(({ idWell }) => {
+export const Report = memo(() => {
   const [aviableDateRange, setAviableDateRange] = useState([moment(), moment()])
   const [filterDateRange, setFilterDateRange] = useState([
     moment().subtract(1, 'days').startOf('day'),
@@ -43,6 +44,8 @@ export const Report = memo(({ idWell }) => {
   const [pagesCount, setPagesCount] = useState(0)
   const [showLoader, setShowLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   const handleReportCreation = useCallback(async () => await invokeWebApiWrapperAsync(
     async () => {
       const taskId = await ReportService.createReport(
@@ -166,7 +169,7 @@ export const Report = memo(({ idWell }) => {
           </div>
         </div>
       </LoaderPortal>
-      <Reports idWell={idWell} />
+      <Reports />
     </div>
   )
 })
diff --git a/src/pages/Telemetry/Archive/index.jsx b/src/pages/Telemetry/Archive/index.jsx
index 4c37e9f..1a45d4e 100755
--- a/src/pages/Telemetry/Archive/index.jsx
+++ b/src/pages/Telemetry/Archive/index.jsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { useState, useEffect, memo, useCallback } from 'react'
+import { useState, useEffect, memo, useCallback, useContext } from 'react'
 
 import { Flex } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
@@ -8,6 +8,7 @@ import { DatePickerWrapper, makeDateSorter } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 import { TelemetryDataSaubService } from '@api'
 
+import { IdWellContext } from '@pages/Well'
 import { normalizeData } from '../TelemetryView'
 import { ArchiveDisplay, cutData } from './ArchiveDisplay'
 
@@ -61,7 +62,7 @@ const range = (start, end) => {
     return result
 }
 
-export const Archive = memo(({ idWell }) => {
+export const Archive = memo(() => {
     const [dataSaub, setDataSaub] = useState([])
     const [dateLimit, setDateLimit] = useState({ from: 0, to: new Date() })
     const [chartInterval, setChartInterval] = useState(parseInt(defaultPeriod) * 1000)
@@ -69,6 +70,8 @@ export const Archive = memo(({ idWell }) => {
     const [showLoader, setShowLoader] = useState(false)
     const [loaded, setLoaded] = useState(null)
 
+    const idWell = useContext(IdWellContext)
+
     const onGraphWheel = useCallback((e) => {
         if (loaded && dateLimit.from && dateLimit.to) {
             setStartDate((prevStartDate) => {
diff --git a/src/pages/Telemetry/DashboardNNB/index.jsx b/src/pages/Telemetry/DashboardNNB/index.jsx
index eb5f8b8..cf16bcf 100644
--- a/src/pages/Telemetry/DashboardNNB/index.jsx
+++ b/src/pages/Telemetry/DashboardNNB/index.jsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useMemo, useReducer, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useMemo, useReducer, useState } from 'react'
 import { useHistory, useParams } from 'react-router-dom'
 import { CloseOutlined } from '@ant-design/icons'
 import { Button, Menu, Popconfirm } from 'antd'
@@ -19,10 +19,12 @@ import {
     WitsRecord61Service,
 } from '@api'
 
+import { IdWellContext } from '@pages/Well'
+import { RootPathContext } from '@pages/Main'
+import AddGroupWindow from './AddGroupWindow'
 import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow'
 
 import '@styles/dashboard_nnb.less'
-import AddGroupWindow from './AddGroupWindow'
 
 const getWitsInfo = async () => {
     // TODO: Добавить expire с принудительным обновлением
@@ -105,19 +107,21 @@ const groupsReducer = (groups, action) => {
     return newGroups
 }
 
-export const DashboardNNB = memo(({ idWell }) => {
+export const DashboardNNB = memo(() => {
     const [groups, dispatchGroups] = useReducer(groupsReducer, [])
     const [witsInfo, setWitsInfo] = useState([])
     const [isLoading, setIsLoading] = useState(false)
     const [selectedSettings, setSelectedSettings] = useState(null)
     const [values, setValues] = useState({})
 
-    const root = useMemo(() => `/well/${idWell}/telemetry/dashboard_nnb`, [idWell])
+    const idWell = useContext(IdWellContext)
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/dashboard_nnb`, [root])
     const history = useHistory()
     const { tab: selectedGroup } = useParams()
 
     if (!selectedGroup && groups?.length > 0)
-        history.push(`${root}/${groups[0].id}`)
+        history.push(`${rootPath}/${groups[0].id}`)
 
 
     const group = useMemo(() => ({
@@ -172,8 +176,8 @@ export const DashboardNNB = memo(({ idWell }) => {
 
     const removeGroup = useCallback((id) => {
         dispatchGroups({ type: 'remove_group', groupId: `${id}` })
-        if (id === selectedGroup) history.push(`${root}`)
-    }, [root, history, selectedGroup])
+        if (id === selectedGroup) history.push(`${rootPath}`)
+    }, [rootPath, history, selectedGroup])
 
     const addWidget = useCallback((settings) => dispatchGroups({
         type: 'add_widget',
@@ -226,7 +230,7 @@ export const DashboardNNB = memo(({ idWell }) => {
                                     <Button type={'link'} icon={<CloseOutlined />} />
                                 </Popconfirm>
                             )}
-                            <Button type={'text'} style={{ paddingLeft: 0 }} onClick={() => history.push(`${root}/${id}`)}>{name}</Button>
+                            <Button type={'text'} style={{ paddingLeft: 0 }} onClick={() => history.push(`${rootPath}/${id}`)}>{name}</Button>
                         </Menu.Item>
                     ))}
                 </Menu>
diff --git a/src/pages/Telemetry/Messages.jsx b/src/pages/Telemetry/Messages.jsx
index 2500ada..e97732b 100755
--- a/src/pages/Telemetry/Messages.jsx
+++ b/src/pages/Telemetry/Messages.jsx
@@ -1,10 +1,12 @@
-import moment from 'moment'
-import { useState, useEffect, memo, useCallback } from 'react'
+import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Table, Select, DatePicker, Input } from 'antd'
 
-import { MessageService } from '@api'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
+import { makeColumn, makeDateColumn, makeNumericSorter } from '@components/Table'
+import { MessageService } from '@api'
+
+import { IdWellContext } from '../Well'
 
 import '@styles/message.css'
 
@@ -22,41 +24,18 @@ const categoryDictionary = {
 
 // Конфигурация таблицы
 export const columns = [
-  {
+  makeDateColumn('Дата', 'date', undefined, undefined, { width: '10rem' }),
+  makeColumn('Глубина', 'wellDepth', { width: '10rem', render: depth => <span>{depth.toFixed(2)} м.</span> }),
+  makeColumn('Категория', 'categoryId', {
     width: '10rem',
-    title: 'Дата',
-    key: 'date',
-    dataIndex: 'date',
-    render: item => moment(item).format('DD MMM YYYY, HH:mm:ss'),
-    sorter: (a, b) => new Date(b.date) - new Date(a.date),
-    sortDirections: ['descend', 'ascend'],
-  }, {
-    width: '10rem',
-    title: 'Глубина',
-    key: 'wellDepth',
-    dataIndex: 'wellDepth',
-    render: depth => <span>{depth.toFixed(2)} м.</span>,
-  }, {
-    width: '10rem',
-    title: 'Категория',
-    key: 'categoryId',
-    dataIndex: 'categoryId',
     render: (_, item) => categoryDictionary[item.categoryId].title,
     style: (_, item) => categoryDictionary[item.categoryId]?.style,
-    sorter: (a, b) => a.categoryId - b.categoryId,
+    sorter: makeNumericSorter('categoryId'),
     sortDirections: ['descend', 'ascend'],
     ellipsis: true,
-  }, {
-    title: 'Сообщение',
-    key: 'message',
-    dataIndex: 'message',
-    onFilter: (value, record) => record.name.indexOf(value) === 0,
-  }, {
-    width: '10rem',
-    title: 'Пользователь',
-    key: 'user',
-    dataIndex: 'user',
-  },
+  }),
+  makeColumn('Сообщение', 'message', { onFilter: (value, record) => record.name.indexOf(value) === 0 }),
+  makeColumn('Пользователь', 'user', { width: '10rem' }),
 ]
 
 const filterOptions = [
@@ -68,7 +47,7 @@ const filterOptions = [
 const children = filterOptions.map((line) => <Option key={line.value}>{line.label}</Option>)
 
 // Данные для таблицы
-export const Messages = memo(({ idWell }) => {
+export const Messages = memo(() => {
   const [messages, setMessages] = useState([])
   const [pagination, setPagination] = useState(null)
   const [page, setPage] = useState(1)
@@ -77,6 +56,8 @@ export const Messages = memo(({ idWell }) => {
   const [searchString, setSearchString] = useState('')
   const [showLoader, setShowLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   const onChangeSearchString = useCallback((message) => setSearchString(message.length > 2 ? message : ''), [])
 
   useEffect(() => invokeWebApiWrapperAsync(
diff --git a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index b2fd566..f839c02 100755
--- a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -1,5 +1,5 @@
 import { Table } from 'antd'
-import { useState, useEffect, useCallback, memo } from 'react'
+import { useState, useEffect, useCallback, memo, useContext } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -7,13 +7,16 @@ import { Subscribe } from '@services/signalr'
 import { MessageService } from '@api'
 
 import { columns } from '../Messages'
+import { IdWellContext } from '@pages/Well'
 
 import '@styles/message.css'
 
-export const ActiveMessagesOnline = memo(({ idWell }) => {
+export const ActiveMessagesOnline = memo(() => {
   const [messages, setMessages] = useState([])
   const [loader, setLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   const handleReceiveMessages = useCallback((messages) => {
     if (messages)
       setMessages(messages.items.splice(0, 4))
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
index 12006ea..985dd96 100755
--- a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useMemo, useState } from 'react'
+import { memo, useCallback, useContext, useMemo, useState } from 'react'
 import { Select, Modal, Input, InputNumber } from 'antd'
 
 import { SetpointsService } from '@api'
@@ -8,12 +8,16 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeNumericRender, EditableTable } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 
-export const SetpointSender = memo(({ idWell, onClose, visible, setpointNames }) => {
+import { IdWellContext } from '@pages/Well'
+
+export const SetpointSender = memo(({ onClose, visible, setpointNames }) => {
     const [expirePeriod, setExpirePeriod] = useState(defaultPeriod)
     const [comment, setComment] = useState('')
     const [setpoints, setSetpoints] = useState([])
     const [isLoading, setIsLoading] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     const addingColumns = useMemo(() => [
         {
             title: 'Наименование уставки',
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
index 2339ea2..bf54c98 100755
--- a/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
@@ -1,5 +1,5 @@
 import { Button, Modal } from 'antd'
-import { useState, useEffect, memo, useCallback, useMemo } from 'react'
+import { useState, useEffect, memo, useCallback, useMemo, useContext } from 'react'
 
 import { Table } from '@components/Table'
 import { UserView } from '@components/views'
@@ -10,10 +10,11 @@ import { makeStringCutter } from '@utils/string'
 import { formatDate } from '@utils'
 import { SetpointsService } from '@api'
 
+import { IdWellContext } from '@pages/Well'
 import SetpointSender from './SetpointSender'
 import { SetpointViewer, getSetpointStatus } from './SetpointViewer'
 
-export const Setpoints = memo(({ idWell, ...other }) => {
+export const Setpoints = memo(({ ...other }) => {
     const [isModalVisible, setIsModalVisible] = useState(false)
     const [isSenderVisible, setIsSenderVisible] = useState(false)
     const [isViewerVisible, setIsViewerVisible] = useState(false)
@@ -22,6 +23,8 @@ export const Setpoints = memo(({ idWell, ...other }) => {
     const [selected, setSelected] = useState(null)
     const [setpointNames, setSetpointNames] = useState([])
 
+    const idWell = useContext(IdWellContext)
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             const names = await SetpointsService.getSetpointsNamesByIdWell(idWell)
@@ -102,7 +105,6 @@ export const Setpoints = memo(({ idWell, ...other }) => {
                 </LoaderPortal>
             </Modal>
             <SetpointSender
-                idWell={idWell}
                 setpointNames={setpointNames}
                 visible={isSenderVisible}
                 onClose={onSenderClose}
diff --git a/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
index 81b31af..ec5a9f6 100644
--- a/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
+++ b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
@@ -1,13 +1,17 @@
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
 import { TelemetryWirelineRunOutService } from '@api'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { WirelineView } from '@components/views'
 
-export const WirelineRunOut = memo(({ idWell }) => {
+import { IdWellContext } from '@pages/Well'
+
+export const WirelineRunOut = memo(() => {
     const [twro, setTwro] = useState({})
     const [isLoading, setIsLoading] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     const update = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
             const twro = await TelemetryWirelineRunOutService.getData(idWell)
diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index c11ae6f..aa0083a 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 } from 'react'
+import { useState, useEffect, useCallback, useContext } from 'react'
 
 import {
   DrillFlowChartService,
@@ -22,6 +22,8 @@ import ActiveMessagesOnline from './ActiveMessagesOnline'
 import { ModeDisplay } from './ModeDisplay'
 import { UserOfWell } from './UserOfWells'
 import { Setpoints } from './Setpoints'
+import WirelineRunOut from './WirelineRunOut'
+import { IdWellContext } from '@pages/Well'
 
 import MomentStabPicEnabled from '@images/DempherOn.png'
 import MomentStabPicDisabled from '@images/DempherOff.png'
@@ -29,7 +31,6 @@ import SpinPicEnabled from '@images/SpinEnabled.png'
 import SpinPicDisabled from '@images/SpinDisabled.png'
 
 import '@styles/message.css'
-import WirelineRunOut from './WirelineRunOut'
 
 const { Option } = Select
 
@@ -303,7 +304,7 @@ export const normalizeData = (data) => data?.map(item => ({
   blockSpeed: Math.abs(item.blockSpeed)
 })) ?? []
 
-export default function TelemetryView({ idWell }) {
+export default function TelemetryView() {
   const [dataSaub, setDataSaub] = useState([])
   const [dataSpin, setDataSpin] = useState([])
   const [chartInterval, setChartInterval] = useState(defaultPeriod)
@@ -312,6 +313,8 @@ export default function TelemetryView({ idWell }) {
   const [flowChartData, setFlowChartData] = useState([])
   const [rop, setRop] = useState(null)
 
+  const idWell = useContext(IdWellContext)
+
   const handleDataSaub = useCallback((data) => {
     if (data) {
       const dataSaub = normalizeData(data)
@@ -392,9 +395,9 @@ export default function TelemetryView({ idWell }) {
                 <Option value={2}>Завершено</Option>
               </Select>
             </div>
-            <Setpoints idWell={idWell} style={{ marginLeft: '1rem' }} />
+            <Setpoints style={{ marginLeft: '1rem' }} />
             <span style={{ flexGrow: 20 }}>&nbsp;</span>
-            <WirelineRunOut idWell={idWell} />
+            <WirelineRunOut />
             <img src={isTorqueStabEnabled(dataSpin) ? MomentStabPicEnabled : MomentStabPicDisabled} style={{ marginRight: '15px' }} alt={'TorqueMaster'} />
             <img src={isSpinEnabled(dataSpin) ? SpinPicEnabled : SpinPicDisabled} style={{ marginRight: '15px' }} alt={'SpinMaster'} />
             <h2 style={{ marginBottom: 0, marginRight: '15px', fontWeight: 'bold', color: isMseEnabled(dataSaub) ? 'green' : 'lightgrey' }}>MSE</h2>
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 77026e1..85189ba 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -1,58 +1,47 @@
-import { Switch, useParams } from 'react-router-dom'
-import { memo, useMemo } from 'react'
+import { useParams } from 'react-router-dom'
+import { memo, useContext, useMemo } from 'react'
 import { Layout } from 'antd'
 import { AlertOutlined, FundViewOutlined, DatabaseOutlined } from '@ant-design/icons'
 
-import PrivateMenu from '@components/Private/PrivateMenu'
-import { PrivateRoute, PrivateDefaultRoute } from '@components/Private'
+import { PrivateSwitch, PrivateMenu } from '@components/Private'
 
 import Archive from './Archive'
 import Messages from './Messages'
 import DashboardNNB from './DashboardNNB'
 import TelemetryView from './TelemetryView'
+import { RootPathContext } from '@pages/Main'
 
 import '@styles/index.css'
 
 const { Content } = Layout
 
-export const Telemetry = memo(({ idWell }) => {
+export const Telemetry = memo(() => {
   const { tab } = useParams()
-  const rootPath = useMemo(() => `/well/${idWell}/telemetry`, [idWell])
+  const root = useContext(RootPathContext)
+  const rootPath = useMemo(() => `${root}/telemetry`, [root])
 
   return (
-    <Layout>
-      <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-        <PrivateMenu.Link key={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
-        <PrivateMenu.Link key={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
-        <PrivateMenu.Link key={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
-        <PrivateMenu.Link key={'dashboard_nnb'} title={'ННБ'} />
-      </PrivateMenu>
-
+    <RootPathContext.Provider value={rootPath}>
       <Layout>
-        <Content className={'site-layout-background'}>
-          <Switch>
-            <PrivateRoute path={`${rootPath}/monitoring`}>
-              <TelemetryView idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/messages`}>
-              <Messages idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/archive`}>
-              <Archive idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/dashboard_nnb/:tab?`}>
-              <DashboardNNB idWell={idWell} />
-            </PrivateRoute>
-            <PrivateDefaultRoute urls={[
-              `${rootPath}/monitoring`,
-              `${rootPath}/messages`,
-              `${rootPath}/archive`,
-              `${rootPath}/dashboard_nnb`,
-            ]}/>
-          </Switch>
-        </Content>
+        <PrivateMenu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+          <PrivateMenu.Link key={'monitoring'} icon={<FundViewOutlined />} title={'Мониторинг'}/>
+          <PrivateMenu.Link key={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
+          <PrivateMenu.Link key={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
+          <PrivateMenu.Link key={'dashboard_nnb'} title={'ННБ'} />
+        </PrivateMenu>
+
+        <Layout>
+          <Content className={'site-layout-background'}>
+            <PrivateSwitch elseRedirect={['monitoring', 'messages', 'archive', 'dashboard_nnb']}>
+              <TelemetryView key={'monitoring'} />
+              <Messages key={'messages'} />
+              <Archive key={'archive'} />
+              <DashboardNNB key={'dashboard_nnb/:tab?'} />
+            </PrivateSwitch>
+          </Content>
+        </Layout>
       </Layout>
-    </Layout>
+    </RootPathContext.Provider>
   )
 })
 
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
index 904b966..f679a67 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
@@ -1,15 +1,19 @@
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 
 import { TelemetryAnalyticsService } from '@api'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryDepthToDay } from '@components/charts/ChartTelemetryDepthToDay'
 
-export const TelemetryAnalysisDepthToDay = memo(({ idWell }) => {
+import { IdWellContext } from '@pages/Well'
+
+export const TelemetryAnalysisDepthToDay = memo(() => {
   const [depthData, setDepthData] = useState([])
   const [bitPositionData, setBitPositionData] = useState([])
   const [loader, setLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
       const depthToDayData = await TelemetryAnalyticsService.getWellDepthToDay(idWell)
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
index 989165f..c5cb90e 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
@@ -1,11 +1,13 @@
 import { Select } from 'antd'
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 
-import { arrayOrDefault } from '@utils'
-import { TelemetryAnalyticsService } from '@api'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryDepthToInterval } from '@components/charts/ChartTelemetryDepthToInterval'
+import { TelemetryAnalyticsService } from '@api'
+import { arrayOrDefault } from '@utils'
+
+import { IdWellContext } from '@pages/Well'
 
 const timePeriodCollection = [
   { value: '3600', label: '1 час' },
@@ -14,11 +16,13 @@ const timePeriodCollection = [
   { value: '86400', label: '24 часа' }
 ]
 
-export const TelemetryAnalysisDepthToInterval = memo(({ idWell }) => {
+export const TelemetryAnalysisDepthToInterval = memo(() => {
   const [depthToIntervalData, setDepthToIntervalData] = useState([])
   const [chartInterval, setChartInterval] = useState(86400)
   const [loader, setLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   useEffect(() => invokeWebApiWrapperAsync(
       async () => {
         const depthToIntervalData = await TelemetryAnalyticsService.getWellDepthToInterval(idWell, chartInterval)
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
index 9337c78..37e35b5 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
@@ -1,20 +1,24 @@
 import moment from 'moment'
 import { Form, DatePicker } from 'antd'
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 
 import { TelemetryAnalyticsService } from '@api'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryOperationsSummary } from '@components/charts/ChartTelemetryOperationsSummary'
 
+import { IdWellContext } from '@pages/Well'
+
 const { RangePicker } = DatePicker
 
-export const TelemetryAnalysisOperationsSummary = memo(({ idWell }) => {
+export const TelemetryAnalysisOperationsSummary = memo(() => {
     const [avilableDatesRange, setAviableDatesRange] = useState([moment(),moment()])
     const [filterDateRange, setFilterDateRange] = useState([moment().subtract(1, 'days'),moment()])
     const [operationsData, setOperationsData] = useState([])
     const [loader, setLoader] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     const disabledDate = (current) => current < avilableDatesRange[0] || current > avilableDatesRange[1]
 
     useEffect(() => invokeWebApiWrapperAsync(
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
index e37da57..460ccd1 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
@@ -1,5 +1,5 @@
 import { memo } from 'react'
 
-export const TelemetryAnalysisOperationsToInterval = memo(({ idWell }) => (<>{idWell} 123</>))
+export const TelemetryAnalysisOperationsToInterval = memo(() => (<>123</>))
 
 export default TelemetryAnalysisOperationsToInterval
diff --git a/src/pages/TelemetryAnalysis/index.jsx b/src/pages/TelemetryAnalysis/index.jsx
index 1cd423c..54bae03 100755
--- a/src/pages/TelemetryAnalysis/index.jsx
+++ b/src/pages/TelemetryAnalysis/index.jsx
@@ -1,24 +1,26 @@
-import { memo } from 'react'
-import { Layout } from 'antd'
+import { useParams } from 'react-router-dom'
+import { memo, useContext, useMemo } from 'react'
 import { FolderOutlined } from '@ant-design/icons'
-import { Switch, useParams } from 'react-router-dom'
+import { Layout } from 'antd'
 
-import { PrivateDefaultRoute, PrivateMenu, PrivateRoute } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import TelemetryAnalysisDepthToDay from './TelemetryAnalysisDepthToDay'
 import TelemetryAnalysisDepthToInterval from './TelemetryAnalysisDepthToInterval'
 import TelemetryAnalysisOperationsSummary from './TelemetryAnalysisOperationsSummary'
 import TelemetryAnalysisOperationsToInterval from './TelemetryAnalysisOperationsToInterval'
+import { RootPathContext } from '@pages/Main'
 
 const { Content } = Layout
 
-export const TelemetryAnalysis = memo(({ idWell }) => {
+export const TelemetryAnalysis = memo(() => {
     const { tab } = useParams()
-    const rootPath = `/well/${idWell}/telemetryAnalysis`
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/telemetryAnalysis`, [root])
 
     return (
-        <>
-            <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
+        <RootPathContext.Provider value={rootPath}>
+            <PrivateMenu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
                 <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToDay'} title={'Глубина-день'} />
                 <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToInterval'} title={'Глубина-интервал'} />
                 <PrivateMenu.Link icon={<FolderOutlined />} key={'operationsSummary'} title={'Все операции'} />
@@ -27,29 +29,15 @@ export const TelemetryAnalysis = memo(({ idWell }) => {
 
             <Layout>
                 <Content className={'site-layout-background'}>
-                    <Switch>
-                        <PrivateRoute path={`${rootPath}/depthToDay`}>
-                            <TelemetryAnalysisDepthToDay idWell={idWell}/>
-                        </PrivateRoute>
-                        <PrivateRoute path={`${rootPath}/depthToInterval`}>
-                            <TelemetryAnalysisDepthToInterval idWell={idWell}/>
-                        </PrivateRoute>
-                        <PrivateRoute path={`${rootPath}/operationsSummary`}>
-                            <TelemetryAnalysisOperationsSummary idWell={idWell}/>
-                        </PrivateRoute>
-                        <PrivateRoute path={`${rootPath}/operationsToInterval`}>
-                            <TelemetryAnalysisOperationsToInterval idWell={idWell}/>
-                        </PrivateRoute>
-                        <PrivateDefaultRoute urls={[
-                            `${rootPath}/depthToDay`,
-                            `${rootPath}/depthToInterval`,
-                            `${rootPath}/operationsSummary`,
-                            `${rootPath}/operationsToInterval`,
-                        ]}/>
-                    </Switch>
+                    <PrivateSwitch elseRedirect={['depthToDay', 'depthToInterval', 'operationsSummary', 'operationsToInterval']}>
+                        <TelemetryAnalysisDepthToDay key={'depthToDay'} />
+                        <TelemetryAnalysisDepthToInterval key={'depthToInterval'} />
+                        <TelemetryAnalysisOperationsSummary key={'operationsSummary'} />
+                        <TelemetryAnalysisOperationsToInterval key={'operationsToInterval'} />
+                    </PrivateSwitch>
                 </Content>
             </Layout>
-        </>
+        </RootPathContext.Provider>
     )
 })
 
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 41bae5e..f3aa58c 100755
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -1,4 +1,4 @@
-import { memo, useMemo } from 'react'
+import { createContext, memo, useContext, useMemo } from 'react'
 import {
   FolderOutlined,
   FundViewOutlined,
@@ -7,9 +7,9 @@ import {
   DeploymentUnitOutlined,
 } from '@ant-design/icons'
 import { Layout } from 'antd'
-import { Switch, useParams } from 'react-router-dom'
+import { useParams } from 'react-router-dom'
 
-import { PrivateRoute, PrivateDefaultRoute, PrivateMenu } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import Report from './Report'
 import Measure from './Measure'
@@ -19,69 +19,51 @@ import Telemetry from './Telemetry'
 import WellOperations from './WellOperations'
 import DrillingProgram from './DrillingProgram'
 import TelemetryAnalysis from './TelemetryAnalysis'
+import { RootPathContext } from './Main'
 
 import '@styles/index.css'
 
 const { Content } = Layout
 
+export const IdWellContext = createContext(null)
+
 export const Well = memo(() => {
   const { idWell, tab } = useParams()
-  const rootPath = useMemo(() => `/well/${idWell}`, [idWell])
+  const root = useContext(RootPathContext)
+  const rootPath = useMemo(() => `${root}/well/${idWell}`, [root, idWell])
 
   return (
-    <Layout>
-      <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-        <PrivateMenu.Link key={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
-        <PrivateMenu.Link key={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
-        <PrivateMenu.Link key={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
-        <PrivateMenu.Link key={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
-        {/* <PrivateMenu.Link key={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
-        <PrivateMenu.Link key={'document'} icon={<FolderOutlined />} title={'Документы'} />
-        <PrivateMenu.Link key={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
-        <PrivateMenu.Link key={'drillingProgram'} icon={<FolderOutlined />} title={'Программа бурения'} />
-      </PrivateMenu>
-
+    <RootPathContext.Provider value={rootPath}>
       <Layout>
-        <Content className={'site-layout-background'}>
-          <Switch>
-            <PrivateRoute path={`${rootPath}/telemetry/:tab?`}>
-              <Telemetry idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/report`}>
-              <Report idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/analytics/:tab?`}>
-              <Analytics idWell={idWell} rootPath={`${rootPath}/analytics`}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/operations/:tab?`}>
-              <WellOperations idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/telemetryAnalysis/:tab?`}>
-              <TelemetryAnalysis idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/document/:category?`}>
-              <Documents idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/measure`}>
-              <Measure idWell={idWell}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/drillingProgram`}>
-              <DrillingProgram idWell={idWell}/>
-            </PrivateRoute>
-            <PrivateDefaultRoute urls={[
-              `${rootPath}/telemetry`,
-              `${rootPath}/report`,
-              `${rootPath}/analytics`,
-              `${rootPath}/operations`,
-              `${rootPath}/telemetryAnalysis`,
-              `${rootPath}/document`,
-              `${rootPath}/measure`,
-              `${rootPath}/drillingProgram`,
-            ]}/>
-          </Switch>
-        </Content>
+        <PrivateMenu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+          <PrivateMenu.Link key={'telemetry'} icon={<FundViewOutlined />} title={'Телеметрия'}/>
+          <PrivateMenu.Link key={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
+          <PrivateMenu.Link key={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
+          <PrivateMenu.Link key={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
+          {/* <PrivateMenu.Link key={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
+          <PrivateMenu.Link key={'document'} icon={<FolderOutlined />} title={'Документы'} />
+          <PrivateMenu.Link key={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
+          <PrivateMenu.Link key={'drillingProgram'} icon={<FolderOutlined />} title={'Программа бурения'} />
+        </PrivateMenu>
+
+        <IdWellContext.Provider value={idWell}>
+          <Layout>
+            <Content className={'site-layout-background'}>
+              <PrivateSwitch elseRedirect={['telemetry', 'report', 'analytics', 'operations', 'telemetryAnalysis', 'document', 'measure', 'drillingProgram']}>
+                <Telemetry key={'telemetry/:tab?'} />
+                <Report key={'report'} />
+                <Analytics key={'analytics/:tab?'} />
+                <WellOperations key={'operations/:tab?'} />
+                <TelemetryAnalysis key={'telemetryAnalysis/:tab?'} />
+                <Documents key={'document/:category?'} />
+                <Measure key={'measure'} />
+                <DrillingProgram key={'drillingProgram'} />
+              </PrivateSwitch>
+            </Content>
+          </Layout>
+        </IdWellContext.Provider>
       </Layout>
-    </Layout>
+    </RootPathContext.Provider>
   )
 })
 
diff --git a/src/pages/WellOperations/DrillProcessFlow.jsx b/src/pages/WellOperations/DrillProcessFlow.jsx
index 878d410..b451c25 100755
--- a/src/pages/WellOperations/DrillProcessFlow.jsx
+++ b/src/pages/WellOperations/DrillProcessFlow.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 
 import {
     EditableTable,
@@ -11,6 +11,8 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
 
+import { IdWellContext } from '../Well'
+
 const columns = [
     makeNumericStartEnd('Глубина, м', 'depth'),
     makeNumericMinMax('Нагрузка, т', 'axialLoad'),
@@ -20,10 +22,12 @@ const columns = [
     makeNumericMinMax('Расход, л/с', 'flow')
 ]
 
-export const DrillProcessFlow = memo(({ idWell }) => {
+export const DrillProcessFlow = memo(() => {
     const [flows, setFlows] = useState([])
     const [showLoader, setShowLoader] = useState(false)
 
+    const idWell = useContext(IdWellContext)
+
     const updateFlows = () => invokeWebApiWrapperAsync(
         async () => {
             const flows = await DrillFlowChartService.get(idWell)
diff --git a/src/pages/WellOperations/Tvd/index.jsx b/src/pages/WellOperations/Tvd/index.jsx
index c35a2d3..6f61e78 100755
--- a/src/pages/WellOperations/Tvd/index.jsx
+++ b/src/pages/WellOperations/Tvd/index.jsx
@@ -1,5 +1,5 @@
 import { useHistory } from 'react-router-dom'
-import { memo, useState, useRef, useEffect, useCallback } from 'react'
+import { memo, useState, useRef, useEffect, useCallback, useContext, useMemo } from 'react'
 import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons'
 import { Switch, Button } from 'antd'
 
@@ -27,6 +27,7 @@ import AdditionalTables from './AdditionalTables'
 
 import '@styles/index.css'
 import '@styles/tvd.less'
+import { IdWellContext } from '@asb/pages/Well'
 
 Chart.register(
   TimeScale,
@@ -114,13 +115,16 @@ const makeDataset = (data, label, color, borderWidth = 1.5, borderDash) => ({
     borderDash,
 })
 
-export const Tvd = memo(({ idWell, title, ...other }) => {
+export const Tvd = memo(({ idWell: wellId, title, ...other }) => {
     const [chart, setChart] = useState()
     const [xLabel, setXLabel] = useState('day')
     const [operations, setOperations] = useState({})
     const [tableVisible, setTableVisible] = useState(false)
     const [isLoading, setIsLoading] = useState(false)
 
+    const idWellContext = useContext(IdWellContext)
+    const idWell = useMemo(() => wellId ?? idWellContext, [wellId, idWellContext])
+
     const chartRef = useRef(null)
     const history = useHistory()
 
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
index b113209..79b7e63 100755
--- a/src/pages/WellOperations/WellDrillParams.jsx
+++ b/src/pages/WellOperations/WellDrillParams.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, memo, useMemo } from 'react'
+import { useState, useEffect, useCallback, memo, useMemo, useContext } from 'react'
 
 import {
     EditableTable,
@@ -13,6 +13,8 @@ import { DrillParamsService, WellOperationService } from '@api'
 import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
 
+import { IdWellContext } from '../Well'
+
 export const getColumns = async (idWell) => {
     let sectionTypes = await WellOperationService.getSectionTypes(idWell)
     sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
@@ -34,11 +36,13 @@ export const getColumns = async (idWell) => {
     ]
 }
 
-export const WellDrillParams = memo(({ idWell }) => {
+export const WellDrillParams = memo(() => {
     const [params, setParams] = useState([])
     const [showLoader, setShowLoader] = useState(false)
     const [columns, setColumns] = useState([])
 
+    const idWell = useContext(IdWellContext)
+
     const updateParams = useCallback(async () => await invokeWebApiWrapperAsync(
         async () => {
             const params = arrayOrDefault(await DrillParamsService.getAll(idWell))
diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
index 033a6f0..6c50d0f 100755
--- a/src/pages/WellOperations/WellOperationsEditor.jsx
+++ b/src/pages/WellOperations/WellOperationsEditor.jsx
@@ -1,7 +1,7 @@
 import moment from 'moment'
 import { Input } from 'antd'
 import { useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useMemo, useCallback } from 'react'
+import { useState, useEffect, memo, useMemo, useCallback, useContext } from 'react'
 
 import {
   EditableTable,
@@ -21,6 +21,8 @@ import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
 import { WellOperationService } from '@api'
 
+import { IdWellContext } from '../Well'
+
 const { TextArea } = Input
 
 const basePageSize = 160
@@ -52,12 +54,14 @@ const generateColumns = (showNpt = false, categories = [], sectionTypes = []) =>
   makeTextColumn('Комментарий', 'comment', null, null, null, { editable: true, input: <TextArea/> }),
 ].filter(Boolean)
 
-export const WellOperationsEditor = memo(({ idWell, idType, showNpt, ...other }) => {
+export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
   const [pageNumAndPageSize, setPageNumAndPageSize] = useState({ current: 1, pageSize: basePageSize })
   const [paginationTotal, setPaginationTotal] = useState(0)
   const [operations, setOperations] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   const [categories, setCategories] = useState([])
   const [sectionTypes, setSectionTypes] = useState([])
 
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
index 5355698..8afa41e 100755
--- a/src/pages/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/WellOperations/WellSectionsStat.jsx
@@ -1,10 +1,12 @@
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { Table, makeColumn, makeColumnsPlanFact, makeNumericRender } from '@components/Table'
-import { OperationStatService } from '@api'
 import { calcDuration } from '@utils/datetime'
+import { OperationStatService } from '@api'
+
+import { IdWellContext } from '../Well'
 
 const numericRender = makeNumericRender(2)
 
@@ -19,10 +21,12 @@ const columns = [
   makeColumnsPlanFact('Спуск ОК, м/ч'         ,'casingDownSpeed', { render: numericRender }),
 ]
 
-export const WellSectionsStat = memo(({ idWell }) => {
+export const WellSectionsStat = memo(() => {
   const [sections, setSections] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
+  const idWell = useContext(IdWellContext)
+
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
       const sectionsResponse = await OperationStatService.getStatWell(idWell)
diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx
index 5e14dd3..c807f08 100755
--- a/src/pages/WellOperations/index.jsx
+++ b/src/pages/WellOperations/index.jsx
@@ -1,6 +1,6 @@
-import { memo, useCallback } from 'react'
+import { useParams, useHistory, useLocation } from 'react-router-dom'
+import { memo, useCallback, useContext, useMemo } from 'react'
 import { Layout } from 'antd'
-import { Switch, useParams, useHistory, useLocation } from 'react-router-dom'
 import {
   BarChartOutlined,
   BuildOutlined,
@@ -9,7 +9,7 @@ import {
   TableOutlined,
 } from '@ant-design/icons'
 
-import { PrivateDefaultRoute, PrivateRoute, PrivateMenu } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import { Tvd } from './Tvd'
 import { ImportExportBar } from './ImportExportBar'
@@ -17,26 +17,31 @@ import { WellDrillParams } from './WellDrillParams'
 import { DrillProcessFlow } from './DrillProcessFlow'
 import { WellSectionsStat } from './WellSectionsStat'
 import { WellOperationsEditor } from './WellOperationsEditor'
-import { Flex } from '@asb/components/Grid'
+import { Flex } from '@components/Grid'
+
+import { RootPathContext } from '@pages/Main'
+import { IdWellContext } from '@pages/Well'
 
 const { Content } = Layout
 
-export const WellOperations = memo(({ idWell }) => {
+export const WellOperations = memo(() => {
   const { tab } = useParams()
   const history = useHistory()
   const location = useLocation()
-  const rootPath = `/well/${idWell}/operations`
+  const root = useContext(RootPathContext)
+  const idWell = useContext(IdWellContext)
+  const rootPath = useMemo(() => `${root}/operations`, [root])
 
   const onImported = useCallback(() =>
     history.push({ pathname: `${rootPath}`, state: { from: location.pathname }})
   , [history, location, rootPath])
 
-  const isIEBarDisabled = !['plan', 'fact'].includes(tab)
+  const isIEBarDisabled = useMemo(() => !['plan', 'fact'].includes(tab), [tab])
 
   return(
-    <>
+    <RootPathContext.Provider value={rootPath}>
       <Flex style={{ width: '100%' }}>
-        <PrivateMenu root={rootPath} mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]} style={{ flex: 1 }}>
+        <PrivateMenu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]} style={{ flex: 1 }}>
           <PrivateMenu.Link icon={<LineChartOutlined />} key={'tvd'} title={'TVD'} />
           <PrivateMenu.Link icon={<BuildOutlined />} key={'sections'} title={'Секции'} />
           <PrivateMenu.Link icon={<TableOutlined />} key={'plan'} title={'План'} />
@@ -48,37 +53,17 @@ export const WellOperations = memo(({ idWell }) => {
       </Flex>
       <Layout>
         <Content className={'site-layout-background'}>
-          <Switch>
-            <PrivateRoute path={`${rootPath}/tvd`}>
-              <Tvd idWell={idWell}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/sections`}>
-              <WellSectionsStat idWell={idWell}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/plan`}>
-              <WellOperationsEditor idWell={idWell} idType={0} tableName={'well_operations_plan'}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/fact`}>
-              <WellOperationsEditor idWell={idWell} idType={1} showNpt tableName={'well_operations_fact'}/>
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/drillProcessFlow`}>
-              <DrillProcessFlow idWell={idWell} />
-            </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/params`}>
-              <WellDrillParams idWell={idWell}/>
-            </PrivateRoute>
-            <PrivateDefaultRoute urls={[
-              `${rootPath}/plan`,
-              `${rootPath}/fact`,
-              `${rootPath}/tvd`,
-              `${rootPath}/sections`,
-              `${rootPath}/drillProcessFlow`,
-              `${rootPath}/params`
-            ]}/>
-          </Switch>
+          <PrivateSwitch elseRedirect={['plan', 'fact', 'tvd', 'sections', 'drillProcessFlow', 'params']}>
+            <Tvd key={'tvd'} />
+            <WellSectionsStat key={'sections'} />
+            <WellOperationsEditor key={'plan'} idType={0} tableName={'well_operations_plan'}/>
+            <WellOperationsEditor key={'fact'} idType={1} showNpt tableName={'well_operations_fact'}/>
+            <DrillProcessFlow key={'drillProcessFlow'} />
+            <WellDrillParams key={'params'} />
+          </PrivateSwitch>
         </Content>
       </Layout>
-    </>
+    </RootPathContext.Provider>
   )
 })
 

From 006ee7878f100fe4fb76bcfe9b5ad8ca6552f938 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 18:57:19 +0500
Subject: [PATCH 22/49] =?UTF-8?q?*=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=B2=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D0=B0=D1=85=20*=20=D0=93=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=B5=D1=86=20=D1=81=D1=83=D1=82?=
 =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/DailyReport/ReportEditor.jsx      | 251 +++++++++++++-----
 src/pages/Reports/DailyReport/index.jsx       |  28 +-
 src/pages/Reports/index.jsx                   |  51 ++--
 3 files changed, 224 insertions(+), 106 deletions(-)

diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx
index 383df80..89c6abd 100644
--- a/src/pages/Reports/DailyReport/ReportEditor.jsx
+++ b/src/pages/Reports/DailyReport/ReportEditor.jsx
@@ -1,58 +1,119 @@
-import { useForm } from 'antd/lib/form/Form'
-import { ConfigProvider, Descriptions, Divider, Form, Input, InputNumber, Modal, Select, Space, Table, Tag } from 'antd'
-import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import moment from 'moment'
+import { DatePicker, Descriptions, Divider, Form, Input, InputNumber, Modal, Select, Space, Table } from 'antd'
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DatePickerWrapper, makeColumn, makeGroupColumn } from '@components/Table'
-import { formatDate } from '@utils'
+import { makeColumn, makeGroupColumn } from '@components/Table'
+import { DailyReportService } from '@api'
 
-const { Item } = Form
+import { IdWellContext } from '@pages/Well'
+
+const { Item: RawItem } = Form
 const { Summary } = Table
 
+const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style }} {...other} />)
+
 const table1Columns = [
     makeGroupColumn('Отчётный период', [
-        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (date) => formatDate(date) ?? '---' }),
+        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (disabled) => (
+            <Item name={'reportDate'}>
+                <DatePicker disabled={disabled} format={'DD.MM.YYYY'} style={{ width: '100%' }} />
+            </Item>
+        )}),
     ]),
     makeGroupColumn('Забой за отчётный период, м', [
         makeColumn('От', 'depthStart', { width: 200, render: () => (
-            <Item name={'wellDepthIntervalStartDate'} style={{ margin: 0 }}>
+            <Item name={'wellDepthIntervalStartDate'}>
                 <InputNumber style={{ width: '100%' }} />
             </Item>
         )}),
         makeColumn('До', 'depthEnd', { width: 200, render: () => (
-            <Item name={'wellDepthIntervalEndDate'} style={{ margin: 0 }}>
+            <Item name={'wellDepthIntervalFinishDate'}>
                 <InputNumber style={{ width: '100%' }} />
             </Item>
         )}),
     ])
 ]
 
+const cellData = {
+    width: 200,
+    render: (name) => (
+        <Item name={name}>
+            <InputNumber style={{ width: '100%' }} />
+        </Item>
+    )
+}
+
 const table2Columns = [
-    makeColumn('Работа модулей САУБ', 'label', { width: 500 }),
-    makeColumn('Часов:', 'hours', { width: 200, render: (data) => (
-        <Item name={data.name} style={{ margin: 0 }}>
-            <InputNumber style={{ width: '100%' }} />
-        </Item>
-    )}),
-    makeColumn('Метров:', 'meters', { width: 200, render: (data) => (
-        <Item name={data.name} style={{ margin: 0 }}>
-            <InputNumber style={{ width: '100%' }} />
-        </Item>
-    )}),
+    makeColumn('Работа модулей САУБ', 'label', { width: 400 }),
+    makeColumn('Часов:', 'hours', cellData),
+    makeColumn('Метров:', 'meters', cellData),
 ]
 
 const table2Data = [
-    { label: 'АПД (автоматическая подача долота), ч/м:', hours: 'workTimeSaub', meters: 'drilledMetersSaub' },
-    { label: 'Спин Мастер (осцилляция), ч/м:', hours: 'workTimeSpinMaster', meters: 'drilledMetersSpinMaster' },
-    { label: 'Торк Мастер (демпфирование), ч/м:', hours: 'workTimeTorkMaster', meters: 'drilledMetersTorkMaster' },
+    { label: 'АПД (автоматическая подача долота), ч/м:', hours: 'workTimeSAUB', meters: 'penetrationSAUB' },
+    { label: 'Спин Мастер (осцилляция), ч/м:', hours: 'workTimeSpinMaster', meters: 'penetrationSpinMaster' },
+    { label: 'Торк Мастер (демпфирование), ч/м:', hours: 'workTimeTorkMaster', meters: 'penetrationTorkMaster' },
 ]
 
+const table3Columns = [
+    makeGroupColumn('Бурение в роторе (за отчётный период) с использованием САУБ-1', [
+        makeColumn('Проходка', 'sinking', cellData),
+        makeColumn('Часы бурения', 'hours', cellData),
+        makeColumn('Среднее диф. Давление', 'pressure', cellData),
+    ]),
+]
+
+const table3Data = [{ sinking: 'penetrationInRotor', hours: 'numberDrillingHours', pressure: 'avgDiffDropRotor' }]
+
+const table4Columns = [
+    makeGroupColumn('Бурение в слайде (за отчётный период) с использованием САУБ-1', [
+        makeColumn('Проходка', 'sinking', cellData),
+        makeColumn('Часы бурения', 'hours', cellData),
+        makeColumn('Среднее диф. Давление', 'pressure', cellData),
+    ]),
+]
+
+const table4Data = [{ sinking: 'penetrationInSlide', hours: 'drillingTimeInRotor', pressure: 'avgDiffPressureSlide' }]
+
+const table6Columns = [
+    makeGroupColumn('БЕЗМЕТРАЖНЫЕ РАБОТЫ', [
+        makeColumn('Подготовка ствола скважины к наращиванию', 'l_label', { colSpan: 2, width: 200 }),
+        makeColumn('', 'l_value', { colSpan: 0, ...cellData }),
+        makeColumn('Наращивание', 'r_label', { colSpan: 2, width: 200 }),
+        makeColumn('', 'r_value', { colSpan: 0, ...cellData }),
+    ]),
+]
+
+const table6Data = [{
+    l_label: 'Норматив на одну операцию, (мин):',
+    r_label: 'Норматив на одну операцию, (мин):',
+    l_value: 'standardTimeBarrelPreparation',
+    r_value: 'standardTimeExtension'
+}, {
+    l_label: 'Проработка при бур, факт (ч):',
+    r_label: 'Наращивание, факт (ч):',
+    l_value: 'actualTimeBarrelPreparation',
+    r_value: 'actualTimeExtension'
+}]
+
+const table6Summary = () => (
+    <Summary.Row>
+        <Summary.Cell colSpan={2}>
+            Краткие причины: доп проработки при переходе из слайда в ротор, в середине свечи.
+        </Summary.Cell>
+        <Summary.Cell colSpan={2}>
+            Краткие причины: нехватка пальцев на обоих руках у первого помощника бурильщика.
+        </Summary.Cell>
+    </Summary.Row>
+)
+
 const table2Summary = () => (
     <Summary.Row>
         <Summary.Cell>МСЕ, колличество запусков, раз:</Summary.Cell>
         <Summary.Cell colSpan={2}>
-            <Item name={'countLaunchesMSE'} style={{ margin: 0 }}>
+            <Item name={'countLaunchesMSE'}>
                 <InputNumber style={{ width: '100%' }} />
             </Item>
         </Summary.Cell>
@@ -60,27 +121,36 @@ const table2Summary = () => (
 )
 
 export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
-    const [form] = useForm()
+    const [form] = Form.useForm()
     const [isInvalid, setIsInvalid] = useState(false)
     const [isLoading, setIsLoading] = useState(false)
 
-    useEffect(() => form.setFieldsValue(data), [data])
+    const idWell = useContext(IdWellContext)
+
+    useEffect(() => form.setFieldsValue(data ? {
+        ...data,
+        rotorDrillingModes: Array.isArray(data.rotorDrillingModes) ? data.rotorDrillingModes ?? [] : [],
+        slideDrillingModes: Array.isArray(data.slideDrillingModes) ? data.slideDrillingModes ?? [] : [],
+        reportDate: moment.utc(data.reportDate).local(),
+    } : {}), [data, form])
 
     const onFormChange = useCallback(async () => await form.validateFields()
         .then(() => setIsInvalid(false))
         .catch(() => setIsInvalid(true))
     , [form])
 
-    const onFormFinish = useCallback((data) => invokeWebApiWrapperAsync(
+    const onFormFinish = useCallback((formData) => invokeWebApiWrapperAsync(
         async () => {
-            onDone?.(data)
+            if (data)
+                await DailyReportService.update(idWell, data.reportDate, formData)
+            else
+                await DailyReportService.add(idWell, formData)
+            onDone?.(formData)
         },
         setIsLoading,
         'Не удалось сохранить суточный рапорт',
         'Сохранение суточного рапорта',
-    ), [onDone])
-
-    const table1Data = useMemo(() => [{ dateStart: form.getFieldValue('reportDate') }], [form])
+    ), [data, onDone, idWell])
 
     return (
         <Modal
@@ -89,7 +159,10 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
             visible={visible}
             onCancel={onCancel}
             okText={'Сохранить'}
-            title={data ? `Суточная сводка бурения скважины № ${data.wellName} куст № ${data.clusterName}`:  'Новая суточная сводка бурения'}
+            title={data ?
+                <>Суточная сводка бурения скважины № {data?.wellName} куст № {data?.clusterName}</> :
+                <>Новая cуточная сводка бурения скважины</>
+            }
             onOk={form.submit}
             okButtonProps={{
                 disabled: isInvalid,
@@ -103,49 +176,87 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
                     onChange={onFormChange}
                 >
                     <Item name={'reportDate'} label={'Дата рапорта'} rules={[{ required: true }]}>
-                        <DatePickerWrapper showTime={false} disabled={!!data}/>
+                        <DatePicker disabled={!!data} format={'DD.MM.YYYY'}/>
                     </Item>
                     <Divider />
-                    <p>Суточная сводка бурения скважины № {data?.wellName} куст № {data?.clusterName}</p>
-                    <Item name={'customer'} label={'Заказчик'}><Input /></Item>
-                    <Item name={'contractor'} label={'Подрядчик'}><Input /></Item>
-                    <Table
-                        bordered
-                        size={'small'}
-                        columns={table1Columns}
-                        dataSource={table1Data}
-                        pagination={false}
-                        style={{ marginBottom: '15px' }}
-                    />
-                    <Item label={'Бурильщик 1 смена'} name={'firstDriller'}><Input /></Item>
-                    <Item label={'Бурильщик 2 смена'} name={'firstDriller'}><Input /></Item>
+                    <Space direction={'vertical'} size={'middle'} style={{ width: '100%' }}>
+                        <Item name={'customer'} label={'Заказчик'}><Input /></Item>
+                        <Item name={'contractor'} label={'Подрядчик'}><Input /></Item>
+                        <Table
+                            bordered
+                            size={'small'}
+                            columns={table1Columns}
+                            dataSource={[{ dateStart: !!data }]}
+                            pagination={false}
+                        />
+                        <Item label={'Бурильщик 1 смена'} name={'firstDriller'}><Input /></Item>
+                        <Item label={'Бурильщик 2 смена'} name={'secondDriller'}><Input /></Item>
 
-                    <Table
-                        bordered
-                        size={'small'}
-                        columns={table2Columns}
-                        dataSource={table2Data}
-                        summary={table2Summary}
-                        pagination={false}
-                        style={{ marginBottom: '15px' }}
-                    />
+                        <Table
+                            bordered
+                            size={'small'}
+                            columns={table2Columns}
+                            dataSource={table2Data}
+                            summary={table2Summary}
+                            pagination={false}
+                        />
 
-                    <Item name={'bhaDescription'}>
-                        <Input.TextArea rows={4} />
-                    </Item>
+                        <Item name={'bhaDescription'} label={'Описание КНБК'}>
+                            <Input.TextArea rows={4} />
+                        </Item>
 
-                    <Descriptions column={1} size={'small'} bordered>
-                        <Descriptions.Item label={'Бурение в роторе:'}>
-                            <Item name={'rotaryDrillingModes'} style={{ margin: 0 }}>
-                                <Select mode={'tags'} style={{ width: '100%' }} />
-                            </Item>
-                        </Descriptions.Item>
-                        <Descriptions.Item label={'Бурение в слайде:'}>
-                            <Item name={'slideDrillingModes'} style={{ margin: 0 }}>
-                                <Select mode={'tags'} style={{ width: '100%' }} />
-                            </Item>
-                        </Descriptions.Item>
-                    </Descriptions>
+                        <Table bordered size={'small'} columns={table6Columns} dataSource={table6Data} pagination={false} summary={table6Summary} />
+
+                        <Descriptions column={1} size={'small'} bordered>
+                            <Descriptions.Item label={'Бурение в роторе:'}>
+                                <Item name={'rotorDrillingModes'}>
+                                    <Select mode={'tags'} style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                            <Descriptions.Item label={'Бурение в слайде:'}>
+                                <Item name={'slideDrillingModes'}>
+                                    <Select mode={'tags'} style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                        </Descriptions>
+
+                        <Table bordered size={'small'} columns={table3Columns} dataSource={table3Data} pagination={false} />
+                        <Table bordered size={'small'} columns={table4Columns} dataSource={table4Data} pagination={false} />
+                        
+                        <Item label={'Плановая мех скорость'} name={'sectionROPPlan'}>
+                            <InputNumber style={{ width: '100%' }}/>
+                        </Item>
+
+                        <Descriptions bordered size={'small'} column={1}>
+                            <Descriptions.Item label={'Время бурения за секцию'}>
+                                <Item name={'sectionDrillingTimeTotal'}>
+                                    <InputNumber style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                            <Descriptions.Item label={'Проходка за секцию'}>
+                                <Item name={'sectionPenetrationTotal'}>
+                                    <InputNumber style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                            <Descriptions.Item label={'Кол-во наращиваний'}>
+                                <Item name={'extensionsCount'}>
+                                    <InputNumber style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                            <Descriptions.Item label={'Отклонение от ГГД +/-, сут'}>
+                                <Item name={'deviationFromTVD'}>
+                                    <InputNumber style={{ width: '100%' }} />
+                                </Item>
+                            </Descriptions.Item>
+                        </Descriptions>
+
+                        <Item name={'declinesReasonsROP'} label={'Примечание:'}>
+                            <Input.TextArea rows={4} />
+                        </Item>
+
+                        <Item label={'Мастер буровой'} name={'drillingMaster'}><Input /></Item>
+                        <Item label={'Супервайзер'} name={'supervisor'}><Input /></Item>
+                    </Space>
                 </Form>
             </LoaderPortal>
         </Modal>
diff --git a/src/pages/Reports/DailyReport/index.jsx b/src/pages/Reports/DailyReport/index.jsx
index c67a3be..64241af 100644
--- a/src/pages/Reports/DailyReport/index.jsx
+++ b/src/pages/Reports/DailyReport/index.jsx
@@ -1,26 +1,30 @@
 import moment from 'moment'
 import { Button } from 'antd'
-import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { FileExcelOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
 
 import LoaderPortal from '@components/LoaderPortal'
 import DateRangeWrapper from '@components/Table/DateRangeWrapper'
 import { Table, makeDateColumn, makeColumn } from '@components/Table'
 import { download, invokeWebApiWrapperAsync } from '@components/factory'
+import { DailyReportService } from '@api'
 import { arrayOrDefault } from '@utils'
 
 import ReportEditor from './ReportEditor'
+import { IdWellContext } from '@pages/Well'
 
-export const DailyReport = memo(({ idWell }) => {
+export const DailyReport = memo(() => {
     const [data, setData] = useState([])
     const [isLoading, setIsLoading] = useState(false)
     const [searchDate, setSearchDate] = useState(null)
     const [selectedReport, setSelectedReport] = useState(null)
-    const [isEditorVisible, setIsEditorVisible] = useState(true)
+    const [isEditorVisible, setIsEditorVisible] = useState(false)
 
-    useEffect(() => invokeWebApiWrapperAsync(
+    const idWell = useContext(IdWellContext)
+
+    const updateTable = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
-            const data = [{ date: '2022-10-01' }] // arrayOrDefault(await DailyreportService.getData(idWell))
+            const data = arrayOrDefault(await DailyReportService.getList(idWell))
             setData(data)
         },
         setIsLoading,
@@ -28,14 +32,16 @@ export const DailyReport = memo(({ idWell }) => {
         'Получение списка суточных рапортов',
     ), [idWell])
 
+    useEffect(updateTable, [updateTable])
+
     const columns = useMemo(() => [
-        makeDateColumn('Дата', 'date', undefined, undefined, { width: 300 }),
-        makeColumn('', '', { width: 200, render: (_, report, idx) => (
+        makeDateColumn('Дата', 'reportDate', undefined, undefined, { width: 300 }),
+        makeColumn('', '', { width: 200, render: (_, report) => (
             <>
                 <Button
                     type={'link'}
                     icon={<FileExcelOutlined />}
-                    onClick={async () => await download(`/api/daily_report/${report.id}`)}
+                    onClick={async () => await download(`/api/well/${idWell}/DailyReport/${report.reportDate}/excel`)}
                 >
                     Скачать XLSX
                 </Button>
@@ -51,7 +57,7 @@ export const DailyReport = memo(({ idWell }) => {
                 </Button>
             </>
         )}),
-    ], [])
+    ], [idWell])
     
     const filteredData = useMemo(() => {
         if (!searchDate) return data
@@ -89,6 +95,10 @@ export const DailyReport = memo(({ idWell }) => {
                 data={selectedReport}
                 visible={isEditorVisible}
                 onCancel={() => setIsEditorVisible(false)}
+                onDone={() => {
+                    setIsEditorVisible(false)
+                    updateTable()
+                }}
             />
         </>
     )
diff --git a/src/pages/Reports/index.jsx b/src/pages/Reports/index.jsx
index 056eb9b..7d889a5 100644
--- a/src/pages/Reports/index.jsx
+++ b/src/pages/Reports/index.jsx
@@ -1,43 +1,40 @@
-import { Switch, useParams } from 'react-router-dom'
-import { memo, useMemo } from 'react'
-import { Layout, Menu } from 'antd'
+import { useParams } from 'react-router-dom'
+import { memo, useContext, useMemo } from 'react'
 import { FilePdfOutlined } from '@ant-design/icons'
+import { Layout } from 'antd'
 
-import { PrivateMenuItemLink, PrivateRoute, PrivateDefaultRoute } from '@components/Private'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import DailyReport from './DailyReport'
 import DiagramReport from './DiagramReport'
+import { RootPathContext } from '@pages/Main'
 
 const { Content } = Layout
 
-export const Reports = memo(({ idWell }) => {
+export const Reports = memo(() => {
     const { tab } = useParams()
-    const rootPath = useMemo(() => `/well/${idWell}/reports`, [idWell])
+
+    const root = useContext(RootPathContext)
+    const rootPath = useMemo(() => `${root}/reports`, [root])
 
     return (
-        <Layout>
-            <Menu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
-                <PrivateMenuItemLink root={rootPath} key={'diagram_report'} path={'diagram_report'} icon={<FilePdfOutlined />} title={'Диаграмма'}/>
-                <PrivateMenuItemLink root={rootPath} key={'daily_report'} path={'daily_report'} title={'Суточный рапорт'} />
-            </Menu>
-
+        <RootPathContext.Provider value={rootPath}>
             <Layout>
-                <Content className={'site-layout-background'}>
-                <Switch>
-                    <PrivateRoute path={`${rootPath}/diagram_report`}>
-                        <DiagramReport idWell={idWell} />
-                    </PrivateRoute>
-                    <PrivateRoute path={`${rootPath}/daily_report`}>
-                        <DailyReport idWell={idWell} />
-                    </PrivateRoute>
-                    <PrivateDefaultRoute urls={[
-                        `${rootPath}/diagram_report`,
-                        `${rootPath}/daily_report`,
-                    ]}/>
-                </Switch>
-                </Content>
+                <PrivateMenu mode={'horizontal'} selectable={true} selectedKeys={[tab]} className={'well_menu'}>
+                    <PrivateMenu.Link key={'diagram_report'} icon={<FilePdfOutlined />} title={'Диаграмма'}/>
+                    <PrivateMenu.Link key={'daily_report'} title={'Суточный рапорт'} />
+                </PrivateMenu>
+
+                <Layout>
+                    <Content className={'site-layout-background'}>
+                    <PrivateSwitch elseRedirect={['diagram_report', 'daily_report']}>
+                        <DiagramReport key={'diagram_report'} />
+                        <DailyReport key={'daily_report'} />
+                    </PrivateSwitch>
+                    </Content>
+                </Layout>
             </Layout>
-        </Layout>
+        </RootPathContext.Provider>
     )
 })
 

From 0ed91387b9f7063e2937ceb3f9044cd2ac1eb02a Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 18:57:42 +0500
Subject: [PATCH 23/49] =?UTF-8?q?=D0=A3=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20ope?=
 =?UTF-8?q?napi=20codegen=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c785414..6a4f874 100755
--- a/package.json
+++ b/package.json
@@ -59,6 +59,6 @@
     "@types/react-router-dom": "^5.3.2",
     "craco-alias": "^3.0.1",
     "openapi-typescript": "^3.4.1",
-    "openapi-typescript-codegen": "^0.9.3"
+    "openapi-typescript-codegen": "^0.21.0"
   }
 }

From f9ddf172f5e75b899959b4a4206d70c0f3663b97 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 19:09:05 +0500
Subject: [PATCH 24/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D1=83=D1=82=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=80=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Reports/DailyReport/index.jsx | 27 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/pages/Reports/DailyReport/index.jsx b/src/pages/Reports/DailyReport/index.jsx
index 64241af..4c9dca5 100644
--- a/src/pages/Reports/DailyReport/index.jsx
+++ b/src/pages/Reports/DailyReport/index.jsx
@@ -1,10 +1,9 @@
 import moment from 'moment'
-import { Button } from 'antd'
-import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { Button, DatePicker } from 'antd'
 import { FileExcelOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
+import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
-import DateRangeWrapper from '@components/Table/DateRangeWrapper'
 import { Table, makeDateColumn, makeColumn } from '@components/Table'
 import { download, invokeWebApiWrapperAsync } from '@components/factory'
 import { DailyReportService } from '@api'
@@ -16,7 +15,7 @@ import { IdWellContext } from '@pages/Well'
 export const DailyReport = memo(() => {
     const [data, setData] = useState([])
     const [isLoading, setIsLoading] = useState(false)
-    const [searchDate, setSearchDate] = useState(null)
+    const [searchDate, setSearchDate] = useState([moment().subtract(1, 'week'), moment()])
     const [selectedReport, setSelectedReport] = useState(null)
     const [isEditorVisible, setIsEditorVisible] = useState(false)
 
@@ -42,9 +41,8 @@ export const DailyReport = memo(() => {
                     type={'link'}
                     icon={<FileExcelOutlined />}
                     onClick={async () => await download(`/api/well/${idWell}/DailyReport/${report.reportDate}/excel`)}
-                >
-                    Скачать XLSX
-                </Button>
+                    children={'Скачать XLSX'}
+                />
                 <Button
                     type={'link'}
                     icon={<EditOutlined />}
@@ -52,16 +50,15 @@ export const DailyReport = memo(() => {
                         setSelectedReport(report)
                         setIsEditorVisible(true)
                     }}
-                >
-                    Редактировать
-                </Button>
+                    children={'Редактировать'}
+                />
             </>
         )}),
     ], [idWell])
     
     const filteredData = useMemo(() => {
         if (!searchDate) return data
-        return data.filter((row) => moment(row.date).isBetween(...searchDate))
+        return data.filter((row) => moment.utc(row.reportDate).local().isBetween(...searchDate))
     }, [data, searchDate])
 
     return (
@@ -71,7 +68,13 @@ export const DailyReport = memo(() => {
                     <div>
                         <div>
                             <div>Диапозон дат отчёта</div>
-                            <DateRangeWrapper onCalendarChange={setSearchDate} />
+                            <DatePicker.RangePicker
+                                allowClear={false}
+                                format={'DD.MM.YYYY'}
+                                defaultValue={searchDate}
+                                onCalendarChange={setSearchDate}
+                                disabledDate={(date) => date.isAfter(moment())}
+                            />
                         </div>
                     </div>
                     <div style={{ display: 'flex', alignItems: 'end' }}>

From 148dd2e96c3f26f54968faefd54f0aec82e8afb2 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 19 Apr 2022 19:26:35 +0500
Subject: [PATCH 25/49] =?UTF-8?q?*=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BD=D1=8F=D0=B5=D0=BC=D1=8B=D1=85=20=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20*=20=D0=98=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B5=D0=BC=20'key'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/DailyReport/ReportEditor.jsx      | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx
index 89c6abd..c871b20 100644
--- a/src/pages/Reports/DailyReport/ReportEditor.jsx
+++ b/src/pages/Reports/DailyReport/ReportEditor.jsx
@@ -16,9 +16,9 @@ const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style
 
 const table1Columns = [
     makeGroupColumn('Отчётный период', [
-        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (disabled) => (
+        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (_, { disabled, onChange }) => (
             <Item name={'reportDate'}>
-                <DatePicker disabled={disabled} format={'DD.MM.YYYY'} style={{ width: '100%' }} />
+                <DatePicker disabled={disabled} format={'DD.MM.YYYY'} style={{ width: '100%' }} onChange={onChange} />
             </Item>
         )}),
     ]),
@@ -52,9 +52,9 @@ const table2Columns = [
 ]
 
 const table2Data = [
-    { label: 'АПД (автоматическая подача долота), ч/м:', hours: 'workTimeSAUB', meters: 'penetrationSAUB' },
-    { label: 'Спин Мастер (осцилляция), ч/м:', hours: 'workTimeSpinMaster', meters: 'penetrationSpinMaster' },
-    { label: 'Торк Мастер (демпфирование), ч/м:', hours: 'workTimeTorkMaster', meters: 'penetrationTorkMaster' },
+    { key: '1', label: 'АПД (автоматическая подача долота), ч/м:', hours: 'workTimeSAUB', meters: 'penetrationSAUB' },
+    { key: '2', label: 'Спин Мастер (осцилляция), ч/м:', hours: 'workTimeSpinMaster', meters: 'penetrationSpinMaster' },
+    { key: '3', label: 'Торк Мастер (демпфирование), ч/м:', hours: 'workTimeTorkMaster', meters: 'penetrationTorkMaster' },
 ]
 
 const table3Columns = [
@@ -65,7 +65,7 @@ const table3Columns = [
     ]),
 ]
 
-const table3Data = [{ sinking: 'penetrationInRotor', hours: 'numberDrillingHours', pressure: 'avgDiffDropRotor' }]
+const table3Data = [{ key: '', sinking: 'penetrationInRotor', hours: 'numberDrillingHours', pressure: 'avgDiffDropRotor' }]
 
 const table4Columns = [
     makeGroupColumn('Бурение в слайде (за отчётный период) с использованием САУБ-1', [
@@ -75,7 +75,7 @@ const table4Columns = [
     ]),
 ]
 
-const table4Data = [{ sinking: 'penetrationInSlide', hours: 'drillingTimeInRotor', pressure: 'avgDiffPressureSlide' }]
+const table4Data = [{ key: '', sinking: 'penetrationInSlide', hours: 'drillingTimeInRotor', pressure: 'avgDiffPressureSlide' }]
 
 const table6Columns = [
     makeGroupColumn('БЕЗМЕТРАЖНЫЕ РАБОТЫ', [
@@ -87,11 +87,13 @@ const table6Columns = [
 ]
 
 const table6Data = [{
+    key: '1',
     l_label: 'Норматив на одну операцию, (мин):',
     r_label: 'Норматив на одну операцию, (мин):',
     l_value: 'standardTimeBarrelPreparation',
     r_value: 'standardTimeExtension'
 }, {
+    key: '2',
     l_label: 'Проработка при бур, факт (ч):',
     r_label: 'Наращивание, факт (ч):',
     l_value: 'actualTimeBarrelPreparation',
@@ -127,12 +129,14 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
 
     const idWell = useContext(IdWellContext)
 
-    useEffect(() => form.setFieldsValue(data ? {
+    const setFields = useCallback((data) => form.setFieldsValue(data ? {
         ...data,
         rotorDrillingModes: Array.isArray(data.rotorDrillingModes) ? data.rotorDrillingModes ?? [] : [],
         slideDrillingModes: Array.isArray(data.slideDrillingModes) ? data.slideDrillingModes ?? [] : [],
         reportDate: moment.utc(data.reportDate).local(),
-    } : {}), [data, form])
+    } : {}), [form])
+
+    useEffect(() => setFields(data), [data, setFields])
 
     const onFormChange = useCallback(async () => await form.validateFields()
         .then(() => setIsInvalid(false))
@@ -152,6 +156,17 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
         'Сохранение суточного рапорта',
     ), [data, onDone, idWell])
 
+    const onDateChange = useCallback((date) => invokeWebApiWrapperAsync(
+        async () => {
+            if (data) return
+            const newData = await DailyReportService.getOrGenerate(idWell, date.toISOString())
+            setFields(newData)
+        },
+        setIsLoading,
+        'Не удалось загрузить автозаполняемые данные для нового рапорта',
+        'Получение автозаполняемых данных суточного рапорта',
+    ))
+
     return (
         <Modal
             centered
@@ -176,7 +191,7 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
                     onChange={onFormChange}
                 >
                     <Item name={'reportDate'} label={'Дата рапорта'} rules={[{ required: true }]}>
-                        <DatePicker disabled={!!data} format={'DD.MM.YYYY'}/>
+                        <DatePicker disabled={!!data} format={'DD.MM.YYYY'} onChange={onDateChange} />
                     </Item>
                     <Divider />
                     <Space direction={'vertical'} size={'middle'} style={{ width: '100%' }}>
@@ -186,7 +201,7 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
                             bordered
                             size={'small'}
                             columns={table1Columns}
-                            dataSource={[{ dateStart: !!data }]}
+                            dataSource={[{ key: '', disabled: !!data, onChange: onDateChange }]}
                             pagination={false}
                         />
                         <Item label={'Бурильщик 1 смена'} name={'firstDriller'}><Input /></Item>

From 09ebdd5b46ad395f7622ec6fe6b2b0cdfd7f1ebe Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 09:30:17 +0500
Subject: [PATCH 26/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=84=D0=B8=D0=BA=D1=81=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86-=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/WellOperations/WellOperationsEditor.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
index 6c50d0f..4ea8dee 100755
--- a/src/pages/WellOperations/WellOperationsEditor.jsx
+++ b/src/pages/WellOperations/WellOperationsEditor.jsx
@@ -132,6 +132,7 @@ export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
         bordered
         size={'small'}
         columns={columns}
+        sticky={true}
         dataSource={operations}
         onRowAdd={hasPermission('WellOperation.edit') && makeActionHandler('insertRange', handlerProps, recordParser, 'Добавление операции по скважине')}
         onRowEdit={hasPermission('WellOperation.edit') && makeActionHandler('update', handlerProps, recordParser, 'Редактирование операции по скважине')}

From 62e697065308fb93d2752d545bee359d4da1463e Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 11:18:39 +0500
Subject: [PATCH 27/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D0=B5=D1=86=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=9D=D0=9F=D0=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/WellOperations/Tvd/AdditionalTables.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/WellOperations/Tvd/AdditionalTables.jsx b/src/pages/WellOperations/Tvd/AdditionalTables.jsx
index 1889b63..d9fd228 100755
--- a/src/pages/WellOperations/Tvd/AdditionalTables.jsx
+++ b/src/pages/WellOperations/Tvd/AdditionalTables.jsx
@@ -1,5 +1,5 @@
 import { Descriptions } from 'antd'
-import { memo, useEffect, useState } from 'react'
+import { memo, useEffect, useMemo, useState } from 'react'
 
 import { makeNumericRender } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -21,6 +21,8 @@ const printDate = (date) => formatDate(date) ?? '-'
 export const AdditionalTables = memo(({ operations, xLabel, setIsLoading }) => {
     const [additionalData, setAdditionalData] = useState({})
 
+    const nptSum = useMemo(() => operations.fact?.reduce((out, row) => out + (row?.durationHours ?? 0), 0), [operations.fact])
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             const [factStartDate, factEndDate] = calcEndDate(operations.fact)
@@ -49,6 +51,7 @@ export const AdditionalTables = memo(({ operations, xLabel, setIsLoading }) => {
                 <Descriptions bordered column={1} size={'small'} style={{ backgroundColor: 'white' }}>
                     <Item label={'Дата завершения'}>{printDate(additionalData.endDate)}</Item>
                     <Item label={'Отставание (сут)'}>{numericRender(additionalData.lag)}</Item>
+                    <Item label={'Длительность НПВ (сут)'}>{numericRender(nptSum)}</Item>
                 </Descriptions>
             </div>
             <div className={'tvd-bl-table'} style={{ bottom: xLabel === 'day' ? '35px' : '85px' }}>

From 107016ba5ef3bc5219ac2d877a4f9a760e4f441d Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 12:06:13 +0500
Subject: [PATCH 28/49] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D1=82=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BB=D0=B1=D0=B5=D1=86=20=D0=BF=D0=BB=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=9D=D0=9F=D0=92;=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=9D=D0=9F=D0=92=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=20=D1=87=D0=B0=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Cluster/ClusterWells.jsx | 47 +++++++++++-------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index f919f2f..eaa447b 100755
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -1,5 +1,5 @@
 import { Link, useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useMemo } from 'react'
+import { useState, useEffect, memo, useMemo, useCallback } from 'react'
 import { Tag, Button, Modal } from 'antd'
 import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
 
@@ -11,6 +11,7 @@ import {
   makeNumericColumnPlanFact,
   Table,
   makeNumericRender,
+  makeNumericColumn,
 } from '@components/Table'
 import { CompanyView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
@@ -36,6 +37,7 @@ const DAY_IN_MS = 86_400_000
 const ONLINE_DEADTIME = 600_000
 
 const getDate = (str) => isRawDate(str) ? new Date(str).toLocaleString() : '-'
+const numericRender = makeNumericRender(1)
 
 export const ClusterWells = memo(({ statsWells }) => {
   const [selectedWellId, setSelectedWellId] = useState(0)
@@ -127,38 +129,23 @@ export const ClusterWells = memo(({ statsWells }) => {
       makeColumn('начало', 'factStart', { sorter: makeDateSorter('factStart'), render: getDate }),
       makeColumn('окончание', 'factEnd', { sorter: makeDateSorter('factEnd'), render: getDate }),
     ]),
-    makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
-    makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
-    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
-    makeNumericColumnPlanFact('НПВ, сут', 'notProductiveTime', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
-    {
-      title: 'TVD',
-      key: 'tvd',
-      render: (value) => <Button onClick={()=> {
-        setSelectedWellId(value.id)
-        setIsTVDModalVisible(true)
-      }}><LineChartOutlined /></Button>,
-      align: 'center'
-    },
-    {
-      title: 'Операции',
-      key: 'operations',
-      render: (value) => <Button onClick={()=> {
-        setSelectedWellId(value.id)
-        setIsOpsModalVisible(true)
-      }}><ProfileOutlined /></Button>,
-      align: 'center'
-    },
-    {
-      title: 'Участники',
-      key: 'companies',
-      dataIndex: 'companies',
+    makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+    makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+    makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', filtersMinMax, makeFilterMinMaxFunction, (npt) => numericRender(npt * 24)),
+    makeColumn('TVD', 'tvd', { align: 'center', render: (_, value) => (
+      <Button onClick={() => { setSelectedWellId(value?.id); setIsTVDModalVisible(true) }} children={<LineChartOutlined />} />
+    ) }),
+    makeColumn('Операции', 'operations', { align: 'center', render: (_, value) => (
+      <Button onClick={() => { setSelectedWellId(value?.id); setIsOpsModalVisible(true) }} children={<ProfileOutlined />} />
+    ) }),
+    makeColumn('Участники', 'companies', {
       render: (item) => item?.map((company) => (
-        <Tag key={company.caption} color='blue'>
+        <Tag key={company.caption} color={'blue'}>
           <CompanyView company={company} />
         </Tag>
       )) ?? '-',
-    },
+    }),
   ], [location.pathname])
 
   return (
@@ -181,7 +168,7 @@ export const ClusterWells = memo(({ statsWells }) => {
         width={1500}
         footer={null}
       >
-        <Tvd idWell={selectedWellId} />
+        <Tvd style={{ minHeight: '600px' }} idWell={selectedWellId} />
       </Modal>
 
       <Modal

From 62625073668277322e1950bfed5c2befa4826b4d Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 12:12:17 +0500
Subject: [PATCH 29/49] =?UTF-8?q?SignalR=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BB=D1=91=D0=BD=20=D0=B4=D0=BE=206.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 160 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0e2227..1eb6257 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@craco/craco": "^6.1.2",
-        "@microsoft/signalr": "^5.0.5",
+        "@microsoft/signalr": "^6.0.4",
         "@testing-library/jest-dom": "^5.11.10",
         "@testing-library/react": "^11.2.6",
         "@testing-library/user-event": "^12.8.3",
@@ -2631,15 +2631,35 @@
       "dev": true
     },
     "node_modules/@microsoft/signalr": {
-      "version": "5.0.14",
-      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-5.0.14.tgz",
-      "integrity": "sha512-TdATUaBcJu0UB4BmhHzJ/JeUMocKNg/P2/NlFvY6re8DNoINCsVjYDqWfW3mvXz16uFlIH1p8hdJlzt8caVdVA==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-6.0.4.tgz",
+      "integrity": "sha512-YeWRh4LxfYnq4I5CKw17/HOq8rY+ouTv6Bq+s55122StE3pK29j8j2OpP+1PA3D1ksHPfy7dFIgC33yr/E+01A==",
       "dependencies": {
         "abort-controller": "^3.0.0",
         "eventsource": "^1.0.7",
-        "fetch-cookie": "^0.7.3",
-        "node-fetch": "^2.6.0",
-        "ws": "^6.0.0"
+        "fetch-cookie": "^0.11.0",
+        "node-fetch": "^2.6.7",
+        "ws": "^7.4.5"
+      }
+    },
+    "node_modules/@microsoft/signalr/node_modules/ws": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -7471,11 +7491,6 @@
         "next-tick": "~1.0.0"
       }
     },
-    "node_modules/es6-denodeify": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-denodeify/-/es6-denodeify-0.1.5.tgz",
-      "integrity": "sha1-MdTV/pxVA+ElRgQ5MQ4WoqPznB8="
-    },
     "node_modules/es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -8867,12 +8882,14 @@
       }
     },
     "node_modules/fetch-cookie": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.7.3.tgz",
-      "integrity": "sha512-rZPkLnI8x5V+zYAiz8QonAHsTb4BY+iFowFBI1RFn0zrO343AVp9X7/yUj/9wL6Ef/8fLls8b/vGtzUvmyAUGA==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.11.0.tgz",
+      "integrity": "sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA==",
       "dependencies": {
-        "es6-denodeify": "^0.1.1",
-        "tough-cookie": "^2.3.3"
+        "tough-cookie": "^2.3.3 || ^3.0.1 || ^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/figgy-pudding": {
@@ -12116,19 +12133,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/jsdom/node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/jsdom/node_modules/tr46": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
@@ -12140,14 +12144,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jsdom/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/jsdom/node_modules/whatwg-url": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
@@ -19799,15 +19795,24 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/tr46": {
@@ -24130,15 +24135,23 @@
       "dev": true
     },
     "@microsoft/signalr": {
-      "version": "5.0.14",
-      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-5.0.14.tgz",
-      "integrity": "sha512-TdATUaBcJu0UB4BmhHzJ/JeUMocKNg/P2/NlFvY6re8DNoINCsVjYDqWfW3mvXz16uFlIH1p8hdJlzt8caVdVA==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-6.0.4.tgz",
+      "integrity": "sha512-YeWRh4LxfYnq4I5CKw17/HOq8rY+ouTv6Bq+s55122StE3pK29j8j2OpP+1PA3D1ksHPfy7dFIgC33yr/E+01A==",
       "requires": {
         "abort-controller": "^3.0.0",
         "eventsource": "^1.0.7",
-        "fetch-cookie": "^0.7.3",
-        "node-fetch": "^2.6.0",
-        "ws": "^6.0.0"
+        "fetch-cookie": "^0.11.0",
+        "node-fetch": "^2.6.7",
+        "ws": "^7.4.5"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+          "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+          "requires": {}
+        }
       }
     },
     "@nodelib/fs.scandir": {
@@ -27938,11 +27951,6 @@
         "next-tick": "~1.0.0"
       }
     },
-    "es6-denodeify": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-denodeify/-/es6-denodeify-0.1.5.tgz",
-      "integrity": "sha1-MdTV/pxVA+ElRgQ5MQ4WoqPznB8="
-    },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -28961,12 +28969,11 @@
       }
     },
     "fetch-cookie": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.7.3.tgz",
-      "integrity": "sha512-rZPkLnI8x5V+zYAiz8QonAHsTb4BY+iFowFBI1RFn0zrO343AVp9X7/yUj/9wL6Ef/8fLls8b/vGtzUvmyAUGA==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.11.0.tgz",
+      "integrity": "sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA==",
       "requires": {
-        "es6-denodeify": "^0.1.1",
-        "tough-cookie": "^2.3.3"
+        "tough-cookie": "^2.3.3 || ^3.0.1 || ^4.0.0"
       }
     },
     "figgy-pudding": {
@@ -31419,16 +31426,6 @@
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
           "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
         },
-        "tough-cookie": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-          "requires": {
-            "psl": "^1.1.33",
-            "punycode": "^2.1.1",
-            "universalify": "^0.1.2"
-          }
-        },
         "tr46": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
@@ -31437,11 +31434,6 @@
             "punycode": "^2.1.1"
           }
         },
-        "universalify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-        },
         "whatwg-url": {
           "version": "8.7.0",
           "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
@@ -37395,12 +37387,20 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+        }
       }
     },
     "tr46": {
diff --git a/package.json b/package.json
index c785414..9b7dafb 100755
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@craco/craco": "^6.1.2",
-    "@microsoft/signalr": "^5.0.5",
+    "@microsoft/signalr": "^6.0.4",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.3",

From ec5b5e427bedcdb0c8a8684752bc5afb9d39dadd Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 16:59:14 +0500
Subject: [PATCH 30/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B8=20=D0=BF=D0=BE=D1=81=D1=87=D1=91=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BD=D0=BF=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Cluster/ClusterWells.jsx            |  2 +-
 .../TelemetryView/MonitoringColumn.jsx        | 47 +++++++++----------
 .../WellOperations/Tvd/AdditionalTables.jsx   |  7 ++-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index eaa447b..7e3bb10 100755
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -132,7 +132,7 @@ export const ClusterWells = memo(({ statsWells }) => {
     makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, numericRender),
     makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, numericRender),
     makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, numericRender),
-    makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', filtersMinMax, makeFilterMinMaxFunction, (npt) => numericRender(npt * 24)),
+    makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', filtersMinMax, makeFilterMinMaxFunction, numericRender),
     makeColumn('TVD', 'tvd', { align: 'center', render: (_, value) => (
       <Button onClick={() => { setSelectedWellId(value?.id); setIsTVDModalVisible(true) }} children={<LineChartOutlined />} />
     ) }),
diff --git a/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx b/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
index 01c7504..39f500d 100755
--- a/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
+++ b/src/pages/Telemetry/TelemetryView/MonitoringColumn.jsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 
 import { Grid, GridItem } from '@components/Grid'
 import { makeDateSorter } from '@components/Table'
@@ -31,17 +31,33 @@ const RemoveSimilar = (input, accessor) => {
 
 const addPointData = (point) => ({ depth: point.wellDepth })
 
+const ChartValues = memo(({ pv }) => pv?.map((v, idx) => {
+  const text = `${v.value?.toFixed(2) ?? '--'} ${v.unit}`
+  return (
+    <GridItem
+      key={idx}
+      row={idx + 1}
+      col={1}
+      className={'monitoring_value'}
+      style={{ color: v.color, padding: '0 4px' }}
+      data-before={text}
+      children={text}
+    />
+  )
+}))
+
 export const MonitoringColumn = memo(({ lineGroup, data, flowChartData, interval, showBorder, style, headerHeight, pointCount = 2048, additionalLabels }) => {
   const [dataStore, setDataStore] = useState([])
-  const [lineGroupWithoutShapes, setLineGroupWithoutShapes] = useState([])
-  const dataLast = data?.[data.length - 1]
-  const yStart = new Date((dataLast?.date ? +new Date(dataLast.date) : Date.now()) - interval * 0.97)
-  let pv = lineGroup.filter(line => line.showLabels).map(line => ({
+  const dataLast = useMemo(() => data?.[data.length - 1], [data])
+  const yStart = useMemo(() => new Date((dataLast?.date ? +new Date(dataLast.date) : Date.now()) - interval * 0.97), [dataLast, interval])
+  const pv = useMemo(() => lineGroup.filter(line => line.showLabels).map(line => ({
     color: line.color,
     label: line.label,
     unit: line.units,
     value: dataLast?.[line.xAccessorName]
-  }))
+  })), [lineGroup, dataLast])
+
+  const lineGroupWithoutShapes = useMemo(() => lineGroup.filter(cfg => !cfg.isShape), [lineGroup])
 
   const postParsing = useCallback((data) => {
     lineGroupWithoutShapes.forEach(lineCfg => {
@@ -67,10 +83,6 @@ export const MonitoringColumn = memo(({ lineGroup, data, flowChartData, interval
     })
   }, [data, pointCount])
 
-  useEffect(() => {
-    setLineGroupWithoutShapes(lineGroup.filter(cfg => !cfg.isShape))
-  }, [lineGroup])
-
   return (
     <div style={style}>
       <Grid style={{ height: headerHeight, boxShadow: showBorder ? 'inset 0px 0px 0px 3px black' : '', margin: 0 }}>
@@ -80,20 +92,7 @@ export const MonitoringColumn = memo(({ lineGroup, data, flowChartData, interval
       </Grid>
       <div style={{ position: 'relative' }}>
         <Grid className={'display_chart_values'}>
-          {pv?.map((v, idx) => {
-            const text = `${v.value?.toFixed(2) ?? '--'} ${v.unit}`
-            return (
-              <GridItem
-                key={idx}
-                row={idx + 1}
-                col={1}
-                className={'monitoring_value'}
-                style={{ color: v.color, padding: '0 4px' }}
-                data-before={text}
-                children={text}
-              />
-            )
-          })}
+          <ChartValues pv={pv} />
           {additionalLabels?.map((label, idx) => (
             <GridItem
               key={idx}
diff --git a/src/pages/WellOperations/Tvd/AdditionalTables.jsx b/src/pages/WellOperations/Tvd/AdditionalTables.jsx
index d9fd228..312770d 100755
--- a/src/pages/WellOperations/Tvd/AdditionalTables.jsx
+++ b/src/pages/WellOperations/Tvd/AdditionalTables.jsx
@@ -21,7 +21,10 @@ const printDate = (date) => formatDate(date) ?? '-'
 export const AdditionalTables = memo(({ operations, xLabel, setIsLoading }) => {
     const [additionalData, setAdditionalData] = useState({})
 
-    const nptSum = useMemo(() => operations.fact?.reduce((out, row) => out + (row?.durationHours ?? 0), 0), [operations.fact])
+    const nptSum = useMemo(() => operations.fact
+        ?.filter((row) => row.isNPT)
+        .reduce((out, row) => out + (row?.durationHours ?? 0), 0)
+    , [operations.fact])
 
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
@@ -51,7 +54,7 @@ export const AdditionalTables = memo(({ operations, xLabel, setIsLoading }) => {
                 <Descriptions bordered column={1} size={'small'} style={{ backgroundColor: 'white' }}>
                     <Item label={'Дата завершения'}>{printDate(additionalData.endDate)}</Item>
                     <Item label={'Отставание (сут)'}>{numericRender(additionalData.lag)}</Item>
-                    <Item label={'Длительность НПВ (сут)'}>{numericRender(nptSum)}</Item>
+                    <Item label={'Длительность НПВ (ч)'}>{numericRender(nptSum)}</Item>
                 </Descriptions>
             </div>
             <div className={'tvd-bl-table'} style={{ bottom: xLabel === 'day' ? '35px' : '85px' }}>

From d91815ebf27e813fec094dae74ffc9d104cd2bf4 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 17:13:43 +0500
Subject: [PATCH 31/49] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=82=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=D1=82=D1=8B=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=84=D0=B0=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Private/PrivateMenu.tsx        |  2 +-
 src/components/Private/PrivateSwitch.tsx      |  4 +--
 src/context.ts                                |  4 +++
 src/pages/AdminPanel/Telemetry/index.jsx      |  2 +-
 src/pages/AdminPanel/index.jsx                |  2 +-
 .../WellCompositeEditor/NewParamsTable.jsx    |  2 +-
 .../WellCompositeSections.jsx                 |  2 +-
 .../Analytics/WellCompositeEditor/index.jsx   |  4 +--
 src/pages/Analytics/index.jsx                 |  2 +-
 src/pages/Documents/DocumentsTemplate.jsx     |  6 ++--
 src/pages/Documents/index.jsx                 |  2 +-
 src/pages/DrillingProgram/CategoryAdder.jsx   |  2 +-
 src/pages/DrillingProgram/CategoryEditor.jsx  |  2 +-
 src/pages/DrillingProgram/CategoryHistory.jsx |  2 +-
 src/pages/DrillingProgram/CategoryRender.jsx  |  2 +-
 src/pages/DrillingProgram/index.jsx           |  2 +-
 src/pages/Main.jsx                            |  5 ++--
 src/pages/Measure/MeasureTable.jsx            |  2 +-
 src/pages/Measure/index.jsx                   |  4 +--
 src/pages/Report/Reports.jsx                  |  6 ++--
 src/pages/Telemetry/Archive/index.jsx         |  2 +-
 src/pages/Telemetry/DashboardNNB/index.jsx    |  3 +-
 src/pages/Telemetry/Operations/index.jsx      | 28 +++++++++++++++++++
 .../TelemetryView/ActiveMessagesOnline.jsx    |  2 +-
 .../Setpoints/SetpointSender.jsx              |  4 +--
 .../TelemetryView/Setpoints/index.jsx         |  2 +-
 .../TelemetryView/WirelineRunOut.jsx          |  6 ++--
 src/pages/Telemetry/TelemetryView/index.jsx   |  2 +-
 src/pages/Telemetry/index.jsx                 |  2 +-
 .../TelemetryAnalysisDepthToDay.jsx           |  4 +--
 .../TelemetryAnalysisDepthToInterval.jsx      |  2 +-
 .../TelemetryAnalysisOperationsSummary.jsx    |  4 +--
 src/pages/TelemetryAnalysis/index.jsx         |  2 +-
 src/pages/Well.jsx                            |  6 ++--
 src/pages/WellOperations/index.jsx            |  3 +-
 35 files changed, 79 insertions(+), 52 deletions(-)
 create mode 100644 src/context.ts
 create mode 100644 src/pages/Telemetry/Operations/index.jsx

diff --git a/src/components/Private/PrivateMenu.tsx b/src/components/Private/PrivateMenu.tsx
index 6894518..8ecc6ab 100644
--- a/src/components/Private/PrivateMenu.tsx
+++ b/src/components/Private/PrivateMenu.tsx
@@ -3,8 +3,8 @@ import { Menu, MenuItemProps, MenuProps } from 'antd'
 import { Children, cloneElement, memo, ReactElement, useContext, useMemo } from 'react'
 import { Link, useLocation } from 'react-router-dom'
 
+import { RootPathContext } from '@asb/context'
 import { isURLAvailable } from '@utils/permissions'
-import { RootPathContext } from '@pages/Main'
 
 export type PrivateMenuProps = MenuProps & { root?: string }
 
diff --git a/src/components/Private/PrivateSwitch.tsx b/src/components/Private/PrivateSwitch.tsx
index 57911ed..1be3dff 100644
--- a/src/components/Private/PrivateSwitch.tsx
+++ b/src/components/Private/PrivateSwitch.tsx
@@ -1,12 +1,12 @@
 import { join } from 'path'
 import { Location } from 'history'
 import { Children, cloneElement, memo, ReactElement, ReactNode, useCallback, useContext, useMemo } from 'react'
-
 import { Redirect, Route, Switch, SwitchProps, useLocation } from 'react-router-dom'
+
+import { RootPathContext } from '@asb/context'
 import { isURLAvailable } from '@utils/permissions'
 import { getUserId } from '@utils/storage'
 
-import { RootPathContext } from '@pages/Main'
 
 export type PrivateSwitchProps = SwitchProps & {
     root?: string
diff --git a/src/context.ts b/src/context.ts
new file mode 100644
index 0000000..06311dc
--- /dev/null
+++ b/src/context.ts
@@ -0,0 +1,4 @@
+import { createContext } from 'react'
+
+export const IdWellContext = createContext<number | null>(null)
+export const RootPathContext = createContext<string>('')
diff --git a/src/pages/AdminPanel/Telemetry/index.jsx b/src/pages/AdminPanel/Telemetry/index.jsx
index 9a145e0..7d97fda 100755
--- a/src/pages/AdminPanel/Telemetry/index.jsx
+++ b/src/pages/AdminPanel/Telemetry/index.jsx
@@ -2,10 +2,10 @@ import { Layout } from 'antd'
 import { lazy, memo, Suspense, useContext, useMemo } from 'react'
 import { useParams } from 'react-router-dom'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import { SuspenseFallback } from '@pages/SuspenseFallback'
-import { RootPathContext } from '@pages/Main'
 
 const TelemetryViewer = lazy(() => import('./TelemetryViewer'))
 const TelemetryMerger = lazy(() => import('./TelemetryMerger'))
diff --git a/src/pages/AdminPanel/index.jsx b/src/pages/AdminPanel/index.jsx
index 8963f67..c704c99 100755
--- a/src/pages/AdminPanel/index.jsx
+++ b/src/pages/AdminPanel/index.jsx
@@ -2,9 +2,9 @@ import { Layout } from 'antd'
 import { lazy, memo, Suspense, useContext, useMemo } from 'react'
 import { useParams } from 'react-router-dom'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
-import { RootPathContext } from '@pages/Main'
 import { SuspenseFallback } from '@pages/SuspenseFallback'
 
 const     ClusterController = lazy(() => import(    './ClusterController'))
diff --git a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
index c353e4d..d01c9f5 100755
--- a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
@@ -1,12 +1,12 @@
 import { memo, useCallback, useContext, useEffect, useState } from 'react'
 import { Button, Modal, Popconfirm } from 'antd'
 
+import { IdWellContext } from '@asb/context'
 import { Table } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DrillParamsService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 import { getColumns } from '@pages/WellOperations/WellDrillParams'
 
 export const NewParamsTable = memo(({ selectedWellsKeys }) => {
diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 38aa452..228e8f3 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -3,6 +3,7 @@ import { useState, useEffect, memo, useMemo, useContext } from 'react'
 import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
 import { Table, Tag, Button, Badge, Divider, Modal, Row, Col } from 'antd'
 
+import { IdWellContext } from '@asb/context'
 import { CompanyView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -15,7 +16,6 @@ import {
   getOperations
 } from '@utils/functions'
 
-import { IdWellContext } from '@pages/Well'
 import { Tvd } from '@pages/WellOperations/Tvd'
 import WellOperationsTable from '@pages/Cluster/WellOperationsTable'
 import NewParamsTable from './NewParamsTable'
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
index 8cecd33..9725994 100755
--- a/src/pages/Analytics/WellCompositeEditor/index.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/index.jsx
@@ -2,14 +2,14 @@ import { useState, useEffect, memo, useContext } from 'react'
 import { useParams } from 'react-router-dom'
 import { Col, Layout, Row } from 'antd'
 
-import { arrayOrDefault } from '@utils'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import WellSelector from '@components/selectors/WellSelector'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
+import { arrayOrDefault } from '@utils'
 import { OperationStatService, WellCompositeService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 import ClusterWells from '@pages/Cluster/ClusterWells'
 import { WellCompositeSections } from './WellCompositeSections'
 
diff --git a/src/pages/Analytics/index.jsx b/src/pages/Analytics/index.jsx
index 1a38c6a..33834a4 100755
--- a/src/pages/Analytics/index.jsx
+++ b/src/pages/Analytics/index.jsx
@@ -2,11 +2,11 @@ import { memo, useContext, useMemo } from 'react'
 import { useParams } from 'react-router-dom'
 import { Layout } from 'antd'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import Statistics from './Statistics'
 import WellCompositeEditor from './WellCompositeEditor'
-import { RootPathContext } from '@pages/Main'
 
 export const Analytics = memo(() => {
     const { tab } = useParams()
diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx
index dc98a2e..479ac5b 100755
--- a/src/pages/Documents/DocumentsTemplate.jsx
+++ b/src/pages/Documents/DocumentsTemplate.jsx
@@ -1,15 +1,15 @@
 import { useState, useEffect, useMemo, useCallback, useContext } from 'react'
 import { DatePicker, Button, Input } from 'antd'
 
-import { FileService } from '@api'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { UploadForm } from '@components/UploadForm'
 import { CompanyView, UserView } from  '@components/views'
-import { EditableTable, makeColumn, makeDateColumn, makeNumericColumn, makePaginationObject } from '@components/Table'
 import { invokeWebApiWrapperAsync, downloadFile, formatBytes } from '@components/factory'
+import { EditableTable, makeColumn, makeDateColumn, makeNumericColumn, makePaginationObject } from '@components/Table'
 import { hasPermission } from '@utils/permissions'
+import { FileService } from '@api's
 
-import { IdWellContext } from '@pages/Well'
 
 const pageSize = 12
 const { RangePicker } = DatePicker
diff --git a/src/pages/Documents/index.jsx b/src/pages/Documents/index.jsx
index 3c79213..4711d81 100755
--- a/src/pages/Documents/index.jsx
+++ b/src/pages/Documents/index.jsx
@@ -3,10 +3,10 @@ import { memo, useContext, useMemo } from 'react'
 import { FolderOutlined } from '@ant-design/icons'
 import { Layout } from 'antd'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import DocumentsTemplate from './DocumentsTemplate'
-import { RootPathContext } from '@pages/Main'
 
 const { Content } = Layout
 
diff --git a/src/pages/DrillingProgram/CategoryAdder.jsx b/src/pages/DrillingProgram/CategoryAdder.jsx
index 66534e7..23c5118 100755
--- a/src/pages/DrillingProgram/CategoryAdder.jsx
+++ b/src/pages/DrillingProgram/CategoryAdder.jsx
@@ -2,11 +2,11 @@ import { Form, Select } from 'antd'
 import { FileAddOutlined } from '@ant-design/icons'
 import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import Poprompt from '@components/selectors/Poprompt'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DrillingProgramService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
diff --git a/src/pages/DrillingProgram/CategoryEditor.jsx b/src/pages/DrillingProgram/CategoryEditor.jsx
index 4bedc5e..13f0ddf 100755
--- a/src/pages/DrillingProgram/CategoryEditor.jsx
+++ b/src/pages/DrillingProgram/CategoryEditor.jsx
@@ -2,6 +2,7 @@ import { Input, Modal, Radio } from 'antd'
 import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { BehaviorSubject, debounceTime, distinctUntilChanged, filter, map } from 'rxjs'
 
+import { IdWellContext } from '@asb/context'
 import { UserView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -9,7 +10,6 @@ import { makeColumn, makeNumericSorter, Table } from '@components/Table'
 import { DrillingProgramService } from '@api'
 import { arrayOrDefault } from '@utils'
 
-import { IdWellContext } from '@pages/Well'
 
 const userRules = [
     { label: 'Нет', value: 0 },
diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx
index b9f1424..a89df43 100755
--- a/src/pages/DrillingProgram/CategoryHistory.jsx
+++ b/src/pages/DrillingProgram/CategoryHistory.jsx
@@ -1,6 +1,7 @@
 import { useCallback, useContext, useEffect, useState } from 'react'
 import { Button, DatePicker, Input, Modal } from 'antd'
 
+import { IdWellContext } from '@asb/context'
 import { CompanyView } from '@components/views'
 import DownloadLink from '@components/DownloadLink'
 import LoaderPortal from '@components/LoaderPortal'
@@ -10,7 +11,6 @@ import { arrayOrDefault, formatDate } from '@utils'
 import { FileService } from '@api'
 
 import MarksCard from './MarksCard'
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 92f6e27..770c7c2 100755
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -6,6 +6,7 @@ import {
     TableOutlined,
 } from '@ant-design/icons'
 
+import { IdWellContext } from '@asb/context'
 import { UserView } from '@components/views'
 import UploadForm from '@components/UploadForm'
 import DownloadLink from '@components/DownloadLink'
@@ -16,7 +17,6 @@ import { DrillingProgramService } from '@api'
 import { formatDate } from '@utils'
 
 import MarksCard from './MarksCard'
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
index 1b08c73..ae3a530 100755
--- a/src/pages/DrillingProgram/index.jsx
+++ b/src/pages/DrillingProgram/index.jsx
@@ -10,6 +10,7 @@ import {
 } from '@ant-design/icons'
 import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, formatDate } from '@utils'
@@ -19,7 +20,6 @@ import CategoryAdder from './CategoryAdder'
 import CategoryRender from './CategoryRender'
 import CategoryEditor from './CategoryEditor'
 import CategoryHistory from './CategoryHistory'
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/drilling_program.less'
 
diff --git a/src/pages/Main.jsx b/src/pages/Main.jsx
index 183da19..67a39fb 100755
--- a/src/pages/Main.jsx
+++ b/src/pages/Main.jsx
@@ -1,6 +1,7 @@
-import { createContext, memo } from 'react'
+import { memo } from 'react'
 import { Route, Switch } from 'react-router-dom'
 
+import { RootPathContext } from '@asb/context'
 import { AdminLayoutPortal, LayoutPortal } from '@components/Layout'
 import { PrivateDefaultRoute, PrivateRoute } from '@components/Private'
 
@@ -10,8 +11,6 @@ import Deposit from './Deposit'
 import AdminPanel from './AdminPanel'
 import AccessDenied from './AccessDenied'
 
-export const RootPathContext = createContext('')
-
 export const Main = memo(() => (
     <RootPathContext.Provider value={''}>
         <Switch>
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 32bd830..6f858dd 100755
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -9,6 +9,7 @@ import {
   DeleteOutlined
 } from '@ant-design/icons'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { hasPermission } from '@utils/permissions'
@@ -16,7 +17,6 @@ import { formatDate } from '@utils'
 import { MeasureService } from '@api'
 
 import { View } from './View'
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/index.css'
 import '@styles/measure.css'
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index af15e53..ecc1e6d 100755
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -2,16 +2,16 @@ import { Button } from 'antd'
 import { useState, useEffect, memo, useContext } from 'react'
 import { TableOutlined } from '@ant-design/icons'
 
-import { MeasureService } from '@api'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
+import { MeasureService } from '@api'
 
 import { MeasureTable } from './MeasureTable'
 import { InclinometryTable } from './InclinometryTable'
 import { columnsNnb, nnbDefaultData } from './nnbData'
 import { columnsMudDiagram, mudDiagramDefaultData } from './mudDiagramData'
 import { columnsDrillingFluid, drillingFluidDefaultData } from './drillingFluidData'
-import { IdWellContext } from '@pages/Well'
 
 const defaultData = [
   {
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Report/Reports.jsx
index c5fb7ca..9d0609f 100755
--- a/src/pages/Report/Reports.jsx
+++ b/src/pages/Report/Reports.jsx
@@ -2,12 +2,12 @@ import { Button, Tooltip } from 'antd'
 import { useState, useEffect, memo, useContext } from 'react'
 import { FilePdfOutlined, FileTextOutlined } from '@ant-design/icons'
 
-import { ReportService } from '@api'
-import { formatDate, periodToString } from '@utils'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { Table, makeDateSorter, makeNumericSorter } from '@components/Table'
 import { invokeWebApiWrapperAsync, downloadFile } from '@components/factory'
-import { IdWellContext } from '@pages/Well'
+import { formatDate, periodToString } from '@utils'
+import { ReportService } from '@api'
 
 const imgPaths = {
   '.pdf': <FilePdfOutlined/>,
diff --git a/src/pages/Telemetry/Archive/index.jsx b/src/pages/Telemetry/Archive/index.jsx
index 1a45d4e..fe37028 100755
--- a/src/pages/Telemetry/Archive/index.jsx
+++ b/src/pages/Telemetry/Archive/index.jsx
@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { useState, useEffect, memo, useCallback, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import { Flex } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -8,7 +9,6 @@ import { DatePickerWrapper, makeDateSorter } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 import { TelemetryDataSaubService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 import { normalizeData } from '../TelemetryView'
 import { ArchiveDisplay, cutData } from './ArchiveDisplay'
 
diff --git a/src/pages/Telemetry/DashboardNNB/index.jsx b/src/pages/Telemetry/DashboardNNB/index.jsx
index cf16bcf..5fd2e6c 100644
--- a/src/pages/Telemetry/DashboardNNB/index.jsx
+++ b/src/pages/Telemetry/DashboardNNB/index.jsx
@@ -3,6 +3,7 @@ import { useHistory, useParams } from 'react-router-dom'
 import { CloseOutlined } from '@ant-design/icons'
 import { Button, Menu, Popconfirm } from 'antd'
 
+import { IdWellContext, RootPathContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { BaseWidget, WidgetSettingsWindow } from '@components/widgets'
@@ -19,8 +20,6 @@ import {
     WitsRecord61Service,
 } from '@api'
 
-import { IdWellContext } from '@pages/Well'
-import { RootPathContext } from '@pages/Main'
 import AddGroupWindow from './AddGroupWindow'
 import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow'
 
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
new file mode 100644
index 0000000..ee25cae
--- /dev/null
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -0,0 +1,28 @@
+import { memo, useContext, useEffect, useState } from 'react'
+
+import { IdWellContext } from '@asb/context'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+
+
+export const Operations = memo(() => {
+    const idWell = useContext(IdWellContext)
+    const [isLoading, setIsLoading] = useState(false)
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => {
+            //
+        },
+        setIsLoading,
+        'Не удалось загрузить список определённых операций',
+        'Получение списка определённых операций',
+    ))
+
+    return (
+        <LoaderPortal show={isLoading}>
+
+        </LoaderPortal>
+    )
+})
+
+export default Operations
diff --git a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index f839c02..3e9ea0b 100755
--- a/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -1,13 +1,13 @@
 import { Table } from 'antd'
 import { useState, useEffect, useCallback, memo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { Subscribe } from '@services/signalr'
 import { MessageService } from '@api'
 
 import { columns } from '../Messages'
-import { IdWellContext } from '@pages/Well'
 
 import '@styles/message.css'
 
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
index 985dd96..d98f91c 100755
--- a/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
@@ -1,14 +1,14 @@
 import { memo, useCallback, useContext, useMemo, useState } from 'react'
 import { Select, Modal, Input, InputNumber } from 'antd'
 
-import { SetpointsService } from '@api'
+import { IdWellContext } from '@asb/context'
 import { Grid, GridItem } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeNumericRender, EditableTable } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
+import { SetpointsService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 
 export const SetpointSender = memo(({ onClose, visible, setpointNames }) => {
     const [expirePeriod, setExpirePeriod] = useState(defaultPeriod)
diff --git a/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
index bf54c98..7cf4901 100755
--- a/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/Setpoints/index.jsx
@@ -1,6 +1,7 @@
 import { Button, Modal } from 'antd'
 import { useState, useEffect, memo, useCallback, useMemo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import { Table } from '@components/Table'
 import { UserView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
@@ -10,7 +11,6 @@ import { makeStringCutter } from '@utils/string'
 import { formatDate } from '@utils'
 import { SetpointsService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 import SetpointSender from './SetpointSender'
 import { SetpointViewer, getSetpointStatus } from './SetpointViewer'
 
diff --git a/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
index ec5a9f6..a6fc188 100644
--- a/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
+++ b/src/pages/Telemetry/TelemetryView/WirelineRunOut.jsx
@@ -1,10 +1,10 @@
 import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
-import { TelemetryWirelineRunOutService } from '@api'
-import { invokeWebApiWrapperAsync } from '@components/factory'
+import { IdWellContext } from '@asb/context'
 import { WirelineView } from '@components/views'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { TelemetryWirelineRunOutService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 
 export const WirelineRunOut = memo(() => {
     const [twro, setTwro] = useState({})
diff --git a/src/pages/Telemetry/TelemetryView/index.jsx b/src/pages/Telemetry/TelemetryView/index.jsx
index aa0083a..2189da5 100755
--- a/src/pages/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Telemetry/TelemetryView/index.jsx
@@ -8,6 +8,7 @@ import {
   TelemetryDataSpinService,
   WellService
 } from '@api'
+import { IdWellContext } from '@asb/context'
 import { makeDateSorter } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { Grid, GridItem, Flex } from '@components/Grid'
@@ -23,7 +24,6 @@ import { ModeDisplay } from './ModeDisplay'
 import { UserOfWell } from './UserOfWells'
 import { Setpoints } from './Setpoints'
 import WirelineRunOut from './WirelineRunOut'
-import { IdWellContext } from '@pages/Well'
 
 import MomentStabPicEnabled from '@images/DempherOn.png'
 import MomentStabPicDisabled from '@images/DempherOff.png'
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 85189ba..3cc7336 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -3,13 +3,13 @@ import { memo, useContext, useMemo } from 'react'
 import { Layout } from 'antd'
 import { AlertOutlined, FundViewOutlined, DatabaseOutlined } from '@ant-design/icons'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateSwitch, PrivateMenu } from '@components/Private'
 
 import Archive from './Archive'
 import Messages from './Messages'
 import DashboardNNB from './DashboardNNB'
 import TelemetryView from './TelemetryView'
-import { RootPathContext } from '@pages/Main'
 
 import '@styles/index.css'
 
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
index f679a67..b2f3c6e 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
@@ -1,11 +1,11 @@
 import { useState, useEffect, memo, useContext } from 'react'
 
-import { TelemetryAnalyticsService } from '@api'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryDepthToDay } from '@components/charts/ChartTelemetryDepthToDay'
+import { TelemetryAnalyticsService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 
 export const TelemetryAnalysisDepthToDay = memo(() => {
   const [depthData, setDepthData] = useState([])
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
index c5cb90e..f2a6f6c 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
@@ -1,13 +1,13 @@
 import { Select } from 'antd'
 import { useState, useEffect, memo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryDepthToInterval } from '@components/charts/ChartTelemetryDepthToInterval'
 import { TelemetryAnalyticsService } from '@api'
 import { arrayOrDefault } from '@utils'
 
-import { IdWellContext } from '@pages/Well'
 
 const timePeriodCollection = [
   { value: '3600', label: '1 час' },
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
index 37e35b5..d5b88f6 100755
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
+++ b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
@@ -2,12 +2,12 @@ import moment from 'moment'
 import { Form, DatePicker } from 'antd'
 import { useState, useEffect, memo, useContext } from 'react'
 
-import { TelemetryAnalyticsService } from '@api'
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { ChartTelemetryOperationsSummary } from '@components/charts/ChartTelemetryOperationsSummary'
+import { TelemetryAnalyticsService } from '@api'
 
-import { IdWellContext } from '@pages/Well'
 
 const { RangePicker } = DatePicker
 
diff --git a/src/pages/TelemetryAnalysis/index.jsx b/src/pages/TelemetryAnalysis/index.jsx
index 54bae03..4b24fea 100755
--- a/src/pages/TelemetryAnalysis/index.jsx
+++ b/src/pages/TelemetryAnalysis/index.jsx
@@ -3,13 +3,13 @@ import { memo, useContext, useMemo } from 'react'
 import { FolderOutlined } from '@ant-design/icons'
 import { Layout } from 'antd'
 
+import { RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import TelemetryAnalysisDepthToDay from './TelemetryAnalysisDepthToDay'
 import TelemetryAnalysisDepthToInterval from './TelemetryAnalysisDepthToInterval'
 import TelemetryAnalysisOperationsSummary from './TelemetryAnalysisOperationsSummary'
 import TelemetryAnalysisOperationsToInterval from './TelemetryAnalysisOperationsToInterval'
-import { RootPathContext } from '@pages/Main'
 
 const { Content } = Layout
 
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index f3aa58c..3f998f0 100755
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -1,4 +1,4 @@
-import { createContext, memo, useContext, useMemo } from 'react'
+import { memo, useContext, useMemo } from 'react'
 import {
   FolderOutlined,
   FundViewOutlined,
@@ -9,6 +9,7 @@ import {
 import { Layout } from 'antd'
 import { useParams } from 'react-router-dom'
 
+import { IdWellContext, RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import Report from './Report'
@@ -19,14 +20,11 @@ import Telemetry from './Telemetry'
 import WellOperations from './WellOperations'
 import DrillingProgram from './DrillingProgram'
 import TelemetryAnalysis from './TelemetryAnalysis'
-import { RootPathContext } from './Main'
 
 import '@styles/index.css'
 
 const { Content } = Layout
 
-export const IdWellContext = createContext(null)
-
 export const Well = memo(() => {
   const { idWell, tab } = useParams()
   const root = useContext(RootPathContext)
diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx
index c807f08..c77a3c6 100755
--- a/src/pages/WellOperations/index.jsx
+++ b/src/pages/WellOperations/index.jsx
@@ -9,6 +9,7 @@ import {
   TableOutlined,
 } from '@ant-design/icons'
 
+import { IdWellContext, RootPathContext } from '@asb/context'
 import { PrivateMenu, PrivateSwitch } from '@components/Private'
 
 import { Tvd } from './Tvd'
@@ -19,8 +20,6 @@ import { WellSectionsStat } from './WellSectionsStat'
 import { WellOperationsEditor } from './WellOperationsEditor'
 import { Flex } from '@components/Grid'
 
-import { RootPathContext } from '@pages/Main'
-import { IdWellContext } from '@pages/Well'
 
 const { Content } = Layout
 

From f0659f234c58151c99277cb7a009438aebc2e2cc Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 28 Apr 2022 17:22:58 +0500
Subject: [PATCH 32/49] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=D0=B8=D0=BD=D1=82=D0=B0=D0=BA=D1=81=D0=B8=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Analytics/Statistics.jsx                | 2 +-
 src/pages/Cluster/ClusterWells.jsx                | 2 +-
 src/pages/Documents/DocumentsTemplate.jsx         | 5 ++---
 src/pages/Report/index.jsx                        | 6 +++---
 src/pages/Telemetry/Messages.jsx                  | 2 +-
 src/pages/WellOperations/DrillProcessFlow.jsx     | 4 ++--
 src/pages/WellOperations/Tvd/index.jsx            | 2 +-
 src/pages/WellOperations/WellDrillParams.jsx      | 2 +-
 src/pages/WellOperations/WellOperationsEditor.jsx | 2 +-
 src/pages/WellOperations/WellSectionsStat.jsx     | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/pages/Analytics/Statistics.jsx b/src/pages/Analytics/Statistics.jsx
index fabd3c1..e10c29f 100755
--- a/src/pages/Analytics/Statistics.jsx
+++ b/src/pages/Analytics/Statistics.jsx
@@ -1,6 +1,7 @@
 import { Table as RawTable, Typography } from 'antd'
 import { Fragment, memo, useCallback, useContext, useEffect, useState } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { WellSelector } from '@components/selectors/WellSelector'
@@ -8,7 +9,6 @@ import { makeGroupColumn, makeNumericColumn, makeNumericRender, makeTextColumn,
 import { OperationStatService, WellOperationService } from '@api'
 import { arrayOrDefault } from '@utils'
 
-import { IdWellContext } from '../Well'
 
 import '@styles/index.css'
 import '@styles/statistics.less'
diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index 7e3bb10..1c48058 100755
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -1,5 +1,5 @@
 import { Link, useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useMemo, useCallback } from 'react'
+import { useState, useEffect, memo, useMemo } from 'react'
 import { Tag, Button, Modal } from 'antd'
 import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
 
diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx
index 479ac5b..a540975 100755
--- a/src/pages/Documents/DocumentsTemplate.jsx
+++ b/src/pages/Documents/DocumentsTemplate.jsx
@@ -8,8 +8,7 @@ import { CompanyView, UserView } from  '@components/views'
 import { invokeWebApiWrapperAsync, downloadFile, formatBytes } from '@components/factory'
 import { EditableTable, makeColumn, makeDateColumn, makeNumericColumn, makePaginationObject } from '@components/Table'
 import { hasPermission } from '@utils/permissions'
-import { FileService } from '@api's
-
+import { FileService } from '@api'
 
 const pageSize = 12
 const { RangePicker } = DatePicker
@@ -42,7 +41,7 @@ export const DocumentsTemplate = ({ idCategory, idWell: wellId, accept, headerCh
   const [showLoader, setShowLoader] = useState(false)
 
   const idwellContext = useContext(IdWellContext)
-  const idWell = useMemo(() => wellId ?? idwellContext, [wellId])
+  const idWell = useMemo(() => wellId ?? idwellContext, [wellId, idwellContext])
 
   const uploadUrl = useMemo(() => `/api/well/${idWell}/files/?idCategory=${idCategory}`, [idWell, idCategory])
 
diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
index 0c1f2e0..16bd8c0 100755
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Report/index.jsx
@@ -3,15 +3,15 @@ import moment from 'moment'
 import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Radio, Button, Select, notification } from 'antd'
 
-import { ReportService } from '@api'
-import { Subscribe } from '@services/signalr'
+import { IdWellContext } from '@asb/context'
 import { LoaderPortal } from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DateRangeWrapper } from 'components/Table/DateRangeWrapper'
+import { Subscribe } from '@services/signalr'
+import { ReportService } from '@api'
 
 import { Reports } from './Reports'
 import { ReportCreationNotify } from './ReportCreationNotify'
-import { IdWellContext } from '../Well'
 
 const timePeriodNames = [
   { label: '1 секунда', value: 1 },
diff --git a/src/pages/Telemetry/Messages.jsx b/src/pages/Telemetry/Messages.jsx
index e97732b..ad2d3e9 100755
--- a/src/pages/Telemetry/Messages.jsx
+++ b/src/pages/Telemetry/Messages.jsx
@@ -1,12 +1,12 @@
 import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Table, Select, DatePicker, Input } from 'antd'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeColumn, makeDateColumn, makeNumericSorter } from '@components/Table'
 import { MessageService } from '@api'
 
-import { IdWellContext } from '../Well'
 
 import '@styles/message.css'
 
diff --git a/src/pages/WellOperations/DrillProcessFlow.jsx b/src/pages/WellOperations/DrillProcessFlow.jsx
index b451c25..0d9865d 100755
--- a/src/pages/WellOperations/DrillProcessFlow.jsx
+++ b/src/pages/WellOperations/DrillProcessFlow.jsx
@@ -1,17 +1,17 @@
 import { useState, useEffect, memo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import {
     EditableTable,
     makeNumericMinMax,
     makeNumericStartEnd,
 } from '@components/Table'
-import { DrillFlowChartService } from '@api'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
+import { DrillFlowChartService } from '@api'
 
-import { IdWellContext } from '../Well'
 
 const columns = [
     makeNumericStartEnd('Глубина, м', 'depth'),
diff --git a/src/pages/WellOperations/Tvd/index.jsx b/src/pages/WellOperations/Tvd/index.jsx
index 6f61e78..997ca5d 100755
--- a/src/pages/WellOperations/Tvd/index.jsx
+++ b/src/pages/WellOperations/Tvd/index.jsx
@@ -16,6 +16,7 @@ import 'chartjs-adapter-moment'
 import zoomPlugin from 'chartjs-plugin-zoom'
 import ChartDataLabels from 'chartjs-plugin-datalabels'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { formatDate, fractionalSum } from '@utils/datetime'
@@ -27,7 +28,6 @@ import AdditionalTables from './AdditionalTables'
 
 import '@styles/index.css'
 import '@styles/tvd.less'
-import { IdWellContext } from '@asb/pages/Well'
 
 Chart.register(
   TimeScale,
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
index 79b7e63..5a4570b 100755
--- a/src/pages/WellOperations/WellDrillParams.jsx
+++ b/src/pages/WellOperations/WellDrillParams.jsx
@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback, memo, useMemo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import {
     EditableTable,
     makeSelectColumn,
@@ -13,7 +14,6 @@ import { DrillParamsService, WellOperationService } from '@api'
 import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
 
-import { IdWellContext } from '../Well'
 
 export const getColumns = async (idWell) => {
     let sectionTypes = await WellOperationService.getSectionTypes(idWell)
diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
index 4ea8dee..11b0298 100755
--- a/src/pages/WellOperations/WellOperationsEditor.jsx
+++ b/src/pages/WellOperations/WellOperationsEditor.jsx
@@ -3,6 +3,7 @@ import { Input } from 'antd'
 import { useLocation } from 'react-router-dom'
 import { useState, useEffect, memo, useMemo, useCallback, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import {
   EditableTable,
   makeColumn,
@@ -21,7 +22,6 @@ import { hasPermission } from '@utils/permissions'
 import { arrayOrDefault } from '@utils'
 import { WellOperationService } from '@api'
 
-import { IdWellContext } from '../Well'
 
 const { TextArea } = Input
 
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
index 8afa41e..089c0c2 100755
--- a/src/pages/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/WellOperations/WellSectionsStat.jsx
@@ -1,12 +1,12 @@
 import { useState, useEffect, memo, useContext } from 'react'
 
+import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { Table, makeColumn, makeColumnsPlanFact, makeNumericRender } from '@components/Table'
 import { calcDuration } from '@utils/datetime'
 import { OperationStatService } from '@api'
 
-import { IdWellContext } from '../Well'
 
 const numericRender = makeNumericRender(2)
 

From 9e8648d33e8a4c512f9e0d1187d4b6ea8b8e55e0 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 29 Apr 2022 12:10:42 +0500
Subject: [PATCH 33/49] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=B5=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B,=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20Teleme?=
 =?UTF-8?q?tryAnalytics?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 concept/WellTelemetryAnalysis.jsx             | 163 ----------------
 src/components/AnalysisOperationTime.jsx      |  41 ----
 src/components/charts/ChartOperationTime.jsx  |  68 -------
 .../charts/ChartOperationTimeBase.tsx         | 177 ------------------
 .../charts/ChartTelemetryDepthToDay.jsx       |  99 ----------
 .../charts/ChartTelemetryDepthToInterval.jsx  |  74 --------
 .../ChartTelemetryOperationsSummary.jsx       |  89 ---------
 .../TelemetryAnalysisDepthToDay.jsx           |  46 -----
 .../TelemetryAnalysisDepthToInterval.jsx      |  53 ------
 .../TelemetryAnalysisOperationsSummary.jsx    |  72 -------
 .../TelemetryAnalysisOperationsToInterval.jsx |   5 -
 src/pages/TelemetryAnalysis/index.jsx         |  44 -----
 12 files changed, 931 deletions(-)
 delete mode 100755 concept/WellTelemetryAnalysis.jsx
 delete mode 100755 src/components/AnalysisOperationTime.jsx
 delete mode 100755 src/components/charts/ChartOperationTime.jsx
 delete mode 100755 src/components/charts/ChartOperationTimeBase.tsx
 delete mode 100755 src/components/charts/ChartTelemetryDepthToDay.jsx
 delete mode 100755 src/components/charts/ChartTelemetryDepthToInterval.jsx
 delete mode 100755 src/components/charts/ChartTelemetryOperationsSummary.jsx
 delete mode 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
 delete mode 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
 delete mode 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
 delete mode 100755 src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
 delete mode 100755 src/pages/TelemetryAnalysis/index.jsx

diff --git a/concept/WellTelemetryAnalysis.jsx b/concept/WellTelemetryAnalysis.jsx
deleted file mode 100755
index e0505b9..0000000
--- a/concept/WellTelemetryAnalysis.jsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import { Table, Select, DatePicker } from "antd";
-import { TelemetryAnalyticsService } from "../src/services/api";
-import { useState, useEffect } from "react";
-import { useParams } from "react-router-dom";
-import notify from "../src/components/notify";
-import LoaderPortal from "../src/components/LoaderPortal";
-import moment from "moment";
-import "../styles/message.css";
-
-const { Option } = Select;
-const pageSize = 26;
-const { RangePicker } = DatePicker;
-
-const columns = [
-  {
-    title: "Название операции",
-    key: "name",
-    dataIndex: "name",
-  },
-  {
-    title: "Дата начала операции",
-    key: "beginDate",
-    dataIndex: "beginDate",
-    render: (item) => moment.utc(item).local().format("DD MMM YYYY, HH:mm:ss"),
-  },
-  {
-    title: "Дата окончания операции",
-    key: "endDate",
-    dataIndex: "endDate",
-    render: (item) => moment.utc(item).local().format("DD MMM YYYY, HH:mm:ss"),
-  },
-  {
-    title: "Глубина скважины в начале операции",
-    key: "beginWellDepth",
-    dataIndex: "startWellDepth",
-  },
-  {
-    title: "Глубина скважины в конце операции",
-    key: "endWellDepth",
-    dataIndex: "endWellDepth",
-  },
-];
-
-const filterOptions = [
-  { label: "Невозможно определить операцию", value: 1 },
-  { label: "Роторное бурение", value: 2 },
-  { label: "Слайдирование", value: 3 },
-  { label: "Подъем с проработкой", value: 4 },
-  { label: "Спуск с проработкой", value: 5 },
-  { label: "Подъем с промывкой", value: 6 },
-  { label: "Спуск с промывкой", value: 7 },
-  { label: "Спуск в скважину", value: 8 },
-  { label: "Спуск с вращением", value: 9 },
-  { label: "Подъем из скважины", value: 10 },
-  { label: "Подъем с вращением", value: 11 },
-  { label: "Промывка в покое", value: 12 },
-  { label: "Промывка с вращением", value: 13 },
-  { label: "Удержание в клиньях", value: 14 },
-  { label: "Неподвижное состояние", value: 15 },
-  { label: "Вращение без циркуляции", value: 16 },
-  { label: "На поверхности", value: 17 },
-];
-
-export default function WellTelemetryAnalysis() {
-  let { id } = useParams();
-
-  const [page, setPage] = useState(1);
-  const [range, setRange] = useState([]);
-  const [categories, setCategories] = useState([]);
-  const [pagination, setPagination] = useState(null);
-  const [operations, setOperations] = useState([]);
-
-  const [loader, setLoader] = useState(false);
-
-  const children = filterOptions.map((line) => (
-    <Option key={line.value}>{line.label}</Option>
-  ));
-
-  const onChangeRange = (range) => {
-    setRange(range);
-  };
-
-  useEffect(() => {
-    const GetOperations = async () => {
-      setLoader(true);
-      try {
-        let begin = null;
-        let end = null;
-        if (range?.length > 1) {
-          begin = range[0].toISOString();
-          end = range[1].toISOString();
-        }
-
-        await TelemetryAnalyticsService.getOperationsByWell(
-          `${id}`,
-          (page - 1) * pageSize,
-          pageSize,
-          categories,
-          begin,
-          end
-        ).then((paginatedOperations) => {
-          setOperations(
-            paginatedOperations?.items.map((o) => {
-              return {
-                key: o.id,
-                begin: o.date,
-                ...o,
-              };
-            })
-          );
-
-          setPagination({
-            total: paginatedOperations?.count,
-            current: Math.floor(paginatedOperations?.skip / pageSize),
-          });
-        });
-      } catch (ex) {
-        notify(`Не удалось загрузить операции по скважине "${id}"`, "error");
-        console.log(ex);
-      }
-      setLoader(false);
-    };
-    GetOperations();
-  }, [id, categories, range, page]);
-
-  return (
-    <>
-      <div className="filter-group">
-        <h3 className="filter-group-heading">Фильтр операций</h3>
-        <Select
-          mode="multiple"
-          allowClear
-          placeholder="Фильтр операций"
-          className="filter-selector"
-          value={categories}
-          onChange={setCategories}
-        >
-          {children}
-        </Select>
-        <RangePicker
-          showTime
-          placeholder={["Дата начала операции", "Дата окончания операции"]}
-          onChange={onChangeRange}
-        />
-      </div>
-      <LoaderPortal show={loader}>
-        <Table
-          columns={columns}
-          dataSource={operations}
-          size={"small"}
-          pagination={{
-            pageSize: pageSize,
-            showSizeChanger: false,
-            total: pagination?.total,
-            current: page,
-            onChange: (page) => setPage(page),
-          }}
-          rowKey={(record) => record.id}
-        />
-      </LoaderPortal>
-    </>
-  );
-}
diff --git a/src/components/AnalysisOperationTime.jsx b/src/components/AnalysisOperationTime.jsx
deleted file mode 100755
index 89a9209..0000000
--- a/src/components/AnalysisOperationTime.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import moment from 'moment'
-import { DatePicker } from 'antd'
-import { useState, useEffect } from 'react'
-import { useParams } from 'react-router-dom'
-
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { TelemetryAnalyticsService } from '@api'
-import { ChartOperationTime } from './charts/ChartOperationTime'
-
-const { RangePicker } = DatePicker
-
-const lines = [{ labelAccessorName: 'processName', pieceAccessorName: 'duration' }]
-
-export const AnalysisOperationTime = () => {
-  const { id } = useParams()
-  const [operationTimeData, setOperationTimeData] = useState([])
-  const [loader, setLoader] = useState(false)
-  const [range, setRange] = useState([moment().subtract(1,'days'), moment()])
-
-  useEffect(() => invokeWebApiWrapperAsync(
-    async () => {
-      const begin = range?.length > 1 ? range[0].toISOString() : null
-      const end = range?.length > 1 ? range[1].toISOString() : null
-      const summary = await TelemetryAnalyticsService.getOperationsSummary(id, begin, end)
-      setOperationTimeData(summary)
-    },
-    setLoader,
-    `Не удалось получить данные для анализа Операция-Время по скважине '${id}' за период с ${begin} по ${end}`,
-    'Получение данных для анализа Операция-Время по скважине'
-  ), [id, range])
-
-  return (
-    <LoaderPortal show={loader}>
-      <RangePicker showTime onChange={(range) => setRange(range)} />
-      <ChartOperationTime data={operationTimeData} lines={lines} />
-    </LoaderPortal>
-  )
-}
-
-export default AnalysisOperationTime
diff --git a/src/components/charts/ChartOperationTime.jsx b/src/components/charts/ChartOperationTime.jsx
deleted file mode 100755
index 6de7784..0000000
--- a/src/components/charts/ChartOperationTime.jsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import moment from 'moment'
-import { useEffect, useState } from 'react'
-
-import { ChartOpertationTimeBase } from './ChartOperationTimeBase'
-
-export const CreateLabels = () => {
-  let labels = []
-  return labels
-}
-
-export const CreateData = (lineConfig) => {
-  let datasets = {
-    label: lineConfig.label,
-    data: [],
-    backgroundColor: [
-      '#f00', '#ff0', '#f0f', '#0ff', '#00f', '#0f0'
-    ],
-  }
-  return datasets
-}
-
-export const ChartOperationTime = ({ lines, data, rangeDate }) => {
-  const [opertationTimeDataParams, setOpertationTimeDataParams] = useState({ data: { labels: [], datasets: [] } })
-
-  useEffect(() => {
-    if ((!lines)
-      || (!data))
-      return
-
-    let newLabels = lines.map(lineCfg => {
-      let labels = CreateLabels(lineCfg)
-      if (data.length !== 0)
-        labels = data.map(dataItem => {
-          return dataItem[lineCfg.labelAccessorName]
-        })
-      return labels
-    })
-
-    let newDatasets = lines.map(lineCfg => {
-      let datasets = CreateData(lineCfg)
-      if (data.length !== 0)
-        datasets.data = data.map(dataItem => {
-          return dataItem[lineCfg.pieceAccessorName]
-        })
-      return datasets
-    })
-
-    let interval = rangeDate ? (rangeDate[1] - rangeDate[0]) / 1000 : null
-    let startDate = rangeDate ? rangeDate[0] : moment()
-    let newParams = {
-      xInterval: interval,
-      xStart: startDate,
-      data: {
-        labels: newLabels,
-        datasets: newDatasets
-      }
-    }
-    setOpertationTimeDataParams(newParams)
-
-    console.log(newParams)
-
-  }, [data, lines, rangeDate])
-
-  return (<>
-    <ChartOpertationTimeBase dataParams={opertationTimeDataParams} />
-  </>
-  )
-}
\ No newline at end of file
diff --git a/src/components/charts/ChartOperationTimeBase.tsx b/src/components/charts/ChartOperationTimeBase.tsx
deleted file mode 100755
index df48daf..0000000
--- a/src/components/charts/ChartOperationTimeBase.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import {
-  Chart,
-  ArcElement,
-  TimeScale,
-  Legend,
-  PointElement,
-  ChartData,
-  ChartTypeRegistry,
-  ChartOptions,
-  DoughnutController,
-} from 'chart.js'
-import 'chartjs-adapter-moment'
-import ChartDataLabels from 'chartjs-plugin-datalabels'
-
-Chart.register(TimeScale, DoughnutController, PointElement, ArcElement, Legend, ChartDataLabels)
-
-const defaultOptions = {
-  responsive: true,
-  title: {
-    display: true,
-    position: 'top',
-    text: 'Doughnut Chart',
-    fontSize: 18,
-    fontColor: '#111'
-  },
-  legend: {
-    display: true,
-    position: 'bottom',
-    labels: {
-      fontColor: '#333',
-      fontSize: 16
-    }
-  }
-}
-
-export type ChartTimeData = ChartData<keyof ChartTypeRegistry, {
-  x: String
-  label: number
-  y: number
-}[], unknown>
-
-export type ChartTimeDataParams = {
-  data: ChartTimeData,
-  xStart?: Date,
-  xInterval?: number,
-  displayLabels?: Boolean,
-}
-
-export type ChartTimeBaseProps = {
-  dataParams: ChartTimeDataParams,
-  // TODO: Create good type for options
-  options?: ChartOptions<keyof ChartTypeRegistry> | any,
-}
-
-export type TimeParams = {
-  unit: String
-  stepSize: number
-}
-
-const linesPerInterval = 32
-
-export const timeUnitByInterval = (intervalSec: number): String => {
-  if (intervalSec <= 60)
-    return 'millisecond'
-
-  if (intervalSec <= 32 * 60)
-    return 'second'
-
-  if (intervalSec <= 32 * 60 * 60)
-    return 'minute'
-
-  if (intervalSec <= 32 * 12 * 60 * 60)
-    return 'hour'
-
-  if (intervalSec <= 32 * 24 * 60 * 60)
-    return 'day'
-
-  if (intervalSec <= 32 * 7 * 24 * 60 * 60)
-    return 'week'
-
-  if (intervalSec <= 32 * 30.4375 * 24 * 60 * 60)
-    return 'month'
-
-  if (intervalSec <= 32 * 121.75 * 24 * 60 * 60)
-    return 'quarter'
-  else
-    return 'year'
-}
-
-export const timeParamsByInterval = (intervalSec: number): TimeParams => {
-  let stepSize = intervalSec
-  let unit = timeUnitByInterval(intervalSec)
-
-  switch (unit) {
-    case 'millisecond':
-      stepSize *= 1000
-      break
-    case 'second':
-      //stepSize *= 1
-      break
-    case 'minute':
-      stepSize /= 60
-      break
-    case 'hour':
-      stepSize /= 60 * 60
-      break
-    case 'day':
-      stepSize /= 24 * 60 * 60
-      break
-    case 'week':
-      stepSize /= 7 * 24 * 60 * 60
-      break
-    case 'month':
-      stepSize /= 30 * 24 * 60 * 60
-      break
-    case 'quarter':
-      stepSize /= 91 * 24 * 60 * 60
-      break
-    case 'year':
-      stepSize /= 365.25 * 24 * 60 * 60
-      break
-  }
-
-  stepSize = Math.round(stepSize / linesPerInterval)
-  stepSize = stepSize > 0 ? stepSize : 1
-  return { unit, stepSize }
-}
-
-export const ChartOpertationTimeBase: React.FC<ChartTimeBaseProps> = ({ options, dataParams }) => {
-  const chartRef = useRef<HTMLCanvasElement>(null)
-  const [chart, setChart] = useState<any>()
-
-  useEffect(() => {
-    if ((chartRef.current) && (!chart)) {
-      let thisOptions = {}
-      Object.assign(thisOptions, defaultOptions, options)
-
-      let newChart = new Chart(chartRef.current, {
-        type: 'doughnut',
-        plugins: [ChartDataLabels],
-        options: thisOptions,
-        data: dataParams.data
-      })
-      setChart(newChart)
-
-      return () => chart?.destroy()
-    }
-  }, [chart, options, dataParams])
-
-  useEffect(() => {
-    if (!chart)
-      return
-
-    chart.data = dataParams.data
-    chart.options.aspectRatio = options?.aspectRatio
-    if (dataParams.xStart) {
-      let interval = Number(dataParams.xInterval ?? 600)
-      let start = new Date(dataParams.xStart)
-      let end = new Date(dataParams.xStart)
-      end.setSeconds(end.getSeconds() + interval)
-      let { unit, stepSize } = timeParamsByInterval(interval)
-
-      if (chart.options.scales?.x) {
-        chart.options.scales.x.max = end.getTime()
-        chart.options.scales.x.min = start.getTime()
-        chart.options.scales.x.ticks.display = dataParams.displayLabels ?? true
-        chart.options.scales.x.time.unit = unit
-        chart.options.scales.x.time.stepSize = stepSize
-      }
-    }
-
-    chart.update()
-  }, [chart, dataParams, options])
-
-  return (<canvas ref={chartRef} />)
-}
diff --git a/src/components/charts/ChartTelemetryDepthToDay.jsx b/src/components/charts/ChartTelemetryDepthToDay.jsx
deleted file mode 100755
index e6c526e..0000000
--- a/src/components/charts/ChartTelemetryDepthToDay.jsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import {
-	Chart,
-	TimeScale,
-	LinearScale,
-	Legend,
-	LineController,
-	PointElement,
-	LineElement
-} from 'chart.js'
-import 'chartjs-adapter-moment'
-import ChartDataLabels from 'chartjs-plugin-datalabels'
-import zoomPlugin from 'chartjs-plugin-zoom'
-
-Chart.register(TimeScale, LinearScale, LineController, LineElement, PointElement, Legend, ChartDataLabels, zoomPlugin)
-
-const defaultOptions = {
-  responsive: true,
-  aspectRatio: 2.45,
-  scales: {
-    x: {
-      type: 'time',
-      time: {
-        unit: 'hour',
-        displayFormats: {
-          hour: 'MM.DD'
-        },
-        tooltipFormat: 'DD T'
-      },
-    },
-    y: {
-      type: 'linear',
-      position: 'top',
-      reverse: true,
-      // ticks: {
-      //   // forces step size to be 50 units
-      //   stepSize: 50
-      // }
-    }
-  },
-  parsing: {
-    xAxisKey: 'date',
-    yAxisKey: 'depth'
-  },
-  elements: {
-    point: {
-      radius: 1.7,
-      hoverRadius: 5,
-    },
-  },
-  plugins: {
-    datalabels: {
-      display: false,
-    },
-  }
-}
-
-const makeDataset = (data, label, color, width = 1.5, dash) => ({
-  label: label,
-  data: data,
-  backgroundColor: color,
-  borderColor: color,
-  borderWidth: width,
-  borderDash: dash,
-})
-
-export const ChartTelemetryDepthToDay = ({ depthData, bitPositionData }) => {
-	const chartRef = useRef(null)
-	const [chart, setChart] = useState()
-
-	useEffect(() => {
-    const data = {
-      datasets: [
-        makeDataset(depthData, 'Глубина', '#0A0'),
-        makeDataset(bitPositionData, 'Положение долота', 'blue'),
-      ]
-    }
-
-		if(chartRef.current && !chart) {
-			const thisOptions = {}
-			Object.assign(thisOptions, defaultOptions)
-
-			const newChart = new Chart(chartRef.current, {
-				type: 'line',
-				plugins: [ChartDataLabels],
-				options: thisOptions,
-				data: data
-			})
-			setChart(newChart)
-
-			return () => chart?.destroy()
-		} else {
-      chart.data = data
-      chart.update()
-    }
-	}, [chart, depthData, bitPositionData])
-
-	return(<canvas ref={chartRef} />)
-}
diff --git a/src/components/charts/ChartTelemetryDepthToInterval.jsx b/src/components/charts/ChartTelemetryDepthToInterval.jsx
deleted file mode 100755
index d5995fc..0000000
--- a/src/components/charts/ChartTelemetryDepthToInterval.jsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import { Chart, registerables } from 'chart.js'
-
-Chart.register(...registerables)
-
-const defaultOptions = {
-  responsive: true,
-  aspectRatio: 2.6,
-  scales: {
-    x: {
-      title: {
-        display: true,
-        text: 'Дата начала интервала'
-      },
-    },
-    y: {
-      title: {
-        display: true,
-        text: 'Коэффициент скорости'
-      }
-    }
-  },
-  plugins: {
-    datalabels: {
-      display: false
-    }
-  }
-}
-
-export const ChartTelemetryDepthToInterval = ({ depthToIntervalData }) => {
-  const chartRef = useRef(null)
-  const [chart, setChart] = useState()
-
-  const calculateBarWidth = (dataLength) => {
-    if (dataLength < 3) return 150
-    if (dataLength < 16) return 70
-    return 10
-  }
-
-  useEffect(() => {
-    const xData = depthToIntervalData.map(el => new Date(el.intervalStartDate).toLocaleString())
-    const yData = depthToIntervalData.map(el => el.intervalDepthProgress.toFixed(3))
-
-    const data = {
-      labels: xData,
-      datasets: [{
-        label: 'Скорость проходки за интервал',
-        data: yData,
-        borderColor: '#00b300',
-        borderWidth: 2,
-        backgroundColor: '#0A0',
-        barThickness: calculateBarWidth(xData.length)
-      }]
-    }
-
-    const thisOptions = {}
-    Object.assign(thisOptions, defaultOptions)
-
-    if (chartRef.current && !chart) {
-      const newChart = new Chart(chartRef.current, {
-        type: 'bar',
-        options: thisOptions,
-        data: data
-      })
-      setChart(newChart)
-    } else {
-      chart.data = data
-      chart.options = thisOptions
-      chart.update()
-    }
-  }, [chart, depthToIntervalData])
-
-  return (<canvas ref={chartRef} />)
-}
diff --git a/src/components/charts/ChartTelemetryOperationsSummary.jsx b/src/components/charts/ChartTelemetryOperationsSummary.jsx
deleted file mode 100755
index 7228cea..0000000
--- a/src/components/charts/ChartTelemetryOperationsSummary.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import { Chart, registerables } from 'chart.js'
-
-Chart.register(...registerables)
-
-const transformSecondsToHoursString = (seconds) => {
-  const hours = Math.floor(seconds / 3600)
-  const minutes = Math.floor((seconds % 3600) / 60)
-  const s = seconds - (hours * 3600) - (minutes * 60)
-
-  return `${hours} ч.${minutes} мин.${s} сек.`
-}
-
-const transformSecondsToTimeString = (seconds) => {
-  if (seconds === 1) // 1 is default state if null returned (1 is to show chart anyway with 0 sec)
-    return '0 сек.'
-  else if(seconds < 60)
-    return seconds + ' сек.'
-  else if (seconds < 3600)
-    return Math.floor(seconds / 60) + ' мин. ' + (0.6 * (seconds % 60)).toFixed() + ' сек.'
-  else
-    return transformSecondsToHoursString(seconds)
-}
-
-const defaultOptions = {
-  responsive: true,
-  aspectRatio: 2.8,
-  plugins: {
-    datalabels: {
-      color: '#ffffff',
-      formatter: transformSecondsToTimeString,
-      font: {
-        weight: 'bold'
-      }
-    },
-    tooltip: {
-      callbacks: {
-        label: (tooltipItem) => transformSecondsToTimeString(tooltipItem.parsed),
-      }
-    }
-  }
-}
-
-const chartPartsColors = [
-  '#54a60c', '#0ca68a', '#0c8aa6', '#0c57a6', '#0c33a6',
-  '#6f10d5', '#d510a1', '#f1bc41', '#c5f141', '#41f196',
-  '#41cbf1', '#4196f1', '#bf41f1', '#41f1c5', '#cbf141',
-  '#f1ce41', '#f17f41', '#f14141', '#34b40e', '#420eb4'
-]
-
-export const ChartTelemetryOperationsSummary = ({ operationsData }) => {
-  const chartRef = useRef(null)
-  const [chart, setChart] = useState()
-
-  useEffect(() => {
-    const namesData = operationsData?.map(el => el.operationName) ?? ['Нет операций']
-    const durationsData = operationsData?.map(el => el.duration) ?? [1]
-
-    const data = {
-      labels: namesData,
-      datasets: [
-        {
-          label: 'Скорость проходки за интервал',
-          data: durationsData,
-          borderColor: chartPartsColors,
-          backgroundColor: chartPartsColors,
-        }
-      ]
-    }
-
-    const thisOptions = {}
-    Object.assign(thisOptions, defaultOptions)
-
-    if (chartRef.current && !chart) {
-      const newChart = new Chart(chartRef.current, {
-        type: 'doughnut',
-        options: thisOptions,
-        data: data
-      })
-      setChart(newChart)
-    } else {
-      chart.data = data
-      chart.options = thisOptions
-      chart.update()
-    }
-  }, [chart, operationsData])
-
-  return (<canvas ref={chartRef} />)
-}
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
deleted file mode 100755
index b2f3c6e..0000000
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToDay.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useState, useEffect, memo, useContext } from 'react'
-
-import { IdWellContext } from '@asb/context'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { ChartTelemetryDepthToDay } from '@components/charts/ChartTelemetryDepthToDay'
-import { TelemetryAnalyticsService } from '@api'
-
-
-export const TelemetryAnalysisDepthToDay = memo(() => {
-  const [depthData, setDepthData] = useState([])
-  const [bitPositionData, setBitPositionData] = useState([])
-  const [loader, setLoader] = useState(false)
-
-  const idWell = useContext(IdWellContext)
-
-  useEffect(() => invokeWebApiWrapperAsync(
-    async () => {
-      const depthToDayData = await TelemetryAnalyticsService.getWellDepthToDay(idWell)
-
-      const depths = depthToDayData.map(el => ({depth: el.wellDepth, date: el.date}))
-        .sort((a, b) => new Date(a.date) - new Date(b.date))
-      setDepthData(depths)
-
-      const bitPositions = depthToDayData.map(el => ({depth: el.bitDepth, date: el.date}))
-        .sort((a, b) => new Date(a.date) - new Date(b.date))
-      setBitPositionData(bitPositions)
-    },
-    setLoader,
-    `Не удалось получить данные для анализа Глубина-День по скважине "${idWell}"`,
-    'Получение данных для анализа Глубина-День'
-  ), [idWell])
-
-  return (
-    <LoaderPortal show={loader}>
-      <div className={'mt-20px'}>
-        <ChartTelemetryDepthToDay
-          depthData={depthData}
-          bitPositionData={bitPositionData}
-        />
-      </div>
-    </LoaderPortal>
-  )
-})
-
-export default TelemetryAnalysisDepthToDay
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
deleted file mode 100755
index f2a6f6c..0000000
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisDepthToInterval.jsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Select } from 'antd'
-import { useState, useEffect, memo, useContext } from 'react'
-
-import { IdWellContext } from '@asb/context'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { ChartTelemetryDepthToInterval } from '@components/charts/ChartTelemetryDepthToInterval'
-import { TelemetryAnalyticsService } from '@api'
-import { arrayOrDefault } from '@utils'
-
-
-const timePeriodCollection = [
-  { value: '3600', label: '1 час' },
-  { value: '21600', label: '6 часов' },
-  { value: '43200', label: '12 часов' },
-  { value: '86400', label: '24 часа' }
-]
-
-export const TelemetryAnalysisDepthToInterval = memo(() => {
-  const [depthToIntervalData, setDepthToIntervalData] = useState([])
-  const [chartInterval, setChartInterval] = useState(86400)
-  const [loader, setLoader] = useState(false)
-
-  const idWell = useContext(IdWellContext)
-
-  useEffect(() => invokeWebApiWrapperAsync(
-      async () => {
-        const depthToIntervalData = await TelemetryAnalyticsService.getWellDepthToInterval(idWell, chartInterval)
-        setDepthToIntervalData(arrayOrDefault(depthToIntervalData))
-      },
-      setLoader,
-      `Не удалось получить данные для анализа скорость проходки-интервал "${idWell}"`,
-      'Получение данных для анализа скорость проходки-интервал'
-  ), [idWell, chartInterval])
-
-  return (
-    <LoaderPortal show={loader}>
-      <div className={'mt-20px'}>
-        <Select
-          options={timePeriodCollection}
-          onChange={setChartInterval}
-          defaultValue={'86400'}
-          className={'ml-30px'}
-        />
-        <ChartTelemetryDepthToInterval
-          depthToIntervalData={depthToIntervalData}
-        />
-      </div>
-    </LoaderPortal>
-  )
-})
-
-export default TelemetryAnalysisDepthToInterval
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
deleted file mode 100755
index d5b88f6..0000000
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsSummary.jsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import moment from 'moment'
-import { Form, DatePicker } from 'antd'
-import { useState, useEffect, memo, useContext } from 'react'
-
-import { IdWellContext } from '@asb/context'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { ChartTelemetryOperationsSummary } from '@components/charts/ChartTelemetryOperationsSummary'
-import { TelemetryAnalyticsService } from '@api'
-
-
-const { RangePicker } = DatePicker
-
-export const TelemetryAnalysisOperationsSummary = memo(() => {
-    const [avilableDatesRange, setAviableDatesRange] = useState([moment(),moment()])
-    const [filterDateRange, setFilterDateRange] = useState([moment().subtract(1, 'days'),moment()])
-    const [operationsData, setOperationsData] = useState([])
-    const [loader, setLoader] = useState(false)
-
-    const idWell = useContext(IdWellContext)
-
-    const disabledDate = (current) => current < avilableDatesRange[0] || current > avilableDatesRange[1]
-
-    useEffect(() => invokeWebApiWrapperAsync(
-        async() => {
-            const datesRange = await TelemetryAnalyticsService.getOperationsDateRange(idWell)
-            setAviableDatesRange(datesRange)
-        },
-        setLoader,
-        `Не удалось загрузить диапозон дат для скважины "${idWell}"`,
-        'Получение диапозона дат телеметрии скважины'
-    ), [idWell])
-
-    useEffect(() => invokeWebApiWrapperAsync(
-        async () => {
-          const operationsSummaryData = await TelemetryAnalyticsService.getOperationsSummary(idWell,
-            filterDateRange[0].toISOString(), filterDateRange[1].toISOString())
-
-          setOperationsData(operationsSummaryData)
-        },
-        setLoader,
-        `Не удалось получить данные для анализа операций по скважине "${idWell}"`,
-        'Получение данных для анализа операций по скважине'
-    ), [idWell, filterDateRange])
-
-    return (
-        <LoaderPortal show={loader}>
-            <div className={'w-100 mt-20px'}>
-                <Form layout={'vertical'} name={'operationsForm'} initialValues={{ remember: true }}>
-                    <div className={'d-flex'}>
-                        <Form.Item
-                            name={'period'}
-                            className={'ml-30px'}
-                            initialValue={filterDateRange}
-                            label={'Диапазон дат графика:'}
-                        >
-                            <RangePicker
-                                showTime
-                                allowClear={false}
-                                disabledDate={disabledDate}
-                                onCalendarChange={(dates) => setFilterDateRange(dates)}
-                            />
-                        </Form.Item>
-                    </div>
-                </Form>
-            </div>
-            <ChartTelemetryOperationsSummary operationsData={operationsData}/>
-        </LoaderPortal>
-    )
-})
-
-export default TelemetryAnalysisOperationsSummary
diff --git a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx b/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
deleted file mode 100755
index 460ccd1..0000000
--- a/src/pages/TelemetryAnalysis/TelemetryAnalysisOperationsToInterval.jsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { memo } from 'react'
-
-export const TelemetryAnalysisOperationsToInterval = memo(() => (<>123</>))
-
-export default TelemetryAnalysisOperationsToInterval
diff --git a/src/pages/TelemetryAnalysis/index.jsx b/src/pages/TelemetryAnalysis/index.jsx
deleted file mode 100755
index 4b24fea..0000000
--- a/src/pages/TelemetryAnalysis/index.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useParams } from 'react-router-dom'
-import { memo, useContext, useMemo } from 'react'
-import { FolderOutlined } from '@ant-design/icons'
-import { Layout } from 'antd'
-
-import { RootPathContext } from '@asb/context'
-import { PrivateMenu, PrivateSwitch } from '@components/Private'
-
-import TelemetryAnalysisDepthToDay from './TelemetryAnalysisDepthToDay'
-import TelemetryAnalysisDepthToInterval from './TelemetryAnalysisDepthToInterval'
-import TelemetryAnalysisOperationsSummary from './TelemetryAnalysisOperationsSummary'
-import TelemetryAnalysisOperationsToInterval from './TelemetryAnalysisOperationsToInterval'
-
-const { Content } = Layout
-
-export const TelemetryAnalysis = memo(() => {
-    const { tab } = useParams()
-    const root = useContext(RootPathContext)
-    const rootPath = useMemo(() => `${root}/telemetryAnalysis`, [root])
-
-    return (
-        <RootPathContext.Provider value={rootPath}>
-            <PrivateMenu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}>
-                <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToDay'} title={'Глубина-день'} />
-                <PrivateMenu.Link icon={<FolderOutlined />} key={'depthToInterval'} title={'Глубина-интервал'} />
-                <PrivateMenu.Link icon={<FolderOutlined />} key={'operationsSummary'} title={'Все операции'} />
-                <PrivateMenu.Link icon={<FolderOutlined />} key={'operationsToInterval'} title={'Операции-интервал'} />
-            </PrivateMenu>
-
-            <Layout>
-                <Content className={'site-layout-background'}>
-                    <PrivateSwitch elseRedirect={['depthToDay', 'depthToInterval', 'operationsSummary', 'operationsToInterval']}>
-                        <TelemetryAnalysisDepthToDay key={'depthToDay'} />
-                        <TelemetryAnalysisDepthToInterval key={'depthToInterval'} />
-                        <TelemetryAnalysisOperationsSummary key={'operationsSummary'} />
-                        <TelemetryAnalysisOperationsToInterval key={'operationsToInterval'} />
-                    </PrivateSwitch>
-                </Content>
-            </Layout>
-        </RootPathContext.Provider>
-    )
-})
-
-export default TelemetryAnalysis

From dd2315d53e0abe46f0db65ba811a29fdd526b473 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 29 Apr 2022 16:39:49 +0500
Subject: [PATCH 34/49] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D1=83=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/MSE_and_torqueStab_info.txt               |  9 -----
 src/components/{Display.jsx => Display.tsx}   | 40 +++++++++++++------
 .../{ErrorFetch.js => ErrorFetch.ts}          |  4 +-
 .../{UploadForm.jsx => UploadForm.tsx}        | 21 ++++++++--
 src/context/Context.js                        |  5 ---
 src/pages/Well.jsx                            |  3 --
 6 files changed, 47 insertions(+), 35 deletions(-)
 delete mode 100755 doc/MSE_and_torqueStab_info.txt
 rename src/components/{Display.jsx => Display.tsx} (65%)
 mode change 100755 => 100644
 rename src/components/{ErrorFetch.js => ErrorFetch.ts} (66%)
 mode change 100755 => 100644
 rename src/components/{UploadForm.jsx => UploadForm.tsx} (69%)
 mode change 100755 => 100644
 delete mode 100755 src/context/Context.js

diff --git a/doc/MSE_and_torqueStab_info.txt b/doc/MSE_and_torqueStab_info.txt
deleted file mode 100755
index 7950584..0000000
--- a/doc/MSE_and_torqueStab_info.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Вопрос Олегу: Какой бит и в каком регистре (или значение регистра) контроллера спинмастера сигнализирует что система спинмастер активана/работает?
-Ответ: Такого бита нет, но можно понять если etap %MW1600: INT; не равен 6 и не равен 0 тогда система в работе
-
-# Вопрос Олегу: Какой бит и в каком регистре (или значение регистра) контроллера спинмастера сигнализирует что система стабилизации крутящего момента активна/работает?
-Ответ: Такого бита по сути тоже нет но можно понять что 
-когда stik_sleep %MX2802.01: BOOL; =true
-и
-etap %MW1600: INT; =7
-тогда торк мастер работает
\ No newline at end of file
diff --git a/src/components/Display.jsx b/src/components/Display.tsx
old mode 100755
new mode 100644
similarity index 65%
rename from src/components/Display.jsx
rename to src/components/Display.tsx
index 77d1a1b..1ae6709
--- a/src/components/Display.jsx
+++ b/src/components/Display.tsx
@@ -1,19 +1,33 @@
 import moment from 'moment'
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, ReactNode } from 'react'
 import {CaretUpOutlined, CaretDownOutlined, CaretRightOutlined} from '@ant-design/icons'
 
 import '@styles/display.css'
 
-export const formatNumber = (value, format) =>
+export const formatNumber = (value?: unknown, format?: number) =>
   Number.isInteger(format) && Number.isFinite(value)
-  ? (+value).toFixed(format)
-  : (+value).toPrecision(4)
+  ? Number(value).toFixed(format)
+  : Number(value).toPrecision(4)
 
 const iconStyle = { color:'#0008' }
 const displayValueStyle = { display: 'flex', flexGrow: 1 }
 
-export const ValueDisplay = ({ prefix, value, suffix, isArrowVisible, format, enumeration }) => {
-  const [val, setVal] = useState('---')
+export type ValueDisplayProps = {
+  prefix?: ReactNode
+  suffix?: ReactNode
+  format?: number | string
+  isArrowVisible?: boolean
+  enumeration?: Record<string, string>
+  value: string
+}
+
+export type DisplayProps = ValueDisplayProps & {
+  className?: string
+  label?: ReactNode
+}
+
+export const ValueDisplay = memo<ValueDisplayProps>(({ prefix, value, suffix, isArrowVisible, format, enumeration }) => {
+  const [val, setVal] = useState<string>('---')
   const [arrowState, setArrowState] = useState({
     preVal: NaN,
     preTimestamp: Date.now(),
@@ -28,25 +42,25 @@ export const ValueDisplay = ({ prefix, value, suffix, isArrowVisible, format, en
       if (Number.isFinite(+value)) {
         if (isArrowVisible && (arrowState.preTimestamp + 1000 < Date.now())) {
           let direction = 0
-          if (value > arrowState.preVal)
+          if (+value > arrowState.preVal)
             direction = 1
-          if (value < arrowState.preVal)
+          if (+value < arrowState.preVal)
             direction = -1
 
           setArrowState({
-            preVal: value,
+            preVal: +value,
             preTimestamp: Date.now(),
             direction: direction,
           })
         }
 
-        return formatNumber(value, format)
+        return formatNumber(value, Number(format))
       }
 
       if (value.length > 4) {
         const valueDate = moment(value)
         if (valueDate.isValid())
-          return valueDate.format(format)
+          return valueDate.format(String(format))
       }
 
       return value
@@ -74,9 +88,9 @@ export const ValueDisplay = ({ prefix, value, suffix, isArrowVisible, format, en
       {prefix} {val} {suffix}{arrow}
     </span>
   )
-}
+})
 
-export const Display = memo(({ className, label, ...other })=> (
+export const Display = memo<DisplayProps>(({ className, label, ...other })=> (
   <div className={className}>
     <div className={'display_label'}>{label}</div>
     <div style={displayValueStyle}>
diff --git a/src/components/ErrorFetch.js b/src/components/ErrorFetch.ts
old mode 100755
new mode 100644
similarity index 66%
rename from src/components/ErrorFetch.js
rename to src/components/ErrorFetch.ts
index b4f2bed..68993f1
--- a/src/components/ErrorFetch.js
+++ b/src/components/ErrorFetch.ts
@@ -1,5 +1,7 @@
 export class ErrorFetch extends Error {
-  constructor(status, message) {
+  public status: number
+
+  constructor(status: number, message?: string) {
     super(message)
     this.name = 'ErrorFetch'
     this.status = status
diff --git a/src/components/UploadForm.jsx b/src/components/UploadForm.tsx
old mode 100755
new mode 100644
similarity index 69%
rename from src/components/UploadForm.jsx
rename to src/components/UploadForm.tsx
index 2d0f244..3ec99a5
--- a/src/components/UploadForm.jsx
+++ b/src/components/UploadForm.tsx
@@ -1,22 +1,35 @@
 import { memo, useCallback, useState } from 'react'
 import { Upload, Button } from 'antd'
 import { UploadOutlined } from '@ant-design/icons'
+import { UploadFile } from 'antd/lib/upload/interface'
 
 import { upload } from  './factory'
 import { ErrorFetch } from './ErrorFetch'
 
-export const UploadForm = memo(({ url, disabled, accept, style, formData, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
-  const [fileList, setfileList] = useState([])
+export type UploadFormProps = {
+  url: string
+  disabled?: boolean
+  accept?: string
+  style?: CSSStyleSheet
+  formData: FormData
+  onUploadStart?: () => void
+  onUploadSuccess?: () => void
+  onUploadComplete?: () => void
+  onUploadError?: (error: unknown) => void
+}
+
+export const UploadForm = memo<UploadFormProps>(({ url, disabled, accept, style, formData, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
+  const [fileList, setfileList] = useState<UploadFile<any>[]>([])
 
   const handleFileSend = useCallback(async () => {
     onUploadStart?.()
     try {
       const formDataLocal = new FormData()
-      fileList.forEach((val) => formDataLocal.append('files', val.originFileObj))
+      fileList.forEach((val) => formDataLocal.append('files', String(val.originFileObj)))
 
       if(formData)
         for(const propName in formData)
-          formDataLocal.append(propName, formData[propName])
+          formDataLocal.append(propName, String(formData.get(propName)))
 
       const response = await upload(url, formDataLocal)
       if (!response.ok) {
diff --git a/src/context/Context.js b/src/context/Context.js
deleted file mode 100755
index ea1c502..0000000
--- a/src/context/Context.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import {createContext} from 'react'
-
-const Context = createContext()
-
-export default Context
\ No newline at end of file
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 3f998f0..e8088c4 100755
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -19,7 +19,6 @@ import Documents from './Documents'
 import Telemetry from './Telemetry'
 import WellOperations from './WellOperations'
 import DrillingProgram from './DrillingProgram'
-import TelemetryAnalysis from './TelemetryAnalysis'
 
 import '@styles/index.css'
 
@@ -38,7 +37,6 @@ export const Well = memo(() => {
           <PrivateMenu.Link key={'report'} icon={<FilePdfOutlined />} title={'Рапорт'} />
           <PrivateMenu.Link key={'analytics'} icon={<DeploymentUnitOutlined />} title={'Аналитика'} />
           <PrivateMenu.Link key={'operations'} icon={<FolderOutlined />} title={'Операции по скважине'} />
-          {/* <PrivateMenu.Link key={'telemetryAnalysis'} icon={<FundProjectionScreenOutlined />} title={'Операции по телеметрии'} /> */}
           <PrivateMenu.Link key={'document'} icon={<FolderOutlined />} title={'Документы'} />
           <PrivateMenu.Link key={'measure'} icon={<ExperimentOutlined />} title={'Измерения'} />
           <PrivateMenu.Link key={'drillingProgram'} icon={<FolderOutlined />} title={'Программа бурения'} />
@@ -52,7 +50,6 @@ export const Well = memo(() => {
                 <Report key={'report'} />
                 <Analytics key={'analytics/:tab?'} />
                 <WellOperations key={'operations/:tab?'} />
-                <TelemetryAnalysis key={'telemetryAnalysis/:tab?'} />
                 <Documents key={'document/:category?'} />
                 <Measure key={'measure'} />
                 <DrillingProgram key={'drillingProgram'} />

From 9d6e5b0687346f678faa271819baf1ff2d6f58c6 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 29 Apr 2022 18:38:49 +0500
Subject: [PATCH 35/49] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       | 37 +++++++++++++++----------
 package.json                            |  1 +
 src/{App.js => App.tsx}                 |  8 +++---
 src/components/Private/PrivateRoute.tsx |  2 +-
 src/{index.js => index.tsx}             |  0
 src/reportWebVitals.js                  | 13 ---------
 src/reportWebVitals.ts                  | 12 ++++++++
 7 files changed, 41 insertions(+), 32 deletions(-)
 rename src/{App.js => App.tsx} (95%)
 mode change 100755 => 100644
 rename src/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 delete mode 100755 src/reportWebVitals.js
 create mode 100644 src/reportWebVitals.ts

diff --git a/package-lock.json b/package-lock.json
index 1eb6257..59ee380 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@testing-library/jest-dom": "^5.11.10",
         "@testing-library/react": "^11.2.6",
         "@testing-library/user-event": "^12.8.3",
+        "@types/react-dom": "^18.0.3",
         "antd": "^4.15.0",
         "chart.js": "^3.6.0",
         "chartjs-adapter-moment": "^1.0.0",
@@ -3322,8 +3323,7 @@
     "node_modules/@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
@@ -3334,13 +3334,20 @@
       "version": "17.0.39",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz",
       "integrity": "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==",
-      "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
+    "node_modules/@types/react-dom": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
+      "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/react-router": {
       "version": "5.1.18",
       "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
@@ -3373,8 +3380,7 @@
     "node_modules/@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "node_modules/@types/source-list-map": {
       "version": "0.1.2",
@@ -6608,8 +6614,7 @@
     "node_modules/csstype": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==",
-      "dev": true
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
     },
     "node_modules/cyclist": {
       "version": "1.0.1",
@@ -24654,8 +24659,7 @@
     "@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "@types/q": {
       "version": "1.5.5",
@@ -24666,13 +24670,20 @@
       "version": "17.0.39",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz",
       "integrity": "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==",
-      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
+    "@types/react-dom": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
+      "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/react-router": {
       "version": "5.1.18",
       "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
@@ -24705,8 +24716,7 @@
     "@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -27245,8 +27255,7 @@
     "csstype": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==",
-      "dev": true
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
     },
     "cyclist": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 9b7dafb..9e2f152 100755
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.3",
+    "@types/react-dom": "^18.0.3",
     "antd": "^4.15.0",
     "chart.js": "^3.6.0",
     "chartjs-adapter-moment": "^1.0.0",
diff --git a/src/App.js b/src/App.tsx
old mode 100755
new mode 100644
similarity index 95%
rename from src/App.js
rename to src/App.tsx
index 18b2b83..5349dab
--- a/src/App.js
+++ b/src/App.tsx
@@ -3,22 +3,22 @@ import {
   Switch,
   Route
 } from 'react-router-dom'
+import { memo } from 'react'
 import { ConfigProvider } from 'antd'
 import locale from 'antd/lib/locale/ru_RU'
 
-import { OpenAPI } from '@api'
-import { getUserToken } from '@utils/storage'
 import { PrivateRoute } from '@components/Private'
+import { getUserToken } from '@utils/storage'
+import { OpenAPI } from '@api'
 
 import Main from '@pages/Main'
 import Login from '@pages/Login'
 import Register from '@pages/Register'
 
 import '@styles/App.less'
-import { memo } from 'react'
 
 //OpenAPI.BASE = 'http://localhost:3000'
-OpenAPI.TOKEN = async () => getUserToken()
+OpenAPI.TOKEN = async () => getUserToken() ?? ''
 OpenAPI.HEADERS = {'Content-Type': 'application/json'}
 
 export const App = memo(() => (
diff --git a/src/components/Private/PrivateRoute.tsx b/src/components/Private/PrivateRoute.tsx
index 901a0b6..7be8f17 100755
--- a/src/components/Private/PrivateRoute.tsx
+++ b/src/components/Private/PrivateRoute.tsx
@@ -7,7 +7,7 @@ import { getUserId } from '@utils/storage'
 import { isURLAvailable } from '@utils/permissions'
 
 export type PrivateRouteProps = RouteProps & {
-    root: string
+    root?: string
     path: string
     children?: ReactNode
     redirect?: (location?: Location<unknown>) => ReactNode
diff --git a/src/index.js b/src/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from src/index.js
rename to src/index.tsx
diff --git a/src/reportWebVitals.js b/src/reportWebVitals.js
deleted file mode 100755
index 7d10e17..0000000
--- a/src/reportWebVitals.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const reportWebVitals = onPerfEntry => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry)
-      getFID(onPerfEntry)
-      getFCP(onPerfEntry)
-      getLCP(onPerfEntry)
-      getTTFB(onPerfEntry)
-    })
-  }
-}
-
-export default reportWebVitals
diff --git a/src/reportWebVitals.ts b/src/reportWebVitals.ts
new file mode 100644
index 0000000..30e6a9d
--- /dev/null
+++ b/src/reportWebVitals.ts
@@ -0,0 +1,12 @@
+import { getCLS, getFID, getFCP, getLCP, getTTFB, ReportHandler } from 'web-vitals'
+
+export const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (!onPerfEntry) return
+  getCLS(onPerfEntry)
+  getFID(onPerfEntry)
+  getFCP(onPerfEntry)
+  getLCP(onPerfEntry)
+  getTTFB(onPerfEntry)
+}
+
+export default reportWebVitals

From fb82815cbcd7f2e4d645e14fd853701a73dbebfb Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Wed, 4 May 2022 15:00:26 +0500
Subject: [PATCH 36/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=83=D1=8E=20=D1=81=D0=BA=D0=B2=D0=B0=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/selectors/WellTreeSelector.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx
index f354d07..38ff425 100755
--- a/src/components/selectors/WellTreeSelector.tsx
+++ b/src/components/selectors/WellTreeSelector.tsx
@@ -54,7 +54,7 @@ const getLabel = (wellsTree: TreeNodeData[], value?: string): string | undefined
             break
         default: break
     }
-    return value
+    return 'Ошибка! Скважина не найдена!'
 }
 
 export const WellTreeSelector = memo(({ ...other }) => {
@@ -100,14 +100,9 @@ export const WellTreeSelector = memo(({ ...other }) => {
         )
     }, [])
 
-    useEffect(() => {
-        setValue(getLabel(wellsTree, routeMatch?.url))
-    }, [wellsTree, routeMatch])
+    useEffect(() => setValue(getLabel(wellsTree, routeMatch?.url)), [wellsTree, routeMatch])
 
-    const onChange = useCallback((value: string): void => {
-        if (wellsTree)
-            setValue(getLabel(wellsTree, value))
-    }, [wellsTree])
+    const onChange = useCallback((value?: string): void => setValue(getLabel(wellsTree, value)), [wellsTree])
 
     const onSelect = useCallback((value: RawValueType | LabelInValueType): void => {
         if (['number', 'string'].includes(typeof value))

From 71f801751cba427ac05873d697001843c2767210 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 5 May 2022 17:26:52 +0500
Subject: [PATCH 37/49] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=20=D0=9E=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=91=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 1227 ++++++++++++++++-
 package.json                                  |    2 +
 src/pages/Telemetry/Archive/index.jsx         |   14 +-
 .../Telemetry/Operations/OperationsChart.jsx  |   52 +
 .../Telemetry/Operations/OperationsTable.jsx  |   30 +
 src/pages/Telemetry/Operations/index.jsx      |   77 +-
 src/pages/Telemetry/index.jsx                 |    3 +
 src/styles/detected_operations.less           |    7 +
 src/utils/index.ts                            |    2 +
 src/utils/permissions.ts                      |    1 +
 10 files changed, 1395 insertions(+), 20 deletions(-)
 create mode 100644 src/pages/Telemetry/Operations/OperationsChart.jsx
 create mode 100644 src/pages/Telemetry/Operations/OperationsTable.jsx
 create mode 100644 src/styles/detected_operations.less

diff --git a/package-lock.json b/package-lock.json
index 59ee380..249dca8 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "chartjs-plugin-datalabels": "^2.0.0-rc.1",
         "chartjs-plugin-zoom": "^1.1.1",
         "craco-less": "^1.17.1",
+        "d3": "^7.4.4",
         "moment": "^2.29.1",
         "pigeon-maps": "^0.19.7",
         "react": "^17.0.2",
@@ -31,6 +32,7 @@
         "web-vitals": "^1.1.1"
       },
       "devDependencies": {
+        "@types/d3": "^7.1.0",
         "@types/react": "^17.0.3",
         "@types/react-router-dom": "^5.3.2",
         "craco-alias": "^3.0.1",
@@ -3207,6 +3209,259 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "node_modules/@types/d3": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.1.0.tgz",
+      "integrity": "sha512-gYWvgeGjEl+zmF8c+U1RNIKqe7sfQwIXeLXO5Os72TjDjCEtgpvGBvZ8dXlAuSS1m6B90Y1Uo6Bm36OGR/OtCA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "node_modules/@types/d3-array": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.2.tgz",
+      "integrity": "sha512-5mjGjz6XOXKOCdTajXTZ/pMsg236RdiwKPrRPWAEf/2S/+PzwY+LLYShUpeysWaMvsdS7LArh6GdUefoxpchsQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-axis": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.1.tgz",
+      "integrity": "sha512-zji/iIbdd49g9WN0aIsGcwcTBUkgLsCSwB+uH+LPVDAiKWENMtI3cJEWt+7/YYwelMoZmbBfzA3qCdrZ2XFNnw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-brush": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.1.tgz",
+      "integrity": "sha512-B532DozsiTuQMHu2YChdZU0qsFJSio3Q6jmBYGYNp3gMDzBmuFFgPt9qKA4VYuLZMp4qc6eX7IUFUEsvHiXZAw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-eQfcxIHrg7V++W8Qxn6QkqBNBokyhdWSAS73AbkbMzvLQmVVBviknoz2SRS/ZJdIOmhcmmdCRE/NFOm28Z1AMw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.0.2.tgz",
+      "integrity": "sha512-WVx6zBiz4sWlboCy7TCgjeyHpNjMsoF36yaagny1uXfbadc9f+5BeBf7U+lRmQqY3EHbGQpP8UdW8AC+cywSwQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-contour": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-C3zfBrhHZvrpAAK3YXqLWVAGo87A4SvJ83Q/zVJ8rFWJdKejUnDYaWZPkA8K84kb2vDA/g90LTQAz7etXcgoQQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-delaunay": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.0.tgz",
+      "integrity": "sha512-iGm7ZaGLq11RK3e69VeMM6Oqj2SjKUB9Qhcyd1zIcqn2uE8w9GFB445yCY46NOQO3ByaNyktX1DK+Etz7ZaX+w==",
+      "dev": true
+    },
+    "node_modules/@types/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-NhxMn3bAkqhjoxabVJWKryhnZXXYYVQxaBnbANu0O94+O/nX9qSjrA1P1jbAQJxJf+VC72TxDX/YJcKue5bRqw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-drag": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.1.tgz",
+      "integrity": "sha512-o1Va7bLwwk6h03+nSM8dpaGEYnoIG19P0lKqlic8Un36ymh9NSkNFX1yiXMKNMx8rJ0Kfnn2eovuFaL6Jvj0zA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-dsv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.0.tgz",
+      "integrity": "sha512-o0/7RlMl9p5n6FQDptuJVMxDf/7EDEv2SYEO/CwdG2tr1hTfUVi0Iavkk2ax+VpaQ/1jVhpnj5rq1nj8vwhn2A==",
+      "dev": true
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
+      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==",
+      "dev": true
+    },
+    "node_modules/@types/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-toZJNOwrOIqz7Oh6Q7l2zkaNfXkfR7mFSJvGvlD/Ciq/+SQ39d5gynHJZ/0fjt83ec3WL7+u3ssqIijQtBISsw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-dsv": "*"
+      }
+    },
+    "node_modules/@types/d3-force": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.3.tgz",
+      "integrity": "sha512-z8GteGVfkWJMKsx6hwC3SiTSLspL98VNpmvLpEFJQpZPq6xpA1I8HNBDNSpukfK0Vb0l64zGFhzunLgEAcBWSA==",
+      "dev": true
+    },
+    "node_modules/@types/d3-format": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.1.tgz",
+      "integrity": "sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.0.2.tgz",
+      "integrity": "sha512-DbqK7MLYA8LpyHQfv6Klz0426bQEf7bRTvhMy44sNGVyZoWn//B0c+Qbeg8Osi2Obdc9BLLXYAKpyWege2/7LQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-hierarchy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.0.2.tgz",
+      "integrity": "sha512-+krnrWOZ+aQB6v+E+jEkmkAx9HvsNAD+1LCD0vlBY3t+HwjKnsBFbpVLx6WWzDzCIuiTWdAxXMEnGnVXpB09qQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz",
+      "integrity": "sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-polygon": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.0.tgz",
+      "integrity": "sha512-D49z4DyzTKXM0sGKVqiTDTYr+DHg/uxsiWDAkNrwXYuiZVd9o9wXZIo+YsHkifOiyBkmSWlEngHCQme54/hnHw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-quadtree": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.2.tgz",
+      "integrity": "sha512-QNcK8Jguvc8lU+4OfeNx+qnVy7c0VrDJ+CCVFS9srBo2GL9Y18CnIxBdTF3v38flrGy5s1YggcoAiu6s4fLQIw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-IIE6YTekGczpLYo/HehAy3JGF1ty7+usI97LqraNa8IiDur+L44d0VOjAvFQWJVdZOJHukUJw+ZdZBlgeUsHOQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-Yk4htunhPAwN0XGlIwArRomOjdoBFXC3+kCxK2Ubg7I9shQlVSJy/pG/Ht5ASN+gdMIalpk8TJ5xV74jFsetLA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-scale-chromatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-dsoJGEIShosKVRBZB0Vo3C8nqSDqVGujJU6tPznsBJxNJNwMF8utmS83nvCBKQYPpjCzaaHcrf66iTRpZosLPw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-selection": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.2.tgz",
+      "integrity": "sha512-d29EDd0iUBrRoKhPndhDY6U/PYxOWqgIZwKTooy2UkBfU7TNZNpRho0yLWPxlatQrFWk2mnTu71IZQ4+LRgKlQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.0.2.tgz",
+      "integrity": "sha512-5+ButCmIfNX8id5seZ7jKj3igdcxx+S9IDBiT35fQGTLZUfkFgTv+oBH34xgeoWDKpWcMITSzBILWQtBoN5Piw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-time-format": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.0.tgz",
+      "integrity": "sha512-yjfBUe6DJBsDin2BMIulhSHmr5qNR5Pxs17+oW4DoVPyVIXZ+m6bs7j1UVKP08Emv6jRmYrYqxYzO63mQxy1rw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
+      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==",
+      "dev": true
+    },
+    "node_modules/@types/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-Sv4qEI9uq3bnZwlOANvYK853zvpdKEm1yz9rcc8ZTsxvRklcs9Fx4YFuGA3gXoQN/c/1T6QkVNjhaRO/cWj94g==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-zoom": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.1.tgz",
+      "integrity": "sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
     "node_modules/@types/eslint": {
       "version": "7.29.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
@@ -3221,6 +3476,12 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
       "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.8",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
+      "dev": true
+    },
     "node_modules/@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -5765,7 +6026,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
       "engines": {
         "node": ">= 10"
       }
@@ -6630,6 +6890,387 @@
         "type": "^1.0.1"
       }
     },
+    "node_modules/d3": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.4.4.tgz",
+      "integrity": "sha512-97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ==",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "3",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz",
+      "integrity": "sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA==",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
+      "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
+      "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz",
+      "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz",
+      "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -6987,6 +7628,14 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/delaunator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
+      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "dependencies": {
+        "robust-predicates": "^3.0.0"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -10499,6 +11148,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -17510,6 +18167,11 @@
         "inherits": "^2.0.1"
       }
     },
+    "node_modules/robust-predicates": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
+      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
+    },
     "node_modules/rollup": {
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
@@ -17642,6 +18304,11 @@
         "aproba": "^1.1.1"
       }
     },
+    "node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+    },
     "node_modules/rxjs": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz",
@@ -24543,6 +25210,259 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/d3": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.1.0.tgz",
+      "integrity": "sha512-gYWvgeGjEl+zmF8c+U1RNIKqe7sfQwIXeLXO5Os72TjDjCEtgpvGBvZ8dXlAuSS1m6B90Y1Uo6Bm36OGR/OtCA==",
+      "dev": true,
+      "requires": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "@types/d3-array": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.2.tgz",
+      "integrity": "sha512-5mjGjz6XOXKOCdTajXTZ/pMsg236RdiwKPrRPWAEf/2S/+PzwY+LLYShUpeysWaMvsdS7LArh6GdUefoxpchsQ==",
+      "dev": true
+    },
+    "@types/d3-axis": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.1.tgz",
+      "integrity": "sha512-zji/iIbdd49g9WN0aIsGcwcTBUkgLsCSwB+uH+LPVDAiKWENMtI3cJEWt+7/YYwelMoZmbBfzA3qCdrZ2XFNnw==",
+      "dev": true,
+      "requires": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "@types/d3-brush": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.1.tgz",
+      "integrity": "sha512-B532DozsiTuQMHu2YChdZU0qsFJSio3Q6jmBYGYNp3gMDzBmuFFgPt9qKA4VYuLZMp4qc6eX7IUFUEsvHiXZAw==",
+      "dev": true,
+      "requires": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "@types/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-eQfcxIHrg7V++W8Qxn6QkqBNBokyhdWSAS73AbkbMzvLQmVVBviknoz2SRS/ZJdIOmhcmmdCRE/NFOm28Z1AMw==",
+      "dev": true
+    },
+    "@types/d3-color": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.0.2.tgz",
+      "integrity": "sha512-WVx6zBiz4sWlboCy7TCgjeyHpNjMsoF36yaagny1uXfbadc9f+5BeBf7U+lRmQqY3EHbGQpP8UdW8AC+cywSwQ==",
+      "dev": true
+    },
+    "@types/d3-contour": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-C3zfBrhHZvrpAAK3YXqLWVAGo87A4SvJ83Q/zVJ8rFWJdKejUnDYaWZPkA8K84kb2vDA/g90LTQAz7etXcgoQQ==",
+      "dev": true,
+      "requires": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "@types/d3-delaunay": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.0.tgz",
+      "integrity": "sha512-iGm7ZaGLq11RK3e69VeMM6Oqj2SjKUB9Qhcyd1zIcqn2uE8w9GFB445yCY46NOQO3ByaNyktX1DK+Etz7ZaX+w==",
+      "dev": true
+    },
+    "@types/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-NhxMn3bAkqhjoxabVJWKryhnZXXYYVQxaBnbANu0O94+O/nX9qSjrA1P1jbAQJxJf+VC72TxDX/YJcKue5bRqw==",
+      "dev": true
+    },
+    "@types/d3-drag": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.1.tgz",
+      "integrity": "sha512-o1Va7bLwwk6h03+nSM8dpaGEYnoIG19P0lKqlic8Un36ymh9NSkNFX1yiXMKNMx8rJ0Kfnn2eovuFaL6Jvj0zA==",
+      "dev": true,
+      "requires": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "@types/d3-dsv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.0.tgz",
+      "integrity": "sha512-o0/7RlMl9p5n6FQDptuJVMxDf/7EDEv2SYEO/CwdG2tr1hTfUVi0Iavkk2ax+VpaQ/1jVhpnj5rq1nj8vwhn2A==",
+      "dev": true
+    },
+    "@types/d3-ease": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
+      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==",
+      "dev": true
+    },
+    "@types/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-toZJNOwrOIqz7Oh6Q7l2zkaNfXkfR7mFSJvGvlD/Ciq/+SQ39d5gynHJZ/0fjt83ec3WL7+u3ssqIijQtBISsw==",
+      "dev": true,
+      "requires": {
+        "@types/d3-dsv": "*"
+      }
+    },
+    "@types/d3-force": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.3.tgz",
+      "integrity": "sha512-z8GteGVfkWJMKsx6hwC3SiTSLspL98VNpmvLpEFJQpZPq6xpA1I8HNBDNSpukfK0Vb0l64zGFhzunLgEAcBWSA==",
+      "dev": true
+    },
+    "@types/d3-format": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.1.tgz",
+      "integrity": "sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==",
+      "dev": true
+    },
+    "@types/d3-geo": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.0.2.tgz",
+      "integrity": "sha512-DbqK7MLYA8LpyHQfv6Klz0426bQEf7bRTvhMy44sNGVyZoWn//B0c+Qbeg8Osi2Obdc9BLLXYAKpyWege2/7LQ==",
+      "dev": true,
+      "requires": {
+        "@types/geojson": "*"
+      }
+    },
+    "@types/d3-hierarchy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.0.2.tgz",
+      "integrity": "sha512-+krnrWOZ+aQB6v+E+jEkmkAx9HvsNAD+1LCD0vlBY3t+HwjKnsBFbpVLx6WWzDzCIuiTWdAxXMEnGnVXpB09qQ==",
+      "dev": true
+    },
+    "@types/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "dev": true,
+      "requires": {
+        "@types/d3-color": "*"
+      }
+    },
+    "@types/d3-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz",
+      "integrity": "sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==",
+      "dev": true
+    },
+    "@types/d3-polygon": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.0.tgz",
+      "integrity": "sha512-D49z4DyzTKXM0sGKVqiTDTYr+DHg/uxsiWDAkNrwXYuiZVd9o9wXZIo+YsHkifOiyBkmSWlEngHCQme54/hnHw==",
+      "dev": true
+    },
+    "@types/d3-quadtree": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.2.tgz",
+      "integrity": "sha512-QNcK8Jguvc8lU+4OfeNx+qnVy7c0VrDJ+CCVFS9srBo2GL9Y18CnIxBdTF3v38flrGy5s1YggcoAiu6s4fLQIw==",
+      "dev": true
+    },
+    "@types/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-IIE6YTekGczpLYo/HehAy3JGF1ty7+usI97LqraNa8IiDur+L44d0VOjAvFQWJVdZOJHukUJw+ZdZBlgeUsHOQ==",
+      "dev": true
+    },
+    "@types/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-Yk4htunhPAwN0XGlIwArRomOjdoBFXC3+kCxK2Ubg7I9shQlVSJy/pG/Ht5ASN+gdMIalpk8TJ5xV74jFsetLA==",
+      "dev": true,
+      "requires": {
+        "@types/d3-time": "*"
+      }
+    },
+    "@types/d3-scale-chromatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-dsoJGEIShosKVRBZB0Vo3C8nqSDqVGujJU6tPznsBJxNJNwMF8utmS83nvCBKQYPpjCzaaHcrf66iTRpZosLPw==",
+      "dev": true
+    },
+    "@types/d3-selection": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.2.tgz",
+      "integrity": "sha512-d29EDd0iUBrRoKhPndhDY6U/PYxOWqgIZwKTooy2UkBfU7TNZNpRho0yLWPxlatQrFWk2mnTu71IZQ4+LRgKlQ==",
+      "dev": true
+    },
+    "@types/d3-shape": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.0.2.tgz",
+      "integrity": "sha512-5+ButCmIfNX8id5seZ7jKj3igdcxx+S9IDBiT35fQGTLZUfkFgTv+oBH34xgeoWDKpWcMITSzBILWQtBoN5Piw==",
+      "dev": true,
+      "requires": {
+        "@types/d3-path": "*"
+      }
+    },
+    "@types/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==",
+      "dev": true
+    },
+    "@types/d3-time-format": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.0.tgz",
+      "integrity": "sha512-yjfBUe6DJBsDin2BMIulhSHmr5qNR5Pxs17+oW4DoVPyVIXZ+m6bs7j1UVKP08Emv6jRmYrYqxYzO63mQxy1rw==",
+      "dev": true
+    },
+    "@types/d3-timer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
+      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==",
+      "dev": true
+    },
+    "@types/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-Sv4qEI9uq3bnZwlOANvYK853zvpdKEm1yz9rcc8ZTsxvRklcs9Fx4YFuGA3gXoQN/c/1T6QkVNjhaRO/cWj94g==",
+      "dev": true,
+      "requires": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "@types/d3-zoom": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.1.tgz",
+      "integrity": "sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==",
+      "dev": true,
+      "requires": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
     "@types/eslint": {
       "version": "7.29.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
@@ -24557,6 +25477,12 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
       "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
+    "@types/geojson": {
+      "version": "7946.0.8",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
+      "dev": true
+    },
     "@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -26596,8 +27522,7 @@
     "commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
     },
     "common-tags": {
       "version": "1.8.2",
@@ -27271,6 +28196,279 @@
         "type": "^1.0.1"
       }
     },
+    "d3": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.4.4.tgz",
+      "integrity": "sha512-97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ==",
+      "requires": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "3",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      }
+    },
+    "d3-array": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz",
+      "integrity": "sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA==",
+      "requires": {
+        "internmap": "1 - 2"
+      }
+    },
+    "d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="
+    },
+    "d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      }
+    },
+    "d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "requires": {
+        "d3-path": "1 - 3"
+      }
+    },
+    "d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
+    },
+    "d3-contour": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==",
+      "requires": {
+        "d3-array": "2 - 3"
+      }
+    },
+    "d3-delaunay": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
+      "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
+      "requires": {
+        "delaunator": "5"
+      }
+    },
+    "d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="
+    },
+    "d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      }
+    },
+    "d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "requires": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
+    "d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
+    },
+    "d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "requires": {
+        "d3-dsv": "1 - 3"
+      }
+    },
+    "d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      }
+    },
+    "d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
+    },
+    "d3-geo": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
+      "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
+      "requires": {
+        "d3-array": "2.5.0 - 3"
+      }
+    },
+    "d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="
+    },
+    "d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "requires": {
+        "d3-color": "1 - 3"
+      }
+    },
+    "d3-path": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz",
+      "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w=="
+    },
+    "d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="
+    },
+    "d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="
+    },
+    "d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="
+    },
+    "d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "requires": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      }
+    },
+    "d3-scale-chromatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "requires": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      }
+    },
+    "d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
+    },
+    "d3-shape": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz",
+      "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==",
+      "requires": {
+        "d3-path": "1 - 3"
+      }
+    },
+    "d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==",
+      "requires": {
+        "d3-array": "2 - 3"
+      }
+    },
+    "d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "requires": {
+        "d3-time": "1 - 3"
+      }
+    },
+    "d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
+    },
+    "d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "requires": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      }
+    },
+    "d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "requires": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      }
+    },
     "damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -27547,6 +28745,14 @@
         }
       }
     },
+    "delaunator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
+      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "requires": {
+        "robust-predicates": "^3.0.0"
+      }
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -30201,6 +31407,11 @@
         "side-channel": "^1.0.4"
       }
     },
+    "internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
+    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -35580,6 +36791,11 @@
         "inherits": "^2.0.1"
       }
     },
+    "robust-predicates": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
+      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
+    },
     "rollup": {
       "version": "1.32.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
@@ -35679,6 +36895,11 @@
         "aproba": "^1.1.1"
       }
     },
+    "rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+    },
     "rxjs": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz",
diff --git a/package.json b/package.json
index 9e2f152..b074423 100755
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "chartjs-plugin-datalabels": "^2.0.0-rc.1",
     "chartjs-plugin-zoom": "^1.1.1",
     "craco-less": "^1.17.1",
+    "d3": "^7.4.4",
     "moment": "^2.29.1",
     "pigeon-maps": "^0.19.7",
     "react": "^17.0.2",
@@ -56,6 +57,7 @@
     ]
   },
   "devDependencies": {
+    "@types/d3": "^7.1.0",
     "@types/react": "^17.0.3",
     "@types/react-router-dom": "^5.3.2",
     "craco-alias": "^3.0.1",
diff --git a/src/pages/Telemetry/Archive/index.jsx b/src/pages/Telemetry/Archive/index.jsx
index fe37028..318272e 100755
--- a/src/pages/Telemetry/Archive/index.jsx
+++ b/src/pages/Telemetry/Archive/index.jsx
@@ -8,6 +8,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DatePickerWrapper, makeDateSorter } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 import { TelemetryDataSaubService } from '@api'
+import { range } from '@utils'
 
 import { normalizeData } from '../TelemetryView'
 import { ArchiveDisplay, cutData } from './ArchiveDisplay'
@@ -55,13 +56,6 @@ const getLoadingInterval = (loaded, startDate, interval) => {
     }
 }
 
-const range = (start, end) => {
-    const result = []
-    for (let i = start; i < end; i++)
-        result.push(i)
-    return result
-}
-
 export const Archive = memo(() => {
     const [dataSaub, setDataSaub] = useState([])
     const [dateLimit, setDateLimit] = useState({ from: 0, to: new Date() })
@@ -91,17 +85,17 @@ export const Archive = memo(() => {
     }, [dateLimit])
 
     const isDateTimeDisabled = useCallback((date) => ({
-        disabledHours: () => range(0, 24).filter(h => {
+        disabledHours: () => range(24).filter(h => {
             if (!date) return false
             const dt = +new Date(date).setHours(h)
             return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
         }),
-        disabledMinutes: () => range(0, 60).filter(m => {
+        disabledMinutes: () => range(60).filter(m => {
             if (!date) return false
             const dt = +new Date(date).setMinutes(m)
             return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
         }),
-        disabledSeconds: () => range(0, 60).filter(s => {
+        disabledSeconds: () => range(60).filter(s => {
             if (!date) return false
             const dt = +new Date(date).setSeconds(s)
             return dt < dateLimit.from || dt > +dateLimit.to - chartInterval
diff --git a/src/pages/Telemetry/Operations/OperationsChart.jsx b/src/pages/Telemetry/Operations/OperationsChart.jsx
new file mode 100644
index 0000000..864b1fb
--- /dev/null
+++ b/src/pages/Telemetry/Operations/OperationsChart.jsx
@@ -0,0 +1,52 @@
+import { memo, useEffect, useMemo, useRef, useState } from 'react'
+import * as d3 from 'd3'
+
+import '@styles/detected_operations.less'
+
+export const OperationsChart = memo(({ data, yDomain, width, height, bottom = 30, left = 50, top = 10, right = 10, color = '#00F' }) => {
+    const [ref, setRef] = useState(null)
+    const axisX = useRef(null)
+    const axisY = useRef(null)
+    const w = useMemo(() => Number.isFinite(+width) ? +width : ref?.offsetWidth, [width, ref])
+    const h = useMemo(() => Number.isFinite(+height) ? +height : ref?.offsetHeight, [height, ref])
+
+    const d = useMemo(() => data.map((row) => ({
+        date: new Date(row.dateStart),
+        value: row.durationMinutes,
+    })), [data]) // Нормализуем данные для графика
+
+    const x = useMemo(() => d3
+        .scaleTime()
+        .range([0, w - left - right])
+        .domain([d3.min(d, d => d.date), d3.max(d, d => d.date)])
+    , [w, d, left, right]) // Создаём ось X
+
+    const y = useMemo(() => d3
+        .scaleLinear()
+        .range([h - bottom - top, 0])
+        .domain([0, yDomain ?? d3.max(d, d => d.value)])
+    , [h, d, top, bottom, yDomain]) // Создаём ось Y
+
+    const lines = useMemo(() => d.map(d => ({ x: x(d.date), y: y(d.value) })), [d, x, y]) // Получаем массив координат линий
+
+    useEffect(() => d3.select(axisX.current).call(d3.axisBottom(x)), [axisX, x]) // Рисуем ось X
+    useEffect(() => d3.select(axisY.current).call(d3.axisLeft(y)), [axisY, y]) // Рисуем ось Y
+
+    return (
+        <>
+            <div className={'page-left'} ref={setRef}>
+                <svg width={width ?? '100%'} height={height ?? '100%'}>
+                    <g ref={axisX} className={'axis x'} transform={`translate(${left}, ${h - bottom})`} />
+                    <g ref={axisY} className={'axis y'} transform={`translate(${left}, ${top})`} />
+                    <g transform={`translate(${left}, ${top})`} stroke={color}>
+                        {lines.map(({ x, y }, i) => (
+                            <line key={i} x1={x} y1={h - bottom - top} x2={x} y2={y} />
+                        ))}
+                    </g>
+                </svg>
+            </div>
+        </>
+    )
+})
+
+export default OperationsChart
diff --git a/src/pages/Telemetry/Operations/OperationsTable.jsx b/src/pages/Telemetry/Operations/OperationsTable.jsx
new file mode 100644
index 0000000..8d78ab6
--- /dev/null
+++ b/src/pages/Telemetry/Operations/OperationsTable.jsx
@@ -0,0 +1,30 @@
+import { memo } from 'react'
+
+import { Table, makeTextColumn, makeNumericColumn, makeDateColumn } from '@components/Table'
+
+import '@styles/detected_operations.less'
+
+export const columns = [
+    makeTextColumn('Пользователь', 'telemetryUserName', null, null, null, { width: 200 }),
+    makeDateColumn('Дата начала', 'dateStart', null, undefined, { width: 150 }),
+    makeNumericColumn('Продолжительность (мин)', 'durationMinutes', null, null, null, 150),
+    makeNumericColumn('Глубина (м)', 'depthStart', null, null, null, 100),
+]
+
+export const OperationsTable = memo(({ data, height, ...other }) => (
+    <div className={'page-right'}>
+        <Table
+            bordered
+            size={'small'}
+            pagination={false}
+            {...other}
+            sticky={true}
+            columns={columns}
+            dataSource={data}
+            tableName={'well_telemetry_detected_operations'}
+            scroll={{ y: height ?? '70vh', scrollToFirstRowOnChange: true }}
+        />
+    </div>
+))
+
+export default OperationsTable
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
index ee25cae..10baf3f 100644
--- a/src/pages/Telemetry/Operations/index.jsx
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -1,27 +1,90 @@
-import { memo, useContext, useEffect, useState } from 'react'
+import moment from 'moment'
+import { InputNumber } from 'antd'
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
 
 import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
+import DateRangeWrapper from '@components/Table/DateRangeWrapper'
+import { DetectedOperationService, TelemetryDataSaubService } from '@api'
+import { range } from '@utils'
 
+import OperationsChart from './OperationsChart'
+import OperationsTable from './OperationsTable'
+
+import '@styles/detected_operations.less'
 
 export const Operations = memo(() => {
-    const idWell = useContext(IdWellContext)
     const [isLoading, setIsLoading] = useState(false)
+    const [dateRange, setDateRange] = useState([])
+    const [yDomain, setYDomain] = useState(10)
+    const [dates, setDates] = useState()
+    const [data, setData] = useState([])
+
+    const idWell = useContext(IdWellContext)
+
+    const disabledDates = useCallback((current) => current && !moment(current).isBetween(...dateRange, 'day', '[]'), [dateRange])
+
+    const disabledTimes = useCallback((date) => ({
+        disabledHours: () => range(24).filter(h => date && !moment(date).hours(h).isBetween(...dateRange, 'hour', '[]')),
+        disabledMinutes: () => range(60).filter(m => date && !moment(date).minutes(m).isBetween(...dateRange, 'minute', '[]')),
+        disabledSeconds: () => range(60).filter(s => date && !moment(date).seconds(s).isBetween(...dateRange, 'second', '[]'))
+    }), [dateRange])
 
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
-            //
+            const dates = await TelemetryDataSaubService.getDataDatesRange(idWell)
+            if (dates) {
+                const dt = [moment(dates.from), moment(dates.to)]
+                setDateRange(dt)
+                setDates(dt)
+            }
+        },
+        setIsLoading,
+        'Не удалось загрузить диапазон доступных дат',
+        'Получение дапазона доступних дат',
+    ), [idWell])
+
+    useEffect(() => invokeWebApiWrapperAsync(
+        async () => {
+            if (!dates) return
+            const data = await DetectedOperationService.get(idWell, undefined, dates[0].toISOString(), dates[1].toISOString())
+            setData(data)
         },
         setIsLoading,
         'Не удалось загрузить список определённых операций',
         'Получение списка определённых операций',
-    ))
+    ), [idWell, dates])
 
     return (
-        <LoaderPortal show={isLoading}>
-
-        </LoaderPortal>
+        <div className={'container detected-operations-page'}>
+            <div className={'page-top'}>
+                <DateRangeWrapper
+                    value={dates}
+                    onChange={setDates}
+                    disabledDate={disabledDates}
+                    disabledTime={disabledTimes}
+                    style={{ marginRight: '10px' }}
+                    showTime={{ hideDisabledOptions: true }}
+                    disabled={isLoading}
+                />
+                <InputNumber
+                    min={1}
+                    max={2*24*60}
+                    value={yDomain}
+                    onChange={setYDomain}
+                    addonAfter={'мин'}
+                    addonBefore={'Верхняя граница'}
+                    style={{ marginRight: '10px' }}
+                />
+            </div>
+            <LoaderPortal show={isLoading}>
+                <div className={'page-main'}>
+                <OperationsChart data={data} yDomain={yDomain} height={'50vh'} />
+                    <OperationsTable data={data} height={'20vh'} />
+                </div>
+            </LoaderPortal>
+        </div>
     )
 })
 
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 3cc7336..789f0e1 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -12,6 +12,7 @@ import DashboardNNB from './DashboardNNB'
 import TelemetryView from './TelemetryView'
 
 import '@styles/index.css'
+import Operations from './Operations'
 
 const { Content } = Layout
 
@@ -28,6 +29,7 @@ export const Telemetry = memo(() => {
           <PrivateMenu.Link key={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
           <PrivateMenu.Link key={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
           <PrivateMenu.Link key={'dashboard_nnb'} title={'ННБ'} />
+          <PrivateMenu.Link key={'operations'} title={'Отмеченные операции'} />
         </PrivateMenu>
 
         <Layout>
@@ -37,6 +39,7 @@ export const Telemetry = memo(() => {
               <Messages key={'messages'} />
               <Archive key={'archive'} />
               <DashboardNNB key={'dashboard_nnb/:tab?'} />
+              <Operations key={'operations'}/>
             </PrivateSwitch>
           </Content>
         </Layout>
diff --git a/src/styles/detected_operations.less b/src/styles/detected_operations.less
new file mode 100644
index 0000000..2ecf598
--- /dev/null
+++ b/src/styles/detected_operations.less
@@ -0,0 +1,7 @@
+.detected-operations-page {
+    & .page-top {
+        width: 100%;
+        margin: 10px;
+    }
+
+}
\ No newline at end of file
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 48ec383..7e84db5 100755
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -15,6 +15,8 @@ export const deepCopy = <T extends any>(data: T): T => JSON.parse(JSON.stringify
 export const wrapValues = <T, R>(data: Record<string, T>, handler: (data: T, key: string, object: Record<string, T>) => R): Record<string, R> =>
     Object.fromEntries(Object.entries(data).map(([key, value]) => [key, handler(value, key, data)]))
 
+export const range = (end: number, start: number = 0) => Array.from({ length: end - start }, (_, i) => start + i)
+
 /**
  * Объединить типы, исключив совпадающие поля справа
  * @param T Тип, передаваемый полностью
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index 09f3d86..3fcd67f 100755
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -97,6 +97,7 @@ export const requirements: PermissionRecord = {
                 monitoring: ['Deposit.get', 'DrillFlowChart.get', 'TelemetryDataSaub.get', 'TelemetryDataSpin.get'],
                 messages: ['Deposit.get', 'TelemetryDataSaub.get'],
                 dashboard_nnb: ['Deposit.get'], //'WitsInfo.get', 'WitsRecord1.get', 'WitsRecord7.get', 'WitsRecord8.get', 'WitsRecord50.get', 'WitsRecord60.get', 'WitsRecord61.get'],
+                operations: ['Deposit.get'], //'TelemetryDataSaubService.get', 'DetectedOperationService.get'],
             },
             report: ['Deposit.get', 'Report.get'],
             analytics: {

From 45bd384eaf3f4cbe536a0143a7e7352f4699e70f Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 5 May 2022 17:28:19 +0500
Subject: [PATCH 38/49] =?UTF-8?q?=D0=97=D0=B0=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B7=D0=B0=D0=B3=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B=20=D0=9D=D0=9F=D0=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/selectors/WellTreeSelector.tsx | 5 ++---
 src/pages/WellOperations/Tvd/NptTable.jsx     | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx
index 38ff425..7545055 100755
--- a/src/components/selectors/WellTreeSelector.tsx
+++ b/src/components/selectors/WellTreeSelector.tsx
@@ -1,11 +1,10 @@
 import { TreeSelect } from 'antd'
+import { LabelInValueType } from 'rc-select/lib/Select'
+import { RawValueType } from 'rc-tree-select/lib/TreeSelect'
 import { DefaultValueType } from 'rc-tree-select/lib/interface'
 import { useState, useEffect, ReactNode, useCallback, memo } from 'react'
 import { useHistory, useLocation, useRouteMatch } from 'react-router-dom'
 
-import { RawValueType } from 'rc-tree-select/lib/TreeSelect'
-import { LabelInValueType } from 'rc-select/lib/Select'
-
 import { isRawDate } from '@utils'
 import LoaderPortal from '@components/LoaderPortal'
 import { WellIcon, WellIconState } from '@components/icons'
diff --git a/src/pages/WellOperations/Tvd/NptTable.jsx b/src/pages/WellOperations/Tvd/NptTable.jsx
index 12f39bf..3369f3b 100755
--- a/src/pages/WellOperations/Tvd/NptTable.jsx
+++ b/src/pages/WellOperations/Tvd/NptTable.jsx
@@ -53,6 +53,7 @@ export const NptTable = memo(({ operations }) => {
             <LoaderPortal show={isTableLoading}>
                 <Table
                     bordered
+                    sticky={true}
                     size={'small'}
                     dataSource={filteredNPT}
                     columns={columns}

From e75d75cb5f08a054262c392dbec1714cfa3b6a14 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 5 May 2022 17:47:15 +0500
Subject: [PATCH 39/49] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=20=D0=9E=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Telemetry/Operations/OperationsChart.jsx  | 24 +++++++++----------
 .../Telemetry/Operations/OperationsTable.jsx  |  6 ++---
 src/pages/Telemetry/Operations/index.jsx      | 10 ++++----
 src/pages/Telemetry/index.jsx                 |  2 +-
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/pages/Telemetry/Operations/OperationsChart.jsx b/src/pages/Telemetry/Operations/OperationsChart.jsx
index 864b1fb..7eaf0ef 100644
--- a/src/pages/Telemetry/Operations/OperationsChart.jsx
+++ b/src/pages/Telemetry/Operations/OperationsChart.jsx
@@ -33,19 +33,17 @@ export const OperationsChart = memo(({ data, yDomain, width, height, bottom = 30
     useEffect(() => d3.select(axisY.current).call(d3.axisLeft(y)), [axisY, y]) // Рисуем ось Y
 
     return (
-        <>
-            <div className={'page-left'} ref={setRef}>
-                <svg width={width ?? '100%'} height={height ?? '100%'}>
-                    <g ref={axisX} className={'axis x'} transform={`translate(${left}, ${h - bottom})`} />
-                    <g ref={axisY} className={'axis y'} transform={`translate(${left}, ${top})`} />
-                    <g transform={`translate(${left}, ${top})`} stroke={color}>
-                        {lines.map(({ x, y }, i) => (
-                            <line key={i} x1={x} y1={h - bottom - top} x2={x} y2={y} />
-                        ))}
-                    </g>
-                </svg>
-            </div>
-        </>
+        <div className={'page-left'} ref={setRef}>
+            <svg width={width ?? '100%'} height={height ?? '100%'}>
+                <g ref={axisX} className={'axis x'} transform={`translate(${left}, ${h - bottom})`} />
+                <g ref={axisY} className={'axis y'} transform={`translate(${left}, ${top})`} />
+                <g transform={`translate(${left}, ${top})`} stroke={color}>
+                    {lines.map(({ x, y }, i) => (
+                        <line key={i} x1={x} y1={h - bottom - top} x2={x} y2={y} />
+                    ))}
+                </g>
+            </svg>
+        </div>
     )
 })
 
diff --git a/src/pages/Telemetry/Operations/OperationsTable.jsx b/src/pages/Telemetry/Operations/OperationsTable.jsx
index 8d78ab6..dfee059 100644
--- a/src/pages/Telemetry/Operations/OperationsTable.jsx
+++ b/src/pages/Telemetry/Operations/OperationsTable.jsx
@@ -1,14 +1,14 @@
 import { memo } from 'react'
 
-import { Table, makeTextColumn, makeNumericColumn, makeDateColumn } from '@components/Table'
+import { Table, makeTextColumn, makeNumericColumn, makeDateColumn, makeNumericRender } from '@components/Table'
 
 import '@styles/detected_operations.less'
 
 export const columns = [
     makeTextColumn('Пользователь', 'telemetryUserName', null, null, null, { width: 200 }),
     makeDateColumn('Дата начала', 'dateStart', null, undefined, { width: 150 }),
-    makeNumericColumn('Продолжительность (мин)', 'durationMinutes', null, null, null, 150),
-    makeNumericColumn('Глубина (м)', 'depthStart', null, null, null, 100),
+    makeNumericColumn('Продолжительность (мин)', 'durationMinutes', null, null, makeNumericRender(2), 150),
+    makeNumericColumn('Глубина (м)', 'depthStart', null, null, makeNumericRender(1), 100),
 ]
 
 export const OperationsTable = memo(({ data, height, ...other }) => (
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
index 10baf3f..1af6816 100644
--- a/src/pages/Telemetry/Operations/index.jsx
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -1,6 +1,6 @@
-import moment from 'moment'
-import { InputNumber } from 'antd'
 import { memo, useCallback, useContext, useEffect, useState } from 'react'
+import { InputNumber } from 'antd'
+import moment from 'moment'
 
 import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
@@ -17,7 +17,7 @@ import '@styles/detected_operations.less'
 export const Operations = memo(() => {
     const [isLoading, setIsLoading] = useState(false)
     const [dateRange, setDateRange] = useState([])
-    const [yDomain, setYDomain] = useState(10)
+    const [yDomain, setYDomain] = useState(20)
     const [dates, setDates] = useState()
     const [data, setData] = useState([])
 
@@ -62,11 +62,11 @@ export const Operations = memo(() => {
                 <DateRangeWrapper
                     value={dates}
                     onChange={setDates}
+                    disabled={isLoading}
                     disabledDate={disabledDates}
                     disabledTime={disabledTimes}
                     style={{ marginRight: '10px' }}
                     showTime={{ hideDisabledOptions: true }}
-                    disabled={isLoading}
                 />
                 <InputNumber
                     min={1}
@@ -80,7 +80,7 @@ export const Operations = memo(() => {
             </div>
             <LoaderPortal show={isLoading}>
                 <div className={'page-main'}>
-                <OperationsChart data={data} yDomain={yDomain} height={'50vh'} />
+                    <OperationsChart data={data} height={'50vh'} yDomain={yDomain} />
                     <OperationsTable data={data} height={'20vh'} />
                 </div>
             </LoaderPortal>
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx
index 789f0e1..8207810 100755
--- a/src/pages/Telemetry/index.jsx
+++ b/src/pages/Telemetry/index.jsx
@@ -29,7 +29,7 @@ export const Telemetry = memo(() => {
           <PrivateMenu.Link key={'messages'} icon={<AlertOutlined/>} title={'Сообщения'} />
           <PrivateMenu.Link key={'archive'} icon={<DatabaseOutlined />} title={'Архив'} />
           <PrivateMenu.Link key={'dashboard_nnb'} title={'ННБ'} />
-          <PrivateMenu.Link key={'operations'} title={'Отмеченные операции'} />
+          <PrivateMenu.Link key={'operations'} title={'Операции'} />
         </PrivateMenu>
 
         <Layout>

From b02fec42f2d88c682005d0c982576d8b2ed12e77 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 6 May 2022 17:02:52 +0500
Subject: [PATCH 40/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=20Dat?=
 =?UTF-8?q?eRangeWrapper=20=D0=B8=D0=B7=20Table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/index.tsx            | 3 +++
 src/pages/Reports/DiagramReport/index.jsx | 2 +-
 src/pages/Telemetry/Operations/index.jsx  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index 2e1fc8e..ddf735d 100755
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -1,6 +1,7 @@
 export { makeDateSorter, makeNumericSorter, makeStringSorter } from './sorters'
 export { EditableTable, makeActionHandler } from './EditableTable'
 export { DatePickerWrapper } from './DatePickerWrapper'
+export { DateRangeWrapper } from './DateRangeWrapper'
 export { Table } from './Table'
 export {
     RegExpIsFloat,
@@ -33,6 +34,8 @@ export type {
     TagInputProps,
     columnPropsOther,
 } from './Columns'
+export type { DateRangeWrapperProps } from './DateRangeWrapper'
+export type { DatePickerWrapperProps } from './DatePickerWrapper'
 export type { BaseTableColumn, TableColumns, TableContainer } from './Table'
 
 export const defaultPagination = {
diff --git a/src/pages/Reports/DiagramReport/index.jsx b/src/pages/Reports/DiagramReport/index.jsx
index e5b40e4..6462abd 100644
--- a/src/pages/Reports/DiagramReport/index.jsx
+++ b/src/pages/Reports/DiagramReport/index.jsx
@@ -4,9 +4,9 @@ import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Radio, Button, Select, notification } from 'antd'
 
 import { IdWellContext } from '@asb/context'
+import { DateRangeWrapper } from 'components/Table'
 import { LoaderPortal } from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DateRangeWrapper } from 'components/Table/DateRangeWrapper'
 import { Subscribe } from '@services/signalr'
 import { ReportService } from '@api'
 
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
index 1af6816..f6f57fc 100644
--- a/src/pages/Telemetry/Operations/index.jsx
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -4,8 +4,8 @@ import moment from 'moment'
 
 import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
+import { DateRangeWrapper } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import DateRangeWrapper from '@components/Table/DateRangeWrapper'
 import { DetectedOperationService, TelemetryDataSaubService } from '@api'
 import { range } from '@utils'
 

From 5f03b751ee821eba137ef3e74a28fcfab93bf8ae Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 6 May 2022 17:04:33 +0500
Subject: [PATCH 41/49] =?UTF-8?q?=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20DailyReport=20?=
 =?UTF-8?q?=20*=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=B4=D0=B0=D1=82=20=D1=80=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=80=D1=82=D0=BE=D0=B2=20=20*=20=D0=98=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=91=D0=BD=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=B0=D1=88=D0=B8=D0=B2=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B9=20=D0=B4=D0=B0=D1=82=D1=8B=20=20*=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=81=D0=B1=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=B0?=
 =?UTF-8?q?=20=20*=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=BE=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/DailyReport/ReportEditor.jsx      | 30 ++++++++++++++-----
 src/pages/Reports/DailyReport/index.jsx       | 16 ++++++----
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx
index 7ed3776..18697f1 100644
--- a/src/pages/Reports/DailyReport/ReportEditor.jsx
+++ b/src/pages/Reports/DailyReport/ReportEditor.jsx
@@ -16,9 +16,15 @@ const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style
 
 const table1Columns = [
     makeGroupColumn('Отчётный период', [
-        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (_, { disabled, onChange }) => (
+        makeColumn('От (дата, время)', 'dateStart', { width: 200, render: (_, { disabled, onChange, checkIsDateBusy }) => (
             <Item name={'reportDate'}>
-                <DatePicker disabled={disabled} format={'DD.MM.YYYY'} style={{ width: '100%' }} onChange={onChange} />
+                <DatePicker
+                    onChange={onChange}
+                    disabled={disabled}
+                    format={'DD.MM.YYYY'}
+                    style={{ width: '100%' }}
+                    disabledDate={checkIsDateBusy}
+                />
             </Item>
         )}),
     ]),
@@ -122,7 +128,7 @@ const table2Summary = () => (
     </Summary.Row>
 )
 
-export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
+export const ReportEditor = memo(({ visible, data, onDone, onCancel, checkIsDateBusy }) => {
     const [form] = Form.useForm()
     const [isInvalid, setIsInvalid] = useState(false)
     const [isLoading, setIsLoading] = useState(false)
@@ -150,22 +156,25 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
             else
                 await DailyReportService.add(idWell, formData)
             onDone?.(formData)
+            form.resetFields()
         },
         setIsLoading,
         'Не удалось сохранить суточный рапорт',
         'Сохранение суточного рапорта',
-    ), [data, onDone, idWell])
+    ), [data, onDone, idWell, form])
 
     const onDateChange = useCallback((date) => invokeWebApiWrapperAsync(
         async () => {
             if (data) return
-            const newData = await DailyReportService.getOrGenerate(idWell, date.toISOString())
+            const newData = await DailyReportService.getOrGenerate(idWell, date.format('YYYY-MM-DD') + 'Z')
+            if (checkIsDateBusy(moment(newData.reportDate)))
+                throw 'Рапорт на данную дату уже существует'
             setFields(newData)
         },
         setIsLoading,
         'Не удалось загрузить автозаполняемые данные для нового рапорта',
         'Получение автозаполняемых данных суточного рапорта',
-    ), [idWell, data, setFields])
+    ), [idWell, data, setFields, checkIsDateBusy])
 
     return (
         <Modal
@@ -191,7 +200,12 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
                     onChange={onFormChange}
                 >
                     <Item name={'reportDate'} label={'Дата рапорта'} rules={[{ required: true }]}>
-                        <DatePicker disabled={!!data} format={'DD.MM.YYYY'} onChange={onDateChange} />
+                        <DatePicker
+                            disabled={!!data}
+                            format={'DD.MM.YYYY'}
+                            onChange={onDateChange}
+                            disabledDate={checkIsDateBusy}
+                        />
                     </Item>
                     <Divider />
                     <Space direction={'vertical'} size={'middle'} style={{ width: '100%' }}>
@@ -201,7 +215,7 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel }) => {
                             bordered
                             size={'small'}
                             columns={table1Columns}
-                            dataSource={[{ key: '', disabled: !!data, onChange: onDateChange }]}
+                            dataSource={[{ key: '', disabled: !!data, onChange: onDateChange, checkIsDateBusy }]}
                             pagination={false}
                         />
                         <Item label={'Бурильщик 1 смена'} name={'firstDriller'}><Input /></Item>
diff --git a/src/pages/Reports/DailyReport/index.jsx b/src/pages/Reports/DailyReport/index.jsx
index ae6379e..b9129a7 100644
--- a/src/pages/Reports/DailyReport/index.jsx
+++ b/src/pages/Reports/DailyReport/index.jsx
@@ -1,11 +1,11 @@
 import moment from 'moment'
-import { Button, DatePicker } from 'antd'
+import { Button } from 'antd'
 import { FileExcelOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
 import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
 import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
-import { Table, makeDateColumn, makeColumn } from '@components/Table'
+import { DateRangeWrapper, Table, makeDateColumn, makeColumn } from '@components/Table'
 import { download, invokeWebApiWrapperAsync } from '@components/factory'
 import { DailyReportService } from '@api'
 import { arrayOrDefault } from '@utils'
@@ -33,8 +33,10 @@ export const DailyReport = memo(() => {
 
     useEffect(updateTable, [updateTable])
 
+    const checkIsDateBusy = useCallback((current) => current.isAfter(moment(), 'day') || data.some((row) => moment(row.reportDate).isSame(current, 'day')), [data])
+
     const columns = useMemo(() => [
-        makeDateColumn('Дата', 'reportDate', undefined, undefined, { width: 300 }),
+        makeDateColumn('Дата', 'reportDate', undefined, 'YYYY.MM.DD', { width: 300 }),
         makeColumn('', '', { width: 200, render: (_, report) => (
             <>
                 <Button
@@ -58,7 +60,8 @@ export const DailyReport = memo(() => {
     
     const filteredData = useMemo(() => {
         if (!searchDate) return data
-        return data.filter((row) => moment.utc(row.reportDate).local().isBetween(...searchDate))
+        const endDate = moment(searchDate[1]).add(1, 'd')
+        return data.filter((row) => moment(row.reportDate).isBetween(searchDate[0], endDate, 'ms', '[)'))
     }, [data, searchDate])
 
     return (
@@ -68,8 +71,8 @@ export const DailyReport = memo(() => {
                     <div>
                         <div>
                             <div>Диапозон дат отчёта</div>
-                            <DatePicker.RangePicker
-                                allowClear={false}
+                            <DateRangeWrapper
+                                showTime={false}
                                 format={'DD.MM.YYYY'}
                                 defaultValue={searchDate}
                                 onCalendarChange={setSearchDate}
@@ -102,6 +105,7 @@ export const DailyReport = memo(() => {
                     setIsEditorVisible(false)
                     updateTable()
                 }}
+                checkIsDateBusy={checkIsDateBusy}
             />
         </>
     )

From 3af90800ff3f86b4df3027d1c76a30515192c801 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Tue, 17 May 2022 16:12:22 +0500
Subject: [PATCH 42/49] =?UTF-8?q?*=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=BE=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20README.md?=
 =?UTF-8?q?=20*=20TODO.md=20=D1=83=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20=D0=B7?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=BD=D0=B0=D0=B4=D0=BE=D0=B1=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=D1=8E=20*=20=D0=92=20index.html=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B5=20=D0=BF=D0=BE=D0=B4=D1=80=D0=BE=D0=B1=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=D1=8B=D1=85=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=20*=20=D0=A7=D0=B0=D1=81=D1=82=D0=B8=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20utils=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F,=20?=
 =?UTF-8?q?=D1=8F=D0=B2=D0=BD=D0=BE=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md               | 62 ++++++++++++++++++++++++++++++++++++++++-
 TODO.md                 |  1 -
 public/index.html       |  8 ++++--
 src/utils/datetime.ts   |  6 ++--
 src/utils/functions.tsx | 35 +++++++++++++----------
 src/utils/index.ts      | 47 +++++++++++++++++++++++++++----
 src/utils/string.ts     |  4 +--
 7 files changed, 134 insertions(+), 29 deletions(-)
 delete mode 100755 TODO.md

diff --git a/README.md b/README.md
index e940f42..60b1e40 100755
--- a/README.md
+++ b/README.md
@@ -1 +1,61 @@
-Проект веб части ASB cloud
\ No newline at end of file
+![ASB Logo](concept/ImagesSrc/logo_Asb.svg)
+# Проект веб части ASB cloud
+
+# Порядок запуска
+## 1. Установка пакетов
+Для запуска установки необходимо иметь уже установленый [NPM](https://www.npmjs.com).
+
+Установка выполняется одной командой:
+```bash
+npm i
+```
+
+## 2. Автогенерация сервисов
+Для корректной работы веб-приложения необходимо наличие сервисов работы с RestAPI.
+
+Для их автогенерации требуется уже запущенная серверная часть.
+
+Автогенерацию можно запустить с помощью уже прописанных в [package.json](package.json) скриптов, либо вручную.
+
+Если сервер запущен на текущей машине достаточно написать: 
+```bash
+npm run update_openapi
+```
+
+Для получения сервисов с основного сервера: 
+```bash
+npm run update_openapi_server
+```
+
+или же ручной вариант:
+```bash
+npx openapi -i http://{IP_ADDRESS}:{PORT}/swagger/v1/swagger.json -o src/services/api
+```
+
+где ***IP_ADDRESS*** и ***PORT*** это соответственно IP-адрес и порт сервера.
+
+На данный момент имеются следующие IP-адреса:
+| IP-адрес | Описание |
+|:-|:-|
+| 127.0.0.1:5000 | Локальный адрес вашей машины (привязан к `update_openapi`) |
+| 192.168.1.70:5000 | Локальный адрес development-сервера (привязан к `update_openapi_server`) |
+| 46.146.209.148:89 | Внешний адрес development-сервера |
+| 46.146.209.148    | Внешний адрес production-сервера |
+
+## 3. Компиляция production-версии приложения
+После выполнения вышеописанных пунктов приложение готово к компиляции.
+
+Для компиляции досточно выполнить команду:
+```bash
+npm run build
+```
+
+После завершения этой команды скомпилированное приложение будет находиться в появившейся директории [build/](build/).
+
+## 4. Запуск development-версии приложения
+В [package.json](package.json) необходимо проверить и при необходимости изменить значение в поле ***proxy*** (пара адрес-порт сервера с RestAPI) на актуальное.
+
+После чего выполнить запуск командой:
+```bash
+npm start
+```
diff --git a/TODO.md b/TODO.md
deleted file mode 100755
index 3d2733d..0000000
--- a/TODO.md
+++ /dev/null
@@ -1 +0,0 @@
-env params prod/dev
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index aeeddf7..affdf4a 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,13 +1,15 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="ru">
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
+    <meta name="theme-color" content="white" />
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white" />
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
     <meta
       name="description"
-      content="онлайн мониторинг процесса бурения в реальном времени в офисе заказчика"
+      content="Онлайн мониторинг процесса бурения в реальном времени в офисе заказчика"
     />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>АСБ Vision</title>
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
index 74090a8..9977f60 100755
--- a/src/utils/datetime.ts
+++ b/src/utils/datetime.ts
@@ -19,7 +19,7 @@ export function isRawDate(value: unknown): value is RawDate {
     return !isNaN(Date.parse(String(value)))
 }
 
-export const formatDate = (date: unknown, utc = false, format = defaultFormat) => {
+export const formatDate = (date: unknown, utc: boolean = false, format: string = defaultFormat) => {
     if (!isRawDate(date)) return null
     const out = utc ? moment.utc(date).local() : moment(date)
     return out.format(format)
@@ -40,8 +40,8 @@ export const periodToString = (time?: number) => {
     return `${days > 0 ? days : ''} ${toFixed(hours)}:${toFixed(minutes)}:${toFixed(seconds)}`
 }
 
-export const calcDuration = (start: unknown, end: unknown) => {
-    if (!isRawDate(start) || !isRawDate(end)) return
+export const calcDuration = (start: unknown, end: unknown): number | undefined => {
+    if (!isRawDate(start) || !isRawDate(end)) return undefined
     return (+new Date(end) - +new Date(start)) * timeInS.millisecond / timeInS.day
 }
 
diff --git a/src/utils/functions.tsx b/src/utils/functions.tsx
index a6751d2..cc377e8 100755
--- a/src/utils/functions.tsx
+++ b/src/utils/functions.tsx
@@ -1,20 +1,25 @@
 import { OperationStatService, WellOperationDto, WellOperationDtoPlanFactPredictBase } from '@api'
 
-const maxPrefix = 'isMax'
-const minPrefix = 'isMin'
+const maxPrefix: string = 'isMax'
+const minPrefix: string = 'isMin'
 
-export const getPrecision = (number: number) => Number.isFinite(number) ? number.toFixed(2) : '-'
+export const getPrecision = (number: number): string => Number.isFinite(number) ? number.toFixed(2) : '-'
 
 export type KeyType = number | string
 
-export const nwtIdCategory = 1043
+export const nwtIdCategory: number = 1043
 
 export type SaubData = WellOperationDto & {
-  isNPT?: boolean // Относится ли операция к НПВ
-  key?: number // ID операции
-  depth?: number // Глубина
-  date?: string // Дата
-  nptHours?: number // Колличество часов НПВ с начала бурения до текущего момента
+  /** Относится ли операция к НПВ */
+  isNPT?: boolean
+  /** ID операции */
+  key?: number
+  /** Глубина */
+  depth?: number
+  /** Дата */
+  date?: string
+  /** Колличество часов НПВ с начала бурения до текущего момента */
+  nptHours?: number
 }
 
 export const getOperations = async (idWell: number): Promise<{
@@ -25,11 +30,13 @@ export const getOperations = async (idWell: number): Promise<{
 }> => {
   const ops = await OperationStatService.getTvd(idWell)
 
-  if (!ops) return {
-    operations: [],
-    plan: [],
-    fact: [],
-    predict: [],
+  if (!ops) {
+      return {
+        operations: [],
+        plan: [],
+        fact: [],
+        predict: [],
+    }
   }
 
   const convert = (operation?: WellOperationDto): SaubData => ({
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 7e84db5..49517b9 100755
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,25 +1,62 @@
-export type { RawDate, timeInS } from './datetime'
 export { isRawDate, formatDate, defaultFormat, periodToString } from './datetime'
+export type { RawDate, timeInS } from './datetime'
 
-export const headerHeight = 64
+export const headerHeight: number = 64
 
 export const mainFrameSize = () => ({
     width: window.innerWidth,
     height: window.innerHeight - headerHeight
 })
 
+/**
+ * Возвращает 
+ * 
+ * @param arr Входящие данные
+ * @param def Значение по-умолчанию
+ * 
+ * @returns Если `arr` - массив будет возвращено оно, иначе `def`
+ */
 export const arrayOrDefault = <T extends unknown>(arr?: unknown, def: T[] = []): T[] => Array.isArray(arr) ? arr : def
 
+/**
+ * Копирует данные в глубину.
+ * 
+ * @remarks
+ * При копированиий объектов, содержащих функций может возникнуть исключение.
+ * Не предназначено для копирования функций.
+ * 
+ * @param data Копируемые данные
+ * @returns Полная копия `data`
+ */
 export const deepCopy = <T extends any>(data: T): T => JSON.parse(JSON.stringify(data ?? null))
 
+/**
+ * Маппинг полей объекта
+ * 
+ * @param data Входящие данные
+ * @param handler Обработчик
+ * 
+ * @returns Объект с обработанными полями
+ */
 export const wrapValues = <T, R>(data: Record<string, T>, handler: (data: T, key: string, object: Record<string, T>) => R): Record<string, R> =>
     Object.fromEntries(Object.entries(data).map(([key, value]) => [key, handler(value, key, data)]))
 
+/**
+ * Генерирует массив чисел в заданном диапазоне
+ * 
+ * @param end Конечное значение
+ * @param start Начальное значение
+ * 
+ * @returns Массив чисел в диапазоне от `start` до `end`
+ */
 export const range = (end: number, start: number = 0) => Array.from({ length: end - start }, (_, i) => start + i)
 
 /**
- * Объединить типы, исключив совпадающие поля справа
- * @param T Тип, передаваемый полностью
- * @param R Аддитивный тип
+ * Объединить типы, исключив совпадающие поля справа.
+ * 
+ * @typeParam T - Тип, передаваемый полностью
+ * @typeParam R - Аддитивный тип
+ * 
+ * @returns Общий тип с полным `T` и несовпадающими полями из `R`
  */
 export type OmitExtends<T, R> = T & Omit<R, keyof T>
diff --git a/src/utils/string.ts b/src/utils/string.ts
index debbcf3..ae27338 100755
--- a/src/utils/string.ts
+++ b/src/utils/string.ts
@@ -1,7 +1,7 @@
-export const makeStringCutter = (maxLength = 100, separator = ' ', suffix = '...') => (comment?: string) => {
+export const makeStringCutter = (maxLength: number = 100, separator: string = ' ', suffix: string = '...') => (comment?: string) => {
     if (!comment || comment.length < maxLength)
         return comment
-    let lastSep = comment.lastIndexOf(separator, maxLength)
+    const lastSep = comment.lastIndexOf(separator, maxLength)
     if (lastSep < 0)
         return comment.substring(0, maxLength - suffix.length) + suffix
     return comment.substring(0, lastSep)

From e8e9b614384d40611a401bbd5f973583a2082cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=D0=B5=D0=B2=D0=B8=D1=87=20?=
 =?UTF-8?q?=D0=A1=D0=B8=D1=80=D0=BE=D1=82=D0=BA=D0=B8=D0=BD?=
 <av.sirotkin@autodrilling.ru>
Date: Tue, 17 May 2022 11:14:32 +0000
Subject: [PATCH 43/49] README.md edited online with Bitbucket

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 60b1e40..de49569 100755
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ npx openapi -i http://{IP_ADDRESS}:{PORT}/swagger/v1/swagger.json -o src/service
 где ***IP_ADDRESS*** и ***PORT*** это соответственно IP-адрес и порт сервера.
 
 На данный момент имеются следующие IP-адреса:
+
 | IP-адрес | Описание |
 |:-|:-|
 | 127.0.0.1:5000 | Локальный адрес вашей машины (привязан к `update_openapi`) |

From 3912e9b30839f7252d0c771d32c35a190cc0d224 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Wed, 18 May 2022 12:25:22 +0500
Subject: [PATCH 44/49] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=85=D1=83=D0=BA=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D1=81=D0=BA=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B8=D0=BD=D1=8B=20=D0=B8=20=D1=82=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BA=D0=BE=D1=80=D0=BD=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/context.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/context.ts b/src/context.ts
index 06311dc..a74e4b9 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -1,4 +1,21 @@
-import { createContext } from 'react'
+import { createContext, useContext } from 'react'
 
+
+/** Контекст текущего ID скважины */
 export const IdWellContext = createContext<number | null>(null)
+/** Контекст текущего корневого пути */
 export const RootPathContext = createContext<string>('')
+
+/**
+   * Получает текущий ID скважины
+   *
+   * @returns Текущий ID скважины, либо `null`
+   */
+export const useIdWell = () => useContext(IdWellContext)
+
+/**
+   * Получает текущий корневой путь
+   *
+   * @returns Текущий корневой путь
+   */
+export const useRootPath = () => useContext(RootPathContext)

From 12a6d96a95a6b7ae8bf1560492f6e2b6dc932686 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Wed, 18 May 2022 17:18:35 +0500
Subject: [PATCH 45/49] =?UTF-8?q?*=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BE=20=D1=81=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20*=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20mime-=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=20*=20=D0=98=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8?=
 =?UTF-8?q?=D0=B1=D0=BA=D0=B0=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=20*=20=D0=94=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D1=80=D0=BE=D0=BF=20mim?=
 =?UTF-8?q?eType=20=D0=B2=20UploadForm=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8F=20=D1=82=D0=B8=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20*=20?=
 =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B5=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D1=80=D0=B5=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D0=B8=20=D0=9F=D0=91=20*=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=82=D0=B8=D0=BF?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20notify=20*=20=D0=98=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=91=D0=BD=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B2=20=D0=BE=D0=BA=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D1=81=D1=83=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20*=20=D0=94=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D1=81=D1=83=D1=82=D0=BE=D1=87?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D0=BF=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadForm.tsx                 | 22 +++++++--
 src/components/factory.ts                     |  4 +-
 src/pages/Documents/DocumentsTemplate.jsx     |  4 +-
 src/pages/DrillingProgram/CategoryEditor.jsx  |  8 +++-
 src/pages/DrillingProgram/CategoryRender.jsx  |  3 +-
 src/pages/DrillingProgram/index.jsx           | 47 ++++++++++---------
 .../Reports/DailyReport/ReportEditor.jsx      |  4 +-
 src/pages/Reports/DailyReport/index.jsx       |  2 +-
 src/utils/index.ts                            |  2 +
 src/utils/mimeTypes.ts                        | 34 ++++++++++++++
 10 files changed, 95 insertions(+), 35 deletions(-)
 create mode 100644 src/utils/mimeTypes.ts

diff --git a/src/components/UploadForm.tsx b/src/components/UploadForm.tsx
index 3ec99a5..12bfef4 100644
--- a/src/components/UploadForm.tsx
+++ b/src/components/UploadForm.tsx
@@ -1,15 +1,17 @@
-import { memo, useCallback, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { Upload, Button } from 'antd'
 import { UploadOutlined } from '@ant-design/icons'
 import { UploadFile } from 'antd/lib/upload/interface'
+import { RcFile } from 'antd/lib/upload'
 
-import { upload } from  './factory'
+import { notify, upload } from  './factory'
 import { ErrorFetch } from './ErrorFetch'
 
 export type UploadFormProps = {
   url: string
   disabled?: boolean
   accept?: string
+  mimeTypes?: string | string[]
   style?: CSSStyleSheet
   formData: FormData
   onUploadStart?: () => void
@@ -18,14 +20,25 @@ export type UploadFormProps = {
   onUploadError?: (error: unknown) => void
 }
 
-export const UploadForm = memo<UploadFormProps>(({ url, disabled, accept, style, formData, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
+export const UploadForm = memo<UploadFormProps>(({ url, disabled, style, formData, mimeTypes, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
   const [fileList, setfileList] = useState<UploadFile<any>[]>([])
 
+  const checkMimeTypes = useCallback((file: RcFile) => {
+    const isAccepted = !mimeTypes || mimeTypes.includes(file.type)
+    if (isAccepted) return false
+    notify(`"${file.name}" является файлом неподходящего типа`, 'error')
+    return Upload.LIST_IGNORE
+  }, [mimeTypes])
+
+  const accept = useMemo(() => Array.isArray(mimeTypes) ? mimeTypes.join(',') : mimeTypes, [mimeTypes])
+
+  useEffect(() => console.log(fileList), [fileList])
+
   const handleFileSend = useCallback(async () => {
     onUploadStart?.()
     try {
       const formDataLocal = new FormData()
-      fileList.forEach((val) => formDataLocal.append('files', String(val.originFileObj)))
+      fileList.forEach((val) => formDataLocal.append('files',  val.originFileObj as Blob))
 
       if(formData)
         for(const propName in formData)
@@ -58,6 +71,7 @@ export const UploadForm = memo<UploadFormProps>(({ url, disabled, accept, style,
         disabled={disabled}
         fileList={fileList}
         onChange={(props) => setfileList(props.fileList)}
+        beforeUpload={checkMimeTypes}
       >
         <Button disabled={disabled} icon={<UploadOutlined/>}>Загрузить файл</Button>
       </Upload>
diff --git a/src/components/factory.ts b/src/components/factory.ts
index 3d5abfa..635b2c2 100755
--- a/src/components/factory.ts
+++ b/src/components/factory.ts
@@ -11,12 +11,14 @@ const notificationTypeDictionary = new Map([
   ['open'   , { notifyInstance: notification.info   , caption: '' }],
 ])
 
+export type NotifyType = 'error' | 'warning' | 'info'
+
 /**
  * Вызов оповещений всплывающим окошком.
  * @param body string или ReactNode
  * @param notifyType для параметра типа. Допустимые значение 'error', 'warning', 'info'
  */
-export const notify = (body: ReactNode, notifyType: string = 'info', other?: any) => {
+export const notify = (body: ReactNode, notifyType: NotifyType = 'info', other?: any) => {
   if (!body) return
 
   const instance = notificationTypeDictionary.get(notifyType) ??
diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx
index a540975..d831508 100755
--- a/src/pages/Documents/DocumentsTemplate.jsx
+++ b/src/pages/Documents/DocumentsTemplate.jsx
@@ -31,7 +31,7 @@ const columns = [
   makeColumn('Компания', 'company', { render: (_, record) => <CompanyView company={record?.author?.company}/> })
 ]
 
-export const DocumentsTemplate = ({ idCategory, idWell: wellId, accept, headerChild, customColumns, beforeTable, onChange, tableName }) => {
+export const DocumentsTemplate = ({ idCategory, idWell: wellId, mimeTypes, headerChild, customColumns, beforeTable, onChange, tableName }) => {
   const [page, setPage] = useState(1)
   const [filterDataRange, setFilterDataRange] = useState([])
   const [filterCompanyName, setFilterCompanyName] = useState([])
@@ -134,7 +134,7 @@ export const DocumentsTemplate = ({ idCategory, idWell: wellId, accept, headerCh
             <span>Загрузка</span>
             <UploadForm
               url={uploadUrl}
-              accept={accept}
+              mimeTypes={mimeTypes}
               onUploadStart={() => setShowLoader(true)}
               onUploadComplete={update}
             />
diff --git a/src/pages/DrillingProgram/CategoryEditor.jsx b/src/pages/DrillingProgram/CategoryEditor.jsx
index 13f0ddf..8c3b7ff 100755
--- a/src/pages/DrillingProgram/CategoryEditor.jsx
+++ b/src/pages/DrillingProgram/CategoryEditor.jsx
@@ -28,9 +28,12 @@ export const CategoryEditor = memo(({ visible, category, onClosed }) => {
     const [showLoader, setShowLoader] = useState(false)
     const [searchValue, setSearchValue] = useState('')
     const [subject, setSubject] = useState(null)
+    const [needUpdate, setNeedUpdate] = useState(false)
 
     const idWell = useContext(IdWellContext)
 
+    useEffect(() => visible && setNeedUpdate(false), [visible])
+
     useEffect(() => invokeWebApiWrapperAsync(
         async () => {
             const filteredUsers = users.filter(({ user }) => user && [
@@ -108,6 +111,7 @@ export const CategoryEditor = memo(({ visible, category, onClosed }) => {
                 prevUsers[userIdx].status = status
                 return [...prevUsers]
             })
+            setNeedUpdate(true)
         },
         setShowLoader,
         <>
@@ -138,9 +142,9 @@ export const CategoryEditor = memo(({ visible, category, onClosed }) => {
     const onSearchTextChange = useCallback((e) => subject?.next(e?.target?.value), [subject])
 
     const onModalClosed = useCallback(() => {
-        onClosed?.()
+        onClosed?.(needUpdate)
         calcUsers()
-    }, [onClosed, calcUsers])
+    }, [onClosed, calcUsers, needUpdate])
 
     return (
         <Modal
diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 770c7c2..3b607a5 100755
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -14,7 +14,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import Poprompt from '@components/selectors/Poprompt'
 import { formatBytes, invokeWebApiWrapperAsync, notify } from '@components/factory'
 import { DrillingProgramService } from '@api'
-import { formatDate } from '@utils'
+import { formatDate, MimeTypes } from '@utils'
 
 import MarksCard from './MarksCard'
 
@@ -124,6 +124,7 @@ export const CategoryRender = memo(({ partData, onUpdate, onEdit, onHistory, set
                             {permissionToUpload && (
                                 <UploadForm
                                     url={uploadUrl}
+                                    mimeTypes={MimeTypes.XLSX}
                                     style={{ margin: '5px 0 10px 0' }}
                                     onUploadStart={() => setIsUploading(true)}
                                     onUploadComplete={onUploadComplete}
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
index ae3a530..2b8aa69 100755
--- a/src/pages/DrillingProgram/index.jsx
+++ b/src/pages/DrillingProgram/index.jsx
@@ -8,9 +8,9 @@ import {
   ReloadOutlined,
   WarningOutlined,
 } from '@ant-design/icons'
-import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 
-import { IdWellContext } from '@asb/context'
+import { useIdWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, formatDate } from '@utils'
@@ -23,20 +23,22 @@ import CategoryHistory from './CategoryHistory'
 
 import '@styles/drilling_program.less'
 
-const idStateNotInitialized = 0
-const idStateApproving = 1
-const idStateCreating = 2
-const idStateReady = 3
-const idStateError = 4
-const idStateUnknown = -1
+const ID_STATE = {
+  NotInitialized: 0,
+  Approving: 1,
+  Creating: 2,
+  Ready: 3,
+  Error: 4,
+  Unknown: -1,
+}
 
-const stateString = {
-  [idStateNotInitialized]: { icon: CloseOutlined, text: 'Не настроена' },
-  [idStateApproving]: { icon: AuditOutlined, text: 'Согласовывается' },
-  [idStateCreating]: { icon: LoadingOutlined, text: 'Формируется' },
-  [idStateReady]: { icon: CheckOutlined, text: 'Сформирована' },
-  [idStateError]: { icon: WarningOutlined, text: 'Ошибка формирования' },
-  [idStateUnknown]: { icon: WarningOutlined, text: 'Неизвестно' },
+const STATE_STRING = {
+  [ID_STATE.NotInitialized]: { icon: CloseOutlined, text: 'Не настроена' },
+  [ID_STATE.Approving]: { icon: AuditOutlined, text: 'Согласовывается' },
+  [ID_STATE.Creating]: { icon: LoadingOutlined, text: 'Формируется' },
+  [ID_STATE.Ready]: { icon: CheckOutlined, text: 'Сформирована' },
+  [ID_STATE.Error]: { icon: WarningOutlined, text: 'Ошибка формирования' },
+  [ID_STATE.Unknown]: { icon: WarningOutlined, text: 'Неизвестно' },
 }
 
 export const DrillingProgram = memo(() => {
@@ -47,7 +49,7 @@ export const DrillingProgram = memo(() => {
   const [categories, setCategories] = useState([])
   const [data, setData] = useState({})
 
-  const idWell = useContext(IdWellContext)
+  const idWell = useIdWell()
 
   const {
     idState,
@@ -57,8 +59,8 @@ export const DrillingProgram = memo(() => {
     error,
   } = useMemo(() => data, [data])
 
-  const stateId = useMemo(() => idState ?? idStateUnknown, [idState])
-  const state = useMemo(() => stateString[stateId], [stateId])
+  const stateId = useMemo(() => idState ?? ID_STATE.Unknown, [idState])
+  const state = useMemo(() => STATE_STRING[stateId], [stateId])
   const StateIcon = useMemo(() => state.icon, [state?.icon])
 
   const updateData = useCallback(async () => await invokeWebApiWrapperAsync(
@@ -89,9 +91,10 @@ export const DrillingProgram = memo(() => {
     setHistoryVisible(!!catId)
   }, [])
 
-  const onEditorClosed = useCallback(() => {
+  const onEditorClosed = useCallback((needUpdate) => {
     setEditorVisible(false)
-    updateData()
+    if (needUpdate)
+      updateData()
   }, [updateData])
 
   return (
@@ -107,7 +110,7 @@ export const DrillingProgram = memo(() => {
             )}
           </div>
           <div className={'program_content'}>
-            {stateId === idStateReady ? (
+            {stateId === ID_STATE.Ready ? (
               <>
                 <Button
                   type={'link'}
@@ -120,7 +123,7 @@ export const DrillingProgram = memo(() => {
                 <div className={'m-10'}>Размер: {formatBytes(program?.size)}</div>
                 <div className={'m-10'}>Сформирован: {formatDate(program?.uploadDate)}</div>
               </>
-            ) : stateId === idStateError ? (
+            ) : stateId === ID_STATE.Error ? (
               <>
                 <h3 className={'program_status error'}>
                   <StateIcon className={'m-10'} />
diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx
index 18697f1..ffea880 100644
--- a/src/pages/Reports/DailyReport/ReportEditor.jsx
+++ b/src/pages/Reports/DailyReport/ReportEditor.jsx
@@ -168,11 +168,11 @@ export const ReportEditor = memo(({ visible, data, onDone, onCancel, checkIsDate
             if (data) return
             const newData = await DailyReportService.getOrGenerate(idWell, date.format('YYYY-MM-DD') + 'Z')
             if (checkIsDateBusy(moment(newData.reportDate)))
-                throw 'Рапорт на данную дату уже существует'
+                throw new Error('Рапорт на данную дату уже существует')
             setFields(newData)
         },
         setIsLoading,
-        'Не удалось загрузить автозаполняемые данные для нового рапорта',
+        (e) => `Не удалось загрузить автозаполняемые данные для нового рапорта: ${e}`,
         'Получение автозаполняемых данных суточного рапорта',
     ), [idWell, data, setFields, checkIsDateBusy])
 
diff --git a/src/pages/Reports/DailyReport/index.jsx b/src/pages/Reports/DailyReport/index.jsx
index b9129a7..cbb0c97 100644
--- a/src/pages/Reports/DailyReport/index.jsx
+++ b/src/pages/Reports/DailyReport/index.jsx
@@ -36,7 +36,7 @@ export const DailyReport = memo(() => {
     const checkIsDateBusy = useCallback((current) => current.isAfter(moment(), 'day') || data.some((row) => moment(row.reportDate).isSame(current, 'day')), [data])
 
     const columns = useMemo(() => [
-        makeDateColumn('Дата', 'reportDate', undefined, 'YYYY.MM.DD', { width: 300 }),
+        makeDateColumn('Дата', 'reportDate', undefined, 'DD.MM.YYYY', { width: 300 }),
         makeColumn('', '', { width: 200, render: (_, report) => (
             <>
                 <Button
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 49517b9..2323451 100755
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,6 +1,8 @@
 export { isRawDate, formatDate, defaultFormat, periodToString } from './datetime'
 export type { RawDate, timeInS } from './datetime'
 
+export { MimeTypes } from './mimeTypes'
+
 export const headerHeight: number = 64
 
 export const mainFrameSize = () => ({
diff --git a/src/utils/mimeTypes.ts b/src/utils/mimeTypes.ts
new file mode 100644
index 0000000..cdbb3e9
--- /dev/null
+++ b/src/utils/mimeTypes.ts
@@ -0,0 +1,34 @@
+export const MimeTypes = {
+    BMP: 'image/bmp',
+    CSV: 'text/csv',
+    CSV1: 'application/csv',
+    DOC: 'application/msword',
+    DOCM: 'application/vnd.ms-word.document.macroEnabled.12',
+    DOCX: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    DOTM: 'application/vnd.ms-word.template.macroEnabled.12',
+    DOTX: 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    GIF: 'image/gif',
+    HTML: 'text/html',
+    JPEG: 'image/jpeg',
+    JPG: 'image/jpeg',
+    JSON: 'application/json',
+    PDF: 'application/pdf',
+    PNG: 'image/png',
+    POTM: 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+    POTX: 'application/vnd.openxmlformats-officedocument.presentationml.template',
+    PPAM: 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+    PPS: 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    PPSM: 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+    PPSX: 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    PPT: 'application/vnd.ms-powerpoint',
+    PPTM: 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+    PPTX: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    RTF: 'application/rtf',
+    RTF2: 'text/rtf',
+    TXT: 'text/plain',
+    XLSB: 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    XLSM: 'application/vnd.ms-excel.sheet.macroEnabled.12',
+    XLSX: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+}
+
+export default MimeTypes

From 43e97750e4828026704faa3e7361aa9aea595401 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 19 May 2022 01:28:06 +0500
Subject: [PATCH 46/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D1=81=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChangePassword.tsx | 45 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/components/ChangePassword.tsx b/src/components/ChangePassword.tsx
index fb2ef0e..92725ab 100755
--- a/src/components/ChangePassword.tsx
+++ b/src/components/ChangePassword.tsx
@@ -1,5 +1,5 @@
-import { memo, useState } from 'react'
-import { useForm } from 'antd/lib/form/Form'
+import { memo, useCallback, useMemo, useState } from 'react'
+import { Rule } from 'antd/lib/form'
 import { Form, Input, Modal, FormProps } from 'antd'
 
 import { AuthService, UserDto } from '@api'
@@ -21,12 +21,19 @@ export type ChangePasswordProps = {
 
 const fieldRules = [...passwordRules, ...createPasswordRules]
 
+const confirmPasswordRules: Rule[] = [({ getFieldValue }) => ({ validator(_, value: string) {
+    if (value !== getFieldValue('new-password'))
+        return Promise.reject('Пароли не совпадают!')
+    return Promise.resolve()
+}})]
+
 export const ChangePassword = memo<ChangePasswordProps>(({ user, visible, onCancel, onOk }) => {
     const [showLoader, setShowLoader] = useState<boolean>(false)
-    const [password, setPassword] = useState<string>('')
     const [isDisabled, setIsDisabled] = useState(true)
 
-    const [form] = useForm()
+    const userData = useMemo(() => user ?? { id: getUserId(), login: getUserLogin() } as UserDto, [user])
+
+    const [form] = Form.useForm()
 
     const onFormChange = async () => await form.validateFields()
         .then(() => setIsDisabled(false))
@@ -37,15 +44,15 @@ export const ChangePassword = memo<ChangePasswordProps>(({ user, visible, onCanc
         onCancel?.()
     }
 
-    const onFormFinish = () => invokeWebApiWrapperAsync(
+    const onFormFinish = useCallback((values: any) => invokeWebApiWrapperAsync(
         async() => {
-            await AuthService.changePassword(user?.id ?? getUserId() ?? -1, `"${password}"`)
+            await AuthService.changePassword(userData.id ?? -1, `${values['new-password']}`)
             onOk?.()
         },
         setShowLoader,
-        `Не удалось сменить пароль пользователя ${getUserLogin()}`,
+        `Не удалось сменить пароль пользователя ${userData.login}`,
         'Смена пароля пользователя'
-    )
+    ), [userData, onOk])
 
     return (
         <Modal
@@ -63,6 +70,8 @@ export const ChangePassword = memo<ChangePasswordProps>(({ user, visible, onCanc
             okButtonProps={{
                 disabled: isDisabled
             }}
+            // getContainer={false} // Исправляет ошибку с формой, но портит вид модалки при вызове из user menu
+            // TODO: разобраться
         >
             <LoaderPortal show={showLoader}>
                 <Form
@@ -72,24 +81,10 @@ export const ChangePassword = memo<ChangePasswordProps>(({ user, visible, onCanc
                     onFinish={onFormFinish}
                     onChange={onFormChange}
                 >
-                    <Form.Item
-                        label={'Новый пароль'}
-                        name={'new-password'}
-                        required={true}
-                        rules={fieldRules}
-                    >
-                        <Input.Password onChange={(e) => setPassword(e.target.value)} value={password} />
+                    <Form.Item required rules={fieldRules} name={'new-password'} label={'Новый пароль'}>
+                        <Input.Password />
                     </Form.Item>
-                    <Form.Item
-                        label={'Подтверждение пароля'}
-                        name={'confirm-password'}
-                        required={true}
-                        rules={[() => ({ validator(_, value: string) {
-                            if (value !== password)
-                                return Promise.reject('Пароли не совпадают!')
-                            return Promise.resolve()
-                        }})]}
-                    >
+                    <Form.Item required name={'confirm-password'} rules={confirmPasswordRules} label={'Подтверждение пароля'}>
                         <Input.Password />
                     </Form.Item>
                 </Form>

From 0db0984ba7e77507808f5c3058fee353f6d5c53a Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 19 May 2022 11:43:32 +0500
Subject: [PATCH 47/49] =?UTF-8?q?*=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=20TelemetryMerger=20*=20=D0=BA=20=D0=BA=D0=BE=D0=BD=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D1=82=D0=B0=D0=BC=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20Readonly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminPanel/Telemetry/TelemetryMerger.jsx   | 15 ++++++++-------
 src/utils/datetime.ts                          |  6 +++---
 src/utils/functions.tsx                        |  6 +++---
 src/utils/index.ts                             |  2 +-
 src/utils/mimeTypes.ts                         |  4 ++--
 src/utils/permissions.ts                       |  4 ++--
 src/utils/validationRules.ts                   | 18 +++++++++---------
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
index c97333e..f518c9e 100755
--- a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
+++ b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
@@ -35,7 +35,7 @@ export const TelemetryInfo = memo(({ info, danger, ...other }) => (
 export const TelemetryMerger = memo(() => {
     const [primary, setPrimary] = useState(null)
     const [secondary, setSecondary] = useState(null)
-    const [telemetry, setTelemetry] = useState([])
+    const [telemetry, setTelemetry] = useState(null)
     const [isLoading, setIsLoading] = useState(false)
     const [isMerging, setIsMerging] = useState(false)
 
@@ -47,7 +47,7 @@ export const TelemetryMerger = memo(() => {
         primary?.info?.deposit !== secondary?.info?.deposit && 'deposit',
     ], [primary, secondary])
 
-    const updateTelemetry = useCallback(async () => await invokeWebApiWrapperAsync(
+    const updateTelemetry = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
             const telemetry = arrayOrDefault(await AdminTelemetryService.getAll())
             setTelemetry(telemetry)
@@ -59,22 +59,23 @@ export const TelemetryMerger = memo(() => {
 
     const mergeTelemetry = useCallback(() => invokeWebApiWrapperAsync(
         async () => {
+            if (!secondary?.id || !primary?.id) return
             await AdminTelemetryService.mergeTelemetries(secondary.id, primary.id)
-            await updateTelemetry()
+            updateTelemetry()
         },
         setIsMerging,
         'Не удалось объединить телеметрии',
         'Объединение телеметрий',
-    ), [updateTelemetry, secondary.id, primary.id])
+    ), [updateTelemetry, secondary, primary])
 
-    useEffect(() => updateTelemetry(), [updateTelemetry])
+    useEffect(updateTelemetry, [updateTelemetry])
 
     useEffect(() => {
         const query = new URLSearchParams(location.search)
         const primaryId = parseInt(query.get('primary') ?? null)
         const secondaryId = parseInt(query.get('secondary') ?? null)
-        const primary = isNaN(primaryId) ? null : telemetry.find((t) => t.id === primaryId)
-        const secondary = isNaN(secondaryId) ? null : telemetry.find((t) => t.id === secondaryId)
+        const primary = isNaN(primaryId) ? null : telemetry.find((t) => t?.id === primaryId)
+        const secondary = isNaN(secondaryId) ? null : telemetry.find((t) => t?.id === secondaryId)
         setPrimary(primary)
         setSecondary(secondary)
     }, [location, telemetry])
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
index 9977f60..e72f63c 100755
--- a/src/utils/datetime.ts
+++ b/src/utils/datetime.ts
@@ -4,7 +4,7 @@ import { SimpleTimezoneDto } from '@api'
 
 export type RawDate = number | string | Date
 
-export const defaultFormat: string = 'DD.MM.YYYY HH:mm'
+export const defaultFormat: Readonly<string> = 'DD.MM.YYYY HH:mm'
 
 export enum timeInS {
     millisecond = 0.001,
@@ -52,7 +52,7 @@ export const fractionalSum = (date: unknown, value: number, type: keyof typeof t
     return d
 }
 
-export const rawTimezones = {
+export const rawTimezones = Object.freeze({
     'Калининград': 2,
     'Москва': 3,
     'Самара': 4,
@@ -68,7 +68,7 @@ export const rawTimezones = {
     'Среднеколымск': 11,
     'Анадырь': 12,
     'Петропавловск-Камчатский': 12,
-}
+})
 
 export type TimezoneId = keyof typeof rawTimezones
 
diff --git a/src/utils/functions.tsx b/src/utils/functions.tsx
index cc377e8..fce1223 100755
--- a/src/utils/functions.tsx
+++ b/src/utils/functions.tsx
@@ -1,13 +1,13 @@
 import { OperationStatService, WellOperationDto, WellOperationDtoPlanFactPredictBase } from '@api'
 
-const maxPrefix: string = 'isMax'
-const minPrefix: string = 'isMin'
+const maxPrefix: Readonly<string> = 'isMax'
+const minPrefix: Readonly<string> = 'isMin'
 
 export const getPrecision = (number: number): string => Number.isFinite(number) ? number.toFixed(2) : '-'
 
 export type KeyType = number | string
 
-export const nwtIdCategory: number = 1043
+export const nwtIdCategory: Readonly<number> = 1043
 
 export type SaubData = WellOperationDto & {
   /** Относится ли операция к НПВ */
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2323451..51732bc 100755
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -3,7 +3,7 @@ export type { RawDate, timeInS } from './datetime'
 
 export { MimeTypes } from './mimeTypes'
 
-export const headerHeight: number = 64
+export const headerHeight: Readonly<number> = 64
 
 export const mainFrameSize = () => ({
     width: window.innerWidth,
diff --git a/src/utils/mimeTypes.ts b/src/utils/mimeTypes.ts
index cdbb3e9..c5a640a 100644
--- a/src/utils/mimeTypes.ts
+++ b/src/utils/mimeTypes.ts
@@ -1,4 +1,4 @@
-export const MimeTypes = {
+export const MimeTypes = Object.freeze({
     BMP: 'image/bmp',
     CSV: 'text/csv',
     CSV1: 'application/csv',
@@ -29,6 +29,6 @@ export const MimeTypes = {
     XLSB: 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
     XLSM: 'application/vnd.ms-excel.sheet.macroEnabled.12',
     XLSX: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-}
+})
 
 export default MimeTypes
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index f6434b9..6108278 100755
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -62,9 +62,9 @@ export const isURLAvailable = (path: string, userPermissions?: Permission[]) =>
     return sectionAvailable(perms, userPerms)
 }
 
-interface PermissionRecord extends Record<string, string[] | PermissionRecord | null> {}
+export interface PermissionRecord extends Record<string, string[] | PermissionRecord | null> {}
 
-export const requirements: PermissionRecord = {
+export const requirements: Readonly<PermissionRecord> = {
     '': [],
     login: [], // ['Auth.edit']
     register: [], // ['Auth.edit']
diff --git a/src/utils/validationRules.ts b/src/utils/validationRules.ts
index 9f300a4..a59de26 100755
--- a/src/utils/validationRules.ts
+++ b/src/utils/validationRules.ts
@@ -1,44 +1,44 @@
 import { Rule } from 'rc-field-form/lib/interface'
 
-const _min1: Rule = {
+const _min1: Readonly<Rule> = {
     min: 1,
     max: 255,
     message: 'Допустимая длина 1-255 символов',
 }
 
-export const min1: Rule[] = [_min1]
+export const min1: Readonly<Rule[]> = [_min1]
 
-export const createLoginRules: Rule[] = [_min1, {
+export const createLoginRules: Readonly<Rule[]> = [_min1, {
     pattern: /^\s*[A-zА-яЁё][A-zА-яЁё\w.-]+\s*$/,
     message: 'Логин должен начинаться с русской или латинской буквы и содержать только символы (А-яA-z0-9_-.)!'
 }]
 
-export const loginRules: Rule[] = [...createLoginRules, {
+export const loginRules: Readonly<Rule[]> = [...createLoginRules, {
     required: true,
     message: 'Пожалуйста, введите логин',
 }]
 
-export const nameRules: Rule[] = [_min1, {
+export const nameRules: Readonly<Rule[]> = [_min1, {
     pattern: /^[A-zА-яЁё][A-zА-яЁё-]*$/,
     message: 'Допустимые символы: А-яA-z-',
 }]
 
-export const phoneRules: Rule[] = [{
+export const phoneRules: Readonly<Rule[]> = [{
     pattern: /^(?:\+7|8)\s?(?:\(\d{3}\)|\d{3})\s?\d{3}-?\d{2}-?\d{2}$/,
     message: 'Номер телефона должен иметь вид: +7 (xxx) xxx-xx-xx',
 }]
 
-export const emailRules: Rule[] = [{
+export const emailRules: Readonly<Rule[]> = [{
     type: 'email',
     message: 'E-mail должен иметь вид: "user@site.domain"',
 }]
 
-export const passwordRules: Rule[] = [{
+export const passwordRules: Readonly<Rule[]> = [{
     required: true,
     message: 'Пожалуйста, введите пароль!',
 }]
 
-export const createPasswordRules: Rule[] = [{
+export const createPasswordRules: Readonly<Rule[]> = [{
     min: 8,
     max: 255,
     message: 'Допустимая длина пароля 8-255',

From a343308a47a04b3a534ca29e9d07817f3b3ef910 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Thu, 19 May 2022 11:52:54 +0500
Subject: [PATCH 48/49] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=9D=D0=9F=D0=92=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=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

---
 .../WellCompositeEditor/WellCompositeSections.jsx          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 228e8f3..6b79e86 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -7,7 +7,7 @@ import { IdWellContext } from '@asb/context'
 import { CompanyView } from '@components/views'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
+import { makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn, makeNumericRender } from '@components/Table'
 import { WellCompositeService } from '@api'
 import { hasPermission } from '@utils/permissions'
 import {
@@ -70,8 +70,7 @@ export const WellCompositeSections = memo(({ statsWells, selectedSections }) =>
           sectionBhaUpSpeedFact: section.fact?.bhaUpSpeed,
           sectionCasingDownSpeedPlan: section.plan?.casingDownSpeed,
           sectionCasingDownSpeedFact: section.fact?.casingDownSpeed,
-          nonProductiveTimePlan: section.plan?.nonProductiveHours,
-          nonProductiveTimeFact: section.fact?.nonProductiveHours,
+          nonProductiveHours: section.fact?.nonProductiveHours,
           companies: well.companies,
         }
 
@@ -150,7 +149,7 @@ export const WellCompositeSections = memo(({ statsWells, selectedSections }) =>
     makeNumericColumnPlanFact('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('НПВ, сут', 'nonProductiveTime', filtersMinMax, makeFilterMinMaxFunction, null, '70px'),
+    makeNumericColumn('НПВ, ч', 'nonProductiveHours', filtersMinMax, makeFilterMinMaxFunction, null, '80px'),
     {
       title: 'TVD',
       render: (value) => (

From 355b2dfe2675e02c05b03329bde895f1407af8a1 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 20 May 2022 12:43:09 +0500
Subject: [PATCH 49/49] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B0=D0=BB=D0=B8=D0=B0=D1=81=D1=8B=20=D0=B3?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4bb1cdc..0787000 100755
--- a/package.json
+++ b/package.json
@@ -30,8 +30,10 @@
     "start": "craco start",
     "build": "craco build",
     "test": "craco test",
-    "update_openapi": "npx openapi -i http://127.0.0.1:5000/swagger/v1/swagger.json -o src/services/api",
-    "update_openapi_server": "npx openapi -i http://192.168.1.70:5000/swagger/v1/swagger.json -o src/services/api",
+    "oul": "npx openapi -i http://127.0.0.1:5000/swagger/v1/swagger.json -o src/services/api",
+    "oud": "npx openapi -i http://192.168.1.70:5000/swagger/v1/swagger.json -o src/services/api",
+    "oug": "npx openapi -i http://46.146.209.148/swagger/v1/swagger.json -o src/services/api",
+    "oug_dev": "npx openapi -i http://46.146.209.148:89/swagger/v1/swagger.json -o src/services/api",
     "react_start": "react-scripts start",
     "react_build": "react-scripts build",
     "react_test": "react-scripts test",