Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .openspp-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ rules:
- "entitlement_manager_ids" # Entitlement managers (typically <10 per program)
- "payment_manager_ids" # Payment managers (typically <10 per program)
- "farm_machinery_ids" # Farm machinery (typically <20 per farm)
- "group_membership_ids" # Group members (editable from registrant form)
- "individual_membership_ids" # Individual memberships (editable from registrant form)
- "reg_ids" # Registrant IDs (editable from registrant form)
- "related_1_ids" # Relationships (editable from registrant form)
- "related_2_ids" # Relationships (editable from registrant form)
- "beneficiary_ids" # Duplicate beneficiaries (editable from duplicate form)

# Severity overrides (change default severity for rules)
# Valid values: error, warning, info
Expand Down
9 changes: 2 additions & 7 deletions spp_programs/views/duplicate_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
</div>
<notebook>
<page string="Beneficiaries">
<field
name="beneficiary_ids"
nolabel="1"
colspan="2"
readonly="1"
>
<list delete="0">
<field name="beneficiary_ids" nolabel="1" colspan="2">
<list delete="0" editable="bottom">
Comment on lines +50 to +51

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency with other view files in this pull request (e.g., spp_registry/views/individual_views.xml) and for better readability, consider placing attributes of the <field> and <list> tags on separate lines.

Suggested change
<field name="beneficiary_ids" nolabel="1" colspan="2">
<list delete="0" editable="bottom">
<field
name="beneficiary_ids"
nolabel="1"
colspan="2"
>
<list
delete="0"
editable="bottom"
>

<button
name="open_registrant_form"
type="object"
Expand Down
16 changes: 5 additions & 11 deletions spp_programs/views/program_membership_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
</field>
</page>
<page string="IDs" name="ids">
<field name="reg_ids" nolabel="1" colspan="2" readonly="1">
<list>
<field name="reg_ids" nolabel="1" colspan="2">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency with other view files in this PR and for better readability, consider placing attributes of the <field> tag on separate lines.

                            <field
                                name="reg_ids"
                                nolabel="1"
                                colspan="2"
                            >

<list editable="bottom">
<field name="id_type_id" />
<field name="value" string="ID Number" />
<field name="expiry_date" />
Expand All @@ -228,13 +228,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
</page>
<page string="Relationships" name="relationships">
<group string="Registrant is related to:">
<field
name="related_1_ids"
nolabel="1"
colspan="2"
readonly="1"
>
<list>
<field name="related_1_ids" nolabel="1" colspan="2">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency and readability, consider placing attributes of the <field> tag on separate lines.

                                <field
                                    name="related_1_ids"
                                    nolabel="1"
                                    colspan="2"
                                >

<list editable="bottom">
<field
name="source"
domain="[('is_registrant','=',True),('id','!=',id)]"
Expand Down Expand Up @@ -318,9 +313,8 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
name="individual_membership_ids"
nolabel="1"
colspan="2"
readonly="1"
>
<list>
<list editable="bottom">
<field
name="group"
domain="[('is_registrant','=',True),('is_group','=',True)]"
Expand Down
4 changes: 2 additions & 2 deletions spp_registry/views/group_membership_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</xpath>
<xpath expr="//div[@name='group_members_section']" position="inside">
<separator string="Group Members" />
<field name="group_membership_ids" readonly="1" nolabel="1">
<list default_order='status asc,ended_date asc'>
<field name="group_membership_ids" readonly="disabled" nolabel="1">
<list editable="top" default_order='status asc,ended_date asc'>
Comment on lines +17 to +18

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency with other view files in this PR (e.g., spp_registry/views/individual_views.xml) and for better readability, consider placing attributes of the <field> and <list> tags on separate lines.

Suggested change
<field name="group_membership_ids" readonly="disabled" nolabel="1">
<list editable="top" default_order='status asc,ended_date asc'>
<field
name="group_membership_ids"
readonly="disabled"
nolabel="1"
>
<list
editable="top"
default_order="status asc,ended_date asc"
>

<button
name="open_individual_form"
type="object"
Expand Down
4 changes: 2 additions & 2 deletions spp_registry/views/individual_membership_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</xpath>
<xpath expr="//div[@name='membership_section']" position="inside">
<separator string="Group Membership" />
<field name="individual_membership_ids" readonly="1" nolabel="1">
<list>
<field name="individual_membership_ids" readonly="disabled" nolabel="1">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency and readability, consider placing attributes of the <field> tag on separate lines.

                <field
                    name="individual_membership_ids"
                    readonly="disabled"
                    nolabel="1"
                >

<list editable="top">
<button
name="open_group_form"
type="object"
Expand Down
36 changes: 24 additions & 12 deletions spp_registry/views/individual_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,11 @@
<group name="ids_section">
<field
name="reg_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list>
<list editable="bottom">
<field
name="available_id_type_ids"
column_invisible="1"
Expand Down Expand Up @@ -415,11 +415,14 @@
/>
<field
name="related_1_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list decoration-danger="disabled">
<list
editable="bottom"
decoration-danger="disabled"
>
<field
name="available_relation_ids"
column_invisible="1"
Expand Down Expand Up @@ -458,11 +461,14 @@
/>
<field
name="related_2_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list decoration-danger="disabled">
<list
editable="bottom"
decoration-danger="disabled"
>
<field
name="available_relation_ids"
column_invisible="1"
Expand Down Expand Up @@ -680,11 +686,11 @@
<group name="group_ids_section">
<field
name="reg_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list>
<list editable="bottom">
<field
name="available_id_type_ids"
column_invisible="1"
Expand Down Expand Up @@ -713,11 +719,14 @@
/>
<field
name="related_1_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list decoration-danger="disabled">
<list
editable="bottom"
decoration-danger="disabled"
>
<field
name="available_relation_ids"
column_invisible="1"
Expand Down Expand Up @@ -755,11 +764,14 @@
/>
<field
name="related_2_ids"
readonly="1"
readonly="disabled"
nolabel="1"
colspan="2"
>
<list decoration-danger="disabled">
<list
editable="bottom"
decoration-danger="disabled"
>
<field
name="available_relation_ids"
column_invisible="1"
Expand Down
Loading