From 997fd4d3e23c80d6445481306d770a7cd031e7a1 Mon Sep 17 00:00:00 2001
From: ashok-conflux <ashok@confluxtechnologies.com>
Date: Wed, 5 Jun 2013 14:57:37 +0530
Subject: [PATCH] MIFOSX-416 : display loan type for loan in Client's general
 details

---
 .../client/data/ClientAccountSummaryData.java   | 17 +++++++++++++++++
 .../service/ClientReadPlatformServiceImpl.java  |  6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientAccountSummaryData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientAccountSummaryData.java
index 6bf022033..944473f03 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientAccountSummaryData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientAccountSummaryData.java
@@ -5,6 +5,7 @@
  */
 package org.mifosplatform.portfolio.client.data;
 
+import org.mifosplatform.infrastructure.core.data.EnumOptionData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanStatusEnumData;
 
 /**
@@ -25,6 +26,8 @@ public class ClientAccountSummaryData {
 
     private final Integer accountStatusId;
     private final LoanStatusEnumData status;
+    @SuppressWarnings("unused")
+	private final EnumOptionData loanType;
 
     public ClientAccountSummaryData(final Long id, final String externalId, final Long productId, final String loanProductName,
             final Integer loanStatusId) {
@@ -35,6 +38,7 @@ public class ClientAccountSummaryData {
         this.productName = loanProductName;
         this.accountStatusId = loanStatusId;
         this.status = null;
+        this.loanType = null;
     }
 
     public ClientAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
@@ -46,6 +50,19 @@ public class ClientAccountSummaryData {
         this.productName = loanProductName;
         this.accountStatusId = null;
         this.status = loanStatus;
+        this.loanType = null;
+    }
+    
+    public ClientAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
+            final String loanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType) {
+        this.id = id;
+        this.accountNo = accountNo;
+        this.externalId = externalId;
+        this.productId = productId;
+        this.productName = loanProductName;
+        this.accountStatusId = null;
+        this.status = loanStatus;
+        this.loanType = loanType;
     }
 
     public Integer accountStatusId() {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
index a0f139038..72f1851e9 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
@@ -476,7 +476,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
         public String loanAccountSummarySchema() {
 
             StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,");
-            accountsSummary.append("l.product_id as productId, lp.name as productName,").append("l.loan_status_id as statusId ")
+            accountsSummary.append("l.product_id as productId, lp.name as productName,").append("l.loan_status_id as statusId, l.loan_type_enum as loanType ")
                     .append("from m_loan l ").append("LEFT JOIN m_product_loan AS lp ON lp.id = l.product_id ");
 
             return accountsSummary.toString();
@@ -492,8 +492,10 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
             final String loanProductName = rs.getString("productName");
             final Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId");
             final LoanStatusEnumData loanStatus = LoanEnumerations.status(loanStatusId);
+            final Integer loanTypeId = JdbcSupport.getInteger(rs, "loanType");
+            final EnumOptionData loanType = LoanEnumerations.loanType(loanTypeId);
 
-            return new ClientAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus);
+            return new ClientAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus, loanType);
         }
     }