- To display side panel [As jdk 1.6 not support string in switch, Used if else conditions in code]

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196511 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DataModelComponent.java

@@ -76,9 +76,9 @@ public class DataModelComponent extends E12DataModelComponent
 			else
 			{
 
-				switch (dataModelName)
+				//switch (dataModelName)
+				if ( dataModelName.equalsIgnoreCase("account") )
 				{
-				case "account":
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT  acct.ACCT_CODE, acct.DESCR, acct.SH_DESCR, acct.DET_DESCR, acct.ACCT_TYPE, acct.ACTIVE, acct.TYP_BAL, acct.CURR_CODE, \n" +
 							"acct.FORMAT_CODE, acct.LEDG_POST, acct.SUNDRY_TYPE,\n" +
 							"ACCTGRP.GROUP_CODE as GRP_CODE, ACCTGRP.DESCR as GRP_CODE_DESCR, acct.SGROUP_CODE, ACCTSGRP.DESCR as SUB_GRP_CODE_DESCR\n" +
@@ -86,42 +86,42 @@ public class DataModelComponent extends E12DataModelComponent
 							"INNER JOIN ACCTSGRP ON acct.SGROUP_CODE = ACCTSGRP.SGROUP_CODE\n" +
 							"INNER JOIN ACCTGRP ON ACCTGRP.GROUP_CODE = ACCTSGRP.GROUP_CODE\n" +
 							"where acct.ACCT_CODE = '"+fieldValue+"'" :  "SELECT * FROM ACCOUNTS";
-					break;
-
-				case "cost-center":
+				}
+				else if ( dataModelName.equalsIgnoreCase("cost-center") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM COSTCTR WHERE CCTR_CODE = '"+fieldValue+"'" :  "SELECT * FROM COSTCTR";
-					break;
-
-				case "site":
+				}
+				else if ( dataModelName.equalsIgnoreCase("site") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT SITE.*,SITEREGNO.REG_NO,(SELECT DESCR FROM GENCODES WHERE FLD_NAME = 'SITE_TYPE' and FLD_VALUE = SITE.SITE_TYPE) as SITE_TYPE_DESCR FROM SITE INNER JOIN SITEREGNO \n" +
 							"ON SITE.SITE_CODE=SITEREGNO.SITE_CODE AND SITE.SITE_CODE ='"+fieldValue+"'" :  "SELECT * FROM SITE";
-					break;
-
-				case "credit-term":
+				}
+				else if ( dataModelName.equalsIgnoreCase("credit-term") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM CRTERM WHERE CR_TERM= '"+fieldValue+"'" :  "SELECT * FROM CRTERM";
-					break;
-
-				case "speciality":
+				}
+				else if ( dataModelName.equalsIgnoreCase("speciality") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM SPECIALITY WHERE SPL_CODE= '"+fieldValue+"'" :  "SELECT * FROM SPECIALITY";
-					break;
-
-				case "strg-customer":
+				}
+				else if ( dataModelName.equalsIgnoreCase("strg-customer") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT sc_code, UPPER(FIRST_NAME)||' '||UPPER(LAST_NAME) AS SC_NAME, addr1, addr2, addr3, email_addr, mobile_no\n" +
 							" FROM STRG_CUSTOMER where SC_CODE= '"+fieldValue+"'" :  "SELECT * FROM STRG_CUSTOMER";
-					break;
-
-				case "employee":
+				}
+				else if ( dataModelName.equalsIgnoreCase("employee") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT EMP_CODE, UPPER(EMP_FNAME)||' '||UPPER(EMP_LNAME) AS EMP_NAME, DESIGNATION, DEPT_CODE, "
 							+ "REPORT_TO, CUR_ADD1, CUR_ADD2, CUR_ADD3, CUR_CITY, CUR_STATE, CUR_PIN FROM EMPLOYEE where EMP_CODE= '"+fieldValue+"'" :  "SELECT * FROM EMPLOYEE";
-					break;
-
-				case "grade":
+				}
+				else if ( dataModelName.equalsIgnoreCase("grade") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM GRADE WHERE GRADE_CODE= '"+fieldValue+"'" :  "SELECT * FROM GRADE";
-					break;
-
-				case "item-series":
+				}
+				else if ( dataModelName.equalsIgnoreCase("item-series") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT ITEM_SER, descr, SH_DESCR, SITE_CODE,LOC_CODE, UNIT FROM ITEMSER WHERE ITEM_SER = '"+fieldValue+"'" :  "SELECT * FROM ITEMSER";
-					break;
+				}
 
 					//By Sainath T. on 13/12/2018 [To add columns in supplier details]-START
 					/*case "supplier":
@@ -129,7 +129,8 @@ public class DataModelComponent extends E12DataModelComponent
 								                                " FROM SUPPLIER WHERE SUPP_CODE='"+fieldValue+"'" :  "SELECT * FROM SUPPLIER";
 						break;*/
 					//Changed by Amey W on 28/01/2019 [To display PAN_NO in side panel] START
-				case "supplier":
+				else if ( dataModelName.equalsIgnoreCase("supplier") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT S.SUPP_CODE,S.SUPP_NAME,S.SUPP_TYPE,S.FULL_NAME,S.SH_NAME,S.GROUP_CODE,S.ADDR1, S.ADDR2, S.ADDR3,S.CITY,S.PIN, \n " +
 							"S.EMAIL_ADDR,S.TELE1,S.TELE2,S.TELE3, \n"+
 							"S.STATE_CODE,STAT.DESCR AS STATE_DECR,S.COUNT_CODE,C.DESCR COUNTRY_DESCR,S.STAN_CODE, \n"+
@@ -139,7 +140,7 @@ public class DataModelComponent extends E12DataModelComponent
 							"where STAT.STATE_CODE = S.STATE_CODE and C.COUNT_CODE = S.COUNT_CODE \n"+
 							"and ST.STAN_CODE = S.STAN_CODE and CRD.CR_TERM = S.CR_TERM and D.DLV_TERM = S.DLV_TERM \n"+
 							"and S.SUPP_CODE='"+fieldValue+"'" :  "SELECT * FROM SUPPLIER";
-					break;
+				}
 
 					/*	case "customer":
 						finalQuery = (!"".equals(fieldValue)) ? "SELECT S.CUST_CODE,S.CUST_NAME,S.CUST_TYPE,S.FULL_NAME,S.SH_NAME,S.GROUP_CODE,S.ADDR1, S.ADDR2, S.ADDR3,S.CITY,S.PIN, \n " +
@@ -154,24 +155,25 @@ public class DataModelComponent extends E12DataModelComponent
 						break;*/
 					//Changed by Amey W on 28/01/2019 [To display PAN_NO in side panel] END
 					//By Sainath T. on 13/12/2018 [To add columns in supplier details]-END
-				case "taxclass":
+				else if ( dataModelName.equalsIgnoreCase("taxclass") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM TAXCLASS WHERE TAX_CLASS = '"+fieldValue+"'" :  "SELECT * FROM TAXCLASS";
-					break;
-
-				case "taxchap":
+				}
+				else if ( dataModelName.equalsIgnoreCase("taxchap") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM TAXCHAP WHERE TAX_CHAP = '"+fieldValue+"'" :  "SELECT * FROM TAXCHAP";
-					break;
-
-				case "taxenv":
+				}
+				else if ( dataModelName.equalsIgnoreCase("taxenv") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM TAXENV WHERE TAX_ENV = '"+fieldValue+"'" :  "SELECT * FROM TAXENV";
-					break;
-
-				case "finentity":
+				}
+				else if ( dataModelName.equalsIgnoreCase("finentity") )
+				{
 					finalQuery = (!"".equals(fieldValue)) ? "SELECT * FROM FINENT WHERE FIN_ENTITY = '"+fieldValue+"'" :  "SELECT * FROM FINENT";
-					break;
-
-				default:
-					break;
+				}
+				else
+				{
+					BaseLogger.log("3", null, null,"dataModelName["+dataModelName+"] Doesn't match !");
 				}
 
 				if( !"".equalsIgnoreCase(finalQuery) )