update code

bbbond123 · Feb 5, 2020 · 438b43e · 438b43e
1 parent 466bf1e
commit 438b43e
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,9 +7,11 @@
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
     "@types/jest": "^24.9.1",
+    "@types/lodash": "^4.14.149",
     "@types/node": "^12.12.26",
     "@types/react": "^16.9.19",
     "@types/react-dom": "^16.9.5",
+    "lodash": "^4.17.15",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-scripts": "3.3.1",

diff --git a/src/App.css b/src/App.css
@@ -1,38 +1,4 @@
 .App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+  width: 800px;
+  margin: 0 auto;
 }
diff --git a/src/App.tsx b/src/App.tsx
@@ -2,16 +2,17 @@ import React from 'react';
 import logo from './logo.svg';
 import 'semantic-ui-css/semantic.min.css'
 import Logs from './Component/Logs'
+import { } from 'lodash'
 import './App.css';
 
 const App = () => {
   return (
     <div className="App">
       <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
+        {/* <img src={logo} className="App-logo" alt="logo" /> */}
+        {/* <p>
           Edit <code>src/App.tsx</code> and save to reload.
-        </p>
+        </p> */}
         <a
           className="App-link"
           href="https://reactjs.org"
@@ -20,6 +21,10 @@ const App = () => {
         >
           Learn React
         </a>
+        <br />
+        <br />
+        <br />
+        <br />
         <Logs />
       </header>
     </div>

diff --git a/src/Component/Logs/index.tsx b/src/Component/Logs/index.tsx
@@ -1,13 +1,16 @@
 import * as React from 'react';
 import ButtonExampleButton from '../../universal/ButtonExampleButton'
 import { Button, Icon } from 'semantic-ui-react'
+import LogsTable from '../../universal/LogsTable';
 
 export interface ILogsProps {
 }
 
 export default function Logs(props: ILogsProps) {
     return (
         <div>
+            <LogsTable />
+
             <ButtonExampleButton />
 
             <Button animated>

diff --git a/src/scenario.ts b/src/scenario.ts
@@ -0,0 +1,24 @@
+
+export interface ITest {
+    simulationRuns: ISimulationRuns[]
+    scenarios: IScenarios[]
+}
+
+export interface IScenarios {
+    scenarioId: string;
+    maxnumberOfStops: number;
+    maxRunningTime: number
+}
+
+export interface ISimulationRuns {
+    startTime: number;
+    endTime: number;
+    scenarioId: string,
+    carBuild: string,
+    result: IResult
+}
+
+export interface IResult {
+    numberOfStops: number
+    hasCollision: boolean
+}
diff --git a/src/universal/LogsTable.tsx b/src/universal/LogsTable.tsx
@@ -0,0 +1,68 @@
+import React from 'react'
+import { Icon, Label, Menu, Table } from 'semantic-ui-react'
+
+const LogsTable = () => (
+    <Table celled>
+        <Table.Header>
+            <Table.Row>
+                <Table.HeaderCell>scenarioId </Table.HeaderCell>
+                <Table.HeaderCell>carBuild </Table.HeaderCell>
+                <Table.HeaderCell>startTime </Table.HeaderCell>
+                <Table.HeaderCell>runningTime / maxRunningTime </Table.HeaderCell>
+                <Table.HeaderCell>numberOfStops / maxNumberOfStops </Table.HeaderCell>
+                <Table.HeaderCell>hasCollision </Table.HeaderCell>
+                <Table.HeaderCell>doesScenarioPass </Table.HeaderCell>
+            </Table.Row>
+        </Table.Header>
+        <Table.Body>
+            <Table.Row>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+            </Table.Row>
+            <Table.Row>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+            </Table.Row>
+            <Table.Row>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+                <Table.Cell>Cell</Table.Cell>
+            </Table.Row>
+        </Table.Body>
+
+        <Table.Footer>
+            <Table.Row>
+                <Table.HeaderCell colSpan='7'>
+                    <Menu floated='right' pagination>
+                        <Menu.Item as='a' icon>
+                            <Icon name='chevron left' />
+                        </Menu.Item>
+                        <Menu.Item as='a'>1</Menu.Item>
+                        <Menu.Item as='a'>2</Menu.Item>
+                        <Menu.Item as='a'>3</Menu.Item>
+                        <Menu.Item as='a'>4</Menu.Item>
+                        <Menu.Item as='a' icon>
+                            <Icon name='chevron right' />
+                        </Menu.Item>
+                    </Menu>
+                </Table.HeaderCell>
+            </Table.Row>
+        </Table.Footer>
+    </Table>
+)
+
+export default LogsTable