branch develop updated (066334f -> da4345a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 066334f fixes #7134: [PS] Orthongel - Nouvelle requête Répartition des calées par cuve Merge branch 'feature/7134' into develop new bf54268 fix API new da4345a correction de la requete pour fonctionner sous pg (refs #7134) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit da4345a2530dfca7ce156e220e987f9ee4121feb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 14:36:49 2015 +0200 correction de la requete pour fonctionner sous pg (refs #7134) commit bf5426826900d329ffb7e05db1906a610fa710ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 14:36:30 2015 +0200 fix API Summary of changes: observe-business/src/main/filters/observe-reports.properties | 2 +- .../java/fr/ird/observe/its/report/AbstractReportIT.java | 4 ++-- .../fr/ird/observe/its/report/accessoryCatch/Report2IT.java | 2 +- .../fr/ird/observe/its/report/accessoryCatch/ReportIT.java | 2 +- .../observe/its/report/accessoryCatchByGroup/Report2IT.java | 2 +- .../observe/its/report/accessoryCatchByGroup/ReportIT.java | 2 +- .../java/fr/ird/observe/ui/admin/report/ReportModel.java | 6 +++--- .../java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 12 ++++++------ 8 files changed, 16 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bf5426826900d329ffb7e05db1906a610fa710ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 14:36:30 2015 +0200 fix API --- .../java/fr/ird/observe/its/report/AbstractReportIT.java | 4 ++-- .../fr/ird/observe/its/report/accessoryCatch/Report2IT.java | 2 +- .../fr/ird/observe/its/report/accessoryCatch/ReportIT.java | 2 +- .../observe/its/report/accessoryCatchByGroup/Report2IT.java | 2 +- .../observe/its/report/accessoryCatchByGroup/ReportIT.java | 2 +- .../java/fr/ird/observe/ui/admin/report/ReportModel.java | 6 +++--- .../java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java b/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java index a453d50..aaffe11 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java @@ -177,7 +177,7 @@ public abstract class AbstractReportIT { reportExecute.populate(report, tripId); // les variables a utiliser (par defaut, pas de variable) - Map<String, String> variables = new HashMap<String, String>(); + Map<String, Object> variables = new HashMap<String, Object>(); // preparation des variables prepareVariables(dataSource, variables); @@ -197,7 +197,7 @@ public abstract class AbstractReportIT { } protected void prepareVariables(DataSource dataSource, - Map<String, String> variables) { + Map<String, Object> variables) { variables.put(ReportExecute.TRIP_ID_VARIABLE, tripId); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/Report2IT.java b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/Report2IT.java index 6794633..e6fcb0b 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/Report2IT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/Report2IT.java @@ -36,7 +36,7 @@ public class Report2IT extends ReportIT { @Override protected void prepareVariables(DataSource dataSource, - Map<String, String> variables) { + Map<String, Object> variables) { super.prepareVariables(dataSource, variables); variables.put("speciesGroupId", "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.12092280503502995"); diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/ReportIT.java b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/ReportIT.java index d26a97d..c7c5cb2 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/ReportIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatch/ReportIT.java @@ -89,7 +89,7 @@ public class ReportIT extends AbstractReportIT { } @Override - protected void prepareVariables(DataSource dataSource, Map<String, String> variables) { + protected void prepareVariables(DataSource dataSource, Map<String, Object> variables) { super.prepareVariables(dataSource, variables); variables.put("speciesGroupId", "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075"); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/Report2IT.java b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/Report2IT.java index 832257e..8ccc783 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/Report2IT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/Report2IT.java @@ -36,7 +36,7 @@ public class Report2IT extends ReportIT { @Override protected void prepareVariables(DataSource dataSource, - Map<String, String> variables) { + Map<String, Object> variables) { super.prepareVariables(dataSource, variables); variables.put("speciesGroupId", "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.12092280503502995"); diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/ReportIT.java b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/ReportIT.java index 001e978..866b4d9 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/ReportIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/accessoryCatchByGroup/ReportIT.java @@ -139,7 +139,7 @@ public class ReportIT extends AbstractReportIT { } @Override - protected void prepareVariables(DataSource dataSource, Map<String, String> variables) { + protected void prepareVariables(DataSource dataSource, Map<String, Object> variables) { super.prepareVariables(dataSource, variables); variables.put("speciesGroupId", "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075"); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java index 4213430..cee1fc3 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java @@ -78,7 +78,7 @@ public class ReportModel extends AdminActionModel { protected Report selectedReport; /** les variables utilisées pour le report. */ - protected Map<String, String> variables; + protected Map<String, Object> variables; /** le résultat du report actuellement sélectionné */ protected ResultTableModel resultModel; @@ -102,7 +102,7 @@ public class ReportModel extends AdminActionModel { public ReportModel() { super(AdminStep.REPORT); - variables = new TreeMap<String, String>(); + variables = new TreeMap<String, Object>(); } public ReportExecute getReportExecute() { @@ -228,7 +228,7 @@ public class ReportModel extends AdminActionModel { firePropertyChange(SELECTED_REPORT_PROPERTY_NAME, old, selectedReport); } - public Map<String, String> getVariables() { + public Map<String, Object> getVariables() { return variables; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index bef7919..250850f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -124,8 +124,8 @@ public class ReportUIHandler extends AdminTabUIHandler { Report report = (Report) newValue; onSelectedReportChanged(tabUI, source, report); } else if (ReportModel.VARIABLES_PROPERTY_NAME.equals(propertyName)) { - Map<String, String> variables = - (Map<String, String>) newValue; + Map<String, Object> variables = + (Map<String, Object>) newValue; onVariablesChanges(source, variables); } else if (ReportModel.VALID_PROPERTY_NAME.equals(propertyName)) { final Boolean valid = (Boolean) newValue; @@ -383,12 +383,12 @@ public class ReportUIHandler extends AdminTabUIHandler { // on revalide la disposition de l'onglet SwingUtilities.invokeLater(revalidateTabUI); - Map<String, String> variables = model.getVariables(); + Map<String, Object> variables = model.getVariables(); updateValidState(execute, variables); } protected void onVariablesChanges(ReportModel model, - Map<String, String> variables) { + Map<String, Object> variables) { ReportExecute execute = getReportExecute(model); if (execute == null) { @@ -434,7 +434,7 @@ public class ReportUIHandler extends AdminTabUIHandler { "] on " + mareeId); } - Map<String, String> variables = model.getVariables(); + Map<String, Object> variables = model.getVariables(); variables.put(ReportExecute.TRIP_ID_VARIABLE, mareeId); data = execute.execute(variables); @@ -470,7 +470,7 @@ public class ReportUIHandler extends AdminTabUIHandler { } protected void updateValidState(ReportExecute execute, - Map<String, String> variables) { + Map<String, Object> variables) { boolean canExecute = execute.canExecute(variables); getStepModel().setValid(canExecute); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit da4345a2530dfca7ce156e220e987f9ee4121feb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 14:36:49 2015 +0200 correction de la requete pour fonctionner sous pg (refs #7134) --- observe-business/src/main/filters/observe-reports.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 6eac42b..434dda1 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -1509,5 +1509,5 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetCatch tc \ Where t.id = :tripId \ -Group By r.date, a.time, a.latitude, a.longitude, tc.weightCategory.species, tc.well \ +Group By r.date, a.time, a.latitude, a.longitude, tc.weightCategory.species, tc.weightCategory.species.faoCode, tc.well, a.setSeine.schoolType \ Order By r.date, a.time, tc.weightCategory.species, tc.well -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm