diff --git a/client/src/components/map/MapToolbar/MapToolbar.tsx b/client/src/components/map/MapToolbar/MapToolbar.tsx index 6335cb2..0386970 100644 --- a/client/src/components/map/MapToolbar/MapToolbar.tsx +++ b/client/src/components/map/MapToolbar/MapToolbar.tsx @@ -1,5 +1,5 @@ import { ActionIcon, useMantineColorScheme } from '@mantine/core' -import { IconApi, IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler } from '@tabler/icons-react' +import { IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler, IconTransformPoint } from '@tabler/icons-react' import { setCurrentTool, useMapStore } from '../../../store/map'; interface IToolbarProps { @@ -16,12 +16,6 @@ const MapToolbar = ({ return ( <ActionIcon.Group orientation='vertical' pos='absolute' top='8px' right='8px' style={{ zIndex: 1, backdropFilter: 'blur(8px)', backgroundColor: colorScheme === 'light' ? '#FFFFFFAA' : '#000000AA', borderRadius: '4px' }}> - <ActionIcon size='lg' variant='transparent' onClick={() => { - fetch(`${import.meta.env.VITE_API_EMS_URL}/hello`, { method: 'GET' }).then(res => console.log(res)) - }}> - <IconApi /> - </ActionIcon> - <ActionIcon size='lg' variant='transparent' onClick={onSave}> <IconExclamationCircle /> </ActionIcon> @@ -30,6 +24,15 @@ const MapToolbar = ({ <IconArrowBackUp /> </ActionIcon> + <ActionIcon + size='lg' + variant={mapState.currentTool === 'Edit' ? 'filled' : 'transparent'} + onClick={() => { + setCurrentTool('Edit') + }}> + <IconTransformPoint /> + </ActionIcon> + <ActionIcon size='lg' variant={mapState.currentTool === 'Point' ? 'filled' : 'transparent'} diff --git a/client/src/components/map/TCBParameter.tsx b/client/src/components/map/TCBParameter.tsx index 82529af..3a623fe 100644 --- a/client/src/components/map/TCBParameter.tsx +++ b/client/src/components/map/TCBParameter.tsx @@ -5,10 +5,10 @@ import { Text } from '@mantine/core' import TableValue from './TableValue' interface ITCBParameterProps { - value: string, - vtable: string, - inactive?: boolean, - name: string + value: string; + vtable: string; + inactive?: boolean; + name: string; } const TCBParameter = ({ @@ -28,26 +28,52 @@ const TCBParameter = ({ ) const tables = [ + 'PipesTypes', + 'vAddRepairEvent', 'vBoilers', + 'vBoilersAppointment', + 'vBoilersBalance', + 'vBoilersCondition', + 'vBoilersFuels', + 'vBoilersHotWater', + 'vBoilersPerimeter', + 'vBoilersPeriods', + 'vBoilersScheme', + 'vBoilersState', + 'vBoilersTypes', + 'vBuildingManagement', + 'vBuildingOwner', 'vCanalization', 'vColdWaterTypes', + 'vConditionEquipment', 'vCovering', + 'vDryer', 'vElectroSupplyTypes', + 'vEquipmentsTypes', 'vFoundation', + 'vFuelsFeed', 'vGasSupplyTypes', 'vHeatingTypes', + 'vHeatTransfer', 'vHotWaterTypes', 'vMaterialsWall', + 'vNormative', 'vPipeDiameters', 'vPipeOutDiameters', + 'vPipesBearingType', + 'vPipesCovering', 'vPipesGround', 'vPipesIsolation', 'vPipesLayer', 'vPipesMaterial', 'vRepairEvent', 'vRoof', + 'vRPSType', 'vStreets', 'vTechStatus', + 'vTrash', + 'vVentilation', + 'vWallingEquipment', 'tTypes', ]