From 11ff4b7e94112a94e0e97884c7edb22752631966 Mon Sep 17 00:00:00 2001 From: Chika Date: Sat, 14 Nov 2020 13:31:58 +0300 Subject: [PATCH] ui fixes --- src/client/Containers/Calculation/Results/index.jsx | 9 +++------ .../Containers/Calculation/Sections/sectionsList.ts | 4 ++-- src/core/types/Calculation/components.ts | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/client/Containers/Calculation/Results/index.jsx b/src/client/Containers/Calculation/Results/index.jsx index 78af76a..1802891 100644 --- a/src/client/Containers/Calculation/Results/index.jsx +++ b/src/client/Containers/Calculation/Results/index.jsx @@ -1,19 +1,16 @@ import { Divider } from 'antd'; import { renderGroups } from 'client/Containers/Calculation/lib/renderSections'; import Background from 'client/Elements/Background'; -import Title from 'client/Elements/Title'; -import { Flex } from 'client/UIKit/grid'; +import { Flex, Box } from 'client/UIKit/grid'; import React from 'react'; -import { resultInfo, calculationResults } from './resultsList'; +import { calculationResults, resultInfo } from './resultsList'; const Results = props => ( + {renderGroups({ groups: resultInfo })} - - - </Flex> {renderGroups({ groups: calculationResults })} </Flex> </Background> diff --git a/src/client/Containers/Calculation/Sections/sectionsList.ts b/src/client/Containers/Calculation/Sections/sectionsList.ts index cbd4ab5..f447802 100644 --- a/src/client/Containers/Calculation/Sections/sectionsList.ts +++ b/src/client/Containers/Calculation/Sections/sectionsList.ts @@ -14,10 +14,10 @@ import { validateKpp, validatePhone, } from 'client/tools/validate'; -import { ISections } from 'core/types/Calculation/components'; +import { ISection } from 'core/types/Calculation/components'; import { ElementType } from 'core/types/Calculation/Store/elements'; -const sections: ISections[] = [ +const sections: ISection[] = [ { title: 'Интерес/ЛС', groups: [ diff --git a/src/core/types/Calculation/components.ts b/src/core/types/Calculation/components.ts index 6f22ac6..969cb5d 100644 --- a/src/core/types/Calculation/components.ts +++ b/src/core/types/Calculation/components.ts @@ -47,7 +47,7 @@ export interface IGroup { blocks?: IBlock[]; } -export interface ISections { +export interface ISection { title?: string; groups?: IGroup[]; }