Merge branch 'main' of https://github.com/teksi/wastewater into pr/284

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Exact steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots / data**
+If applicable, add screenshots or data to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - TWW version
+ - QGIS Version
+ - OS
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,102 @@
+---
+name: Feature request
+about: Suggest a new feature for this project
+title: "[NEW FEATURE REQUEST]"
+labels: Feature
+assignees: ''
+
+---
+
+## General information
+_This document helps to collect information for a TEKSI project definition and afterwards the TEKSI projects specification that are the basis for passing with the new feature process thru the different decision takers.
+
+- Applicant (User. who would like this feature):
+- Author (Service provider, who is mandated to write this request):
+- Developer (suggested developer(s)):
+- TEKSI Code reviewer : _Developer responsible for the code review_
+
+
+## Users and administrators needs
+
+### Graphical identity / Logo
+
+_Illustrations if applicable._
+
+### Description of users and administrators feature requirements
+
+_Describe the new feature_
+
+### Requirements
+
+_List of requirements_
+
+### Illustrations of the features and the requirements
+
+_Schemes, screen captures, or any other illustrations._
+
+### Graphical User Interface (GUI)
+
+_Provide a mockup of how it should look like_
+
+## Technical analysis and specifications
+
+_Feedbacks from the technical group_
+
+### Feasibility study
+
+_IF required, list the conclusions of the Feasibility study, options, alternatives and technical specificities_
+
+### Risks and constraints
+
+### Mutualisation
+_Mutualisation and possible impacts with other projects_
+
+### Specifications
+
+_IF available, link advanced specifications of the features required_
+
+### Timeline / deadlines
+_Add a detailed timeline_
+
+- [x] 01.09.2024 : First draft
+- [ ] 01.10.2024 :
+- [ ] 01.11.2024 :
+- [ ] xx.xx.2024 : Presentation and review by User group
+- [ ] xx.xx.2024 : Presentation and review by Technical group
+- [ ] xx.xx.2024 : TEKSI project definition
+- [ ] xx.xx.2024 : Presentation and review by Board (strategic ok)
+- [ ] xx.xx.2024 : TEKSI requirements
+- [ ] xx.xx.2024 : Presentation and review by Technical group
+- [ ] xx.xx.2024 : Presentation and review by Board (technical ok)
+- [ ] xx.xx.2024 : Call for offers
+- [ ] xx.xx.2024 : ...
+
+### Related softwares versions
+
+- QGIS version:
+- Database model version:
+- INTERLIS Model version:
+
+### Linked issues :
+- [ ] #XXX
+
+## Documentation
+
+Documentation links
+- User manual :
+- Administrator manual :
+
+## Development and integration
+
+Link and comments from the developer about the product
+
+- Deliverable :
+- Recommendations and comments :
+- Future prospects :
+
+## Conclusion
+
+Conclusions from applicant, users or admins group
+
+- Conclusion:
+- Future prospects:

.github/ISSUE_TEMPLATE/specification_definition.md

@@ -0,0 +1,33 @@
+---
+name: Specification definition
+about: Suggest a new feature specification definition
+title: "[NEW SPECIFICATION DEFINITION]"
+labels: Specification
+assignees: ''
+
+---
+
+# Objective
+_What is expected from the new functionnality/development_
+
+# How it works
+_Simple description of how it is supposed to work_
+
+# Configuration
+_How it can be configured_
+
+- **Parameters** :
+
+| Field | Type | Mandatory | Example |
+|------|-------|--------------|----------|
+| id     | int4   | Primary key|               |
+
+# Other
+_Additional informations/requirements_
+
+# Acceptation criteria
+| Identifier | Description                                |
+|-----------|-----------------------------------|
+| #ISSUE-1 | It works                                     |
+| #ISSUE-2 | It works everytime                    |
+| #ISSUE-3 | It works on all systems             |

.github/PULL_REQUEST_TEMPLATE/pull_request.md

@@ -0,0 +1,23 @@
+## General
+ - [ ] Fix a bug
+ - [ ] Add a feature
+ - [ ] Maintenance / sustainability
+ - [ ] Add Documentation
+
+## Describe your changes
+
+## Screenshots
+
+## Issue ticket number and link
+
+## Checklist before requesting a review
+- [ ] I have performed a self-review of my code
+- [ ] If it is a core feature, I have added thorough tests.
+- [ ] CI Tests are green
+- [ ] The documentation is up to date with the proposed change.
+- [ ] My work is ready for review
+
+## Checklist before merge
+- [ ] A review has been performed
+- [ ] Comments are resolved
+- [ ] Documentation is ready

datamodel/app/create_app.py

@@ -10,8 +10,10 @@
     import psycopg2 as psycopg
 
 from pirogue import MultipleInheritance, SimpleJoins, SingleInheritance
+from view.vw_tww_additional_ws import vw_tww_additional_ws
 from view.vw_tww_reach import vw_tww_reach
 from view.vw_tww_wastewater_structure import vw_tww_wastewater_structure
+from view.vw_wastewater_structure import vw_wastewater_structure
 from yaml import safe_load
 
 
@@ -38,6 +40,7 @@ def create_app(
     drop_schema: Optional[bool] = False,
     tww_reach_extra: Optional[Path] = None,
     tww_wastewater_structure_extra: Optional[Path] = None,
+    wastewater_structure_extra: Optional[Path] = None,
 ):
     """
     Creates the schema tww_app for TEKSI Wastewater & GEP
@@ -46,6 +49,7 @@ def create_app(
     :param pg_service: the PostgreSQL service, if not given it will be determined from environment variable in Pirogue
     :param tww_reach_extra: YAML file path of the definition of additional columns for vw_tww_reach view
     :param tww_wastewater_structure_extra: YAML file path of the definition of additional columns for vw_tww_wastewater_structure_extra view
+    :param wastewater_structure_extra: YAML file path of the definition of additional columns for vw_wastewater_structure_extra view
     """
     cwd = Path(__file__).parent.resolve()
     variables = {
@@ -60,12 +64,15 @@ def create_app(
     run_sql_file("symbology_functions.sql", pg_service)
     run_sql_file("reach_direction_change.sql", pg_service, variables)
     run_sql_file("14_geometry_functions.sql", pg_service, variables)
+    run_sql_file("organisation_functions.sql", pg_service, variables)
 
     # open YAML files
     if tww_reach_extra:
         tww_reach_extra = safe_load(open(tww_reach_extra))
     if tww_wastewater_structure_extra:
         tww_wastewater_structure_extra = safe_load(open(tww_wastewater_structure_extra))
+    if wastewater_structure_extra:
+        wastewater_structure_extra = safe_load(open(wastewater_structure_extra))
 
     run_sql_file("view/vw_dictionary_value_list.sql", pg_service, variables)
 
@@ -139,10 +146,12 @@ def create_app(
         pg_service=pg_service,
     ).create()
 
+    vw_wastewater_structure(pg_service=pg_service, extra_definition=wastewater_structure_extra)
     vw_tww_wastewater_structure(
         srid, pg_service=pg_service, extra_definition=tww_wastewater_structure_extra
     )
     vw_tww_reach(pg_service=pg_service, extra_definition=tww_reach_extra)
+    vw_tww_additional_ws(srid, pg_service=pg_service)
 
     run_sql_file("view/vw_file.sql", pg_service, variables)