From 1dc9bc50099230da541d58202778894d2de91498 Mon Sep 17 00:00:00 2001 From: mifoscontributer Date: Mon, 12 Aug 2013 17:48:20 +0530 Subject: [PATCH 1/3] Add basic saving summary reports for groups --- .../core_db/V100__Group_saving_summary_report.sql | 1 + .../portfolio/client/data/ClientDataValidator.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql diff --git a/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql b/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql new file mode 100644 index 000000000..d98372bbf --- /dev/null +++ b/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql @@ -0,0 +1 @@ +INSERT INTO `stretchy_report` (`report_name`, `report_type`, `report_subtype`, `report_category`, `report_sql`, `description`, `core_report`, `use_report`) VALUES ('GroupSavingSummary', 'Table', NULL, NULL, 'select ifnull(cur.display_symbol, sa.currency_code) as currency,\ncount(sa.id) as totalSavingAccounts, ifnull(sum(sa.account_balance_derived),0) as totalSavings\nfrom m_group topgroup\njoin m_office o on o.id = topgroup.office_id and o.hierarchy like concat(\'${currentUserHierarchy}\', \'%\')\njoin m_group g on g.hierarchy like concat(topgroup.hierarchy, \'%\')\njoin m_savings_account sa on sa.group_id = g.id\nleft join m_currency cur on cur.code = sa.currency_code\nwhere topgroup.id = ${groupId}\nand sa.activatedon_date is not null\ngroup by sa.currency_code', 'Utility query for getting group or center saving summary details for a group_id', 1, 0); \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java index 62f27efd0..9a3ca297c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java @@ -5,8 +5,6 @@ */ package org.mifosplatform.portfolio.client.data; -import static org.mifosplatform.portfolio.savings.SavingsApiConstants.activatedOnDateParamName; - import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; @@ -314,8 +312,8 @@ public final class ClientDataValidator { final JsonElement element = command.parsedJson(); - final LocalDate activationDate = this.fromApiJsonHelper.extractLocalDateNamed(activatedOnDateParamName, element); - baseDataValidator.reset().parameter(activatedOnDateParamName).value(activationDate).notNull(); + final LocalDate activationDate = this.fromApiJsonHelper.extractLocalDateNamed(ClientApiConstants.activationDateParamName, element); + baseDataValidator.reset().parameter(ClientApiConstants.activationDateParamName).value(activationDate).notNull(); throwExceptionIfValidationWarningsExist(dataValidationErrors); } From 8ca7c66ec4cecff7714310b160c91649749d19ad Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Wed, 14 Aug 2013 11:50:52 +0530 Subject: [PATCH 2/3] only interested in picking up the fix for http://tinyurl.com/oazjwq7 from 662d26771ed4f020276163574932a57cf9087829 --- .../migrations/core_db/V100__Group_saving_summary_report.sql | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql diff --git a/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql b/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql deleted file mode 100644 index d98372bbf..000000000 --- a/mifosng-db/migrations/core_db/V100__Group_saving_summary_report.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO `stretchy_report` (`report_name`, `report_type`, `report_subtype`, `report_category`, `report_sql`, `description`, `core_report`, `use_report`) VALUES ('GroupSavingSummary', 'Table', NULL, NULL, 'select ifnull(cur.display_symbol, sa.currency_code) as currency,\ncount(sa.id) as totalSavingAccounts, ifnull(sum(sa.account_balance_derived),0) as totalSavings\nfrom m_group topgroup\njoin m_office o on o.id = topgroup.office_id and o.hierarchy like concat(\'${currentUserHierarchy}\', \'%\')\njoin m_group g on g.hierarchy like concat(topgroup.hierarchy, \'%\')\njoin m_savings_account sa on sa.group_id = g.id\nleft join m_currency cur on cur.code = sa.currency_code\nwhere topgroup.id = ${groupId}\nand sa.activatedon_date is not null\ngroup by sa.currency_code', 'Utility query for getting group or center saving summary details for a group_id', 1, 0); \ No newline at end of file From 86c57464d6663c8e9f1745c5a86e19ecea68c742 Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Wed, 14 Aug 2013 11:58:56 +0530 Subject: [PATCH 3/3] Update CHANGELOG.md for 1.7.2 release --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a16e59d6..17be8940e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for Releases =============== +1. 14 Aug 2013 - 1.7.2.RELEASE 1. 12 Aug 2013 - 1.7.1.RELEASE 1. 28 July 2013 - 1.7.0.RELEASE 1. 28 July 2013 - 1.6.1.RELEASE @@ -30,6 +31,15 @@ Releases 1. 05 April 2013 - 0.11.1.beta 1. 05 April 2013 - 0.11.0.beta +1.7.2.RELEASE +============= +Bug Release + +Platform & API + +Bug + - [MIFOSX-606] - Unable to activate client from pending state + 1.7.1.RELEASE ============= Bug Release