From 15019ad0f24d6c17114786ac486683012196b0d2 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Wed, 7 Mar 2018 11:14:20 +0100 Subject: [PATCH] [REF][TYPO]GOLEM Activity Queue : remove useless wizard and typo improve last one --- golem_activity_queue/__manifest__.py | 3 +- golem_activity_queue/wizard/__init__.py | 2 +- ...golem_activity_automated_queue_activate.py | 25 +++-------- ...ctivity_automated_queue_activate_views.xml | 9 ++-- .../wizard/golem_activity_queue_choose.py | 37 ---------------- .../golem_activity_queue_choose_views.xml | 44 ------------------- 6 files changed, 11 insertions(+), 109 deletions(-) delete mode 100644 golem_activity_queue/wizard/golem_activity_queue_choose.py delete mode 100644 golem_activity_queue/wizard/golem_activity_queue_choose_views.xml diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py index d61475f..92087d1 100644 --- a/golem_activity_queue/__manifest__.py +++ b/golem_activity_queue/__manifest__.py @@ -20,7 +20,7 @@ 'name': 'GOLEM activity queues', 'summary': 'GOLEM activity queues', 'description': ''' GOLEM activity queue management ''', - 'version': '10.0.1.2.2', + 'version': '10.0.1.2.3', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', @@ -32,7 +32,6 @@ 'views/golem_activity_queue_views.xml', 'views/golem_activity_views.xml', 'views/golem_member_views.xml', - 'wizard/golem_activity_queue_choose_views.xml', 'wizard/golem_activity_automated_queue_activate_views.xml' ] } diff --git a/golem_activity_queue/wizard/__init__.py b/golem_activity_queue/wizard/__init__.py index 03d4907..7656c13 100644 --- a/golem_activity_queue/wizard/__init__.py +++ b/golem_activity_queue/wizard/__init__.py @@ -16,4 +16,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import golem_activity_queue_choose, golem_activity_automated_queue_activate +from . import golem_activity_automated_queue_activate diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py index c283ea8..f858108 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py @@ -16,37 +16,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM Activity Automated Queue """ +""" GOLEM Activity Automated Queue Activation """ from odoo import models, fields class GolemActivityAutomatedQueueActivateWizard(models.TransientModel): - """GOLEM Activity Automated Queue wizard : Activatate automated Queue """ - _name = "golem.activity.automated.queue.activate.wizard" + """ GOLEM Activity Automated Queue wizard : activate automated queue processing """ + _name = 'golem.activity.automated.queue.activate.wizard' - activity_id = fields.Many2one("golem.activity") + activity_id = fields.Many2one('golem.activity') auto_registration_from_queue = fields.Boolean(default=True) - # lancer liste editable d'inscription sur attente def activate_queue(self): """ Activate Queue for the activity""" - self.ensure_one() activation = self[0] activation.activity_id.write({ 'queue_allowed': True, 'auto_registration_from_queue': activation.auto_registration_from_queue - }) - - - """ - self.env['golem.activity.queue'].create({'member_id': activityQueue.member_id.id, - 'activity_id': activityQueue.activity_id.id}) - message = _('the member {} is registred in queue for the activity {} with success') - return { - 'warning' : { - 'title' : _('Warning'), - 'message': (message.format(activityQueue.member_id.name, - activityQueue.activity_id.name)) - } - }""" + }) diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml index de6a38d..e698b0d 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml @@ -26,11 +26,10 @@ along with this program. If not, see . golem.activity.automated.queue.activate.wizard
- - +

+ Are you sure you want to Add queue to this activity ?
+ If yes please confirm if you want automated registration from queue to activity. +

diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose.py b/golem_activity_queue/wizard/golem_activity_queue_choose.py deleted file mode 100644 index 515ea77..0000000 --- a/golem_activity_queue/wizard/golem_activity_queue_choose.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- - -# 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 -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -""" GOLEM Activity Queue Choice """ - -from odoo import models, fields - -class GolemActivityQueueChooseWizard(models.TransientModel): - """ GOLEM Activity Queue Choice """ - _name = "golem.activity.queue.choose.wizard" - - activity_id = fields.Many2one("golem.activity") - member_id = fields.Many2one("golem.member") - - - # lancer liste editable d'inscription sur attente - def register_in_queue(self): - """ Choisir l'activité pour s'inscrire sur sa liste d'attente""" - self.ensure_one() - activity_queue = self[0] - self.env['golem.activity.queue'].create({'member_id': activity_queue.member_id.id, - 'activity_id': activity_queue.activity_id.id}) diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml deleted file mode 100644 index b4ba674..0000000 --- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - GOLEM Activity Queue Choose Wizard Form - golem.activity.queue.choose.wizard - - - - - - - - - - - - -