Daru13
49e147e620
Make the whole calendar inherit the font family from its parent.
2018-11-24 03:20:52 +01:00
Daru13
5e9423c858
Fix the wrong font size of weveral calendar elements.
2018-11-24 03:19:57 +01:00
Daru13
eb8f82f6c4
Display the calendar in full height (w/ scroll).
2018-11-24 03:18:01 +01:00
Daru13
41b640a1ea
Ensure time slot and event grids have the same number of columns.
2018-11-24 03:14:18 +01:00
Daru13
b2dabd1dc4
Fix event positionning in the grid.
2018-11-24 03:09:19 +01:00
Qwann
504044b1cf
hotfix: inheritance in calendar
2018-11-23 15:33:04 +01:00
Daru13
74eaf82575
Fix the structure of the HTML of the generated events.
2018-11-22 22:43:18 +01:00
Daru13
12534ff2da
Update the start and end date of the calendar (displayed era).
2018-11-22 22:42:31 +01:00
Daru13
2699573913
Fix the title of the event (used to be the event id).
2018-11-22 22:42:09 +01:00
Daru13
7a7254f3da
Put the event title on its own line (in the detail popup).
2018-11-22 22:36:23 +01:00
Daru13
5da4c7050c
Updates the perm counter on perm area update.
2018-11-22 22:34:45 +01:00
Daru13
555fa8fb7c
Adds effective enrol/unerol POST request on related button click.
2018-11-22 22:34:09 +01:00
Evarin
3ebb89c1c6
Calendrier accessible et presque fonctionnel
2018-11-22 00:39:12 +01:00
Daru13
d08a39307f
Initial addition of the visual calendar (day view only).
...
This is the first step to include a visual calendar to Poulpe,
only including a "day view" as of now (i.e. events hour-by-hour from one date to another).
More views may be added at a later time.
It is **NOT WORKING YET**!
The CSS has been broken on this branch, and will have to be fixed before the calendar can work:
* the CSS of the calendar needs to be adapted to the environment and design of Poulpe;
* add actual links to enroll/un-enroll to an activity (cf. `Event` class in `calendar.js`);
* other small tweaks :)?
Finally, this view is likely to require the addition of start and end date change,
so that an user can browse events over several days (cf. `setStartDate` and `setEndDate` methods of `Calendar` class in `calendar.js`).
Note that this code should be better re-written (e.g. in Typescript, split between files, using more/better design patterns) at a later time.
It should nonetheless be easy to fix it and use it right now (see above requirements for this).
2018-11-19 23:57:42 +01:00
Daru13
d3e1943021
Merge branch 'Evarin/enrol-json' into Qwann/calendar
2018-11-19 22:32:58 +01:00
Evarin
511c3096f7
enrol?ajax=json renvoie un JSON pour le calendrier dynamique
2018-11-12 21:44:10 +01:00
Qwann
b1c0dd857d
search matos
2018-11-07 21:39:50 +01:00
Qwann
abdd893309
dos not work
2018-10-12 18:04:27 +02:00
Evarin
6d81735a55
Inscription en perm
2018-08-28 22:19:24 +02:00
Qwann
634c4ad4ff
hotfix: admin
2018-08-27 17:11:27 +02:00
Qwann
727bd10aeb
hotfix: place and tags show correctly
2018-08-27 15:51:29 +02:00
Qwann
3275de7c9c
hotfix: dates activity
2018-08-27 15:31:44 +02:00
Qwann
62330956ec
MAJ : MAJ 2.1, remove user urls
2018-08-27 14:03:06 +02:00
Qwann
7c7adab658
event base done
2018-08-26 21:18:51 +02:00
Qwann
7ebc34d5aa
date behaviour is correct
2018-08-22 14:04:42 +02:00
Qwann
5d39b1018b
admin for event
2018-08-20 18:20:18 +02:00
Qwann
0ff2f40832
cleaning activity
2018-08-20 17:46:41 +02:00
Qwann
e6d79df735
event admin base
2018-08-20 16:02:42 +02:00
Qwann
7064e89059
event admin
2018-08-20 15:16:40 +02:00
Qwann
e863823457
init migrations for prod
2018-08-06 09:52:56 +02:00
Qwann
0483610e69
moins caca
2018-08-04 05:38:03 +02:00
Qwann
123d524eab
start equipement
2018-07-26 15:53:42 +02:00
Aurélien Delobelle
e1b4dc1651
Update AppConfigs
2017-08-19 15:36:45 +02:00
Erkan Narmanli
26d7ad474f
Merge branch 'master' into 'Qwann/Serializers'
...
# Conflicts:
# event/models.py
2017-08-13 18:27:40 +02:00
Aurélien Delobelle
18037246e1
Remake migrations
2017-08-13 18:05:24 +02:00
Aurélien Delobelle
07d4c3ead1
Reflect changes on validators/fields
2017-08-12 15:01:57 +02:00
Aurélien Delobelle
cd78757244
Clean some models
...
Add/fix some field names, verbose_name, help_text, on_delete (for
foreign keys), etc.
2017-08-03 12:09:03 +02:00
Qwann
ee411d06a6
help text added
2017-08-02 17:28:26 +02:00
Qwann
5e1a0cc0ef
fixe tests
2017-07-26 13:48:12 +02:00
Qwann
f87fe3d5a0
renamed attribute + PEP
2017-07-26 13:16:52 +02:00
Qwann
c709583e06
Activity parent nullable
2017-07-25 14:07:20 +02:00
Qwann
cab370421b
small fixes
2017-07-23 16:21:11 +02:00
Ludovic Stephan
782cb34b0e
Change get_herited method
2017-07-21 16:24:53 +02:00
Ludovic Stephan
ef8c62835b
Migrations
2017-07-21 16:20:39 +02:00
Ludovic Stephan
8a587b3d56
Override attribution save() + stuff
2017-07-21 16:18:19 +02:00
Ludovic Stephan
670a9d45da
Use EventSpecificMixin for event-specific models
2017-07-18 19:08:09 +02:00
Ludovic Stephan
53d9084d63
Correct Activity inheritance and get_herited()
2017-07-18 18:41:44 +02:00
Ludovic Stephan
5b005571d5
Event ending_date no longer optional
2017-07-18 17:31:01 +02:00
Ludovic Stephan
da75dc7d9c
Test + small changes
2017-07-18 17:18:54 +02:00
Ludovic Stephan
270e31f12b
adapt migrations and tests
2017-07-18 15:37:13 +02:00