Ajout du popup qui ne s'affiche pas encore
This commit is contained in:
parent
cc23e92232
commit
a64d865648
@ -25,5 +25,7 @@
|
|||||||
'application': True,
|
'application': True,
|
||||||
'installable': True,
|
'installable': True,
|
||||||
'depends': ['golem_activity', 'golem_activity_registration'],
|
'depends': ['golem_activity', 'golem_activity_registration'],
|
||||||
'data': ['views/golem_activity_queue_views.xml']
|
'data': ['views/golem_activity_queue_views.xml',
|
||||||
|
'views/golem_activity_views.xml',
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
@ -19,14 +19,69 @@
|
|||||||
|
|
||||||
from odoo import models, fields, api, _
|
from odoo import models, fields, api, _
|
||||||
|
|
||||||
|
class YesNoQueuePopUp(models.TransientModel):
|
||||||
|
"""GOLEM Resource wizard"""
|
||||||
|
_name = "golem.queuepopup"
|
||||||
|
|
||||||
|
|
||||||
|
yes_no = fields.Char(default='Do you want to proceed?')
|
||||||
|
|
||||||
|
@api.multi
|
||||||
|
def yes(self):
|
||||||
|
pass
|
||||||
|
# sure continue!
|
||||||
|
|
||||||
|
@api.multi
|
||||||
|
def no(self):
|
||||||
|
pass # don't do anything stupid
|
||||||
|
|
||||||
|
|
||||||
class GolemActivity(models.Model):
|
class GolemActivity(models.Model):
|
||||||
""" GOLEM Activity """
|
""" GOLEM Activity adaptations """
|
||||||
_name = 'golem.activity'
|
_inherit = 'golem.activity'
|
||||||
|
|
||||||
|
|
||||||
#ajout d'un champs O2M vers activity_id
|
#ajout d'un champs O2M vers activity_id
|
||||||
activity_queue_id = fields.One2many('golem.activity.queue', 'activity_id')
|
activity_queue_id = fields.One2many('golem.activity.queue', 'activity_id')
|
||||||
# un boolen pour determiner si une fille d'attente est autorisé
|
# un boolen pour determiner si une fille d'attente est autorisé
|
||||||
allows_queue = fields.Boolean(required=False)
|
queue_allowed = fields.Boolean(default=True)
|
||||||
|
|
||||||
|
@api.multi
|
||||||
|
@api.constrains('places_remain')
|
||||||
|
def _check_remaining_places(self):
|
||||||
|
""" Forbid inscription when there is no more place """
|
||||||
|
for activity in self:
|
||||||
|
if activity.places_remain < 5:
|
||||||
|
|
||||||
|
if self.queue_allowed:
|
||||||
|
print "__________________________ test ______________________"
|
||||||
|
return {
|
||||||
|
'name' : _('Please enter the reseaon of rejection'),
|
||||||
|
'type' : 'ir.actions.act_window',
|
||||||
|
'res_model' : 'golem.queuepopup',
|
||||||
|
'view_mode': 'form',
|
||||||
|
'view_type': 'form',
|
||||||
|
'target': 'new',
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
'name' : _('Do you want to add your registration to the queue?'),
|
||||||
|
'type' : 'ir.actions.act_window',
|
||||||
|
'res_model' : 'golem.queuepopup',
|
||||||
|
'view_mode': 'form',
|
||||||
|
'view_type': 'form',
|
||||||
|
'target': 'new',
|
||||||
|
}
|
||||||
|
print "________________________________test 2 __________________"
|
||||||
|
|
||||||
|
|
||||||
|
else:
|
||||||
|
emsg = _('Sorry, there is no more place man !')
|
||||||
|
raise models.ValidationError(emsg)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class GolemActivityQueue(models.Model):
|
class GolemActivityQueue(models.Model):
|
||||||
""" GOLEM Activity Queue """
|
""" GOLEM Activity Queue """
|
||||||
@ -34,5 +89,5 @@ class GolemActivityQueue(models.Model):
|
|||||||
_description = 'GOLEM Activity Queue'
|
_description = 'GOLEM Activity Queue'
|
||||||
|
|
||||||
activity_id = fields.Many2one('golem.activity', required=True)
|
activity_id = fields.Many2one('golem.activity', required=True)
|
||||||
season_id = fields.Many2one('golem.season', related='golem.activity.season_id')
|
season_id = fields.Many2one(related='activity_id.season_id')
|
||||||
member_id = fields.Many2one('golem.member', required=True)
|
member_id = fields.Many2one('golem.member', required=True)
|
||||||
|
26
golem_activity_queue/views/golem_activity_queue_views.xml
Normal file
26
golem_activity_queue/views/golem_activity_queue_views.xml
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
|
||||||
|
|
||||||
|
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 <http://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<odoo>
|
||||||
|
<data>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</data>
|
||||||
|
</odoo>
|
48
golem_activity_queue/views/golem_activity_views.xml
Normal file
48
golem_activity_queue/views/golem_activity_views.xml
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
|
||||||
|
|
||||||
|
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 <http://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<odoo>
|
||||||
|
<data>
|
||||||
|
<record id="golem_activity_form_inherit_queue"
|
||||||
|
model="ir.ui.view">
|
||||||
|
<field name="name">Activity Registrations and Places</field>
|
||||||
|
<field name="model">golem.activity</field>
|
||||||
|
<field name="inherit_id" ref="golem_activity.golem_activity_form" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//field[@name='is_overbooked']" position="after">
|
||||||
|
<field name="queue_allowed"/>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record model="ir.ui.view" id="wizard_form_view">
|
||||||
|
<field name="name">queuepopup.form</field>
|
||||||
|
<field name="model">golem.queuepopup</field>
|
||||||
|
<field name="type">form</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form string="Add motif">
|
||||||
|
<field name="yes_no" readonly="1" />
|
||||||
|
<!--<footer>
|
||||||
|
<button class="oe_highlight" name="yes" string="Yes" />
|
||||||
|
<button class="oe_highlight" name="no" string="No" />
|
||||||
|
</footer>-->
|
||||||
|
</form>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</data>
|
||||||
|
</odoo>
|
Loading…
Reference in New Issue
Block a user