Skip to content

Commit

Permalink
Filter datapoints by timestamp - Timestamp Filter - Issue #279 (#338)
Browse files Browse the repository at this point in the history
* implementing component

* redux implementation

* extracting date information from MUI date picker

* working redux implementation

* useState implementation in timestamp component

* working redux + APPLY button implementation

* filter function applied onto prop arrays + RESET button

* fixed bug where calendar shows behind date picker

* format and linter changes

* adjusted width of timestamp filter

* added time field to time picker + redux bug fixes

* removing unecessary constants and comments

* stylistic changes

* working version of filtering with MapsContainer.tsx

* modifying aisships simulation to include differing timestamps

* bug fix of aisships json data for simulation

* added timestamp filtering functionality for aisships

* simulation timestamp adjustment & dashboard filtering bug fix

* bug fix, redux refactoring, format & lint

* Slight adjustments to timestamp button; fixed merge conflicts

* Suppress Hydration Warning

* Added package-lock.json file

---------

Co-authored-by: John Ahn <john.ahn.es@gmail.com>
  • Loading branch information
dk1702 and jahn18 authored Apr 4, 2024
1 parent 4f9090e commit e6b204c
Show file tree
Hide file tree
Showing 20 changed files with 738 additions and 227 deletions.
2 changes: 2 additions & 0 deletions src/website/lib/redux/rootReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import LocalPathReducer from '@/stores/LocalPath/LocalPathReducers';
import BatteriesReducer from '@/stores/Batteries/BatteriesReducers';
import WindSensorsReducer from '@/stores/WindSensors/WindSensorsReducers';
import GenericSensorsReducer from '@/stores/GenericSensors/GenericSensorsReducers';
import DataFilterReducer from '@/stores/DataFilter/DataFilterReducers';

export function rootReducer() {
const reducerMap = {
Expand All @@ -17,6 +18,7 @@ export function rootReducer() {
batteries: new BatteriesReducer().reducer,
windSensors: new WindSensorsReducer().reducer,
genericSensors: new GenericSensorsReducer().reducer,
dataFilter: new DataFilterReducer().reducer,
};

return combineReducers(reducerMap);
Expand Down
3 changes: 3 additions & 0 deletions src/website/lib/redux/rootSaga.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import GlobalPathSagas from '@/stores/GlobalPath/GlobalPathSagas';
import BatteriesSagas from '@/stores/Batteries/BatteriesSagas';
import WindSensorsSagas from '@/stores/WindSensors/WindSensorsSagas';
import GenericSensorsSagas from '@/stores/GenericSensors/GenericSensorsSagas';
import DataFilterSagas from '@/stores/DataFilter/DataFilterSagas';
import DataFilterActions from '@/stores/DataFilter/DataFilterActions';

export function* rootSaga() {
const rootSagaMap = {
Expand All @@ -16,6 +18,7 @@ export function* rootSaga() {
batteries: new BatteriesSagas().forkSagas(),
windSensors: new WindSensorsSagas().forkSagas(),
genericSensors: new GenericSensorsSagas().forkSagas(),
dataFilter: new DataFilterSagas().forkSaga(DataFilterActions.SET_TIMESTAMP),
};

yield all(combineSagas(rootSagaMap));
Expand Down
Loading

0 comments on commit e6b204c

Please sign in to comment.