Skip to content
Snippets Groups Projects

Feature/comp 125 staffing graph

Merged Bjarke Madsen requested to merge feature/COMP-125-staffing-graph into develop
1 unresolved thread

Add two staff graphs under /staff for technical/non technical and permanent/subcontractor comparisons.

Merge request reports

Approval is optional

Merged by Bjarke MadsenBjarke Madsen 2 years ago (Apr 21, 2023 9:39am UTC)

Merge details

  • Changes merged into develop with fd740f30.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
133 const newSelectedYears = visibleYears.length ? previous.selectedYears : [Math.max(...years)];
134 const visibleNrens = previous.selectedNrens.filter(nren => nrens.has(nren));
135 const newSelectedNrens = visibleNrens.length ? previous.selectedNrens : [...nrens];
136 return { selectedYears: newSelectedYears, selectedNrens: newSelectedNrens };
137 });
138 }
139 loadData()
140 }, [setFilterSelection]);
141
142 return (
143 <Container>
144 <Row>
145 <Col xs={9}>
146 <Row>
147 <h3>NREN Staff</h3>
148 <input type="checkbox" id="contractor" name="contractor" value="contractor" onChange={() => setContractor(contractor => !contractor)} />
  • Remco Tukker
  • Bjarke Madsen added 2 commits

    added 2 commits

    • 4d055be5 - pep8
    • 5c0554d1 - Create separate pages for staff employment type / roles

    Compare with previous version

  • Bjarke Madsen mentioned in commit fd740f30

    mentioned in commit fd740f30

  • merged

  • Please register or sign in to reply
    Loading