diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index 9116f1ae11c5ab5bc18c7a447f2f708a6229e9ba..e5c961657d6df883a8b10eb6b672f68241b4020b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -176,13 +176,16 @@ function Table({ columns, data, defaultheader, optionalheader }) {
{headerGroup.headers.map(column => (
<th {...column.getHeaderProps(column.getSortByToggleProps())} >
{column.Header !== 'actionpath' && column.render('Header')}
- {/* {column.Header !== 'Action'?
- column.isSorted ? (column.isSortedDesc ? <i className="pi pi-sort-down" aria-hidden="true"></i> : <i className="pi pi-sort-up" aria-hidden="true"></i>) : <i className="pi pi-sort" aria-hidden="true"></i>
+ {column.Header !== 'Action'?
+ column.isSorted ? (column.isSortedDesc ? <i className="pi pi-sort-down" aria-hidden="true"></i> : <i className="pi pi-sort-up" aria-hidden="true"></i>) : <i className="pi pi-sor" aria-hidden="true"></i>
: ""
- } */}
+ }
{/* Render the columns filter UI */}
{column.Header !== 'actionpath' &&
- <div className={columnclassname[0][column.Header]} > {column.canFilter && column.Header !== 'Action' ? column.render('Filter') : null}</div>
+ <div className={columnclassname[0][column.Header]} >
+ {column.canFilter && column.Header !== 'Action' ? column.render('Filter') : null}
+
+ </div>
}
</th>
))}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
index b6308584d5d768ba19deca2deaedb1eb0ed84bf5..79ddd60b6b80b15e064ae8a60df296ff6b51674b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
@@ -50,13 +50,13 @@ export class CycleCreate extends Component {
{name:'LOFAR Observing Time'},
{name:'LOFAR Observing Time prio A'},
{name:'LOFAR Observing Time prio B'},
- {name:'LOFAR Processing time '},
- {name:'LOFAR LTA resources'},
+ {name:'CEP Processing Time'},
+ {name:'LTA Storage'},
{name:'LOFAR LTA resources SARA'},
{name:'LOFAR LTA resources Jülich'},
{name:'LOFAR LTA resources Poznan'},
{name:'LOFAR Observing time DDT/Commissioning'},
- {name:'LOFAR Support'}];
+ {name:'LOFAR Support Time'}];
this.cycleResourceDefaults = {}; // Default values for default resources
this.resourceUnitMap = UnitConverter.resourceUnitMap; // Resource unit conversion factor and constraints
this.tooltipOptions = UIConstants.tooltipOptions;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
index ccc2d4807252a8d8bdc8b1a1b3f36f6e7158f81f..8ecbf062eccfb70a68b53adfb27e3e8fbe81a115 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
@@ -70,13 +70,21 @@ class CycleList extends Component{
cycle.id = cycle.name ;
cycle.regularProjects = regularProjects.length;
cycle.longterm = longterm.length;
- cycle.observingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time');
- cycle.processingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'cep_processing_time');
- cycle.ltaResources = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'lta_storage');
- cycle.support = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'support_time');
- cycle.observingTimeDDT = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_commissioning');
- cycle.observingTimePrioA = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_prio_a');
- cycle.observingTimePrioB = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_prio_b');
+ // cycle.observingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time');
+ // cycle.processingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'cep_processing_time');
+ // cycle.ltaResources = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'lta_storage');
+ // cycle.support = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'support_time');
+ // cycle.observingTimeDDT = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_commissioning');
+ // cycle.observingTimePrioA = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_prio_a');
+ // cycle.observingTimePrioB = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'observing_time_prio_b');
+ cycle.observingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LOFAR Observing Time');
+ cycle.processingTime = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'CEP Processing Time');
+ cycle.ltaResources = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LTA Storage');
+ cycle.support = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LOFAR Support Time');
+ cycle.observingTimeDDT = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LOFAR Observing Time Commissioning');
+ cycle.observingTimePrioA = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LOFAR Observing Time prio A');
+ cycle.observingTimePrioB = this.getUnitConvertedQuotaValue(cycle, cycleQuota, 'LOFAR Observing Time prio B');
+
cycle['actionpath'] = `/cycle/view/${cycle.id}`;
return cycle;
});
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index 042e46d47b9d4e5672da2271516159bce9371394..2a33a72b8c5c54a7f283b1363120ab270779226b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -89,10 +89,10 @@ class ViewSchedulingUnit extends Component{
style={{float:'right'}}>
<i className="fa fa-times" style={{marginTop: "10px", marginLeft: '5px'}}></i>
</Link>
- <Link to={{ pathname: '/schedulingunit/edit', state: {id: this.state.scheduleunit?this.state.scheduleunit.id:''}}} title="Edit"
+ {/* <Link to={{ pathname: '/schedulingunit/edit', state: {id: this.state.scheduleunit?this.state.scheduleunit.id:''}}} title="Edit"
style={{float:'right'}}>
<i className="fa fa-edit" style={{marginTop: "10px"}}></i>
- </Link>
+ </Link> */}
</div>
</div>
{ this.state.isLoading ? <AppLoader/> :this.state.scheduleunit &&
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
index c7ad3675e676ec1ef9436ef7350e4fad63d03bc7..f758c543f5a72a8096175dee6484822dc4a2fb48 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
@@ -25,7 +25,8 @@ const CycleService = {
},
getAllCycleQuotas: async function () {
let res = [];
- await axios.get('/api/cycle_quota/')
+ // To be changed once the cycle_quota for cycle is available.
+ await axios.get('/api/cycle_quota/?limit=1000&offset=0')
.then(response => {
res = response.data.results;
}).catch(function (error) {