precision) {
+ // Truncate the value if it exceeds the total precision
+ formattedValue = numericValue.toPrecision(precision);
+ }
+
+ // Pad with leading zeros if necessary (if it's an integer and the precision is greater than the scale)
+ const [integerPart, decimalPart] = formattedValue.split('.');
+
+ // Ensure the integer part doesn't exceed the precision
+ const paddedInteger = integerPart.padStart(precision - scale, '0');
+
+ // Reassemble the number
+ return `${paddedInteger}.${decimalPart.padEnd(scale, '0')}`;
+}
interface ObjectParameterProps {
showLabel?: boolean,
@@ -12,56 +48,61 @@ interface ObjectParameterProps {
}
const ObjectParameter = ({
- param,
- showLabel = true
+ param
}: ObjectParameterProps) => {
const { data: paramData } = useSWR(
`/general/params/all?param_id=${param.id_param}`,
(url) => fetcher(url, BASE_URL.ems).then(res => res[0] as IParam),
{
- revalidateOnFocus: false
+ revalidateOnFocus: false,
+ revalidateIfStale: false
}
)
- const Parameter = (type: string, name: string, value: unknown, vtable: string) => {
+ const Parameter = (type: string, name: string, value: unknown, vtable: string, unit: string | null) => {
switch (type) {
case 'bit':
return (
-
-
- {name}
-
- )
- case 'varchar(200)':
- return (
-
- {decodeDoubleEncodedString(value as string)}
-
- )
- case 'varchar(5)':
- return (
-
- {decodeDoubleEncodedString(value as string)}
-
+
)
case 'bigint':
return (
-
- {(value as string)}
-
+
+ )
+ case 'tinyint':
+ return (
+
+ )
+ // TODO: Calculate from calc procedures
+ case 'calculate':
+ return (
+
)
case 'GTCB':
return (
-
+
)
case 'TCB':
return (
-
+
+ )
+ case type.match(/varchar\((\d+)\)/)?.input:
+ return (
+
+ )
+ case type.match(/numeric\((\d+),(\d+)\)/)?.input:
+ return (
+
+ )
+ case 'year':
+ return (
+
)
default:
return (
{type}
+ {value as string}
)
}
@@ -70,12 +111,7 @@ const ObjectParameter = ({
return (
<>
{paramData &&
-
- {showLabel &&
-
- }
- {Parameter(paramData.format, paramData.name, param.value, paramData.vtable)}
-
+ Parameter(paramData.format, paramData.name, param.value, paramData.vtable, paramData.unit)
}
)
diff --git a/client/src/components/map/TCBParameter.tsx b/client/src/components/map/TCBParameter.tsx
index 9f49fab..40127be 100644
--- a/client/src/components/map/TCBParameter.tsx
+++ b/client/src/components/map/TCBParameter.tsx
@@ -1,30 +1,20 @@
-import React from 'react'
import useSWR from 'swr'
import { fetcher } from '../../http/axiosInstance'
import { BASE_URL } from '../../constants'
import { Text } from '@mantine/core'
+import TableValue from './TableValue'
interface ITCBParameterProps {
value: string,
vtable: string,
- inactive?: boolean
-}
-
-interface vStreet {
- id: number,
- id_city: number,
- name: string,
- kv: number
-}
-
-interface tType {
- id: number,
- name: string,
+ inactive?: boolean,
+ name: string
}
const TCBParameter = ({
value,
- vtable
+ vtable,
+ name
}: ITCBParameterProps) => {
//Get value
@@ -32,16 +22,8 @@ const TCBParameter = ({
`/general/params/tcb?id=${value}&vtable=${vtable}`,
(url) => fetcher(url, BASE_URL.ems).then(res => res[0]),
{
- revalidateOnFocus: false
- }
- )
-
- //Get available values
- const { data: tcbAll } = useSWR(
- `/general/params/tcb?vtable=${vtable}`,
- (url) => fetcher(url, BASE_URL.ems).then(res => res),
- {
- revalidateOnFocus: false
+ revalidateOnFocus: false,
+ revalidateIfStale: false
}
)
@@ -49,43 +31,84 @@ const TCBParameter = ({
switch (vtable) {
case 'vStreets':
return (
-
- {JSON.stringify(tcbValue)}
-
+
)
case 'tTypes':
return (
-
- {(tcbValue as tType)?.name}
-
+
)
case 'vPipesGround':
return (
-
- {(tcbValue)?.name}
-
+
)
case 'vRepairEvent':
return (
-
- {(tcbValue)?.name}
-
+
)
case 'vPipesMaterial':
return (
-
- {(tcbValue)?.name}
-
+
)
case 'vBoilers':
return (
-
- {(tcbValue)?.name}
-
+
+ )
+ case 'vHotWaterTypes':
+ return (
+
+ )
+ case 'vHeatingTypes':
+ return (
+
+ )
+ case 'vColdWaterTypes':
+ return (
+
+ )
+ case 'vCanalization':
+ return (
+
+ )
+ case 'vElectroSupplyTypes':
+ return (
+
+ )
+ case 'vGasSupplyTypes':
+ return (
+
+ )
+ case 'vFoundation':
+ return (
+
+ )
+ case 'vMaterialsWall':
+ return (
+
+ )
+ case 'vCovering':
+ return (
+
+ )
+ case 'vRoof':
+ return (
+
+ )
+ case 'vTechStatus':
+ return (
+
+ )
+ case 'vPipeOutDiameters':
+ return (
+
+ )
+ case 'vPipeDiameters':
+ return (
+
)
default:
return (
+ {JSON.stringify(name)}
{JSON.stringify(tcbValue)}
)
diff --git a/client/src/components/map/TableValue.tsx b/client/src/components/map/TableValue.tsx
new file mode 100644
index 0000000..af818b6
--- /dev/null
+++ b/client/src/components/map/TableValue.tsx
@@ -0,0 +1,71 @@
+import { Checkbox, ComboboxData, Grid, NumberInput, Select, Text, Textarea } from '@mantine/core';
+import useSWR from 'swr';
+import { fetcher } from '../../http/axiosInstance';
+import { BASE_URL } from '../../constants';
+import { useObjectsStore } from '../../store/objects';
+
+interface TableValueProps {
+ name: string;
+ value: unknown;
+ type: 'value' | 'boolean' | 'number' | 'select' | 'string';
+ unit?: string | null | undefined;
+ vtable?: string;
+}
+
+const TableValue = ({
+ name,
+ value,
+ type,
+ unit,
+ vtable
+}: TableValueProps) => {
+ const { selectedCity } = useObjectsStore()
+
+ //Get available values
+ const { data: tcbAll, isValidating } = useSWR(
+ type === 'select' && selectedCity ? `/general/params/tcb?vtable=${vtable}&id_city=${selectedCity}` : null,
+ (url) => fetcher(url, BASE_URL.ems).then(res => {
+ if (Array.isArray(res)) {
+ return res.map((el) => ({
+ label: el.name || "",
+ value: JSON.stringify(el.id)
+ })) as ComboboxData
+ }
+ }),
+ {
+ revalidateOnFocus: false,
+ revalidateIfStale: false
+ }
+ )
+
+ return (
+
+
+ {name as string}
+
+
+ {type === 'boolean' ?
+
+ :
+ type === 'number' ?
+ { }}
+ suffix={unit ? ` ${unit}` : ''}
+ />
+ :
+ type === 'select' && !isValidating && tcbAll ?
+
+ :
+ type === 'string' ?
+
+ :
+ {value as string}
+ }
+
+
+ )
+}
+
+export default TableValue
\ No newline at end of file
diff --git a/client/src/components/map/mapUtils.ts b/client/src/components/map/mapUtils.ts
index 0479b11..0dc44c4 100644
--- a/client/src/components/map/mapUtils.ts
+++ b/client/src/components/map/mapUtils.ts
@@ -2,7 +2,7 @@ import { Coordinate, distance, rotate } from "ol/coordinate";
import { containsExtent, Extent, getCenter, getHeight, getWidth } from "ol/extent";
import Feature from "ol/Feature";
import GeoJSON from "ol/format/GeoJSON";
-import { Circle, Geometry, LineString, Point, Polygon, SimpleGeometry } from "ol/geom";
+import { Circle, Geometry, LineString, Polygon, SimpleGeometry } from "ol/geom";
import VectorLayer from "ol/layer/Vector";
import VectorImageLayer from "ol/layer/VectorImage";
import Map from "ol/Map";
@@ -20,13 +20,15 @@ import ImageLayer from "ol/layer/Image";
import { IFigure, ILine } from "../../interfaces/gis";
import { fromCircle } from "ol/geom/Polygon";
import { measureStyleFunction, modifyStyle } from "./Measure/MeasureStyles";
-import { getCurrentTool, getMeasureClearPrevious, getMeasureShowSegments, getMeasureType, getTipPoint } from "../../store/map";
+import { getCurrentTool, getMeasureClearPrevious, getMeasureType, getTipPoint } from "../../store/map";
+import { VectorImage } from "ol/layer";
+import { MutableRefObject } from "react";
export function processLine(
line: ILine,
scaling: { w: number, h: number },
mapCenter: Coordinate,
- linesLayer: React.MutableRefObject, any>>
+ linesLayer: React.MutableRefObject, VectorSource>>>
) {
const x1 = line.x1 * scaling.w
const y1 = line.y1 * scaling.h
@@ -53,7 +55,7 @@ export function processFigure(
figure: IFigure,
scaling: { w: number, h: number },
mapCenter: Coordinate,
- figuresLayer: React.MutableRefObject, any>>
+ figuresLayer: React.MutableRefObject, VectorSource>>>
) {
if (figure.figure_type_id == 1) {
const width = figure.width * scaling.w
@@ -186,7 +188,6 @@ export const addInteractions = (
measureModify: React.MutableRefObject,
) => {
const currentTool = getCurrentTool()
- const showSegments = getMeasureShowSegments()
const clearPrevious = getMeasureClearPrevious()
const measureType = getMeasureType()
const tipPoint = getTipPoint()
@@ -338,7 +339,7 @@ const zoomToFeature = (map: React.MutableRefObject