Skip to content

Commit 9f54353

Browse files
emjay0921emjay0921
authored
Common Demo Module Restructure (#853)
* [NEW] spp_demo_common * [IMP] phone number generation * [ADD] data exporter * [FIX] access rights * [ADD] refresh function * [FIX] UI * [FIX] UI * [FIX] UI * [IMP] UI * [IMP] data exporter templates UI * [IMP] data exporter UI * [IMP] data exporter UI * [IMP] data exporter UI * [IMP] initial stage of export * [IMP] initial stage of export * [IMP] initial stage of export * [IMP] initial stage of export * [IMP] second stage of exporting * [IMP] second stage of exporting * [IMP] second stage of exporting * [IMP] second stage of exporting * [IMP] second stage of exporting * [IMP] second stage of exporting * [FINALIZE] second stage of data exporter * [IMP] add modules on exported data * [IMP] minor fix on export data * [IMP] add force save on bool * [IMP] data exporter * [ADD] initial importer * [FIX] importer UI * [FIX] importer UI * [FIX] importer getting of modules list on file * [FIX] importer getting of modules list on file * [FIX] importer getting of models list on file * [FIX] importer getting of models list on file * [IMP] second stage of importing * [IMP] second stage of importing * [IMP] UI of Importer * [IMP] UI of Importer * [IMP] UI of Importer * [ADD] validation * [FIX] states to invisible * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation replace single quote to double * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] validation * [FIX] UI and validation and pre-commit * [FIX] counts * [ADD] partial state * [ADD] button to save records * [FIX] remove requirement for company on res partner * [FIX] convert iso date to normal date * [FIX] creation * [IMP] creation * [IMP] creation * [IMP] creation * [ADD] logging to check errors * [FIX] recursion * [FIX] new approach on creation * [ADD] logging * [FIX] creation * [ADD] logging * comment out checking of state for now * [ADD] error state for retry saving * [FIX] creation * [ADD] logging * [FIX] remove many2one that representing the same model with parent * [FIX] skip one2many for now * [FIX] skip one2many for now * [FIX] improve many2many handle * [FIX] improve many2many handle * [IMP] improvements on UI and functions * [FIX] UI and function * [IMP] checking of existing records * [IMP] counts * [FIX] wrong indentation * [ADD] logs * [ADD] logger to check error * [IMP] exporting * [ADD] logger to check error * [ADD] logger to check error * [ADD] skipping fields * [IMP] UI * [IMP] UI of Importer * [IMP] UI of Importer * [IMP] importer function and checking of counts * [ADD] notifications * [ADD] queue jobs for export * [FIX] UI for export * [IMP] record count on export * [ADD] job queue on start import * [IMP] use act window close for refresh * [IMP] job queue on validation * [IMP] UI for import * [IMP] UI * [IMP] UI * [ADD] loggging * [IMP] raw mapping * [IMP] raw mapping * [IMP] validation * [IMP] creation * [IMP] add logging * [IMP] mapping * [IMP] mapping * [FIX] age * [ADD] default export template * [FIX] special search for user * [FIX] checking of existing * [FIX] checking of existing * [FIX] checking of existing * [ADD] job queue for Saving * [IMP] status * [ADD] job queue on demo data generator * [IMP] generator * [IMP] generator * [IMP] generator * [IMP] queue jobs in data generator * [IMP] queue jobs in data generator * [IMP] add origins configurations * [IMP] data generator UI * [IMP] Household name should be head last name * [ADD] bank types and id types * [ADD] percentage of id types and banks * [FIX] ID Types and Bank Types to no create * [IMP] make sure to have head member * [FIX] pre-commit * [FIX] validation error * [FIX] generator UI * [FIX] generator UI * [FIX] demo data generation * [FIX] demo data generation * [FIX] demo data generation * [FIX] demo data generation * [FIX] demo data generation * [FIX] demo data generation * [IMP] country mapping * [FIX] demo data generation * [FIX] demo data generation * [FIX] demo data generation * [FIX] phone number generation * [FIX] phone number generation * [ADD] bank types configurations * [FIX] improve App modules * [FIX] improve App modules * [ADD] apps wizard * [ADD] apps wizard * [ADD] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [FIX] apps wizard * [IMP] exporter to include archived data * [IMP] exporter to include archived data * [FIX] add logging to check error * [FIX] creating to remove existing * [FIX] creating to remove existing * [FIX] creating to remove existing * [FIX] creating to remove existing * [FIX] date generation * [FIX] date generation * [FIX] access * [IMP] handle regex for id validation * [IMP] handle regex for id validation * [IMP] handle regex for id validation * [IMP] handle regex for id validation * [IMP] handle regex for id validation * [IMP] handle regex for id validation * [ADD] logger on regex generator * [ADD] logger on regex generator * [FIX] id creation * [FIX] id creation * [FIX] id creation * [FIX] pre-commit * [FIX] batch fake * [FIX] batch fake * [FIX] batch fake * [IMP] renamed spp_farmer_registry_demo * [IMP] common generator extension on farmer demo * [FIX] land record * [FIX] land record * [FIX] farmer generator * [FIX] farmer generator * [FIX] farmer generator * [IMP] farm details on generator * [FIX] head duplication * [FIX] head duplication * [FIX] head duplication * [IMP] trigger onchange for phone field * [IMP] phone numbers possible to have more than 1 * [FIX] pre-commit * [FIX] show only countries with correct locales * [FIX] test yaml and farmer demo exclusion * [FIX] add tests and fix test yaml * [FIX] fix test yaml * [ADD] isolated db for spmis * [FIX] test yaml * [FIX] farmer registry dashboard dependencies * [ADD] tests * [FIX] pre-commit * [REM] not needed from farmer demo * [FIX] tests * [FIX] tests * [FIX] tests
1 parent ae1ae36 commit 9f54353

86 files changed

Lines changed: 12750 additions & 74174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
- name: Install addons and dependencies
154154
env:
155155
SKIP_EXT_DEB_DEPENDENCIES: "true"
156-
EXCLUDE_REGEX: "odoo-addon-g2p.*|odoo-addon-muk.*"
156+
EXCLUDE_REGEX: "odoo-addon-g2p.*|odoo-addon-muk.*|odoo-addon-spp.*"
157157
run: oca_install_addons
158158
- name: Check licenses
159159
run: manifestoo -d . check-licenses
@@ -167,10 +167,15 @@ jobs:
167167
run: |
168168
rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_programs/tests
169169
rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_registry_individual/tests
170+
- name: Initialize sp_mis db
171+
env:
172+
PGDATABASE: sp_mis
173+
run: oca_init_test_database
170174
- name: Run SP-MIS tests
171175
env:
176+
PGDATABASE: sp_mis
172177
COVERAGE_FILE: ".coverage-mis"
173-
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_social_registry,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm"
178+
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_social_registry,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_base_farmer_registry_demo"
174179
run: oca_run_tests
175180
- name: Initialize farmer_registry db
176181
env:
@@ -198,7 +203,7 @@ jobs:
198203
env:
199204
PGDATABASE: social_registry
200205
COVERAGE_FILE: ".coverage-social"
201-
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_spmis,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group"
206+
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_spmis,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group,spp_base_farmer_registry_demo"
202207
run: oca_run_tests
203208
- name: Combine coverage data
204209
run: coverage combine .coverage-mis .coverage-farmer .coverage-social

‎spp_base_common/models/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
from . import ir_module_module
22
from . import phone_validation
33
from . import phone_number
4+
from . import res_partner

‎spp_base_common/models/res_partner.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import logging
2+
3+
from odoo import fields, models
4+
5+
_logger = logging.getLogger(__name__)
6+
7+
8+
class SPPResPartner(models.Model):
9+
_inherit = "res.partner"
10+
11+
company_id = fields.Many2one(
12+
"res.company",
13+
string="Company",
14+
default=lambda self: self.env.company,
15+
required=False,
16+
)

‎spp_base_common/views/main_view.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
name="Settings"
1919
web_icon="spp_base_common,static/description/OpenSPP-Icons-Setting.png"
2020
/>
21+
<menuitem
22+
id="spp_bank_types_config_menu"
23+
action="base.action_res_bank_form"
24+
name="Banks"
25+
parent="g2p_registry_base.g2p_configuration_menu_root"
26+
sequence="50"
27+
/>
2128
</odoo>

‎spp_base_common/views/phone_validation_view.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
class="btn-danger"
3636
invisible="state == 'inactive'"
3737
/>
38-
<field name="active" invisible="1" />
38+
<field name="active" column_invisible="1" />
3939
</tree>
4040
</field>
4141
</record>

spp_farmer_registry_demo/README.rst renamed to spp_base_farmer_registry_demo/README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenSPP Farmer Registry Demo
1717
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1818
:alt: License: LGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OpenSPP%2Fopenspp--modules-lightgray.png?logo=github
20-
:target: https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_farmer_registry_demo
20+
:target: https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_base_farmer_registry_demo
2121
:alt: OpenSPP/openspp-modules
2222

2323
|badge1| |badge2| |badge3|
@@ -28,7 +28,7 @@ OpenSPP Farmer Registry Demo
2828
Overview
2929
--------
3030

31-
The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module is a
31+
The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module is a
3232
demonstration module for OpenSPP that provides pre-populated data for
3333
the farmer registry. It builds upon the
3434
`spp_base_farmer_registry <spp_base_farmer_registry>`__ module and its
@@ -80,7 +80,7 @@ Module Dependencies and Integration
8080
Additional Functionality
8181
------------------------
8282

83-
The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module
83+
The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module
8484
introduces the following key functionalities:
8585

8686
- **Sample Data Generation:** The module includes a dedicated model,
@@ -123,7 +123,7 @@ introduces the following key functionalities:
123123
Conclusion
124124
----------
125125

126-
The `spp_farmer_registry_demo <spp_farmer_registry_demo>`__ module
126+
The `spp_base_farmer_registry_demo <spp_base_farmer_registry_demo>`__ module
127127
provides a valuable tool for understanding and demonstrating the
128128
functionalities of the OpenSPP farmer registry system. By populating the
129129
database with realistic sample data, it allows users to explore the
@@ -143,7 +143,7 @@ Bug Tracker
143143
Bugs are tracked on `GitHub Issues <https://github.com/OpenSPP/openspp-modules/issues>`_.
144144
In case of trouble, please check there if your issue has already been reported.
145145
If you spotted it first, help us to smash it by providing a detailed and welcomed
146-
`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_farmer_registry_demo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
146+
`feedback <https://github.com/OpenSPP/openspp-modules/issues/new?body=module:%20spp_base_farmer_registry_demo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
147147

148148
Do not contact contributors directly about support or help with technical issues.
149149

@@ -172,6 +172,6 @@ Current maintainers:
172172

173173
|maintainer-jeremi| |maintainer-gonzalesedwin1123| |maintainer-reichie020212|
174174

175-
This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_farmer_registry_demo>`_ project on GitHub.
175+
This module is part of the `OpenSPP/openspp-modules <https://github.com/OpenSPP/openspp-modules/tree/17.0/spp_base_farmer_registry_demo>`_ project on GitHub.
176176

177177
You are welcome to contribute.

spp_farmer_registry_demo/__init__.py renamed to spp_base_farmer_registry_demo/__init__.py

File renamed without changes.

spp_farmer_registry_demo/__manifest__.py renamed to spp_base_farmer_registry_demo/__manifest__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
"base",
1818
"g2p_registry_base",
1919
"spp_base_farmer_registry",
20-
"spp_base_demo",
20+
"spp_demo_common",
2121
"queue_job",
2222
"spp_custom_filter_farmer_registry",
2323
],
2424
"excludes": [
2525
"spp_base_spmis",
26+
"spp_base_social_registry",
2627
],
2728
"data": [
2829
"security/ir.model.access.csv",
@@ -36,7 +37,6 @@
3637
"data/feed_items_data.xml",
3738
"views/group_view.xml",
3839
"views/individual_view.xml",
39-
"views/generate_farmer_data_view.xml",
4040
],
4141
"assets": {},
4242
"demo": [],

spp_farmer_registry_demo/data/aqua_data.xml renamed to spp_base_farmer_registry_demo/data/aqua_data.xml

File renamed without changes.

spp_farmer_registry_demo/data/asset_type_data.xml renamed to spp_base_farmer_registry_demo/data/asset_type_data.xml

File renamed without changes.

0 commit comments

Comments
 (0)