Skip to content

Commit 4e3a7a0

Browse files
committed
fix(spp_hxl, spp_hxl_area): update to latest with Beta promotion and UI fixes
- Promote both modules to Beta status - Fix mode="tree" to mode="list" (Odoo 19 compat) - Add missing list view for aggregation rules - Make import batch fields readonly when completed/failed - Remove redundant header buttons - Fix PII in log messages - Improve form layouts
1 parent 52f3651 commit 4e3a7a0

13 files changed

Lines changed: 127 additions & 94 deletions

spp_hxl/README.rst

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@ OpenSPP HXL Integration
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:6ac8b288fda5285dc32109e1aa1876445a3a6584ee8ccbe17c1537f927ad05cb
10+
!! source digest: sha256:2725b4cddb87416b387ae9395036e4f2f9e4cbea74760c5ba624796521b4d519
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
13-
.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
13+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1414
:target: https://odoo-community.org/page/development-status
15-
:alt: Alpha
15+
:alt: Beta
1616
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1717
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1818
:alt: License: LGPL-3
19-
.. |badge3| image:: https://img.shields.io/badge/github-OpenSPP%2Fopenspp--modules-lightgray.png?logo=github
20-
:target: https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl
21-
:alt: OpenSPP/openspp-modules
22-
23-
|badge1| |badge2| |badge3|
19+
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fopenspp--modules-lightgray.png?logo=github
20+
:target: https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl
21+
:alt: OCA/openspp-modules
22+
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23+
:target: https://translation.odoo-community.org/projects/openspp-modules-19-0/openspp-modules-19-0-spp_hxl
24+
:alt: Translate me on Weblate
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/openspp-modules&target_branch=19.0
27+
:alt: Try me on Runboat
28+
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
2430

2531
Humanitarian Exchange Language (HXL) integration for OpenSPP data
2632
interoperability. Provides a registry of standard HXL hashtags and
@@ -127,10 +133,6 @@ Dependencies
127133

128134
``spp_security``, ``spp_cel_domain``, ``spp_studio``, ``spp_vocabulary``
129135

130-
.. IMPORTANT::
131-
This is an alpha version, the data model and design can change at any time without warning.
132-
Only for development or testing purpose, do not use in production.
133-
134136
**Table of contents**
135137

136138
.. contents::
@@ -139,10 +141,10 @@ Dependencies
139141
Bug Tracker
140142
===========
141143

142-
Bugs are tracked on `GitHub Issues <https://github.com/OpenSPP/openspp-modules/issues>`_.
144+
Bugs are tracked on `GitHub Issues <https://github.com/OCA/openspp-modules/issues>`_.
143145
In case of trouble, please check there if your issue has already been reported.
144146
If you spotted it first, help us to smash it by providing a detailed and welcomed
145-
`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_hxl%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
147+
`feedback <https://github.com/OCA/openspp-modules/issues/new?body=module:%20spp_hxl%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
146148

147149
Do not contact contributors directly about support or help with technical issues.
148150

@@ -157,6 +159,20 @@ Authors
157159
Maintainers
158160
-----------
159161

160-
This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl>`_ project on GitHub.
162+
.. |maintainer-jeremi| image:: https://github.com/jeremi.png?size=40px
163+
:target: https://github.com/jeremi
164+
:alt: jeremi
165+
.. |maintainer-gonzalesedwin1123| image:: https://github.com/gonzalesedwin1123.png?size=40px
166+
:target: https://github.com/gonzalesedwin1123
167+
:alt: gonzalesedwin1123
168+
.. |maintainer-emjay0921| image:: https://github.com/emjay0921.png?size=40px
169+
:target: https://github.com/emjay0921
170+
:alt: emjay0921
171+
172+
Current maintainers:
173+
174+
|maintainer-jeremi| |maintainer-gonzalesedwin1123| |maintainer-emjay0921|
175+
176+
This module is part of the `OCA/openspp-modules <https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl>`_ project on GitHub.
161177

162178
You are welcome to contribute.

spp_hxl/__manifest__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"author": "OpenSPP.org",
88
"website": "https://github.com/OpenSPP/OpenSPP2",
99
"license": "LGPL-3",
10-
"development_status": "Alpha",
10+
"maintainers": ["jeremi", "gonzalesedwin1123", "emjay0921"],
11+
"development_status": "Beta",
1112
"depends": [
1213
"spp_security",
1314
"spp_cel_domain",

spp_hxl/static/description/index.html

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ <h1 class="title">OpenSPP HXL Integration</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:6ac8b288fda5285dc32109e1aa1876445a3a6584ee8ccbe17c1537f927ad05cb
370+
!! source digest: sha256:2725b4cddb87416b387ae9395036e4f2f9e4cbea74760c5ba624796521b4d519
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl"><img alt="OpenSPP/openspp-modules" src="https://img.shields.io/badge/github-OpenSPP%2Fopenspp--modules-lightgray.png?logo=github" /></a></p>
372+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl"><img alt="OCA/openspp-modules" src="https://img.shields.io/badge/github-OCA%2Fopenspp--modules-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/openspp-modules-19-0/openspp-modules-19-0-spp_hxl"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/openspp-modules&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>Humanitarian Exchange Language (HXL) integration for OpenSPP data
374374
interoperability. Provides a registry of standard HXL hashtags and
375375
attributes, tools for creating export profiles with HXL tagging, and
@@ -503,11 +503,6 @@ <h1>Extension Points</h1>
503503
<div class="section" id="dependencies">
504504
<h1>Dependencies</h1>
505505
<p><tt class="docutils literal">spp_security</tt>, <tt class="docutils literal">spp_cel_domain</tt>, <tt class="docutils literal">spp_studio</tt>, <tt class="docutils literal">spp_vocabulary</tt></p>
506-
<div class="admonition important">
507-
<p class="first admonition-title">Important</p>
508-
<p class="last">This is an alpha version, the data model and design can change at any time without warning.
509-
Only for development or testing purpose, do not use in production.</p>
510-
</div>
511506
<p><strong>Table of contents</strong></p>
512507
<div class="contents local topic" id="contents">
513508
<ul class="simple">
@@ -521,10 +516,10 @@ <h1>Dependencies</h1>
521516
</div>
522517
<div class="section" id="bug-tracker">
523518
<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
524-
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenSPP/openspp-modules/issues">GitHub Issues</a>.
519+
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/openspp-modules/issues">GitHub Issues</a>.
525520
In case of trouble, please check there if your issue has already been reported.
526521
If you spotted it first, help us to smash it by providing a detailed and welcomed
527-
<a class="reference external" href="https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_hxl%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
522+
<a class="reference external" href="https://github.com/OCA/openspp-modules/issues/new?body=module:%20spp_hxl%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
528523
<p>Do not contact contributors directly about support or help with technical issues.</p>
529524
</div>
530525
<div class="section" id="credits">
@@ -537,7 +532,9 @@ <h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
537532
</div>
538533
<div class="section" id="maintainers">
539534
<h3><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h3>
540-
<p>This module is part of the <a class="reference external" href="https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl">OpenSPP/openspp-modules</a> project on GitHub.</p>
535+
<p>Current maintainers:</p>
536+
<p><a class="reference external image-reference" href="https://github.com/jeremi"><img alt="jeremi" src="https://github.com/jeremi.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/gonzalesedwin1123"><img alt="gonzalesedwin1123" src="https://github.com/gonzalesedwin1123.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/emjay0921"><img alt="emjay0921" src="https://github.com/emjay0921.png?size=40px" /></a></p>
537+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl">OCA/openspp-modules</a> project on GitHub.</p>
541538
<p>You are welcome to contribute.</p>
542539
</div>
543540
</div>

spp_hxl/views/hxl_export_profile_views.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@
5555
<field name="active" widget="boolean_toggle" />
5656
</group>
5757
</group>
58-
<separator string="Description"/>
59-
<field name="description" nolabel="1" placeholder="Description of this export profile..." class="oe_inline"/>
58+
<group colspan="2">
59+
<field name="description" placeholder="Description of this export profile..." />
60+
</group>
6061
<notebook>
6162
<page string="Columns" name="columns">
62-
<field name="column_ids" widget="one2many" mode="tree">
63+
<field name="column_ids" widget="one2many" mode="list">
6364
<form>
6465
<group>
6566
<group>

spp_hxl_area/README.rst

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@ OpenSPP HXL Area Integration
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:3c5a1d6122d13f49f33892b9b6f52d26da35c110f224c781fa24f90d788dacf3
10+
!! source digest: sha256:8207f2737da83b4a78dda75cf232ad3cabe9bedab42315659385ce7646ea06dc
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
13-
.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
13+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1414
:target: https://odoo-community.org/page/development-status
15-
:alt: Alpha
15+
:alt: Beta
1616
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1717
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1818
:alt: License: LGPL-3
19-
.. |badge3| image:: https://img.shields.io/badge/github-OpenSPP%2Fopenspp--modules-lightgray.png?logo=github
20-
:target: https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl_area
21-
:alt: OpenSPP/openspp-modules
22-
23-
|badge1| |badge2| |badge3|
19+
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fopenspp--modules-lightgray.png?logo=github
20+
:target: https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl_area
21+
:alt: OCA/openspp-modules
22+
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23+
:target: https://translation.odoo-community.org/projects/openspp-modules-19-0/openspp-modules-19-0-spp_hxl_area
24+
:alt: Translate me on Weblate
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/openspp-modules&target_branch=19.0
27+
:alt: Try me on Runboat
28+
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
2430

2531
Import HXL-tagged field data and aggregate to area-level indicators for
2632
humanitarian coordination. Matches HXL data rows to geographical areas
@@ -118,10 +124,6 @@ Dependencies
118124
``spp_hxl``, ``spp_area``, ``spp_cel_domain``, ``spp_hazard``,
119125
``spp_security``, ``queue_job``
120126

121-
.. IMPORTANT::
122-
This is an alpha version, the data model and design can change at any time without warning.
123-
Only for development or testing purpose, do not use in production.
124-
125127
**Table of contents**
126128

127129
.. contents::
@@ -130,10 +132,10 @@ Dependencies
130132
Bug Tracker
131133
===========
132134

133-
Bugs are tracked on `GitHub Issues <https://github.com/OpenSPP/openspp-modules/issues>`_.
135+
Bugs are tracked on `GitHub Issues <https://github.com/OCA/openspp-modules/issues>`_.
134136
In case of trouble, please check there if your issue has already been reported.
135137
If you spotted it first, help us to smash it by providing a detailed and welcomed
136-
`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_hxl_area%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
138+
`feedback <https://github.com/OCA/openspp-modules/issues/new?body=module:%20spp_hxl_area%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
137139

138140
Do not contact contributors directly about support or help with technical issues.
139141

@@ -148,6 +150,20 @@ Authors
148150
Maintainers
149151
-----------
150152

151-
This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/19.0/spp_hxl_area>`_ project on GitHub.
153+
.. |maintainer-jeremi| image:: https://github.com/jeremi.png?size=40px
154+
:target: https://github.com/jeremi
155+
:alt: jeremi
156+
.. |maintainer-gonzalesedwin1123| image:: https://github.com/gonzalesedwin1123.png?size=40px
157+
:target: https://github.com/gonzalesedwin1123
158+
:alt: gonzalesedwin1123
159+
.. |maintainer-emjay0921| image:: https://github.com/emjay0921.png?size=40px
160+
:target: https://github.com/emjay0921
161+
:alt: emjay0921
162+
163+
Current maintainers:
164+
165+
|maintainer-jeremi| |maintainer-gonzalesedwin1123| |maintainer-emjay0921|
166+
167+
This module is part of the `OCA/openspp-modules <https://github.com/OCA/openspp-modules/tree/19.0/spp_hxl_area>`_ project on GitHub.
152168

153169
You are welcome to contribute.

spp_hxl_area/__manifest__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"author": "OpenSPP.org",
1010
"website": "https://github.com/OpenSPP/OpenSPP2",
1111
"license": "LGPL-3",
12-
"development_status": "Alpha",
12+
"maintainers": ["jeremi", "gonzalesedwin1123", "emjay0921"],
13+
"development_status": "Beta",
1314
"depends": [
1415
"spp_hxl",
1516
"spp_area",

spp_hxl_area/data/hxl_import_profiles.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<odoo>
3-
<data noupdate="1">
2+
<odoo noupdate="1">
43
<!-- Sri Lanka Damage Assessment Profile -->
54
<record id="profile_sl_damage" model="spp.hxl.import.profile">
65
<field name="name">Sri Lanka Damage Assessment</field>
@@ -138,5 +137,4 @@
138137
<field name="output_hxl_tag">#meta+count</field>
139138
<field name="sequence">10</field>
140139
</record>
141-
</data>
142140
</odoo>

spp_hxl_area/models/hxl_import_batch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def process_import(self):
262262
from ..services.aggregation_engine import AggregationEngine
263263
from ..services.area_matcher import AreaMatcher
264264

265-
_logger.info("Starting HXL import batch: %s", self.name)
265+
_logger.info("Starting HXL import batch: %s", self.id)
266266

267267
# Decode file
268268
file_content = base64.b64decode(self.file_data)
@@ -350,7 +350,7 @@ def process_import(self):
350350
% (len(created_indicators), areas_updated),
351351
)
352352

353-
_logger.info("HXL import batch completed: %s", self.name)
353+
_logger.info("HXL import batch completed: %s", self.id)
354354

355355
except Exception as e:
356356
error_msg = _("Import failed: %s") % str(e)
@@ -377,7 +377,7 @@ def action_view_indicators(self):
377377
"type": "ir.actions.act_window",
378378
"name": _("Generated Indicators"),
379379
"res_model": "spp.hxl.area.indicator",
380-
"view_mode": "tree,form",
380+
"view_mode": "list,form",
381381
"domain": [("batch_id", "=", self.id)],
382382
"context": {"default_batch_id": self.id},
383383
}

spp_hxl_area/models/hxl_import_profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def action_view_batches(self):
9797
"type": "ir.actions.act_window",
9898
"name": _("Import Batches"),
9999
"res_model": "spp.hxl.import.batch",
100-
"view_mode": "tree,form",
100+
"view_mode": "list,form",
101101
"domain": [("profile_id", "=", self.id)],
102102
"context": {"default_profile_id": self.id},
103103
}

0 commit comments

Comments
 (0)