From 00ba422705bf2b7616a65805e4d8a509ebdb5f6b Mon Sep 17 00:00:00 2001
From: Chandrika <chandrika@confluxtechnologies.com>
Date: Tue, 9 Jun 2015 12:07:03 -0400
Subject: [PATCH] MIFOSX-1881 Breadcrumb issue is resolved.Able to navigate to
 the respective center/group.Group Level has been fetched for this case.

---
 .../group/data/GroupGeneralData.java          | 21 +++++++++++--------
 .../service/AllGroupTypesDataMapper.java      |  6 ++++--
 .../CenterReadPlatformServiceImpl.java        |  4 +++-
 .../service/LoanReadPlatformServiceImpl.java  |  5 +++--
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupGeneralData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupGeneralData.java
index 7b62f36a5..328946556 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupGeneralData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupGeneralData.java
@@ -38,6 +38,7 @@ public class GroupGeneralData {
     private final Long staffId;
     private final String staffName;
     private final String hierarchy;
+    private final String groupLevel;
 
     // associations
     private final Collection<ClientData> clientMembers;
@@ -60,7 +61,7 @@ public class GroupGeneralData {
         final Collection<ClientData> clientMembers = null;
         final Collection<GroupRoleData> groupRoles = null;
         final Collection<CodeValueData> closureReasons = null;
-        return new GroupGeneralData(groupId, accountNo, groupName, null, null, null, null, null, null, null, null, null, null, clientMembers, null, null,
+        return new GroupGeneralData(groupId, accountNo, groupName, null, null, null, null, null, null, null, null, null, null, null, clientMembers, null, null,
                 null, null, null, groupRoles, null, null, null, null, closureReasons, null);
     }
 
@@ -73,7 +74,7 @@ public class GroupGeneralData {
         final Collection<GroupRoleData> groupRoles = null;
         final Collection<CodeValueData> closureReasons = null;
 
-        return new GroupGeneralData(null, accountNo , null, null, null, null, officeId, null, centerId, centerName, staffId, staffName, null,
+        return new GroupGeneralData(null, accountNo , null, null, null, null, officeId, null, centerId, centerName, staffId, staffName, null, null,
                 clientMembers, null, centerOptions, officeOptions, staffOptions, clientOptions, groupRoles, availableRoles, null, null, null,
                 closureReasons, null);
     }
@@ -81,7 +82,7 @@ public class GroupGeneralData {
     public static GroupGeneralData withTemplate(final GroupGeneralData templatedGrouping, final GroupGeneralData grouping) {
         return new GroupGeneralData(grouping.id, grouping.accountNo, grouping.name, grouping.externalId, grouping.status, grouping.activationDate,
                 grouping.officeId, grouping.officeName, grouping.centerId, grouping.centerName, grouping.staffId, grouping.staffName,
-                grouping.hierarchy, grouping.clientMembers, grouping.activeClientMembers, templatedGrouping.centerOptions, templatedGrouping.officeOptions,
+                grouping.hierarchy, grouping.groupLevel, grouping.clientMembers, grouping.activeClientMembers, templatedGrouping.centerOptions, templatedGrouping.officeOptions,
                 templatedGrouping.staffOptions, templatedGrouping.clientOptions, grouping.groupRoles, templatedGrouping.availableRoles,
                 grouping.selectedRole, grouping.calendarsData, grouping.collectionMeetingCalendar, grouping.closureReasons,
                 templatedGrouping.timeline);
@@ -92,14 +93,14 @@ public class GroupGeneralData {
             final CalendarData collectionMeetingCalendar) {
         return new GroupGeneralData(grouping.id, grouping.accountNo, grouping.name, grouping.externalId, grouping.status, grouping.activationDate,
                 grouping.officeId, grouping.officeName, grouping.centerId, grouping.centerName, grouping.staffId, grouping.staffName,
-                grouping.hierarchy, membersOfGroup, activeClientMembers, grouping.centerOptions, grouping.officeOptions, grouping.staffOptions,
+                grouping.hierarchy, grouping.groupLevel, membersOfGroup, activeClientMembers, grouping.centerOptions, grouping.officeOptions, grouping.staffOptions,
                 grouping.clientOptions, groupRoles, grouping.availableRoles, grouping.selectedRole, calendarsData,
                 collectionMeetingCalendar, grouping.closureReasons, grouping.timeline);
     }
 
     public static GroupGeneralData instance(final Long id, final String accountNo, final String name, final String externalId, final EnumOptionData status,
             final LocalDate activationDate, final Long officeId, final String officeName, final Long centerId, final String centerName,
-            final Long staffId, final String staffName, final String hierarchy, final GroupTimelineData timeline) {
+            final Long staffId, final String staffName, final String hierarchy, final String groupLevel, final GroupTimelineData timeline) {
 
         final Collection<ClientData> clientMembers = null;
         final Collection<ClientData> activeClientMembers = null;
@@ -115,13 +116,13 @@ public class GroupGeneralData {
         final Collection<CodeValueData> closureReasons = null;
 
         return new GroupGeneralData(id, accountNo, name, externalId, status, activationDate, officeId, officeName, centerId, centerName, staffId,
-                staffName, hierarchy, clientMembers, activeClientMembers, centerOptions, officeOptions, staffOptions,
+                staffName, hierarchy, groupLevel, clientMembers, activeClientMembers, centerOptions, officeOptions, staffOptions,
                 clientOptions, groupRoles, availableRoles, role, calendarsData, collectionMeetingCalendar, closureReasons, timeline);
     }
 
     private GroupGeneralData(final Long id, final String accountNo, final String name, final String externalId, final EnumOptionData status,
             final LocalDate activationDate, final Long officeId, final String officeName, final Long centerId, final String centerName,
-            final Long staffId, final String staffName, final String hierarchy, final Collection<ClientData> clientMembers,
+            final Long staffId, final String staffName, final String hierarchy, final String groupLevel, final Collection<ClientData> clientMembers,
             final Collection<ClientData> activeClientMembers, final Collection<CenterData> centerOptions,
             final Collection<OfficeData> officeOptions, final Collection<StaffData> staffOptions,
             final Collection<ClientData> clientOptions, final Collection<GroupRoleData> groupRoles,
@@ -147,6 +148,7 @@ public class GroupGeneralData {
         this.staffId = staffId;
         this.staffName = staffName;
         this.hierarchy = hierarchy;
+        this.groupLevel = groupLevel;
 
         // associations
         this.clientMembers = clientMembers;
@@ -201,7 +203,7 @@ public class GroupGeneralData {
     public static GroupGeneralData updateSelectedRole(final GroupGeneralData grouping, final GroupRoleData selectedRole) {
         return new GroupGeneralData(grouping.id, grouping.accountNo, grouping.name, grouping.externalId, grouping.status, grouping.activationDate,
                 grouping.officeId, grouping.officeName, grouping.centerId, grouping.centerName, grouping.staffId, grouping.staffName,
-                grouping.hierarchy, grouping.clientMembers, grouping.activeClientMembers, grouping.centerOptions,
+                grouping.hierarchy, grouping.groupLevel, grouping.clientMembers, grouping.activeClientMembers, grouping.centerOptions,
                 grouping.officeOptions, grouping.staffOptions, grouping.clientOptions, grouping.groupRoles, grouping.availableRoles,
                 selectedRole, grouping.calendarsData, grouping.collectionMeetingCalendar, grouping.closureReasons, null);
     }
@@ -220,6 +222,7 @@ public class GroupGeneralData {
         final Long staffId = null;
         final String staffName = null;
         final String hierarchy = null;
+        final String groupLevel = null;
         final Collection<ClientData> clientMembers = null;
         final Collection<ClientData> activeClientMembers = null;
         final Collection<CenterData> centerOptions = null;
@@ -233,7 +236,7 @@ public class GroupGeneralData {
         final CalendarData collectionMeetingCalendar = null;
 
         return new GroupGeneralData(id, accountNo, name, externalId, status, activationDate, officeId, officeName, centerId, centerName, staffId,
-                staffName, hierarchy, clientMembers, activeClientMembers, centerOptions, officeOptions, staffOptions, clientOptions, groupRoles,
+                staffName, hierarchy, groupLevel, clientMembers, activeClientMembers, centerOptions, officeOptions, staffOptions, clientOptions, groupRoles,
                 availableRoles, role, calendarsData, collectionMeetingCalendar, closureReasons, null);
     }
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/AllGroupTypesDataMapper.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/AllGroupTypesDataMapper.java
index a053f0e42..c9ef0cdb5 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/AllGroupTypesDataMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/AllGroupTypesDataMapper.java
@@ -45,7 +45,8 @@ public final class AllGroupTypesDataMapper implements RowMapper<GroupGeneralData
         sqlBuilder.append("acu.firstname as activatedByFirstname, ");
         sqlBuilder.append("acu.lastname as activatedByLastname, ");
 
-        sqlBuilder.append("g.hierarchy as hierarchy ");
+        sqlBuilder.append("g.hierarchy as hierarchy, ");
+        sqlBuilder.append("g.level_id as groupLevel ");
         sqlBuilder.append("from m_group g ");
         sqlBuilder.append("join m_office o on o.id = g.office_id ");
         sqlBuilder.append("left join m_staff s on s.id = g.staff_id ");
@@ -80,6 +81,7 @@ public final class AllGroupTypesDataMapper implements RowMapper<GroupGeneralData
         final Long staffId = JdbcSupport.getLong(rs, "staffId");
         final String staffName = rs.getString("staffName");
         final String hierarchy = rs.getString("hierarchy");
+        final String groupLevel = rs.getString("groupLevel");
 
         final LocalDate closedOnDate = JdbcSupport.getLocalDate(rs, "closedOnDate");
         final String closedByUsername = rs.getString("closedByUsername");
@@ -100,6 +102,6 @@ public final class AllGroupTypesDataMapper implements RowMapper<GroupGeneralData
                 closedByUsername, closedByFirstname, closedByLastname);
 
         return GroupGeneralData.instance(id, accountNo, name, externalId, status, activationDate, officeId, officeName, centerId, centerName, staffId,
-                staffName, hierarchy, timeline);
+                staffName, hierarchy, groupLevel, timeline);
     }
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java
index 9cc54ea1d..e383a72f5 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java
@@ -141,6 +141,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
             + "g.staff_id as staffId, s.display_name as staffName, " //
             + "g.status_enum as statusEnum, g.activation_date as activationDate, " //
             + "g.hierarchy as hierarchy, " //
+            + "g.level_id as groupLevel," //
             + "g.closedon_date as closedOnDate, " + "g.submittedon_date as submittedOnDate, " + "sbu.username as submittedByUsername, "
             + "sbu.firstname as submittedByFirstname, " + "sbu.lastname as submittedByLastname, " + "clu.username as closedByUsername, "
             + "clu.firstname as closedByFirstname, " + "clu.lastname as closedByLastname, " + "acu.username as activatedByUsername, "
@@ -287,6 +288,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
             final Long staffId = JdbcSupport.getLong(rs, "staffId");
             final String staffName = rs.getString("staffName");
             final String hierarchy = rs.getString("hierarchy");
+            final String groupLevel = rs.getString("groupLevel");
 
             final LocalDate closedOnDate = JdbcSupport.getLocalDate(rs, "closedOnDate");
             final String closedByUsername = rs.getString("closedByUsername");
@@ -307,7 +309,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
                     closedByUsername, closedByFirstname, closedByLastname);
 
             return GroupGeneralData.instance(id, accountNo, name, externalId, status, activationDate, officeId, officeName, null, null, staffId,
-                    staffName, hierarchy, timeline);
+                    staffName, hierarchy, groupLevel, timeline);
         }
     }
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
index 77d7dc64a..794f87e38 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -546,7 +546,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
                     + " c.id as clientId, c.display_name as clientName, c.office_id as clientOfficeId,"
                     + " g.id as groupId, g.account_no as groupAccountNo, g.display_name as groupName,"
                     + " g.office_id as groupOfficeId, g.staff_id As groupStaffId , g.parent_id as groupParentId, "
-                    + " g.hierarchy As groupHierarchy , g.external_id As groupExternalId, "
+                    + " g.hierarchy As groupHierarchy , g.level_id as groupLevel, g.external_id As groupExternalId, "
                     + " g.status_enum as statusEnum, g.activation_date as activationDate, "
                     + " l.submittedon_date as submittedOnDate, sbu.username as submittedByUsername, sbu.firstname as submittedByFirstname, sbu.lastname as submittedByLastname,"
                     + " l.rejectedon_date as rejectedOnDate, rbu.username as rejectedByUsername, rbu.firstname as rejectedByFirstname, rbu.lastname as rejectedByLastname,"
@@ -658,6 +658,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
             final Long groupStaffId = JdbcSupport.getLong(rs, "groupStaffId");
             final Long groupParentId = JdbcSupport.getLong(rs, "groupParentId");
             final String groupHierarchy = rs.getString("groupHierarchy");
+            final String groupLevel = rs.getString("groupLevel");
 
             final Integer loanTypeId = JdbcSupport.getInteger(rs, "loanType");
             final EnumOptionData loanType = AccountEnumerations.loanType(loanTypeId);
@@ -838,7 +839,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
                 final EnumOptionData groupStatus = ClientEnumerations.status(groupStatusEnum);
                 final LocalDate activationDate = JdbcSupport.getLocalDate(rs, "activationDate");
                 groupData = GroupGeneralData.instance(groupId, groupAccountNo, groupName, groupExternalId, groupStatus, activationDate, groupOfficeId,
-                        null, groupParentId, null, groupStaffId, null, groupHierarchy, null);
+                        null, groupParentId, null, groupStaffId, null, groupHierarchy, groupLevel, null);
             }
 
             final Integer loanCounter = JdbcSupport.getInteger(rs, "loanCounter");