Revision 13:053ef68134de

View differences:

WebContent/WEB-INF/config/ss102_user_admin/form-beans.xml
50 50
			<form-property name="searchCreationDateFrom" type="java.lang.String" />
51 51
			<form-property name="searchCreationDateTo" type="java.lang.String" />
52 52
			<form-property name="isSearch" type="java.lang.Boolean" />
53
			<form-property name="searchMobileNo" type="java.lang.String" />
54
			<form-property name="searchUserApplication" type="java.lang.String" />
55
			<form-property name="searchUserAuthMode" type="java.lang.String" />
53 56

  
54 57
			<!-- Admin Users -->
55 58
			<form-property name="userDob" type="java.lang.String" />
WebContent/WEB-INF/config/ss102_user_admin/view-beans.xml
35 35
			<form-property name="searchLinkName" type="java.lang.String" />
36 36
			<form-property name="paginationList" type="java.util.List" />
37 37
			<form-property name="userCreationDate" type="java.lang.String" />
38
			<form-property name="userLastLoginDate" type="java.lang.String" />	
38
			<form-property name="userLastLoginDate" type="java.lang.String" />
39
			
40
			<form-property name="applicationMap" type="java.util.Map" />
41
			<form-property name="authModeMap" type="java.util.Map" />
42
			
43
			<form-property name="allUserMap" type="java.util.Map" />
44
			<form-property name="userApplicationKey" type="java.lang.String" />
45
			<form-property name="userApplication" type="java.lang.String" />
46
			<form-property name="userAuthMode" type="java.lang.String" />	
39 47
		</form-bean>
40 48

  
41 49
		<form-bean name="ibssUserDetailBean" type="org.apache.struts.action.DynaActionForm">
......
147 155
			<form-property name="navAccesses" type="java.lang.Long[]" />
148 156
	 	 	<form-property name="userAccessRole" type="java.lang.String"/>
149 157
			<form-property name="detailsList" type="java.util.List" />
158
			
159
			<form-property name="userApplicationKey" type="java.lang.String" />
160
			<form-property name="userApplication" type="java.lang.String" />
161
			<form-property name="userAuthMode" type="java.lang.String" />	
150 162
		</form-bean>
151 163

  
152 164
		<form-bean name="ibssUserBean" type="org.apache.struts.action.DynaActionForm">
WebContent/WEB-INF/config/ss112_user/validation.xml
10 10
			<field property="searchUserName" depends="alphaNumericSpace">
11 11
				<arg0 key="user.customer.name" />
12 12
			</field>
13
			<field property="searchAccessNo" depends="numeric">
14
				<arg0 key="user.access.no" />
15
			</field>
16
			<field property="searchTacPhone" depends="numeric">
17
				<arg0 key="user.tac.no" />
13
			<field property="searchMobileNo" depends="numeric">
14
				<arg0 key="user.mobile.no" />
18 15
			</field>
19 16
			<field property="searchCreationDateFrom" depends="date, numericSlash">
20 17
				<arg0 key="user.search.creation.from.date" />
WebContent/jsp/ss112_user/ibssRetailUserEnquiry.jsp
10 10
<bean:define id="viewBean" name="ibssUserForm" property="ibssUserViewBean" />
11 11
<bean:define id="pagination" name="viewBean" property="pagination" />
12 12

  
13
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/></strong></h3>
14

  
13 15
<table id="errorTable">
14 16
<tr>
15 17
	<td>
......
24 26
	<jsp:include flush="true" page="/jsp/ss112_user/ibssRetailUserEnquiryPagination.jsp"></jsp:include>
25 27
</c:if>
26 28

  
27
<beanEL:size collection="${viewBean.map.userBeanList}" id="userListSize"/>
29
<beanEL:size collection="${viewBean.map.allUserMap}" id="userListSize"/>
28 30

  
29 31
<c:choose>
30 32
	<c:when test="${userListSize > 0}">
......
35 37
      <th><bean:message key="user.alias"/></th>
36 38
      <th><bean:message key="user.customer.name"/></th>
37 39
      <th><bean:message key="user.status"/></th>
38
      <th><bean:message key="user.updated.date"/></th>
40
      <th><bean:message key="user.application"/></th>
41
      <th><bean:message key="user.authentication.mode"/></th>
42
      <th><bean:message key="user.creation.date"/></th>
39 43
     </tr>
40 44
    </thead>
41 45
    	<tbody>
42 46
    <c:set var="styleClass" value="alt" />
43
		<logicEL:iterate id="userBean" name="viewBean" property="userBeanList" indexId="i">
47
		<logicEL:iterate id="userMap" name="viewBean" property="allUserMap" indexId="i">
48
		<c:set var="userBean" value="${userMap.value}"></c:set>
44 49
		<c:choose>
45 50
			<c:when test="${(i mod 2) eq 0}">
46 51
				<c:set var="styleClass" value="alt"></c:set>
......
49 54
				<c:set var="styleClass" value="even"></c:set>
50 55
			</c:otherwise>
51 56
		</c:choose>
52
		<bean:define id="indexNo" name="userBean" property="indexNo" />
57
		<c:set var="indexNo" value="${userMap.key}"></c:set>
53 58
		<tr class="<c:out value='${styleClass}'/>">
54 59

  
55
		<bean:define id="userID" name="userBean" property="userID" />
56
		<bean:define id="userAlias" name="userBean" property="userAlias" />
57
		<bean:define id="userName" name="userBean" property="userName" />
58
		<bean:define id="userStatus" name="userBean" property="userStatus" />
59
		<bean:define id="updatedDate" name="userBean" property="updatedDate" />
60
		<bean:define id="userStatusKey" name="userBean" property="userStatusKey" />
60
		<bean:define id="indexNo" name="userMap" property="key" />
61
		
61 62
<%
62 63
			HashMap paramsName = new HashMap();
63
			paramsName.put("userID", userID);
64
			paramsName.put("userName", userName);
65
			paramsName.put("userAlias", userAlias);
66
			paramsName.put("userStatus", userStatus);
67
			paramsName.put("updatedDate", updatedDate);		
68
			paramsName.put("userStatusKey", userStatusKey);
64
			paramsName.put("indexNo", indexNo);
69 65
			paramsName.put("SECONDARY_TOKEN", request.getSession().getAttribute("PRIMARY_TOKEN"));
70 66
			
71 67
			pageContext.setAttribute("paramsName", paramsName);
......
96 92
			</td>
97 93
			<td>
98 94
				<c:choose>
99
		    		<c:when test="${not empty userBean.map.updatedDate}">
100
		    			<c:out value="${userBean.map.updatedDate}"></c:out>
95
		    		<c:when test="${not empty userBean.map.userApplication}">
96
		    			<c:out value="${userBean.map.userApplication}"></c:out>
97
		    		</c:when>
98
		    		<c:otherwise>-</c:otherwise>
99
		    	</c:choose>
100
			</td>
101
			<td>
102
				<c:choose>
103
		    		<c:when test="${not empty userBean.map.userAuthMode}">
104
		    			<c:out value="${userBean.map.userAuthMode}"></c:out>
105
		    		</c:when>
106
		    		<c:otherwise>-</c:otherwise>
107
		    	</c:choose>
108
			</td>
109
			<td>
110
				<c:choose>
111
		    		<c:when test="${not empty userBean.map.userCreationDate}">
112
		    			<c:out value="${userBean.map.userCreationDate}"></c:out>
101 113
		    		</c:when>
102 114
		    		<c:otherwise>-</c:otherwise>
103 115
		    	</c:choose>
WebContent/jsp/ss112_user/ibssRetailUserSearch.jsp
17 17
		<tr><td height="30" colspan="4">&nbsp;</td></tr>
18 18
		<tr>
19 19
			<td>&nbsp;</td>
20
			<td><bean:message key="user.alias"/>&nbsp;:</td>
20
			<td><bean:message key="user.id"/>&nbsp;:</td>
21 21
			<td><htmlEL:text name="ibssUserForm" property="searchUserAlias" maxlength="64" size="22"/></td>
22 22
		</tr>
23 23
		<tr>
24 24
			<td>&nbsp;</td>
25
			<td><bean:message key="user.customer.name"/>&nbsp;:</td>
25
			<td><bean:message key="user.name"/>&nbsp;:</td>
26 26
			<td><htmlEL:text name="ibssUserForm" property="searchUserName" maxlength="64" size="22"/>&nbsp;&nbsp;</td>
27 27
		</tr>
28 28
		<tr>
29 29
			<td>&nbsp;</td>
30
			<td><bean:message key="user.access.no"/>&nbsp;:</td>
31
			<td><htmlEL:text name="ibssUserForm" property="searchAccessNo" maxlength="20" size="22"/>&nbsp;&nbsp;</td>
32
		</tr>
33
		<tr>
34
			<td>&nbsp;</td>
35
			<td><bean:message key="user.tac.no"/>&nbsp;:</td>
36
			<td><htmlEL:text name="ibssUserForm" property="searchTacPhone" maxlength="20" size="22"/>&nbsp;&nbsp;<bean:message key="mobile.no.example"/></td>
37
		</tr>
38
		<tr>
39
			<td>&nbsp;</td>
40
			<td><bean:message key="user.group"/>&nbsp;:</td>
41
			<td>
42
				<htmlEL:select name="ibssUserForm" property="searchUserGroup">
43
				<htmlEL:option value=""><bean:message key="general.select.option0"/></htmlEL:option>
44
				<logicEL:iterate id="group" name="viewBean" property="userGroupMap">
45
					<bean:define id="key" name="group" property="key"/>
46
					<bean:define id="value" name="group" property="value"/>
47
					<htmlEL:option value="${key}"><c:out value="${value}"/></htmlEL:option>
48
				</logicEL:iterate>
49
				</htmlEL:select>
50
			</td>
30
			<td><bean:message key="user.mobile.no"/>&nbsp;:</td>
31
			<td><htmlEL:text name="ibssUserForm" property="searchMobileNo" maxlength="20" size="22"/>&nbsp;&nbsp;</td>
51 32
		</tr>
52 33
		<tr>
53 34
			<td>&nbsp;</td>
......
65 46
		</tr>
66 47
		<tr>
67 48
			<td>&nbsp;</td>
68
			<td><bean:message key="user.search.user.type"/>&nbsp;:</td>
49
			<td><bean:message key="user.application"/>&nbsp;:</td>
69 50
			<td>
70
				<htmlEL:select name="ibssUserForm" property="searchUserType">
51
				<htmlEL:select name="ibssUserForm" property="searchUserApplication">
71 52
				<htmlEL:option value=""><bean:message key="general.select.option0"/></htmlEL:option>
72
				<logicEL:iterate id="type" name="viewBean" property="userTypeMap">
73
					<bean:define id="key" name="type" property="key"/>
74
					<bean:define id="value" name="type" property="value"/>
53
				<logicEL:iterate id="app" name="viewBean" property="applicationMap">
54
					<bean:define id="key" name="app" property="key"/>
55
					<bean:define id="value" name="app" property="value"/>
75 56
					<htmlEL:option value="${key}"><c:out value="${value}"/></htmlEL:option>
76 57
				</logicEL:iterate>
77 58
				</htmlEL:select>
......
79 60
		</tr>
80 61
		<tr>
81 62
			<td>&nbsp;</td>
63
			<td><bean:message key="user.authentication.mode"/>&nbsp;:</td>
64
			<td>
65
				<htmlEL:select name="ibssUserForm" property="searchUserAuthMode">
66
				<htmlEL:option value=""><bean:message key="general.select.option0"/></htmlEL:option>
67
				<logicEL:iterate id="auth" name="viewBean" property="authModeMap">
68
					<bean:define id="key" name="auth" property="key"/>
69
					<bean:define id="value" name="auth" property="value"/>
70
					<htmlEL:option value="${key}"><c:out value="${value}"/></htmlEL:option>
71
				</logicEL:iterate>
72
				</htmlEL:select>
73
			</td>
74
		</tr>
75
		
76
		<tr>
77
			<td>&nbsp;</td>
82 78
			<td><bean:message key="user.search.creation.from.date"/>&nbsp;:</td>
83 79
			<td><htmlEL:text name="ibssUserForm" property="searchCreationDateFrom" readonly="true" styleId="datepicker1" maxlength="10" size="22" style="background-color : #EBE9E9;" />&nbsp;&nbsp;</td>
84 80
		</tr>
resource/com/ib/hibernate/configuration/hibernate.cfg.xml
13 13
		
14 14
		<property name="connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
15 15
		<property name="connection.url">jdbc:oracle:thin:@121.121.18.49:1521:IBSDEMO</property>
16
		<property name="connection.username">M2U_UPASS</property>
17
		<property name="connection.password">dev123</property>
16
		<property name="connection.username">M2U_UPASS_CI</property>
17
		<property name="connection.password">ci123</property>
18 18
		<property name="dialect">org.hibernate.dialect.OracleDialect</property>
19 19
						
20 20
		<!-- Use the C3P0 connection pool provider -->
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
786 786
user.no.of.ft.employee=No of Full-Time Employee
787 787
user.client.type=Client Type
788 788
user.mobile.no.flag=Mobile No Flag
789
user.application=Application
790
user.authentication.mode=Authentication Mode
789 791

  
790 792
#102
791 793
error.pending.admin.name.already.exist=User name already exist in pending list
resource/com/ib/ibss/resources/message/IBSSBusinessOptionsResources.properties
23 23
bib.user.pending.status.option.value=0;1
24 24
bib.user.pending.status.option.display=No;Yes
25 25

  
26
user.status.option.value=0;1;2;3;4;5
27
user.status.option.display=Normal;Locked;Unlocked;TAC Locked;TAC Unlocked;New
26
user.status.option.value=0;1;2;3;4
27
user.status.option.display=Active;Locked;Inactive;Disabled;New
28 28

  
29 29
admin.user.status.option.value=0;1;2;5;7;8;9
30 30
admin.user.status.option.display=Normal;Locked;Unlocked;New;Dormant;Suspend;Activate
......
161 161
# Upass Maintenance
162 162
upass.application.option.value=1;2;3
163 163
upass.application.option.display=IBAM;RIB;BIB
164

  
165
authentication.mode.option.value=0;1
166
authentication.mode.option.display=Static Password;Token (Secure Pass)
167

  
168
application.client.option.value=1;2;3;4;5
169
application.client.option.display=M2U Retail Internet Banking;Maybank Online Stock;Maybank Online Ticketing;Maybank CCPP;M2U Singapore Integration
src/com/ib/ibss/common/constant/BusinessOptions.java
37 37
	public static final String BANK_ACCOUNT_TYPE		= "bank.account.type.option";
38 38
	public static final String FD_DISPOSITION_OPT		= "fd.interest.disposition.option";
39 39
	public static final String UPASS_OPTION				= "upass.application.option";
40
	public static final String AUTHENTICATION_MODE		= "authentication.mode.option";
41
	public static final String APPLICATION_CLIENT		= "application.client.option";
42
	
40 43
}
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryDetailsAction.java
65 65
		noErrorHandling (p_oRequest, p_oMapping);
66 66
		
67 67
		IBSSDynaBean m_oIBDynaBean 	= IBSSDynaBeanManager.createIBSSDynaBean (p_oForm, p_oMapping);
68
		IBSSDynaBean m_oViewBean 	= (IBSSDynaBean) m_oIBDynaBean.get(IBSSUserConstants.IBSS_USER_VIEW);
68
//		IBSSDynaBean m_oViewBean 	= (IBSSDynaBean) m_oIBDynaBean.get(IBSSUserConstants.IBSS_USER_VIEW);
69 69
		
70 70
		try
71 71
		{	
72 72
			checkToken (p_oRequest, p_oMapping, false);
73 73
			checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
74 74
			
75
			String m_sUID = p_oRequest.getParameter(IBSSUserConstants.USER_ID);
76
			m_oViewBean.set(IBSSUserConstants.USER_ID, m_sUID);
77
			m_oIBDynaBean.set(IBSSUserConstants.IBSS_USER_VIEW, m_oViewBean);
75
			String index = p_oRequest.getParameter(IBSSUserConstants.USER_VBEAN_INDEXNO);
76
//			m_oViewBean.set(IBSSUserConstants.USER_ID, m_sUID);
77
//			m_oIBDynaBean.set(IBSSUserConstants.IBSS_USER_VIEW, m_oViewBean);
78 78
			
79 79
			IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
80 80
			IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
......
82 82
			
83 83
			IBSSRetailUserEnquiryDetailsServices m_oServices = new IBSSRetailUserEnquiryDetailsServices(m_oSessionObjects);
84 84
			m_oServices.setIBSSDynaBean (m_oIBDynaBean);
85
			m_oServices.execute ();
85
			m_oServices.execute (index);
86 86
		}
87 87
		catch (IBSSGenericException e)
88 88
		{
src/com/ib/ibss/enterprise/services/ss102_user_admin/constants/IBSSUserConstants.java
135 135
			
136 136
	public static final String USER_VBEAN_INDEXNO 					= "indexNo";
137 137
	public static final String USER_VBEAN_USERLIST 					= "userBeanList";
138
	public static final String ALL_USER_MAP		 					= "allUserMap";
138 139
	public static final String USER_VBEAN_USERMAP 					= "userMap";
139 140
	public static final String USER_VBEAN_DEL_INDEX 				= "delIndex";
140 141
	public static final String USER_VBEAN_SELECTED_DEL_LIST 		= "userSelectedDelList";
141 142
	public static final String USER_VBEAN_SELECTED_DEL_INDICATOR 	= "deletedInd";
142 143
	public static final String USER_VBEAN_DELETED_USER 				= "deletedUser";
143 144
	
145
	public static final String APPLICATION_MAP 						= "applicationMap";
146
	public static final String AUTH_MODE_MAP 						= "authModeMap";
147
	
148
	public static final String USER_APPLICATION_KEY					= "userApplicationKey";
149
	public static final String USER_APPLICATION						= "userApplication";
150
	public static final String USER_AUTH_MODE						= "userAuthMode";
151
	
144 152
	// Property of ibssUserChangePassForm
145 153
	public static final String OLD_PASS 							= "userOldPassword";
146 154
	public static final String NEW_PASS 							= "userNewPassword";
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
16 16
import java.util.HashMap;
17 17
import java.util.Map;
18 18

  
19
import my.com.upass.pojo.ClientApp;
19 20
import net.penril.ibss.core.hibernate.IbCustProfile;
20 21

  
22
import com.ib.enterprise.services.common.BeanToBeanTransferUtils;
21 23
import com.ib.ibss.common.constant.BusinessOptions;
22 24
import com.ib.ibss.common.constant.IBSSCommonConstants;
23 25
import com.ib.ibss.common.utils.DataValidator;
......
63 65
	}
64 66

  
65 67
	@SuppressWarnings("unchecked")
66
	public void execute () throws IBSSGenericException
68
	public void execute (String index) throws IBSSGenericException
67 69
	{		
68 70
		IBSSLogger.debug (c_oClass, "Entering execute");
69 71
		
......
71 73
		IbCustProfile m_oUser;
72 74
		IBSSDynaBean m_oUserViewbean;
73 75
		IBSSDynaBean m_oDetailBean;
76
		IBSSDynaBean m_oUserBean;
77
		
74 78
		Map<String, String> m_mStatusMap 	= new HashMap<String, String> ();
75 79
		Map<String, String> m_mGenderMap 	= new HashMap<String, String> ();
76 80
		SimpleDateFormat m_oDateFormatter 	= new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
......
81 85
		Map<String, String> m_oIncomeRangeMap = new HashMap<String, String>();
82 86
		Map<String, String> m_oEducationLevelMap = new HashMap<String, String>();
83 87
		Map<String, String> m_oOccupationRangeMap = new HashMap<String, String>();
88
		
89
		Map<String, IBSSDynaBean> userMap 	= new HashMap<String, IBSSDynaBean> ();
90
		
84 91
		try
85 92
		{
86 93
			
......
94 101
			m_mAgeRangeMap  	= ResourcesUtils.getBusinessOptionsResourceKey ("user.age.range.option");
95 102
			m_mMaritalMap  		= ResourcesUtils.getBusinessOptionsResourceKey ("user.marital.status.option");
96 103
			m_mUserGroupMap 	= (Map<Long, String>) m_oUserViewbean.get (IBSSUserConstants.USER_GROUP_MAP);
97
			String m_sUserID	= (String) m_oUserViewbean.get (IBSSUserConstants.USER_ID);
98
			m_oUser 			= getUserProfileDAO ().getProfileByID (Long.valueOf (m_sUserID));
104
			
99 105
			m_mMobileNoFlagMap	= ResourcesUtils.getBusinessOptionsResourceKey ("user.mobile.no.flag.option");
100
			String m_sDOB		 = "";
101 106
			
102
			if(m_oUser != null)
107
			userMap 			= (Map<String, IBSSDynaBean>) m_oUserViewbean.get(IBSSUserConstants.ALL_USER_MAP);
108
			
109
			m_oUserBean 		= userMap.get(index);
110
			
111
			if(m_oUserBean != null)
103 112
			{
104
				if(!DataValidator.isEmptyString (m_oUser.getUserDobBrd ()))
105
				{
106
					m_sDOB = m_oUser.getUserDobBrd ();
107
					SimpleDateFormat m_oDf = new SimpleDateFormat("yyyyMMdd");
108
					
109
					try
110
					{
111
						Date m_oDob = m_oDf.parse (m_sDOB);
112
						m_sDOB = m_oDOBFormatter.format (m_oDob);
113
				BeanToBeanTransferUtils.BeanToBeanDataTransfer(m_oUserBean, m_oDetailBean);
114
				
115
				int userType = Integer.valueOf((String) m_oUserBean.get(IBSSUserConstants.USER_APPLICATION_KEY));
116
				
117
				switch (userType){
118
					case 1:{//M2U Retail Internet Banking
119
						break;
113 120
					}
114
					catch(Exception e)
115
					{
116
						//Display nothing
121
					case 2:{//Maybank Online Stock
122
						break;
123
					}
124
					case 3:{//Maybank Online Ticketing
125
						break;
126
					}
127
					case 4:{//Maybank CCPP
128
						break;
129
					}
130
					case 5:{//M2U Singapore Integration
131
						break;
117 132
					}
118 133
				}
119 134
				
120
				m_oDetailBean.set (IBSSUserConstants.CREATION_DATE, m_oUser.getMainProfile ().getCreationDate () != null ? m_oDateFormatter.format (m_oUser.getMainProfile ().getCreationDate ()) : "");
121
				m_oDetailBean.set (IBSSUserConstants.LAST_LOGIN_DATE, m_oUser.getLastLoginDate () != null ? m_oDateFormatter.format (m_oUser.getLastLoginDate ()) : "");
122
				m_oDetailBean.set (IBSSUserConstants.UPDATED_BY, m_oUser.getUpdaterName ());
123
				m_oDetailBean.set (IBSSUserConstants.UPDATED_DATE, m_oUser.getUpdatedDate () != null ? m_oDateFormatter.format (m_oUser.getUpdatedDate ()) : "");
124
				m_oDetailBean.set (IBSSUserConstants.USER_EMAIL, m_oUser.getUserEmail ());
125
				m_oDetailBean.set (IBSSUserConstants.USER_ID, m_oUser.getUserId ());
126
				m_oDetailBean.set (IBSSUserConstants.USER_NAME, m_oUser.getUserName ());
127
//				m_oDetailBean.set (IBSSUserConstants.ROLE_ID, m_oUser.getIbRole ().getRoleId ());
128
				m_oDetailBean.set (IBSSUserConstants.USER_ALIAS, m_oUser.getMainProfile ().getUserAlias ());
129
				m_oDetailBean.set (IBSSUserConstants.GROUP_NAME, m_mUserGroupMap.get (m_oUser.getIbGroup ().getGroupId ()));
130
				m_oDetailBean.set (IBSSUserConstants.USER_GROUP, m_oUser.getIbGroup ().getGroupId ());
131
				m_oDetailBean.set (IBSSUserConstants.USER_STATE, m_mStatusMap.get (String.valueOf (m_oUser.getMainProfile ().getUserState ())));
132
				m_oDetailBean.set (IBSSUserConstants.USER_STATE_KEY, (Long)m_oUser.getMainProfile ().getUserState ());
133
				m_oDetailBean.set (IBSSUserConstants.ACCESS_NO, m_oUser.getUserAccessNo ());
134
				m_oDetailBean.set (IBSSUserConstants.ADDRESS1, DataValidator.isEmptyString (m_oUser.getUserAddr1 ()) ? "" : m_oUser.getUserAddr1 ());
135
				m_oDetailBean.set (IBSSUserConstants.ADDRESS2, DataValidator.isEmptyString (m_oUser.getUserAddr2 ()) ? "" : m_oUser.getUserAddr2 ());
136
				m_oDetailBean.set (IBSSUserConstants.ADDRESS3, DataValidator.isEmptyString (m_oUser.getUserAddr3 ()) ? "" : m_oUser.getUserAddr3 ());
137
				m_oDetailBean.set (IBSSUserConstants.ADDRESS4, DataValidator.isEmptyString (m_oUser.getUserAddr4 ()) ? "" : m_oUser.getUserAddr4 ());;
138
				m_oDetailBean.set (IBSSUserConstants.ADDRESS5, DataValidator.isEmptyString (m_oUser.getUserAddr5 ()) ? "" : m_oUser.getUserAddr5 ());
139
				m_oDetailBean.set (IBSSUserConstants.USER_DOB_BRD, m_sDOB);
140
				m_oDetailBean.set (IBSSUserConstants.USER_GENDER, m_mGenderMap.get (m_oUser.getUserGender ()));
141
				m_oDetailBean.set (IBSSUserConstants.USER_RACE, m_oUser.getUserRace ());
142
				m_oDetailBean.set (IBSSUserConstants.USER_HOME_PHONE, DataValidator.isEmptyString (m_oUser.getUserHomePhone ()) ? "" : m_oUser.getUserHomePhone ());
143
				m_oDetailBean.set (IBSSUserConstants.USER_MOBILE_NO, DataValidator.isEmptyString (m_oUser.getUserMobilePhone ()) ? "" : m_oUser.getUserMobilePhone ());
144
				m_oDetailBean.set (IBSSUserConstants.USER_OFFICE_NO, DataValidator.isEmptyString (m_oUser.getUserOfficePhone ()) ? "" : m_oUser.getUserOfficePhone ());
145
				m_oDetailBean.set (IBSSUserConstants.USER_TAC_PHONE, DataValidator.isEmptyString (m_oUser.getUserTacPhone ()) ? "" : m_oUser.getUserTacPhone ());
146
				m_oDetailBean.set (IBSSUserConstants.USER_TYPE, m_oUser.getUserType ());
147
				//m_oDetailBean.set (IBSSUserConstants.IMAGE_LINK, m_oUser.getImageLink ());
148
				//m_oDetailBean.set (IBSSUserConstants.IMAGE_TEXT, m_oUser.getImageText ());
149
				m_oDetailBean.set (IBSSUserConstants.USER_CITY, m_oUser.getUserCity ());
150
				m_oDetailBean.set (IBSSUserConstants.USER_ADDR_STATE, m_oUser.getUserState ());
151
				m_oDetailBean.set (IBSSUserConstants.USER_POSTCODE, m_oUser.getUserPostcode ());
152
				m_oDetailBean.set (IBSSUserConstants.USER_COUNTRY, m_oUser.getUserCountry ());
153
				m_oDetailBean.set (IBSSUserConstants.USER_AGE_RANGE, m_mAgeRangeMap.get (String.valueOf (m_oUser.getUserAgeRange ())));
154
				m_oDetailBean.set (IBSSUserConstants.USER_INCOME_RANGE, m_oIncomeRangeMap.get(String.valueOf(m_oUser.getUserIncomeRange ())));
155
				m_oDetailBean.set (IBSSUserConstants.USER_MARITAL_STATUS, m_mMaritalMap.get (String.valueOf (m_oUser.getUserMaritalStatus ())));
156
				m_oDetailBean.set (IBSSUserConstants.USER_EMPLOY_STATUS, m_oOccupationRangeMap.get(String.valueOf(m_oUser.getUserEmployStatus ())));
157
				m_oDetailBean.set (IBSSUserConstants.USER_EDUCATION_LEVEL, m_oEducationLevelMap.get(String.valueOf(m_oUser.getUserEducationLevel ())));
158
				
159
				m_oDetailBean.set (IBSSUserConstants.USER_ORGANIZATION, m_oUser.getIbOrganization ().getOrgName ());
160
				m_oDetailBean.set (IBSSUserConstants.USER_DISPLAY_NAME, m_oUser.getUserDisplayName ());
161
				m_oDetailBean.set (IBSSUserConstants.USER_INSIDER, m_oUser.getInsider ());
162
				m_oDetailBean.set (IBSSUserConstants.USER_INQUIRY_CODE, m_oUser.getInquiryCode ());
163
				m_oDetailBean.set (IBSSUserConstants.USER_MOTHER_MAIDEN_NAME, m_oUser.getMotherMaidenName ());
164
				m_oDetailBean.set (IBSSUserConstants.USER_NATIONALITY, m_oUser.getNationality ());
165
				m_oDetailBean.set (IBSSUserConstants.USER_BUMI, m_oUser.getBumi ());
166
				m_oDetailBean.set (IBSSUserConstants.USER_RESIDENCE, m_oUser.getResidence ());
167
				m_oDetailBean.set (IBSSUserConstants.USER_RELIGION_CODE, m_oUser.getReligionCode ());
168
				m_oDetailBean.set (IBSSUserConstants.USER_LANGUAGE, m_oUser.getLanguage ());			
169
				m_oDetailBean.set (IBSSUserConstants.USER_MARITAL_DATE, m_oUser.getMaritalDate () != null ? m_oDateFormatter.format (m_oUser.getMaritalDate ()) : "");			
170
				m_oDetailBean.set (IBSSUserConstants.USER_CUSTOMER_STATUS, m_oUser.getCustStatus ());
171
				m_oDetailBean.set (IBSSUserConstants.USER_CUSTOMER_STATUS_DATE, m_oUser.getCustStatusDate () != null? m_oDateFormatter.format (m_oUser.getCustStatusDate ()) : "");
172
				m_oDetailBean.set (IBSSUserConstants.USER_DECEASED, m_oUser.getDeceased ());
173
				m_oDetailBean.set (IBSSUserConstants.USER_DECEASED_DATE, m_oUser.getDeceasedDate () != null? m_oDateFormatter.format(m_oUser.getDeceasedDate ()):"");
174
				m_oDetailBean.set (IBSSUserConstants.USER_HOLD_MAIL_CODE, m_oUser.getHoldMailCode ());
175
				m_oDetailBean.set (IBSSUserConstants.USER_PROMO_MAIL_CODE, m_oUser.getPromoMailCode ());
176
				m_oDetailBean.set (IBSSUserConstants.USER_ADDRESS_SEQ, m_oUser.getAddressSeq ());
177
				m_oDetailBean.set (IBSSUserConstants.USER_START_RELATIONSHIP, m_oUser.getStartRelationship () != null? m_oDateFormatter.format (m_oUser.getStartRelationship ()): "");
178
				m_oDetailBean.set (IBSSUserConstants.USER_REVIEW_DATE, m_oUser.getReviewDate ()!= null? m_oDateFormatter.format(m_oUser.getReviewDate ()):"");
179
				m_oDetailBean.set (IBSSUserConstants.USER_RETENTION, m_oUser.getRetention ());
180
				m_oDetailBean.set (IBSSUserConstants.USER_CONSTITUTION, m_oUser.getConsitution ());
181
				m_oDetailBean.set (IBSSUserConstants.USER_PLACE_OF_BIRTH, m_oUser.getPlaceOfBirth ());
182
				m_oDetailBean.set (IBSSUserConstants.USER_CUSTOMER_SEGMENT_CODE, m_oUser.getCustSegmentCode ());			
183
				m_oDetailBean.set (IBSSUserConstants.USER_NO_OF_EMPLOYEE, String.valueOf (m_oUser.getNoOfEmp ()));
184
				m_oDetailBean.set (IBSSUserConstants.USER_HIGH_RISK, m_oUser.getHighRisk ());
185
				m_oDetailBean.set (IBSSUserConstants.USER_HIGH_RISK_CODE, m_oUser.getHighRiskCode ());
186
				m_oDetailBean.set (IBSSUserConstants.USER_STAFF_FLAG, m_oUser.getStaffFlag ());
187
				m_oDetailBean.set (IBSSUserConstants.USER_STAFF_ID_NO, m_oUser.getStaffIdNo ());
188
				m_oDetailBean.set (IBSSUserConstants.USER_DURATION_STAY_PRE_ADD, String.valueOf (m_oUser.getDurationStayPreAdd ()));
189
				m_oDetailBean.set (IBSSUserConstants.USER_HOUSE_OWNER_CODE, m_oUser.getHouseOwnerCode ());
190
				m_oDetailBean.set (IBSSUserConstants.USER_TYPE_DWELLING, m_oUser.getTypeDwelling ());
191
				m_oDetailBean.set (IBSSUserConstants.USER_NO_OF_DEPENDENTS, String.valueOf (m_oUser.getNoOfDependents ()));
192
				m_oDetailBean.set (IBSSUserConstants.USER_BUSS_PREMISE_CODE, m_oUser.getBussPremiseCode ());
193
				m_oDetailBean.set (IBSSUserConstants.USER_BUSS_TYPE, m_oUser.getBussinessType ());
194
				m_oDetailBean.set (IBSSUserConstants.USER_BUSS_OPERATION_HOUR, m_oUser.getBussOperHours ());
195
				m_oDetailBean.set (IBSSUserConstants.USER_ID_NO, m_oUser.getIdNo ());			
196
				m_oDetailBean.set (IBSSUserConstants.USER_ID_TYPE, m_oUser.getIdType ());
197
				m_oDetailBean.set (IBSSUserConstants.USER_SALUTATION, m_oUser.getSalutation ());
198
				m_oDetailBean.set (IBSSUserConstants.USER_OFFICE_CONTACT_NAME, m_oUser.getOfficeContactName ());
199
				m_oDetailBean.set (IBSSUserConstants.USER_FAX, m_oUser.getFax ());
200
				m_oDetailBean.set (IBSSUserConstants.USER_FAX_CONTACT_NAME, m_oUser.getFaxContactName ());			
201
				m_oDetailBean.set (IBSSUserConstants.USER_YEAR, String.valueOf (m_oUser.getYear ()));
202
				m_oDetailBean.set (IBSSUserConstants.USER_ANNUAL_TURNOVER, String.valueOf (m_oUser.getAnnualTurnover ()));
203
				m_oDetailBean.set (IBSSUserConstants.USER_SECTOR, m_oUser.getSector ());			
204
				m_oDetailBean.set (IBSSUserConstants.USER_NO_OF_FT_EMPLOYEE, String.valueOf (m_oUser.getNoFulltimeEmp ()));
205
				m_oDetailBean.set (IBSSUserConstants.USER_CLIENT_TYPE, m_oUser.getClientType ());
206
				m_oDetailBean.set (IBSSUserConstants.USER_MOBILE_NO_FLAG, m_mMobileNoFlagMap.get (m_oUser.getMobileNoFlag ()));		
207
				
208
				m_oDetailBean.set (IBSSUserConstants.CUSTOMER_PROFILE, m_oUser);
209 135
				
210 136
				getIBSSDynaBean ().set (IBSSUserConstants.IBSS_USER_DETAIL, m_oDetailBean);
211 137
				getIBSSDynaBean ().set (IBSSUserConstants.IBSS_USER_VIEW, m_oUserViewbean);
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryMainServices.java
13 13

  
14 14
import java.text.SimpleDateFormat;
15 15
import java.util.ArrayList;
16
import java.util.Date;
16 17
import java.util.HashMap;
17 18
import java.util.List;
18 19
import java.util.Map;
19 20

  
20 21
import javax.servlet.http.HttpServletRequest;
21 22

  
23
import my.com.upass.dao.UserDAO;
24
import my.com.upass.maybank.entities.IbccUser;
25
import my.com.upass.maybank.entities.Im2uUser;
26
import my.com.upass.maybank.entities.M2uUser;
27
import my.com.upass.maybank.entities.StockUser;
28
import my.com.upass.maybank.entities.TicketingUser;
29
import my.com.upass.maybank.entities.UserProfile;
30
import my.com.upass.pojo.MinimalUserBean;
22 31
import net.penril.ibss.core.hibernate.IbCustProfile;
23 32

  
24 33
import com.ib.common.utils.IBDateTime;
......
85 94
		
86 95
		IBSSDynaBean m_oUserGroupViewBean 		= null;
87 96
		IBSSDynaBean m_oUserGroupListViewBean 	= null;
88
		IbCustProfile m_oUser					= null;
97
		MinimalUserBean m_oUser					= null;
89 98
		List<IbCustProfile> m_oUsers			= null;
90 99
		List<IBSSDynaBean> m_lGroupList 		= new ArrayList<IBSSDynaBean> ();
100
		Map<String, IBSSDynaBean> m_mUserListMap 		= new HashMap<String, IBSSDynaBean> ();
91 101
		
92 102
		Map<String, String> m_mUStatusMap 				= new HashMap<String, String> ();
103
		Map<String, String> applicationMap 				= new HashMap<String, String> ();
104
		Map<String, String> authModeMap 				= new HashMap<String, String> ();
93 105
		Map<Long, String> m_mGroupMap					= null;
94 106
		
95 107
		SimpleDateFormat m_oDateFormat = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
......
107 119
				}
108 120
			}
109 121
			
122
			List<MinimalUserBean> userList = dummyList();
110 123
			
111 124
			int m_iIndexNo 	= 0;
112
			m_iUserListSize = noOfRecordsBasedOnCriteria();
125
			m_iUserListSize = userList.size();
113 126
			
114 127
			m_oPagination 	= new Pagination(m_iUserListSize, m_iUserEnquiryRowPerPage);
115 128
			
......
124 137
			m_iCurrentPageNo 	= m_oPagination.getCurrentPageNumber ();
125 138
			m_iTotalPageNo 		= m_oPagination.getTotalPageNumber ();
126 139
			
127
			m_oUsers = searchUserBasedOnCriteria(m_iCurrentPageNo, m_iUserEnquiryRowPerPage);
140
//			m_oUsers = searchUserBasedOnCriteria(m_iCurrentPageNo, m_iUserEnquiryRowPerPage);
128 141
			
129
			int noOfRecordInPage = m_oUsers.size();
142
			int noOfRecordInPage = userList.size()%m_iUserEnquiryRowPerPage;
130 143
			
131 144
			if(noOfRecordInPage < 10)
132 145
			{
......
136 149
			}
137 150
			
138 151
			m_mUStatusMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
152
			authModeMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.AUTHENTICATION_MODE);
153
			applicationMap	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.APPLICATION_CLIENT);
139 154
			m_mGroupMap		= getGroupDAO ().getAllGroupNameMap ();
140 155
			
141
			if (m_oUsers == null)
156
			if (userList == null)
142 157
			{
143 158
				getIBSSDynaBean().set(IBSSUserConstants.IBSS_USER_VIEW, m_oUserGroupViewBean);
144 159
				throw IBSSErrorHandler.createDelegationException(IBSSUserConstants.DELEGATION_NO_USERS);
145 160
			}
146 161
			else
147 162
			{
148
				
149
				
150 163
				for(int i = m_iStartIndex; i <= m_iEndIndex; i++)
151 164
				{
152
					m_oUser 					= m_oUsers.get (i);
165
					m_oUser 					= userList.get (i);
153 166
					m_oUserGroupListViewBean 	= IBSSDynaBeanManager.createIBSSDynaBean(IBSSUserConstants.IBSS_USER_VIEW, getIBSSDynaBean().getActionMapping());
154 167
					
155
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ID, String.valueOf (m_oUser.getUserId ()));
156
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_NAME, m_oUser.getUserName () == null ? "" : m_oUser.getUserName ());
157
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ALIAS, m_oUser.getMainProfile ().getUserAlias () == null ? "" : m_oUser.getMainProfile ().getUserAlias ());
158
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE_KEY, m_oUser.getMainProfile ().getUserState ());
159
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf (m_oUser.getMainProfile ().getUserState ())));
160
					m_oUserGroupListViewBean.set(IBSSUserConstants.UPDATED_DATE, m_oUser.getUpdatedDate () != null ? m_oDateFormat.format (m_oUser.getUpdatedDate ()) : "");
168
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ID, String.valueOf (m_oUser.getUserID()));
169
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_NAME, m_oUser.getUsername() == null ? "" : m_oUser.getUsername());
170
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ALIAS, m_oUser.getUserAlias() == null ? "" : m_oUser.getUserAlias());
171
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE_KEY, Long.valueOf(String.valueOf(m_oUser.getUstate())));
172
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf (m_oUser.getUstate())));
173
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION, applicationMap.get(String.valueOf (m_oUser.getUserType())));
174
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION_KEY, String.valueOf (m_oUser.getUserType()));
175
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_AUTH_MODE, authModeMap.get(""));
176
					m_oUserGroupListViewBean.set(IBSSUserConstants.CREATION_DATE, m_oUser.getUdateCreated() != null ? m_oDateFormat.format (m_oUser.getUdateCreated()) : "");
177
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_VBEAN_INDEXNO, String.valueOf(m_iIndexNo));
178
					
179
					m_mUserListMap.put(String.valueOf(m_iIndexNo), m_oUserGroupListViewBean);
161 180
					
162 181
					m_iIndexNo++;
163
					
164
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_VBEAN_INDEXNO, String.valueOf(m_iIndexNo-1));
165
					m_lGroupList.add(m_oUserGroupListViewBean);
166 182
				}
167 183
			}
168 184
			
169 185
			m_lPaginationList = m_oPagination.getFixedPagesNavigation();
170 186
			
171 187
			m_oUserGroupViewBean.set(IBSSUserConstants.PAGINATION_LIST, m_lPaginationList);
188
			m_oUserGroupViewBean.set(IBSSUserConstants.ALL_USER_MAP, m_mUserListMap);
172 189
			m_oUserGroupViewBean.set(IBSSUserConstants.USER_VBEAN_USERLIST, m_lGroupList);
173 190
			m_oUserGroupViewBean.set(IBSSUserConstants.ENQUIRY_SEGMENT, String.valueOf(m_iUserEnquirySegment));
174 191
			m_oUserGroupViewBean.set(IBSSUserConstants.PAGINATION, m_oPagination);
......
217 234
		return getUserProfileDAO ().noOfRecords (m_sUserAlias, m_sUserName, m_sUserGroup, 
218 235
				m_sUserState, m_sAccessNo, m_sUserType, m_sTacPhone, m_sCreateFr, m_sCreateTo);
219 236
	}
237
	
238
	private List<MinimalUserBean> dummyList() throws Exception{
239
		List<MinimalUserBean> returnList = new ArrayList<MinimalUserBean>();
240
		
241
		MinimalUserBean userBean = new MinimalUserBean();
242
		userBean.setUserID(1L);
243
		userBean.setUsername("user1");
244
		userBean.setUserType(1);
245
		userBean.setUstate(0);
246
		userBean.setUdateCreated(new Date());
247
		returnList.add(userBean);
248
		
249
		MinimalUserBean userBean2 = new MinimalUserBean();
250
		userBean2.setUserID(2L);
251
		userBean2.setUsername("user2");
252
		userBean2.setUserType(2);
253
		userBean2.setUstate(0);
254
		userBean2.setUdateCreated(new Date());
255
		returnList.add(userBean2);
256
		
257
		MinimalUserBean userBean3 = new MinimalUserBean();
258
		userBean3.setUserID(3L);
259
		userBean3.setUsername("user3");
260
		userBean3.setUserType(3);
261
		userBean3.setUstate(0);
262
		userBean3.setUdateCreated(new Date());
263
		returnList.add(userBean3);
264
		
265
		MinimalUserBean userBean4 = new MinimalUserBean();
266
		userBean4.setUserID(4L);
267
		userBean4.setUsername("user4");
268
		userBean4.setUserType(4);
269
		userBean4.setUstate(0);
270
		userBean4.setUdateCreated(new Date());
271
		returnList.add(userBean4);
272
		
273
		MinimalUserBean userBean5 = new MinimalUserBean();
274
		userBean5.setUserID(5L);
275
		userBean5.setUsername("user5");
276
		userBean5.setUserType(5);
277
		userBean5.setUstate(0);
278
		userBean5.setUdateCreated(new Date());
279
		returnList.add(userBean5);
280
		
281
		return returnList;
282
	}
220 283
}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserSearchServices.java
14 14
import java.util.HashMap;
15 15
import java.util.Iterator;
16 16
import java.util.LinkedHashMap;
17
import java.util.List;
17 18
import java.util.Map;
18 19

  
20
import my.com.upass.dao.MinimalDAOFactory;
21
import my.com.upass.dao.UserDAO;
22
import my.com.upass.pojo.ClientApp;
23
import my.com.upass.pojo.UserAppAccess;
24
import my.com.upass.services.AppAccessMgtService;
19 25
import net.penril.ibss.core.hibernate.AdminNavigationGroup;
20 26

  
21 27
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
......
50 56
		super(sessionObjects);
51 57
	}
52 58

  
59
	@SuppressWarnings("unchecked")
53 60
	public void createUserSearchScreen () throws IBSSGenericException
54 61
	{
55 62
		IBSSLogger.debug (c_oClass, "Entering createUserSearchScreen");
56 63
		
57 64
		IBSSDynaBean m_oViewBean 		= null;
58
		Map<Long, String> m_mGroupMap 			= new LinkedHashMap<Long, String>();
65
//		Map<Long, String> m_mGroupMap 			= new LinkedHashMap<Long, String>();
59 66
		Map<String, String> m_mUStatusMap 		= new HashMap<String, String> ();
60
		Map<String, String> m_mUserTypeMap 		= new HashMap<String, String> ();
61
		Map<String, String> m_mDisplayGroupMap 	= new LinkedHashMap<String, String> ();
62
		Long m_oGroupID;
67
		Map<String, String> applicationMap 		= new HashMap<String, String> ();
68
		Map<String, String> authModeMap 		= new HashMap<String, String> ();
69
//		Map<String, String> m_mUserTypeMap 		= new HashMap<String, String> ();
70
//		Map<String, String> m_mDisplayGroupMap 	= new LinkedHashMap<String, String> ();
71
//		Long m_oGroupID;
63 72
		
64 73
		try
65 74
		{
66 75
			m_oViewBean 	= IBSSDynaBeanManager.createIBSSDynaBean (IBSSUserConstants.IBSS_USER_VIEW, getIBSSDynaBean ().getActionMapping ());
67
			m_mGroupMap 	= getGroupDAO ().getAllGroupNameMap ();
76
//			m_mGroupMap 	= getGroupDAO ().getAllGroupNameMap ();
68 77
			m_mUStatusMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_STATUS);
69
			m_mUserTypeMap	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_TYPE);
70
				
71
			for(Iterator<Long> it = m_mGroupMap.keySet ().iterator (); it.hasNext ();)
72
			{
73
				m_oGroupID = it.next ();
74
				m_mDisplayGroupMap.put (String.valueOf (m_oGroupID), m_mGroupMap.get (m_oGroupID));
75
			}
78
			authModeMap 	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.AUTHENTICATION_MODE);
79
			applicationMap	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.APPLICATION_CLIENT);
76 80
			
77
			IBSSLogger.debug (c_oClass, "Group Map Drop Down: " + m_mDisplayGroupMap);
78
			
79
			m_oViewBean.set(IBSSUserConstants.USER_GROUP_MAP, m_mDisplayGroupMap);
81
//			m_mUserTypeMap	= ResourcesUtils.getBusinessOptionsResourceKey(BusinessOptions.USER_TYPE);
82
//				
83
//			for(Iterator<Long> it = m_mGroupMap.keySet ().iterator (); it.hasNext ();)
84
//			{
85
//				m_oGroupID = it.next ();
86
//				m_mDisplayGroupMap.put (String.valueOf (m_oGroupID), m_mGroupMap.get (m_oGroupID));
87
//			}
88
//			
89
//			IBSSLogger.debug (c_oClass, "Group Map Drop Down: " + m_mDisplayGroupMap);
90
//			
91
//			m_oViewBean.set(IBSSUserConstants.USER_GROUP_MAP, m_mDisplayGroupMap);
80 92
			m_oViewBean.set(IBSSUserConstants.USER_STATUS_MAP, m_mUStatusMap);
81
			m_oViewBean.set (IBSSUserConstants.USER_TYPE_MAP, m_mUserTypeMap);
93
			m_oViewBean.set(IBSSUserConstants.APPLICATION_MAP, applicationMap);
94
			m_oViewBean.set(IBSSUserConstants.AUTH_MODE_MAP, authModeMap);
95
//			m_oViewBean.set (IBSSUserConstants.USER_TYPE_MAP, m_mUserTypeMap);
82 96
			getIBSSDynaBean().set(IBSSUserConstants.IBSS_USER_VIEW, m_oViewBean);
83 97
			
84 98
			AdminNavigationGroup userEnquiryAccess = getIBSSessionObjects ().getUserAccess ().get (FunctionCodeEnum.RIB_USER_ENQUIRY.getAccessName ());
85
			if (userEnquiryAccess != null)
86
			{
87
				Boolean hasEnableChangeMobile = false;
88
				Boolean hasDisableChangeMobile = false;
89
				Boolean hasUnlock = false;
90
				Boolean hasActivate = false;
91
				
92
				if(userEnquiryAccess.isEditable ()){
93
					Long enableChangeMobile 	= RIBPermission.ENABLE_RIB_USER_CHANGE_MOBILE_NO.getActionId();
94
					Long disableChangeMobile 	= RIBPermission.DISABLE_RIB_USER_CHANGE_MOBILE_NO.getActionId();
95
					Long unlock 				= RIBPermission.UNLOCK_RIB_USER.getActionId();
96
					Long activate				= RIBPermission.ACTIVATE_RIB_USER.getActionId();
97
					
98
					SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(getIBSSessionObjects());
99
					hasEnableChangeMobile 	= access.checkUserAccess(enableChangeMobile);
100
					hasDisableChangeMobile 	= access.checkUserAccess(disableChangeMobile);
101
					hasUnlock 				= access.checkUserAccess(unlock);
102
					hasActivate 			= access.checkUserAccess(activate);
103
					
104
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ENABLE_CHANGE_MOBILE_ACCESS, hasEnableChangeMobile);
105
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_DISABLE_CHANGE_MOBILE_ACCESS, hasDisableChangeMobile);
106
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_UNLOCK_ACCESS, hasUnlock);
107
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ACTIVATE_ACCESS, hasActivate);
108
				} else {
109
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ENABLE_CHANGE_MOBILE_ACCESS, hasEnableChangeMobile);
110
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_DISABLE_CHANGE_MOBILE_ACCESS, hasDisableChangeMobile);
111
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_UNLOCK_ACCESS, hasUnlock);
112
					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ACTIVATE_ACCESS, hasActivate);
113
				}
114
			}
99
//			if (userEnquiryAccess != null)
100
//			{
101
//				Boolean hasEnableChangeMobile = false;
102
//				Boolean hasDisableChangeMobile = false;
103
//				Boolean hasUnlock = false;
104
//				Boolean hasActivate = false;
105
//				
106
//				if(userEnquiryAccess.isEditable ()){
107
//					Long enableChangeMobile 	= RIBPermission.ENABLE_RIB_USER_CHANGE_MOBILE_NO.getActionId();
108
//					Long disableChangeMobile 	= RIBPermission.DISABLE_RIB_USER_CHANGE_MOBILE_NO.getActionId();
109
//					Long unlock 				= RIBPermission.UNLOCK_RIB_USER.getActionId();
110
//					Long activate				= RIBPermission.ACTIVATE_RIB_USER.getActionId();
111
//					
112
//					SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(getIBSSessionObjects());
113
//					hasEnableChangeMobile 	= access.checkUserAccess(enableChangeMobile);
114
//					hasDisableChangeMobile 	= access.checkUserAccess(disableChangeMobile);
115
//					hasUnlock 				= access.checkUserAccess(unlock);
116
//					hasActivate 			= access.checkUserAccess(activate);
117
//					
118
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ENABLE_CHANGE_MOBILE_ACCESS, hasEnableChangeMobile);
119
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_DISABLE_CHANGE_MOBILE_ACCESS, hasDisableChangeMobile);
120
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_UNLOCK_ACCESS, hasUnlock);
121
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ACTIVATE_ACCESS, hasActivate);
122
//				} else {
123
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ENABLE_CHANGE_MOBILE_ACCESS, hasEnableChangeMobile);
124
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_DISABLE_CHANGE_MOBILE_ACCESS, hasDisableChangeMobile);
125
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_UNLOCK_ACCESS, hasUnlock);
126
//					getIBSSDynaBean ().set (IBSSUserConstants.HAS_RIB_ACTIVATE_ACCESS, hasActivate);
127
//				}
128
//			}
115 129
			
116 130
		}
117 131
		catch (Exception e)

Also available in: Unified diff