diff --git a/.gitignore b/.gitignore index 1e2b64c..329050c 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .idea/ venv/ data/ -__pycache__/ \ No newline at end of file +__pycache__/ +*.csv +TESTS \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d141a2..aa5ef62 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,20 +2,11 @@ - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,78 +153,92 @@ K>orekta n_samp 1545 - print XYP + allow + allow_filtering + print + sca + feature + + + $PROJECT_DIR$/ui + $PROJECT_DIR$/api + $PROJECT_DIR$ + $PROJECT_DIR$/TESTS - @@ -185,7 +249,6 @@ - @@ -212,45 +275,28 @@ - + - + - - + - - - - - - - - - - - - - - - - - - + this.setState(state => ({ selected: { @@ -202,7 +206,7 @@ export class App extends React.Component<{}, AppState> { {key: 'day', value: 'day'}, {key: 'weekday', value: 'weekday'}, {key: 'monthday', value: 'monthday'}, - {key: 'timestamp', value: 'timestamp'} + {key: 'none', value: 'none'} ]} onChange={(selected) => this.setState(state => ({ selected: { diff --git a/ui/src/components/Chart/Chart.tsx b/ui/src/components/Chart/Chart.tsx index 4e0e303..14c8a91 100644 --- a/ui/src/components/Chart/Chart.tsx +++ b/ui/src/components/Chart/Chart.tsx @@ -50,7 +50,7 @@ export class Chart extends React.Component { return (
{this.renderSummary(data)} - + v.toExponential()}/> v.toExponential()}/> {this.state.showOutlierData diff --git a/ui/src/components/Chart/style.ts b/ui/src/components/Chart/style.ts index fde04f4..cfa3c8b 100644 --- a/ui/src/components/Chart/style.ts +++ b/ui/src/components/Chart/style.ts @@ -5,6 +5,7 @@ export const style: {[key: string]: React.CSSProperties} = { marginTop: 100 }, chart: { + marginLeft: 0, marginTop: 100 }, summary: { @@ -13,7 +14,7 @@ export const style: {[key: string]: React.CSSProperties} = { right: 0, top: 70, bottom: 0, - width: 300, + width: 280, zIndex: 100 }, colorBlock: { diff --git a/ui/src/types/Operator.ts b/ui/src/types/Operator.ts index 9aa4765..8eee874 100644 --- a/ui/src/types/Operator.ts +++ b/ui/src/types/Operator.ts @@ -1,4 +1,5 @@ export interface Operator { operator_id: number; operator_name: string; + has_enough: boolean; } \ No newline at end of file