From ebcd1eebb5a7ecbd7b6538302ec703c13c29bd09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B0=D1=80=D1=87=D0=B5=D0=BD=D0=BA=D0=BE=20=D0=92?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80?=
 <vv.kharchenko@autodrilling.ru>
Date: Tue, 21 Dec 2021 16:38:30 +0500
Subject: [PATCH 1/4] Fixed null dates display (for stats table)

---
 src/pages/Cluster/ClusterWells.jsx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index 57457b3..520c54f 100644
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -55,6 +55,13 @@ export default function ClusterWells({statsWells}) {
       if (!filtersWellsType.some((el) => el.text === well.wellType))
         filtersWellsType.push({ text: well.wellType, value: well.wellType,})
 
+      let periodPlanValue = well.total?.plan?.start && well.total?.plan?.end
+                            ? (new Date(well.total?.plan?.end) - new Date(well.total?.plan?.start)) / DAY_IN_MS
+                            : '-'
+      let periodFactValue = well.total?.fact?.start && well.total?.fact?.end
+                            ? (new Date(well.total?.fact?.end) - new Date(well.total?.fact?.start)) / DAY_IN_MS
+                            : '-'
+
       return {
         key: well.caption,
         id: well.id,
@@ -62,8 +69,8 @@ export default function ClusterWells({statsWells}) {
         wellType: well.wellType,
         factStart: well.total?.fact?.start,
         factEnd: well.total?.fact?.end,
-        periodPlan: (new Date(well.total?.plan?.end) - new Date(well.total?.plan?.start)) / DAY_IN_MS,
-        periodFact: (new Date(well.total?.fact?.end) - new Date(well.total?.fact?.start)) / DAY_IN_MS,
+        periodPlan: periodPlanValue,
+        periodFact: periodFactValue,
         rateOfPenetrationPlan: well.total?.plan?.rop,
         rateOfPenetrationFact: well.total?.fact?.rop,
         routeSpeedPlan: well.total?.plan?.routeSpeed,
@@ -91,7 +98,9 @@ export default function ClusterWells({statsWells}) {
     setTableData(data)
   }, [statsWells])
 
-  const getDate = (str) => Number.isNaN(+new Date(str)) ? '-' : new Date(str).toLocaleString()
+  const getDate = (str) => Number.isNaN(+new Date(str)) || +new Date(str) === 0
+                           ? '-'
+                           : new Date(str).toLocaleString()
 
   const columns = [
     makeTextColumn('скв №', 'caption', null, null,

From 528b7e4f7b8560ccde58c8948011d05c8f7baaf3 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Thu, 23 Dec 2021 18:23:21 +0500
Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=20"=D0=98=D0=B7=D0=BC=D0=B5=D1=80=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F":=20*=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=BC=D0=B8=20=D0=BA=D0=BB=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BA=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=20*?=
 =?UTF-8?q?=20=D0=97=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20"=D0=9D=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85"=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D0=BF=D1=80=D0=B8=20=D0=B8=D1=85=20=D0=BE=D1=82?=
 =?UTF-8?q?=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20*=20render-?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=BB=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B2=D1=8B=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=82=D1=83=20*=20=D0=91=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D1=8B=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=87=D0=BD=D1=8B=D1=85=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B5=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20css=20*=20=D0=9F?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=BA=D0=B0=D1=8F=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Measure/InclinometryTable.jsx |  50 ++++++-----
 src/pages/Measure/MeasureTable.jsx      |  29 +++---
 src/pages/Measure/View.jsx              |  97 +++++++++-----------
 src/pages/Measure/columnsCommon.js      |  25 ++----
 src/pages/Measure/drillingFluidData.js  | 115 ++++++++++++------------
 src/pages/Measure/index.jsx             |  56 ++++++------
 src/pages/Measure/mudDiagramData.js     |  44 ++++-----
 src/pages/Measure/nnbData.js            |  36 ++++----
 src/styles/measure.css                  |  31 +++++++
 9 files changed, 246 insertions(+), 237 deletions(-)

diff --git a/src/pages/Measure/InclinometryTable.jsx b/src/pages/Measure/InclinometryTable.jsx
index fe04957..ed55e38 100644
--- a/src/pages/Measure/InclinometryTable.jsx
+++ b/src/pages/Measure/InclinometryTable.jsx
@@ -1,29 +1,38 @@
-import React, { useEffect, useState } from 'react'
 import { Modal } from 'antd'
+import { memo, useEffect, useState } from 'react'
+
 import { Table } from '../../components/Table'
+
 import { formatDate } from './MeasureTable'
 import { v } from './columnsCommon'
 
-export const InclinometryTable = React.memo(({ group, visible, onClose }) => {
+const tableScroll = { y: 400, x: 1300 }
+
+const dateColumn = {
+    title: 'Дата',
+    key: 'date',
+    dataIndex: 'date',
+    render: formatDate,
+    fixed: 'left',
+    width: '8rem',
+}
+
+export const InclinometryTable = memo(({ group, visible, onClose }) => {
     const [tableColumns, setTableColumns] = useState([])
     const [tableData, setTableData] = useState([])
 
-    useEffect(() => {
-        setTableColumns([{
-            title: 'Дата',
-            key: 'date',
-            dataIndex: 'date',
-            render: (item) => formatDate(item),
-            fixed: 'left',
-            width: '8rem',
-          },
-          ...(group?.columns?.map((column) => ({...column, title: v(column.title)})) ?? [])
-        ])
-    }, [group?.columns])
+    useEffect(() => setTableColumns([
+        dateColumn,
+        ...(group?.columns?.map((column) => ({
+            ...column,
+            title: v(column.title)
+        })) ?? [])
+    ]), [group?.columns])
 
-    useEffect(() => {
-        setTableData(group?.values?.map(row => ({ date: row.timestamp, ...row.data })))
-    }, [group?.values])
+    useEffect(() => setTableData(group?.values?.map(row => ({
+        date: row.timestamp,
+        ...row.data
+    }))), [group?.values])
 
     return !group?.columns ? null : (
         <Modal
@@ -37,14 +46,9 @@ export const InclinometryTable = React.memo(({ group, visible, onClose }) => {
             <Table
                 dataSource={tableData}
                 columns={tableColumns}
-                scroll={{
-                    y: 400,
-                    x: 1300
-                }}
+                scroll={tableScroll}
                 bordered
             />
         </Modal>
     )
 })
-
-export default InclinometryTable
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 04fbff9..71025c6 100644
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -1,6 +1,6 @@
+import moment from 'moment'
 import { useState, useEffect } from 'react'
 import { Button, Form, Input, Popconfirm, Timeline } from 'antd'
-import moment from 'moment'
 import {
   CheckSquareOutlined,
   EditOutlined,
@@ -9,15 +9,21 @@ import {
   CloseCircleOutlined,
   DeleteOutlined
 } from '@ant-design/icons'
-import { View } from  './View'
+
 import LoaderPortal from '../../components/LoaderPortal'
 import { MeasureService } from '../../services/api'
-import '../../styles/index.css'
-import '../../styles/measure.css'
 import { invokeWebApiWrapperAsync } from '../../components/factory'
 
-const dateFormat = 'YYYY.MM.DD HH:mm'
-export const formatDate = (date) => date ? moment.utc(date).local().format(dateFormat) : 'Нет данных'
+import { View } from './View'
+
+import '../../styles/index.css'
+import '../../styles/measure.css'
+
+export const formatDate = (date) => date ?
+  moment.utc(date).local().format('YYYY.MM.DD HH:mm') : 'Нет данных'
+
+const createEditingColumns = (cols, renderDelegate) =>
+  cols.map(col => ({ render: renderDelegate, ...col }))
 
 export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButtons}) => {
   const [showLoader, setShowLoader] = useState(false)
@@ -29,11 +35,10 @@ export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButto
 
   const [measuresForm] = Form.useForm()
 
-  const createEditingColumns = (cols, renderDelegate) =>
-    cols.map(col => ({ render: renderDelegate, ...col }))
-
   useEffect(() => {
-    const data = [group.defaultValue].concat(group.values ?? [])
+    let data = [group.defaultValue]
+    if (group?.values?.length > 0)
+      data = group.values
     setData(data)
     setDisplayedValues(data.at(-1))
   }, [group.defaultValue, group.values])
@@ -136,11 +141,11 @@ export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButto
                   key={index}
                   className={'measure-button'}
                   onClick={() => setDisplayedValues(item)}
-                  dot={item?.id !== displayedValues?.id ? null :
+                  dot={item?.id === displayedValues?.id &&
                     <CheckSquareOutlined className={'timeline-clock-icon'} />
                   }
                 >
-                  <span className={item?.id === displayedValues?.id ? 'selected-timeline' : ''}>
+                  <span className={item?.id === displayedValues?.id && 'selected-timeline'}>
                     {formatDate(item.timestamp)}
                   </span>
                 </Timeline.Item>
diff --git a/src/pages/Measure/View.jsx b/src/pages/Measure/View.jsx
index a42cbbe..04d204b 100644
--- a/src/pages/Measure/View.jsx
+++ b/src/pages/Measure/View.jsx
@@ -1,61 +1,50 @@
-import React from 'react'
+import { memo, Fragment } from 'react'
 import { Empty, Form } from 'antd'
+
 import { Grid, GridItem } from '../../components/Grid'
+
 import '../../styles/index.css'
+import '../../styles/measure.css'
 
 const colsCount = 3
 
-const headerCellStyle = {
-  border:'1px solid lightgrey'
-}
+export const View = memo(({ columns, item }) => !item || !columns?.length ? (
+  <Empty key={'empty'} image={Empty.PRESENTED_IMAGE_SIMPLE} />
+) : (
+  <Grid>
+    {columns.map((column, i) => (
+      <Fragment key={i}>
+        <GridItem
+          key={column.dataIndex}
+          row={Math.floor(i / colsCount) + 1}
+          col={(i % colsCount) * 2 + 1}
+          className={'measure-column-header'}
+        >
+          {column.title}
+        </GridItem>
 
-const valueCellStyle = {
-  border:'1px solid lightgrey',
-  justifyContent:'right',
-  marginRight:'16px',
-  fontWeight:'bold',
-  textAlign:'right',
-  padding: 0
-}
-
-export const View = React.memo(({columns, item}) => {
-  if (!item || !columns?.length)
-    return <Empty key='empty' image={Empty.PRESENTED_IMAGE_SIMPLE}/>
-
-  return (
-    <Grid>
-      {columns.map((column, i) => (
-        <>
-          <GridItem
-            key={column.dataIndex}
-            row={Math.floor(i / colsCount) + 1}
-            col={(i % colsCount) * 2 + 1}
-            style={headerCellStyle}
-          >
-            {column.title}
-          </GridItem>
-
-          <GridItem
-            key={column.title}
-            row={Math.floor(i / colsCount) + 1}
-            col={(i % colsCount) * 2 + 2}
-            style={valueCellStyle}
-          >
-            {column.render ? (
-              <Form.Item
-                key={column.dataIndex}
-                name={column.dataIndex}
-                style={{ margin: 0 }}
-                //rules={column.formItemRules}
-              >
-                {column.render(item[column.dataIndex])}
-              </Form.Item>
-            ) : (
-              <p key={column.title} className='m-5px'>{item[column.dataIndex]}</p>
-            )}
-          </GridItem>
-        </>
-      ))}
-    </Grid>
-  )
-})
\ No newline at end of file
+        <GridItem
+          key={column.title}
+          row={Math.floor(i / colsCount) + 1}
+          col={(i % colsCount) * 2 + 2}
+          className={'measure-column-value'}
+          style={{ padding: 0 }}
+        >
+          {column.render ? (
+            <Form.Item
+              key={column.dataIndex}
+              name={column.dataIndex}
+              style={{ padding: 0 }}
+            >
+              {column.render(item[column.dataIndex])}
+            </Form.Item>
+          ) : (
+            <p key={column.title} className={'m-5px'}>
+              {item[column.dataIndex]}
+            </p>
+          )}
+        </GridItem>
+      </Fragment>
+    ))}
+  </Grid>
+))
diff --git a/src/pages/Measure/columnsCommon.js b/src/pages/Measure/columnsCommon.js
index 8e2a9fc..8db90bd 100644
--- a/src/pages/Measure/columnsCommon.js
+++ b/src/pages/Measure/columnsCommon.js
@@ -1,27 +1,12 @@
-import React from 'react'
 import { Input } from 'antd'
+
 import { RegExpIsFloat } from '../../components/Table'
 
-const { TextArea } = Input
+import '../../styles/measure.css'
 
 export const v = (text) => (
-  <div style={{
-    display: 'flex',
-    height: '180px',
-    justifyContent: 'center'
-  }}>
-    <span
-      style={{
-        whiteSpace: 'pre',
-        verticalAlign: 'center',
-        textAlign: 'center',
-
-        WebkitTransform: 'rotate(-90deg)',
-        MozTransform: 'rotate(-90deg)',
-        MsTransform: 'rotate(-90deg)',
-        OTransform: 'rotate(-90deg)',
-        transform: 'rotate(-90deg)',
-      }}>
+  <div className={'v-div'}>
+    <span className={'v-span'}>
       {text}
     </span>
   </div>
@@ -42,7 +27,7 @@ export const numericColumnOptions = {
 
 export const textColumnOptions = {
   editable: true,
-  input: <TextArea/>,
+  input: <Input.TextArea/>,
   width: '3rem',
   formItemRules: [{
     required: true,
diff --git a/src/pages/Measure/drillingFluidData.js b/src/pages/Measure/drillingFluidData.js
index 395d33c..f68b009 100644
--- a/src/pages/Measure/drillingFluidData.js
+++ b/src/pages/Measure/drillingFluidData.js
@@ -1,36 +1,37 @@
-import { makeColumn } from '../../components/Table';
+import { makeColumn } from '../../components/Table'
+
 import { numericColumnOptions, textColumnOptions } from './columnsCommon'
 
 export const columnsDrillingFluid = [
   makeColumn('Наименование', 'name', textColumnOptions),
-  makeColumn('Температура, °C', 'temperature',numericColumnOptions),
-  makeColumn('Плотность, г/см³', 'density',numericColumnOptions),
-  makeColumn('Усл. вязкость, сек', 'conditionalViscosity',numericColumnOptions),
-  makeColumn('R300', 'r300',numericColumnOptions),
-  makeColumn('R600', 'r600',numericColumnOptions),
-  makeColumn('R3/R6', 'r3r6',numericColumnOptions),
-  makeColumn('ДНС, дПа', 'dnsDpa',numericColumnOptions),
-  makeColumn('Пластич. вязкость, сПз', 'plasticViscocity',numericColumnOptions),
-  makeColumn('СНС, дПа', 'snsDpa',numericColumnOptions),
-  makeColumn('R3/R6 49С', 'r3r649С',numericColumnOptions),
-  makeColumn('ДНС 49С, дПа', 'dns49Cdpa',numericColumnOptions),
-  makeColumn('Пластич. вязкость 49С, сПз', 'plasticViscocity49c',numericColumnOptions),
-  makeColumn('СНС 49С, дПа', 'sns49Cdpa',numericColumnOptions),
-  makeColumn('МВТ, кг/м³', 'mbt',numericColumnOptions),
-  makeColumn('Песок, %', 'sand',numericColumnOptions),
-  makeColumn('Фильтрация, см³/30мин', 'filtering',numericColumnOptions),
-  makeColumn('Корка, мм', 'crust',numericColumnOptions),
-  makeColumn('KTK', 'ktk',numericColumnOptions),
-  makeColumn('pH', 'ph',numericColumnOptions),
-  makeColumn('Жесткость, мг/л', 'hardness',numericColumnOptions),
-  makeColumn('Хлориды, мг/л', 'chlorides',numericColumnOptions),
-  makeColumn('PF', 'pf',numericColumnOptions),
-  makeColumn('Mf', 'mf',numericColumnOptions),
-  makeColumn('Pm', 'pm',numericColumnOptions),
-  makeColumn('Твердая фаза раствора, %', 'fluidSolidPhase',numericColumnOptions),
-  makeColumn('Смазка, %', 'grease',numericColumnOptions),
-  makeColumn('Карбонат кальция, кг/м³', 'calciumCarbonate',numericColumnOptions),
-];
+  makeColumn('Температура, °C', 'temperature', numericColumnOptions),
+  makeColumn('Плотность, г/см³', 'density', numericColumnOptions),
+  makeColumn('Усл. вязкость, сек', 'conditionalViscosity', numericColumnOptions),
+  makeColumn('R300', 'r300', numericColumnOptions),
+  makeColumn('R600', 'r600', numericColumnOptions),
+  makeColumn('R3/R6', 'r3r6', numericColumnOptions),
+  makeColumn('ДНС, дПа', 'dnsDpa', numericColumnOptions),
+  makeColumn('Пластич. вязкость, сПз', 'plasticViscocity', numericColumnOptions),
+  makeColumn('СНС, дПа', 'snsDpa', numericColumnOptions),
+  makeColumn('R3/R6 49С', 'r3r649С', numericColumnOptions),
+  makeColumn('ДНС 49С, дПа', 'dns49Cdpa', numericColumnOptions),
+  makeColumn('Пластич. вязкость 49С, сПз', 'plasticViscocity49c', numericColumnOptions),
+  makeColumn('СНС 49С, дПа', 'sns49Cdpa', numericColumnOptions),
+  makeColumn('МВТ, кг/м³', 'mbt', numericColumnOptions),
+  makeColumn('Песок, %', 'sand', numericColumnOptions),
+  makeColumn('Фильтрация, см³/30мин', 'filtering', numericColumnOptions),
+  makeColumn('Корка, мм', 'crust', numericColumnOptions),
+  makeColumn('KTK', 'ktk', numericColumnOptions),
+  makeColumn('pH', 'ph', numericColumnOptions),
+  makeColumn('Жесткость, мг/л', 'hardness', numericColumnOptions),
+  makeColumn('Хлориды, мг/л', 'chlorides', numericColumnOptions),
+  makeColumn('PF', 'pf', numericColumnOptions),
+  makeColumn('Mf', 'mf', numericColumnOptions),
+  makeColumn('Pm', 'pm', numericColumnOptions),
+  makeColumn('Твердая фаза раствора, %', 'fluidSolidPhase', numericColumnOptions),
+  makeColumn('Смазка, %', 'grease', numericColumnOptions),
+  makeColumn('Карбонат кальция, кг/м³', 'calciumCarbonate', numericColumnOptions),
+]
 
 export const drillingFluidDefaultData = {
   idWell: 0,
@@ -38,33 +39,33 @@ export const drillingFluidDefaultData = {
   idCategory: 0,
   isDefaultData: true,
   data: {
-    'name': 0,
-    'temperature': 0,
-    'density': 0,
-    'conditionalViscosity': 0,
-    'r300': 0,
-    'r600': 0,
-    'r3r6': 0,
-    'dnsDpa': 0,
-    'plasticViscocity': 0,
-    'snsDpa': 0,
-    'r3r649С': 0,
-    'dns49Cdpa': 0,
-    'plasticViscocity49c': 0,
-    'sns49Cdpa': 0,
-    'mbt': 0,
-    'sand': 0,
-    'filtering': 0,
-    'crust': 0,
-    'ktk': 0,
-    'ph': 0,
-    'hardness': 0,
-    'chlorides': 0,
-    'pf': 0,
-    'mf': 0,
-    'pm': 0,
-    'fluidSolidPhase': 0,
-    'grease': 0,
-    'calciumCarbonate': 0
+    name: 0,
+    temperature: 0,
+    density: 0,
+    conditionalViscosity: 0,
+    r300: 0,
+    r600: 0,
+    r3r6: 0,
+    dnsDpa: 0,
+    plasticViscocity: 0,
+    snsDpa: 0,
+    r3r649С: 0,
+    dns49Cdpa: 0,
+    plasticViscocity49c: 0,
+    sns49Cdpa: 0,
+    mbt: 0,
+    sand: 0,
+    filtering: 0,
+    crust: 0,
+    ktk: 0,
+    ph: 0,
+    hardness: 0,
+    chlorides: 0,
+    pf: 0,
+    mf: 0,
+    pm: 0,
+    fluidSolidPhase: 0,
+    grease: 0,
+    calciumCarbonate: 0
   }
 }
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index abfb431..c66c414 100644
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -1,40 +1,49 @@
+import { Button } from 'antd'
 import { useState, useEffect } from 'react'
+import { TableOutlined } from '@ant-design/icons'
+
+import { MeasureService } from '../../services/api'
+import LoaderPortal from '../../components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '../../components/factory'
+
+import { MeasureTable } from './MeasureTable'
+import { InclinometryTable } from './InclinometryTable'
 import { columnsNnb, nnbDefaultData } from './nnbData'
 import { columnsMudDiagram, mudDiagramDefaultData } from './mudDiagramData'
 import { columnsDrillingFluid, drillingFluidDefaultData } from './drillingFluidData'
-import { invokeWebApiWrapperAsync } from '../../components/factory'
-import { MeasureService } from '../../services/api'
-import LoaderPortal from '../../components/LoaderPortal'
-import { MeasureTable } from './MeasureTable'
-import InclinometryTable from './InclinometryTable'
-import { Button } from 'antd'
-import { TableOutlined } from '@ant-design/icons'
 
 const defaultData = [
   {
     idCategory: 1,
     title: 'Замер бурового раствора',
     columns: columnsDrillingFluid,
-    values: [drillingFluidDefaultData],
     defaultValue: drillingFluidDefaultData,
   },
   {
     idCategory: 2,
     title: 'Шламограмма',
     columns: columnsMudDiagram,
-    values: [mudDiagramDefaultData],
     defaultValue: mudDiagramDefaultData,
   },
   {
     idCategory: 3,
     title: 'ННБ',
     columns: columnsNnb,
-    values: [nnbDefaultData],
     defaultValue: nnbDefaultData,
+    additionalButtons: (group, idx, onClick) => (isEditing) => isEditing ? null : (
+      <Button
+        key={'table'}
+        className={'flex-1'}
+        onClick={() => onClick(idx)}
+        disabled={!group.values || group.values.length <= 0}
+      >
+        <TableOutlined />
+      </Button>
+    )
   }
 ]
 
-export default function Measure({idWell}){
+export const Measure = ({ idWell }) => {
   const [showLoader, setShowLoader] = useState(false)
   const [isMeasuresUpdating, setIsMeasuresUpdating] = useState(false)
   const [data, setData] = useState(defaultData)
@@ -59,26 +68,9 @@ export default function Measure({idWell}){
     `Не удалось загрузить последние данные по скважине ${idWell}`
   )
 
-  useEffect(() => {
-    setData(prevData => {
-      prevData[2].additionalButtons = (group, idx) => (isEditing) => isEditing ? null : (
-        <Button
-          key={'table'}
-          className={'flex-1'}
-          onClick={() => setTableIdx(idx)}
-          disabled={!group.values || group.values.length <= 0}
-        >
-          <TableOutlined />
-        </Button>
-      )
-
-      return prevData
-    })
-  }, [])
-
   useEffect(updateCurrentValues, [idWell, isMeasuresUpdating])
 
-  return <>
+  return (
     <LoaderPortal show={showLoader}>
       {data.map((group, idx) => (
         <MeasureTable
@@ -86,7 +78,7 @@ export default function Measure({idWell}){
           idWell={idWell}
           group={group}
           updateMeasuresFunc={() => setIsMeasuresUpdating(true)}
-          additionalButtons={group.additionalButtons?.(group, idx)}
+          additionalButtons={group.additionalButtons?.(group, idx, setTableIdx)}
         />
       ))}
       <InclinometryTable
@@ -95,5 +87,7 @@ export default function Measure({idWell}){
         group={data[tableIdx]}
       />
     </LoaderPortal>
-  </>
+  )
 }
+
+export default Measure
diff --git a/src/pages/Measure/mudDiagramData.js b/src/pages/Measure/mudDiagramData.js
index a0ec0c9..c3fa93d 100644
--- a/src/pages/Measure/mudDiagramData.js
+++ b/src/pages/Measure/mudDiagramData.js
@@ -32,27 +32,27 @@ export const mudDiagramDefaultData = {
   idCategory: 0,
   isDefaultData: true,
   data: {
-    'probeNumber': 0,
-    'probeExtractionDepth': 0,
-    'sandstone': 0,
-    'siltstone': 0,
-    'argillit': 0,
-    'brokenArgillit': 0,
-    'coal': 0,
-    'sand': 0,
-    'clay': 0,
-    'camstone': 0,
-    'cement': 0,
-    'summary': '-',
-    'drillingMud': 0,
-    'sludge': 0,
-    'maxSum': 0,
-    'methane': 0,
-    'ethane': 0,
-    'propane': 0,
-    'butane': 0,
-    'pentane': 0,
-    'mechanicalSpeed': 0,
-    'preliminaryConclusion': '-'
+    probeNumber: 0,
+    probeExtractionDepth: 0,
+    sandstone: 0,
+    siltstone: 0,
+    argillit: 0,
+    brokenArgillit: 0,
+    coal: 0,
+    sand: 0,
+    clay: 0,
+    camstone: 0,
+    cement: 0,
+    summary: '-',
+    drillingMud: 0,
+    sludge: 0,
+    maxSum: 0,
+    methane: 0,
+    ethane: 0,
+    propane: 0,
+    butane: 0,
+    pentane: 0,
+    mechanicalSpeed: 0,
+    preliminaryConclusion: '-'
   }
 }
diff --git a/src/pages/Measure/nnbData.js b/src/pages/Measure/nnbData.js
index 663816d..69ff79b 100644
--- a/src/pages/Measure/nnbData.js
+++ b/src/pages/Measure/nnbData.js
@@ -19,7 +19,7 @@ export const columnsNnb = [
   makeColumn('Комментарий', 'comment', numericColumnOptions),
   makeColumn('Разница вертикальных глубин\nмежду планом и фактом', 'depthPlanFactDifference', numericColumnOptions),
   makeColumn('Расстояние в пространстве\nмежду планом и фактом', 'distancePlanFactDifference', numericColumnOptions),
-];
+]
 
 export const nnbDefaultData = {
   idWell: 0,
@@ -27,22 +27,22 @@ export const nnbDefaultData = {
   idCategory: 0,
   isDefaultData: true,
   data: {
-    'depth': 0,
-    'zenithAngle': 0,
-    'magneticAzimuth': 0,
-    'trueAzimuth': 0,
-    'directAzimuth': 0,
-    'verticalDepth': 0,
-    'absoluteMark': 0,
-    'localNorthOffset': 0,
-    'localEastOffset': 0,
-    'outFallOffset': 0,
-    'offsetAzimuth': 0,
-    'areaIntensity': '-',
-    'offsetStopAngle': 0,
-    'zenithIntensity': 0,
-    'comment': '-',
-    'depthPlanFactDifference': 0,
-    'distancePlanFactDifference': 0
+    depth: 0,
+    zenithAngle: 0,
+    magneticAzimuth: 0,
+    trueAzimuth: 0,
+    directAzimuth: 0,
+    verticalDepth: 0,
+    absoluteMark: 0,
+    localNorthOffset: 0,
+    localEastOffset: 0,
+    outFallOffset: 0,
+    offsetAzimuth: 0,
+    areaIntensity: '-',
+    offsetStopAngle: 0,
+    zenithIntensity: 0,
+    comment: '-',
+    depthPlanFactDifference: 0,
+    distancePlanFactDifference: 0
   }
 }
diff --git a/src/styles/measure.css b/src/styles/measure.css
index 1425fdc..24a4831 100644
--- a/src/styles/measure.css
+++ b/src/styles/measure.css
@@ -34,3 +34,34 @@ input.measure-input {
 .ml-10px {
     margin-left: 10px;
 }
+
+.v-div {
+    display: flex;
+    height: 180px;
+    justify-content: center;
+}
+
+.v-span {
+    white-space: pre;
+    vertical-align: center;
+    text-align: center;
+
+    -webkit-transform: rotate(-90deg);
+    -moz-transform: rotate(-90deg);
+    -ms-transform: rotate(-90deg);
+    -o-transform: rotate(-90deg);
+    transform: rotate(-90deg);
+}
+
+.measure-column-header {
+    border: 1px solid lightgrey;
+}
+
+.measure-column-value {
+    border: 1px solid lightgrey;
+    justify-content: right;
+    margin-right: 16px;
+    font-weight: bold;
+    text-align: right;
+    padding: 0;
+}

From c327240ea270f7b01285ad8f90cf1bab32869179 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 27 Dec 2021 15:18:20 +0500
Subject: [PATCH 3/4] =?UTF-8?q?=D0=9D=D0=B0=20=D0=B2=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D1=83=20=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B8,=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D1=8B=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B=20=D0=B8=D0=B7=D0=BC=D0=B5=D1=80=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=80=D0=B5?=
 =?UTF-8?q?=D1=84=D1=80=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/DatePickerWrapper.tsx    |   4 +-
 src/components/Table/EditableTable.jsx        |  16 +-
 src/components/Table/index.tsx                |   3 +-
 src/components/WellTreeSelector.tsx           |   2 +-
 src/components/factory.ts                     | 108 ++++----
 src/pages/Cluster/ClusterWells.jsx            |   8 +-
 src/pages/Measure/InclinometryTable.jsx       |   4 +-
 src/pages/Measure/MeasureTable.jsx            |  13 +-
 src/pages/Measure/View.jsx                    |   2 +-
 src/pages/Measure/index.jsx                   |  15 +-
 src/pages/Report/Reports.jsx                  | 108 ++++----
 src/pages/Report/index.jsx                    | 238 ++++++++----------
 src/pages/TelemetryView/SetpointViewer.jsx    |  25 +-
 .../WellCompositeSections.jsx                 |  14 +-
 src/pages/WellOperations/WellDrillParams.jsx  |  58 ++---
 .../WellOperations/WellOperationsEditor.jsx   | 181 +++++++------
 src/pages/WellOperations/WellSectionsStat.jsx |  24 +-
 src/utils/DateTimeUtils.ts                    |   5 -
 src/utils/datetime.ts                         |  48 +++-
 src/utils/index.ts                            |   4 +-
 20 files changed, 413 insertions(+), 467 deletions(-)
 delete mode 100644 src/utils/DateTimeUtils.ts

diff --git a/src/components/Table/DatePickerWrapper.tsx b/src/components/Table/DatePickerWrapper.tsx
index f042a4a..b1735b8 100644
--- a/src/components/Table/DatePickerWrapper.tsx
+++ b/src/components/Table/DatePickerWrapper.tsx
@@ -1,6 +1,6 @@
 import { DatePicker } from 'antd'
 import moment from 'moment'
-import { formatDate } from './index'
+import { defaultFormat } from '../../utils'
 
 export type DatePickerWrapperProps = {
     value: moment.Moment,
@@ -13,7 +13,7 @@ export const DatePickerWrapper: React.FC<DatePickerWrapperProps> = ({value, onCh
     allowClear={false}
     defaultValue={moment()}
     value={moment.utc(value).local()}
-    format={formatDate}
+    format={defaultFormat}
     showTime
     onChange={(date) => onChange(date)}
     {...other}
diff --git a/src/components/Table/EditableTable.jsx b/src/components/Table/EditableTable.jsx
index 1d1a2eb..af84287 100644
--- a/src/components/Table/EditableTable.jsx
+++ b/src/components/Table/EditableTable.jsx
@@ -6,17 +6,25 @@ import { invokeWebApiWrapperAsync } from '../factory'
 
 const newRowKeyValue = 'newRow'
 
-export const makeActionHandler = (action, { service, setLoader, errorMsg, onComplete }) => service && action && (
+export const makeActionHandler = (action, { idWell, service, setLoader, errorMsg, onComplete }, recordParser) => service && action && (
   (record) => invokeWebApiWrapperAsync(
     async () => {
+      const addIdWell = (...params) => idWell ? [idWell, ...params] : params
+      if (typeof recordParser === 'function')
+        record = recordParser(record)
+
       if (action === 'insert') {
         record.key = Date.now()
-        await service.insert(record)
+        await service.insert(...addIdWell(record))
+      } else if (action === 'insertRange') {
+        if (!Array.isArray(record))
+          record = [record]
+        await service.insertRange(...addIdWell(record))
       } else if (record.id) {
         if (action === 'update')
-          await service.put(record.id, record)
+          await service.put(...addIdWell(record.id, record))
         else if (action === 'delete')
-          await service.delete(record.id)
+          await service.delete(...addIdWell(record.id))
       }
       onComplete?.()
     },
diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index 8f6b439..57b57e1 100644
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -10,7 +10,6 @@ export { DatePickerWrapper } from './DatePickerWrapper'
 export { SelectFromDictionary } from './SelectFromDictionary'
 
 export const RegExpIsFloat = /^[-+]?\d+\.?\d*$/
-export const formatDate = 'YYYY.MM.DD HH:mm'
 
 export const makeNumericRender = (fixed?: number) => (value: any, row: object): ReactNode => {
   let val = '-'
@@ -209,7 +208,7 @@ export const makeSelectColumn = <T extends unknown = string>(
   other?: columnPropsOther
 ) => makeColumn(title, dataIndex, {
   input: <Select options={options}/>,
-  render: (value) => options.find(option => option?.value === value)?.label ?? defaultValue ?? '--',
+  render: (value) => options?.find(option => option?.value === value)?.label ?? defaultValue ?? value ?? '--',
   ...other
 })
 
diff --git a/src/components/WellTreeSelector.tsx b/src/components/WellTreeSelector.tsx
index 00011e5..4be2b27 100644
--- a/src/components/WellTreeSelector.tsx
+++ b/src/components/WellTreeSelector.tsx
@@ -9,7 +9,7 @@ import { WellIcon, WellIconState } from './icons/WellIcon'
 import { ReactComponent as DepositIcon } from '../images/DepositIcon.svg'
 import { ReactComponent as ClusterIcon } from '../images/ClusterIcon.svg'
 import { DepositDto } from '../services/api'
-import { RawDate } from '../utils/DateTimeUtils'
+import { RawDate } from '../utils/'
 
 export const getWellState = (idState?: number): WellIconState => idState === 1 ? 'active' : 'unknown'
 export const checkIsWellOnline = (lastTelemetryDate?: RawDate): boolean => {
diff --git a/src/components/factory.ts b/src/components/factory.ts
index ab16629..46aacbc 100644
--- a/src/components/factory.ts
+++ b/src/components/factory.ts
@@ -1,12 +1,12 @@
-import { Dispatch, SetStateAction } from "react"
-import { notification } from 'antd';
+import { notification } from 'antd'
+import { Dispatch, SetStateAction } from 'react'
 import { FileInfoDto } from '../services/api'
 
 const notificationTypeDictionary = new Map([
-  ['error', {notifyInstance: notification.error, caption: 'Ошибка'}],
-  ['warning', {notifyInstance: notification.warning, caption: 'Предупреждение'}],
-  ['info', {notifyInstance: notification.info, caption: 'Инфо'}],
-  ['open', {notifyInstance: notification.info, caption: ''}],
+  ['error'  , { notifyInstance: notification.error  , caption: 'Ошибка' }],
+  ['warning', { notifyInstance: notification.warning, caption: 'Предупреждение' }],
+  ['info'   , { notifyInstance: notification.info   , caption: 'Инфо' }],
+  ['open'   , { notifyInstance: notification.info   , caption: '' }],
 ])
 
 /**
@@ -14,30 +14,29 @@ const notificationTypeDictionary = new Map([
  * @param body string или ReactNode
  * @param notifyType для параметра типа. Допустимые значение 'error', 'warning', 'info'
  */
-export const notify = (body: string|any, notifyType:string ='info', other?: any) => {
-  if(!body) 
-    return
-  const instance = notificationTypeDictionary.get(notifyType) ?? 
+export const notify = (body: string | any, notifyType: string = 'info', other?: any) => {
+  if (!body) return
+
+  const instance = notificationTypeDictionary.get(notifyType) ??
     notificationTypeDictionary.get('open')
 
   instance?.notifyInstance({
     description: body,
     message: instance.caption,
-    placement: "bottomRight",
+    placement: 'bottomRight',
     duration: 10,
     ...other
   })
 }
 
-type asyncFunction = (...args:any) => Promise<any|void>;
+type asyncFunction = (...args: any) => Promise<any|void>
 
 export const invokeWebApiWrapperAsync = async (
   funcAsync: asyncFunction,
-  setShowLoader: Dispatch<SetStateAction<boolean>>,
-  errorNotifyText: (string | ((ex: unknown) => string))
+  setShowLoader?: Dispatch<SetStateAction<boolean>>,
+  errorNotifyText?: (string | ((ex: unknown) => string))
 ) => {
-  if(setShowLoader)
-    setShowLoader(true)
+  setShowLoader?.(true)
   try{
     await funcAsync()
   } catch (ex) {
@@ -48,49 +47,43 @@ export const invokeWebApiWrapperAsync = async (
         notify(errorNotifyText(ex), 'error')
       else notify(errorNotifyText, 'error')
     }
-  } finally{
-    if(setShowLoader)
-      setShowLoader(false)
+  } finally {
+    setShowLoader?.(false)
   }
 }
 
-export const download = async (url:string, fileName?:string) => {
+export const download = async (url: string, fileName?: string) => {
   const response = await fetch(url, {
     headers: {
-      Authorization: 'Bearer ' + localStorage['token']
+      Authorization: `Bearer ${localStorage['token']}`
     },
     method: 'Get'
   })
   if(response.status !== 200)
     throw response
-  const requestFileName = decodeURI(fileName
-    ??response.headers
-      .get('content-disposition')
-      ?.split(';')
-      .splice(-1)[0]
-      .split("'")
-      .splice(-1)[0]
-      ?? url.replace('\\','/')
-      .split('/')
-      .splice(-1)[0]
-      ?? 'file')
+  const requestFileName = decodeURI(
+    fileName
+    ?? response.headers.get('content-disposition')?.split(';').pop()?.split(`'`).pop()
+    ?? url.replace('\\','/').split('/').pop()
+    ?? 'file'
+  )
   const blob = await response.blob()
-  const reader = new FileReader();
-  reader.readAsDataURL(blob);
-  reader.onload = function (e) {
-    let a = document.createElement('a');
-    a.href = (e.target?.result?.toString() ?? '');
-    a.download = requestFileName;
-    document.body.appendChild(a); // we need to append the element to the dom -> otherwise it will not work in firefox
-    a.click();    
-    a.remove();
-  };
+  const reader = new FileReader()
+  reader.readAsDataURL(blob)
+  reader.onload = (e) => {
+    const a = document.createElement('a')
+    a.href = (e.target?.result?.toString() ?? '')
+    a.download = requestFileName
+    document.body.appendChild(a) // we need to append the element to the dom -> otherwise it will not work in firefox
+    a.click()
+    a.remove()
+  }
 }
 
-export const upload = async (url:string, formData: FormData) => {
-  let response = await fetch(url, {
+export const upload = async (url: string, formData: FormData) => {
+  const response = await fetch(url, {
     headers: {
-      Authorization: 'Bearer ' + localStorage['token']
+      Authorization: `Bearer ${localStorage['token']}`
     },
     method: 'Post',
     body: formData,
@@ -107,28 +100,11 @@ export const downloadFile = async (fileInfo: FileInfoDto) => {
   }
 }
 
-export const formatBytes = (bytes:number) => {  
+export const formatBytes = (bytes: number) => {
   if(bytes < 1024)
     return `${bytes.toFixed(0)}b`
-  if(bytes < 1024*1024)
-    return `${(bytes/1024).toFixed(2)}kb`
+  if(bytes < 1024 * 1024)
+    return `${(bytes / 1024).toFixed(2)}kb`
   else
-    return `${(bytes/1024/1024).toFixed(2)}Mb`
+    return `${(bytes / 1024 / 1024).toFixed(2)}Mb`
 }
-
-export const formatTimespan = (seconds:number) => {
-  const days = Math.floor(seconds / 86400)
-  seconds = seconds % 86400
-  const hours = Math.floor(seconds / 3600)
-  seconds = seconds % 3600
-  const minutes = Math.floor(seconds / 60)
-  seconds = seconds % 60
-  let formatedTimespan = ''
-  if(days > 0)
-    formatedTimespan += days + ' '
-
-  formatedTimespan += hours.toString().padStart(2,'0') + ':' + 
-    minutes.toString().padStart(2,'0') + ':' + 
-    seconds.toString().padStart(2,'0')
-  return formatedTimespan
-}
\ No newline at end of file
diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index 520c54f..87e868d 100644
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -119,11 +119,11 @@ export default function ClusterWells({statsWells}) {
     makeTextColumn('Тип скв.', 'wellType', filtersWellsType, null, (text) => text ?? '-'),
     makeGroupColumn('Фактические сроки', [
       makeColumn('начало', 'factStart', { sorter: makeDateSorter('factStart'), render: getDate }),
-      makeColumn('окончание', 'factEnd', { sorter: makeDateSorter('factEnd'), render: getDate })
+      makeColumn('окончание', 'factEnd', { sorter: makeDateSorter('factEnd'), render: getDate }),
     ]),
-    makeNumericColumnPlanFact('Продолжительность', 'period', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('МСП', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Рейсовая скорость', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('НПВ, сут', 'notProductiveTime', filtersMinMax, makeFilterMinMaxFunction),
     {
       title: 'TVD',
diff --git a/src/pages/Measure/InclinometryTable.jsx b/src/pages/Measure/InclinometryTable.jsx
index ed55e38..5a692fb 100644
--- a/src/pages/Measure/InclinometryTable.jsx
+++ b/src/pages/Measure/InclinometryTable.jsx
@@ -2,8 +2,8 @@ import { Modal } from 'antd'
 import { memo, useEffect, useState } from 'react'
 
 import { Table } from '../../components/Table'
+import { formatDate } from '../../utils'
 
-import { formatDate } from './MeasureTable'
 import { v } from './columnsCommon'
 
 const tableScroll = { y: 400, x: 1300 }
@@ -12,7 +12,7 @@ const dateColumn = {
     title: 'Дата',
     key: 'date',
     dataIndex: 'date',
-    render: formatDate,
+    render: (date) => formatDate(date, true) ?? 'Нет данных',
     fixed: 'left',
     width: '8rem',
 }
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 71025c6..191afc8 100644
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -1,4 +1,3 @@
-import moment from 'moment'
 import { useState, useEffect } from 'react'
 import { Button, Form, Input, Popconfirm, Timeline } from 'antd'
 import {
@@ -18,9 +17,7 @@ import { View } from './View'
 
 import '../../styles/index.css'
 import '../../styles/measure.css'
-
-export const formatDate = (date) => date ?
-  moment.utc(date).local().format('YYYY.MM.DD HH:mm') : 'Нет данных'
+import { formatDate } from '../../utils'
 
 const createEditingColumns = (cols, renderDelegate) =>
   cols.map(col => ({ render: renderDelegate, ...col }))
@@ -123,8 +120,8 @@ export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButto
                   <Button key={'edit'} className={'flex-1'} onClick={() => editTable('edit')} disabled={isDataDefault()}>
                     <EditOutlined />
                   </Button>
-                  <Popconfirm style={{flex: '1'}} title={'Удалить данные?'} onConfirm={markMeasuresAsDeleted} disabled={isDataDefault()}>
-                    <Button key={'delete'} onClick={() => setEditingActionName('delete')} disabled={isDataDefault()} >
+                  <Popconfirm style={{ flex: '1' }} title={'Удалить данные?'} onConfirm={markMeasuresAsDeleted} disabled={isDataDefault()}>
+                    <Button key={'delete'} onClick={() => setEditingActionName('delete')} disabled={isDataDefault()}>
                       <DeleteOutlined style={{ margin:'auto 28px' }}/>
                     </Button>
                   </Popconfirm>
@@ -145,8 +142,8 @@ export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButto
                     <CheckSquareOutlined className={'timeline-clock-icon'} />
                   }
                 >
-                  <span className={item?.id === displayedValues?.id && 'selected-timeline'}>
-                    {formatDate(item.timestamp)}
+                  <span className={item?.id === displayedValues?.id ? 'selected-timeline' : undefined}>
+                    {formatDate(item.timestamp, true) ?? 'Нет данных'}
                   </span>
                 </Timeline.Item>
               )}
diff --git a/src/pages/Measure/View.jsx b/src/pages/Measure/View.jsx
index 04d204b..1b68b57 100644
--- a/src/pages/Measure/View.jsx
+++ b/src/pages/Measure/View.jsx
@@ -34,7 +34,7 @@ export const View = memo(({ columns, item }) => !item || !columns?.length ? (
             <Form.Item
               key={column.dataIndex}
               name={column.dataIndex}
-              style={{ padding: 0 }}
+              style={{ margin: 0 }}
             >
               {column.render(item[column.dataIndex])}
             </Form.Item>
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index c66c414..a816065 100644
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -18,14 +18,12 @@ const defaultData = [
     title: 'Замер бурового раствора',
     columns: columnsDrillingFluid,
     defaultValue: drillingFluidDefaultData,
-  },
-  {
+  }, {
     idCategory: 2,
     title: 'Шламограмма',
     columns: columnsMudDiagram,
     defaultValue: mudDiagramDefaultData,
-  },
-  {
+  }, {
     idCategory: 3,
     title: 'ННБ',
     columns: columnsNnb,
@@ -45,12 +43,13 @@ const defaultData = [
 
 export const Measure = ({ idWell }) => {
   const [showLoader, setShowLoader] = useState(false)
-  const [isMeasuresUpdating, setIsMeasuresUpdating] = useState(false)
+  const [isMeasuresUpdating, setIsMeasuresUpdating] = useState(true)
   const [data, setData] = useState(defaultData)
   const [tableIdx, setTableIdx] = useState(-1)
 
-  const updateCurrentValues = () => invokeWebApiWrapperAsync(
+  useEffect(() => invokeWebApiWrapperAsync(
     async () => {
+      if (!isMeasuresUpdating) return
       const measures = await MeasureService.getHisory(idWell)
       setIsMeasuresUpdating(false)
 
@@ -66,9 +65,7 @@ export const Measure = ({ idWell }) => {
     },
     setShowLoader,
     `Не удалось загрузить последние данные по скважине ${idWell}`
-  )
-
-  useEffect(updateCurrentValues, [idWell, isMeasuresUpdating])
+  ), [idWell, isMeasuresUpdating])
 
   return (
     <LoaderPortal show={showLoader}>
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Report/Reports.jsx
index 322171e..71218b0 100644
--- a/src/pages/Report/Reports.jsx
+++ b/src/pages/Report/Reports.jsx
@@ -1,81 +1,83 @@
-import { useState, useEffect } from "react"
-import { Table, formatDate, makeDateSorter, makeNumericSorter} from "../../components/Table"
-import { Button, Tooltip } from "antd"
-import { FilePdfOutlined, FileTextOutlined} from '@ant-design/icons'
-import { ReportService } from "../../services/api"
-import { invokeWebApiWrapperAsync, downloadFile, formatTimespan} from "../../components/factory"
-import LoaderPortal from "../../components/LoaderPortal"
-import moment from "moment"
+import { Button, Tooltip } from 'antd'
+import { useState, useEffect } from 'react'
+import { FilePdfOutlined, FileTextOutlined } from '@ant-design/icons'
+
+import { formatDate, periodToString } from '../../utils'
+import { ReportService } from '../../services/api'
+import LoaderPortal from '../../components/LoaderPortal'
+import { Table, makeDateSorter, makeNumericSorter } from '../../components/Table'
+import { invokeWebApiWrapperAsync, downloadFile, formatTimespan } from '../../components/factory'
 
 const imgPaths = {
-  ".pdf": <FilePdfOutlined/>,
-  ".las": <FileTextOutlined />,
+  '.pdf': <FilePdfOutlined/>,
+  '.las': <FileTextOutlined/>,
 }
 
-const columns = [  
+const columns = [
   {
-    title: "Название",
-    dataIndex: "name",
-    key: "name",
+    title: 'Название',
+    dataIndex: 'name',
+    key: 'name',
     render: (name, report) => (
       <Button
-        type="link"
+        type={'link'}
         icon={imgPaths[report.format]}
-        onClick={(_) => downloadFile(report.file)}
+        onClick={() => downloadFile(report.file)}
         download={name}
       >
         {name}
       </Button>
     ),
-  },
-  {
-    title: <Tooltip title="Дата формирования">Сформирован</Tooltip>,
-    dataIndex: "date",
-    key: "date",
+  }, {
+    title: <Tooltip title={'Дата формирования'}>Сформирован</Tooltip>,
+    dataIndex: 'date',
+    key: 'date',
     sorter: makeDateSorter('date'),
-    render: date=>moment(date).format(formatDate),
-  },  
-  {
-    title: <Tooltip title="Дата начала периода рапорта">С</Tooltip>,
-    dataIndex: "begin",
-    key: "begin",
+    render: (date) => formatDate(date),
+  }, {
+    title: <Tooltip title={'Дата начала периода рапорта'}>С</Tooltip>,
+    dataIndex: 'begin',
+    key: 'begin',
     sorter: makeDateSorter('begin'),
-    render: date=>moment(date).format(formatDate),
-  }, 
-  {
-    title: <Tooltip title="Дата окончания периода рапорта">По</Tooltip>,
-    dataIndex: "end",
-    key: "end",    
+    render: (date) => formatDate(date),
+  }, {
+    title: <Tooltip title={'Дата окончания периода рапорта'}>По</Tooltip>,
+    dataIndex: 'end',
+    key: 'end',
     sorter: makeDateSorter('end'),
-    render: date=>moment(date).format(formatDate),
-  }, 
-  {
-    title: <Tooltip title="шаг сетки графиков">шаг, сек</Tooltip>,
-    dataIndex: "step",
-    key: "step",
-    
+    render: (date) => formatDate(date),
+  }, {
+    title: <Tooltip title={'шаг сетки графиков'}>шаг, сек</Tooltip>,
+    dataIndex: 'step',
+    key: 'step',
     sorter: makeNumericSorter('step'),
-    
-    render: step => formatTimespan(step)
+    render: step => periodToString(step),
   },
 ]
 
-export const Reports = ({idWell}) => {
+export const Reports = ({ idWell }) => {
   const [reports, setReports] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
-  useEffect(()=>invokeWebApiWrapperAsync(async()=>{
-    const reportsResponse = await ReportService.getAllReportsNamesByWell(idWell)
-    const reports = reportsResponse.map(r => ({...r, key: r.id?? r.name?? r.date}))
-    setReports(reports)
-  },setShowLoader), [idWell])
+  useEffect(() => invokeWebApiWrapperAsync(
+    async () => {
+      const reportsResponse = await ReportService.getAllReportsNamesByWell(idWell)
+      const reports = reportsResponse.map(r => ({ ...r, key: r.id ?? r.name ?? r.date }))
+      setReports(reports)
+    },
+    setShowLoader,
+    `Не удалось загрузить список рапортов по скважине "${idWell}"`
+  ), [idWell])
 
   return (
     <LoaderPortal show={showLoader}>
-      <Table 
-        size='small' bordered
+      <Table
+        size={'small'}
+        bordered
         columns={columns}
         dataSource={reports}
-        pagination={{pageSize:13}}/>
-    </LoaderPortal>)
-}
\ No newline at end of file
+        pagination={{ pageSize: 13 }}
+      />
+    </LoaderPortal>
+  )
+}
diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
index ba310b4..bd2fc6c 100644
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Report/index.jsx
@@ -1,63 +1,55 @@
-import { useState, useEffect } from "react"
-import { DatePicker, Radio, Button, Select, notification } from "antd"
-import "moment/locale/ru"
-import moment from "moment"
-import { Subscribe } from "../../services/signalr"
-import LoaderPortal from "../../components/LoaderPortal"
-import { ReportService } from "../../services/api"
-import { ReportCreationNotify } from "./ReportCreationNotify"
-import { invokeWebApiWrapperAsync, notify } from "../../components/factory"
-import { Reports } from "./Reports"
+import 'moment/locale/ru'
+import moment from 'moment'
+import { useState, useEffect } from 'react'
+import { DatePicker, Radio, Button, Select, notification } from 'antd'
 
-const { RangePicker } = DatePicker
-const { Option } = Select
+import { ReportService } from '../../services/api'
+import { Subscribe } from '../../services/signalr'
+import LoaderPortal from '../../components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '../../components/factory'
+
+import { Reports } from './Reports'
+import { ReportCreationNotify } from './ReportCreationNotify'
 
 const timePeriodNames = [
-  { label: "1 секунда", value: 1 },
-  { label: "10 секунд", value: 10 },
-  { label: "1 минута", value: 60 },
-  { label: "5 минут", value: 300 },
-  { label: "30 минут", value: 1800 },
-  { label: "1 час", value: 3600 },
-  { label: "6 часов", value: 21600 },
-  { label: "12 часов", value: 43200 },
-  { label: "1 день", value: 86400 },
-  { label: "1 неделя", value: 604800 },
+  { label: '1 секунда', value: 1 },
+  { label: '10 секунд', value: 10 },
+  { label: '1 минута', value: 60 },
+  { label: '5 минут', value: 300 },
+  { label: '30 минут', value: 1800 },
+  { label: '1 час', value: 3600 },
+  { label: '6 часов', value: 21600 },
+  { label: '12 часов', value: 43200 },
+  { label: '1 день', value: 86400 },
+  { label: '1 неделя', value: 604800 },
 ]
 
-const dateTimeFormat = "DD.MM.YYYY hh:mm:ss"
+const dateTimeFormat = 'DD.MM.YYYY hh:mm:ss'
+
+const reportFormats = [
+  { value: 0, label: 'PDF' },
+  { value: 1, label: 'LAS' },
+]
 
 export default function Report({ idWell }) {
-  const [aviableDateRange, setAviableDateRange] = useState([
-    moment(),
-    moment(),
-  ])
+  const [aviableDateRange, setAviableDateRange] = useState([moment(), moment()])
   const [filterDateRange, setFilterDateRange] = useState([
-    moment().subtract(1, "days").startOf("day"),
-    moment().startOf("day"),
+    moment().subtract(1, 'days').startOf('day'),
+    moment().startOf('day'),
   ])
   const [step, setStep] = useState(timePeriodNames[2].value)
   const [format, setFormat] = useState(0)
   const [pagesCount, setPagesCount] = useState(0)
   const [showLoader, setShowLoader] = useState(false)
 
-  const periodOptions = timePeriodNames.map((item) => (
-    <Option key={item.value} value={item.value}>
-      {item.label}
-    </Option>
-  ))
-
-  const handleReportCreation = async () => {
-    let begin = filterDateRange[0].toISOString()
-    let end = filterDateRange[1].toISOString()
-
-    try {
+  const handleReportCreation = async () => await invokeWebApiWrapperAsync(
+    async () => {
       const taskId = await ReportService.createReport(
         idWell,
         step,
         format,
-        begin,
-        end
+        filterDateRange[0].toISOString(),
+        filterDateRange[1].toISOString()
       )
       if (!taskId) return
 
@@ -65,12 +57,8 @@ export default function Report({ idWell }) {
         if (progressData) {
           notification.open({
             key: taskId,
-            message: "Создание отчета:",
-            description: (
-              <ReportCreationNotify
-                progressData={progressData}
-              ></ReportCreationNotify>
-            ),
+            message: 'Создание отчета:',
+            description: <ReportCreationNotify progressData={progressData} />,
             duration: 0,
             onClose: unSubscribeReportHub,
           })
@@ -81,82 +69,68 @@ export default function Report({ idWell }) {
       }
 
       const unSubscribeReportHub = Subscribe(
-        "hubs/reports",
-        "GetReportProgress",
+        'hubs/reports',
+        'GetReportProgress',
         `Report_${taskId}`,
         handleReportProgress
       )
-    } catch (error) {
-      notify(
-        `Не удалось создать отчет по скважине (${idWell}) c 
-      ${filterDateRange[0].format("DD.MM.YYYY hh:mm:ss")} по 
-      ${filterDateRange[1].format("DD.MM.YYYY hh:mm:ss")}`,
-        "error"
+    },
+    setShowLoader,
+    `Не удалось создать отчет по скважине (${idWell}) c
+    ${filterDateRange[0].format(dateTimeFormat)} по
+    ${filterDateRange[1].format(dateTimeFormat)}`
+  )
+
+  const disabledDate = (current) => !current.isBetween(aviableDateRange[0], aviableDateRange[1], 'seconds', '[]')
+
+  useEffect(() => invokeWebApiWrapperAsync(
+    async () => {
+      const datesRangeResponse = await ReportService.getReportsDateRange(idWell)
+      if (!datesRangeResponse?.from || !datesRangeResponse.to)
+        throw new Error('Формат ответа неверный!')
+
+      const datesRange = [
+        moment(datesRangeResponse.from),
+        moment(datesRangeResponse.to),
+      ]
+      setAviableDateRange(datesRange)
+
+      const from = moment.max(moment(datesRange[1]).subtract(1, 'days'), datesRange[0])
+
+      setFilterDateRange([
+        from.startOf('day'),
+        moment(datesRange[1]).startOf('day'),
+      ])
+    },
+    setShowLoader,
+    `Не удалось получить диапозон дат рапортов для скважины "${idWell}"`
+  ), [idWell])
+
+  useEffect(() => invokeWebApiWrapperAsync(
+    async () => {
+      if (filterDateRange?.length !== 2) return
+      const pagesCount = await ReportService.getReportSize(
+        idWell,
+        step,
+        format,
+        filterDateRange[0].toISOString(),
+        filterDateRange[1].toISOString()
       )
-      console.log(error)
-    }
-  }
-
-  const disabledDate = (current) => {
-    return current < aviableDateRange[0] || current > aviableDateRange[1]
-  }
-
-  useEffect(
-    () =>
-      invokeWebApiWrapperAsync(async () => {
-        const datesRangeResponse = await ReportService.getReportsDateRange(
-          idWell
-        )
-        const datesRange = [
-          moment(datesRangeResponse.from),
-          moment(datesRangeResponse.to),
-        ]
-        setAviableDateRange(datesRange)
-
-        let from = moment(datesRangeResponse.to)
-        from = from.subtract(1, "days")
-        if (from < datesRange[0]) from = datesRange[0]
-
-        const filterDateDefaults = [
-          from.startOf("day"),
-          moment(datesRangeResponse.to).startOf("day"),
-        ]
-        setFilterDateRange(filterDateDefaults)
-      }, setShowLoader),
-    [idWell]
-  )
-
-  useEffect(
-    () =>
-      invokeWebApiWrapperAsync(
-        async () => {
-          if (!filterDateRange || filterDateRange.length < 2) return
-          const begin = filterDateRange[0].toISOString()
-          const end = filterDateRange[1].toISOString()
-          const pagesCount = await ReportService.getReportSize(
-            idWell,
-            step,
-            format,
-            begin,
-            end
-          )
-          setPagesCount(pagesCount)
-        },
-        setShowLoader,
-        `Не удалось получить предварительные параметры отчета c 
-                ${filterDateRange[0].format(dateTimeFormat)} по 
-                ${filterDateRange[1].format(dateTimeFormat)}`
-      ),
-    [filterDateRange, step, format, idWell]
-  )
+      setPagesCount(pagesCount)
+    },
+    setShowLoader,
+    `Не удалось получить предварительные параметры отчета c
+    ${filterDateRange[0].format(dateTimeFormat)} по
+    ${filterDateRange[1].format(dateTimeFormat)}`
+  ), [filterDateRange, step, format, idWell])
 
   return (
     <div>
       <LoaderPortal show={showLoader}>
-        <div className="w-100 mt-20px mb-20px d-flex">
+        <div className={'w-100 mt-20px mb-20px d-flex'}>
           <div>
             <div>Диапазон дат отчета</div>
-            <RangePicker
+            <DatePicker.RangePicker
               disabledDate={disabledDate}
               allowClear={false}
               onCalendarChange={setFilterDateRange}
@@ -164,38 +138,28 @@ export default function Report({ idWell }) {
               value={filterDateRange}
             />
           </div>
-          <div className="ml-30px">
+          <div className={'ml-30px'}>
             <div>Шаг графиков</div>
-            <Select style={{ width: "8rem" }} 
-              onChange={e=>{
-                setStep(e)
-              }}
-              value={step}>
-              {periodOptions}
-            </Select>
+            <Select
+              style={{ width: '8rem' }}
+              onChange={e => setStep(e)}
+              value={step}
+              options={timePeriodNames}
+            />
           </div>
 
-          <div className="ml-30px">
+          <div className={'ml-30px'}>
             <div>Формат отчета</div>
             <Radio.Group
               onChange={(e) => setFormat(e.target.value)}
+              options={reportFormats}
               value={format}
-            >
-              <Radio.Button value={0}>PDF</Radio.Button>
-              <Radio.Button value={1}>LAS</Radio.Button>
-            </Radio.Group>
+            />
           </div>
-          <div className="ml-30px">
+          <div className={'ml-30px'}>
             <div>&nbsp;</div>
-            <Button type="primary" onClick={handleReportCreation}>
-              <span>Получить рапорт</span>
-              <span className={"ml-5px"}>({pagesCount} стр.)</span>
-              <span
-                style={{ display: pagesCount > 100 ? "inline" : "none" }}
-                className={"ml-5px"}
-              >
-                !!!
-              </span>
+            <Button type={'primary'} onClick={handleReportCreation}>
+              Получить рапорт ({pagesCount} стр.) {pagesCount > 100 && '!!!'}
             </Button>
           </div>
         </div>
diff --git a/src/pages/TelemetryView/SetpointViewer.jsx b/src/pages/TelemetryView/SetpointViewer.jsx
index feb2240..c88e4dd 100644
--- a/src/pages/TelemetryView/SetpointViewer.jsx
+++ b/src/pages/TelemetryView/SetpointViewer.jsx
@@ -1,10 +1,10 @@
-import moment from 'moment'
 import { memo } from 'react'
 import { Modal, Input } from 'antd'
+
 import { Table } from '../../components/Table'
 import { UserView } from '../../components/UserView'
 import { Grid, GridItem } from '../../components/Grid'
-import { periodToString } from '../../utils/datetime'
+import { formatDate, periodToString } from '../../utils'
 
 export const setpointStatus = {
     0: 'Неизвестно',
@@ -16,9 +16,9 @@ export const setpointStatus = {
 }
 
 export const getSetpointStatus = (id) => {
-    if (!id || Object.keys(setpointStatus).every((idx) => Number(idx) !== id))
-        return setpointStatus[0]
-    return setpointStatus[id]
+    if (id && Object.keys(setpointStatus).some((idx) => Number(idx) === id))
+        return setpointStatus[id]
+    return setpointStatus[0]
 }
 
 const columns = [
@@ -27,14 +27,11 @@ const columns = [
 ]
 
 export const SetpointViewer = memo(({ setpoint, visible, onClose, setpointNames }) => {
-    let date = moment(setpoint?.uploadDate).format('DD MMM YYYY, HH:mm:ss')
-    let setpoints = []
-    if (setpoint) {
-        setpoints = Object.keys(setpoint?.setpoints).map((name) => ({
-            name: setpointNames.find(spName => spName.value === name)?.label,
-            value: setpoint.setpoints[name]
-        }))
-    }
+    const date = formatDate(setpoint?.uploadDate)
+    const setpoints = Object.keys(setpoint?.setpoints ?? []).map((name) => ({
+        name: setpointNames.find(spName => spName.value === name)?.label,
+        value: setpoint?.setpoints?.[name]
+    }))
 
     return (
         <Modal
@@ -55,7 +52,7 @@ export const SetpointViewer = memo(({ setpoint, visible, onClose, setpointNames
                 <GridItem row={3} col={2}>{getSetpointStatus(setpoint?.idState)}</GridItem>
 
                 <GridItem row={4} col={1}>Период актуальности рекомендаций:</GridItem>
-                <GridItem row={4} col={2}>{periodToString(setpoint?.obsolescenceSec)}</GridItem>
+                <GridItem row={4} col={2}>{periodToString(setpoint?.obsolescenceSec * 1000)}</GridItem>
 
                 <GridItem row={5} col={1}>Комментарий:</GridItem>
                 <GridItem row={6} col={1} colSpan={3}>
diff --git a/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx
index 8c27c8c..bfc6923 100644
--- a/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx
@@ -122,13 +122,13 @@ export const WellCompositeSections = ({idWell, statsWells, selectedSections}) =>
       (text, item) => <Link to={`/well/${item?.id}`}>{text ?? '-'}</Link>
     ),
     makeTextColumn('Секция', 'sectionType', filtersSectionsType, null, (text) => text ?? '-'),
-    makeNumericColumnPlanFact('Глубина', 'sectionWellDepth', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Продолжительность', 'sectionBuildDays', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('МСП', 'sectionRateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Рейсовая скорость', 'sectionRouteSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Спуск КНБК', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Подъем КНБК', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Скорость спуска ОК', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Глубина, м', 'sectionWellDepth', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Продолжительность, ч', 'sectionBuildDays', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('МСП, м/ч', 'sectionRateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'sectionRouteSpeed', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction),
+    makeNumericColumnPlanFact('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
     makeNumericColumnPlanFact('НПВ, сут', 'nonProductiveTime', filtersMinMax, makeFilterMinMaxFunction, null, '70px'),
     {
       title: 'TVD',
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
index 58b9264..a44c835 100644
--- a/src/pages/WellOperations/WellDrillParams.jsx
+++ b/src/pages/WellOperations/WellDrillParams.jsx
@@ -1,31 +1,28 @@
 import { useState, useEffect } from 'react'
 
-import {
-    makeColumn,
-    makeNumericAvgRange
-} from '../../components/Table'
+import { DrillParamsService } from '../../services/api'
 import LoaderPortal from '../../components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '../../components/factory'
 import { EditableTable, SelectFromDictionary } from '../../components/Table'
-import { DrillParamsService } from '../../services/api'
+import { makeActionHandler, makeColumn, makeNumericAvgRange } from '../../components/Table'
+
 import { dictionarySectionType, getByKeyOrReturnKey } from './dictionary'
 
 export const columns = [
     makeColumn('Конструкция секции','idWellSectionType', {
-        editable:true,
-        input:<SelectFromDictionary dictionary={dictionarySectionType}/>,
-        width:160,
-        render:(_, record)=>getByKeyOrReturnKey(dictionarySectionType, record.idWellSectionType)
+        editable: true,
+        input: <SelectFromDictionary dictionary={dictionarySectionType}/>,
+        width: 160,
+        render: (_, record) => getByKeyOrReturnKey(dictionarySectionType, record.idWellSectionType)
     }),
-    // makeNumericStartEnd('Глубина', 'depth'),
-    makeNumericAvgRange('Нагрузка', 'axialLoad', 1),
-    makeNumericAvgRange('Давление', 'pressure', 1),
-    makeNumericAvgRange('Момент на ВСП', 'rotorTorque', 1),
-    makeNumericAvgRange('Обороты на ВСП', 'rotorSpeed', 1),
-    makeNumericAvgRange('Расход', 'flow', 1)
+    makeNumericAvgRange('Нагрузка, т', 'axialLoad', 1),
+    makeNumericAvgRange('Давление, атм', 'pressure', 1),
+    makeNumericAvgRange('Момент на ВСП, кН·м', 'rotorTorque', 1),
+    makeNumericAvgRange('Обороты на ВСП, об/мин', 'rotorSpeed', 1),
+    makeNumericAvgRange('Расход, л/с', 'flow', 1)
 ]
 
-export const WellDrillParams = ({idWell}) => {
+export const WellDrillParams = ({ idWell }) => {
     const [params, setParams] = useState([])
     const [showLoader, setShowLoader] = useState(false)
 
@@ -40,24 +37,15 @@ export const WellDrillParams = ({idWell}) => {
 
     useEffect(updateParams, [idWell])
 
-    const onAdd = async (param) => {
-        param.idWell = idWell
-        await DrillParamsService.insert(idWell, param)
-        updateParams()
+    const handlerProps = {
+        service: DrillParamsService,
+        setLoader: setShowLoader,
+        errorMsg: `Не удалось выполнить операцию`,
+        onComplete: updateParams,
+        idWell
     }
 
-    const onEdit = async (param) => {
-        if (!param.id) return
-        param.idWell = idWell
-        await DrillParamsService.update(idWell, param.id, param)
-        updateParams()
-    }
-
-    const onDelete = async (param) => {
-        if (!param.id) return
-        await DrillParamsService.delete(idWell, param.id)
-        updateParams()
-    }
+    const recordParser = (record) => ({ ...record, idWell })
 
     return (
         <LoaderPortal show={showLoader}>
@@ -66,9 +54,9 @@ export const WellDrillParams = ({idWell}) => {
                 bordered
                 columns={columns}
                 dataSource={params}
-                onRowAdd={onAdd}
-                onRowEdit={onEdit}
-                onRowDelete={onDelete}
+                onRowAdd={makeActionHandler('insert', handlerProps, recordParser)}
+                onRowEdit={makeActionHandler('update', handlerProps, recordParser)}
+                onRowDelete={makeActionHandler('delete', handlerProps, recordParser)}
                 pagination={false}
             />
         </LoaderPortal>
diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
index 1f07d86..4098a4f 100644
--- a/src/pages/WellOperations/WellOperationsEditor.jsx
+++ b/src/pages/WellOperations/WellOperationsEditor.jsx
@@ -1,48 +1,82 @@
-import { useState, useEffect } from 'react'
-import { Input } from 'antd'
 import moment from 'moment'
-import { 
-  EditableTable, 
-  DatePickerWrapper, 
-  SelectFromDictionary, 
-  makeColumn, 
+import { Input } from 'antd'
+import { useState, useEffect } from 'react'
+
+import {
+  EditableTable,
+  DatePickerWrapper,
+  makeColumn,
   makeDateSorter,
-  makeNumericColumnOptions} from "../../components/Table"
+  makeNumericColumnOptions,
+  makeSelectColumn,
+  makeActionHandler,
+} from '../../components/Table'
 import LoaderPortal from '../../components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '../../components/factory'
 import { WellOperationService} from '../../services/api'
-import { dictionarySectionType, getByKeyOrReturnKey } from './dictionary'
+import { formatDate } from '../../utils'
 
-const { TextArea } = Input;
+const { TextArea } = Input
 
-const basePageSize = 160;
-const format='YYYY.MM.DD HH:mm'
+const basePageSize = 160
+
+const defaultColumns = [
+  makeSelectColumn('Конструкция секции', 'idWellSectionType', [], undefined, { editable: true, width: 160 }),
+  makeSelectColumn('Операция', 'idCategory', [], undefined, { editable: true, width: 200 }),
+  makeColumn('Доп. инфо', 'categoryInfo', { editable: true, width: 300, input: <TextArea/> }),
+  makeColumn('Глубина забоя на начало, м', 'depthStart', makeNumericColumnOptions(2, 'depthStart')),
+  makeColumn('Глубина забоя при завершении, м', 'depthEnd', makeNumericColumnOptions(2, 'depthEnd')),
+  makeColumn('Время начала', 'dateStart', {
+    editable: true,
+    width: 200,
+    input: <DatePickerWrapper/>,
+    initialValue: moment().format(),
+    sorter: makeDateSorter('dateStart'),
+    render: (_, record) => (
+      <div className={'text-align-r-container'}>
+        <span>{formatDate(record.dateStart)}</span>
+      </div>
+    )
+  }),
+  makeColumn('Часы', 'durationHours', makeNumericColumnOptions(2, 'durationHours')),
+  makeColumn('Комментарий', 'comment', { editable: true, input: <TextArea/> }),
+]
 
 export const WellOperationsEditor = ({idWell, idType}) => {
   const [pageNumAndPageSize, setPageNumAndPageSize] = useState({current:1, pageSize:basePageSize})
   const [paginationTotal, setPaginationTotal] = useState(0)
-  const [dictionaryOperationCategory, setDictionaryOperationCategory] = useState(new Map())
   const [operations, setOperations] = useState([])
   const [showLoader, setShowLoader] = useState(false)
-  
+  const [columns, setColumns] = useState(defaultColumns)
+
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
-      const categories = await WellOperationService.getCategories(idWell)
-      const dictCategories = new Map()
-      categories?.forEach((item) => dictCategories.set(item.id, item.name))
-      setDictionaryOperationCategory(dictCategories)
-    }),[idWell])
+      let categories = await WellOperationService.getCategories(idWell) ?? []
+      categories = categories.map((item) => ({ value: item.id, label: item.name }))
+
+      let sectionTypes = await WellOperationService.getSectionTypes(idWell) ?? []
+      sectionTypes = Object.keys(sectionTypes).map((key) => ({ value: parseInt(key), label: sectionTypes[key] }))
+
+      setColumns(preColumns => {
+        preColumns[0] = makeSelectColumn('Конструкция секции', 'idWellSectionType', sectionTypes, undefined, { editable: true, width: 160 })
+        preColumns[1] = makeSelectColumn('Операция', 'idCategory', categories, undefined, { editable: true, width: 200 })
+        return preColumns
+      })
+    },
+    setShowLoader,
+    'Не удалось загрузить список операций по скважине'
+  ), [idWell])
 
   const updateOperations = () => invokeWebApiWrapperAsync(
     async () => {
       const skip = ((pageNumAndPageSize.current - 1) * pageNumAndPageSize.pageSize) || 0
       const take = pageNumAndPageSize.pageSize
-      const paginatedOperations = await WellOperationService.getOperations(idWell, 
-        idType, undefined, undefined, undefined, undefined, 
+      const paginatedOperations = await WellOperationService.getOperations(idWell,
+        idType, undefined, undefined, undefined, undefined,
         undefined, undefined, skip, take )
       const operations = paginatedOperations?.items ?? []
       setOperations(operations)
-      const total = paginatedOperations.count?? paginatedOperations.items?.length ?? 0      
+      const total = paginatedOperations.count?? paginatedOperations.items?.length ?? 0
       setPaginationTotal(total)
     },
     setShowLoader,
@@ -51,78 +85,39 @@ export const WellOperationsEditor = ({idWell, idType}) => {
 
   useEffect(updateOperations, [idWell, idType, pageNumAndPageSize])
 
-  const columns = [
-    makeColumn('Конструкция секции','idWellSectionType', {
-      editable:true,
-      input:<SelectFromDictionary dictionary={dictionarySectionType}/>,
-      width:160,
-      render:(_, record)=>getByKeyOrReturnKey(dictionarySectionType, record.idWellSectionType)
-    }),
-    makeColumn('Операция','idCategory', {
-      editable:true,
-      input:<SelectFromDictionary dictionary={dictionaryOperationCategory}/>, 
-      width:200,
-      render:(_, record)=>getByKeyOrReturnKey(dictionaryOperationCategory, record.idCategory)
-    }),
-    makeColumn('Доп. инфо','categoryInfo', {editable:true, width:300, input:<TextArea/>}),
-    makeColumn('Глубина забоя на начало','depthStart', makeNumericColumnOptions(2, 'depthStart')),
-    makeColumn('Глубина забоя при завершении','depthEnd', makeNumericColumnOptions(2, 'depthEnd')),
-    makeColumn('Время начала','dateStart', {
-      editable:true, 
-      width:200, 
-      input:<DatePickerWrapper/>,
-      initialValue:moment().format(),
-      sorter: makeDateSorter('dateStart'),      
-      render:(_, record) => 
-        <div className={'text-align-r-container'}>
-          <span>{moment.utc(record.dateStart).local().format(format)}</span>
-        </div>
-    }),
-    makeColumn('Часы','durationHours', makeNumericColumnOptions(2, 'durationHours')),
-    makeColumn('Комментарий','comment', {editable:true, input:<TextArea/>}),
-  ]
-
-  const onAdd = async (operation) => {
-    operation.idType = idType
-    operation.wellDepth = +operation.wellDepth
-    operation.durationHours = +operation.durationHours
-    await WellOperationService.insertRange(idWell, [operation])
-    updateOperations()
+  const handlerProps = {
+    service: WellOperationService,
+    setLoader: setShowLoader,
+    errorMsg: `Не удалось выполнить операцию`,
+    onComplete: updateOperations,
+    idWell
   }
 
-  const onEdit= async (operation) => {
-    if(!operation.id)
-      return
-    operation.idType = idType
-    operation.wellDepth = +operation.wellDepth
-    operation.durationHours = +operation.durationHours
-    await WellOperationService.update(idWell, operation.id, operation)
-    updateOperations()
-  }
+  const recordParser = (record) => ({
+    ...record,
+    idType,
+    wellDepth: +record.wellDepth,
+    durationHours: +record.durationHours
+  })
 
-  const onDelete= async (operation) => {
-    if(!operation.id)
-      return
-    await WellOperationService.delete(idWell, operation.id)
-    updateOperations()
-  }
-
-  return <LoaderPortal show={showLoader}>
-    <EditableTable
-      size='small'
-      bordered
-      columns={columns}
-      dataSource={operations}
-      onRowAdd={onAdd}
-      onRowEdit={onEdit}
-      onRowDelete={onDelete}
-      pagination={{
-        current: pageNumAndPageSize.current,
-        pageSize: pageNumAndPageSize.pageSize,
-        showSizeChanger: false,
-        total: paginationTotal,
-        onChange: (page, pageSize) => setPageNumAndPageSize({current: page, pageSize: pageSize})
-      }}
+  return (
+    <LoaderPortal show={showLoader}>
+      <EditableTable
+        size={'small'}
+        bordered
+        columns={columns}
+        dataSource={operations}
+        onRowAdd={makeActionHandler('insertRange', handlerProps, recordParser)}
+        onRowEdit={makeActionHandler('update', handlerProps, recordParser)}
+        onRowDelete={makeActionHandler('delete', handlerProps)}
+        pagination={{
+          current: pageNumAndPageSize.current,
+          pageSize: pageNumAndPageSize.pageSize,
+          showSizeChanger: false,
+          total: paginationTotal,
+          onChange: (page, pageSize) => setPageNumAndPageSize({ current: page, pageSize })
+        }}
       />
-  </LoaderPortal> 
-}
\ No newline at end of file
+    </LoaderPortal>
+  )
+}
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
index ae288f5..ec50d7d 100644
--- a/src/pages/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/WellOperations/WellSectionsStat.jsx
@@ -1,8 +1,10 @@
 import { useState, useEffect } from 'react'
+
 import LoaderPortal from '../../components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '../../components/factory'
 import { Table, makeColumn, makeColumnsPlanFact } from '../../components/Table'
 import { OperationStatService } from '../../services/api'
+import { calcDuration } from '../../utils/datetime'
 
 const makeNumberRender = value => {
   const v = +value
@@ -13,23 +15,15 @@ const makeNumberRender = value => {
 
 const columns = [
   makeColumn('Тип секции', 'sectionType'),
-  makeColumnsPlanFact('Глубина'           ,'wellDepth',       {render:makeNumberRender}),
-  makeColumnsPlanFact('Часы'              ,'duration',        {render:makeNumberRender}),
-  makeColumnsPlanFact('МСП'               ,'rop',             {render:makeNumberRender}),
-  makeColumnsPlanFact('Рейсовая скорость' ,'routeSpeed',      {render:makeNumberRender}),
-  makeColumnsPlanFact('Подъем КНБК'       ,'bhaUpSpeed',      {render:makeNumberRender}),
-  makeColumnsPlanFact('Спуск КНБК'        ,'bhaDownSpeed',    {render:makeNumberRender}),
-  makeColumnsPlanFact('Спуск ОК'          ,'casingDownSpeed', {render:makeNumberRender}),
+  makeColumnsPlanFact('Глубина, м'            ,'wellDepth',       { render: makeNumberRender }),
+  makeColumnsPlanFact('Часы'                  ,'duration',        { render: makeNumberRender }),
+  makeColumnsPlanFact('МСП, м/ч'              ,'rop',             { render: makeNumberRender }),
+  makeColumnsPlanFact('Рейсовая скорость, м/ч','routeSpeed',      { render: makeNumberRender }),
+  makeColumnsPlanFact('Подъем КНБК, м/ч'      ,'bhaUpSpeed',      { render: makeNumberRender }),
+  makeColumnsPlanFact('Спуск КНБК, м/ч'       ,'bhaDownSpeed',    { render: makeNumberRender }),
+  makeColumnsPlanFact('Спуск ОК, м/ч'         ,'casingDownSpeed', { render: makeNumberRender }),
 ]
 
-const calcDuration = (start, end) => {
-  const msInDay = 1000 * 60 * 60 * 24
-  const startD = new Date(start)
-  const endD = new Date(end)
-  const ms = endD - startD
-  return ms / msInDay
-}
-
 export const WellSectionsStat = ({idWell}) => {
   const [sections, setSections] = useState([])
   const [showLoader, setShowLoader] = useState(false)
diff --git a/src/utils/DateTimeUtils.ts b/src/utils/DateTimeUtils.ts
deleted file mode 100644
index 79a8063..0000000
--- a/src/utils/DateTimeUtils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type RawDate = number | string | Date
-
-export function isRawDate(value: unknown): value is RawDate {
-    return isNaN(new Date(value as RawDate).getTime())
-}
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
index 2f2bb63..b8acfcd 100644
--- a/src/utils/datetime.ts
+++ b/src/utils/datetime.ts
@@ -1,10 +1,44 @@
-export const periodToString = (time?: number) => {
-    if (!time) return '00:00:00'
-    const hours = Math.floor(time / 3600)
-    const minutes = Math.floor(time / 60 - hours * 60)
-    const seconds = Math.floor(time - hours * 3600 - minutes * 60)
+import moment from 'moment'
 
-    const toFixed = (num: number) => `${num}`.padStart(2, '0')
+export type RawDate = number | string | Date
 
-    return `${toFixed(hours)}:${toFixed(minutes)}:${toFixed(seconds)}`
+export const defaultFormat: string = 'YYYY.MM.DD HH:mm'
+
+export enum timeInS {
+    millisecond = 0.001,
+    second = 1,
+    minute = second * 60,
+    hour = minute * 60,
+    day = hour * 24,
+    week = day * 7,
+}
+
+export function isRawDate(value: unknown): value is RawDate {
+    return !isNaN(Date.parse(String(value)))
+}
+
+export const formatDate = (date: unknown, utc = false, format = defaultFormat) => {
+    if (!isRawDate(date)) return null
+    const out = utc ? moment.utc(date).local() : moment(date)
+    return out.format(format)
+}
+
+export const periodToString = (time?: number) => {
+    if (!time || time <= 0) return '00:00:00'
+    const days = Math.floor(time / timeInS.day)
+    time %= timeInS.day
+    const hours = Math.floor(time / timeInS.hour)
+    time %= timeInS.hour
+    const minutes = Math.floor(time / timeInS.minute)
+    time %= timeInS.minute
+    const seconds = Math.floor(time / timeInS.second)
+
+    const toFixed = (num: number) => String(num).padStart(2, '0')
+
+    return `${days > 0 ? days : ''} ${toFixed(hours)}:${toFixed(minutes)}:${toFixed(seconds)}`
+}
+
+export const calcDuration = (start: RawDate, end: RawDate) => {
+    if (!isRawDate(start) || !isRawDate(end)) return
+    return (+new Date(end) - +new Date(start)) * timeInS.millisecond / timeInS.day
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 252ffa6..9bff94d 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,5 @@
-export type { RawDate } from './DateTimeUtils'
-export { isRawDate } from './DateTimeUtils'
+export type { RawDate } from './datetime'
+export { isRawDate, formatDate, defaultFormat, periodToString } from './datetime'
 
 export const headerHeight = 64
 

From a4b62c76a8857f9126ab2073e17395bb2bade3f1 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 27 Dec 2021 15:18:35 +0500
Subject: [PATCH 4/4] =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D1=8B?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/api/index.ts                     |   8 +-
 src/services/api/models/ClusterDto.ts         |   3 +
 .../{WellParamsDto.ts => DepositBaseDto.ts}   |   5 +-
 src/services/api/models/PermissionBaseDto.ts  |   9 --
 src/services/api/models/PermissionDto.ts      |   7 +-
 src/services/api/models/PermissionInfoDto.ts  |  10 --
 src/services/api/models/RequestLogUserDto.ts  |  16 +++
 src/services/api/models/StatOperationsDto.ts  |   4 +-
 src/services/api/models/TelemetryBaseDto.ts   |  11 ++
 src/services/api/models/TelemetryDto.ts       |   3 +
 src/services/api/models/UserDto.ts            |   1 +
 src/services/api/models/UserExtendedDto.ts    |   1 +
 .../api/models/UserRegistrationDto.ts         |   1 +
 src/services/api/models/UserRoleDto.ts        |   4 +-
 src/services/api/models/UserTokenDto.ts       |   5 +-
 src/services/api/models/WellDto.ts            |   7 +-
 src/services/api/models/WellInfoDto.ts        |   9 ++
 .../services/AdminPermissionInfoService.ts    |  90 ---------------
 .../api/services/AdminPermissionService.ts    | 106 ++++++++++--------
 .../api/services/AdminTelemetryService.ts     |  23 +---
 src/services/api/services/MeasureService.ts   |   8 +-
 .../api/services/RequerstTrackerService.ts    |   5 +-
 .../api/services/WellOperationService.ts      |  16 +++
 src/services/api/services/WellService.ts      |  16 +--
 src/utils/index.ts                            |   2 +-
 25 files changed, 157 insertions(+), 213 deletions(-)
 rename src/services/api/models/{WellParamsDto.ts => DepositBaseDto.ts} (67%)
 delete mode 100644 src/services/api/models/PermissionBaseDto.ts
 delete mode 100644 src/services/api/models/PermissionInfoDto.ts
 create mode 100644 src/services/api/models/RequestLogUserDto.ts
 create mode 100644 src/services/api/models/TelemetryBaseDto.ts
 create mode 100644 src/services/api/models/WellInfoDto.ts
 delete mode 100644 src/services/api/services/AdminPermissionInfoService.ts

diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 21fd12a..2df1212 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -9,6 +9,7 @@ export type { ClusterDto } from './models/ClusterDto';
 export type { ClusterRopStatDto } from './models/ClusterRopStatDto';
 export type { CompanyDto } from './models/CompanyDto';
 export type { DatesRangeDto } from './models/DatesRangeDto';
+export type { DepositBaseDto } from './models/DepositBaseDto';
 export type { DepositDto } from './models/DepositDto';
 export type { DrillFlowChartDto } from './models/DrillFlowChartDto';
 export type { DrillParamsDto } from './models/DrillParamsDto';
@@ -20,9 +21,8 @@ export type { FilePublishInfoDto } from './models/FilePublishInfoDto';
 export type { MeasureDto } from './models/MeasureDto';
 export type { MessageDto } from './models/MessageDto';
 export type { MessageDtoPaginationContainer } from './models/MessageDtoPaginationContainer';
-export type { PermissionBaseDto } from './models/PermissionBaseDto';
 export type { PermissionDto } from './models/PermissionDto';
-export type { PermissionInfoDto } from './models/PermissionInfoDto';
+export type { RequestLogUserDto } from './models/RequestLogUserDto';
 export type { SetpointInfoDto } from './models/SetpointInfoDto';
 export type { SetpointsRequestDto } from './models/SetpointsRequestDto';
 export type { StatClusterDto } from './models/StatClusterDto';
@@ -30,6 +30,7 @@ export type { StatOperationsDto } from './models/StatOperationsDto';
 export type { StatOperationsDtoPlanFactBase } from './models/StatOperationsDtoPlanFactBase';
 export type { StatSectionDto } from './models/StatSectionDto';
 export type { StatWellDto } from './models/StatWellDto';
+export type { TelemetryBaseDto } from './models/TelemetryBaseDto';
 export type { TelemetryDataSaubDto } from './models/TelemetryDataSaubDto';
 export type { TelemetryDataSpinDto } from './models/TelemetryDataSpinDto';
 export type { TelemetryDto } from './models/TelemetryDto';
@@ -49,16 +50,15 @@ export type { WellCompositeDto } from './models/WellCompositeDto';
 export type { WellDepthToDayDto } from './models/WellDepthToDayDto';
 export type { WellDepthToIntervalDto } from './models/WellDepthToIntervalDto';
 export type { WellDto } from './models/WellDto';
+export type { WellInfoDto } from './models/WellInfoDto';
 export type { WellOperationCategoryDto } from './models/WellOperationCategoryDto';
 export type { WellOperationDto } from './models/WellOperationDto';
 export type { WellOperationDtoPaginationContainer } from './models/WellOperationDtoPaginationContainer';
 export type { WellOperationDtoPlanFactPredictBase } from './models/WellOperationDtoPlanFactPredictBase';
-export type { WellParamsDto } from './models/WellParamsDto';
 
 export { AdminClusterService } from './services/AdminClusterService';
 export { AdminCompanyService } from './services/AdminCompanyService';
 export { AdminDepositService } from './services/AdminDepositService';
-export { AdminPermissionInfoService } from './services/AdminPermissionInfoService';
 export { AdminPermissionService } from './services/AdminPermissionService';
 export { AdminTelemetryService } from './services/AdminTelemetryService';
 export { AdminUserRoleService } from './services/AdminUserRoleService';
diff --git a/src/services/api/models/ClusterDto.ts b/src/services/api/models/ClusterDto.ts
index b802a01..2aced28 100644
--- a/src/services/api/models/ClusterDto.ts
+++ b/src/services/api/models/ClusterDto.ts
@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { DepositBaseDto } from './DepositBaseDto';
 import type { WellDto } from './WellDto';
 
 export type ClusterDto = {
@@ -9,5 +10,7 @@ export type ClusterDto = {
     caption?: string | null;
     latitude?: number | null;
     longitude?: number | null;
+    idDeposit?: number | null;
+    deposit?: DepositBaseDto;
     wells?: Array<WellDto> | null;
 }
diff --git a/src/services/api/models/WellParamsDto.ts b/src/services/api/models/DepositBaseDto.ts
similarity index 67%
rename from src/services/api/models/WellParamsDto.ts
rename to src/services/api/models/DepositBaseDto.ts
index 4f01852..e7844ea 100644
--- a/src/services/api/models/WellParamsDto.ts
+++ b/src/services/api/models/DepositBaseDto.ts
@@ -2,10 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type WellParamsDto = {
+export type DepositBaseDto = {
+    id?: number;
     caption?: string | null;
     latitude?: number | null;
     longitude?: number | null;
-    idWellType?: number;
-    idState?: number;
 }
diff --git a/src/services/api/models/PermissionBaseDto.ts b/src/services/api/models/PermissionBaseDto.ts
deleted file mode 100644
index f6b16de..0000000
--- a/src/services/api/models/PermissionBaseDto.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type PermissionBaseDto = {
-    idPermissionInfo?: number;
-    permissionName?: string | null;
-    value?: number;
-}
diff --git a/src/services/api/models/PermissionDto.ts b/src/services/api/models/PermissionDto.ts
index 955fb61..2b6ee5b 100644
--- a/src/services/api/models/PermissionDto.ts
+++ b/src/services/api/models/PermissionDto.ts
@@ -3,8 +3,7 @@
 /* eslint-disable */
 
 export type PermissionDto = {
-    idPermissionInfo?: number;
-    permissionName?: string | null;
-    value?: number;
-    idUserRole?: number;
+    id?: number;
+    name?: string | null;
+    description?: string | null;
 }
diff --git a/src/services/api/models/PermissionInfoDto.ts b/src/services/api/models/PermissionInfoDto.ts
deleted file mode 100644
index 191d91c..0000000
--- a/src/services/api/models/PermissionInfoDto.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type PermissionInfoDto = {
-    id?: number;
-    name?: string | null;
-    description?: string | null;
-    bitDescription?: Record<string, string> | null;
-}
diff --git a/src/services/api/models/RequestLogUserDto.ts b/src/services/api/models/RequestLogUserDto.ts
new file mode 100644
index 0000000..e8254da
--- /dev/null
+++ b/src/services/api/models/RequestLogUserDto.ts
@@ -0,0 +1,16 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { UserDto } from './UserDto';
+
+export type RequestLogUserDto = {
+    userId?: number;
+    login?: string | null;
+    ip?: string | null;
+    elapsedMs?: number;
+    lastDate?: string;
+    requests?: number;
+    errors?: number;
+    user?: UserDto;
+}
diff --git a/src/services/api/models/StatOperationsDto.ts b/src/services/api/models/StatOperationsDto.ts
index 40c7510..51af309 100644
--- a/src/services/api/models/StatOperationsDto.ts
+++ b/src/services/api/models/StatOperationsDto.ts
@@ -3,8 +3,8 @@
 /* eslint-disable */
 
 export type StatOperationsDto = {
-    start?: string;
-    end?: string;
+    start?: string | null;
+    end?: string | null;
     wellDepthStart?: number;
     wellDepthEnd?: number;
     routeSpeed?: number;
diff --git a/src/services/api/models/TelemetryBaseDto.ts b/src/services/api/models/TelemetryBaseDto.ts
new file mode 100644
index 0000000..c454dab
--- /dev/null
+++ b/src/services/api/models/TelemetryBaseDto.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TelemetryInfoDto } from './TelemetryInfoDto';
+
+export type TelemetryBaseDto = {
+    id?: number;
+    remoteUid?: string | null;
+    info?: TelemetryInfoDto;
+}
diff --git a/src/services/api/models/TelemetryDto.ts b/src/services/api/models/TelemetryDto.ts
index b152295..c85ab5f 100644
--- a/src/services/api/models/TelemetryDto.ts
+++ b/src/services/api/models/TelemetryDto.ts
@@ -3,9 +3,12 @@
 /* eslint-disable */
 
 import type { TelemetryInfoDto } from './TelemetryInfoDto';
+import type { WellInfoDto } from './WellInfoDto';
 
 export type TelemetryDto = {
     id?: number;
     remoteUid?: string | null;
     info?: TelemetryInfoDto;
+    idWell?: number | null;
+    well?: WellInfoDto;
 }
diff --git a/src/services/api/models/UserDto.ts b/src/services/api/models/UserDto.ts
index 4d9e6af..65ddb9e 100644
--- a/src/services/api/models/UserDto.ts
+++ b/src/services/api/models/UserDto.ts
@@ -14,5 +14,6 @@ export type UserDto = {
     phone?: string | null;
     position?: string | null;
     idCompany?: number | null;
+    idState?: number | null;
     company?: CompanyDto;
 }
diff --git a/src/services/api/models/UserExtendedDto.ts b/src/services/api/models/UserExtendedDto.ts
index cfd4158..b3db1d5 100644
--- a/src/services/api/models/UserExtendedDto.ts
+++ b/src/services/api/models/UserExtendedDto.ts
@@ -14,6 +14,7 @@ export type UserExtendedDto = {
     phone?: string | null;
     position?: string | null;
     idCompany?: number | null;
+    idState?: number | null;
     company?: CompanyDto;
     roleNames?: Array<string> | null;
 }
diff --git a/src/services/api/models/UserRegistrationDto.ts b/src/services/api/models/UserRegistrationDto.ts
index cc952e4..1899354 100644
--- a/src/services/api/models/UserRegistrationDto.ts
+++ b/src/services/api/models/UserRegistrationDto.ts
@@ -14,6 +14,7 @@ export type UserRegistrationDto = {
     phone?: string | null;
     position?: string | null;
     idCompany?: number | null;
+    idState?: number | null;
     company?: CompanyDto;
     password?: string | null;
 }
diff --git a/src/services/api/models/UserRoleDto.ts b/src/services/api/models/UserRoleDto.ts
index 6efd298..7fb6dbb 100644
--- a/src/services/api/models/UserRoleDto.ts
+++ b/src/services/api/models/UserRoleDto.ts
@@ -2,12 +2,12 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { PermissionBaseDto } from './PermissionBaseDto';
+import type { PermissionDto } from './PermissionDto';
 
 export type UserRoleDto = {
     id?: number;
     caption?: string | null;
     idParent?: number | null;
     idType?: number;
-    permissions?: Array<PermissionBaseDto> | null;
+    permissions?: Array<PermissionDto> | null;
 }
diff --git a/src/services/api/models/UserTokenDto.ts b/src/services/api/models/UserTokenDto.ts
index ef33f2c..e1eea11 100644
--- a/src/services/api/models/UserTokenDto.ts
+++ b/src/services/api/models/UserTokenDto.ts
@@ -3,7 +3,7 @@
 /* eslint-disable */
 
 import type { CompanyDto } from './CompanyDto';
-import type { PermissionBaseDto } from './PermissionBaseDto';
+import type { PermissionDto } from './PermissionDto';
 
 export type UserTokenDto = {
     id?: number;
@@ -15,8 +15,9 @@ export type UserTokenDto = {
     phone?: string | null;
     position?: string | null;
     idCompany?: number | null;
+    idState?: number | null;
     company?: CompanyDto;
     roleNames?: Array<string> | null;
-    permissions?: Array<PermissionBaseDto> | null;
+    permissions?: Array<PermissionDto> | null;
     token?: string | null;
 }
diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts
index a55bf12..b24376f 100644
--- a/src/services/api/models/WellDto.ts
+++ b/src/services/api/models/WellDto.ts
@@ -2,7 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { TelemetryDto } from './TelemetryDto';
+import type { CompanyDto } from './CompanyDto';
+import type { TelemetryBaseDto } from './TelemetryBaseDto';
 
 export type WellDto = {
     caption?: string | null;
@@ -16,5 +17,7 @@ export type WellDto = {
     idCluster?: number | null;
     idState?: number;
     lastTelemetryDate?: string;
-    telemetry?: TelemetryDto;
+    idTelemetry?: number | null;
+    telemetry?: TelemetryBaseDto;
+    companies?: Array<CompanyDto> | null;
 }
diff --git a/src/services/api/models/WellInfoDto.ts b/src/services/api/models/WellInfoDto.ts
new file mode 100644
index 0000000..105200b
--- /dev/null
+++ b/src/services/api/models/WellInfoDto.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type WellInfoDto = {
+    caption?: string | null;
+    cluster?: string | null;
+    deposit?: string | null;
+}
diff --git a/src/services/api/services/AdminPermissionInfoService.ts b/src/services/api/services/AdminPermissionInfoService.ts
deleted file mode 100644
index bb4519f..0000000
--- a/src/services/api/services/AdminPermissionInfoService.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { PermissionInfoDto } from '../models/PermissionInfoDto';
-import { request as __request } from '../core/request';
-
-export class AdminPermissionInfoService {
-
-    /**
-     * Получить все записи
-     * @returns PermissionInfoDto Success
-     * @throws ApiError
-     */
-    public static async getAll(): Promise<Array<PermissionInfoDto>> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/admin/permissionInfo/all`,
-        });
-        return result.body;
-    }
-
-    /**
-     * Получить одну запись по Id
-     * @param id id записи
-     * @returns PermissionInfoDto Success
-     * @throws ApiError
-     */
-    public static async get(
-        id: number,
-    ): Promise<PermissionInfoDto> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/admin/permissionInfo/${id}`,
-        });
-        return result.body;
-    }
-
-    /**
-     * Редактировать запись по id
-     * @param id id записи
-     * @param requestBody запись
-     * @returns number Success
-     * @throws ApiError
-     */
-    public static async put(
-        id: number,
-        requestBody?: PermissionInfoDto,
-    ): Promise<number> {
-        const result = await __request({
-            method: 'PUT',
-            path: `/api/admin/permissionInfo/${id}`,
-            body: requestBody,
-        });
-        return result.body;
-    }
-
-    /**
-     * Удалить запись по id
-     * @param id id записи
-     * @returns number Success
-     * @throws ApiError
-     */
-    public static async delete(
-        id: number,
-    ): Promise<number> {
-        const result = await __request({
-            method: 'DELETE',
-            path: `/api/admin/permissionInfo/${id}`,
-        });
-        return result.body;
-    }
-
-    /**
-     * Добавить запись
-     * @param requestBody запись
-     * @returns number Success
-     * @throws ApiError
-     */
-    public static async insert(
-        requestBody?: PermissionInfoDto,
-    ): Promise<number> {
-        const result = await __request({
-            method: 'POST',
-            path: `/api/admin/permissionInfo`,
-            body: requestBody,
-        });
-        return result.body;
-    }
-
-}
\ No newline at end of file
diff --git a/src/services/api/services/AdminPermissionService.ts b/src/services/api/services/AdminPermissionService.ts
index 580599f..5bd7e38 100644
--- a/src/services/api/services/AdminPermissionService.ts
+++ b/src/services/api/services/AdminPermissionService.ts
@@ -7,32 +7,77 @@ import { request as __request } from '../core/request';
 export class AdminPermissionService {
 
     /**
-     * Получает список всех разрешений для роли
-     * @param idRole id роли
+     * Получить все записи
      * @returns PermissionDto Success
      * @throws ApiError
      */
-    public static async getByIdRole(
-        idRole?: number,
-    ): Promise<Array<PermissionDto>> {
+    public static async getAll(): Promise<Array<PermissionDto>> {
         const result = await __request({
             method: 'GET',
-            path: `/api/admin/permission`,
-            query: {
-                'idRole': idRole,
-            },
+            path: `/api/admin/permission/all`,
         });
         return result.body;
     }
 
     /**
-     * Добавляет разрешения для роли
-     * @param requestBody Объекты новых разрешений для справочника
+     * Получить одну запись по Id
+     * @param id id записи
+     * @returns PermissionDto Success
+     * @throws ApiError
+     */
+    public static async get(
+        id: number,
+    ): Promise<PermissionDto> {
+        const result = await __request({
+            method: 'GET',
+            path: `/api/admin/permission/${id}`,
+        });
+        return result.body;
+    }
+
+    /**
+     * Редактировать запись по id
+     * @param id id записи
+     * @param requestBody запись
      * @returns number Success
      * @throws ApiError
      */
-    public static async insertRange(
-        requestBody?: Array<PermissionDto>,
+    public static async put(
+        id: number,
+        requestBody?: PermissionDto,
+    ): Promise<number> {
+        const result = await __request({
+            method: 'PUT',
+            path: `/api/admin/permission/${id}`,
+            body: requestBody,
+        });
+        return result.body;
+    }
+
+    /**
+     * Удалить запись по id
+     * @param id id записи
+     * @returns number Success
+     * @throws ApiError
+     */
+    public static async delete(
+        id: number,
+    ): Promise<number> {
+        const result = await __request({
+            method: 'DELETE',
+            path: `/api/admin/permission/${id}`,
+        });
+        return result.body;
+    }
+
+    /**
+     * Добавить запись
+     * @param requestBody запись
+     * @returns number Success
+     * @throws ApiError
+     */
+    public static async insert(
+        requestBody?: PermissionDto,
     ): Promise<number> {
         const result = await __request({
             method: 'POST',
@@ -42,39 +87,4 @@ export class AdminPermissionService {
         return result.body;
     }
 
-    /**
-     * Обновляет разрешение для роли
-     * @param requestBody Объект разрешения для справочника
-     * @returns number Success
-     * @throws ApiError
-     */
-    public static async update(
-        requestBody?: PermissionDto,
-    ): Promise<number> {
-        const result = await __request({
-            method: 'PUT',
-            path: `/api/admin/permission`,
-            body: requestBody,
-        });
-        return result.body;
-    }
-
-    /**
-     * Удаляет разрешение для роли
-     * @param idUserRole id роли для удаления разрешения
-     * @param idPermission id разрешения
-     * @returns number Success
-     * @throws ApiError
-     */
-    public static async delete(
-        idUserRole: number,
-        idPermission: number,
-    ): Promise<number> {
-        const result = await __request({
-            method: 'DELETE',
-            path: `/api/admin/permission/${idPermission}/${idUserRole}`,
-        });
-        return result.body;
-    }
-
 }
\ No newline at end of file
diff --git a/src/services/api/services/AdminTelemetryService.ts b/src/services/api/services/AdminTelemetryService.ts
index 5744944..bedb762 100644
--- a/src/services/api/services/AdminTelemetryService.ts
+++ b/src/services/api/services/AdminTelemetryService.ts
@@ -7,30 +7,19 @@ import { request as __request } from '../core/request';
 export class AdminTelemetryService {
 
     /**
-     * @returns any Success
-     * @throws ApiError
-     */
-    public static async getRedundentRemoteUids(): Promise<any> {
-        const result = await __request({
-            method: 'GET',
-            path: `/reduntentUids`,
-        });
-        return result.body;
-    }
-
-    /**
-     * merge telemetries
-     * @param requestBody array of ids
+     * Merge telemetries. No body required.
+     * @param idFrom
+     * @param idTo
      * @returns any Success
      * @throws ApiError
      */
     public static async mergeTelemetries(
-        requestBody?: Array<number>,
+        idFrom: number,
+        idTo: number,
     ): Promise<any> {
         const result = await __request({
             method: 'POST',
-            path: `/merge`,
-            body: requestBody,
+            path: `/merge/${idFrom}/${idTo}`,
         });
         return result.body;
     }
diff --git a/src/services/api/services/MeasureService.ts b/src/services/api/services/MeasureService.ts
index 6f59d4a..37a30b1 100644
--- a/src/services/api/services/MeasureService.ts
+++ b/src/services/api/services/MeasureService.ts
@@ -39,18 +39,22 @@ export class MeasureService {
     }
 
     /**
+     * История замеров по скважине
      * @param idWell
-     * @param idCategory
+     * @param idCategory Категория скважины. Не обязательный параметр.
      * @returns any Success
      * @throws ApiError
      */
     public static async getHisory(
         idWell: number,
-        idCategory: number,
+        idCategory?: number,
     ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/measure/history`,
+            query: {
+                'idCategory': idCategory,
+            },
         });
         return result.body;
     }
diff --git a/src/services/api/services/RequerstTrackerService.ts b/src/services/api/services/RequerstTrackerService.ts
index 2cb94f8..6a02622 100644
--- a/src/services/api/services/RequerstTrackerService.ts
+++ b/src/services/api/services/RequerstTrackerService.ts
@@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+import type { RequestLogUserDto } from '../models/RequestLogUserDto';
 import { request as __request } from '../core/request';
 
 export class RequerstTrackerService {
@@ -84,12 +85,12 @@ export class RequerstTrackerService {
     /**
      * Получить последних пользователей обращавшихся к серверу. Уникальность пользователя проверяется по логину и Ip.
      * @param take от 1 до 1000
-     * @returns any Success
+     * @returns RequestLogUserDto Success
      * @throws ApiError
      */
     public static async getUsersStat(
         take: number = 512,
-    ): Promise<any> {
+    ): Promise<Array<RequestLogUserDto>> {
         const result = await __request({
             method: 'GET',
             path: `/api/RequerstTracker/users`,
diff --git a/src/services/api/services/WellOperationService.ts b/src/services/api/services/WellOperationService.ts
index d30efa7..7ded07b 100644
--- a/src/services/api/services/WellOperationService.ts
+++ b/src/services/api/services/WellOperationService.ts
@@ -8,6 +8,22 @@ import { request as __request } from '../core/request';
 
 export class WellOperationService {
 
+    /**
+     * Возвращает словарь типов секций
+     * @param idWell
+     * @returns string Success
+     * @throws ApiError
+     */
+    public static async getSectionTypes(
+        idWell: string,
+    ): Promise<Record<string, string>> {
+        const result = await __request({
+            method: 'GET',
+            path: `/api/well/${idWell}/wellOperations/sectionTypes`,
+        });
+        return result.body;
+    }
+
     /**
      * Возвращает список имен типов операций на скважине
      * @param idWell
diff --git a/src/services/api/services/WellService.ts b/src/services/api/services/WellService.ts
index d71b14c..bb9e56b 100644
--- a/src/services/api/services/WellService.ts
+++ b/src/services/api/services/WellService.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { WellDto } from '../models/WellDto';
-import type { WellParamsDto } from '../models/WellParamsDto';
 import { request as __request } from '../core/request';
 
 export class WellService {
@@ -31,7 +30,7 @@ export class WellService {
      */
     public static async updateWell(
         idWell?: number,
-        requestBody?: WellParamsDto,
+        requestBody?: WellDto,
     ): Promise<number> {
         const result = await __request({
             method: 'PUT',
@@ -63,17 +62,4 @@ export class WellService {
         return result.body;
     }
 
-    /**
-     * Возвращает список скважин, передающих телеметрию в данный момент
-     * @returns WellDto Success
-     * @throws ApiError
-     */
-    public static async getTransmittingWells(): Promise<Array<WellDto>> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/well/transmittingWells`,
-        });
-        return result.body;
-    }
-
 }
\ No newline at end of file
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9bff94d..ae17c8b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,4 @@
-export type { RawDate } from './datetime'
+export type { RawDate, timeInS } from './datetime'
 export { isRawDate, formatDate, defaultFormat, periodToString } from './datetime'
 
 export const headerHeight = 64