Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fancy graph #587

Merged
merged 43 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
03ceb69
Added view
Theophile-Madet Nov 22, 2024
375284a
Base for react integration and dummy graph
Theophile-Madet Nov 22, 2024
7d311b1
Added two test views and graph controls.
Theophile-Madet Nov 26, 2024
e179fb6
Chart with dynamic loading!
Theophile-Madet Nov 26, 2024
d0dd33d
Added script for db dump import
Theophile-Madet Nov 27, 2024
ae6de94
Added dataset working members, renamed a few service files.
Theophile-Madet Nov 27, 2024
2cdf89b
Added dataset purchasing members.
Theophile-Madet Nov 27, 2024
73626c2
Added dataset frozen members.
Theophile-Madet Nov 27, 2024
0f1a45c
Formatting.
Theophile-Madet Nov 27, 2024
759607a
Added view number of long-term frozen members.
Theophile-Madet Nov 28, 2024
f04385c
Added view number of shift partners.
Theophile-Madet Nov 28, 2024
d62fc10
Added view number of co purchasers
Theophile-Madet Nov 28, 2024
f5c36b9
Added view number of flying members
Theophile-Madet Dec 4, 2024
8683651
Added view number of abcd members
Theophile-Madet Dec 4, 2024
90d0d1d
Added view number of investing and paused members
Theophile-Madet Dec 4, 2024
f9c2784
Added view number of resignations
Theophile-Madet Dec 4, 2024
9b31c94
Standardization of reference dates.
Theophile-Madet Dec 4, 2024
c30cd22
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
f5ac037
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
6cb2a17
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
694a49b
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
8d4e723
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
f49292c
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
e6ea7a1
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
629dc3d
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
ded3c7a
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
00f354a
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
bca5a26
WIP generic absolute / relative views
Theophile-Madet Dec 4, 2024
0301e8f
Graph styling
Theophile-Madet Dec 4, 2024
468aabd
Graph styling
Theophile-Madet Dec 5, 2024
61b550d
Fixed jumpy graph using refs.
Theophile-Madet Dec 5, 2024
10c417e
Moved dataset definition to a separate file.
Theophile-Madet Dec 5, 2024
188c95a
Use formatDate from utils
Theophile-Madet Dec 5, 2024
fed0999
Moved dataset picker to its own component.
Theophile-Madet Dec 5, 2024
79be0a4
Moved date range picker to its own component.
Theophile-Madet Dec 5, 2024
b512a95
Moved ChartJS.register outside of the component
Theophile-Madet Dec 5, 2024
b512dbc
Added download data button.
Theophile-Madet Dec 5, 2024
1b914f9
Added view for exempted members.
Theophile-Madet Dec 5, 2024
477fc94
Translation files.
Theophile-Madet Dec 5, 2024
8127ad1
Merge branch 'master' into fancy_graph
Theophile-Madet Dec 5, 2024
8ea534d
Conflict solve translation file from master.
Theophile-Madet Dec 5, 2024
0f126a5
Added a description
Theophile-Madet Dec 5, 2024
985cf89
Shift partner only from working members.
Theophile-Madet Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions django.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM python:3.12
FROM python:3.13
ENV PYTHONUNBUFFERED=1
WORKDIR /app
COPY . /app

RUN apt update -y \
&& apt --no-install-recommends install -y \
RUN apt-get update -y \
&& apt-get --no-install-recommends install -y \
gettext \
libldap2-dev \
libsasl2-dev \
Expand Down
83 changes: 70 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
"@openapitools/openapi-generator-cli": "^2.14.1",
"@types/node": "^22.7.5",
"bootstrap": "^5.3.3",
"chart.js": "^4.4.6",
"react": "^18.3.1",
"react-bootstrap": "^2.10.5",
"react-bootstrap-icons": "^1.11.4",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.3.1",
"typescript": "^5.6.3"
},
Expand Down
Loading
Loading