Skip to content

Commit 6130efd

Browse files
jeremigonzalesedwin1123
jeremi
authored and
gonzalesedwin1123
committed
feat(spp_change_request_v2): add Submit button and statusbar to all detail forms
Add header with Submit for Approval / Resubmit buttons and approval state statusbar to all CR detail form views, enabling users to submit directly from the detail form.
1 parent 5a04d3a commit 6130efd

11 files changed

+403
-92
lines changed

‎spp_change_request_v2/views/detail_add_member_views.xml‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,66 @@
66
<field name="model">spp.cr.detail.add_member</field>
77
<field name="arch" type="xml">
88
<form>
9+
<header>
10+
<button
11+
name="action_submit_for_approval"
12+
string="Submit for Approval"
13+
type="object"
14+
class="btn-primary"
15+
invisible="approval_state != 'draft'"
16+
/>
17+
<button
18+
name="action_submit_for_approval"
19+
string="Resubmit for Review"
20+
type="object"
21+
class="btn-primary"
22+
invisible="approval_state != 'revision'"
23+
/>
24+
<field
25+
name="approval_state"
26+
widget="statusbar"
27+
statusbar_visible="draft,pending,approved,applied"
28+
/>
29+
</header>
930
<sheet>
1031
<div class="oe_title">
1132
<h1>Add Member to Group</h1>
1233
</div>
1334

1435
<!-- Target Group -->
1536
<group string="Target Group">
16-
<field name="registrant_id" readonly="1"/>
17-
<field name="change_request_id" invisible="1"/>
37+
<field name="registrant_id" readonly="1" />
38+
<field name="change_request_id" invisible="1" />
1839
</group>
1940

2041
<!-- Member Details -->
2142
<group string="New Member Information">
2243
<group>
23-
<field name="given_name" required="1"/>
24-
<field name="family_name" required="1"/>
25-
<field name="member_name" readonly="1" force_save="1"/>
44+
<field name="given_name" required="1" />
45+
<field name="family_name" required="1" />
46+
<field name="member_name" readonly="1" force_save="1" />
2647
</group>
2748
<group>
28-
<field name="birthdate"/>
29-
<field name="gender_id"/>
30-
<field name="relationship_id"/>
49+
<field name="birthdate" />
50+
<field name="gender_id" />
51+
<field name="relationship_id" />
3152
</group>
3253
</group>
3354

3455
<group string="Contact Information">
3556
<group>
36-
<field name="phone"/>
37-
<field name="id_number"/>
57+
<field name="phone" />
58+
<field name="id_number" />
3859
</group>
3960
</group>
4061

4162
<!-- Result (after apply) -->
4263
<group string="Result" invisible="not created_individual_id">
43-
<field name="created_individual_id"/>
64+
<field name="created_individual_id" />
4465
</group>
4566
</sheet>
46-
<chatter/>
67+
<chatter />
4768
</form>
4869
</field>
4970
</record>
50-
5171
</odoo>

‎spp_change_request_v2/views/detail_change_hoh_views.xml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@
66
<field name="model">spp.cr.detail.change_hoh</field>
77
<field name="arch" type="xml">
88
<form string="Change Head of Household Details">
9+
<header>
10+
<button
11+
name="action_submit_for_approval"
12+
string="Submit for Approval"
13+
type="object"
14+
class="btn-primary"
15+
invisible="approval_state != 'draft'"
16+
/>
17+
<button
18+
name="action_submit_for_approval"
19+
string="Resubmit for Review"
20+
type="object"
21+
class="btn-primary"
22+
invisible="approval_state != 'revision'"
23+
/>
24+
<field
25+
name="approval_state"
26+
widget="statusbar"
27+
statusbar_visible="draft,pending,approved,applied"
28+
/>
29+
</header>
930
<sheet>
1031
<group>
1132
<group string="Current Head">
@@ -19,7 +40,11 @@
1940
domain="[('id', 'in', available_individual_ids)]"
2041
required="1"
2142
/>
22-
<field name="new_head_membership_id" invisible="1" force_save="1"/>
43+
<field
44+
name="new_head_membership_id"
45+
invisible="1"
46+
force_save="1"
47+
/>
2348
</group>
2449
</group>
2550
<group>
@@ -28,11 +53,17 @@
2853
<field name="effective_date" />
2954
</group>
3055
<group string="Previous Head Reassignment">
31-
<field name="previous_head_new_role_id" options="{'no_create': True}" />
56+
<field
57+
name="previous_head_new_role_id"
58+
options="{'no_create': True}"
59+
/>
3260
</group>
3361
</group>
3462
<group string="Additional Information">
35-
<field name="remarks" placeholder="Enter any additional notes..." />
63+
<field
64+
name="remarks"
65+
placeholder="Enter any additional notes..."
66+
/>
3667
</group>
3768
</sheet>
3869
</form>

‎spp_change_request_v2/views/detail_create_group_views.xml‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,31 @@
66
<field name="model">spp.cr.detail.create_group</field>
77
<field name="arch" type="xml">
88
<form string="Create New Group Details">
9+
<header>
10+
<button
11+
name="action_submit_for_approval"
12+
string="Submit for Approval"
13+
type="object"
14+
class="btn-primary"
15+
invisible="approval_state != 'draft'"
16+
/>
17+
<button
18+
name="action_submit_for_approval"
19+
string="Resubmit for Review"
20+
type="object"
21+
class="btn-primary"
22+
invisible="approval_state != 'revision'"
23+
/>
24+
<field
25+
name="approval_state"
26+
widget="statusbar"
27+
statusbar_visible="draft,pending,approved,applied"
28+
/>
29+
</header>
930
<sheet>
1031
<group>
1132
<group string="Group Information">
12-
<field name="group_name" required="1"/>
33+
<field name="group_name" required="1" />
1334
<field name="group_type_id" options="{'no_create': True}" />
1435
</group>
1536
<group string="Contact">
@@ -26,16 +47,22 @@
2647
</group>
2748
<group invisible="create_new_head">
2849
<group string="Select Existing Individual">
29-
<field name="head_individual_id" options="{'no_create': True}" />
50+
<field
51+
name="head_individual_id"
52+
options="{'no_create': True}"
53+
/>
3054
</group>
3155
</group>
3256
<group invisible="not create_new_head">
3357
<group string="New Head Information">
34-
<field name="head_given_name" required="create_new_head"/>
35-
<field name="head_family_name" required="create_new_head"/>
36-
<field name="head_name" readonly="1" force_save="1"/>
58+
<field name="head_given_name" required="create_new_head" />
59+
<field name="head_family_name" required="create_new_head" />
60+
<field name="head_name" readonly="1" force_save="1" />
3761
<field name="head_birthdate" />
38-
<field name="head_gender_id" options="{'no_create': True}" />
62+
<field
63+
name="head_gender_id"
64+
options="{'no_create': True}"
65+
/>
3966
<field name="head_phone" />
4067
</group>
4168
</group>

‎spp_change_request_v2/views/detail_edit_group_views.xml‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,65 @@
66
<field name="model">spp.cr.detail.edit_group</field>
77
<field name="arch" type="xml">
88
<form>
9+
<header>
10+
<button
11+
name="action_submit_for_approval"
12+
string="Submit for Approval"
13+
type="object"
14+
class="btn-primary"
15+
invisible="approval_state != 'draft'"
16+
/>
17+
<button
18+
name="action_submit_for_approval"
19+
string="Resubmit for Review"
20+
type="object"
21+
class="btn-primary"
22+
invisible="approval_state != 'revision'"
23+
/>
24+
<field
25+
name="approval_state"
26+
widget="statusbar"
27+
statusbar_visible="draft,pending,approved,applied"
28+
/>
29+
</header>
930
<sheet>
1031
<div class="oe_title">
1132
<h1>Edit Group Information</h1>
1233
</div>
1334

1435
<group string="Group">
15-
<field name="registrant_id" readonly="1"/>
16-
<field name="change_request_id" invisible="1"/>
36+
<field name="registrant_id" readonly="1" />
37+
<field name="change_request_id" invisible="1" />
1738
</group>
1839

1940
<notebook>
2041
<page string="Group Information">
2142
<group>
2243
<group>
23-
<field name="group_name" required="1"/>
44+
<field name="group_name" required="1" />
2445
</group>
2546
<group>
26-
<field name="phone"/>
27-
<field name="email"/>
47+
<field name="phone" />
48+
<field name="email" />
2849
</group>
2950
</group>
3051
</page>
3152
<page string="Address">
3253
<group>
3354
<group>
34-
<field name="address_line1"/>
35-
<field name="address_line2"/>
55+
<field name="address_line1" />
56+
<field name="address_line2" />
3657
</group>
3758
<group>
38-
<field name="city"/>
39-
<field name="postal_code"/>
59+
<field name="city" />
60+
<field name="postal_code" />
4061
</group>
4162
</group>
4263
</page>
4364
</notebook>
4465
</sheet>
45-
<chatter/>
66+
<chatter />
4667
</form>
4768
</field>
4869
</record>
49-
5070
</odoo>

‎spp_change_request_v2/views/detail_edit_individual_views.xml‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,68 @@
66
<field name="model">spp.cr.detail.edit_individual</field>
77
<field name="arch" type="xml">
88
<form>
9+
<header>
10+
<button
11+
name="action_submit_for_approval"
12+
string="Submit for Approval"
13+
type="object"
14+
class="btn-primary"
15+
invisible="approval_state != 'draft'"
16+
/>
17+
<button
18+
name="action_submit_for_approval"
19+
string="Resubmit for Review"
20+
type="object"
21+
class="btn-primary"
22+
invisible="approval_state != 'revision'"
23+
/>
24+
<field
25+
name="approval_state"
26+
widget="statusbar"
27+
statusbar_visible="draft,pending,approved,applied"
28+
/>
29+
</header>
930
<sheet>
1031
<div class="oe_title">
1132
<h1>Edit Individual Information</h1>
1233
</div>
1334

1435
<group string="Individual">
15-
<field name="registrant_id" readonly="1"/>
16-
<field name="change_request_id" invisible="1"/>
36+
<field name="registrant_id" readonly="1" />
37+
<field name="change_request_id" invisible="1" />
1738
</group>
1839

1940
<notebook>
2041
<page string="Personal Information">
2142
<group>
2243
<group>
23-
<field name="given_name" required="1"/>
24-
<field name="family_name" required="1"/>
25-
<field name="birthdate"/>
26-
<field name="gender_id"/>
44+
<field name="given_name" required="1" />
45+
<field name="family_name" required="1" />
46+
<field name="birthdate" />
47+
<field name="gender_id" />
2748
</group>
2849
<group>
29-
<field name="phone"/>
30-
<field name="email"/>
50+
<field name="phone" />
51+
<field name="email" />
3152
</group>
3253
</group>
3354
</page>
3455
<page string="Address">
3556
<group>
3657
<group>
37-
<field name="address_line1"/>
38-
<field name="address_line2"/>
58+
<field name="address_line1" />
59+
<field name="address_line2" />
3960
</group>
4061
<group>
41-
<field name="city"/>
42-
<field name="postal_code"/>
62+
<field name="city" />
63+
<field name="postal_code" />
4364
</group>
4465
</group>
4566
</page>
4667
</notebook>
4768
</sheet>
48-
<chatter/>
69+
<chatter />
4970
</form>
5071
</field>
5172
</record>
52-
5373
</odoo>

0 commit comments

Comments
 (0)