Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated time filter to use gemstone version #97

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
857c49c
Used gemstone TimeFilter
Tenacs Jul 18, 2024
186f000
deleted ReportTimeFilter file and fixed TimeFilter props
Tenacs Jul 19, 2024
4bd04c4
wrapped EventTypeFilter in <Li> tag
Tenacs Jul 31, 2024
8fddbfd
updated packages
Tenacs Aug 13, 2024
1a789a8
formatted and added 'key' props
collins-self Aug 28, 2024
a87eef3
fixed optional prop
collins-self Sep 4, 2024
c1c345e
works with updated TimeFilter
collins-self Sep 4, 2024
37f20c3
removing center from selector
collins-self Sep 4, 2024
f3ce7c8
removed center from global.d.ts
collins-self Sep 4, 2024
3fbc5b2
imports, and formatting
collins-self Sep 6, 2024
325692f
time window was wrong
collins-self Sep 6, 2024
b2ec27a
removed a comment
collins-self Sep 6, 2024
a92faac
updated packages
collins-self Sep 9, 2024
1fb47c4
updated EvenSearchNavbar.tsx
collins-self Sep 9, 2024
306e3a2
SVGIcons not available anymore
collins-self Sep 9, 2024
5ddd007
TrendData startEnd Time Update
collins-self Sep 9, 2024
01e963a
updated global types
collins-self Sep 9, 2024
4357ae4
TrendDate time display changes
collins-self Sep 9, 2024
4da08c1
EventSearch time update
collins-self Sep 9, 2024
7e18afd
Updated front end to start-end
collins-self Sep 12, 2024
7cc6f64
initial pass on backend for start-end
collins-self Sep 12, 2024
1fc54b3
added global format
collins-self Sep 12, 2024
13af5ae
BreakerReport uses global time format
collins-self Sep 12, 2024
a4a8067
CapBankReport using global filter
collins-self Sep 12, 2024
a3d3596
DER using global time format
collins-self Sep 12, 2024
13656ad
EventSearch uses global time format. Changed all to useEffect
collins-self Sep 12, 2024
0cf28d7
RelayReport uses global time format
collins-self Sep 12, 2024
fc49be2
TrendMarkerTable uses global time format
collins-self Sep 12, 2024
a8c6df3
TrendData settings updated to global time format
collins-self Sep 12, 2024
1235def
TrendData is using global time format
collins-self Sep 12, 2024
30caf4b
Meter Activity uses global time format
collins-self Sep 12, 2024
654976f
Updated Meteractivity
collins-self Sep 12, 2024
6e0e166
updated breakerreport class
collins-self Sep 12, 2024
26e2ab6
fixed breakerreportnavbar class
collins-self Sep 13, 2024
8f9939c
date time filter matches up with backend
collins-self Sep 13, 2024
d531fbd
package-lock and package.json were unadded?
collins-self Sep 13, 2024
a9b4007
package-lock webconfig package.json were unadded?
collins-self Sep 13, 2024
b8f1c3a
removed useEffects
collins-self Sep 13, 2024
a78acee
simplified state
collins-self Sep 16, 2024
0868413
npm ci got removed from build script
collins-self Sep 16, 2024
4fe2cd7
EventSearchNavbar format
collins-self Sep 20, 2024
446945b
removed unused imports for linter
collins-self Sep 20, 2024
6146e95
final error fixes, lining up requests with db
collins-self Sep 24, 2024
ab73e5d
lint fixes
collins-self Sep 24, 2024
3b01d5d
Update Submodule Pointer
gsfbuildbot Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BreakerReport uses global time format
collins-self committed Jan 29, 2025

Verified

This commit was signed with the committer’s verified signature.
Garfield550 Garfield Lee
commit 13af5ae0cde444791d59c1a2c1ec972ed29fbfb1
11 changes: 7 additions & 4 deletions SEBrowser/Scripts/TSX/Components/BreakerReport/BreakerReport.tsx
Original file line number Diff line number Diff line change
@@ -23,9 +23,10 @@
import * as React from 'react';
import BreakerReportNavbar from './BreakerReportNavbar';
import * as queryString from 'querystring';
const momentDateFormat = "MM/DD/YYYY";
import moment from 'moment';
import { useLocation, useNavigate } from 'react-router-dom';
import { useSelector } from 'react-redux';
import { SelectDateTimeSetting } from '../SettingsSlice';

declare let homePath: string;

@@ -39,14 +40,16 @@ const BreakerReport = () => {
const [fromDate, setFromDate] = React.useState<string>('');
const [toDate, setToDate] = React.useState<string>('');
const [breaker, setBreaker] = React.useState<string>('');
const dateTimeSetting = useSelector(SelectDateTimeSetting);
const dateTimeFormat = dateTimeSetting.DateTimeFormat;
const navigate = useNavigate();
const history = useLocation();

React.useEffect(() => {
const query = queryString.parse(history.search.replace("?", ""), "&", "=");

setFromDate(query['fromDate'] != undefined ? query['fromDate'].toString() : moment().subtract(30, 'days').format(momentDateFormat));
setToDate(query['toDate'] != undefined ? query['toDate'].toString() : moment().format(momentDateFormat));
setFromDate(query['fromDate'] != undefined ? query['fromDate'].toString() : moment().subtract(30, 'days').format(dateTimeFormat));
setToDate(query['toDate'] != undefined ? query['toDate'].toString() : moment().format(dateTimeFormat));
setBreaker(query['breaker'] != undefined ? query['breaker'].toString() : '0');

}, []);
@@ -58,7 +61,7 @@ const BreakerReport = () => {
const q = queryString.stringify(state, "&", "=");
const handle = setTimeout(() => navigate(history.pathname + '?' + q), 500);
return (() => { clearTimeout(handle); })
}, [fromDate,toDate,breaker])
}, [fromDate, toDate, breaker])

function setState(a: State) {
setFromDate(a.fromDate);
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@

import React from 'react';
import BreakerReportService from './../../../TS/Services/BreakerReport'
import { useSelector } from 'react-redux';
import { SelectDateTimeSetting } from '../SettingsSlice';


export interface BreakerReportNavbarProps {
@@ -36,8 +38,8 @@ interface State {
breakers: Array<any>
}

const momentDateFormat = "MM/DD/YYYY";

const dateTimeSetting = useSelector(SelectDateTimeSetting);
const dateTimeFormat = dateTimeSetting.DateTimeFormat;

export default class BreakerReportNavbar extends React.Component<BreakerReportNavbarProps, State> {
breakerReportService: BreakerReportService;
@@ -51,13 +53,13 @@ export default class BreakerReportNavbar extends React.Component<BreakerReportNa
}

componentDidMount() {
$('#toDatePicker').datetimepicker({ format: momentDateFormat });
$('#toDatePicker').datetimepicker({ format: dateTimeFormat });
$('#toDatePicker').on('dp.change', (e) => this.props.stateSetter({ toDate: (e.target as any).value }));
$('#fromDatePicker').datetimepicker({ format: momentDateFormat });
$('#fromDatePicker').datetimepicker({ format: dateTimeFormat });
$('#fromDatePicker').on('dp.change', (e) => this.props.stateSetter({ fromDate: (e.target as any).value }));

this.breakerReportService.getMaximoBreakers().done(data => {
this.setState({ breakers: data.map((d,i) => <option key={i} value={d.AssetKey}>{d.BreakerName}</option>)});
this.setState({ breakers: data.map((d, i) => <option key={i} value={d.AssetKey}>{d.BreakerName}</option>) });
});
}