youssef
/
GOLEM
forked from Yaltik/golem
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IMP]GOLEM analysis wizards : use header, not footer in current target

This commit is contained in:
Fabien BOURGEOIS 2019-01-21 12:14:43 +01:00
parent 9705eb0f5a
commit 1c3f10ad0a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py
View File

@ -33,7 +33,7 @@ class GolemActivityRegistrationAnalysisWizard(models.TransientModel):
domain = [('is_default', '=', True)] domain = [('is_default', '=', True)]
return self.env['golem.season'].search(domain, limit=1) return self.env['golem.season'].search(domain, limit=1)
name = fields.Char(default=_('Registration Analysis')) name = fields.Char(default='/')
season_id = fields.Many2one('golem.season', 'Season', required=True, season_id = fields.Many2one('golem.season', 'Season', required=True,
default=default_season, ondelete='cascade') default=default_season, ondelete='cascade')
season_start = fields.Date(related='season_id.date_start') season_start = fields.Date(related='season_id.date_start')
@ -83,7 +83,7 @@ class GolemActivityRegistrationAnalysisWizard(models.TransientModel):
}) })
analyse_pivot = analysis_rec.get_pivot_view() analyse_pivot = analysis_rec.get_pivot_view()
return { return {
'name': _('Member Analysis'), 'name': _('Registration Analysis'),
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'res_model': 'golem.member.analysis', 'res_model': 'golem.member.analysis',
'domain': [('resgistration_analysis_id', '=', analysis_rec.id)], 'domain': [('resgistration_analysis_id', '=', analysis_rec.id)],

8
golem_activity_registration/wizard/golem_activity_registration_analysis_wizard_views.xml
View File

@ -26,6 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="name">GOLEM Activity Registration Analyse Wizard Form</field> <field name="name">GOLEM Activity Registration Analyse Wizard Form</field>
<field name="model">golem.activity.registration.analysis.wizard</field> <field name="model">golem.activity.registration.analysis.wizard</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<header>
<button name="registration_analyse" string="Analyse Registrations"
type="object" class="oe_highlight" />
</header>
<form string="Registration Analysis"> <form string="Registration Analysis">
<sheet> <sheet>
<group> <group>
@ -41,10 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="age_computing" widget="radio"/> <field name="age_computing" widget="radio"/>
</group> </group>
</group> </group>
<footer>
<button name="registration_analyse" string="Analyse Registrations"
type="object" class="oe_highlight" />
</footer>
</sheet> </sheet>
</form> </form>

2
golem_member/wizard/golem_member_analysis_wizard.py
View File

@ -33,7 +33,7 @@ class GolemMemberAnalysis(models.TransientModel):
domain = [('is_default', '=', True)] domain = [('is_default', '=', True)]
return self.env['golem.season'].search(domain, limit=1) return self.env['golem.season'].search(domain, limit=1)
name = fields.Char(default=_('Service User Analysis')) name = fields.Char(default='/')
season_id = fields.Many2one('golem.season', 'Season', required=True, season_id = fields.Many2one('golem.season', 'Season', required=True,
default=default_season, ondelete='cascade') default=default_season, ondelete='cascade')
season_start = fields.Date(related='season_id.date_start') season_start = fields.Date(related='season_id.date_start')

8
golem_member/wizard/golem_member_analysis_wizard_views.xml
View File

@ -26,6 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="model">golem.member.analysis.wizard</field> <field name="model">golem.member.analysis.wizard</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Service User Analysis"> <form string="Service User Analysis">
<header>
<button name="members_analyse" string="Run analysis"
type="object" class="oe_highlight" />
</header>
<sheet> <sheet>
<group> <group>
<group> <group>
@ -40,10 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="age_computing" widget="radio"/> <field name="age_computing" widget="radio"/>
</group> </group>
</group> </group>
<footer>
<button name="members_analyse" string="Run analysis"
type="object" class="oe_highlight" />
</footer>
</sheet> </sheet>
</form> </form>