From 43e85364b0e202630f0c73023097c14b1559be33 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 28 Feb 2022 12:51:45 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D0=B5=D1=86=20=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D1=8B=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=9C=D0=B5=D1=81=D1=82=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC=D0=B8/=D0=9A=D1=83?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BC=D0=B8/=D0=A1=D0=BA=D0=B2=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/index.tsx                | 73 ++++++++++++++++++-
 src/pages/AdminPanel/ClusterController.jsx    |  4 +-
 src/pages/AdminPanel/DepositController.jsx    |  5 +-
 src/pages/AdminPanel/WellController/index.jsx |  2 +
 src/pages/DrillingProgram/CategoryRender.jsx  |  2 +-
 5 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index d9c737e..88a3936 100644
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -1,6 +1,7 @@
 import { memo, useEffect, useState, ReactNode } from 'react'
 import { InputNumber, Select, Table as RawTable, Tag, SelectProps, TableProps } from 'antd'
 import { DefaultOptionType, SelectValue } from 'antd/lib/select'
+import { ColumnProps } from 'antd/lib/table'
 import { Rule } from 'rc-field-form/lib/interface'
 
 import { tryAddKeys } from './EditableTable'
@@ -32,11 +33,11 @@ export const makeNumericRender = (fixed?: number) => (value: any, _: object): Re
   )
 }
 
-export const makeNumericColumnOptions = (fixed?: number, sorterKey?: string) => ({
+export const makeNumericColumnOptions = (fixed?: number, sorterKey?: string): columnPropsOther => ({
   editable: true,
   initialValue: 0,
   width: 100,
-  sorter: sorterKey ? makeNumericSorter(sorterKey) : null,
+  sorter: sorterKey ? makeNumericSorter(sorterKey) : undefined,
   formItemRules: [
     {
       required: true,
@@ -51,7 +52,7 @@ export const makeNumericColumnOptions = (fixed?: number, sorterKey?: string) =>
 other - объект с дополнительными свойствами колонки
 поддерживаются все базовые свойства из описания https://ant.design/components/table/#Column
 плю дополнительные для колонок EditableTable: */
-interface columnPropsOther {
+type columnPropsOther<T = any> = ColumnProps<T> & {
   // редактируемая колонка
   editable?: boolean
   // react компонента редактора
@@ -309,3 +310,69 @@ export type TableContainer = TableProps<any> & {
 export const Table = memo<TableContainer>(({dataSource, children, ...other}) => (
   <RawTable dataSource={tryAddKeys(dataSource)} {...other}>{children}</RawTable>
 ))
+
+const rawTimezones = {
+  'Калининград': 2,
+  'Москва': 3,
+  'Самара': 4,
+  'Екатеринбург': 5,
+  'Омск': 6,
+  'Красноярск': 7,
+  'Новосибирск': 7,
+  'Иркутск': 8,
+  'Чита': 9,
+  'Владивосток': 10,
+  'Магадан': 11,
+  'Южно-Сахалинск': 11,
+  'Среднеколымск': 11,
+  'Анадырь': 12,
+  'Петропавловск-Камчатский': 12,
+}
+
+const timezoneOptions = Object
+  .entries(rawTimezones)
+  .sort((a, b) => a[1] - b[1])
+  .map(([id, hours]) => ({
+    label: `UTC${hours > 0 ? '+':''}${('0' + hours).slice(-2)} :: ${id}`,
+    value: id,
+  }))
+
+export type TimezoneSelectProps = SelectProps & {
+  //
+}
+
+export const TimezoneSelect = memo<TimezoneSelectProps>(({ onChange, ...other }) => {
+  const [id, setId] = useState<keyof typeof rawTimezones | null>(null)
+
+  useEffect(() => onChange?.({
+    timezoneId: id,
+    hours: id ? rawTimezones[id] : 0,
+    isOverride: false,
+  }, []), [id, onChange])
+
+  return (<Select {...other} onChange={setId} value={id} />)
+})
+
+export const makeTimezoneColumn = (
+  title: string = 'Зона',
+  key: string = 'timezone',
+  defaultValue: any = null,
+  allowClear: boolean = true,
+  other?: columnPropsOther
+) => makeColumn(title, key, {
+  width: 100,
+  editable: true,
+  render: (timezone) => {
+    if (!timezone) return 'UTC~?? :: Неизвестно'
+    const { hours, timezoneId } = timezone
+    return `UTC${hours > 0 ? '+':''}${hours ? ('0' + hours).slice(-2) : '~??'} :: ${timezoneId ?? 'Неизвестно'}`
+  },
+  input: (
+    <TimezoneSelect
+      allowClear={allowClear}
+      options={timezoneOptions}
+      defaultValue={defaultValue}
+    />
+  ),
+  ...other
+})
diff --git a/src/pages/AdminPanel/ClusterController.jsx b/src/pages/AdminPanel/ClusterController.jsx
index b73ea37..002238d 100644
--- a/src/pages/AdminPanel/ClusterController.jsx
+++ b/src/pages/AdminPanel/ClusterController.jsx
@@ -6,7 +6,8 @@ import {
     makeSelectColumn,
     makeActionHandler,
     makeStringSorter,
-    defaultPagination
+    defaultPagination,
+    makeTimezoneColumn
 } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -36,6 +37,7 @@ export const ClusterController = memo(() => {
         }),
         makeColumn('Широта', 'latitude', { width: 150, editable: true, render: coordsFixed }),
         makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFixed }),
+        makeTimezoneColumn('Зона', 'timezone', null, true, { width: 150 }),
     ]
 
     const updateTable = () => invokeWebApiWrapperAsync(
diff --git a/src/pages/AdminPanel/DepositController.jsx b/src/pages/AdminPanel/DepositController.jsx
index af9180d..5a21b94 100644
--- a/src/pages/AdminPanel/DepositController.jsx
+++ b/src/pages/AdminPanel/DepositController.jsx
@@ -2,7 +2,7 @@ import { memo, useEffect, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { EditableTable, makeColumn, makeActionHandler, defaultPagination } from '@components/Table'
+import { EditableTable, makeColumn, makeActionHandler, defaultPagination, makeTimezoneColumn } from '@components/Table'
 import { AdminDepositService } from '@api'
 import { arrayOrDefault } from '@utils'
 import { min1 } from '@utils/validationRules'
@@ -13,7 +13,8 @@ export const coordsFixed = (coords) => coords && isFinite(coords) ? (+coords).to
 const depositColumns = [
     makeColumn('Название', 'caption', { width: 200, editable: true, formItemRules: min1 }),
     makeColumn('Широта', 'latitude', { width: 150, editable: true, render: coordsFixed }),
-    makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFixed })
+    makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFixed }),
+    makeTimezoneColumn('Зона', 'timezone', null, true, { width: 150 }),
 ]
 
 export const DepositController = memo(() => {
diff --git a/src/pages/AdminPanel/WellController/index.jsx b/src/pages/AdminPanel/WellController/index.jsx
index 0435da8..60265d6 100644
--- a/src/pages/AdminPanel/WellController/index.jsx
+++ b/src/pages/AdminPanel/WellController/index.jsx
@@ -17,6 +17,7 @@ import {
     makeNumericSorter,
     makeTagColumn,
     defaultPagination,
+    makeTimezoneColumn,
 } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -94,6 +95,7 @@ export const WellController = memo(() => {
                     render: (telemetry) => <TelemetryView telemetry={telemetry} />,
                     input: <TelemetrySelect telemetry={telemetry}/>,
                 }, ),
+                makeTimezoneColumn('Зона', 'timezone', null, true, { width: 170 }),
                 makeTagColumn('Компании', 'companies', companies, 'id', 'caption', {
                     editable: true,
                     render: (company) => <CompanyView company={company} />,
diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 7d93029..27e2a8f 100644
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -82,7 +82,7 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
     const onUploadError = useCallback((e) => {
         notify(e?.message ?? 'Ошибка загрузки файла', 'error')
         setIsUploading(false)
-    })
+    }, [])
 
     return (
         <LoaderPortal show={isUploading}>