diff --git a/mifosng-db/patches/11-ddl_group_level_table.sql b/mifosng-db/patches/11-ddl_group_level_table.sql index 280cb1988..04bccc0db 100644 --- a/mifosng-db/patches/11-ddl_group_level_table.sql +++ b/mifosng-db/patches/11-ddl_group_level_table.sql @@ -8,9 +8,7 @@ CREATE TABLE `m_group_level` ( PRIMARY KEY (`id`), INDEX `Parent_levelId_reference` (`parent_id`), CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`) -) -COLLATE='utf8_general_ci' -ENGINE=InnoDB; +)ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (1, NULL, 1, 'Center', 1, 0); INSERT INTO `m_group_level` (`id`, `parent_id`, `is_super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (2, 1, 0, 'Group', 0, 1); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java index 703899801..b32dbaa27 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java @@ -9,7 +9,6 @@ import java.util.Collection; import org.mifosplatform.organisation.office.data.OfficeLookup; import org.mifosplatform.portfolio.client.data.ClientLookup; -import org.mifosplatform.portfolio.group.domain.GroupLevel; /** * Immutable data object representing groups. @@ -21,7 +20,8 @@ public class GroupData { private final String externalId; private final Long officeId; private final String officeName; - private final GroupLevelData groupLevelData; + @SuppressWarnings("unused") + private final GroupLevelData groupLevelData; private final Collection clientMembers; @SuppressWarnings("unused") @@ -31,7 +31,7 @@ public class GroupData { @SuppressWarnings("unused") private final Collection allowedParentGroups; - public GroupData(final Long id, final Long officeId, final String officeName, final String name, final String externalId ) { + public GroupData(final Long id, final Long officeId, final String officeName, final String name, final String externalId) { this.id = id; this.officeId = officeId; this.officeName = officeName; @@ -46,7 +46,8 @@ public class GroupData { } public GroupData(final GroupData group, final Collection clientMembers, final Collection allowedClients, - final Collection allowedOffices, final Collection allowedParentGroups , final GroupLevelData groupLevelData) { + final Collection allowedOffices, final Collection allowedParentGroups, + final GroupLevelData groupLevelData) { this.id = group.getId(); this.officeId = group.getOfficeId(); this.officeName = group.getOfficeName(); @@ -61,7 +62,7 @@ public class GroupData { } public GroupData(final Long officeId, final Collection allowedClients, final Collection allowedOffices, - final Collection allowedParentGroups , final GroupLevelData groupLevelData ) { + final Collection allowedParentGroups, final GroupLevelData groupLevelData) { this.id = null; this.officeId = officeId; this.officeName = null; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java index 573e2f732..ec5487796 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java @@ -47,6 +47,7 @@ public class Group extends AbstractPersistable { @JoinColumn(name = "staff_id", nullable = true) private Staff loanOfficer; + @SuppressWarnings("unused") @Column(name = "level_id", nullable = false) private Long levelId; @@ -180,7 +181,7 @@ public class Group extends AbstractPersistable { } } - private String hierarchyOf(Long id) { + private String hierarchyOf(final Long id) { return this.hierarchy + id.toString() + "."; }