Skip to content

Commit

Permalink
Merge branch 'dev-3.6' into master-3.6
Browse files Browse the repository at this point in the history
# Conflicts:
#	dbmodel
  • Loading branch information
smaspons committed Sep 5, 2024
2 parents 9c123da + a8e8957 commit 8225d5f
Show file tree
Hide file tree
Showing 66 changed files with 12,499 additions and 9,730 deletions.
16 changes: 13 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ You can find more information about our code of conduct on: https://github.com/G
As well as Giswater is developed in Python (qgis plugin) and PL/SQL(PostgreSQL database) there are three main repositories to manage it (QGIS-PLUGIN, DB-MODEL and DOCS). Right now this is the repository for the QGIS-PLUGIN.

## TABLE OF CONTENTS

1- Bug report.<br>
2- Working with issues.<br>
3- Make new code contribution.<br>
4- Contributors list.<br>

## BUG REPORT

If you’re experiencing a problem while working with Giswater, please, report it so our developers can revise and fix it, by submitting the following information and sending an e-mail to bugreport@giswater.org

1. Contact Information: name and e-mail address.<br>
Expand All @@ -27,33 +29,38 @@ This report is generated by clicking on the button ‘Check project' on utilitie
After a few seconds an extensive report for project status is generated within a dialog. Screenshot of this dialog should be sent such that (at least errors & warnings).<br>
More information: https://www.giswater.org/bug-report<br>


## WORKING WITH ISSUES

### Create a new issue:

If you spot a problem with the docs, search if an issue already exists. If a related issue doesn't exist, you can open a new issue using a relevant issue form.<br>

### Solve an issue:

Scan through our existing issues to find one that interests you. You can narrow down the search using labels as filters. See Labels for more information. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.<br>

## MAKE NEW CODE CONTRIBUTION

To get an overview of the project, read the README. Here are some resources to help you get started with open source contributions.<br>

### Finding ways to contribute with project:

- Set up Git.<br>
- GitHub flow.<br>
- Collaborating with pull requests.<br>
- Getting started.<br>
- To navigate our codebase with confidence, see the introduction to working in the docs repository.<br>

### Choose te repo:

To make new code you need to choose what repo are you looking for:<br>
Use the https://github.com/Giswater/docs repository to work with DOCS<br>
Use the https://github.com/Giswater/giswater_qgis_plugin repository to work with PYTHON QGIS PLUGIN.<br>
Use the https://github.com/Giswater/giswater_dbmodel repository to work with DATABASE MODEL.<br>
Rest of repositories are no significant. Some of them they are deprecated or some of them are not used yet.


### Make changes locally:

1- Install Git LFS.<br>
2- Fork the repository.<br>
3- Using GitHub Desktop.<br>
Expand All @@ -66,13 +73,15 @@ Rest of repositories are no significant. Some of them they are deprecated or som
10- Once your changes are ready, don't forget to self-review to speed up the review process.<br>

### Create Pull Request:

When you're finished with the changes, create a pull request, also known as a PR.<br>
Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request. Don't forget to link PR to issue if you are solving one.<br>
Enable the checkbox to allow maintainer edits so the branch can be updated for a merge. Once you submit your PR, a team member will review your proposal. We may ask questions or request for additional information.<br>
We may ask for changes to be made before a PR can be merged, either using suggested changes or pull request comments.<br>
As you update your PR and apply changes, mark each conversation as resolved. Once your PR is merged, your contributions will be publicly visible on the GitHub.<br>

## CONTRIBUTORS LIST

Nicole Aguiar, Frelance GIS consultant.<br>
Jordi Blanch, Stagier on BGEO OPEN GIS.<br>
Guillem Esteve, Stagier on BGEO OPEN GIS.<br>
Expand All @@ -94,4 +103,5 @@ Edgar Fuste, GIS developer on BGEO OPEN GIS.<br>
Albert Bofill, GIS analyst on BGEO OPEN GIS.<br>
Barbara Rzepka, GIS analyst on BGEO OPEN GIS.<br>
Xavier Torret, GIS analyst on BGEO OPEN GIS.<br>

Daniel Marín, Backend on BGEO OPEN GIS.<br>
Ferran Martínez, Frontend on BGEO OPEN GIS.<br>
4 changes: 1 addition & 3 deletions config/giswater.config
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ ud = 26, 27, 219
# plan
45 = GwPsectorButton
46 = GwPsectorManagerButton
50 = GwPriceManagerButton
219 = GwNetscenarioManagerButton
# utilities
58 = GwPrintButton
Expand All @@ -83,7 +82,7 @@ ud = 26, 27, 219
217 = GwUtilsManagerButton
# toc
306 = GwAddChildLayerButton
308 = GwEpaWorldButton
308 = GwLayerStyleChangeButton

[menu]
load = true
Expand Down Expand Up @@ -137,7 +136,6 @@ dlg_plan_psector = 5.-giswater-plugin#5-2-5-1-new-planification-sector
#dlg_psector_rapport = None
dlg_psector_manager = 5.-giswater-plugin#5-2-5-2-psector-manager
#dlg_psector_duplicate = None
dlg_price_manager = 5.-giswater-plugin#5-2-5-3-network-cost-manager
#plan_estimate_result_new = None
#price_result_selector = None
#utils
Expand Down
28 changes: 27 additions & 1 deletion config/user_params.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ force_superuser = False #Forces the main Giswater dialog to be enabled, even if
disable_updateall_attributetable = False #Disables button "Update all" from attribute table
show_psector_ruberband_duration = 5 #Manage rubberband duration
force_create_qgis_group_layer = False #Creates missing groups in ToC when adding layers
force_commit = None

[init.log]
log_level = 20 #Default log level. CRITICAL = 50, FATAL = CRITICAL, ERROR = 40, WARNING = 30, WARN = WARNING, INFO = 20, DEBUG = 10, NOTSET = 0
Expand Down Expand Up @@ -68,7 +69,6 @@ shortcut_toggle_log_db = Alt+1 #Shortcut to show DB&Notify logs
# plan
45 = None #GwPsectorButton
46 = None #GwPsectorManagerButton
50 = None #GwPriceManagerButton
# utilities
58 = None #GwPrintButton
59 = None #GwProjectCheckButton
Expand All @@ -92,6 +92,7 @@ _psector_manager_keep_open = True
_search_open_loadproject = None
_curselectors_open_loadproject = False
_mincut_manager_keep_open = False
_workcat_manager_keep_open = True

[init.user_edit_tricks]
_keep_maptool_active = False
Expand Down Expand Up @@ -320,6 +321,14 @@ _dlg_nonvisual_pattern_ws_width = None
_dlg_nonvisual_pattern_ws_height = None
_dlg_psector_repair_width = None
_dlg_psector_repair_height = None
_dlg_comp_x_pages_width = None
_dlg_comp_x_pages_height = None
_dlg_workcat_manager_width = None
_dlg_workcat_manager_height = None
_dlg_style_manager_width = None
_dlg_style_manager_height = None
_dlg_feature_add_width = None
_dlg_feature_add_height = None

[session.dialogs_position]
dlg_admin_translation_x = None
Expand Down Expand Up @@ -520,6 +529,14 @@ _dlg_nonvisual_pattern_ws_x = None
_dlg_nonvisual_pattern_ws_y = None
_dlg_psector_repair_x = None
_dlg_psector_repair_y = None
_dlg_comp_x_pages_x = None
_dlg_comp_x_pages_y = None
_dlg_workcat_manager_x = None
_dlg_workcat_manager_y = None
_dlg_style_manager_x = None
_dlg_style_manager_y = None
_dlg_feature_add_x = None
_dlg_feature_add_y = None

[session.dialogs_tab]
_dlg_selector_basic = None
Expand Down Expand Up @@ -929,6 +946,9 @@ _gw_fct_create_hydrology_scenario_empty_infiltration = None
_gw_fct_create_hydrology_scenario_empty_text = None
_gw_fct_create_hydrology_scenario_empty_expl = None
_gw_fct_create_hydrology_scenario_empty_active = None
_gw_fct_graphanalytics_mapzones_advanced_checkdata = None
_gw_fct_waterbalance_method = None
_gw_fct_graphanalytics_mapzones_plan_exploitation = None

[session.docker]
_position = None
Expand Down Expand Up @@ -1066,3 +1086,9 @@ _cmb_expl_id = None
_cmb_sector_id = None
_chk_active = None

[session.composer_pages]
_last_composer = None
_folder_path = None
_prefix = None
_single = None

Loading

0 comments on commit 8225d5f

Please sign in to comment.