Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

LOFAR
- Activity
- Members
- Labels
- Issues
- Wiki
- Jira issues
- Open Jira
- Environments
- Terraform modules

Snippets Groups Projects

93fc80d9

Commit 93fc80d9 authored 3 years ago by Jorrit Schaap

Downloads
- Plain Diff

Merge branch 'master' into TMSS-1093

parents 3c515a72 b69bc72f

No related branches found

No related tags found

2 merge requests!634WIP: COBALT commissioning delta,!611TMSS-1093: export/populate schemas/templates

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc 3 additions, 3 deletions

MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc 6 additions, 6 deletions

MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h 3 additions, 3 deletions

MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py 2 additions, 1 deletion

SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
SAS/TMSS/backend/test/t_subtasks.py 20 additions, 0 deletions

SAS/TMSS/backend/test/t_subtasks.py
SAS/TMSS/client/lib/tmss_http_rest_client.py 3 additions, 1 deletion

SAS/TMSS/client/lib/tmss_http_rest_client.py
SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss 1 addition, 1 deletion

SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js 1 addition, 22 deletions

...ss_webapp/src/routes/Scheduling/Scheduling.Constraints.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js 1 addition, 1 deletion

...TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js 22 additions, 37 deletions

...s_webapp/src/routes/Scheduling/excelview.schedulingset.js

with 62 additions and 75 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment