klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing current permanency display, delegate slot label config to locales

Browse Source
This commit is contained in:
NaNoMelo 2024-10-22 15:41:34 +02:00
parent aa3123f02a
commit 02c9cca682
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
counter/schemas.py
View File

@ -25,4 +25,5 @@ class PermanencyFilterSchema(FilterSchema):
start_before: datetime | None = Field(None, q="start__lte") start_before: datetime | None = Field(None, q="start__lte")
end_after: datetime | None = Field(None, q="end__gte") end_after: datetime | None = Field(None, q="end__gte")
end_before: datetime | None = Field(None, q="end__lte") end_before: datetime | None = Field(None, q="end__lte")
took_place_after: datetime | None = Field(None, q=["start__gte", "end__gte"])
counter: set[int] | None = Field(None, q="counter_id__in") counter: set[int] | None = Field(None, q="counter_id__in")

3
counter/static/webpack/graph-index.ts
View File

@ -34,7 +34,7 @@ async function loadChart(options: ActivityChartConfig) {
query: { query: {
counter: [options.counterId], counter: [options.counterId],
// biome-ignore lint/style/useNamingConvention: backend API uses snake_case // biome-ignore lint/style/useNamingConvention: backend API uses snake_case
end_after: options.startDate.toISOString(), took_place_after: options.startDate.toISOString(),
}, },
} as PermanencyFetchPermananciesData); } as PermanencyFetchPermananciesData);
@ -44,7 +44,6 @@ async function loadChart(options: ActivityChartConfig) {
plugins: [timeGridPlugin], plugins: [timeGridPlugin],
initialView: "timeGridWeek", initialView: "timeGridWeek",
locale: options.locale, locale: options.locale,
slotLabelFormat: { hour: "2-digit", minute: "2-digit", hour12: false },
dayHeaderFormat: { weekday: "long" }, dayHeaderFormat: { weekday: "long" },
firstDay: 1, firstDay: 1,
views: { timeGrid: { allDaySlot: false } }, views: { timeGrid: { allDaySlot: false } },

17
package-lock.json generated
View File

@ -2345,16 +2345,6 @@
"undici-types": "~6.19.2" "undici-types": "~6.19.2"
} }
}, },
"node_modules/@types/select2": {
"version": "4.0.63",
"resolved": "https://registry.npmjs.org/@types/select2/-/select2-4.0.63.tgz",
"integrity": "sha512-/DXUfPSj3iVTGlRYRYPCFKKSogAGP/j+Z0fIMXbBiBtmmZj0WH7vnfNuckafq9C43KnqPPQW2TI/Rj/vTSGnQQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/jquery": "*"
}
},
"node_modules/@types/sizzle": { "node_modules/@types/sizzle": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
@ -6140,13 +6130,6 @@
"url": "https://opencollective.com/webpack" "url": "https://opencollective.com/webpack"
} }
}, },
"node_modules/select2": {
"version": "4.1.0-rc.0",
"resolved": "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz",
"integrity": "sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==",
"license": "MIT"
},
"node_modules/semver": { "node_modules/semver": {
"version": "7.6.3", "version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",