Skip to content

Commit a363d23

Browse files
committed
finished times
1 parent 687c2b2 commit a363d23

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

src/app/components/App.jsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class App extends Component {
4545
isPlaying: false,
4646
isRecording: false,
4747
isPlayingIndex: 0,
48+
eventTimes: [],
4849
};
4950

5051
this.portToExtension = null;
@@ -76,14 +77,20 @@ class App extends Component {
7677
id: this.state.data.length,
7778
};
7879

80+
// search field
7981
const { searchField } = this.state;
8082
const newDataActionType = newData.action.type.toLowerCase();
83+
84+
// get the date everytime an action fires and add it to state
85+
86+
const eventTime = Date.now();
8187

8288
if (newDataActionType.includes(searchField.toLowerCase())) {
8389
this.setState(state => ({
8490
data: [...state.data, newData],
8591
isPlayingIndex: state.data.length,
8692
filteredData: [...state.filteredData, newData],
93+
eventTimes: [...state.eventTimes, eventTime],
8794
}));
8895
} else {
8996
this.setState(state => ({
@@ -283,6 +290,7 @@ class App extends Component {
283290
isRecording,
284291
filteredData,
285292
searchField,
293+
eventTimes,
286294
} = this.state;
287295

288296
return (
@@ -299,6 +307,7 @@ class App extends Component {
299307
searchChange={this.searchChange}
300308
filteredData={filteredData}
301309
searchField={searchField}
310+
eventTimes={eventTimes}
302311
/>
303312
)}
304313
right={

src/app/components/EventCards/EventCreator.jsx

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,32 @@ import { EventCard, EventTimeDiv } from '../../styles/Events.jsx';
55
export default function EventCreator(props) {
66
// renders individual action
77
const {
8-
action, id, addAction, actionTime, selectedEvent,
8+
action, id, addAction, actionTime, selectedEvent, index, eventTimes,
99
} = props;
10+
11+
let displayTime;
12+
let timeDifference;
13+
14+
if (id === 0) {
15+
displayTime = '00: 00: 00';
16+
} else {
17+
timeDifference = eventTimes[id] - eventTimes[id - 1];
18+
timeDifference = new Date(timeDifference);
19+
20+
let minute = timeDifference.getMinutes();
21+
minute < 10 ? minute = '0' + minute : minute;
22+
let second = timeDifference.getSeconds();
23+
second < 10 ? second = '0' + second : second;
24+
let millisecond = Math.floor(timeDifference.getMilliseconds() / 10);
25+
millisecond < 10 ? millisecond = '0' + millisecond : millisecond;
26+
27+
displayTime = `${minute} : ${second} : ${millisecond}`;
28+
}
29+
1030
return (
1131
<EventCard id={id} onClick={addAction} selectedEvent={selectedEvent}>
1232
&#x2630;{action}
13-
<EventTimeDiv id={id} selectedEvent={selectedEvent}>{actionTime || '00:00:01'}</EventTimeDiv>
33+
<EventTimeDiv id={id} selectedEvent={selectedEvent}>{displayTime}</EventTimeDiv>
1434
</EventCard>
1535

1636
);

src/app/components/EventCards/EventsDisplay.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ import EventCreator from './EventCreator.jsx';
77
import { EventsWrapper } from '../../styles/Events.jsx';
88

99
export default function Events(props) {
10-
const { data,
10+
const {
11+
data,
1112
activeEventId,
1213
filteredData,
14+
eventTimes,
1315
} = props;
1416
return (
1517
<EventsWrapper>
@@ -18,8 +20,10 @@ export default function Events(props) {
1820
selectedEvent={activeEventId === e.id ? 'true' : 'false'}
1921
action={e.action.type}
2022
key={i}
23+
index={i}
2124
id={e.id}
2225
addAction={props.addAction}
26+
eventTimes={eventTimes}
2327
/>
2428
))}
2529
</EventsWrapper>

src/app/container/Events.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class Events extends Component {
1919
searchChange,
2020
filteredData,
2121
searchField,
22+
eventTimes,
2223
} = this.props;
2324
return (
2425
<>
@@ -29,6 +30,7 @@ class Events extends Component {
2930
filteredData={filteredData}
3031
addAction={addAction}
3132
activeEventId={activeEventId}
33+
eventTimes={eventTimes}
3234
/>
3335
</>
3436
);

0 commit comments

Comments
 (0)