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 37ee14d196542abe5359288b6b932cb151202465..1530c68dcc8ab4b328c391266f66e01b766e426c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js @@ -1658,14 +1658,14 @@ export class TimelineView extends Component { title: this.state.dsStatus?'Dynamic Scheduling is On':'Dynamic Scheduling is Off', className:`tag p-chips-token-label su-${this.state.dsStatus? 'finished': 'error'}`, type: 'tag' }, + this.state.dsStatus && { + title: this.state.subSystemStatus?'Dynamic Scheduling is active':'Dynamic Scheduling is idle', + className:` fa fa-${this.state.subSystemStatus? 'play' : 'stop'} subsystem p-chips-token-label su-${this.state.subSystemStatus? 'finished': 'error'}`, + type: 'tag' }, { content: 'F', title: this.state.fsStatus?'Fixed time Scheduling is On':'Fixed time Scheduling is Off', className:`tag p-chips-token-label su-${this.state.fsStatus? 'finished': 'error'}`, - type: 'tag' }, - this.state.dsStatus && { - title: this.state.subSystemStatus?'Sub system Scheduling is On':'Sub system Scheduling is Off', - className:` fa fa-${this.state.subSystemStatus? 'play' : 'stop'} subsystem p-chips-token-label su-${this.state.subSystemStatus? 'finished': 'error'}`, - type: 'tag' }, + type: 'tag' }, { icon: 'fa-cog', title: 'Scheduling Settings', type: 'button', actOn: 'click', props: { callback: this.showDymanicSchedulerPopup }, }, { icon: 'fa-bars', title: '', diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js index 664a766287217c72ec546b588fa2546eb33d0afe..e80710d4b4f2b91613fdfc0d49e35c5d14304aea 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js @@ -1331,14 +1331,14 @@ export class WeekTimelineView extends Component { title: this.state.dsStatus?'Dynamic Scheduling is On':'Dynamic Scheduling is Off', className:`tag p-chips-token-label su-${this.state.dsStatus? 'finished': 'error'}`, type: 'tag' }, + this.state.dsStatus && { + title: this.state.subSystemStatus?'Dynamic Scheduling is active':'Dynamic Scheduling is idle', + className:`fa fa-${this.state.subSystemStatus? 'play' : 'stop'} subsystem p-chips-token-label su-${this.state.subSystemStatus? 'finished': 'error'}`, + type: 'tag' }, { content: 'F', title: this.state.fsStatus?'Fixed time Scheduling is On':'Fixed time Scheduling is Off', className:`tag p-chips-token-label su-${this.state.fsStatus? 'finished': 'error'}`, type: 'tag' }, - this.state.dsStatus && { - title: this.state.subSystemStatus?'Sub system Scheduling is On':'Sub System Scheduling is Off', - className:`fa fa-${this.state.subSystemStatus? 'play' : 'stop'} subsystem p-chips-token-label su-${this.state.subSystemStatus? 'finished': 'error'}`, - type: 'tag' }, { icon: 'fa-cog', title: 'Scheduling Settings', type: 'button', actOn: 'click', props: { callback: this.showDymanicSchedulerPopup }, }, { icon: 'fa-bars', title: '', type: 'button', actOn: 'mouseOver', props: { callback: this.showOptionMenu }, },