thubrecht/poulpe
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions
292 commits 15 branches 0 tags 2.6 MiB
Commit graph

292 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Qwann
bd84b46476 Merge branch 'Qwann/calendar' of git.eleves.ens.fr:klub-dev-ens/GestionEvenementiel into Qwann/calendar 2018-11-22 22:55:30 +01:00
Qwann
c30f588bed Merge branch 'master' of git.eleves.ens.fr:klub-dev-ens/GestionEvenementiel into Qwann/calendar 2018-11-22 22:55:17 +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
Qwann
1865054c29 waaaa, maintenant on peut genre se connecter 2018-11-22 13:24:59 +01:00
Evarin
3ebb89c1c6 Calendrier accessible et presque fonctionnel 2018-11-22 00:39:12 +01:00
Evarin
350836aeb2 Revert to old_css 2018-11-21 19:46:41 +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
Qwann
1042b9f9e4 partial commit 2018-10-12 17:15:55 +02:00
Qwann
94a629371c allauth don't works right now… 2018-10-11 09:48:03 +02:00
Qwann
a32881a24b MAJ allauth 2018-10-04 21:34:39 +02:00
Qwann
7ebee733c5 css no finished 2018-10-04 21:10:30 +02:00
Evarin
601ba4d116 Fix css filtrage catégories 2018-08-28 22:40:02 +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
dd47cc3b07 avec les migrations c'est mieux 2018-08-27 14:09:27 +02:00
Qwann
62330956ec MAJ : MAJ 2.1, remove user urls 2018-08-27 14:03:06 +02:00
Qwann
c8717fb06b MAJ : preparing for Django 3.0 2018-08-27 00:56:57 +02:00
Qwann
3c9486a858 Merge branch 'Qwann/django_maj' 2018-08-27 00:31:28 +02:00
Qwann
906db7069b MAJ : MAJ 2.0, remove debug_panel, django.change url.resolvers to django.urls 2018-08-27 00:30:12 +02:00
Qwann
fc0f861c2c avec les migrations c'est mieux 2018-08-27 00:09:41 +02:00
Qwann
b45d7722a7 MAJ : add on_delete + MIDDLEWARE 2018-08-27 00:02:33 +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
Erkan Narmanli
c723f53909 Merge branch 'Qwann/events/admin' into 'master' 
Qwann/events/admin

See merge request cof-geek/GestionEvenementiel!28
 2018-08-20 18:23:10 +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
7690c1a8ab hotfix: owner can be None 2018-08-20 15:18:54 +02:00
Qwann
7064e89059 event admin 2018-08-20 15:16:40 +02:00
Erkan Narmanli
20fad42d6d Merge branch 'Qwann/mv_root' into 'master' 
rename app evenementiel to poulpe

See merge request cof-geek/GestionEvenementiel!27
 2018-08-20 14:36:12 +02:00
Qwann
e8c1ecadcc rename app evenementiel to poulpe 2018-08-20 14:32:52 +02:00
Qwann
fb1308e70c add migrations 2018-08-20 13:24:47 +02:00
Erkan Narmanli
617edf8691 Merge branch 'Qwann/inventaire_list' into 'master' 
equipment main views

See merge request cof-geek/GestionEvenementiel!26
 2018-08-20 13:22:07 +02:00
Qwann
fd4567b531 equipment main views 2018-08-20 13:17:10 +02:00