Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

compendium-v2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

76ef0781

Commit 76ef0781 authored 2 years ago by Ian Galpin

Downloads
- Plain Diff

Merge branch 'feature/COMP-83_line_graph_of_budgets' into 'develop'

Added line graphs and re-organised the webapp layout

See merge request live-projects/compendium-v2!11

parents 55057be4 251c2751

Branches

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

compendium_v2/db/survey.py 40 additions, 0 deletions

compendium_v2/db/survey.py
compendium_v2/routes/data_entry.py 4 additions, 1 deletion

compendium_v2/routes/data_entry.py
tox.ini 1 addition, 1 deletion

tox.ini
webapp/src/App.tsx 3 additions, 3 deletions

webapp/src/App.tsx
webapp/src/Schema.tsx 9 additions, 0 deletions

webapp/src/Schema.tsx
webapp/src/components/graphing/BarGraph.tsx 32 additions, 0 deletions

webapp/src/components/graphing/BarGraph.tsx
webapp/src/components/graphing/LineGraph.tsx 46 additions, 0 deletions

webapp/src/components/graphing/LineGraph.tsx
webapp/src/components/graphing/types.ts 14 additions, 0 deletions

webapp/src/components/graphing/types.ts
webapp/src/pages/About.tsx 0 additions, 0 deletions

webapp/src/pages/About.tsx
webapp/src/pages/AnnualReport.tsx 1 addition, 1 deletion

webapp/src/pages/AnnualReport.tsx
webapp/src/pages/DataAnalysis.tsx 68 additions, 44 deletions

webapp/src/pages/DataAnalysis.tsx
webapp/src/styles.scss 1 addition, 1 deletion

webapp/src/styles.scss
webapp/webpack.config.ts 5 additions, 1 deletion

webapp/webpack.config.ts

with 224 additions and 52 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