Skip to content

Commit 87d3302

Browse files
emjay0921emjay0921
authored
Merge pull request #85 from OpenSPP/fix/hazard-import-oauth-beta-fixes
fix(spp_hazard_programs,spp_import_match,spp_oauth): beta fixes and import overwrite toggle
2 parents 5d316fe + 2abff7b commit 87d3302

File tree

25 files changed

+785
-248
lines changed

25 files changed

+785
-248
lines changed

‎spp_hazard_programs/README.rst‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
===================================
26
OpenSPP Hazard Programs Integration
37
===================================
48

5-
..
9+
..
610
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
711
!! This file is generated by oca-gen-addon-readme !!
812
!! changes will be overwritten. !!
913
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:e4ca3f5b5e8c998b833ccd6526f575c07f53a38ac49875511c31201f13122916
14+
!! source digest: sha256:4af3e4daf1509efef99ad29497bc756e1ec197df2297c50529ff48112fb08d59
1115
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1216
13-
.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
17+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
15-
:alt: Alpha
19+
:alt: Beta
1620
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1822
:alt: License: LGPL-3
@@ -44,15 +48,15 @@ Key Capabilities
4448
Key Models
4549
~~~~~~~~~~
4650

47-
+----------------------------------+-----------------------------------+
48-
| Model | Description |
49-
+==================================+===================================+
50-
| ``spp.program`` (extend) | Adds target incidents, emergency |
51-
| | mode, damage filter |
52-
+----------------------------------+-----------------------------------+
53-
| ``spp.hazard.incident`` (extend) | Adds reverse relation to response |
54-
| | programs |
55-
+----------------------------------+-----------------------------------+
51+
+----------------------------------+----------------------------------+
52+
| Model | Description |
53+
+==================================+==================================+
54+
| ``spp.program`` (extend) | Adds target incidents, emergency |
55+
| | mode, damage filter |
56+
+----------------------------------+----------------------------------+
57+
| ``spp.hazard.incident`` (extend) | Adds reverse relation to |
58+
| | response programs |
59+
+----------------------------------+----------------------------------+
5660

5761
UI Location
5862
~~~~~~~~~~~
@@ -89,10 +93,6 @@ Dependencies
8993

9094
``spp_hazard``, ``spp_programs``
9195

92-
.. IMPORTANT::
93-
This is an alpha version, the data model and design can change at any time without warning.
94-
Only for development or testing purpose, do not use in production.
95-
9696
**Table of contents**
9797

9898
.. contents::
@@ -135,4 +135,4 @@ Current maintainers:
135135

136136
This module is part of the `OpenSPP/OpenSPP2 <https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_hazard_programs>`_ project on GitHub.
137137

138-
You are welcome to contribute.
138+
You are welcome to contribute.

‎spp_hazard_programs/__manifest__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
"author": "OpenSPP.org",
1313
"website": "https://github.com/OpenSPP/OpenSPP2",
1414
"license": "LGPL-3",
15-
"development_status": "Alpha",
15+
"development_status": "Beta",
1616
"maintainers": ["jeremi", "gonzalesedwin1123", "reichie020212"],
1717
"depends": [
1818
"spp_hazard",
1919
"spp_programs",
2020
],
2121
"data": [
22-
"security/ir.model.access.csv",
2322
"views/program_views.xml",
2423
"views/incident_views.xml",
2524
],

‎spp_hazard_programs/security/ir.model.access.csv‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎spp_hazard_programs/static/description/index.html‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
6-
<title>OpenSPP Hazard Programs Integration</title>
6+
<title>README.rst</title>
77
<style type="text/css">
88

99
/*
@@ -360,22 +360,27 @@
360360
</style>
361361
</head>
362362
<body>
363-
<div class="document" id="openspp-hazard-programs-integration">
364-
<h1 class="title">OpenSPP Hazard Programs Integration</h1>
363+
<div class="document">
365364

365+
366+
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
367+
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
368+
</a>
369+
<div class="section" id="openspp-hazard-programs-integration">
370+
<h1>OpenSPP Hazard Programs Integration</h1>
366371
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
367372
!! This file is generated by oca-gen-addon-readme !!
368373
!! changes will be overwritten. !!
369374
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:e4ca3f5b5e8c998b833ccd6526f575c07f53a38ac49875511c31201f13122916
375+
!! source digest: sha256:4af3e4daf1509efef99ad29497bc756e1ec197df2297c50529ff48112fb08d59
371376
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
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/OpenSPP2/tree/19.0/spp_hazard_programs"><img alt="OpenSPP/OpenSPP2" src="https://img.shields.io/badge/github-OpenSPP%2FOpenSPP2-lightgray.png?logo=github" /></a></p>
377+
<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/OpenSPP/OpenSPP2/tree/19.0/spp_hazard_programs"><img alt="OpenSPP/OpenSPP2" src="https://img.shields.io/badge/github-OpenSPP%2FOpenSPP2-lightgray.png?logo=github" /></a></p>
373378
<p>Links hazard incidents to emergency response programs. Enables programs
374379
to target affected populations using verified impact data, filter
375380
registrants by damage severity, and automatically enable emergency mode
376381
when responding to active incidents.</p>
377382
<div class="section" id="key-capabilities">
378-
<h1>Key Capabilities</h1>
383+
<h2>Key Capabilities</h2>
379384
<ul class="simple">
380385
<li>Link programs to one or more hazard incidents via many-to-many
381386
relation</li>
@@ -390,11 +395,11 @@ <h1>Key Capabilities</h1>
390395
</ul>
391396
</div>
392397
<div class="section" id="key-models">
393-
<h1>Key Models</h1>
398+
<h2>Key Models</h2>
394399
<table border="1" class="docutils">
395400
<colgroup>
396-
<col width="49%" />
397-
<col width="51%" />
401+
<col width="50%" />
402+
<col width="50%" />
398403
</colgroup>
399404
<thead valign="bottom">
400405
<tr><th class="head">Model</th>
@@ -407,14 +412,14 @@ <h1>Key Models</h1>
407412
mode, damage filter</td>
408413
</tr>
409414
<tr><td><tt class="docutils literal">spp.hazard.incident</tt> (extend)</td>
410-
<td>Adds reverse relation to response
411-
programs</td>
415+
<td>Adds reverse relation to
416+
response programs</td>
412417
</tr>
413418
</tbody>
414419
</table>
415420
</div>
416421
<div class="section" id="ui-location">
417-
<h1>UI Location</h1>
422+
<h2>UI Location</h2>
418423
<ul class="simple">
419424
<li><strong>Programs</strong>: Programs &gt; Programs &gt; “Emergency Response” tab</li>
420425
<li><strong>Incidents</strong>: Hazard &amp; Emergency &gt; Incidents &gt; All Incidents &gt;
@@ -426,15 +431,15 @@ <h1>UI Location</h1>
426431
</ul>
427432
</div>
428433
<div class="section" id="security">
429-
<h1>Security</h1>
434+
<h2>Security</h2>
430435
<p>No new ACL entries. Access inherited from base models:</p>
431436
<ul class="simple">
432437
<li><tt class="docutils literal">spp.program</tt>: Controlled by <tt class="docutils literal">spp_programs</tt> security groups</li>
433438
<li><tt class="docutils literal">spp.hazard.incident</tt>: Controlled by <tt class="docutils literal">spp_hazard</tt> security groups</li>
434439
</ul>
435440
</div>
436441
<div class="section" id="extension-points">
437-
<h1>Extension Points</h1>
442+
<h2>Extension Points</h2>
438443
<ul class="simple">
439444
<li>Override <tt class="docutils literal">get_emergency_eligible_registrants()</tt> to customize
440445
eligibility logic beyond damage levels</li>
@@ -446,13 +451,8 @@ <h1>Extension Points</h1>
446451
</ul>
447452
</div>
448453
<div class="section" id="dependencies">
449-
<h1>Dependencies</h1>
454+
<h2>Dependencies</h2>
450455
<p><tt class="docutils literal">spp_hazard</tt>, <tt class="docutils literal">spp_programs</tt></p>
451-
<div class="admonition important">
452-
<p class="first admonition-title">Important</p>
453-
<p class="last">This is an alpha version, the data model and design can change at any time without warning.
454-
Only for development or testing purpose, do not use in production.</p>
455-
</div>
456456
<p><strong>Table of contents</strong></p>
457457
<div class="contents local topic" id="contents">
458458
<ul class="simple">
@@ -465,23 +465,23 @@ <h1>Dependencies</h1>
465465
</ul>
466466
</div>
467467
<div class="section" id="bug-tracker">
468-
<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
468+
<h3><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h3>
469469
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/issues">GitHub Issues</a>.
470470
In case of trouble, please check there if your issue has already been reported.
471471
If you spotted it first, help us to smash it by providing a detailed and welcomed
472472
<a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/issues/new?body=module:%20spp_hazard_programs%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
473473
<p>Do not contact contributors directly about support or help with technical issues.</p>
474474
</div>
475475
<div class="section" id="credits">
476-
<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
476+
<h3><a class="toc-backref" href="#toc-entry-2">Credits</a></h3>
477477
<div class="section" id="authors">
478-
<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
478+
<h4><a class="toc-backref" href="#toc-entry-3">Authors</a></h4>
479479
<ul class="simple">
480480
<li>OpenSPP.org</li>
481481
</ul>
482482
</div>
483483
<div class="section" id="maintainers">
484-
<h3><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h3>
484+
<h4><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h4>
485485
<p>Current maintainers:</p>
486486
<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/reichie020212"><img alt="reichie020212" src="https://github.com/reichie020212.png?size=40px" /></a></p>
487487
<p>This module is part of the <a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_hazard_programs">OpenSPP/OpenSPP2</a> project on GitHub.</p>
@@ -490,5 +490,6 @@ <h3><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h3>
490490
</div>
491491
</div>
492492
</div>
493+
</div>
493494
</body>
494495
</html>

‎spp_hazard_programs/views/program_views.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<field name="category_id" />
6464
<field name="status" widget="badge" />
6565
<field name="severity" widget="badge" />
66-
<field name="affected_registrant_count" />
6766
</list>
6867
</field>
6968
</page>

‎spp_import_match/README.rst‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
====================
26
OpenSPP Import Match
37
====================
48

5-
..
9+
..
610
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
711
!! This file is generated by oca-gen-addon-readme !!
812
!! changes will be overwritten. !!
913
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:b57dea1315fd1f9af8f15720c5332b182c0a01fddd827a3daa73a8e950d41faa
14+
!! source digest: sha256:02de7214923a9a8bd540920bb2ff0166ea13501c1859b831f3a8305970b5d64a
1115
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1216
13-
.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
17+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
15-
:alt: Alpha
19+
:alt: Beta
1620
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1822
:alt: License: LGPL-3
@@ -47,15 +51,15 @@ Key Capabilities
4751
Key Models
4852
~~~~~~~~~~
4953

50-
+-----------------------------+----------------------------------------+
51-
| Model | Description |
52-
+=============================+========================================+
53-
| ``spp.import.match`` | Matching rule configuration for a |
54-
| | specific model |
55-
+-----------------------------+----------------------------------------+
56-
| ``spp.import.match.fields`` | Individual fields used in a rule, |
57-
| | supports sub-fields |
58-
+-----------------------------+----------------------------------------+
54+
+-----------------------------+---------------------------------------+
55+
| Model | Description |
56+
+=============================+=======================================+
57+
| ``spp.import.match`` | Matching rule configuration for a |
58+
| | specific model |
59+
+-----------------------------+---------------------------------------+
60+
| ``spp.import.match.fields`` | Individual fields used in a rule, |
61+
| | supports sub-fields |
62+
+-----------------------------+---------------------------------------+
5963

6064
Configuration
6165
~~~~~~~~~~~~~
@@ -106,10 +110,6 @@ Dependencies
106110
``base``, ``spp_base_common``, ``base_import``, ``queue_job``,
107111
``spp_security``
108112

109-
.. IMPORTANT::
110-
This is an alpha version, the data model and design can change at any time without warning.
111-
Only for development or testing purpose, do not use in production.
112-
113113
**Table of contents**
114114

115115
.. contents::
@@ -149,4 +149,4 @@ Current maintainers:
149149

150150
This module is part of the `OpenSPP/OpenSPP2 <https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_import_match>`_ project on GitHub.
151151

152-
You are welcome to contribute.
152+
You are welcome to contribute.

‎spp_import_match/__manifest__.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"author": "OpenSPP.org",
1111
"website": "https://github.com/OpenSPP/OpenSPP2",
1212
"license": "LGPL-3",
13-
"development_status": "Alpha",
13+
"development_status": "Beta",
1414
"maintainers": ["jeremi", "gonzalesedwin1123"],
1515
"depends": ["base", "spp_base_common", "base_import", "queue_job", "spp_security"],
1616
"data": [
@@ -20,10 +20,8 @@
2020
],
2121
"assets": {
2222
"web.assets_backend": [
23-
"spp_import_match/static/src/legacy/js/custom_base_import.js",
24-
],
25-
"web.assets_qweb": [
26-
"spp_import_match/static/src/legacy/xml/custom_base_import.xml",
23+
"spp_import_match/static/src/import_match_selector/import_match_selector.js",
24+
"spp_import_match/static/src/import_match_selector/import_match_selector.xml",
2725
],
2826
},
2927
"demo": [],

0 commit comments

Comments
 (0)