diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d76e7cd9c8fedc632d60dd14ea9a3b1388c1fe6
--- /dev/null
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/index.js
@@ -0,0 +1,7 @@
+import { ReservationList} from './reservation.list';
+import { ReservationCreate } from './reservation.create';
+import { ReservationView } from './reservation.view';
+import { ReservationSummary } from './reservation.summary';
+import { ReservationEdit } from './reservation.edit';
+
+export {ReservationCreate, ReservationList, ReservationSummary, ReservationView, ReservationEdit} ;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
similarity index 99%
rename from SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.create.js
rename to SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
index 9e8b62e630b6223229acd244a09675681b6b49dc..e56f6d8a4d1cfc6dd273e13e744dfdbd2dd72018 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
@@ -245,7 +245,7 @@ export class ReservationCreate extends Component {
let reservation = this.state.reservation;
let project = this.projects.find(project => project.name === reservation.project);
reservation['start_time'] = moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
- reservation['stop_time'] = reservation['stop_time']?moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT):reservation['stop_time'];
+ reservation['stop_time'] = reservation['stop_time']?moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT):null;
reservation['project']= project ? project.url: null;
reservation['specifications_template']= this.reservationTemplates[0].url;
reservation['specifications_doc']= this.paramsOutput;
@@ -464,7 +464,7 @@ export class ReservationCreate extends Component {
<Dialog header={this.state.dialog.header} visible={this.state.dialogVisible} style={{width: '25vw'}} inputId="confirm_dialog"
modal={true} onHide={() => {this.setState({dialogVisible: false})}}
footer={<div>
- <Button key="back" onClick={() => {this.setState({dialogVisible: false, redirect: `/su/timelineview/reservation/list`});}} label="No" />
+ <Button key="back" onClick={() => {this.setState({dialogVisible: false, redirect: `/reservation/list`});}} label="No" />
<Button key="submit" type="primary" onClick={this.reset} label="Yes" />
</div>
} >
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
similarity index 99%
rename from SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.edit.js
rename to SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
index 9c0329023f5004e966fe24201f501cc6bfdd42b6..e2eb10aac84a4b3b923bf27cbe49cd064e910343 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
@@ -306,7 +306,7 @@ export class ReservationEdit extends Component {
if (reservation && reservation.id){
appGrowl.show({severity: 'success', summary: 'Success', detail: 'Reservation updated successfully.'});
this.props.history.push({
- pathname: `/su/timelineview/reservation/view/${this.props.match.params.id}`,
+ pathname: `/reservation/view/${this.props.match.params.id}`,
});
} else {
appGrowl.show({severity: 'error', summary: 'Error Occured', detail: 'Unable to update Reservation', showDialog: false, isDirty: false});
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
similarity index 99%
rename from SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.list.js
rename to SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
index c11f03179a9efb04321480427b54bc19827aaf77..979508e47c8880a62d0e368adb8d356620c3d653 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
@@ -147,7 +147,7 @@ export class ReservationList extends Component{
reservation['stop_time']= moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
}
reservation['start_time']= moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
- reservation['actionpath'] = `/su/timelineview/reservation/view/${reservation.id}`;
+ reservation['actionpath'] = `/reservation/view/${reservation.id}`;
reservation['canSelect'] = true;
this.reservations.push(reservation);
};
@@ -394,7 +394,7 @@ export class ReservationList extends Component{
return (
<React.Fragment>
<PageHeader location={this.props.location} title={'Reservation - List'}
- actions={[{icon: 'fa-plus-square', title:'Add Reservation', props : { pathname: `/su/timelineview/reservation/create`}},
+ actions={[{icon: 'fa-plus-square', title:'Add Reservation', props : { pathname: `/reservation/create`}},
{icon: 'fa-window-close', title:'Click to close Reservation list', props : { pathname: `/su/timelineview`}}]}/>
{this.state.isLoading? <AppLoader /> : (this.state.reservationsList && this.state.reservationsList.length>0) ?
<>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.summary.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js
similarity index 100%
rename from SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.summary.js
rename to SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.view.js
similarity index 97%
rename from SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.view.js
rename to SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.view.js
index 1b7d7bfd83feaa50345d1c854b4ae566b75fef0b..659706f238485912fb250a552ffde9b35c7b384c 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.view.js
@@ -130,7 +130,7 @@ export class ReservationView extends Component {
if (this.props.history.length > 2) {
this.props.history.goBack();
} else {
- this.setState({redirect: `/su/timelineview/reservation/list`});
+ this.setState({redirect: `/reservation/list`});
}
}
}
@@ -153,11 +153,11 @@ export class ReservationView extends Component {
}
let actions = [ ];
- actions.push({ icon: 'fa-edit', title:'Click to Edit Reservation', props : { pathname:`/su/timelineview/reservation/edit/${this.state.reservation?this.state.reservation.id:null}`}});
+ actions.push({ icon: 'fa-edit', title:'Click to Edit Reservation', props : { pathname:`/reservation/edit/${this.state.reservation?this.state.reservation.id:null}`}});
actions.push({ icon: 'fa fa-trash',title:'Click to Delete Reservation',
type: 'button', actOn: 'click', props:{ callback: this.showConfirmation}});
actions.push({ icon: 'fa-window-close', link: this.props.history.goBack,
- title:'Click to Close Reservation', props : { pathname:'/su/timelineview/reservation/list' }});
+ title:'Click to Close Reservation', props : { pathname:'/reservation/list' }});
return (
<React.Fragment>
<PageHeader location={this.props.location} title={'Reservation – Details'} actions={actions}/>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/index.js
index c3d068c253b34484a1c4fca38db004b5e68eba67..b48cd64f554fa3072685bbab8b48e0f18e61a4c1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/index.js
@@ -1,9 +1,4 @@
import {TimelineView} from './view';
import {WeekTimelineView} from './week.view';
-import { ReservationList} from './reservation.list';
-import { ReservationCreate } from './reservation.create';
-import { ReservationView } from './reservation.view';
-import { ReservationSummary } from './reservation.summary';
-import { ReservationEdit } from './reservation.edit';
-export {TimelineView, WeekTimelineView, ReservationCreate, ReservationList, ReservationSummary, ReservationView, ReservationEdit} ;
+export {TimelineView, WeekTimelineView} ;
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 db9088d4929955ea5113655669b594ad2f791367..06127d33a36ee527698a74cee56ca76da6b7705e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -22,7 +22,7 @@ import TaskService from '../../services/task.service';
import UnitConverter from '../../utils/unit.converter';
import Validator from '../../utils/validator';
import SchedulingUnitSummary from '../Scheduling/summary';
-import ReservationSummary from './reservation.summary';
+import ReservationSummary from '../Reservation/reservation.summary';
import { Dropdown } from 'primereact/dropdown';
import { OverlayPanel } from 'primereact/overlaypanel';
import { RadioButton } from 'primereact/radiobutton';
@@ -706,11 +706,11 @@ export class TimelineView extends Component {
selectOptionMenu(menuName) {
switch(menuName) {
case 'Reservation List': {
- this.setState({redirect: `/su/timelineview/reservation/list`});
+ this.setState({redirect: `/reservation/list`});
break;
}
case 'Add Reservation': {
- this.setState({redirect: `/su/timelineview/reservation/create`});
+ this.setState({redirect: `/reservation/create`});
break;
}
default: {
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 75f8734bab5424bd5ba437c728daf15179a1d7f6..ab7781f674f77e49fe164a5e79ff22cf63594ad7 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
@@ -25,7 +25,7 @@ import { OverlayPanel } from 'primereact/overlaypanel';
import { TieredMenu } from 'primereact/tieredmenu';
import { InputSwitch } from 'primereact/inputswitch';
import { Dropdown } from 'primereact/dropdown';
-import ReservationSummary from './reservation.summary';
+import ReservationSummary from '../Reservation/reservation.summary';
// Color constant for status
const STATUS_COLORS = { "ERROR": "FF0000", "CANCELLED": "#00FF00", "DEFINED": "#00BCD4",
@@ -490,11 +490,11 @@ export class WeekTimelineView extends Component {
selectOptionMenu(menuName) {
switch(menuName) {
case 'Reservation List': {
- this.setState({redirect: `/su/timelineview/reservation/list`});
+ this.setState({redirect: `/reservation/list`});
break;
}
case 'Add Reservation': {
- this.setState({redirect: `/su/timelineview/reservation/create`});
+ this.setState({redirect: `/reservation/create`});
break;
}
default: {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
index 51d16425402864b33f90b89e54845cb38f578780..6eab86c09d55bd7c7a33cfecc6d4fdfcfa30b6e2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
@@ -14,7 +14,8 @@ import ViewSchedulingUnit from './Scheduling/ViewSchedulingUnit'
import SchedulingUnitCreate from './Scheduling/create';
import EditSchedulingUnit from './Scheduling/edit';
import { CycleList, CycleCreate, CycleView, CycleEdit } from './Cycle';
-import { TimelineView, WeekTimelineView, ReservationCreate, ReservationList, ReservationView, ReservationEdit } from './Timeline';
+import { TimelineView, WeekTimelineView} from './Timeline';
+import { ReservationCreate, ReservationList, ReservationView, ReservationEdit } from './Reservation';
import { FindObjectResult } from './Search/'
import SchedulingSetCreate from './Scheduling/excelview.schedulingset';
import Workflow from './Workflow';
@@ -156,25 +157,25 @@ export const routes = [
title: 'QA Reporting (TO)'
},
{
- path: "/su/timelineview/reservation/list",
+ path: "/reservation/list",
component: ReservationList,
name: 'Reservation List',
title:'Reservation List'
},
{
- path: "/su/timelineview/reservation/create",
+ path: "/reservation/create",
component: ReservationCreate,
name: 'Reservation Add',
title: 'Reservation - Add'
},
{
- path: "/su/timelineview/reservation/view/:id",
+ path: "/reservation/view/:id",
component: ReservationView,
name: 'Reservation View',
title: 'Reservation - View'
},
{
- path: "/su/timelineview/reservation/edit/:id",
+ path: "/reservation/edit/:id",
component: ReservationEdit,
name: 'Reservation Edit',
title: 'Reservation - Edit'