Version 2.1.103 (#33)

* Bug fix on v_arc_x_node

* Bug fix

* Merge 'dev_tools' into 'dev' (#32)

* Write function SQL file from Database

* wip task DbToFiles
Rename task CopyFunctionsSchema to FilesToDb

* Parametrize folders adding parameters in properties file

* Bug fix

* Manage UTF-8 without BOM

* Add frame Developer Toolbox
Add functions FilesToDb and DbToFiles

* Bug fixes in Create Schema and Copy Functions

* Bug fix managing execution result

* Dev Tools: manage checkboxes

* Filling data to enable the hydraulic model of the UD sample

* Bug fix getting schemas when user is not the owner

* #129 Improve version table with language-epsg data

* Add compilation instructions

* Insert into table 'version': Add fields 'language' and 'epsg'

* DbToFiles: empty folders before generating files

* Bug fix on config_py_tables

* Improve the 'state' strategy into analysis tools

* Improve the strategy 'state' on the analysis tools

* Improve the strategy to show prices incorporating v_price_arc & v_price_node

* Bug fix on view of RTC

* Update the 'state strategy' applied to anl & man

* Improve the UD data model incorporating new issues

* Improve the WS data model incorporating new issues

* Bug fix deleting views

* Improve the 'visit' strategy

* WiP UD

* Merge SQL branch #129 with branch dev

* Improve 'visit strategy'. WiP

* bug fix on alias name

* bug fix on geom

* adjust man_node trigger to man table approach

* adjust ud_man_arc trigger to man table approach

* bug fix - drop if exists & schema_name

* Change inserts in edit_arc,node,connec trigger

* Change inserts in ud_edit_arc,node,connec,gully trigger

* Add 'config_param' tables

* Bug fix on SQL

* Bug fix on SQL

* Bug fix on SQL

* Bug fix on SQL

* Bug fix on SQL

* Bug fix on fk of document/element tables

* Bug fix on SQL

* Open-Close connection: select previous schema

* Bug fix on SQL

* Bug fix on task 'FilesToDb'

* Bug fix on task 'RenameSchema'

* Fixing error messages

* Insert new triggers to audit_cat_function

* Bug fix on SQL files

* Bug fix on SQL files (UD  - pump strategy)

* Bug fix on sql files

* Bug fix on sql

* Enhance the creation of doc sample data and om sample data using function to generate it

* Bug fix on task 'CreateExampleSchema'

* Bug fix setting SRID on task 'CreateExampleSchema'

* Remove HEC-RAS references

* Bug fix on SQL triggers

* Enhance data of UD sample

* Creation of audit_schema_update_db_catalog

* Introduce pt_BR on SQL files

* Bug fix on SQL

* Bug fix on SQL

* bug fix on ws_edit_man_node

* Add new fields on config_py_tables

* Insert price simple on ud example

* Changes on ws arc,node,connec_type

* Changes on ws arc,node,connec_type

* Changes in ws sample data

* Inserts into config_py_tables

* Arrange UI forms

* DeveloperToolBox: Arrange UI
Remove HECRAS parameters in properties files

* DeveloperToolBox: Process triggers if views are selected

* DeveloperToolBox: FK and rules

* SQL function to insert/update/delete connec's & hydrometer's from CRM DB

* Update changes on dae scs

* Add drop rule and drop constraint on fkeys.

* Bug fix and adding is_last strategy

* bug fix on sql

* Armonize SQL files

* SQL bug fix

* Bug fix on SQL

* BUG fix on SQL

* Insert ws masterplan data

* WiP

* Bug fix on ud man_node. elev

* Data update on db tables.

* DeveloperToolBox: Process files 'vdefault'
Add panel 'CustomOptions'

* Bug fix, add ws man_filter

* bug fix on sql

* DeveloperToolBox: CustomOptions

* Bug fix on SQL file

* Creation of v_edit_man_arc

* Bug fix on value default files

* Reordering and armonizing sql custom files

* DeveloperToolBox CustomOptions: Add 'other' and 'roles'

* Bug fix on sql files

* Bug fix on SQL files

* Bug fix on SQL

* Bug fix on gully insert

* Bug fix on SQL

* Bug fix on SQL file

* Adjustments on arc_type (UD)

* Improve the identification of rows on v_price_x_arc

* Improvment of the strategy of connec_type

* Bug fix on sql file

* SQL bug fix and minor changes

* Minor bugs fixed

* Minor changes on sql files

* New trigger on ws man_pipe

* Check max into integer values of primary id and update the value of the sequence

* Bug fix on views of plan

* New values on config_ui_forms to manage v_price_x_node

* Bug fix on temp tables of WS

* Minor changes on SQL files

* Mino bug fix on sql files

* Bug fix on arc searchnodes

* Bug fix on node2arc functions

* Bug fix on node to arc functions

* Update values on node_type system table (WS)

* Update error message catalog

* Bug fix on man_node triggers (WS & UD)

* Improve the strategy of state on mincut function & connec to network

* Bug fix on node2arc function

* Adjustment on data sample files

* Remove fk from connec_cat to connec_type

* Bug fix on valve analytics recursive

* Bug fix on arc_searchnodes trigger

* New topology tool used to check topology consistency betwen arcs and nodes on ws project

* Bug fix on vnode_update trigger

* Bug fix on node2arc function fixing the arc's direction in case of it is important

* UD - Add fk name in add fk

* Bug fix on sql files

* DeveloperToolBox: Add 'check / uncheck all'
Remove class related to HEC-RAS

* Remove initial message: pgAdmin not found...

* Software configuration: Add option 'Overwrite result'
Remove option 'SQL log file'

* Force a rollback when SQL raises an error
Adjust DeveloperToolBox form

* UD, utils - add fk name in add fk

* Fix bug on sql file

* UD topological consisteny function and utils

* Specific topological consistenyc sql due for dae-scs demands

* WS - fk name in add fk

* Add data num_arcs in cat_node of ws sample

* Bug fix on sql

* Bug fix on sql

* Bug fix on sql

* WS - Delete date_production field

* Bug fix on sql

* Bug fix on sql

* Move searchplus config from utils to ud&ws.

* Bug fix on sql

* Bug fix on sql

* Bug fix on sql file

* Bug fix on SQL files

* Update and rename QGS template files

* Rename project example name
From sample_epasmww and sample_epanet to ud_sample and ws_sample

* Allow relative paths in parameter 'custom_giswater_folder'

* Improve performance of QGIS project creation

* Remove unused files

* Update dbcatalogs

* Add sample data to searchplus config

* Reorganize SQL folders
Folder execution order for 'ws' projects:
ws
ws/fct
ws/trg
utils
utils/fct
utils/trg

* FilesToDb: process new subfolders

* Bug fix on update inp_edit_arc

* Bug fix exporting shorpipe features

* Bug fix on sql

* Add rule insert_plan_arc_x_pavement

* Delete duplicated view of v_inp_dwf_flow

* Bug on v_inp_dwf

* Bug fix on v_inp_pipe

* Update jar file

* Bug fix on sql

* Add inp_dwf rules

* Bug fix on sql 43 ud&ws

* Add fct admin_owner_tables_views

* Bug fix on sql

* Add undelete to connec views

* Bug fix on sample data

* Addi geometry field to visit & creating leakage demo events & views on ws projects

* Bug fix on patterns

* Bug fix on sql

* Add parameter 'FOLDER_TRG'

* Create direct views from inp tables

* Add order by to v_inp

* Add strategy to control qml and sld styles using db catalog

* Add width on edit views of man_arc, man_siphon and man_waccel in order to enhance the simbology using it in QGIS

* WiP on new approach on node2arc function

* Bug fix on sql

* Bug fix on sql

* Change v_plan_psector add atlas_id

* Bug fix on sql file

* Bug fix on sql

* Add multiuser to ws.anl_selector

* Commit changes in Preprocessing options forms

* Bug fix generating rpt file
Add buffer to avoid deadlock with large files

* Add multiuser to ws.rpt_selector

* Code refactor:
Move classes to other packages
Remove any reference to 'actionCommand' in properties files
Remove unused function

* Remove unused forms: catalog, options, result selector

* Remove unused forms: curves and timeseries
Package catalog removed completely

* Add multiuser to ud.rpt_selector

* Bug fix on sql

* Change name of azimut by compass on om tables and views

* Adding default value to SCF field on raingage for UD projects

* Adding field to_arc on views and triggers of inp context (WS)

* Enhancing length of field on catalog of results (WS)

* Create views rpt all on node & arc to enable time manager (WS)

* Change FORCE_MAIN for CONDUIT on arc epaswmm value default system table (UD)

* Add VIRTUAL as value on catalog of shapes (UD)

* Incorporate absolute date on v_rpt_arc_all & v_rpt_node_all to enable the plugin time manager of QGIS to show all simulation results of EPANET

* Bug fix on sql

* fixed bug on sql files

* Fixed few bugs on SQL files

* bug fix in sql files

* Add v_subcatchment

* New db_cat approach

* Bug fix on sql

* New db_cat approach - ws

* Create db_cat_client_agrupation

* Update ws sample data

* Bug fix on sql file

* Bug fix on sql files

* Add current_user into table rpt_selector_result

* Bug fix on sql file

* Bug fix on om_visit (UD)

* UD - update sample data

* Bug fix on sql

* Changes ws sample

* Bug fix on sql files

* Add db_cat_clientlayer data

* Data inserts in ws db_catalog

* Update db_table inserts

* New qgis sample project file

* Bug fix on sql file. When length is cero, slope is not calculed

* Update sample data. Repair mistake on trenchlining price and cost

* Update functions and functionalities on custom_tools (BR_SP_SCS_DAE)

* Bug fix on sql files

* New qgis sample project file

* Update qgis projects

* Update GisPanel form

* DbToFiles: Manage views

* Add function gw_fct_anl_arc_no_startend_node()

* Bug fix in DbToFiles

* Bug fix on don't deleting before creating v_subcatchment

.gitignore

@@ -5,7 +5,7 @@
 log
 portable
 config/giswater_*
-build_runnable.xml
+build_runnable*.xml
 samples/sample_mdt.asc
 samples/sample_mdt.sql
 models/swmm2d/2D/[Bb]in/
@@ -19,7 +19,7 @@ _*
 ## Eclipse
 #################
 
-build.num
+build*.num
 .project
 .metadata
 bin/**

compile_instructions.md

@@ -0,0 +1,53 @@
+This documentation explains how to create a project to develop, test and also be able to generate new executables (.jar file) of Giswater. 
+We will recommend some tools, but of course you can achieve similar results using other ones. 
+
+Download last version of Eclipse IDE for Java developers from this link:
+http://www.eclipse.org/downloads/packages/eclipse-ide-java-developers/neon1a
+
+Use any client GIT software to keep track of the project:
+https://github.com/Giswater/giswater.git
+
+Under Windows platfform we recommend Source Tree:
+https://www.sourcetreeapp.com/
+
+Before create a new project in Eclipse, make sure your computer has a Java Runtime Environment already installed. Although is possible to use any version > 1.6, we recommend to use 1.8.xxx
+http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html
+
+In Eclipse, create a new Java Project called giswater in your workspace folder. For example: 
+C:\workspace\giswater
+
+Configure Build Path:
+Make sure folders 'src' and 'i18n' are set as a source folder
+Make sure default output for binary files is set to: giswater/bin
+
+In that point, you have to be able to Run the application.
+In Project Explorer, search for the MainClass.java under package or.giswater.gui
+Right button - Run As - Java Application
+In a few seconds you will be running giswater!
+
+If everything is fine, now you can make any changes in the source code and run the application again to test them...
+
+If we wanto to create a new executable version we have to execute an XML file containing an Ant buildfile: create_runnable_jar.xml. This file is located in the root folder
+Right button - Run As - Ant build
+
+We can edit that file with any text editor, and make any changes. One of the parameters we have to modify for sure, is the destination folder where application files will be generated (including executable giswater.jar). That parameter is located in line number 12: jar_folder
+Executable full number version consist in 3 digits following this pattern: x.y.zzz
+x: Major version
+y: Minor version
+zzz: Build version
+
+x and y values are defined in the propery version (line 4)
+zzz values will be defined in an external file, called build.num (line 11). We have to create that file will this content:
+[default]
+build.number=100
+
+Every time we run create_runnable_jar.xml, Ant build tool will generate an executable with a diferent build version number (zzz). 
+Ant build tool will automatically autoincrement parameter build.number in the file build.num. We also can manually modify this file whenever we want...
+
+Once generated, we can update giswater.jar, and maybe other folders if that has been updated also, to Giswater installation folder. Default folder is:
+c:\program files\giswater\x.y
+
+For more information and documentation about Ant buildfiles:
+http://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.platform.doc.user%2FgettingStarted%2Fqs-93_project_builder.htm
+
+

config/giswater.properties

@@ -4,19 +4,23 @@ FILE_DBADMIN=portable\\bin\\pgadmin3.exe
 AUTOSTART_POSTGIS=true
 AUTOCONNECT_POSTGIS=true
 SQL_LOG=false
-IMPORT_OVERWRITE=false
-SRID_QUESTION=true
-LOAD_RASTER=true
 OPEN_INP=always
 OPEN_RPT=always
 OVERWRITE_INP=true
 OVERWRITE_RPT=true
+OVERWRITE_RESULT=true
 AUTO_IMPORT_RPT=true
 LOG_FOLDER_SIZE=100
 AUTO_CHECK_UPDATES=false
 FILE_SQL=
 LANGUAGE=en
-PROJECT_UPDATE=ask
+PROJECT_UPDATE=never
+
+# DEVELOPER TOOLS
+DEV_TOOLS=true
+FOLDER_FCT=
+FOLDER_FCT_UTILS=
+FOLDER_VIEWS=
 
 # FIXED PARAMETERS
 DB_CONFIG=config.sqlite

create_runnable_jar.xml

@@ -1,47 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="create_run_jar" name="Create Runnable Jar for Project giswater with libraries in sub-folder">
 
-	<property name="version" value="1.2" />
-	<property name="dist" location="C:/folder_to_save_jar_file"/> 
-	<!--property name="dist" location="C:/Program Files/Giswater/1.2" /--> 	
+	<property name="version" value="2.0" />  	
+	<property name="main-class" value="org.giswater.gui.MainClass"/>
+	<property name="class-path" value=". lib/commons-io-2.4.jar lib/commons-net-3.3.jar lib/formsrt.jar lib/jcalendar-1.4.jar lib/miglayout15-swing.jar lib/postgresql-9.1-901.jdbc4.jar lib/sqlitejdbc-v056.jar"/>	
+
 
     <target name="create_run_jar">
 
-        <jar destfile="${dist}/giswater.jar">
+    	<buildnumber file="build.num"/>    	 
+    	<property name="jar_folder" location="C:/folder_to_save_giswater_versions/${version}.${build.number}"/>      	
+        <jar destfile="${jar_folder}/giswater.jar">
             <manifest>
-                <attribute name="Main-Class" value="org.giswater.gui.MainClass"/>
-				<attribute name="Class-Path" value=". lib/commons-io-2.4.jar lib/commons-net-3.3.jar lib/formsrt.jar lib/jcalendar-1.4.jar lib/miglayout15-swing.jar lib/postgresql-9.1-901.jdbc4.jar lib/sqlitejdbc-v056.jar"/>
+        		<attribute name="Implementation-Version" value="${version}.${build.number}"/>            	
+                <attribute name="Main-Class" value="${main-class}"/>       	
+				<attribute name="Class-Path" value="${class-path}"/>
             </manifest>
             <fileset dir="bin"/>
         </jar>
 
-		<copy todir="${dist}/config">
+		<copy todir="${jar_folder}/config">
 			<fileset dir="config/" includes="*.*" />
 		</copy>		
-		<copy todir="${dist}/epa">
+		<copy todir="${jar_folder}/epa">
 			<fileset dir="epa" />
 		</copy>		
-		<copy todir="${dist}/gis">
+		<copy todir="${jar_folder}/gis">
 			<fileset dir="gis"/>
 		</copy>		
-		<copy todir="${dist}/images">
+		<copy todir="${jar_folder}/images">
 			<fileset dir="images/" includes="*" />
 		</copy>		
-		<copy todir="${dist}/inp">
+		<copy todir="${jar_folder}/inp">
 			<fileset dir="inp/" includes="*" />
 		</copy>		        
-        <copy todir="${dist}/legal">
+        <copy todir="${jar_folder}/legal">
 			<fileset dir="legal/" includes="*.*" />
 		</copy>	
-    	<copy todir="${dist}/lib">
+    	<copy todir="${jar_folder}/lib">
 			<fileset dir="lib/" includes="*.jar" />
 		</copy>	
-        <copy todir="${dist}/samples">
+        <copy todir="${jar_folder}/samples">
 			<fileset dir="samples/" includes="*.*" />
 		</copy>	 
-    	<copy todir="${dist}/sql">
+    	<copy todir="${jar_folder}/sql">
 			<fileset dir="sql" includes="**" />
-		</copy>
+		</copy>	
 
     </target>