From e03b7c56394969d70db78c73639d4ad0d29e541d Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <r.kumar@redkarma.eu>
Date: Thu, 15 Oct 2020 21:39:52 +0530
Subject: [PATCH] TMSS-356: Date format for LST updated and removed unused code
---
.../components/Timeline/CalendarTimeline.js | 20 +--------
.../tmss_webapp/src/routes/Timeline/view.js | 42 -------------------
2 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js
index 084ebc659c9..ba27d387d39 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Timeline/CalendarTimeline.js
@@ -165,7 +165,7 @@ export class CalendarTimeline extends Component {
const currentUTC = moment.utc(utcString);
this.setState({currentUTC: currentUTC});
let currentLST = await UtilService.getLST(utcString);
- this.setState({currentLST: moment(currentUTC.format('DD-MMM-YYYY ') + currentLST.split('.')[0])})
+ this.setState({currentLST: moment(currentUTC.format('DD-MMM-YYYY ') + currentLST.split('.')[0], 'DD-MMM-YYYY HH:mm:ss')})
} );
} else {
this.setState({currentUTC: this.state.currentUTC.add(1, 'second'),
@@ -195,7 +195,7 @@ export class CalendarTimeline extends Component {
const formattedColUTC = colUTC.format(lstDateHeaderUnit==="hour"?UTC_LST_HOUR_FORMAT:UTC_LST_DAY_FORMAT);
// if (!lstDateHeaderMap[formattedColUTC]) {
const lst = await UtilService.getLST(formattedColUTC);
- const lstDate = moment(colUTC.format(`DD-MMM-YYYY ${lst.split('.')[0]}`)).add(30, 'minutes');
+ const lstDate = moment(colUTC.format(`MM-DD-YYYY ${lst.split('.')[0]}`), 'MM-DD-YYYY HH:mm:ss').add(30, 'minutes');
lstDateHeaderMap[formattedColUTC] = lstDateHeaderUnit==="hour"?lstDate.format('HH'):lstDate.format('DD');
// }
}
@@ -609,14 +609,6 @@ export class CalendarTimeline extends Component {
* Zooms In to the next pre-defined zoom level
*/
zoomIn() {
- /*let visibleTimeStart = this.state.defaultStartTime;
- let visibleTimeEnd = this.state.defaultEndTime;
- const visibleTimeDiff = visibleTimeEnd.valueOf()-visibleTimeStart.valueOf();
- if (visibleTimeDiff > this.state.minZoom) {
- const secondsToZoom = visibleTimeDiff / 1000 / 2 / 4 * 3 ;
- this.setState({defaultStartTime: visibleTimeStart.add(1*secondsToZoom, 'seconds'),
- defaultEndTime: visibleTimeEnd.add(-1*secondsToZoom, 'seconds')});
- }*/
let prevZoomLevel = this.state.zoomLevel;
const prevZoomObject = _.find(ZOOM_LEVELS, {'name': prevZoomLevel});
const prevZoomIndex = ZOOM_LEVELS.indexOf(prevZoomObject);
@@ -629,14 +621,6 @@ export class CalendarTimeline extends Component {
* Zooms out to the next pre-defined zoom level
*/
zoomOut() {
- /*let visibleTimeStart = this.state.defaultStartTime;
- let visibleTimeEnd = this.state.defaultEndTime;
- const visibleTimeDiff = visibleTimeEnd.valueOf()-visibleTimeStart.valueOf();
- if (visibleTimeDiff < this.state.maxZoom) {
- const secondsToZoom = visibleTimeDiff / 1000 * 3 / 2;
- this.setState({defaultStartTime: visibleTimeStart.add(-1*secondsToZoom, 'seconds'),
- defaultEndTime: visibleTimeEnd.add(1*secondsToZoom, 'seconds')});
- }*/
let prevZoomLevel = this.state.zoomLevel;
const prevZoomObject = _.find(ZOOM_LEVELS, {'name': prevZoomLevel});
const prevZoomIndex = ZOOM_LEVELS.indexOf(prevZoomObject);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
index a2090d62cf3..3d4ad6a1a31 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -241,16 +241,6 @@ export class TimelineView extends Component {
<PageHeader location={this.props.location} title={'Scheduling Units - Timeline View'} />
{ this.state.isLoading ? <AppLoader /> :
<div className="p-grid">
- {/* <SplitPane split="vertical" defaultSize={600} style={{height: 'auto'}} primary="second"> */}
- {/* <div className={isSUDetsVisible || (canExtendSUList && !canShrinkSUList)?"resize-div-min col-lg-4 col-md-4 col-sm-12":((canExtendSUList && canShrinkSUList)?"resize-div-avg col-lg-5 col-md-5 col-sm-12":"resize-div-max col-lg-6 col-md-6 col-sm-12")}>
- <button className="p-link resize-btn" disabled={!this.state.canExtendSUList}
- onClick={(e)=> { this.resizeSUList(1)}}>
- <i className="pi pi-step-forward"></i>
- </button>
- <button className="p-link resize-btn" disabled={!this.state.canShrinkSUList}
- onClick={(e)=> { this.resizeSUList(-1)}}>
- <i className="pi pi-step-backward"></i>
- </button></div> */}
{/* SU List Panel */}
<div className={isSUDetsVisible || (canExtendSUList && !canShrinkSUList)?"col-lg-4 col-md-4 col-sm-12":((canExtendSUList && canShrinkSUList)?"col-lg-5 col-md-5 col-sm-12":"col-lg-6 col-md-6 col-sm-12")}
style={{position: "inherit", borderRight: "5px solid #efefef", paddingTop: "10px"}}>
@@ -290,7 +280,6 @@ export class TimelineView extends Component {
rowHeight={30} itemClickCallback={this.onItemClick}
dateRangeCallback={this.dateRangeCallback}></Timeline>
</div>
- {/* </SplitPane> */}
{/* Details Panel */}
{this.state.isSUDetsVisible &&
<div className="col-lg-3 col-md-3 col-sm-12"
@@ -299,37 +288,6 @@ export class TimelineView extends Component {
<SchedulingUnitSummary schedulingUnit={suBlueprint} suTaskList={this.state.suTaskList}
closeCallback={this.closeSUDets}></SchedulingUnitSummary>
}
- {/* <div className="p-grid timeline-details-pane" style={{marginTop: '10px'}}>
- <h6 className="col-lg-10 col-sm-10">Details</h6>
- <Link to={`/schedulingunit/view/blueprint/${suBlueprint.id}`}><i className="fa fa-eye"></i></Link>
- <Link to={`/su/timelineview`} onClick={this.closeSUDets}><i className="fa fa-times"></i></Link>
- <div className="col-4"><label>Name:</label></div>
- <div className="col-8">{suBlueprint.name}</div>
- <div className="col-4"><label>Project:</label></div>
- <div className="col-8">{suBlueprint.project.name}</div>
- <div className="col-4"><label>Start Time:</label></div>
- <div className="col-8">{moment.utc(suBlueprint.start_time).format("DD-MMM-YYYY HH:mm:ss")}</div>
- <div className="col-4"><label>Stop Time:</label></div>
- <div className="col-8">{moment.utc(suBlueprint.stop_time).format("DD-MMM-YYYY HH:mm:ss")}</div>
- <div className="col-4"><label>Status:</label></div>
- <div className="col-8">{suBlueprint.status}</div>
- <div className="col-12">
- <ViewTable
- data={this.state.suTaskList}
- defaultcolumns={[{id: "ID", start_time:"Start Time", stop_time:"End Time", status: "Status",
- antenna_set: "Antenna Set", band: 'Band'}]}
- optionalcolumns={[{actionpath: "actionpath"}]}
- columnclassname={[{"ID": "filter-input-50", "Start Time": "filter-input-75", "End Time": "filter-input-75",
- "Status": "filter-input-75", "Antenna Set": "filter-input-75", "Band": "filter-input-75"}]}
- defaultSortColumn= {[{id: "ID", desc: false}]}
- showaction="false"
- tablename="timeline_su_taskslist"
- showTopTotal={false}
- showGlobalFilter={false}
- showColumnFilter={false}
- />
- </div>
- </div> */}
</div>
}
--
GitLab