Commit graph

158 commits

Author SHA1 Message Date
Qwann
771fdf878e renamed users api sub application 2017-07-25 14:40:34 +02:00
Qwann
b2e6d822da Merge branch 'master' into Qwann/Serializers 2017-07-25 14:13:00 +02:00
Qwann
3246552eba tests factorised 2017-07-25 14:02:57 +02:00
Ludovic Stephan
084a5d9ff5 Merge branch 'Qwann/SmallFixes' into 'master'
small fixes

See merge request !16
2017-07-24 15:28:07 +02:00
Qwann
a4da5d94c4 eventspecific tests 2017-07-23 18:23:25 +02:00
Qwann
7585a8246d url names + API default permissions 2017-07-23 18:23:02 +02:00
Qwann
e1f8a84111 Merge branch 'Qwann/SmallFixes' into Qwann/Serializers 2017-07-23 16:25:21 +02:00
Qwann
cab370421b small fixes 2017-07-23 16:21:11 +02:00
Qwann
ac6b8058f4 test started 2017-07-23 16:06:52 +02:00
Qwann
d7ee270fbf activity template serializer added 2017-07-22 03:12:50 +02:00
Qwann
c9b25baec1 Merge branch 'master' into Qwann/Serializers 2017-07-22 02:10:22 +02:00
Qwann
cd1ed08ca6 tag added to API 2017-07-22 02:09:31 +02:00
Qwann
36f038259b generic classes fixed 2017-07-22 02:09:11 +02:00
Qwann
48f9fd516d EventSpecificSerializer and EventSpecificViewSet defined 2017-07-22 00:56:30 +02:00
Qwann
92e8e374fd WIP 2017-07-21 17:03:33 +02:00
Aurélien Delobelle
110e23a8d2 Merge branch 'Aufinal/communication_models' into 'master'
Modèles de commentaires et de notifications

En plus du changement du `.gitignore` qui ne suit désormais plus les `*.pyc` voici les modifications apportés par cette MR.

### Modification mineures dans les modèles déjà présents

* Ajout d'un champ `amount` à `EquipementRemark` pour indiquer le nombre d'équipement concerné par cette remarque.
* Bas de casse pour quelques `verbose_name`.
* Ajout de date début et fin aux activités.

## Nouvelles dépendances

* [django-contrib-comments](https://github.com/django/django-contrib-comments) pour la gestion des commentaires.
* [django-notifications](https://github.com/django-notifications/django-notifications) pour la gestion des notifications.
* Il reste à utiliser ces dépendances...

## Gestion des souscriptions aux notifications

Placé dans l'application ``communication``, les modèles ``UserSubscription`` et ``GroupSubscription`` permettent de sauvegarder les souscriptions par utilisateur et groupe.  
Pour autoriser la souscription à des instances de modèle, celui-ci doit hériter du mixin ``SubscriptionMixin``.

## Gestion des instances de modèles optionnellement relatives à un événement

Les modèles dont les instances peuvent être spécifiques à un événement ou de niveau "root" (c'est à dire non-spécifique) héritent du mixin ``EventSpecificMixin``.

Voilà voilà,
@lstephan @narmanli @delobell 

See merge request !13
2017-07-21 16:58:36 +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
Qwann
5d26f35f72 Merge branch 'master' into Qwann/Serializers 2017-07-20 15:29:32 +02:00
Qwann
228d16fbdd Merge branch 'Aufinal/communication_models' into Qwann/Serializers 2017-07-20 15:27:07 +02:00
Ludovic Stephan
3439abe922 Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Aufinal/communication_models 2017-07-20 15:24:23 +02:00
Erkan Narmanli
bfa6e84b8d Merge branch 'Qwann/venv' into 'master'
Qwann/venv

See merge request !14
2017-07-20 15:22:40 +02:00
Qwann
cd6348b26f now Aufinal should be satistied 2017-07-20 15:22:42 +02:00
Qwann
c55996d7fc gitignore improved 2017-07-20 15:21:07 +02:00
Qwann
bed9771e0f venv works fine 2017-07-20 15:18:29 +02:00
Qwann
faafbf0630 serializers started 2017-07-20 15:08: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
Qwann
82d4067218 Merge branch 'Aufinal/communication_models' into Qwann/Serializers 2017-07-18 18:01:25 +02:00
Qwann
1924d9b81a fogot a file 2017-07-18 17:48:59 +02:00
Qwann
c8483ca7fb replace User by get_user_model 2017-07-18 17:46:00 +02:00
Qwann
81e9a4b8d2 allow local developement in venv 2017-07-18 17:44:43 +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
Ludovic Stephan
4e8873226f Oops 2017-07-18 13:55:09 +02:00
Ludovic Stephan
19093d01f3 Small fixes 2017-07-18 13:54:11 +02:00
Ludovic Stephan
af75c90b84 Refactor communication models
We now use `django-notifications` and `django-contrib-comments` to manage notifications and comments.

Subscriptions are managed through the `SubscriptionMixin` model, and can correspond to unique
users and to group-like subscriptions.
2017-07-17 17:47:34 +02:00
Ludovic Stephan
6f158638bf Various bugfixes 2017-07-15 21:22:15 +02:00
Ludovic Stephan
26c02df53d All commentables are notifying 2017-07-15 18:37:47 +02:00
Ludovic Stephan
80be26c5b3 Minor changes 2017-07-15 18:14:26 +02:00
Ludovic Stephan
3bbea85b3a Add commentable property to activities 2017-07-15 18:14:15 +02:00
Ludovic Stephan
a22ab92e87 Add comment and notification models 2017-07-15 18:13:45 +02:00
Ludovic Stephan
f1afadda76 Add possibility for endless events 2017-07-15 17:50:58 +02:00
Ludovic Stephan
1d07c5e8fd Add amount field to EquipmentRemark 2017-07-15 17:50:15 +02:00
Ludovic Stephan
350b0c58be Add begin/end date to activities 2017-07-15 17:46:13 +02:00
Ludovic Stephan
35e8585f4c Verbose names in lowercase 2017-07-15 17:44:15 +02:00
Qwann
1ffbac92cb Merge branch 'Kerl/test_user_creation' 2017-05-18 18:47:55 +02:00
Qwann
8800838c32 Merge branch 'Kerl/test_user_creation' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Kerl/test_user_creation 2017-05-18 18:18:14 +02:00