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

b68bad98

Commit b68bad98 authored 4 years ago by Jan David Mol

Downloads
- Plain Diff

Merge branch 'master' of git.astron.nl:ro/lofar

parents e34dbcf6 9fb01266

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py 3 additions, 1 deletion

...ces/scheduling/lib/constraints/template_constraints_v1.py
SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py 34 additions, 7 deletions

.../backend/services/scheduling/test/t_dynamic_scheduling.py
SAS/TMSS/backend/src/tmss/tmssapp/conversions.py 25 additions, 5 deletions

SAS/TMSS/backend/src/tmss/tmssapp/conversions.py
SAS/TMSS/backend/test/t_conversions.py 29 additions, 0 deletions

SAS/TMSS/backend/test/t_conversions.py
SAS/TMSS/frontend/tmss_webapp/package.json 1 addition, 0 deletions

SAS/TMSS/frontend/tmss_webapp/package.json
SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/CustomDateComp.js 28 additions, 20 deletions

.../tmss_webapp/src/components/Spreadsheet/CustomDateComp.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js 14 additions, 3 deletions

...ss_webapp/src/routes/Scheduling/Scheduling.Constraints.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/reservation.create.js 32 additions, 17 deletions

...end/tmss_webapp/src/routes/Timeline/reservation.create.js
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js 3 additions, 3 deletions

SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js

with 169 additions and 56 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