From 78687127f0e2beba36b4601428f6624d22cb8007 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Tue, 20 Feb 2018 00:15:23 +0100 Subject: [PATCH] Add check remain places in member and add some organisation --- golem_activity_queue/models/__init__.py | 3 ++- golem_activity_queue/models/golem_member.py | 16 ++++++++++++++++ .../views/golem_activity_queue_views.xml | 1 + .../views/golem_activity_views.xml | 1 + .../views/golem_member_views.xml | 3 ++- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/golem_activity_queue/models/__init__.py b/golem_activity_queue/models/__init__.py index e279223..0ed9ff9 100644 --- a/golem_activity_queue/models/__init__.py +++ b/golem_activity_queue/models/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright 2016 Fabien Bourgeois +# Copyright 2018 Youssef El Ouahby +# Copyright 2018 Fabien Bourgeois # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py index 7d004f8..fd98685 100644 --- a/golem_activity_queue/models/golem_member.py +++ b/golem_activity_queue/models/golem_member.py @@ -15,3 +15,19 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . + +from odoo import models, fields, api, _ + +class GolemMember(models.Model): + """ GOLEM Member adaptations """ + _inherit = 'golem.member' + + @api.onchange('activity_registration_ids') + def _checkRemain(self): + if len(self.activity_registration_ids) > self.places and self.queue_allowed: + return { + 'warning' : { + 'title' : _('Warning'), + 'message': _('No remaining place, please register in the queue'), + } + } diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml index c9ef7b4..a2cff8b 100644 --- a/golem_activity_queue/views/golem_activity_queue_views.xml +++ b/golem_activity_queue/views/golem_activity_queue_views.xml @@ -1,5 +1,6 @@