Skip to content
Snippets Groups Projects

TMSS-2708 TMSS-2846: reuse TaskBlueprintSlimSerializer in...

Merged TMSS-2708 TMSS-2846: reuse TaskBlueprintSlimSerializer in...
TMSS-2708-Timeline-Grouping into master
Merged Reinder Kraaij requested to merge TMSS-2708-Timeline-Grouping into master

TMSS-2708 TMSS-2846: reuse TaskBlueprintSlimSerializer in SchedulingUnitBlueprintSlimWithTasksSerializer and scheduling_unit_blueprint_slim_with_tasks endpoint

This Adds Grouping Closes TMSS-2708

Edited by Reinder Kraaij

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/WeekView.js
61 61 {({ getRootProps }) => { //getRootProps is mandatory for the library
62 62 return <div {...getRootProps()} className="sidebar-header">
63 63 <div className="sidebar-header-row">UTC</div>
64 <div className="sidebar-header-row" title="Approximate LST">~ LST</div>
64 <div className="sidebar-header-row" title="Approximate LST, based on CS002" >~ LST</div>
  • Reinder Kraaij added 3 commits

    added 3 commits

    • 79a47198 - Performance increased for tooltip
    • d4137f08 - Fixed Ancient Bug related to cursordata
    • ec393ac0 - little time tweak

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    • d3cb8cc1 - Add Project Task Grouping View

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    • 1225dc5e - Set correct dates for Project Task

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    • 696331e8 - duration with moment converted

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    • ef7fc7c0 - Corrected Naming of Tasks in Display

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    • 9a8357a8 - Use specified_stations for reservation

    Compare with previous version

  • Reinder Kraaij added 2 commits

    added 2 commits

    • 19ecf2e2 - FIx Unit test matching enhanced Output
    • 8225b647 - Only add tasks when needed

    Compare with previous version

  • Reinder Kraaij added 1 commit

    added 1 commit

    Compare with previous version

  • Reinder Kraaij added 14 commits

    added 14 commits

    Compare with previous version

  • Reinder Kraaij approved this merge request

    approved this merge request

  • Reinder Kraaij enabled an automatic merge when the pipeline for ab67205e succeeds

    enabled an automatic merge when the pipeline for ab67205e succeeds

  • Jorrit Schaap aborted the automatic merge because source branch was updated

    aborted the automatic merge because source branch was updated

  • Jorrit Schaap added 2 commits

    added 2 commits

    • 04abe2a5 - "Station Scheduled" -> "Station Specified"
    • 99bac689 - Merge branch 'TMSS-2708-Timeline-Grouping' of git.astron.nl:ro/lofar into...

    Compare with previous version

  • Jorrit Schaap added 1 commit

    added 1 commit

    Compare with previous version

  • Reinder Kraaij changed the description

    changed the description

  • Reinder Kraaij merged

    merged

  • Reinder Kraaij mentioned in commit 47082178

    mentioned in commit 47082178

    • Please register or sign in to reply