diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/AuthenticationApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/AuthenticationApiResource.java deleted file mode 100644 index c9e8442b8..000000000 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/AuthenticationApiResource.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.mifosng.platform.api; - -import java.util.ArrayList; -import java.util.Collection; - -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import org.mifosng.platform.api.data.AuthenticatedUserData; -import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; -import org.mifosng.platform.user.domain.AppUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Scope; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.stereotype.Component; - -import com.sun.jersey.core.util.Base64; - -@Path("/authentication") -@Component -@Scope("singleton") -public class AuthenticationApiResource { - - @Qualifier("customAuthenticationProvider") - @Autowired - private DaoAuthenticationProvider customAuthenticationProvider; - - @Autowired - private PortfolioApiJsonSerializerService apiJsonSerializerService; - - @POST - @Consumes({MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_JSON}) - public String authenticate(@QueryParam("username") final String username, @QueryParam("password") final String password) { - - Authentication authentication = new UsernamePasswordAuthenticationToken(username, password); - Authentication authenticationCheck = customAuthenticationProvider.authenticate(authentication); - - Collection permissions = new ArrayList(); - AuthenticatedUserData authenticatedUserData = new AuthenticatedUserData(username, permissions); - - if (authenticationCheck.isAuthenticated()) { - Collection authorities = new ArrayList(authenticationCheck.getAuthorities()); - for (GrantedAuthority grantedAuthority : authorities) { - permissions.add(grantedAuthority.getAuthority()); - } - AppUser principal = (AppUser) authenticationCheck.getPrincipal(); - byte[] base64EncodedAuthenticationKey = Base64.encode(username + ":" + password); - - authenticatedUserData = new AuthenticatedUserData(username, permissions, principal.getId(), new String(base64EncodedAuthenticationKey)); - } - - return this.apiJsonSerializerService.serializeAuthenticatedUserDataToJson(false, authenticatedUserData); - } -} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java index faf38b98a..da2acfbda 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java @@ -40,9 +40,9 @@ import org.mifosng.platform.infrastructure.FileUtils; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; +import org.mifosplatform.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/DataTableApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/DataTableApiResource.java index 86414c204..20dc120e2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/DataTableApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/DataTableApiResource.java @@ -32,7 +32,7 @@ import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.noncore.GenericDataService; import org.mifosng.platform.noncore.ReadWriteNonCoreDataService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java index 8c109e115..866be4a03 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java @@ -15,13 +15,13 @@ import javax.ws.rs.core.UriInfo; import org.mifosng.platform.api.commands.PermissionsCommand; import org.mifosng.platform.api.data.EntityIdentifier; -import org.mifosng.platform.api.data.PermissionUsageData; import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.service.PermissionReadPlatformService; -import org.mifosng.platform.user.service.PermissionWritePlatformService; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.service.PermissionReadPlatformService; +import org.mifosplatform.infrastructure.user.service.PermissionWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportsApiResource.java index 168a13b35..9f1cd8b5e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ReportsApiResource.java @@ -22,7 +22,7 @@ import org.mifosng.platform.exceptions.NoAuthorizationException; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.noncore.ReadReportingService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java index 4c4d975ac..0a45d34ce 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java @@ -20,18 +20,18 @@ import javax.ws.rs.core.UriInfo; import org.mifosng.platform.api.commands.RoleCommand; import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.api.data.EntityIdentifier; -import org.mifosng.platform.api.data.PermissionUsageData; -import org.mifosng.platform.api.data.RoleData; -import org.mifosng.platform.api.data.RolePermissionsData; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.service.PermissionReadPlatformService; -import org.mifosng.platform.user.service.RoleReadPlatformService; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; +import org.mifosplatform.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData; +import org.mifosplatform.infrastructure.user.service.PermissionReadPlatformService; +import org.mifosplatform.infrastructure.user.service.RoleReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AuthenticatedUserData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AuthenticatedUserData.java deleted file mode 100644 index 82f1aef0a..000000000 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AuthenticatedUserData.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.mifosng.platform.api.data; - -import java.util.Collection; - -/** - * Immutable data object for authentication. - */ -public class AuthenticatedUserData { - - private final String username; - private final Long userId; - private final String base64EncodedAuthenticationKey; - private final boolean authenticated; - private final Collection permissions; - - public AuthenticatedUserData(final String username, final Collection permissions) { - this.username = username; - this.userId = null; - this.base64EncodedAuthenticationKey = null; - this.authenticated = false; - this.permissions = permissions; - } - - public AuthenticatedUserData(final String username, final Collection permissions, final Long userId, final String base64EncodedAuthenticationKey) { - this.username = username; - this.userId = userId; - this.base64EncodedAuthenticationKey = base64EncodedAuthenticationKey; - this.authenticated = true; - this.permissions = permissions; - } - - public String getUsername() { - return username; - } - - public Long getUserId() { - return userId; - } - - public String getBase64EncodedAuthenticationKey() { - return base64EncodedAuthenticationKey; - } - - public boolean isAuthenticated() { - return authenticated; - } - - public Collection getPermissions() { - return permissions; - } -} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java index 96c008fe0..af7d5251d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java @@ -7,8 +7,6 @@ import java.util.Set; import org.mifosng.platform.accounting.api.data.ChartOfAccountsData; import org.mifosng.platform.api.commands.ClientCommand; -import org.mifosng.platform.api.data.AppUserData; -import org.mifosng.platform.api.data.AuthenticatedUserData; import org.mifosng.platform.api.data.ChargeData; import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientData; @@ -34,14 +32,16 @@ import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.api.data.NoteData; import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.data.OfficeTransactionData; -import org.mifosng.platform.api.data.PermissionUsageData; -import org.mifosng.platform.api.data.RoleData; -import org.mifosng.platform.api.data.RolePermissionsData; import org.mifosng.platform.api.data.SavingAccountData; import org.mifosng.platform.api.data.SavingProductData; import org.mifosng.platform.api.data.StaffData; import org.mifosng.platform.infrastructure.api.GoogleGsonSerializerHelper; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.api.data.AuthenticatedUserData; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java index 9e3446692..b495a36ca 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java @@ -5,8 +5,6 @@ import java.util.Set; import org.mifosng.platform.accounting.api.data.ChartOfAccountsData; import org.mifosng.platform.api.commands.ClientCommand; -import org.mifosng.platform.api.data.AppUserData; -import org.mifosng.platform.api.data.AuthenticatedUserData; import org.mifosng.platform.api.data.ChargeData; import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientData; @@ -32,13 +30,15 @@ import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.api.data.NoteData; import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.data.OfficeTransactionData; -import org.mifosng.platform.api.data.PermissionUsageData; -import org.mifosng.platform.api.data.RoleData; -import org.mifosng.platform.api.data.RolePermissionsData; import org.mifosng.platform.api.data.SavingAccountData; import org.mifosng.platform.api.data.SavingProductData; import org.mifosng.platform.api.data.StaffData; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.api.data.AuthenticatedUserData; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData; public interface PortfolioApiJsonSerializerService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/charge/domain/Charge.java b/mifosng-provider/src/main/java/org/mifosng/platform/charge/domain/Charge.java index 78eed2a4b..5a70d1b6d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/charge/domain/Charge.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/charge/domain/Charge.java @@ -2,7 +2,7 @@ package org.mifosng.platform.charge.domain; import org.mifosng.platform.api.commands.ChargeCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import javax.persistence.*; import java.math.BigDecimal; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java index c9e582dfe..24cf2550f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java @@ -15,7 +15,7 @@ import org.joda.time.LocalDate; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.organisation.domain.Office; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_client") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/ClientIdentifier.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/ClientIdentifier.java index 82299bb37..b172012e0 100755 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/ClientIdentifier.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/ClientIdentifier.java @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.commands.ClientIdentifierCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.organisation.domain.CodeValue; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_client_identifier", uniqueConstraints = { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java index 0ba963d85..8558f9b69 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java @@ -10,7 +10,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loan.domain.Loan; import org.mifosng.platform.loan.domain.LoanTransaction; import org.mifosng.platform.saving.domain.DepositAccount; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_note") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java index 998f7a973..6b2537a6c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java @@ -9,7 +9,6 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; -import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientAccountSummaryData; import org.mifosng.platform.api.data.ClientData; @@ -26,8 +25,9 @@ import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.service.AppUserReadPlatformService; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.service.AppUserReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java index ae1ae8bf6..4cb9b684a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java @@ -30,8 +30,8 @@ import org.mifosng.platform.organisation.domain.CodeValueRepository; import org.mifosng.platform.organisation.domain.Office; import org.mifosng.platform.organisation.domain.OfficeRepository; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.Permission; -import org.mifosng.platform.user.domain.PermissionRepository; +import org.mifosplatform.infrastructure.user.domain.Permission; +import org.mifosplatform.infrastructure.user.domain.PermissionRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/documentmanagement/domain/Document.java b/mifosng-provider/src/main/java/org/mifosng/platform/documentmanagement/domain/Document.java index 975673aa6..8a409a6b5 100755 --- a/mifosng-provider/src/main/java/org/mifosng/platform/documentmanagement/domain/Document.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/documentmanagement/domain/Document.java @@ -7,7 +7,7 @@ import javax.persistence.Table; import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.commands.DocumentCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_document") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/fund/domain/Fund.java b/mifosng-provider/src/main/java/org/mifosng/platform/fund/domain/Fund.java index 526c50b88..abf510e62 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/fund/domain/Fund.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/fund/domain/Fund.java @@ -8,7 +8,7 @@ import javax.persistence.UniqueConstraint; import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.commands.FundCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_fund", uniqueConstraints={ diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java b/mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java index 795b8d970..dce03e064 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java @@ -16,7 +16,7 @@ import org.mifosng.platform.api.commands.GroupCommand; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.organisation.domain.Office; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_group") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/infrastructure/AuditorAwareImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/infrastructure/AuditorAwareImpl.java index 156b5c585..2928be5d8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/infrastructure/AuditorAwareImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/infrastructure/AuditorAwareImpl.java @@ -1,7 +1,7 @@ package org.mifosng.platform.infrastructure; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.domain.AppUserRepository; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.AuditorAware; import org.springframework.security.core.Authentication; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java index beadfc2f3..22df29f85 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java @@ -41,7 +41,7 @@ import org.mifosng.platform.fund.domain.Fund; import org.mifosng.platform.group.domain.Group; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.staff.domain.Staff; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_loan", uniqueConstraints = @UniqueConstraint(columnNames = { "external_id" })) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanOfficerAssignmentHistory.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanOfficerAssignmentHistory.java index 68728f94e..8413464f0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanOfficerAssignmentHistory.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanOfficerAssignmentHistory.java @@ -3,7 +3,7 @@ package org.mifosng.platform.loan.domain; import org.joda.time.LocalDate; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.staff.domain.Staff; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanProduct.java index c5736208f..e07251b1b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanProduct.java @@ -18,7 +18,7 @@ import org.mifosng.platform.charge.domain.Charge; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.fund.domain.Fund; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; /** * Loan products allow for categorisation of an organisations loans into something meaningful to them. diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentScheduleInstallment.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentScheduleInstallment.java index 48ae1cf06..5031fd28b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentScheduleInstallment.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentScheduleInstallment.java @@ -15,7 +15,7 @@ import org.joda.time.LocalDate; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.currency.domain.Money; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_loan_repayment_schedule") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransaction.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransaction.java index e824be207..7b47c1582 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransaction.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransaction.java @@ -23,7 +23,7 @@ import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.currency.domain.Money; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loanproduct.service.LoanEnumerations; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.format.annotation.DateTimeFormat; /** diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransactionProcessingStrategy.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransactionProcessingStrategy.java index 5e19769f8..6fd0a927c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransactionProcessingStrategy.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransactionProcessingStrategy.java @@ -6,7 +6,7 @@ import javax.persistence.Table; import org.mifosng.platform.api.data.TransactionProcessingStrategyData; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; /** * diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java index a2d96c20a..a8223f008 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -55,7 +55,7 @@ import org.mifosng.platform.loan.domain.LoanTransactionRepository; import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.staff.domain.Staff; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadReportingServiceImpl.java index 0ecebce5f..31eb40672 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadReportingServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadReportingServiceImpl.java @@ -22,7 +22,7 @@ import org.mifosng.platform.api.data.ResultsetDataRow; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; import org.mifosng.platform.exceptions.ReportNotFoundException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.pentaho.reporting.engine.classic.core.ClassicEngineBoot; import org.pentaho.reporting.engine.classic.core.MasterReport; import org.pentaho.reporting.engine.classic.core.ReportProcessingException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java index 38329d6ea..f14b0a574 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java @@ -23,7 +23,7 @@ import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; import org.mifosng.platform.infrastructure.api.JsonParserHelper; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/Office.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/Office.java index 718def534..7bc56586d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/Office.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/Office.java @@ -21,7 +21,7 @@ import org.mifosng.platform.api.commands.OfficeCommand; import org.mifosng.platform.exceptions.CannotUpdateOfficeWithParentOfficeSameAsSelf; import org.mifosng.platform.exceptions.RootOfficeParentCannotBeUpdated; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_office", uniqueConstraints={ diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OfficeTransaction.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OfficeTransaction.java index 423b7fc6e..8ef6a2f48 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OfficeTransaction.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OfficeTransaction.java @@ -17,7 +17,7 @@ import org.joda.time.LocalDate; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.currency.domain.Money; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_office_transaction") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OrganisationCurrency.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OrganisationCurrency.java index ab0492b53..e1b7cbe87 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OrganisationCurrency.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OrganisationCurrency.java @@ -5,7 +5,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_organisation_currency") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java index 1a79c7876..b647f55d9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java @@ -17,7 +17,7 @@ import org.mifosng.platform.exceptions.OfficeNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeWritePlatformServiceJpaRepositoryImpl.java index 139c46edd..6177f57b3 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeWritePlatformServiceJpaRepositoryImpl.java @@ -15,7 +15,7 @@ import org.mifosng.platform.organisation.domain.OfficeRepository; import org.mifosng.platform.organisation.domain.OfficeTransaction; import org.mifosng.platform.organisation.domain.OfficeTransactionRepository; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java index e95eb5af3..d781512bf 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java @@ -33,7 +33,7 @@ import org.mifosng.platform.exceptions.InvalidDepositStateTransitionException; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.savingproduct.domain.DepositProduct; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_deposit_account", uniqueConstraints = @UniqueConstraint(name="deposit_acc_external_id", columnNames = { "external_id" })) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingAccount.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingAccount.java index 95751c502..ecb78e1dd 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingAccount.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingAccount.java @@ -25,7 +25,7 @@ import org.mifosng.platform.savingproduct.domain.SavingProduct; import org.mifosng.platform.savingproduct.domain.SavingProductType; import org.mifosng.platform.savingproduct.domain.SavingsInterestType; import org.mifosng.platform.savingproduct.domain.TenureTypeEnum; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_saving_account", uniqueConstraints = @UniqueConstraint(name="saving_acc_external_id", columnNames = { "external_id" })) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java index ec8150361..c8dd8cb15 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java @@ -14,7 +14,7 @@ import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.exceptions.ValueOutsideRangeException; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loan.domain.PeriodFrequencyType; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_product_deposit", uniqueConstraints={ diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java index 1b8e6e8fc..d4bc1d81c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java @@ -12,7 +12,7 @@ import org.mifosng.platform.api.commands.SavingProductCommand; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loan.domain.PeriodFrequencyType; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_product_savings") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/security/PlatformSecurityContext.java b/mifosng-provider/src/main/java/org/mifosng/platform/security/PlatformSecurityContext.java index 60289cf7b..48e77d5b2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/security/PlatformSecurityContext.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/security/PlatformSecurityContext.java @@ -1,6 +1,6 @@ package org.mifosng.platform.security; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; public interface PlatformSecurityContext { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/security/SpringSecurityPlatformSecurityContext.java b/mifosng-provider/src/main/java/org/mifosng/platform/security/SpringSecurityPlatformSecurityContext.java index 06163a668..38f346c5e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/security/SpringSecurityPlatformSecurityContext.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/security/SpringSecurityPlatformSecurityContext.java @@ -1,7 +1,7 @@ package org.mifosng.platform.security; import org.mifosng.platform.exceptions.UnAuthenticatedUserException; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/security/TenantAwareJpaPlatformUserDetailsService.java b/mifosng-provider/src/main/java/org/mifosng/platform/security/TenantAwareJpaPlatformUserDetailsService.java index 1ee56b135..3e1c05dbd 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/security/TenantAwareJpaPlatformUserDetailsService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/security/TenantAwareJpaPlatformUserDetailsService.java @@ -1,7 +1,7 @@ package org.mifosng.platform.security; import org.mifosng.platform.infrastructure.PlatformUser; -import org.mifosng.platform.user.domain.PlatformUserRepository; +import org.mifosplatform.infrastructure.user.domain.PlatformUserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.security.core.userdetails.UserDetails; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/staff/domain/Staff.java b/mifosng-provider/src/main/java/org/mifosng/platform/staff/domain/Staff.java index 9f12435e0..bc36bd7c9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/staff/domain/Staff.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/staff/domain/Staff.java @@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.commands.StaffCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.organisation.domain.Office; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; @Entity @Table(name = "m_staff", uniqueConstraints = { @UniqueConstraint(columnNames = { "display_name" }, name = "display_name") }) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java similarity index 91% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java index b2e116b51..e133ee8cc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.api; +package org.mifosplatform.commands.api; import java.util.Collection; import java.util.Set; @@ -21,9 +21,9 @@ import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService import org.mifosng.platform.exceptions.UnrecognizedQueryParamException; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; +import org.mifosplatform.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/data/CommandSourceData.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/api/data/CommandSourceData.java index b06f42e19..ce2e2a899 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/data/CommandSourceData.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.api.data; +package org.mifosplatform.commands.api.data; import org.joda.time.LocalDate; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSource.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSource.java index 725b0b7fe..52dfb268c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSource.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.domain; +package org.mifosplatform.commands.domain; import java.util.Date; @@ -12,7 +12,7 @@ import javax.persistence.TemporalType; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; -import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.data.jpa.domain.AbstractPersistable; @Entity diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSourceRepository.java similarity index 83% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSourceRepository.java index 26b0a0e13..2c094f980 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSourceRepository.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.domain; +package org.mifosplatform.commands.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ClientCommandHandler.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ClientCommandHandler.java index a2960781e..655b2e3ef 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ClientCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.handler; +package org.mifosplatform.commands.handler; import java.util.Arrays; import java.util.List; @@ -11,9 +11,9 @@ import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService import org.mifosng.platform.client.service.ClientWritePlatformService; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosplatform.infrastructure.commands.domain.CommandSource; -import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; +import org.mifosplatform.commands.domain.CommandSource; +import org.mifosplatform.commands.service.ChangeDetectionService; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandler.java new file mode 100644 index 000000000..b02cca555 --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandler.java @@ -0,0 +1,5 @@ +package org.mifosplatform.commands.handler; + +public interface CommandSourceHandler { + +} diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandlerDelegator.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandlerDelegator.java index b01fe7aec..f05091299 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CommandSourceHandlerDelegator.java @@ -1,8 +1,8 @@ -package org.mifosplatform.infrastructure.commands.handler; +package org.mifosplatform.commands.handler; import org.mifosng.platform.infrastructure.errorhandling.UnsupportedCommandException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosplatform.infrastructure.commands.domain.CommandSource; +import org.mifosplatform.commands.domain.CommandSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java index 42621a936..ef5055861 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.handler; +package org.mifosplatform.commands.handler; import java.util.Arrays; import java.util.List; @@ -12,10 +12,10 @@ import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.infrastructure.errorhandling.UnsupportedCommandException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.service.RoleWritePlatformService; -import org.mifosplatform.infrastructure.commands.domain.CommandSource; -import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; +import org.mifosplatform.commands.domain.CommandSource; +import org.mifosplatform.commands.service.ChangeDetectionService; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.service.RoleWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java index 69052d4ad..934f87457 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.handler; +package org.mifosplatform.commands.handler; import java.util.Arrays; import java.util.List; @@ -10,10 +10,10 @@ import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerServi import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.service.AppUserWritePlatformService; -import org.mifosplatform.infrastructure.commands.domain.CommandSource; -import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; +import org.mifosplatform.commands.domain.CommandSource; +import org.mifosplatform.commands.service.ChangeDetectionService; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.service.AppUserWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionService.java similarity index 71% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionService.java index 11a117a66..e865e6ddd 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionService.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; public interface ChangeDetectionService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionServiceJdbc.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionServiceJdbc.java index 5d0c8f3ea..35ce09632 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/ChangeDetectionServiceJdbc.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.data.ClientData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformService.java similarity index 84% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformService.java index c95cfa3b3..10ca71fea 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; import org.mifosng.platform.api.data.EntityIdentifier; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWriteServiceImpl.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWriteServiceImpl.java index 58f15f670..63c687bdc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWriteServiceImpl.java @@ -1,12 +1,12 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; import org.joda.time.LocalDate; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosplatform.infrastructure.commands.domain.CommandSource; -import org.mifosplatform.infrastructure.commands.domain.CommandSourceRepository; -import org.mifosplatform.infrastructure.commands.handler.CommandSourceHandlerDelegator; +import org.mifosplatform.commands.domain.CommandSource; +import org.mifosplatform.commands.domain.CommandSourceRepository; +import org.mifosplatform.commands.handler.CommandSourceHandlerDelegator; +import org.mifosplatform.infrastructure.user.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformService.java similarity index 69% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformService.java index 7ced78bde..d64aa2fe4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; import java.util.Collection; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.api.data.CommandSourceData; public interface PortfolioCommandsReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java index e2fe29a36..05c3f815f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java @@ -1,4 +1,4 @@ -package org.mifosplatform.infrastructure.commands.service; +package org.mifosplatform.commands.service; import java.sql.ResultSet; import java.sql.SQLException; @@ -8,7 +8,7 @@ import org.joda.time.LocalDate; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.commands.api.data.CommandSourceData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java deleted file mode 100644 index f82a30325..000000000 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.mifosplatform.infrastructure.commands.handler; - -public interface CommandSourceHandler { - -} diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/AuthenticationApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/AuthenticationApiResource.java new file mode 100644 index 000000000..979c920a0 --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/AuthenticationApiResource.java @@ -0,0 +1,64 @@ +package org.mifosplatform.infrastructure.user.api; + +import java.util.ArrayList; +import java.util.Collection; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; +import org.mifosplatform.infrastructure.user.api.data.AuthenticatedUserData; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Scope; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import com.sun.jersey.core.util.Base64; + +@Path("/authentication") +@Component +@Scope("singleton") +public class AuthenticationApiResource { + + @Qualifier("customAuthenticationProvider") + @Autowired + private DaoAuthenticationProvider customAuthenticationProvider; + + @Autowired + private PortfolioApiJsonSerializerService apiJsonSerializerService; + + @POST + @Consumes({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON }) + public String authenticate(@QueryParam("username") final String username, @QueryParam("password") final String password) { + + Authentication authentication = new UsernamePasswordAuthenticationToken(username, password); + Authentication authenticationCheck = customAuthenticationProvider.authenticate(authentication); + + Collection permissions = new ArrayList(); + AuthenticatedUserData authenticatedUserData = new AuthenticatedUserData(username, permissions); + + if (authenticationCheck.isAuthenticated()) { + Collection authorities = new ArrayList(authenticationCheck.getAuthorities()); + for (GrantedAuthority grantedAuthority : authorities) { + permissions.add(grantedAuthority.getAuthority()); + } + AppUser principal = (AppUser) authenticationCheck.getPrincipal(); + byte[] base64EncodedAuthenticationKey = Base64.encode(username + ":" + password); + + authenticatedUserData = new AuthenticatedUserData(username, permissions, principal.getId(), new String( + base64EncodedAuthenticationKey)); + } + + return this.apiJsonSerializerService.serializeAuthenticatedUserDataToJson(false, authenticatedUserData); + } +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/UsersApiResource.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/UsersApiResource.java index 86d45123c..505bd88f9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/UsersApiResource.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api; +package org.mifosplatform.infrastructure.user.api; import java.util.ArrayList; import java.util.Arrays; @@ -18,15 +18,15 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; -import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.service.AppUserReadPlatformService; -import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.service.AppUserReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AppUserData.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AppUserData.java index dddc9b2f2..4b3fd23e8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/AppUserData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AppUserData.java @@ -1,8 +1,10 @@ -package org.mifosng.platform.api.data; +package org.mifosplatform.infrastructure.user.api.data; import java.util.ArrayList; import java.util.List; +import org.mifosng.platform.api.data.OfficeLookup; + /** * Immutable data object for application user data. */ diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AuthenticatedUserData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AuthenticatedUserData.java new file mode 100644 index 000000000..e9916ddbe --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/AuthenticatedUserData.java @@ -0,0 +1,37 @@ +package org.mifosplatform.infrastructure.user.api.data; + +import java.util.Collection; + +/** + * Immutable data object for authentication. + */ +public class AuthenticatedUserData { + + @SuppressWarnings("unused") + private final String username; + @SuppressWarnings("unused") + private final Long userId; + @SuppressWarnings("unused") + private final String base64EncodedAuthenticationKey; + @SuppressWarnings("unused") + private final boolean authenticated; + @SuppressWarnings("unused") + private final Collection permissions; + + public AuthenticatedUserData(final String username, final Collection permissions) { + this.username = username; + this.userId = null; + this.base64EncodedAuthenticationKey = null; + this.authenticated = false; + this.permissions = permissions; + } + + public AuthenticatedUserData(final String username, final Collection permissions, final Long userId, + final String base64EncodedAuthenticationKey) { + this.username = username; + this.userId = userId; + this.base64EncodedAuthenticationKey = base64EncodedAuthenticationKey; + this.authenticated = true; + this.permissions = permissions; + } +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionUsageData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/PermissionUsageData.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionUsageData.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/PermissionUsageData.java index 2988c8277..a0e9d74fb 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionUsageData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/PermissionUsageData.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.data; +package org.mifosplatform.infrastructure.user.api.data; /** * Immutable representation of permissions diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RoleData.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RoleData.java index 8af7c095c..63f3d4119 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RoleData.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.data; +package org.mifosplatform.infrastructure.user.api.data; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RolePermissionsData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RolePermissionsData.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/RolePermissionsData.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RolePermissionsData.java index be7bf026f..5560d0fc8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/RolePermissionsData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/api/data/RolePermissionsData.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.data; +package org.mifosplatform.infrastructure.user.api.data; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java similarity index 99% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java index 814426ec6..03955da85 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import java.util.ArrayList; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUserRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUserRepository.java similarity index 84% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUserRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUserRepository.java index 475610b24..6c5bd8a81 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUserRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUserRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/JpaUserDomainService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/JpaUserDomainService.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/JpaUserDomainService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/JpaUserDomainService.java index de04b80ff..1ac87739e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/JpaUserDomainService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/JpaUserDomainService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.infrastructure.EmailDetail; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PasswordMustBeDifferentException.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PasswordMustBeDifferentException.java similarity index 65% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PasswordMustBeDifferentException.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PasswordMustBeDifferentException.java index ea685ec85..1ee390f10 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PasswordMustBeDifferentException.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PasswordMustBeDifferentException.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; public class PasswordMustBeDifferentException extends RuntimeException { // basic runtime exception diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Permission.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Permission.java index 181f845bd..e60b7d876 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Permission.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PermissionRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PermissionRepository.java similarity index 77% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PermissionRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PermissionRepository.java index 9a5c04d61..20dc02290 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PermissionRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PermissionRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PlatformUserRepository.java similarity index 74% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PlatformUserRepository.java index 1acec101b..ecd8389cb 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/PlatformUserRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import org.mifosng.platform.infrastructure.PlatformUser; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java index 047454ee5..934139e13 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import java.util.Collection; import java.util.HashSet; @@ -13,8 +13,8 @@ import javax.persistence.ManyToMany; import javax.persistence.Table; import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; +import org.mifosplatform.infrastructure.user.api.data.RoleData; @Entity @Table(name = "m_role") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/RoleRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/RoleRepository.java similarity index 83% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/RoleRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/RoleRepository.java index 3dea77850..2902fdcb8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/RoleRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/RoleRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UserDomainService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UserDomainService.java similarity index 65% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UserDomainService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UserDomainService.java index 05160b028..00d013a31 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UserDomainService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UserDomainService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; public interface UserDomainService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UsernameMustBeDifferentException.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UsernameMustBeDifferentException.java similarity index 65% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UsernameMustBeDifferentException.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UsernameMustBeDifferentException.java index 098347282..95867e204 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/UsernameMustBeDifferentException.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/UsernameMustBeDifferentException.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.domain; +package org.mifosplatform.infrastructure.user.domain; public class UsernameMustBeDifferentException extends RuntimeException { // basic runtime exception diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformService.java similarity index 63% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformService.java index 66025d384..a0435d659 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.Collection; -import org.mifosng.platform.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; public interface AppUserReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformServiceImpl.java similarity index 93% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformServiceImpl.java index cf0793641..3c42af082 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserReadPlatformServiceImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,18 +7,18 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.data.OfficeLookup; -import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.exceptions.UserNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.domain.AppUserRepository; -import org.mifosng.platform.user.domain.Role; +import org.mifosplatform.infrastructure.user.api.data.AppUserData; +import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUserRepository; +import org.mifosplatform.infrastructure.user.domain.Role; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java index 2fc0a3c03..0f47c6eb9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import org.mifosng.platform.api.commands.UserCommand; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java index f5a42ffc3..502f5d536 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.ArrayList; import java.util.HashSet; @@ -21,13 +21,13 @@ import org.mifosng.platform.infrastructure.PlatformUser; import org.mifosng.platform.organisation.domain.Office; import org.mifosng.platform.organisation.domain.OfficeRepository; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.AppUser; -import org.mifosng.platform.user.domain.AppUserRepository; -import org.mifosng.platform.user.domain.Permission; -import org.mifosng.platform.user.domain.PermissionRepository; -import org.mifosng.platform.user.domain.Role; -import org.mifosng.platform.user.domain.RoleRepository; -import org.mifosng.platform.user.domain.UserDomainService; +import org.mifosplatform.infrastructure.user.domain.AppUser; +import org.mifosplatform.infrastructure.user.domain.AppUserRepository; +import org.mifosplatform.infrastructure.user.domain.Permission; +import org.mifosplatform.infrastructure.user.domain.PermissionRepository; +import org.mifosplatform.infrastructure.user.domain.Role; +import org.mifosplatform.infrastructure.user.domain.RoleRepository; +import org.mifosplatform.infrastructure.user.domain.UserDomainService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformService.java similarity index 70% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformService.java index f6ce170e0..27f0b3bfc 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.Collection; -import org.mifosng.platform.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; public interface PermissionReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformServiceImpl.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformServiceImpl.java index e779a368a..bc8d816ab 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionReadPlatformServiceImpl.java @@ -1,12 +1,12 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.mifosng.platform.api.data.PermissionUsageData; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java similarity index 85% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java index 65128f59d..499885aaf 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import org.mifosng.platform.api.commands.PermissionsCommand; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java similarity index 92% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java index b479023b1..7cb0a6533 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.Collection; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.Map; import org.mifosng.platform.api.commands.PermissionsCommand; import org.mifosng.platform.exceptions.PermissionNotFoundException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.Permission; -import org.mifosng.platform.user.domain.PermissionRepository; +import org.mifosplatform.infrastructure.user.domain.Permission; +import org.mifosplatform.infrastructure.user.domain.PermissionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java index 2b8dec3db..d4dbcdc1c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.ArrayList; import java.util.List; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformService.java similarity index 57% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformService.java index ac3285dba..4b7a2b54d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.Collection; -import org.mifosng.platform.api.data.RoleData; +import org.mifosplatform.infrastructure.user.api.data.RoleData; public interface RoleReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformServiceImpl.java similarity index 90% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformServiceImpl.java index fd641186b..589602256 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleReadPlatformServiceImpl.java @@ -1,16 +1,16 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.exceptions.RoleNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.Role; -import org.mifosng.platform.user.domain.RoleRepository; +import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.domain.Role; +import org.mifosplatform.infrastructure.user.domain.RoleRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java similarity index 85% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java index fad662d1e..d19c17806 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import org.mifosng.platform.api.commands.RoleCommand; import org.mifosng.platform.api.commands.RolePermissionCommand; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java similarity index 93% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java index 0b5abf6f5..02a1e27b3 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.Collection; import java.util.Map; @@ -9,10 +9,10 @@ import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotAppr import org.mifosng.platform.exceptions.PermissionNotFoundException; import org.mifosng.platform.exceptions.RoleNotFoundException; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.user.domain.Permission; -import org.mifosng.platform.user.domain.PermissionRepository; -import org.mifosng.platform.user.domain.Role; -import org.mifosng.platform.user.domain.RoleRepository; +import org.mifosplatform.infrastructure.user.domain.Permission; +import org.mifosplatform.infrastructure.user.domain.PermissionRepository; +import org.mifosplatform.infrastructure.user.domain.Role; +import org.mifosplatform.infrastructure.user.domain.RoleRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java index f1fea1174..0fda8b76d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.user.service; +package org.mifosplatform.infrastructure.user.service; import java.util.ArrayList; import java.util.List; diff --git a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml index 22128b0ba..53208b4a9 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml @@ -17,7 +17,7 @@ + org.mifosplatform.*.*.service, org.mifosplatform.*.*.domain, org.mifosplatform, org.mifosplatform.commands"> @@ -25,7 +25,8 @@ - + + diff --git a/mifosng-provider/src/main/resources/ccylist.csv b/mifosng-provider/src/main/resources/ccylist.csv deleted file mode 100644 index 3e88e4fc8..000000000 --- a/mifosng-provider/src/main/resources/ccylist.csv +++ /dev/null @@ -1,164 +0,0 @@ -Code,Name,DPs -AED,UAE Dirham,2 -AFN,Afghanistan Afghani,2 -ALL,Albanian Lek,2 -AMD,Armenian Dram,2 -ANG,Netherlands Antillian Guilder,2 -AOA,Angolan Kwanza,2 -ARS,Argentine Peso,2 -AUD,Australian Dollar,2 -AWG,Aruban Guilder,2 -AZM,Azerbaijanian Manat,2 -BAM,Bosnia and Herzegovina Convertible Marks,2 -BBD,Barbados Dollar,2 -BDT,Bangladesh Taka,2 -BGN,Bulgarian Lev,2 -BHD,Bahraini Dinar,3 -BIF,Burundi Franc,0 -BMD,Bermudian Dollar,2 -BND,Brunei Dollar,2 -BOB,Bolivian Boliviano,2 -BRL,Brazilian Real,2 -BSD,Bahamian Dollar,2 -BTN,Bhutan Ngultrum,2 -BWP,Botswana Pula,2 -BYR,Belarussian Ruble,0 -BZD,Belize Dollar,2 -CAD,Canadian Dollar,2 -CDF,Franc Congolais,2 -CHF,Swiss Franc,2 -CLP,Chilean Peso,0 -CNY,Chinese Yuan Renminbi,2 -COP,Colombian Peso,2 -CRC,Costa Rican Colon,2 -CSD,Serbian Dinar,2 -CUP,Cuban Peso,2 -CVE,Cape Verde Escudo,2 -CYP,Cyprus Pound,2 -CZK,Czech Koruna,2 -DJF,Djibouti Franc,0 -DKK,Danish Krone,2 -DOP,Dominican Peso,2 -DZD,Algerian Dinar,2 -EEK,Estonian Kroon,2 -EGP,Egyptian Pound,2 -ERN,Eritrea Nafka,2 -ETB,Ethiopian Birr,2 -EUR,euro,2 -FJD,Fiji Dollar,2 -FKP,Falkland Islands Pound,2 -GBP,Pound Sterling,2 -GEL,Georgian Lari,2 -GHC,Ghana Cedi,2 -GIP,Gibraltar Pound,2 -GMD,Gambian Dalasi,2 -GNF,Guinea Franc,0 -GTQ,Guatemala Quetzal,2 -GYD,Guyana Dollar,2 -HKD,Hong Kong Dollar,2 -HNL,Honduras Lempira,2 -HRK,Croatian Kuna,2 -HTG,Haiti Gourde,2 -HUF,Hungarian Forint,2 -IDR,Indonesian Rupiah,2 -ILS,New Israeli Shekel,2 -INR,Indian Rupee,2 -IQD,Iraqi Dinar,3 -IRR,Iranian Rial,2 -ISK,Iceland Krona,0 -JMD,Jamaican Dollar,2 -JOD,Jordanian Dinar,3 -JPY,Japanese Yen,0 -KES,Kenyan Shilling,2 -KGS,Kyrgyzstan Som,2 -KHR,Cambodia Riel,2 -KMF,Comoro Franc,0 -KPW,North Korean Won,2 -KRW,Korean Won,0 -KWD,Kuwaiti Dinar,3 -KYD,Cayman Islands Dollar,2 -KZT,Kazakhstan Tenge,2 -LAK,Lao Kip,2 -LBP,Lebanese Pound,2 -LKR,Sri Lanka Rupee,2 -LRD,Liberian Dollar,2 -LSL,Lesotho Loti,2 -LTL,Lithuanian Litas,2 -LVL,Latvian Lats,2 -LYD,Libyan Dinar,3 -MAD,Moroccan Dirham,2 -MDL,Moldovan Leu,2 -MGA,Malagasy Ariary,2 -MKD,Macedonian Denar,2 -MMK,Myanmar Kyat,2 -MNT,Mongolian Tugrik,2 -MOP,Macau Pataca,2 -MRO,Mauritania Ouguiya,2 -MTL,Maltese Lira,2 -MUR,Mauritius Rupee,2 -MVR,Maldives Rufiyaa,2 -MWK,Malawi Kwacha,2 -MXN,Mexican Peso,2 -MYR,Malaysian Ringgit,2 -MZM,Mozambique Metical,2 -NAD,Namibia Dollar,2 -NGN,Nigerian Naira,2 -NIO,Nicaragua Cordoba Oro,2 -NOK,Norwegian Krone,2 -NPR,Nepalese Rupee,2 -NZD,New Zealand Dollar,2 -OMR,Rial Omani,3 -PAB,Panama Balboa,2 -PEN,Peruvian Nuevo Sol,2 -PGK,Papua New Guinea Kina,2 -PHP,Philippine Peso,2 -PKR,Pakistan Rupee,2 -PLN,Polish Zloty,2 -PYG,Paraguayan Guarani,0 -QAR,Qatari Rial,2 -RON,Romanian Leu,2 -RUB,Russian Ruble,2 -RWF,Rwanda Franc,0 -SAR,Saudi Riyal,2 -SBD,Solomon Islands Dollar,2 -SCR,Seychelles Rupee,2 -SDD,Sudanese Dinar,2 -SEK,Swedish Krona,2 -SGD,Singapore Dollar,2 -SHP,St Helena Pound,2 -SIT,Slovenian Tolar,2 -SKK,Slovak Koruna,2 -SLL,Sierra Leone Leone,2 -SOS,Somali Shilling,2 -SRD,Surinam Dollar,2 -STD,São Tome and Principe Dobra,2 -SVC,El Salvador Colon,2 -SYP,Syrian Pound,2 -SZL,Swaziland Lilangeni,2 -THB,Thai Baht,2 -TJS,Tajik Somoni,2 -TMM,Turkmenistan Manat,2 -TND,Tunisian Dinar,3 -TOP,Tonga Pa'anga,2 -TRY,Turkish Lira,2 -TTD,Trinidad and Tobago Dollar,2 -TWD,New Taiwan Dollar,2 -TZS,Tanzanian Shilling,2 -UAH,Ukraine Hryvnia,2 -UGX,Uganda Shilling,2 -USD,US Dollar,2 -UYU,Peso Uruguayo,2 -UZS,Uzbekistan Sum,2 -VEB,Venezuelan Bolivar,2 -VND,Vietnamese Dong,2 -VUV,Vanuatu Vatu,0 -WST,Samoa Tala,2 -XAF,CFA Franc BEAC,0 -XCD,East Caribbean Dollar,2 -XDR,SDR (Special Drawing Rights),5 -XOF,CFA Franc BCEAO,0 -XPF,CFP Franc,0 -YER,Yemeni Rial,2 -ZAR,South African Rand,2 -ZMK,Zambian Kwacha,2 -ZWD,Zimbabwe Dollar,2 diff --git a/mifosng-provider/src/main/resources/logback.xml b/mifosng-provider/src/main/resources/logback.xml index fb801bbf9..25059a961 100644 --- a/mifosng-provider/src/main/resources/logback.xml +++ b/mifosng-provider/src/main/resources/logback.xml @@ -18,8 +18,9 @@ + - + diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/MPESALoanDisbursalsExportSummary.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/MPESALoanDisbursalsExportSummary.properties deleted file mode 100644 index d4af24d05..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/MPESALoanDisbursalsExportSummary.properties +++ /dev/null @@ -1,17 +0,0 @@ -LoanDisbursalsExportSummary=MPESA Loan Disbursals Export Summary -TotalAmountOfDisbursals\:=Total Amount Of Disbursals: -TotalNumberOfExportedRecords\:=Number Of Exported Records: -ListOfExportErrors\:=List Of Export Errors: -LoanAccountNo=Loan Account Number -ReceiptNo=Receipt Number -ErrorDescription=Error Description -PhoneNo=Phone Number -SelectedGroup\:=Selected Group: -SelectedProduct\:=Selected Product: -SelectedExportDate\:=Selected Export Date: -AsOf\:=As Of: -LastEditedBy=Last edited by -PrintedBy\:=Printed by: -Page=Page -On\:=On: -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoanSummaryBranch.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoanSummaryBranch.properties deleted file mode 100644 index 578a6287b..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoanSummaryBranch.properties +++ /dev/null @@ -1,18 +0,0 @@ -ActiveLoanSummaryBranch=Active Loan Summary per Branch -Branch=Branch -NoOfCenters=No. of Centers -NoOfGroups=No. of Groups -NoOfClients=No. of Clients -NoOfActiveLoans=No. of Active Loans -NoOfLoansInArrears=No. of Loans in Arrears -TotalLoansDisbursed=Total Loans Disbursed -TotalPrincipalRepaid=Total Principal Repaid -TotalInterestRepaid=Total Interest Repaid -TotalPrincipalOutstanding=Total Principal Outstanding -TotalInterestOutstanding=Total Interest Outstanding -AmountInArrears=Amount in Arrears -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansCenter.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansCenter.properties deleted file mode 100644 index 7bdfe4edb..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansCenter.properties +++ /dev/null @@ -1,21 +0,0 @@ -ActiveLoansCenter=Active Loans by Center -Office\:=Office: -Center\:=Center: -SystemId=System Id -CenterName=Center Name -GroupName=Group Name -ClientName=Client Name -LoanAmount=Loan Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -Total=Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLastInstallment.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLastInstallment.properties deleted file mode 100644 index 39e7851c6..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLastInstallment.properties +++ /dev/null @@ -1,20 +0,0 @@ -ActiveLoansLastInstallment=Active Loans in their Last Installment -Office\:=Office: -SystemId=System Id -CenterName=Center Name -GroupName=Group Name -ClientName=Client Name -LoanAmount=Loan Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -Total=Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanOfficer.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanOfficer.properties deleted file mode 100644 index 33d323a30..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanOfficer.properties +++ /dev/null @@ -1,21 +0,0 @@ -ActiveLoansLoanOfficer=Active Loans by Loan Officer -Office\:=Office: -LoanOfficer\:=Loan Officer: -SystemId=System Id -CenterName=Center Name -GroupName=Group Name -ClientName=Client Name -LoanAmount=Loan Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -Total=Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanProduct.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanProduct.properties deleted file mode 100644 index c1c82a95f..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanProduct.properties +++ /dev/null @@ -1,21 +0,0 @@ -ActiveLoansLoanProduct=Active Loans by Loan Product -Office\:=Office: -LoanProduct\:=Loan Product: -SystemId=System Id -CenterName=Center Name -GroupName=Group Name -ClientName=Client Name -LoanAmount=Loan Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -Total=Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanPurpose.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanPurpose.properties deleted file mode 100644 index 4e13a236b..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/activeLoansLoanPurpose.properties +++ /dev/null @@ -1,21 +0,0 @@ -ActiveLoansLoanPurpose=Active Loans by Loan Purpose -Office\:=Office: -LoanPurpose\:=Loan Purpose: -SystemId=System Id -CenterName=Center Name -GroupName=Group Name -ClientName=Client Name -LoanAmount=Loan Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -Total=Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/agingSummary.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/agingSummary.properties deleted file mode 100644 index bb0ab1f7c..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/agingSummary.properties +++ /dev/null @@ -1,37 +0,0 @@ -AgingSummary=Aging Summary -Office\:=Office: -AGINGANALYSIS=AGING ANALYSIS -ArrearsAmount=Arrears Amount -PAR=PAR -PARratio=PAR Ratio -AGINGTABLE=AGING TABLE -ofloans=# of Loans -LoanAmount=Loan Amount -PrincipalInArrears=Principal in Arrears -InterestInArrears=Interest in Arrears -PrincipalOutstanding=Principal Outstanding -InterestOutstanding=Interest Outstanding -BalanceOutstanding=Balance Outstanding -Total=Total -VersionAt=Version 1.3 -Page=Page -On\:=On: -PrintedBy\:=Printed by: -1\ Week\ in\ Arrears=1 Week in Arrears -2\ Weeks\ in\ Arrears=2 Weeks in Arrears -3\ Weeks\ in\ Arrears=3 Weeks in Arrears -4\ Weeks\ in\ Arrears=4 Weeks in Arrears -5\ Weeks\ in\ Arrears=5 Weeks in Arrears -6\ Weeks\ in\ Arrears=6 Weeks in Arrears -7\ Weeks\ in\ Arrears=7 Weeks in Arrears -8\ Weeks\ in\ Arrears=8 Weeks in Arrears -9\ Weeks\ in\ Arrears=9 Weeks in Arrears -10\ Weeks\ in\ Arrears=10 Weeks in Arrears -11\ Weeks\ in\ Arrears=11 Weeks in Arrears -12\ Weeks\ in\ Arrears=12 Weeks in Arrears -12+\ Weeks\ in\ Arrears=> 12 Weeks in Arrears -0\ to\ 30\ Days\ in\ Arrears=1 to 30 Days in Arrears -30\ to\ 60\ Days\ in\ Arrears=31 to 60 Days in Arrears -60\ to\ 90\ Days\ in\ Arrears=61 to 90 Days in Arrears -90\ to\ 180\ Days\ in\ Arrears=91 to 180 Days in Arrears ->\ 180\ Days\ in\ Arrears=> 180 Days in Arrears diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstanding.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstanding.properties deleted file mode 100644 index d6b2763e9..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstanding.properties +++ /dev/null @@ -1,29 +0,0 @@ -balanceOutstanding=Balance Outstanding -loanOfficer\:=Loan Officer: -branch\:=Office: -product\:=Product: -outstandingAsOnDate\:=As On Date: -status\:=Status: -loanProducts=Loan Products -loanProduct\:=Loan Product: -accountId=Account Id -memberName=Client Name -loanAmount=Loan Amount -balance=Balance Amount -loanStatus=Loan Status -disbursedDate=Disbursal Date -gender=Gender -groupName=Group Name -loanOfficer=Loan Officer -sourceOfFund=Source Of Funds -subTotal=Total for -savingProducts=Saving Products -savingProduct\:=Saving Product: -savingStatus=Saving Status -dateOfOpening=Date Of Opening -noDataAvailable=No Data Available -blank= -VersionAt=Version 1.3 -printedBy\:=Printed By: -printedOn\:=Printed On: -page\:=Page: diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstandingBySourceOfFunds.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstandingBySourceOfFunds.properties deleted file mode 100644 index 7eb2899e7..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/balanceOutstandingBySourceOfFunds.properties +++ /dev/null @@ -1,16 +0,0 @@ -BalanceOutstandingBySourceOfFunds=Balance Outstanding by Source of Funds -AsOnDate\:=As On Date: -Office\:=Office: -SourceOfFunds\:=Source of Funds: -SourceOfFunds=Source of Funds -AmountDisbursed=Amount Disbursed -AmountPaid=Amount Paid -AmountOutstanding=Amount Outstanding -PrincipalInArrears=Principal in Arrears -NumberOfLoans=Number of Loans -NumberOfClients=Number of Clients -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/branchExpectedCashFlow.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/branchExpectedCashFlow.properties deleted file mode 100644 index 690a25249..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/branchExpectedCashFlow.properties +++ /dev/null @@ -1,21 +0,0 @@ -BranchExpectedCashFlow=Branch Expected Cash Flow -From\:=From: -To\:=To: -Office\:=Office: -ReportDate\:=Report Date: -Branch\:=Branch: -Date=Date -ExpectedCashIn=Expected Cash In -Principal=Principal -Interest=Interest -ClientFees=Client Fees -LoanFees=Loan Fees -ExpectedCashOut=Expected Cash Out -LoanDisbursals=Loan Disbursals -NetExpectedCashFlow=Net Expected Cash Flow -Total=Total -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerCollectionSheet.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerCollectionSheet.properties deleted file mode 100644 index 8836e4e9b..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerCollectionSheet.properties +++ /dev/null @@ -1,40 +0,0 @@ -CenterCollectionSheet=Center Collection Sheet -MeetingDate\:=Meeting Date: -Office\:=Office: -LoanOfficer\:=Loan Officer: -TopCustomerHierarchyId\:=Top Customer Hierarchy Id: -BranchOffice\:=Branch Office: -MeetingLocation\:=Meeting Location: -CenterName\:=Center Name: -ClientMifosID=Client Mifos ID -Name=Name -Att*=Att* -*Att_P,A,L,AA=* Att = P, A, L, AA -ProductID=Product - ID -LoanInstallment=Loan Installment # -AdvancePayment=Advance Payment -AmountPrepaid=Amount Prepaid -AmountPrepaid\:=Amount Prepaid: -Due=Due -Collected=Collected -Principal=Principal -Interest=Interest -F/P=Fees/Penalties -TOTAL=TOTAL -TOTAL\:=TOTAL: -WithdrawalsDisbursals=Withdrawals / Disbursals -Other=Other -Summary=Summary -TotalAmountDue\:=Total Amount Due: -Collection=Collection -AmountCollectedBeforeMeeting\:=Amount Collected Before Meeting: -AmountCollectedDuringMeeting\:=Amount Collected During Meeting: -Issues=Issues -TotalWithdrawalIssued\:=Total Withdrawal Issued: -TotalDisbursalsIssued\:=Total Disbursals Issued: -NETCOLLECTION\:=NET COLLECTION: -Signatures\:=Signatures: -Signature=Signature -VersionAt=v1.3 -Page=Page -AmountCollected=Amount Collected diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerScheduleLoanOfficer.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerScheduleLoanOfficer.properties deleted file mode 100644 index 85737eaa4..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/centerScheduleLoanOfficer.properties +++ /dev/null @@ -1,18 +0,0 @@ -CenterScheduleLoanOfficer=Center Schedule by Loan Officer -Office\:=Office: -From\:=From: -To\:=To: -LoanOfficer=Loan Officer -MeetingDay=Meeting Day -Center=Center -Group=Group -Other=Other -NumOfCenters=No. of Centers: -NumOfGroups=No. of Groups: -TotalNumOfCenters=Total No. of Centers: -TotalNumOfGroups=Total No. of Groups: -VersionAt=Version 1.3 -PrintedBy\:=Printed By: -On\:=On: -Page=Page - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientExit.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientExit.properties deleted file mode 100644 index 87e110776..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientExit.properties +++ /dev/null @@ -1,21 +0,0 @@ -ClientExit=Client Exit -From\:=From: -To\:=To: -Office\:=Office: -LoanOfficer\:=Loan Officer: -Group\:=Group: -ClientID=Client ID -ClientName=Client Name -GroupName=Group Name -NationalID=National ID -ClientClosedDate=Closed Date -ExitReason=Reason -ExitNotes=Notes -NumLoans=# Loans -AmountDisbursed=Amount Disbursed -LoanOfficer=Loan Officer -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientSummary.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientSummary.properties deleted file mode 100644 index 157514184..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/clientSummary.properties +++ /dev/null @@ -1,29 +0,0 @@ -ClientSummary=Client Summary -Office\:=Office: -Gender\:=Gender: -VersionAt=Version 1.3 -On\:=On: -PrintedBy\:=Printed by: -Page=Page -ClientDetails=Client Details -TotalClients=Total Clients -ActiveClients=Active Clients -OnHoldClients=On Hold Clients -ClosedClients=Closed Clients -ActiveCenters=Active Centers -ActiveGroups=Active Groups -MaritalStatus=Marital Status -EducationLevel=Education Level -PovertyStatus=Poverty Status -Gender=Gender -Age=Age -18to25=18 - 25 -26to30=26 - 30 -31to35=31 - 35 -36to40=36 - 40 -41to45=41 - 45 -46to50=46 - 50 -above50=> 50 -Citizenship=Citizenship -Ethinicity=Ethinicity - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoanSummaryBranch.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoanSummaryBranch.properties deleted file mode 100644 index 7d2c33411..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoanSummaryBranch.properties +++ /dev/null @@ -1,13 +0,0 @@ -ClosedLoanSummaryBranch=Closed Loan Summary per Branch -Branch=Branch -NoOfCenters=No. of Centers with Closed Loans -NoOfGroups=No. of Groups with Closed Loans -NoOfClients=No. of Clients with Closed Loans -NoOfClosedLoans=No. of Closed Loans -AmountOfClosedLoans=Total Amount of Closed Loans -InterestRepaid=Total Interest Repaid -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoans.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoans.properties deleted file mode 100644 index a24cd42ac..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/closedLoans.properties +++ /dev/null @@ -1,44 +0,0 @@ -ClosedLoans=Closed Loans -Office\:=Office: -LoanOfficer\:=Loan Officer: -Center\:=Center: -LoanId=Loan Id -CenterName=Center Name -GroupName=Group Name -MemberName=Client Name -DisbursalAmount=Disbursal Amount -InterestRate=Interest Rate(%) -DisbursalDate=Disbursal Date -RepaidPrincipal=Repaid Principal -RepaidInterest=Repaid Interest -OutstandingPrincipal=Outstanding Principal -OutstandingInterest=Outstanding Interest -LoanOfficer=Loan Officer -SubTotal=Sub Total -GrandTotal\:=Grand Total: -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 -ClosureDate=Closed / Rescheduled Date -PurposeOfLoan=Purpose Of Loan -LoanCycle=Loan Cycle -FeesCollected=Fees Collected -TotalCollected=Total Collected -Reason =Reason -DaysAfterClosure=Days Since Loan Closed -NewLoanTaken=New Loan Taken -DisbursalPeriod\:=Disbursal Period: -ClosurePeriod\:=Closure Period: -To=To -(ClosedDate)From\:=(ClosedDate)From: -(ClosedDate)To\:=(ClosedDate)To: -(DisbursalDate)From\:=(DisbursalDate)From: -(DisbursalDate)To\:=(DisbursalDate)To: -CenterSubTotal\:=Center Total: -LoanOfficerSubTotal\:=Loan Officer Total: -BranchTotal\:=Branch Total: -PrincipalCollected=Principal Collected -InterestCollected=Interest Collected -NoDataAvailable=No Data Available -OfficeLoanOfficerCenter\:=Office, Loan Officer, Center: diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dormantClientsSummary.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dormantClientsSummary.properties deleted file mode 100644 index 8068c85cf..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dormantClientsSummary.properties +++ /dev/null @@ -1,13 +0,0 @@ -DormantClientsSummary=Dormant Clients Summary -Branch=Branch -NoCenters=No. of Centers -NoGroups=No. of Groups -NoClients=No. of Clients -NoClientsWithoutActiveLoan=No. of Clients without Active Loan -LongestTimeWithoutLoan=Longest Time without Loan -ActiveClientsDormant=% of Active Clients that are Dormant -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch.properties deleted file mode 100644 index eb6b465f3..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch.properties +++ /dev/null @@ -1,20 +0,0 @@ -DuevsCollectedBranch=Due vs Collected by Branch -From\:=From: -To\:=To: -ReportDate\:= Report Date: -Office\:=Office: -On\:=On: -RepaymentDate=Repayment Date -Due=Due -Collections*=Collections* -Principal=Principal -Interest=Interest -FP=Fees / Penalties -ArrearsPrincipal=Arrears Principal -ArrearsInterest=Arrears Interest -Total=Total -Page=Page -GrandTotal=Grand Total -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Printed by: -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_es.properties deleted file mode 100644 index d279ae5d1..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_es.properties +++ /dev/null @@ -1,20 +0,0 @@ -DuevsCollectedBranch=Debido contra Completo por Rama -From\:=De: -To\:=A: -ReportDate\:=Informe la Fecha: -Office\:=Oficina: -On\:En: -RepaymentDate=Fecha de devolución -Due=Debido -Collections*=Reunió* -Principal=Director -Interest=Interese -FP=Honorarios / Sanciones -ArrearsPrincipal=Atrasos Principales -ArrearsInterest=Atrasos Interese -Total=Suma -Page=Página -GrandTotal=Suma total -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Impreso: -VersionAt=La versión 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_fr.properties deleted file mode 100644 index ee7902681..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedBranch_fr.properties +++ /dev/null @@ -1,20 +0,0 @@ -DuevsCollectedBranch=Le dû contre le Complèt par la Branche -From\:=De: -To\:=À: -ReportDate\:=Rapporter la Date: -Office\:=Bureau: -On\:=Sur: -RepaymentDate=Date de remboursement -Due=Dû -Collections*=Recueilli* -Principal=Principal -Interest=Intéresser -FP=Frais / Sanctions -ArrearsPrincipal=Principal d'Arriéré -ArrearsInterest=Intéresser d'Arriéré -Total=Total -Page=Page -GrandTotal=Grand Total -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Imprimé par: -VersionAt=La version 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter.properties deleted file mode 100644 index d3a731e35..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter.properties +++ /dev/null @@ -1,21 +0,0 @@ -On\:=On: -To\:=To: -From\:=From: -Office\:=Office: -Total=Total -GrandTotal=Grand Total -DuevsCollectedCenter=Due vs Collected by Center -LoanOfficer\:=Loan Officer: -Center\:=Center: -RepaymentDate=Repayment Date -Due=Due -Collections*=Collections* -Principal=Principal -Interest=Interest -FP=Fees / Penalties -ArrearsPrincipal=Arrears Principal -ArrearsInterest=Arrears Interest -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Printed by: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_es.properties deleted file mode 100644 index 486dd20ec..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_es.properties +++ /dev/null @@ -1,21 +0,0 @@ -On\:En: -To\:=A: -From\:=De: -Office\:=Oficina: -Total=Suma -GrandTotal=Suma total -DuevsCollectedCenter=Debido contra completo por el centro -LoanOfficer\:=Preste a Oficial: -Center\:=Centro: -RepaymentDate=Fecha de devolución -Due=Debido -Collections*=Reunió* -Principal=Director -Interest=Interese -FP=Honorarios / Sanciones -ArrearsPrincipal=Atrasos Principales -ArrearsInterest=Atrasos Interese -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Impreso: -Page=Página -VersionAt=La versión 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_fr.properties deleted file mode 100644 index e8de25366..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedCenter_fr.properties +++ /dev/null @@ -1,21 +0,0 @@ -On\:=Sur: -To\:=À: -From\:=De: -Office\:=Bureau: -Total=Total -GrandTotal=Grand Total -DuevsCollectedCenter=Le dû contre le Complèt par le Centre -LoanOfficer\:=Prêter l'Officier: -Center\:=Centre: -RepaymentDate=Date de remboursement -Due=Dû -Collections*=Recueilli* -Principal=Principal -Interest=Intéresser -FP=Frais / Sanctions -ArrearsPrincipal=Principal d'Arriéré -ArrearsInterest=Intéresser d'Arriéré -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Imprimé par: -Page=Page -VersionAt=La version 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer.properties deleted file mode 100644 index 557e0f72c..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer.properties +++ /dev/null @@ -1,20 +0,0 @@ -On\:=On: -To\:=To: -From\:=From: -Office\:=Office: -Total=Total -GrandTotal=Grand Total -DuevsCollectedLoanOfficer=Due vs Collected by Loan Officer -LoanOfficer\:=Loan Officer: -RepaymentDate=Repayment Date -Due=Due -Collections*=Collections* -Principal=Principal -Interest=Interest -FP=Fees / Penalties -ArrearsPrincipal=Arrears Principal -ArrearsInterest=Arrears Interest -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Printed by: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_es.properties deleted file mode 100644 index ccd973c16..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_es.properties +++ /dev/null @@ -1,20 +0,0 @@ -On\:En: -To\:=A: -From\:=De: -Office\:=Oficina: -Total=Suma -GrandTotal=Suma total -DuevsCollectedLoanOfficer=Debido contra Completo por Presta a Oficial -LoanOfficer\:=Preste a Oficial: -RepaymentDate=Fecha de devolución -Due=Debido -Collections*=Reunió* -Principal=Director -Interest=Interese -FP=Honorarios / Sanciones -ArrearsPrincipal=Atrasos Principales -ArrearsInterest=Atrasos Interese -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Impreso: -Page=Página -VersionAt=La versión 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_fr.properties deleted file mode 100644 index ac2a2b9b6..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/dueVsCollectedLoanOfficer_fr.properties +++ /dev/null @@ -1,20 +0,0 @@ -On\:=Sur: -To\:=À: -From\:=De: -Office\:=Bureau: -Total=Total -GrandTotal=Grand Total -DuevsCollectedLoanOfficer=Le dû contre le Complèt par Prête Officier -LoanOfficer\:=Prêter l'Officier: -RepaymentDate=Date de remboursement -Due=Dû -Collections*=Recueilli* -Principal=Principal -Interest=Intéresser -FP=Frais / Sanctions -ArrearsPrincipal=Principal d'Arriéré -ArrearsInterest=Intéresser d'Arriéré -*TheseAmountsDoNotIncludeAdjustedNorReversedPayments=* These amounts do not include adjusted nor reversed payments -PrintedBy\:=Imprimé par: -Page=Page -VersionAt=La version 1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/fundsMovement.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/fundsMovement.properties deleted file mode 100644 index 702d753a6..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/fundsMovement.properties +++ /dev/null @@ -1,23 +0,0 @@ -FundsMovement=Funds Movement -AsOf\:=As Of: -Office\:=Office: -SourceOfFunds\:=Source of Funds: -MifosAccountId=Account ID -ClientName=Client name -LoanDisbursalDate=Loan Disbursal Date -LoanAmountDisbursed=Loan Amount Disbursed -NoOfInstallments=No. of Installments -InstallmentFrequency=Installment Frequency -PrincipalOutstanding=Principal Outstanding -InterestOutstanding=Interest Outstanding -LoanFeesOutstanding=Loan Fees Outstanding -ArrearsAmount=Arrears Amount -ArrearsDays=Arrears Days -SubTotal=Sub Total -week\(s\)=week(s) -month\(s\)=month(s) -day\(s\)=day(s) -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupCollectionSheetMPESA.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupCollectionSheetMPESA.properties deleted file mode 100644 index 886b8efad..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupCollectionSheetMPESA.properties +++ /dev/null @@ -1,38 +0,0 @@ -GroupCollectionSheetMPESA=Group Collection Sheet (MPESA) -MeetingDate\:=Meeting Date: -Office\:=Office: -LoanOfficer\:=Loan Officer: -TopCustomerHierarchyId\:=Top Customer Hierarchy Id: -BranchOffice\:=Branch Office: -MeetingLocation\:=Meeting Location: -GroupName\:=Group Name: -GovtID=Govt ID -Name=Name -PhoneNo=Phone No. -Att*=Att* -*Att_P,A,L,AA=* Att = P, A, L, AA -Product=Product -Balance=Balance -Due=Due -Collected=Collected -Principal=Principal -Interest=Interest -F/P=F/P -TOTAL=TOTAL -TOTAL\:=TOTAL: -ReceiptId=Receipt Id -WithdrawalsDisbursals=Withdrawals / Disbursals -AllowableLoanAmount=Allowable Loan Amount -RequestedLoanAmount=Requested Loan Amount -Summary=Summary -TotalAmountDue\:=Total Amount Due: -Collection=Collection -AmountCollectedBeforeMeeting\:=Amount Collected Before Meeting: -AmountCollectedDuringMeeting\:=Amount Collected During Meeting: -Issues=Issues -TotalWithdrawalIssued\:=Total Withdrawal Issued: -TotalDisbursalsIssued\:=Total Disbursals Issued: -NETCOLLECTION\:=NET COLLECTION: -Signature=Signature -VersionAt=v1.3 -Page=Page diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupsInformation.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupsInformation.properties deleted file mode 100644 index a8b68e961..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/groupsInformation.properties +++ /dev/null @@ -1,23 +0,0 @@ -GroupsInformation=Groups Information -Office\:=Office: -Gender\:=Gender: -VersionAt=Version 1.3 -On\:=On: -PrintedBy\:=Printed by: -Page=Page -BranchName=Branch Name -NoOfCenters=No. of Centers -NoOfActiveGroups=No. of Active Groups -NoOfOnHoldGroups=No. of On Hold Groups -NoOfClosedGroups=No. of Closed Groups -ExternalId=External ID -CenterName=Center Name -GroupName=Group Name -SystemId=System ID -FormationDate=Formation Date -GroupSize=Group Size -Status=Status -ClosedReason=Closed Reason -ClosedDate=Closed Date -LoanOfficer=Loan Officer - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanAging.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanAging.properties deleted file mode 100644 index a193ac815..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanAging.properties +++ /dev/null @@ -1,22 +0,0 @@ -AgingTable=Aging Table -loans=# Of Loans -LoanAmount=Loan Amount -PrincipalInArrears=Principal In Arrears -InterestInArrears=Interest In Arrears -PrincipalOutstanding=Principal Outstanding -InterestOutstanding=Interest Outstanding -BalanceOutstanding=Balance Outstanding -LastReceived=Last Received -CustomerName=Customer Name -CustomerId=Customer Id -ageingReport=Ageing Report -Period\:=Period: -SlNo=Sl No -SubTotal\:=Period Total: -Total\:=Total: -AsOnDate\:=As On Date: -PrintedBy\:=Printed by: -On\:=On: -Page=Page -Office\:=Office: -BranchName\:=BranchName: \ No newline at end of file diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct.properties deleted file mode 100644 index 5a851c622..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct.properties +++ /dev/null @@ -1,20 +0,0 @@ -ProductName=Product Name -DuringPeriod=During Period -OfLoansDisbursed=# of Loans Disbursed -AmountDisbursed=Amount Disbursed -Cumulative=Cumulative -EndOfPeriod=End of Period -AmountOutstanding=Amount Outstanding -ArrearsAmount=Arrears Amount -PAR=PAR -OfActiveLoans=# of Active Loans -OfPortfolioAmount=% of Portfolio Amount -Office\:=Office: -Total=Total -LoanClassificationProduct=Loan Classification by Product -VersionAt=Version 1.3 -From\:=From: -To\:=To: -PrintedBy\:=Printed by: -On\:=On: -Page=Page diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_es.properties deleted file mode 100644 index 4e577de06..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_es.properties +++ /dev/null @@ -1,20 +0,0 @@ -ProductName=Nombre de producto -DuringPeriod=Durante el Período -OfLoansDisbursed=# de Préstamos Desembolsados -AmountDisbursed=Cantidad Desembolsado -Cumulative=Acumulativos -EndOfPeriod=El Fin del Período -AmountOutstanding=Cantidad Sobresaliente -ArrearsAmount=Atrasos Cantidad -PAR=IGUALDAD -OfActiveLoans=# de Activo Préstamos -OfPortfolioAmount=% de Cartera Cantidad -Office\:=Oficina: -Total=Suma -LoanClassificationProduct=Preste Clasificación por Producto -VersionAt=La versión 1,3 -From\:=De: -To\:=A: -Page=Página -PrintedBy\:=Impreso: -On\:=En: diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_fr.properties deleted file mode 100644 index 451f43e2d..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanClassificationProduct_fr.properties +++ /dev/null @@ -1,20 +0,0 @@ -ProductName=Nom de produit -DuringPeriod=Pendant la Période -OfLoansDisbursed=# d'Emprunts Déboursé -AmountDisbursed=Quantité Déboursé -Cumulative=Cumulatifs -EndOfPeriod=La Fin de Période -AmountOutstanding=Quantité Remarquable -ArrearsAmount=Arriéré Quantité -PAR=PAIR -OfActiveLoans=# d'Actif Emprunts -OfPortfolioAmount=% de Portefeuille Quantité -Office\:=Bureau: -Total=Total -LoanClassificationProduct=Prêter sous-Produit de Classification -VersionAt=La version 1,3 -From\:=De: -To\:=A: -PrintedBy\:=Imprimé par: -On\:=Sur: -Page=Page diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed.properties deleted file mode 100644 index 3f1f37090..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed.properties +++ /dev/null @@ -1,71 +0,0 @@ -LoanOfficerDetailed=Loan Officer Detailed -LoanOfficer\:=LoanOfficer: -Office\:=Office: -Gender\:=Gender: -GovernmentID\:=Government ID: -From\:=From: -To\:=To: -On\:=On: -PrintedBy\:=Printed by: -Page=Page -GroupFormation=Group Formation -ofClientsadded(ToDate)=# of Clients added(To Date) -ofClientsadded(ThisPeriod)=# of Clients added(This Period) -ofgroupsadded(ToDate)=# of Groups added(To Date) -ofgroupsadded(ThisPeriod)=# of Groups added(This Period) -ofdropoutclients(ToDate)=# of Dropout clients(To Date) -ofdropoutclients(ThisPeriod)=# of Dropout clients(This Period) -KeyDates=Key Dates -JoinedMFI=Joined MFI -BecameLoanOfficer=Became Loan Officer -BranchMemberships=Branch Memberships -LeftMFI=Left MFI -ClientSummary=Client Summary -ofCenters=# of Centers -ofgroups=# of Groups -ofClients=# of Clients -ofClientswithloans=# of Clients with loans -ofClientswithsavings=# of Clients with savings -Dormantclients=Dormant Clients (no loans) -AccountSummary=Account Summary -ofactiveloans=# of Active Loans -PrincipalAmountOutstanding=Principal Amount Outstanding -InterestAmountOutstanding=Interest Amount Outstanding -PortfolioatRisk%=Portfolio at Risk % -ofloanswrittenoff=# of Loans written off -Amountofloanswrittenoff=Amount of loans written off -TotalSavings=Total Savings -VoluntarySavings=Voluntary Savings -MandatorySavings=Mandatory Savings -AginginArrearsbyWeek=Aging in Arrears by Week -ofLoans=# of Loans -PrincipalOutstanding=Principal Outstanding -Total=Total -AginginArrearsbyDays=Aging in Arrears by Days -Name=Name -Clients=Clients -PrincipalOutstanding=Principal Outstanding -CenterSavings=Center Savings -ArrearsAmount=Arrears Amount -PARratio=PAR ratio -VersionAt=Version 1.3 -SummaryofCenters(Groups)Managed=Summary of Centers (Groups) Managed -Current=Current -1\ Week\ in\ Arrears=1 Week in Arrears -2\ Weeks\ in\ Arrears=2 Weeks in Arrears -3\ Weeks\ in\ Arrears=3 Weeks in Arrears -4\ Weeks\ in\ Arrears=4 Weeks in Arrears -5\ Weeks\ in\ Arrears=5 Weeks in Arrears -6\ Weeks\ in\ Arrears=6 Weeks in Arrears -7\ Weeks\ in\ Arrears=7 Weeks in Arrears -8\ Weeks\ in\ Arrears=8 Weeks in Arrears -9\ Weeks\ in\ Arrears=9 Weeks in Arrears -10\ Weeks\ in\ Arrears=10 Weeks in Arrears -11\ Weeks\ in\ Arrears=11 Weeks in Arrears -12\ Weeks\ in\ Arrears=12 Weeks in Arrears -12+\ Weeks\ in\ Arrears=12+ Weeks in Arrears -0\ to\ 30\ Days\ in\ Arrears=0 to 30 Days in Arrears -30\ to\ 60\ Days\ in\ Arrears=30 to 60 Days in Arrears -60\ to\ 90\ Days\ in\ Arrears=60 to 90 Days in Arrears -90\ to\ 180\ Days\ in\ Arrears=90 to 180 Days in Arrears ->\ 180\ Days\ in\ Arrears=> 180 Days in Arrears diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_es.properties deleted file mode 100644 index 8ad3589a6..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_es.properties +++ /dev/null @@ -1,71 +0,0 @@ -LoanOfficerDetailed=El Oficial del préstamo Detalló -LoanOfficer\:=Preste a Oficial: -Office=Oficina: -Gender\:=Género: -GovernmentID\:=Identificación del Gobierno: -From\:=De: -To\:=A: -On\:=En: -PrintedBy\:=Impreso: -Page=Página -GroupFormation=Agrupe Formación -ofClientsadded(ToDate)=# de Clientes agregó (Fechar) -ofClientsadded(ThisPeriod)=# de Clientes agregó (Este Período) -ofgroupsadded(ToDate)=# de Grupos agregados (Fechar) -ofgroupsadded(ThisPeriod)=# de Grupos agregados (Este Período) -ofdropoutclients(ToDate)=# de Clientes de abandono (Fechar) -ofdropoutclients(ThisPeriod)=# de Clientes de abandono (Este Período) -KeyDates=Fechas clave -JoinedMFI=MFI unido -BecameLoanOfficer=Llegó a ser Oficial de Préstamo -BranchMemberships=Ramifique Asociaciones -LeftMFI=MFI izquierdo -ClientSummary=Resumen de cliente -ofCenters=# de Centros -ofgroups=# de Grupos -ofClients=# de Clientes -ofClientswithloans=# de Clientes con préstamos -ofClientswithsavings=# de Clientes con ahorros -Dormantclients=Clientes inactivos (no préstamos) -AccountSummary=Dé cuenta Resumen -ofactiveloans=# de Préstamos activos -PrincipalAmountOutstanding=Principal Saldo pendiente -InterestAmountOutstanding=Interese Saldo pendiente -PortfolioatRisk%=La cartera en Riesgo % -ofloanswrittenoff=# de préstamos anuló -Amountofloanswrittenoff=La cantidad de préstamos anuló -TotalSavings=Ahorros totales -VoluntarySavings=Ahorros voluntarios -MandatorySavings=Ahorros obligatorios -AginginArrearsbyWeek=El envejecimiento atrasado por Semana -ofLoans=# de Préstamos -PrincipalOutstanding=Director Sobresaliente -Total=Suma -AginginArrearsbyDays=El envejecimiento atrasado por Días -Name=Nombre -Clients=Clientes -PrincipalOutstanding=Director Sobresaliente -CenterSavings=Centro Ahorros -ArrearsAmount=Atrasos Cantidad -PARratio=IGUALDAD relación -VersionAt=La versión 1,3 -SummaryofCenters(Groups)Managed=Resumen de los Centros (Grupos) administrado -Current=Ahora -1\ Week\ in\ Arrears=1 semana en los atrasos -2\ Weeks\ in\ Arrears=2 semanas en los atrasos -3\ Weeks\ in\ Arrears=3 semanas en los atrasos -4\ Weeks\ in\ Arrears=4 semanas en los atrasos -5\ Weeks\ in\ Arrears=5 semanas en los atrasos -6\ Weeks\ in\ Arrears=6 semanas en los atrasos -7\ Weeks\ in\ Arrears=7 semanas en los atrasos -8\ Weeks\ in\ Arrears=8 semanas en los atrasos -9\ Weeks\ in\ Arrears=9 semanas en los atrasos -10\ Weeks\ in\ Arrears=10 semanas en los atrasos -11\ Weeks\ in\ Arrears=11 semanas en los atrasos -12\ Weeks\ in\ Arrears=12 semanas en los atrasos -12+\ Weeks\ in\ Arrears=12+ semanas en los atrasos -0\ to\ 30\ Days\ in\ Arrears=0 a 30 días de atraso -30\ to\ 60\ Days\ in\ Arrears=30 a 60 días de atraso -60\ to\ 90\ Days\ in\ Arrears=60 a 90 días de atraso -90\ to\ 180\ Days\ in\ Arrears=90 a 180 días de atraso ->\ 180\ Days\ in\ Arrears=> 180 días de atraso diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_fr.properties deleted file mode 100644 index fe491129c..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerDetailed_fr.properties +++ /dev/null @@ -1,71 +0,0 @@ -LoanOfficerDetailed=L'Officier d'emprunt A Détaillé -LoanOfficer\:=prêter l'officier: -Office\:=Bureau: -Gender\:=Genre: -GovernmentID\:=Identification du gouvernement: -From\:=De: -To\:=À: -On\:=Sur: -PrintedBy\:=Imprimé par: -Page=Page -GroupFormation=Formation de groupe -ofClientsadded(ToDate)=# des Clients supplémentaires (jusqu'ici) -ofClientsadded(ThisPeriod)=# des Clients s'est ajouté (cette période) -ofgroupsadded(ToDate)=# des Groupes s'est ajouté (jusqu'ici) -ofgroupsadded(ThisPeriod)=# des Groupes s'est ajouté (cette période) -ofdropoutclients(ToDate)=# des Clients de renvoi (jusqu'ici) -ofdropoutclients(ThisPeriod)=# des Clients de renvoi (cette période) -KeyDates=Dates clés -JoinedMFI=Inscrit IFM -BecameLoanOfficer=Devenu agent de crédit -BranchMemberships=Adhésions Direction -LeftMFI=Gauche IFM -ClientSummary=Résumé de client -ofCenters=# de Centres -ofgroups=# de Groupes -ofClients=# de Clients -ofClientswithloans=# de Clients avec des prêts -ofClientswithsavings=# de Clients avec des économies -Dormantclients=Les clients inactifs (pas de prêts) -AccountSummary=Expliquer le Résumé -ofactiveloans=# d'emprunts actifs -PrincipalAmountOutstanding=Remarquable principal de Quantité -InterestAmountOutstanding=Intéresser Remarquable de Quantité -PortfolioatRisk%=Le portefeuille au Risque % -ofloanswrittenoff=d'emprunts a annulé -Amountofloanswrittenoff=La quantité d'emprunts a annulé -TotalSavings=Economies totales -VoluntarySavings=Economies volontaires -MandatorySavings=Economies obligatoires -AginginArrearsbyWeek=Le vieillissement dans Arriéré par la Semaine -ofLoans=# d'Emprunts -PrincipalOutstanding=Le directeur Remarquable -Total=Total -AginginArrearsbyDays=Le vieillissement dans Arriéré par les Jours -Name=Nom -Clients=Clients -PrincipalOutstanding=Directeur Remarquable -CenterSavings=Centre Economies -ArrearsAmount=Arriéré Quantité -PARratio=PAIR rapport -VersionAt=La version 1,3 -SummaryofCenters(Groups)Managed=Le résumé de Centres (les Groupes) A Géré -Current=Actuelle -1\ Week\ in\ Arrears=1 semaine en arriéré -2\ Weeks\ in\ Arrears=2 semaines d'arriérés -3\ Weeks\ in\ Arrears=3 semaines d'arriérés -4\ Weeks\ in\ Arrears=4 semaines d'arriérés -5\ Weeks\ in\ Arrears=5 semaines d'arriérés -6\ Weeks\ in\ Arrears=6 semaines d'arriérés -7\ Weeks\ in\ Arrears=7 semaines d'arriérés -8\ Weeks\ in\ Arrears=8 semaines d'arriérés -9\ Weeks\ in\ Arrears=9 semaines d'arriérés -10\ Weeks\ in\ Arrears=10 semaines d'arriérés -11\ Weeks\ in\ Arrears=11 semaines d'arriérés -12\ Weeks\ in\ Arrears=12 semaines d'arriérés -12+\ Weeks\ in\ Arrears=12+ semaines d'arriérés -0\ to\ 30\ Days\ in\ Arrears=0 à 30 jours d'arriérés -30\ to\ 60\ Days\ in\ Arrears=30 à 60 jours d'arriérés -60\ to\ 90\ Days\ in\ Arrears=60 à 90 jours d'arriérés -90\ to\ 180\ Days\ in\ Arrears=90 à 180 jours d'arriérés ->\ 180\ Days\ in\ Arrears=> 180 jours d'arriérés diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative.properties deleted file mode 100644 index 6ecfd516a..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative.properties +++ /dev/null @@ -1,26 +0,0 @@ -LoanOfficerPerformanceSummaryCumulative=Loan Officer Performance Summary (Cumulative) -Branch\:=Office: -On\:=On: -DuringPeriod=During Period -Asof=As of -Name=Name -Datejoined=Date Joined -ofcenters=# of Centers -ofgroups=# of Groups -ofclients=# of Clients -women=% Women -ofloans=# of Loans -Portfolio=Loan Amount -OutstandingPrincipal=Principal Outstanding -OutstandingInterest=Interest Outstanding -PrincipalOverdue=Principal Overdue -CurrentPAR=Current PAR -TotalSavings=Total Savings -TotalAsofdate=Total As of Date -GrandTotalAsofdate=Grand Total As of Date -VersionAt=Version 1.3 -From\:=From: -To\:=To: -Page=Page -PrintedBy\:=Printed by: - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_es.properties deleted file mode 100644 index b2ecf6593..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_es.properties +++ /dev/null @@ -1,26 +0,0 @@ -LoanOfficerPerformanceSummaryCumulative=Preste a Oficial de Resumen de Desempeño (Acumulativos) -Branch:\=Oficina: -On\:=En: -DuringPeriod=Durante Período -Asof=Al -Name=Nombre -Datejoined=La fecha unió -ofcenters=# de centros -ofgroups=# de grupos -ofclients=# de clientes -women=% mujeres -ofloans=# de préstamos -Portfolio=Cartera -OutstandingPrincipal=Sobresaliente director -OutstandingInterest=Sobresaliente interés -PrincipalOverdue=Director atrasado -CurrentPAR=Actual IGUALDAD -TotalSavings=Totales Ahorros -TotalAsofdate=La Suma total Al fecha -GrandTotalAsofdate=La Suma total Al fecha -VersionAt=La versión 1,3 -From\:=De: -To\:=A: -Page=Página -PrintedBy\:=Impreso: - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_fr.properties deleted file mode 100644 index fda784e25..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryCumulative_fr.properties +++ /dev/null @@ -1,26 +0,0 @@ -LoanOfficerPerformanceSummaryCumulative=Prêter de Résumé d'exécution d'Officier (Cumulatifs) -Branch\:=bureau: -On\:=Sur: -DuringPeriod=Pendant la Période -Asof=Depuis -Name=Nom -Datejoined=La date a joint -ofcenters=# de centres -ofgroups=# de groupes -ofclients=# de clients -women=% femmes -ofloans=# d'emprunts -Portfolio=Portefeuille -OutstandingPrincipal=Remarquable directeur -OutstandingInterest=Remarquable intérêt -PrincipalOverdue=Directeur eu retard -CurrentPAR=Actuel PAIR -TotalSavings=Totale economies -TotalAsofdate=Le Total depuis Date -GrandTotalAsofdate=Le Total depuis Date -VersionAt=La version 1,3 -From\:=De: -To\:=À: -Page=Page -PrintedBy\:=Imprimé par: - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod.properties deleted file mode 100644 index abb07cca2..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod.properties +++ /dev/null @@ -1,22 +0,0 @@ -LoanOfficerPerformanceSummaryDuringPeriod=Loan Officer Performance Summary (During Period) -Branch\:=Office: -On\:=On: -Name=Name -Datejoined=Date Joined -VersionAt=Version 1.3 -PrintedBy\:=Printed by: -Page=Page -From\:=From: -To\:=To: -TotalGroupsFormed=Total Groups Formed -TotalLoansDisbursed=Total Loans Disbursed -TotalAmtOfLoansDisbursed=Total amt of Loans Disbursed -TotalAmtOfLoansRepaid=Total amt of Loans Repaid -TotalNewSavingsAccounts=Total # new Savings Accounts -TotalClientsRecruited=Total Clients Recruited -TotalAmtSavingsDeposits=Total amt Savings Deposits -TotalAmtSavingsWithdrawals=Total amt Savings Withdrawals -ofDropouts=# of Dropouts -TotalDuringPeriod=Total During Period -GrandTotalDuringPeriod=Grand Total During Period - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_es.properties deleted file mode 100644 index 1a6b2b24b..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_es.properties +++ /dev/null @@ -1,22 +0,0 @@ -LoanOfficerPerformanceSummaryDuringPeriod=Preste a Oficial de Resumen de Desempeño (Durante Período) -Branch:\=Oficina: -On\:=En: -Name=Nombre -Datejoined=La fecha unió -TotalGroupsFormed=Totales grupos formaron -TotalLoansDisbursed=Totales préstamos desembolsado -TotalAmtOfLoansDisbursed=El cantidad total de préstamos desembolsó -TotalAmtOfLoansRepaid=El cantidad total de préstamos devolvieron -TotalNewSavingsAccounts=Totalice nuevo ahorros cuentas -TotalClientsRecruited=Totales clientes alistaron -TotalAmtSavingsDeposits=Cantidad total ahorros depósitos -TotalAmtSavingsWithdrawals=Ahorros de cantidad total retiradas -ofDropouts=# de abandonos -TotalDuringPeriod=La Suma total Durante el Período -GrandTotalDuringPeriod=La Suma total Durante el Período -VersionAt=La versión 1,3 -From\:=De: -To\:=A: -Page=Página -PrintedBy\:=Impreso: - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_fr.properties deleted file mode 100644 index f71878b5b..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loanOfficerPerformanceSummaryDuringPeriod_fr.properties +++ /dev/null @@ -1,22 +0,0 @@ -LoanOfficerPerformanceSummaryDuringPeriod=Prêter de Résumé d'exécution d'Officier (Pendant la Période) -Branch\:=Bureau: -On\:=Sur: -Name=Nom -Datejoined=La date a joint -TotalGroupsFormed=Totaux groupes formé -TotalLoansDisbursed=Emprunts totaux déboursé -TotalAmtOfLoansDisbursed=La quantité totale de emprunts a déboursé -TotalAmtOfLoansRepaid=La quantité totale de emprunts a remboursé -TotalNewSavingsAccounts=Totaliser nouveau économies comptes -TotalClientsRecruited=Totaux clients recruté -TotalAmtSavingsDeposits=Quantité totale économies dépôts -TotalAmtSavingsWithdrawals=Les économies totales de quantité retraits -ofDropouts=# de Marginaux -TotalDuringPeriod=Le Total Pendant la Période -GrandTotalDuringPeriod=Le Total Pendant la Période -VersionAt=La version 1,3 -From\:=De: -To\:=À: -Page=Page -PrintedBy\:=Imprimé par: - diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansPendingApproval.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansPendingApproval.properties deleted file mode 100644 index ba8c93292..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansPendingApproval.properties +++ /dev/null @@ -1,20 +0,0 @@ -LoansPendingApproval=Loans Pending Approval -AsOf\:=As Of: -Office\:=Office: -Office=Office -LoanOfficer\:=Loan Officer: -Product\:=Product: -AccountId=Account ID -ClientName=Client name -GroupName=Group name -CenterName=Center name -ProductName=Product name -LoanOfficer=Loan Officer -LoanAmount=Loan Amount -TimeInExistingStatus(days)=Days Pending -LastEditedBy=Last edited by -PrintedBy\:=Printed by: -Page=Page -On\:=On: -VersionAt=Version 1.3 -Total=Total diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansToBeDisbursed.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansToBeDisbursed.properties deleted file mode 100644 index be3337fd0..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/loansToBeDisbursed.properties +++ /dev/null @@ -1,20 +0,0 @@ -LoansToBeDisbursed=Loans To Be Disbursed -AsOf\:=As Of: -Office\:=Office: -Office=Office -LoanOfficer\:=Loan Officer: -Product\:=Product: -AccountId=Account ID -ClientName=Client name -GroupName=Group name -CenterName=Center name -ProductName=Product name -LoanOfficer=Loan Officer -LoanAmount=Loan Amount -TimeInExistingStatus(days)=Days awaiting disbursal -LastEditedBy=Last edited by -PrintedBy\:=Printed by: -Page=Page -On\:=On: -VersionAt=Version 1.3 -Total=Total diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress.properties deleted file mode 100644 index d431bf85a..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress.properties +++ /dev/null @@ -1,72 +0,0 @@ -Office\:=Office: -Period1\:=Period 1: -Period2\:=Period 2: -On\:=On: -OUTREACH=OUTREACH -%Change=% Change -PORTFOLIO=PORTFOLIO -PAR=PAR -Numberofactiveloans=Number of Active Loans -TotalActiveLoans=Total # Active Loans -DisbursalAmount=Disbursal Amount -TotalDisbursalAmount=Total Disbursal Amount -ActiveLoansOutstanding=Active Loans Outstanding -TotalOutstandingAmount=Total Outstanding Amount -Numberofsavingsaccounts=Number of Savings Accounts -TotalSavingsAccounts=Total Savings Accounts -TotalDeposits=Total Deposits -TotalSavingsDeposits=Total Savings Deposits -INCOME=INCOME -Total=Total -AGINGANALYSIS=AGING ANALYSIS -ArrearsAmount=Arrears Amount -PARratio=PAR Ratio -AGINGTABLE=AGING TABLE -ofloans=# of Loans -Outstanding=Outstanding -PERFORMANCERATIOS=PERFORMANCE RATIOS -Activeborrowersperloanofficer=Active Borrowers per Loan Officer -Netloanportfolioperloanofficer=Net Loan Portfolio per Loan Officer -Averageportfolioperactiveborrower=Average Portfolio per Active Borrower -Activeclientsperbranch=Active Clients per Branch -Averageclientspercenter=Average Clients per Center -Averageclientsperloanofficer=Average Clients per Loan Officer -Averageclientsperbranch=Average Clients per Branch -Averageloanoutstanding=Average Loan Outstanding -Averageprincipaloutstanding=Average Principal Outstanding -Averageinterestoutstanding=Average Interest Outstanding -Averageloansize=Average Loan Size -MFIProgress=MFI Progress -VersionAt=Version 1.3 -Page=Page -PrintedBy\:=Printed by: -Jan=Jan -Feb=Feb -Mar=Mar -Apr=Apr -May=May -Jun=Jun -Jul=Jul -Aug=Aug -Sep=Sep -Oct=Oct -Nov=Nov -Dec=Dec -1\ Week\ in\ Arrears=1 Week in Arrears -2\ Weeks\ in\ Arrears=2 Weeks in Arrears -3\ Weeks\ in\ Arrears=3 Weeks in Arrears -4\ Weeks\ in\ Arrears=4 Weeks in Arrears -5\ Weeks\ in\ Arrears=5 Weeks in Arrears -6\ Weeks\ in\ Arrears=6 Weeks in Arrears -7\ Weeks\ in\ Arrears=7 Weeks in Arrears -8\ Weeks\ in\ Arrears=8 Weeks in Arrears -9\ Weeks\ in\ Arrears=9 Weeks in Arrears -10\ Weeks\ in\ Arrears=10 Weeks in Arrears -11\ Weeks\ in\ Arrears=11 Weeks in Arrears -12\ Weeks\ in\ Arrears=12 Weeks in Arrears -12+\ Weeks\ in\ Arrears=12+ Weeks in Arrears -0\ to\ 30\ Days\ in\ Arrears=0 to 30 Days in Arrears -30\ to\ 60\ Days\ in\ Arrears=30 to 60 Days in Arrears -60\ to\ 90\ Days\ in\ Arrears=60 to 90 Days in Arrears -90\ to\ 180\ Days\ in\ Arrears=90 to 180 Days in Arrears ->\ 180\ Days\ in\ Arrears=> 180 Days in Arrears diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_es.properties deleted file mode 100644 index ad55232fd..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_es.properties +++ /dev/null @@ -1,72 +0,0 @@ -Office\:=Oficina: -Period1\:=El período 1: -Period2\:=El período 2: -On\:=En: -OUTREACH=ALCANCE -%Change=% Cambio -PORTFOLIO=CARTERA -Numberofactiveloans=El número de préstamos activos -TotalActiveLoans=Total # los Préstamos Activos -DisbursalAmount=Desembolso Importe -TotalDisbursalAmount=Cantidad total de Desembolso -ActiveLoansOutstanding=Activo Saldo de créditos -PAR=IGUALDAD -TotalOutstandingAmount=Cantidad Sobresaliente total -Numberofsavingsaccounts=El número de cuentas de ahorros -TotalSavingsAccounts=Cuentas de ahorros totales -TotalDeposits=Depósitos totales -TotalSavingsDeposits=Los Ahorros totales Depositan -NCOME=INGRESOS -Total=Suma -AGINGANALYSIS=El ENVEJECIMIENTO el ANALISIS -ArrearsAmount=Atrasos Cantidad -PARratio=IGUALDAD relación -AGINGTABLE=El ENVEJECIMIENTO MESA -ofloans=# de préstamos -Outstanding=Sobresaliente -PERFORMANCERATIOS=PROPORCIONES de DESEMPEÑO -Activeborrowersperloanofficer=Los prestatarios activos por presta a oficial -Netloanportfolioperloanofficer=La cartera neta del préstamo por presta a oficial -Averageportfolioperactiveborrower=La cartera media por prestatario activo -Activeclientsperbranch=Los clientes activos por rama -Averageclientspercenter=Los clientes medios por el centro -Averageclientsperloanofficer=Los clientes medios por presta a oficial -Averageclientsperbranch=Los clientes medios por rama -Averageloanoutstanding=El promedio presta sobresaliente -Averageprincipaloutstanding=Director medio sobresaliente -Averageinterestoutstanding=El promedio interesa sobresaliente -Averageloansize=Tamaño medio de préstamo -MFIProgress=Sobre el progreso de MFI -VersionAt=Versión1.3 -Page=Página -PrintedBy\:=Impreso: -Jan=Ene -Feb=Feb -Mar=Mar -Apr=Abr -Mai=May -Jun=Jun -Jul=Jul -Aug=Ago -Sep=Sep -Oct=Oct -Nov=Nov -Dec=Dic -1\ Week\ in\ Arrears=1 semana en los atrasos -2\ Weeks\ in\ Arrears=2 semanas en los atrasos -3\ Weeks\ in\ Arrears=3 semanas en los atrasos -4\ Weeks\ in\ Arrears=4 semanas en los atrasos -5\ Weeks\ in\ Arrears=5 semanas en los atrasos -6\ Weeks\ in\ Arrears=6 semanas en los atrasos -7\ Weeks\ in\ Arrears=7 semanas en los atrasos -8\ Weeks\ in\ Arrears=8 semanas en los atrasos -9\ Weeks\ in\ Arrears=9 semanas en los atrasos -10\ Weeks\ in\ Arrears=10 semanas en los atrasos -11\ Weeks\ in\ Arrears=11 semanas en los atrasos -12\ Weeks\ in\ Arrears=12 semanas en los atrasos -12+\ Weeks\ in\ Arrears=12+ semanas en los atrasos -0\ to\ 30\ Days\ in\ Arrears=0 a 30 días de atraso -30\ to\ 60\ Days\ in\ Arrears=30 a 60 días de atraso -60\ to\ 90\ Days\ in\ Arrears=60 a 90 días de atraso -90\ to\ 180\ Days\ in\ Arrears=90 a 180 días de atraso ->\ 180\ Days\ in\ Arrears=> 180 días de atraso diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_fr.properties deleted file mode 100644 index b323d2766..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mfiProgress_fr.properties +++ /dev/null @@ -1,72 +0,0 @@ -Office\:=Bureau: -Period1\:=La période 1: -Period2\:=La période 2: -On\:=Sur: -OUTREACH=ASSISTANCE -%Change=% Changement -PORTFOLIO=PORTEFEUILLE -Numberofactiveloans=Le nombre d'emprunts actifs -TotalActiveLoans=Total # les Emprunts Actifs -DisbursalAmount=Montant Décaissement -TotalDisbursalAmount=La Quantité totale de Disbursal -ActiveLoansOutstanding=Prêts en cours en suspens -PAR=PAIR -TotalOutstandingAmount=La Quantité Remarquable totale -Numberofsavingsaccounts=Le nombre d'économies explique -TotalSavingsAccounts=Les Economies totales Expliquent -TotalDeposits=Dépôts totaux -TotalSavingsDeposits=Les Economies totales Déposent -INCOME=REVENU -Total=Total -AGINGANALYSIS=ANALYSE DE VIEILLISSEMENT -ArrearsAmount=Arriéré Quantité -PARratio=PAIR rapport -AGINGTABLE=TABLE DE VIEILLISSEMENT -ofloans=# d'emprunts -Outstanding=Remarquable -PERFORMANCERATIOS=PROPORTIONS D'EXECUTION -Activeborrowersperloanofficer=Les emprunteurs actifs par prête l'officier -Netloanportfolioperloanofficer=Le portefeuille net d'emprunt par prête l'officier -Averageportfolioperactiveborrower=Le portefeuille moyen par l'emprunteur actif -Activeclientsperbranch=Les clients actifs par la branche -Averageclientspercenter=Les clients moyens par le centre -Averageclientsperloanofficer=Les clients moyens par prête l'officier -Averageclientsperbranch=Les clients moyens par la branche -Averageloanoutstanding=La moyenne prête remarquable -Averageprincipaloutstanding=Le directeur moyen remarquable -Averageinterestoutstanding=La moyenne s'intéresse remarquable -Averageloansize=La taille moyenne d'emprunt -MFIProgress=MFI d'avancement -VersionAt=La version 1,3 -Page=Page -PrintedBy\:=Imprimé par: -Jan=Jan -Feb=Fév -Mar=Mar -Apr=Avr -Mai=Mai -Jun=Jun -Jul=Jul -Aug=Aoû -Sep=Sep -Oct=Oct -Nov=Nov -Dec=Déc -1\ Week\ in\ Arrears=1 semaine en arriéré -2\ Weeks\ in\ Arrears=2 semaines d'arriérés -3\ Weeks\ in\ Arrears=3 semaines d'arriérés -4\ Weeks\ in\ Arrears=4 semaines d'arriérés -5\ Weeks\ in\ Arrears=5 semaines d'arriérés -6\ Weeks\ in\ Arrears=6 semaines d'arriérés -7\ Weeks\ in\ Arrears=7 semaines d'arriérés -8\ Weeks\ in\ Arrears=8 semaines d'arriérés -9\ Weeks\ in\ Arrears=9 semaines d'arriérés -10\ Weeks\ in\ Arrears=10 semaines d'arriérés -11\ Weeks\ in\ Arrears=11 semaines d'arriérés -12\ Weeks\ in\ Arrears=12 semaines d'arriérés -12+\ Weeks\ in\ Arrears=12+ semaines d'arriérés -0\ to\ 30\ Days\ in\ Arrears=0 à 30 jours d'arriérés -30\ to\ 60\ Days\ in\ Arrears=30 à 60 jours d'arriérés -60\ to\ 90\ Days\ in\ Arrears=60 à 90 jours d'arriérés -90\ to\ 180\ Days\ in\ Arrears=90 à 180 jours d'arriérés ->\ 180\ Days\ in\ Arrears=> 180 jours d'arriérés diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions.properties deleted file mode 100644 index aa6e82b04..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions.properties +++ /dev/null @@ -1,25 +0,0 @@ -MifosTransactions-Detail=Mifos Transactions - Detail -MifosTransactions-Summary=Mifos Transactions - Summary -Branch\:=Branch: -TransactionID=Transaction ID -ReceiptNo=Receipt No. -ClientPhoneNo=Client Phone No. -GroupName=Group Name -NationalID=National ID -AccountID=Account ID -ClientName=Client Name -TransactionType=Transaction Type -Receipts=Receipts -Disbursements=Disbursements -MifosUser=Mifos User -ActionDate=Action Date -CreatedDate=Created Date -Adjusted=Adjusted -NoDataAvailable=No Data Available -TotalTransactions=Total Transactions = -TotalReceipts=Total Receipts = -TotalDisbursements=Total Disbursements = -ReportDate=Report Date -PrintedBy\:=Printed by: -MFIName\:=MFI Name: -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_es.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_es.properties deleted file mode 100644 index 82cbbcf60..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_es.properties +++ /dev/null @@ -1,25 +0,0 @@ -MifosTransactions-Detail=Mifos Transactions - Detail -MifosTransactions-Summary=Mifos Transactions - Summary -Branch\:=Branch: -TransactionID=Transaction ID -ReceiptNo=Receipt No. -ClientPhoneNo=Client Phone No. -GroupName=Group Name -NationalID=National ID -AccountID=Account ID -ClientName=Client Name -TransactionType=Transaction Type -Receipts=Receipts -Disbursements=Disbursements -MifosUser=Mifos User -ActionDate=Action Date -CreatedDate=Created Date -Adjusted=Adjusted -NoDataAvailable=No Data Available -TotalTransactions=Total Transactions = -TotalReceipts=Total Receipts = -TotalDisbursements=Total Disbursements = -ReportDate=Report Date -PrintedBy\:=Printed by: -MFIName\:=MFI Name: -VersionAt=Versión1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_fr.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_fr.properties deleted file mode 100644 index f4e923d58..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/mifosTransactions_fr.properties +++ /dev/null @@ -1,25 +0,0 @@ -MifosTransactions-Detail=Mifos Transactions - Detail -MifosTransactions-Summary=Mifos Transactions - Summary -Branch\:=Branch: -TransactionID=Transaction ID -ReceiptNo=Receipt No. -ClientPhoneNo=Client Phone No. -GroupName=Group Name -NationalID=National ID -AccountID=Account ID -ClientName=Client Name -TransactionType=Transaction Type -Receipts=Receipts -Disbursements=Disbursements -MifosUser=Mifos User -ActionDate=Action Date -CreatedDate=Created Date -Adjusted=Adjusted -NoDataAvailable=No Data Available -TotalTransactions=Total Transactions = -TotalReceipts=Total Receipts = -TotalDisbursements=Total Disbursements = -ReportDate=Report Date -PrintedBy\:=Printed by: -MFIName\:=MFI Name: -VersionAt=Versión1,3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/outreachSummaryBranch.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/outreachSummaryBranch.properties deleted file mode 100644 index 7874bbdd9..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/outreachSummaryBranch.properties +++ /dev/null @@ -1,14 +0,0 @@ -OutreachSummaryBranch=Outreach Summary by Branch -Branch=Branch -Centers=Centers -Groups=Groups -ActiveClients=Active Clients -ActiveBorrowers=Active Borrowers -ActiveDepositors=Active Depositors -Dropouts=Dropouts -NoOfLoanOfficers=No. of Loan Officers -Total=Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 diff --git a/mifosng-provider/src/main/resources/org/mifos/bi/reports/overdueMatureLoans.properties b/mifosng-provider/src/main/resources/org/mifos/bi/reports/overdueMatureLoans.properties deleted file mode 100644 index c5b994372..000000000 --- a/mifosng-provider/src/main/resources/org/mifos/bi/reports/overdueMatureLoans.properties +++ /dev/null @@ -1,34 +0,0 @@ -OverdueMatureLoans=Overdue Mature Loans -Office\:=Office: -LoanOfficer\:=Loan Officer: -SystemId=System Id -LoanId=Loan Id -overdueMatureLoans\:=Show Only Mature Loans: -GroupName=Group Name -MemberName=Client Name -DisbursedAmount=Disbursed Amount -InterestRate=Interest Rate -DisbursalDate=Disbursal Date -PrincipalRepaid=Principal Repaid -InterestRepaid=Interest Repaid -PrincipalOutstanding=Principal Outstanding -InterestOutstanding=Interest Outstanding -LoanOfficer=Loan Officer -Total=Total -SubTotal=Sub Total -GrandTotal=Grand Total -PrintedBy\:=Printed by: -On\:=On: -Page=Page -VersionAt=Version 1.3 -LastPaidDate=Last Paid Date -PrincipalOverdue=Principal Overdue -InterestOverdue=Interest Overdue -%PrincipalOverdue=Principal Overdue(%) -PurposeOfLoan=Purpose Of Loan -Center\:=Center: -CenterSubTotal=Center Total: -LoanOfficerSubTotal=Loan Officer Total: -BranchTotal=Branch Total: -NoDataAvailable=No Data Available -OfficeLoanOfficerCenter\:=Office, Loan Officer, Center: