Revision 94:6a7a9055eabc

View differences:

WebContent/WEB-INF/config/ss102_user_admin/form-beans.xml
114 114
	 	 	
115 115
	 	 	<!--  new ss112 bean-->
116 116
	 	 	<form-property name="clientAppList" type="java.util.List" />
117
	 	 	<form-property name="selectedAppId" type="java.lang.Integer" />
117
	 	 	<form-property name="selectedAppId" type="java.lang.String" />
118 118
			<form-property name="selectedAppName" type="java.lang.String" />
119 119
			<form-property name="userAlias" type="java.lang.String" />
120 120
			<form-property name="m2uPan1" type="java.lang.String" />
......
129 129
			<form-property name="im2uWSIdentCode" type="java.lang.String" />
130 130
			<form-property name="im2uWSMySgId" type="java.lang.String" />
131 131
			<form-property name="im2uWSRegTimestamp" type="java.lang.String" />
132
			<form-property name="userProfile" type="java.lang.Object" />
133
			<form-property name="userApplicationKey" type="java.lang.String" />
134
			<form-property name="userApplication" type="java.lang.String" />
135
			<form-property name="userCreationDate" type="java.lang.String" />
132 136
			
133 137
		</form-bean>
134 138

  
WebContent/WEB-INF/config/ss112_user/validation.xml
189 189
			    <arg0 key="user.ws.registration.time.stamp"/>
190 190
			</field>
191 191
		</form>
192
		
193
		<form name="ss112RetailUserM2UEditResultValidation">
194
			<field depends="required" property="m2uPan1">
195
			    <arg0 key="user.pan.1"/>
196
			</field>
197
			<field depends="required" property="m2uPan2">
198
			    <arg0 key="user.pan.2"/>
199
			</field>
200
		</form>
201
		
202
		<form name="ss112RetailUserOnlineStockEditResultValidation">
203
			<field depends="required" property="onlineStockIdNo">
204
			    <arg0 key="user.id.no"/>
205
			</field>
206
		</form>
207
		
208
		<form name="ss112RetailUserTicketingEditResultValidation">
209
			<field depends="required" property="ticketingFullName">
210
			    <arg0 key="user.full.name"/>
211
			</field>
212
			<field depends="required" property="ticketingFirstName">
213
			    <arg0 key="user.first.name"/>
214
			</field>
215
			<field depends="required" property="ticketingLastName">
216
			    <arg0 key="user.last.name"/>
217
			</field>
218
			<field depends="required" property="ticketingPayeeCode">
219
			    <arg0 key="user.payee.code"/>
220
			</field>
221
		</form>
222
		
223
		<form name="ss112RetailUserCCPPEditResultValidation">
224
			<field depends="required" property="ccppPanCC">
225
			    <arg0 key="user.pan.cc"/>
226
			</field>
227
		</form>
228
		
229
		<form name="ss112RetailUserIM2UEditResultValidation">
230
			 <field depends="required" property="im2uWSIdentCode">
231
			    <arg0 key="user.id"/>
232
			</field>
233
			 <field depends="required" property="im2uWSMySgId">
234
			    <arg0 key="user.ws.my.sg.id"/>
235
			</field>
236
			 <field depends="required" property="im2uWSRegTimestamp">
237
			    <arg0 key="user.ws.registration.time.stamp"/>
238
			</field>
239
		</form>
192 240
	</formset>
193 241
</form-validation>
194 242

  
WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
125 125
		</htmlEL:cancel>
126 126
		<htmlEL:submit property="action" styleClass="button"
127 127
			onclick="overlay();">
128
			<bean:message key="general.button.edit" />
129
		</htmlEL:submit>
130
		<htmlEL:submit property="action" styleClass="button"
131
			onclick="overlay();">
128 132
			<bean:message key="general.button.reset.password" />
129 133
		</htmlEL:submit>
130 134
		<htmlEL:submit property="action" styleClass="button"
WebContent/jsp/ss112_user/ibssRetailUserEdit.jsp
2 2
<%@ taglib uri="/WEB-INF/tld/struts-bean" prefix="bean" %>
3 3
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
4 4

  
5
<bean:define id="detailBean" name="ibssUserForm" property="ibssUserDetailBean"/>
6 5
<h3 class="title"><strong><c:out value="${sessionScope.displayDesc}"/> - Edit</strong></h3>
7 6
<table id="errorTable">
8 7
<tr>
......
20 19
</table>
21 20
<htmlEL:form action="/ss112/editUserResult.do">
22 21
<table class="tabularForm" width="517" height="97" border="1">
23
  <tr>
24
    <td width="69">&nbsp;</td>
25
    <td width="133">&nbsp;</td>
26
    <td colspan="2">&nbsp;</td>
27
    <td width="63">&nbsp;</td>
28
  </tr>
29
  <tr>
30
    <td width="69">&nbsp;</td>
31
    <td><bean:message key="user.id"/>:</td>
32
    <td colspan="2"><strong><c:out value="${detailBean.map.userID}"/></strong></td>
33
    <td>&nbsp;</td>
34
    </tr>
35
    <tr>
36
    <td width="69">&nbsp;</td>
37
    <td><bean:message key="user.alias"/>:</td>
38
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
39
    <td>&nbsp;</td>
40
    </tr>
41
  <tr>
42
    <td width="69">&nbsp;</td>
43
    <td><bean:message key="user.name"/>:</td>
44
    <td colspan="2"><htmlEL:text autocomplete="off" property="userName" name="ibssUserForm" maxlength="60"/></td>
45
    <td>&nbsp;</td>
46
  </tr>
47
  <tr>
48
    <td>&nbsp;</td>
49
    <td><bean:message key="user.dob.brd"/>:</td>
50
    <td colspan="2"><htmlEL:text autocomplete="off" property="userDobBrd" name="ibssUserForm" maxlength="10"/></td>
51
    <td colspan="2">&nbsp;</td>
52
  </tr>
53
  <tr>
54
    <td>&nbsp;</td>
55
    <td><bean:message key="user.gender"/>:</td>
56
    <td colspan="2">
57
    	<htmlEL:select property="userGender" name="ibssUserForm">
58
    		<htmlEL:option value=""><bean:message key="general.select.option0"/></htmlEL:option>
59
    		<htmlEL:option value="M"><bean:message key="user.gender.male"/></htmlEL:option>
60
    		<htmlEL:option value="F"><bean:message key="user.gender.female"/></htmlEL:option>
61
    	</htmlEL:select>
62
	</td>
63
    <td colspan="2">&nbsp;</td>
64
  </tr>
65
  <tr>
66
    <td>&nbsp;</td>
67
    <td><bean:message key="user.race"/>:</td>
68
    <td colspan="2">
69
		<htmlEL:select property="userRace" name="ibssUserForm">
70
    		<htmlEL:option value=""><bean:message key="general.select.option0"/></htmlEL:option>
71
    		<htmlEL:option value="AMR"><bean:message key="user.race.american"/></htmlEL:option>
72
    		<htmlEL:option value="CHI"><bean:message key="user.race.chinese"/></htmlEL:option>
73
    		<htmlEL:option value="FIL"><bean:message key="user.race.filipino"/></htmlEL:option>
74
    		<htmlEL:option value="JAP"><bean:message key="user.race.japannese"/></htmlEL:option>
75
    		<htmlEL:option value="SPA"><bean:message key="user.race.spaniard"/></htmlEL:option>
76
    		<htmlEL:option value="OTH"><bean:message key="user.race.others"/></htmlEL:option>
77
    	</htmlEL:select>
78
    </td>
79
    <td colspan="2">&nbsp;</td>
80
  </tr>
81
  <tr>
82
    <td>&nbsp;</td>
83
    <td><bean:message key="user.address"/>:</td>
84
    <td colspan="2"><htmlEL:text autocomplete="off" property="userAddr1" name="ibssUserForm" maxlength="60"/></td>
85
    <td colspan="2">&nbsp;</td>
86
  </tr>
87
  <tr>
88
    <td>&nbsp;</td>
89
    <td>&nbsp;</td>
90
    <td colspan="2"><htmlEL:text autocomplete="off" property="userAddr2" name="ibssUserForm" maxlength="60"/></td>
91
    <td colspan="2">&nbsp;</td>
92
  </tr>
93
  <tr>
94
    <td>&nbsp;</td>
95
    <td>&nbsp;</td>
96
    <td colspan="2"><htmlEL:text autocomplete="off" property="userAddr3" name="ibssUserForm" maxlength="60"/></td>
97
    <td colspan="2">&nbsp;</td>
98
  </tr>
99
  <tr>
100
    <td>&nbsp;</td>
101
    <td>&nbsp;</td>
102
    <td colspan="2"><htmlEL:text autocomplete="off" property="userAddr4" name="ibssUserForm" maxlength="60"/></td>
103
    <td colspan="2">&nbsp;</td>
104
  </tr>
105
  <tr>
106
    <td>&nbsp;</td>
107
    <td>&nbsp;</td>
108
    <td colspan="2"><htmlEL:text autocomplete="off" property="userAddr5" name="ibssUserForm" maxlength="60"/></td>
109
    <td colspan="2">&nbsp;</td>
110
  </tr>
111
  <tr>
112
    <td>&nbsp;</td>
113
    <td><bean:message key="user.home.no"/>:</td>
114
    <td colspan="2"><htmlEL:text autocomplete="off" property="userHomePhone" name="ibssUserForm" maxlength="15"/></td>
115
    <td colspan="2">&nbsp;</td>
116
  </tr>
117
  <tr>
118
    <td>&nbsp;</td>
119
    <td><bean:message key="user.office.no"/>:</td>
120
    <td colspan="2"><htmlEL:text autocomplete="off" property="userOfficeNo" name="ibssUserForm" maxlength="15"/></td>
121
    <td colspan="2">&nbsp;</td>
122
  </tr>
123
  <tr>
124
    <td>&nbsp;</td>
125
    <td><bean:message key="user.mobile.no"/>:</td>
126
    <td colspan="2"><htmlEL:text autocomplete="off" property="userMobileNo" name="ibssUserForm" maxlength="15"/></td>
127
    <td colspan="2">&nbsp;</td>
128
  </tr>
129
  <tr>
130
    <td>&nbsp;</td>
131
    <td><bean:message key="user.tac.no"/>:</td>
132
    <td colspan="2"><htmlEL:text autocomplete="off" property="userTacPhone" name="ibssUserForm" maxlength="15"/></td>
133
    <td colspan="2">&nbsp;</td>
134
  </tr>
135
  <tr>
136
    <td>&nbsp;</td>
137
    <td><bean:message key="user.email"/>:</td>
138
    <td colspan="2"><htmlEL:text autocomplete="off" property="email" name="ibssUserForm" maxlength="60"/></td>
139
    <td colspan="2">&nbsp;</td>
140
  </tr>
141
  <tr>
142
    <td>&nbsp;</td>
143
    <td><bean:message key="user.updated.by"/>:</td>
144
    <td colspan="2"><strong>
145
    	<c:choose>
146
    		<c:when test="${not empty detailBean.map.updatedBy}">
147
    			<c:out value="${detailBean.map.updatedBy}"></c:out>
148
    		</c:when>
149
    		<c:otherwise>-</c:otherwise>
150
    	</c:choose>
151
    <bean:write name="detailBean" property="updatedBy"/>
152
    </strong></td>
153
    <td>&nbsp;</td>
154
  </tr>
155
  <tr>
156
    <td>&nbsp;</td>
157
    <td><bean:message key="user.creation.date"/>: </td>
158
    <td colspan="2"><strong>
159
    	<c:choose>
160
    		<c:when test="${not empty detailBean.map.userCreationDate}">
161
    			<c:out value="${detailBean.map.userCreationDate}"></c:out>
162
    		</c:when>
163
    		<c:otherwise>-</c:otherwise>
164
    	</c:choose>
165
    </strong></td>
166
    <td>&nbsp;</td>
167
  </tr>
168
  <tr>
169
    <td>&nbsp;</td>
170
    <td><bean:message key="user.updated.date"/>: </td>
171
    <td colspan="2"><strong>
172
        <c:choose>
173
    		<c:when test="${not empty detailBean.map.updatedDate}">
174
    			<c:out value="${detailBean.map.updatedDate}"></c:out>
175
    		</c:when>
176
    		<c:otherwise>-</c:otherwise>
177
    	</c:choose>
178
    <bean:write name="detailBean" property="updatedDate"/>
179
    </strong></td>
180
    <td>&nbsp;</td>
181
  </tr>
182
  <tr>
183
    <td>&nbsp;</td>
184
    <td>&nbsp;</td>
185
    <td colspan="2">&nbsp;</td>
186
    <td>&nbsp;</td>
187
  </tr>
188
  <tr><td colspan="5">&nbsp;</td></tr>
22
<tr>
23
		<td width="72">&nbsp;</td>
24
    	<td width="140">&nbsp;</td>
25
    	<td width="345">&nbsp;</td>
26
    	<td width="3">&nbsp;</td>
27
   		 <td width="44">&nbsp;</td>
28
	</tr>
29

  
30
	<tr>
31
		<td width="72">&nbsp;</td>
32
		<td width="140"><bean:message key="general.id"/>:</td>
33
		<td width="345"><c:out value="${ibssUserForm.map.userID}"/></td>
34
		<td width="3">&nbsp;</td>
35
   		<td width="44">&nbsp;</td>
36
	</tr>
37

  
38
	<tr>
39
		<td width="72">&nbsp;</td>
40
		<td width="140"><bean:message key="user.id"/>:</td>
41
		<td width="345"><c:out value="${ibssUserForm.map.userAlias}"/></td>
42
		<td width="3">&nbsp;</td>
43
   		<td width="44">&nbsp;</td>
44
	</tr>
45
	
46
	<tr>
47
		<td width="72">&nbsp;</td>
48
		<td width="140"><bean:message key="user.status"/>:</td>
49
		<td width="345"><c:out value="${ibssUserForm.map.userStatus}"/></td>
50
		<td width="3">&nbsp;</td>
51
   		<td width="44">&nbsp;</td>
52
	</tr>
53
	
54
	<tr>
55
		<td width="72">&nbsp;</td>
56
		<td width="140"><bean:message key="user.application"/>:</td>
57
		<td width="345"><c:out value="${ibssUserForm.map.userApplication}"/></td>
58
		<td width="3">&nbsp;</td>
59
   		<td width="44">&nbsp;</td>
60
	</tr>
61
	
62
	<c:if test="${ibssUserForm.map.userApplicationKey eq '1'}">
63
	
64
	<tr>
65
		<td width="72">&nbsp;</td>
66
		<td width="140"><bean:message key="user.pan.1"/>:</td>
67
		<td width="345"><htmlEL:text property="m2uPan1" name="ibssUserForm" autocomplete="off"/></td>
68
		<td width="3">&nbsp;</td>
69
   		<td width="44">&nbsp;</td>
70
	</tr>
71
	<tr>
72
		<td width="72">&nbsp;</td>
73
		<td width="140"><bean:message key="user.pan.2"/>:</td>
74
		<td width="345"><htmlEL:text property="m2uPan2" name="ibssUserForm" autocomplete="off"/></td>
75
		<td width="3">&nbsp;</td>
76
   		<td width="44">&nbsp;</td>
77
	</tr>
78
	
79
	</c:if>
80
	<c:if test="${ibssUserForm.map.userApplicationKey eq '2'}">
81
	
82
	<tr>
83
		<td width="72">&nbsp;</td>
84
		<td width="140"><bean:message key="user.id.no"/>:</td>
85
		<td width="345"><htmlEL:text property="onlineStockIdNo" name="ibssUserForm" autocomplete="off"/></td>
86
		<td width="3">&nbsp;</td>
87
   		<td width="44">&nbsp;</td>
88
	</tr>
89
	
90
	</c:if>
91
	<c:if test="${ibssUserForm.map.userApplicationKey eq '3'}">
92
	
93
	<tr>
94
		<td width="72">&nbsp;</td>
95
		<td width="140"><bean:message key="user.full.name"/>:</td>
96
		<td width="345"><htmlEL:text property="ticketingFullName" name="ibssUserForm" autocomplete="off"/></td>
97
		<td width="3">&nbsp;</td>
98
   		<td width="44">&nbsp;</td>
99
	</tr>
100
	<tr>
101
		<td width="72">&nbsp;</td>
102
		<td width="140"><bean:message key="user.first.name"/>:</td>
103
		<td><htmlEL:text property="ticketingFirstName" name="ibssUserForm" autocomplete="off"/></td>
104
		<td width="3">&nbsp;</td>
105
   		<td width="44">&nbsp;</td>
106
	</tr>
107
	<tr>
108
		<td width="72">&nbsp;</td>
109
		<td width="140"><bean:message key="user.last.name"/>:</td>
110
		<td width="345"><htmlEL:text property="ticketingLastName" name="ibssUserForm" autocomplete="off"/></td>
111
		<td width="3">&nbsp;</td>
112
   		<td width="44">&nbsp;</td>
113
	</tr>
114
	<tr>
115
		<td width="72">&nbsp;</td>
116
		<td width="140"><bean:message key="user.payee.code"/>:</td>
117
		<td width="345"><htmlEL:text property="ticketingPayeeCode" name="ibssUserForm" autocomplete="off"/></td>
118
		<td width="3">&nbsp;</td>
119
   		<td width="44">&nbsp;</td>
120
	</tr>
121
	
122
	</c:if>
123
	<c:if test="${ibssUserForm.map.userApplicationKey eq '4'}">
124
	
125
	<tr>
126
		<td width="72">&nbsp;</td>
127
		<td width="140"><bean:message key="user.pan.cc"/>:</td>
128
		<td width="345"><htmlEL:text property="ccppPanCC" name="ibssUserForm" autocomplete="off"/></td>
129
		<td width="3">&nbsp;</td>
130
   		<td width="44">&nbsp;</td>
131
	</tr>
132
	
133
	</c:if>
134
	<c:if test="${ibssUserForm.map.userApplicationKey eq '5'}">
135
	
136
	<tr>
137
		<td width="72">&nbsp;</td>
138
		<td width="140"><bean:message key="user.ws.flag"/>:</td>
139
		<td width="345">
140
			<htmlEL:select property="im2uWSFlag" name="ibssUserForm">
141
    			<htmlEL:option value="Y"><bean:message key="general.yes"/></htmlEL:option>
142
    			<htmlEL:option value="N"><bean:message key="general.no"/></htmlEL:option>
143
    		</htmlEL:select>
144
    	</td>
145
		<td width="3">&nbsp;</td>
146
   		<td width="44">&nbsp;</td>
147
	</tr>
148
	<tr>
149
		<td width="72">&nbsp;</td>
150
		<td width="140"><bean:message key="user.ws.ident.code"/>:</td>
151
		<td width="345"><htmlEL:text property="im2uWSIdentCode" name="ibssUserForm" autocomplete="off"/></td>
152
		<td width="3">&nbsp;</td>
153
   		<td width="44">&nbsp;</td>
154
	</tr>
155
	<tr>
156
		<td width="72">&nbsp;</td>
157
		<td width="140"><bean:message key="user.ws.my.sg.id"/>:</td>
158
		<td width="345"><htmlEL:text property="im2uWSMySgId" name="ibssUserForm" autocomplete="off"/></td>
159
		<td width="3">&nbsp;</td>
160
   		<td width="44">&nbsp;</td>
161
	</tr>
162
	<tr>
163
		<td width="72">&nbsp;</td>
164
		<td width="140"><bean:message key="user.ws.registration.time.stamp"/>:</td>
165
		<td width="345"><htmlEL:text property="im2uWSRegTimestamp" name="ibssUserForm" autocomplete="off"/> &nbsp; <bean:message key="im2u.reg.timestamp.format"/></td>
166
		<td width="3">&nbsp;</td>
167
   		<td width="44">&nbsp;</td>
168
	</tr>
169
	
170
	</c:if>
171
	
172
	<tr>
173
		<td>&nbsp;</td>
174
		<td>&nbsp;</td>
175
		<td>&nbsp;</td>
176
		<td>&nbsp;</td>
177
		<td>&nbsp;</td>
178
	</tr>
179
	
180
	<tr>
181
		<td colspan="5">&nbsp;</td>
182
	</tr>
183

  
189 184
</table>
190 185
<div class="floatRight">
191 186
	<htmlEL:submit property="action" styleClass="button" onclick="overlay();">
WebContent/jsp/ss112_user/ibssRetailUserEditResult.jsp
20 20
  </tr>
21 21
  <tr>
22 22
    <td height="28">&nbsp;</td>
23
    <td colspan="2"><bean:message key="user.edit.successful"/> <strong><bean:message key="user.edited"/></strong></td>
23
    <td colspan="2"><strong><bean:write name="ibssUserForm" property="jspTitle"/></strong></td>
24 24
    <td>&nbsp;</td>
25 25
  </tr>
26 26
  <tr>
src/com/ib/ibss/common/constant/AdminPermissionModeType.java
122 122
				Long actionId = 1024L;
123 123
				return actionId;
124 124
			}
125
		},
126
		EDIT_RIB_USER
127
		{
128
			public Long getActionId ()
129
			{
130
				Long actionId = 1025L;
131
				return actionId;
132
			}
125 133
		};
126 134

  
127 135
		public abstract Long getActionId ();
src/com/ib/ibss/common/constant/JSPValidator.java
57 57
	public static final String SS112_RETAIL_USER_CCPP_CREATE_RESULT_VALIDATION			= "ss112RetailUserCCPPCreateResultValidation";
58 58
	public static final String SS112_RETAIL_USER_IM2U_CREATE_RESULT_VALIDATION			= "ss112RetailUserIM2UCreateResultValidation";
59 59
	public static final String SS112_RETAIL_USER_EDIT_CONFIRM_VALIDATION				= "ss112RetailUserEditConfirmValidation";
60
	public static final String SS112_RETAIL_USER_M2U_EDIT_RESULT_VALIDATION				= "ss112RetailUserM2UEditResultValidation";
61
	public static final String SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION	= "ss112RetailUserOnlineStockEditResultValidation";
62
	public static final String SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION		= "ss112RetailUserTicketingEditResultValidation";
63
	public static final String SS112_RETAIL_USER_CCPP_EDIT_RESULT_VALIDATION			= "ss112RetailUserCCPPEditResultValidation";
64
	public static final String SS112_RETAIL_USER_IM2U_EDIT_RESULT_VALIDATION			= "ss112RetailUserIM2UEditResultValidation";
65
	
60 66
	/* ss104 */
61 67
	public static final String AUDIT_TRAIL_MAIN_VALIDATION			= "auditTrailMainValidation";
62 68
	public static final String USER_TRANS_MAIN_VALIDATION			= "userTransMainValidation";
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserCreateResultAction.java
68 68
		{
69 69
			ActionErrors error = new ActionErrors();
70 70
			IBSSDynaBean ibDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (form, mapping);
71
			Integer appId = (Integer) ibDynaBean.get(IBSSUserConstants.SELECTED_APPLICATION_ID);
71
			Integer appId = Integer.valueOf((String) ibDynaBean.get(IBSSUserConstants.SELECTED_APPLICATION_ID));
72 72
			if(appId.equals(ClientApp.APP_ID_M2U))
73 73
			{
74 74
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_M2U_CREATE_RESULT_VALIDATION), request);
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryEditAction.java
14 14
import javax.servlet.http.HttpServletRequest;
15 15
import javax.servlet.http.HttpServletResponse;
16 16

  
17
import net.penril.ibss.core.hibernate.IbCustProfile;
18

  
19 17
import org.apache.struts.action.ActionForm;
20 18
import org.apache.struts.action.ActionForward;
21 19
import org.apache.struts.action.ActionMapping;
22 20

  
21
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
23 22
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
24 23
import com.ib.ibss.common.utils.ActionTag;
24
import com.ib.ibss.common.utils.IBSSNavigationUtil;
25 25
import com.ib.ibss.enterprise.services.AccessConstants;
26
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
26
import com.ib.ibss.enterprise.services.common.SessionUserPermissionVerificationService;
27
import com.ib.ibss.enterprise.services.ss112_user.IBSSRetailUserEnquiryEditServices;
27 28
import com.ib.ibss.error.exception.IBSSGenericException;
28
import com.ib.ibss.error.handler.IBSSErrorHandler;
29 29
import com.ib.ibss.struts.utils.IBSSControllerAction;
30 30
import com.ib.ibss.struts.utils.IBSSDynaBean;
31 31
import com.ib.ibss.struts.utils.IBSSDynaBeanManager;
32
import com.ib.ibss.struts.utils.IBSSSessionObjects;
32 33

  
33 34
/**
34 35
 * 
......
53 54
	 * Create new instance of IBSSRetailUserEnquiryEditConfirmServices and call execute() method.
54 55
	 * </pre>
55 56
	 *
56
	 * @param p_oMapping The ActionMapping used to select this instance
57
	 * @param p_oForm The optional ActionForm bean for this request which is from form-bean.xml(if any)
58
	 * @param p_oRequest The HTTP request we are processing
59
	 * @param p_oResponse The HTTP response we are creating
57
	 * @param mapping The ActionMapping used to select this instance
58
	 * @param form The optional ActionForm bean for this request which is from form-bean.xml(if any)
59
	 * @param request The HTTP request we are processing
60
	 * @param response The HTTP response we are creating
60 61
	 * @return The requested ActionForward object
61 62
	 * @throws Exception if the application business logic throws an exception
62 63
	 *
63 64
	 * @see com.ib.ibss.struts.utils.IBSSControllerAction#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
64 65
	 */
65
	public ActionForward execute (ActionMapping p_oMapping, ActionForm p_oForm, HttpServletRequest p_oRequest, HttpServletResponse p_oResponse) throws Exception
66
	public ActionForward execute (ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception
66 67
	{
67
		noErrorHandling (p_oRequest, p_oMapping);
68
		noErrorHandling (request, mapping);
68 69
		
69
		String m_sAction 	= p_oRequest.getParameter(AccessConstants.ACTION);		
70
		String action 	= request.getParameter(AccessConstants.ACTION);		
70 71
		
71
		if("back".equalsIgnoreCase(m_sAction))
72
		if("back".equalsIgnoreCase(action))
72 73
		{
73 74
			setForwardPage("back");
74 75
		}
76
		else if(ActionTag.isResetPassword(action))
77
		{
78
			setForwardPage("resetPass");
79
		}
80
		else if(ActionTag.isDelete(action))
81
		{
82
			setForwardPage("deleteConfirm");
83
		}
75 84
		
76 85
		else
77 86
		{
78 87
			try
79 88
			{
80
				checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
89
				checkCredential(request, FunctionCodeEnum.RIB_USER_ENQUIRY);
81 90
				
82
				IBSSDynaBean m_oIBDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (p_oForm, p_oMapping);
83
				IBSSDynaBean m_oDetailBean =(IBSSDynaBean) m_oIBDynaBean.get (IBSSUserConstants.IBSS_USER_DETAIL);
91
//				IBSSDynaBean m_oDetailBean =(IBSSDynaBean) m_oIBDynaBean.get (IBSSUserConstants.IBSS_USER_DETAIL);
84 92
				
85
				if(ActionTag.isResetPassword(m_sAction))
86
				{
87
					setForwardPage("resetPass");
88
				}
89
				else if(ActionTag.isDelete(m_sAction))
90
				{
91
					setForwardPage("deleteConfirm");
92
				}
93
				checkToken (request, mapping, false);
94
				checkCredential (request, FunctionCodeEnum.RIB_USER_ENQUIRY);
95
				IBSSSessionObjects sessionObjects 	= new IBSSSessionObjects(request);
96
				IBSSDynaBean ibDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (form, mapping);
97
				
98
				IBSSNavigationUtil tree = new IBSSNavigationUtil(sessionObjects);
99
				tree.buildNavigation ();
100
				
101
				//Check User Permission Access
102
				Long actionId = RIBPermission.EDIT_RIB_USER.getActionId();
103
				SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(sessionObjects);
104
				access.validateUser(actionId);
105
				
106
				IBSSRetailUserEnquiryEditServices services = new IBSSRetailUserEnquiryEditServices(sessionObjects);
107
				services.setIBSSDynaBean (ibDynaBean);
108
				services.execute ();
93 109
				
94 110
			}
95 111
			catch (IBSSGenericException e)
96 112
			{
97
				errorHandling(p_oRequest, p_oMapping, e);
113
				errorHandling(request, mapping, e);
98 114
			}			
99 115
		}
100
		return super.execute (p_oMapping, p_oForm, p_oRequest, p_oResponse);
116
		return super.execute (mapping, form, request, response);
101 117
	}	
102 118
}
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryEditResultAction.java
14 14
import javax.servlet.http.HttpServletRequest;
15 15
import javax.servlet.http.HttpServletResponse;
16 16

  
17
import my.com.upass.pojo.ClientApp;
18

  
17 19
import org.apache.struts.action.ActionErrors;
18 20
import org.apache.struts.action.ActionForm;
19 21
import org.apache.struts.action.ActionForward;
......
23 25
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
24 26
import com.ib.ibss.common.utils.ActionTag;
25 27
import com.ib.ibss.common.utils.IBSSNavigationUtil;
28
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
26 29
import com.ib.ibss.enterprise.services.ss112_user.IBSSRetailUserEnquiryEditResultServices;
27 30
import com.ib.ibss.error.exception.IBSSGenericException;
28 31
import com.ib.ibss.struts.utils.IBSSControllerAction;
......
53 56
	 * Create new instance of IBSSRetailUserEnquiryEditResultServices and call updateEditedProfile() method.
54 57
	 * </pre>
55 58
	 *
56
	 * @param p_oMapping The ActionMapping used to select this instance
57
	 * @param p_oForm The optional ActionForm bean for this request which is from form-bean.xml(if any)
58
	 * @param p_oRequest The HTTP request we are processing
59
	 * @param p_oResponse The HTTP response we are creating
59
	 * @param mapping The ActionMapping used to select this instance
60
	 * @param form The optional ActionForm bean for this request which is from form-bean.xml(if any)
61
	 * @param request The HTTP request we are processing
62
	 * @param response The HTTP response we are creating
60 63
	 * @return The requested ActionForward object
61 64
	 * @throws Exception if the application business logic throws an exception
62 65
	 *
63 66
	 * @see com.ib.ibss.struts.utils.IBSSControllerAction#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
64 67
	 */
65
	public ActionForward execute (ActionMapping p_oMapping, ActionForm p_oForm, HttpServletRequest p_oRequest, HttpServletResponse p_oResponse) throws Exception
68
	public ActionForward execute (ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception
66 69
	{
67
		noErrorHandling (p_oRequest, p_oMapping);
68
		IBSSDynaBean m_oIBDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (p_oForm, p_oMapping);
70
		noErrorHandling (request, mapping);
71
		IBSSDynaBean ibDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (form, mapping);
69 72

  
70
		IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
71
		IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
72
		m_oTree.buildNavigation ();
73
		IBSSSessionObjects sessionObjects = new IBSSSessionObjects(request);
74
		IBSSNavigationUtil tree = new IBSSNavigationUtil(sessionObjects);
75
		tree.buildNavigation ();
73 76
		
74
		if(p_oRequest.getParameter("action").equalsIgnoreCase (ActionTag.BACK))
77
		if(request.getParameter("action").equalsIgnoreCase (ActionTag.BACK))
75 78
		{
76 79
			setForwardPage(ActionTag.BACK.toLowerCase ());
77 80
		}
78 81
		else 
79 82
		{		
80
			ActionErrors m_oError = p_oForm.validate(createNewActionMapping(p_oMapping, JSPValidator.EDIT_USER_VALIDATION), p_oRequest);
83
			ActionErrors error = new ActionErrors();
84
			Integer appId 	   = Integer.valueOf((String)ibDynaBean.get(IBSSUserConstants.USER_APPLICATION_KEY));
85
			
86
			if(appId.equals(ClientApp.APP_ID_M2U))
87
			{
88
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_M2U_EDIT_RESULT_VALIDATION), request);
89
			}
90
			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
91
			{
92
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
93
			}
94
			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
95
			{
96
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
97
			}
98
			else if(appId.equals(ClientApp.APP_ID_CCPP))
99
			{
100
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_CCPP_EDIT_RESULT_VALIDATION), request);
101
			}
102
			else if(appId.equals(ClientApp.APP_ID_IM2U))
103
			{
104
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_IM2U_EDIT_RESULT_VALIDATION), request);
105
			}
81 106
		
82
			if(!m_oError.isEmpty ())
107
			if(!error.isEmpty ())
83 108
			{
84
				errorHandling(p_oRequest, p_oMapping, m_oError);
109
				errorHandling(request, mapping, error);
85 110
			}
86 111
			else
87 112
			{
88 113
				try
89 114
				{
90
					checkToken (p_oRequest, p_oMapping, false);
91
					checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
115
					checkToken (request, mapping, false);
116
					checkCredential(request, FunctionCodeEnum.RIB_USER_ENQUIRY);
92 117
					
93
					IBSSRetailUserEnquiryEditResultServices m_oServices = new IBSSRetailUserEnquiryEditResultServices(m_oSessionObjects);
94
					m_oServices.setIBSSDynaBean (m_oIBDynaBean);
95
					m_oServices.updateEditedProfile();
118
					IBSSRetailUserEnquiryEditResultServices services = new IBSSRetailUserEnquiryEditResultServices(sessionObjects);
119
					services.setIBSSDynaBean (ibDynaBean);
120
					services.updateEditedProfile();
96 121
				}
97 122
				catch (IBSSGenericException e)
98 123
				{
99
					errorHandling(p_oRequest, p_oMapping, e);
124
					errorHandling(request, mapping, e);
100 125
				}
101 126
			}
102 127
		}
103
		return super.execute (p_oMapping, p_oForm, p_oRequest, p_oResponse);
128
		return super.execute (mapping, form, request, response);
104 129
	}
105 130
}
src/com/ib/ibss/enterprise/services/ss102_user_admin/constants/IBSSUserConstants.java
257 257
	public static final String IM2U_WS_IDENT_CODE				= "im2uWSIdentCode";
258 258
	public static final String IM2U_WS_MYSG_ID					= "im2uWSMySgId";
259 259
	public static final String IM2U_WS_REG_TIMESTAMP			= "im2uWSRegTimestamp";
260
	public static final String USER_PROFILE						= "userProfile";
260 261
	
261 262
}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserCreateConfirmServices.java
45 45
		try
46 46
		{
47 47
			List <ClientApp> clientAppList 	= (List<ClientApp>) getIBSSDynaBean().get(IBSSUserConstants.CLIENT_APP_LIST);
48
			Integer selectedAppId 			= (Integer) getBeanMessageObj(IBSSUserConstants.SELECTED_APPLICATION_ID);
48
			Integer selectedAppId 			= Integer.valueOf((String) getBeanMessageObj(IBSSUserConstants.SELECTED_APPLICATION_ID));
49 49
			
50 50
			for(ClientApp clientApp : clientAppList)
51 51
			{
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserCreateResultServices.java
69 69
		try
70 70
		{
71 71
			String userAlias 		= getBeanMessage (IBSSUserConstants.USER_ALIAS);
72
			Integer selectedAppId 	= (Integer) getBeanMessageObj (IBSSUserConstants.SELECTED_APPLICATION_ID);
72
			Integer selectedAppId 	= Integer.valueOf((String) getIBSSDynaBean().get (IBSSUserConstants.SELECTED_APPLICATION_ID));
73 73
			String password 		= getBeanMessage (IBSSUserConstants.PASS);
74 74
			String confirmPassword 	= getBeanMessage (IBSSUserConstants.CONFIRM_PASS);
75 75
			String adminUserAlias	= getIBSSessionObjects().getSessionUserAlias();
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
11 11

  
12 12
package com.ib.ibss.enterprise.services.ss112_user;
13 13

  
14
import java.text.SimpleDateFormat;
15
import java.util.Date;
16 14
import java.util.HashMap;
17 15
import java.util.LinkedHashMap;
18 16
import java.util.Map;
......
26 24
import my.com.upass.maybank.entities.StockUser;
27 25
import my.com.upass.maybank.entities.TicketingUser;
28 26
import my.com.upass.maybank.entities.UserProfile;
29
import my.com.upass.pojo.ClientApp;
30 27
import net.penril.generic.hibernate.HibernateUtils;
31
import net.penril.ibss.core.hibernate.IbCustProfile;
32

  
33
import com.ib.common.utils.DateTimeUtils;
34 28
import com.ib.enterprise.services.common.BeanToBeanTransferUtils;
35
import com.ib.ibss.common.constant.BusinessOptions;
36
import com.ib.ibss.common.constant.IBSSCommonConstants;
37 29
import com.ib.ibss.common.utils.DataValidator;
38 30
import com.ib.ibss.common.utils.IBSSLogger;
39 31
import com.ib.ibss.common.utils.ResourcesUtils;
......
127 119
				switch (userType){
128 120
					case 1:{//M2U Retail Internet Banking
129 121
						M2uUser user = (M2uUser) userProfile;
122
						getIBSSDynaBean ().set (IBSSUserConstants.USER_PROFILE, user);
130 123
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.1"), user.getPan1());
131 124
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.2"), user.getPan2());
132 125
						break;
133 126
					}
134 127
					case 2:{//Maybank Online Stock
135 128
						StockUser user = (StockUser) userProfile;
129
						getIBSSDynaBean ().set (IBSSUserConstants.USER_PROFILE, user);
136 130
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.id.no"), user.getIdNo());
137 131
						break;
138 132
					}
139 133
					case 3:{//Maybank Online Ticketing
140 134
						TicketingUser user = (TicketingUser) userProfile;
135
						getIBSSDynaBean ().set (IBSSUserConstants.USER_PROFILE, user);
141 136
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.first.name"), user.getFirstName());
142 137
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.full.name"), user.getFullName());
143 138
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.last.name"), user.getLastName());
......
146 141
					}
147 142
					case 4:{//Maybank CCPP
148 143
						IbccUser user = (IbccUser) userProfile;
144
						getIBSSDynaBean ().set (IBSSUserConstants.USER_PROFILE, user);
149 145
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.cc"), user.getPanCc());
150 146
						break;
151 147
					}
152 148
					case 5:{//M2U Singapore Integration
153 149
						Im2uUser user = (Im2uUser) userProfile;
150
						getIBSSDynaBean ().set (IBSSUserConstants.USER_PROFILE, user);
154 151
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.flag"), user.getWsFlag());
155 152
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.ident.code"), user.getWsIdentCode());
156 153
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.my.sg.id"), user.getWsMySgId());
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryEditResultServices.java
11 11

  
12 12
package com.ib.ibss.enterprise.services.ss112_user;
13 13

  
14
import java.text.SimpleDateFormat;
14 15
import java.util.Date;
16
import java.util.HashMap;
15 17
import java.util.Map;
16 18

  
19
import org.hibernate.Session;
20

  
21
import my.com.upass.MinimalConstants;
22
import my.com.upass.UPassControllerV2;
23
import my.com.upass.generic.hibernate.HibernateUtils;
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.ClientApp;
17 31
import net.penril.ibss.audit.log.AuditLogConstants;
18 32
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
19
import net.penril.ibss.core.hibernate.IbCustProfile;
20 33

  
21
import com.ib.ibss.common.constant.AdminPermissionModeType.RIBPermission;
22
import com.ib.ibss.common.utils.DataValidator;
34
import com.ib.ibss.common.constant.ExceptionErrors;
23 35
import com.ib.ibss.common.utils.IBSSLogger;
24 36
import com.ib.ibss.common.utils.ResourcesUtils;
25 37
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
38
import com.ib.ibss.enterprise.services.StatusConstants;
26 39
import com.ib.ibss.enterprise.services.common.BeanToBeanTransferUtils;
27 40
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
41
import com.ib.ibss.error.exception.IBSSBusinessException;
28 42
import com.ib.ibss.error.exception.IBSSGenericException;
29
import com.ib.ibss.error.exception.IBSSServiceException;
30
import com.ib.ibss.error.handler.CommonErrorCode;
31 43
import com.ib.ibss.error.handler.IBSSErrorHandler;
32
import com.ib.ibss.struts.utils.IBSSDynaBean;
33 44
import com.ib.ibss.struts.utils.IBSSSessionObjects;
34 45

  
35 46
/**
......
60 71
		super(sessionObjects);
61 72
	}
62 73

  
63
	Long c_oLogStatus 				= AuditLogConstants.UNSUCCESSFUL;
64
	String c_sLogReason 			= "";
65
	String c_sUserAlias;
66
	String c_sEditUserContact;
67
	String c_sEditUserEmail;
68
	String c_sEditUserIdentification;
69
	String c_sEditUserName;
70
	String c_sEditUserStateKey;
71
	String c_sDetailUserStatusKey;
72
	String c_sEditUserDobBrd;
73
	String c_sEditUserGender;
74
	String c_sEditUserRace;
75
	String c_sEditUserOfficeNo;
76
	String c_sEditUserHomeNo;
77
	String c_sEditUserTacNo;
78
	String c_sEditUserMobileNo;
79
	String c_sEditUserAddr1;
80
	String c_sEditUserAddr2;
81
	String c_sEditUserAddr3;
82
	String c_sEditUserAddr4;
83
	String c_sEditUserAddr5;
84
	Long c_oDetailUserID;
85
	IbCustProfile c_oUser;
86
	IBSSDynaBean c_oDetailBean;
87
	IBSSDynaBean c_oUserViewBean;
88
	Map<String, String> c_mStatusEditMap;
89
	IbCustProfile retailUserEnquiryBeforeValue= null;
90
	IbCustProfile currentUserProfile= null;
91
	
92 74
	public void updateEditedProfile () throws IBSSGenericException
93 75
	{
94 76
		IBSSLogger.debug (c_oClass, "Entering updateEditedProfile");
95 77
		
78
		Long logStatus 		= AuditLogConstants.UNSUCCESSFUL;
79
		String logReason 	= "";
80
		String userAlias	= "";
81
		String appId		= "";
82
		int rc 				= MinimalConstants.ERR_UNKNOWN;
83
		Map <Integer, String> valueMap = new HashMap<Integer, String>();
84
		Session session 	= null;
85
		
96 86
		try
97 87
		{
98
			/* Get inputs from form and view bean */
99
			getEditInputs ();
100
			/* Assign into new user profile */
101
			updateCurrentUserProfile ();
88
			appId	  = getBeanMessage (IBSSUserConstants.USER_APPLICATION_KEY);
89
			userAlias = getBeanMessage (IBSSUserConstants.USER_ALIAS);
102 90
			
103
			RetailUserSharedServices m_oSharedServices = new RetailUserSharedServices();
91
			UPassControllerV2 upass = new UPassControllerV2();
104 92
			
105
			IbCustProfile m_oCustProfile = new IbCustProfile();	
106
			//TODO : Confirm MK_TYPE id
107
			//Determine maker checker
108
			Long actionId = RIBPermission.ACTIVATE_RIB_USER.getActionId();			
109
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	
93
			session = HibernateUtils.currentSession();
94
			session.beginTransaction();
110 95
			
111
			/* Update profile */
112
			updateUserProfile ();
113
			/* Log successful */
114
			c_oLogStatus = AuditLogConstants.SUCCESSFUL;
96
			UserProfile userProfile = upass.findProfile(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), userAlias, Integer.valueOf(appId), session);
97
			
98
			/*set user profile based on the app id, and update the profile after that*/
99
			//M2U
100
			if(Integer.valueOf(appId).equals(ClientApp.APP_ID_M2U))
101
			{
102
				M2uUser m2uProfile = (M2uUser) userProfile;
103
				
104
				M2uUser m2uProfile2 = m2uProfile;
105
				m2uProfile2.setPan1(getBeanMessage(IBSSUserConstants.M2U_PAN1));
106
				m2uProfile2.setPan2(getBeanMessage(IBSSUserConstants.M2U_PAN2));
107
				
108
				valueMap = BeanToBeanTransferUtils.convertBeanToStringForDiffValue(m2uProfile, m2uProfile2);
109
				
110
				rc = upass.updateProfileShallowly(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), m2uProfile2, session);
111
			}
112
			//Online Stock
113
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_STOCK))
114
			{
115
				StockUser stockProfile = (StockUser) userProfile;
116
				
117
				StockUser stockProfile2 = stockProfile;
118
				stockProfile2.setIdNo(getBeanMessage(IBSSUserConstants.ONLINE_STOCK_ID_NO));
119
				
120
				valueMap = BeanToBeanTransferUtils.convertBeanToStringForDiffValue(stockProfile, stockProfile2);
121
				
122
				rc = upass.updateProfileShallowly(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), stockProfile2, session);
123
			}
124
			//Ticketing
125
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_TICKETING))
126
			{
127
				TicketingUser ticketProfile = (TicketingUser) userProfile;
128
				
129
				TicketingUser ticketProfile2 = ticketProfile;
130
				ticketProfile2.setFirstName(getBeanMessage(IBSSUserConstants.TICKETING_FIRST_NAME));
131
				ticketProfile2.setFullName(getBeanMessage(IBSSUserConstants.TICKETING_FULL_NAME));
132
				ticketProfile2.setLastName(getBeanMessage(IBSSUserConstants.TICKETING_LAST_NAME));
133
				ticketProfile2.setPayeeCode(getBeanMessage(IBSSUserConstants.TICKETING_PAYEE_CODE));
134
				
135
				valueMap = BeanToBeanTransferUtils.convertBeanToStringForDiffValue(ticketProfile, ticketProfile2);
136
				
137
				rc = upass.updateProfileShallowly(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), ticketProfile2, session);
138
			}
139
			//CCPP
140
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_CCPP))
141
			{
142
				IbccUser ibccProfile = (IbccUser) userProfile;
143
				
144
				IbccUser ibccProfile2 = ibccProfile;
145
				ibccProfile2.setPanCc(getBeanMessage(IBSSUserConstants.CCPP_PAN_CC));
146
				
147
				valueMap = BeanToBeanTransferUtils.convertBeanToStringForDiffValue(ibccProfile, ibccProfile2);
148
				
149
				rc = upass.updateProfileShallowly(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), ibccProfile2, session);
150
			}
151
			//IM2U
152
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_IM2U))
153
			{
154
				Im2uUser im2uProfile = (Im2uUser) userProfile;
155
				
156
				Im2uUser im2uProfile2 = im2uProfile;
157
				im2uProfile2.setWsFlag(getBeanMessage(IBSSUserConstants.IM2U_WS_FLAG));
158
				im2uProfile2.setWsIdentCode(getBeanMessage(IBSSUserConstants.IM2U_WS_IDENT_CODE));
159
				im2uProfile2.setWsMySgId(getBeanMessage(IBSSUserConstants.IM2U_WS_MYSG_ID));
160
				
161
				SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
162
				Date wsRegTimeStamp = dateFormat.parse(getBeanMessage(IBSSUserConstants.IM2U_WS_REG_TIMESTAMP));
163
				im2uProfile2.setWsRegTimeStamp(wsRegTimeStamp);
164
				
165
				valueMap = BeanToBeanTransferUtils.convertBeanToStringForDiffValue(im2uProfile, im2uProfile2);
166
				
167
				rc = upass.updateProfileShallowly(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), im2uProfile2, session);
168
			}
169
			
170
			System.out.println("rc = "+rc);
171
			/*check response code*/
172
			switch(rc)
173
			{
174
				case MinimalConstants.ERR_SUCCESS:
175
					logReason = "Edit Successful: " + userAlias;
176
					logStatus = AuditLogConstants.SUCCESSFUL;
177
					break;
178
				case MinimalConstants.ERR_ALREADY_EXIST:
179
					logReason = AuditLogConstants.CREATE_ADMIN_R_ALREADY_EXIST + userAlias;
180
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, StatusConstants.UPASS_ERR_USER_ALREADY_EXIST);
181
				case MinimalConstants.ERR_INVALID_INPUT:
182
					logReason = String.valueOf(rc) + ResourcesUtils.getApplicationResourceMessage("error.invalid.input");
183
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, StatusConstants.UPASS_ERR_INVALID_INPUT);
184
				default:
185
					logReason = "Unhandled Response: " + userAlias + " " + rc;
186
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
187
			}
115 188
			
116 189
			setBeanMessage (IBSSUserConstants.JSP_TITLE, 
117
					ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + c_sUserAlias + " " +
190
					ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + userAlias + " " +
118 191
					ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
119 192
					ResourcesUtils.getApplicationResourceMessage ("user.edit.desc"));
120 193
		}
......
127 200
			try
128 201
			{
129 202
				getAuditLogDAO ().logActivity (USER_ACTIVITY_TYTPE.EDIT_RIB_USER_PROFILE.getID(), 
130
						USER_ACTIVITY_TYTPE.EDIT_RIB_USER_PROFILE.getDescription() + c_sUserAlias, 
131
						c_oLogStatus, 
132
						c_sLogReason, 
203
						USER_ACTIVITY_TYTPE.EDIT_RIB_USER_PROFILE.getDescription() + ": " + userAlias, 
204
						logStatus, 
205
						logReason, 
133 206
						getIBSSessionObjects ().getSessionUserAlias (), 
134 207
						getIBSSessionObjects ().getSessionUser ().getRoleId (),
135 208
						new Long(0),
136 209
						getIBSSessionObjects ().getSessionUser ().getCurrentLoginIPAddress(),
137
						BeanToBeanTransferUtils.convertBeanToStringForDiffValue(retailUserEnquiryBeforeValue, c_oUser));
210
						valueMap);
138 211
			}
139 212
			catch (Exception e)
140 213
			{
......
144 217
		IBSSLogger.debug (c_oClass, "Exiting updateEditedProfile");
145 218
	}
146 219

  
147
	private void updateUserProfile () throws Exception
148
	{
149
		IBSSLogger.debug (c_oClass, "Entering updateUserProfile");
150
		
151
		getUserProfileDAO ().updateUser (c_oUser);
152
		c_sLogReason = "Update Successful";
153
		
154
		IBSSLogger.debug (c_oClass, "Exiting updateUserProfile");
155
	}
156
	
157
	private void updateCurrentUserProfile () throws Exception
158
	{
159
		IBSSLogger.debug (c_oClass, "Entering updateCurrentUserProfile");
160
		
161
		if(!DataValidator.isEmptyString (c_sEditUserDobBrd))
162
		{
163
			c_sEditUserDobBrd = c_sEditUserDobBrd.substring (0, 2) + c_sEditUserDobBrd.substring (3, 5) + c_sEditUserDobBrd.substring (6, 10);
164
		}
165
		
166
		c_oUserViewBean 	= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_VIEW);
167
		
168
		c_oUser = getUserProfileDAO ().getProfileByID (c_oDetailUserID);
169
		
170
		if(c_oUser != null)
171
		{
172
			Date m_oDate = new Date();
173
			
174
			currentUserProfile = (IbCustProfile) c_oUser.clone();
175
			//make a copy of the user group before update
176
			retailUserEnquiryBeforeValue= new IbCustProfile();
177
			BeanToBeanTransferUtils.BeanToBeanDataTransfer(c_oUser, retailUserEnquiryBeforeValue);
178
			
179
			c_oUser.setUserName (c_sEditUserName);
180
			c_oUser.setUserEmail (c_sEditUserEmail);
181
			c_oUser.setUserDobBrd (c_sEditUserDobBrd);
182
			c_oUser.setUserGender (c_sEditUserGender);
183
			c_oUser.setUserRace (c_sEditUserRace);
184
			c_oUser.setUserOfficePhone (c_sEditUserOfficeNo);
185
			c_oUser.setUserHomePhone (c_sEditUserHomeNo);
186
			c_oUser.setUserTacPhone (c_sEditUserTacNo);
187
			c_oUser.setUserMobilePhone (c_sEditUserMobileNo);
188
			c_oUser.setUserAddr1 (c_sEditUserAddr1);
189
			c_oUser.setUserAddr2 (c_sEditUserAddr2);
190
			c_oUser.setUserAddr3 (c_sEditUserAddr3);
191
			c_oUser.setUserAddr4 (c_sEditUserAddr4);
192
			c_oUser.setUserAddr5 (c_sEditUserAddr5);
193
			c_oUser.setUpdatedBy (getIBSSessionObjects ().getSessionUser ().getUserId ());
194
			c_oUser.setUpdatedDate (m_oDate);
195
			c_oUser.getMainProfile().setModifTime(m_oDate);
196
			
197
			setBeanMessage (IBSSUserConstants.USER_ID, String.valueOf (c_oDetailUserID));
198
		}
199
		else
200
		{
201
			c_sLogReason = "Unknown User ID: " + c_oDetailUserID;
202
			throw IBSSErrorHandler.createServiceException(IBSSServiceException.GENERAL_SERVICE_ERROR, true,
203
					new String[] {CommonErrorCode.GENERIC_CODE, "", "", "", "Unknown user id request"}, c_oClass);
204
		}
205
		
206
		IBSSLogger.debug (c_oClass, "Exiting updateCurrentUserProfile");
207
	}
208

  
209
	private void getEditInputs () throws IBSSGenericException
210
	{
211
		IBSSLogger.debug (c_oClass, "Entering getEditInputs");
212
		
213
		c_oDetailBean 				= (IBSSDynaBean) getIBSSDynaBean ().get (IBSSUserConstants.IBSS_USER_DETAIL);
214
		c_sUserAlias 				= (String) c_oDetailBean.get (IBSSUserConstants.USER_ALIAS);
215
		c_oDetailUserID				= (Long) c_oDetailBean.get (IBSSUserConstants.USER_ID);
216
		c_sDetailUserStatusKey		= (String) c_oDetailBean.get (IBSSUserConstants.USER_STATE_KEY);
217
		c_sEditUserDobBrd			= getBeanMessage (IBSSUserConstants.USER_DOB_BRD);
218
		c_sEditUserEmail 			= getBeanMessage (IBSSUserConstants.USER_EMAIL);
219
		c_sEditUserGender		 	= getBeanMessage (IBSSUserConstants.USER_GENDER);
220
		c_sEditUserRace			 	= getBeanMessage (IBSSUserConstants.USER_RACE);
221
		c_sEditUserName 			= getBeanMessage (IBSSUserConstants.USER_NAME);
222
		c_sEditUserOfficeNo 		= getBeanMessage (IBSSUserConstants.USER_OFFICE_NO);
223
		c_sEditUserHomeNo			= getBeanMessage (IBSSUserConstants.USER_HOME_PHONE);
224
		c_sEditUserTacNo			= getBeanMessage (IBSSUserConstants.USER_TAC_PHONE);
225
		c_sEditUserMobileNo 		= getBeanMessage (IBSSUserConstants.USER_MOBILE_NO);
226
		c_sEditUserAddr1 			= getBeanMessage (IBSSUserConstants.ADDRESS1);
227
		c_sEditUserAddr2 			= getBeanMessage (IBSSUserConstants.ADDRESS2);
228
		c_sEditUserAddr3 			= getBeanMessage (IBSSUserConstants.ADDRESS3);
229
		c_sEditUserAddr4 			= getBeanMessage (IBSSUserConstants.ADDRESS4);
230
		c_sEditUserAddr5 			= getBeanMessage (IBSSUserConstants.ADDRESS5);
231
		
232
		IBSSLogger.debug (c_oClass, "Exiting getEditInputs");
233
	}
234 220
}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryEditServices.java
11 11

  
12 12
package com.ib.ibss.enterprise.services.ss112_user;
13 13

  
14
import java.util.LinkedHashMap;
15

  
16
import my.com.upass.pojo.ClientApp;
17

  
14 18
import com.ib.ibss.common.utils.IBSSLogger;
19
import com.ib.ibss.common.utils.ResourcesUtils;
15 20
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
16 21
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
17 22
import com.ib.ibss.error.exception.IBSSGenericException;
......
48 53
		super(sessionObjects);
49 54
	}
50 55

  
56
	@SuppressWarnings("unchecked")
51 57
	public void execute () throws IBSSGenericException
52 58
	{
53 59
		IBSSLogger.debug (c_oClass, "Entering execute");
54 60
		
55
		IBSSDynaBean m_oDetailBean;
61
		IBSSDynaBean detailBean;
62
		LinkedHashMap<String, String> detailMap = new LinkedHashMap<String, String> ();
63
		String appId = "";
56 64
		
57 65
		try
58 66
		{
59
			m_oDetailBean 		= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_DETAIL);
67
			detailBean 	= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_DETAIL);
68
			detailMap		= (LinkedHashMap<String, String>) detailBean.get(IBSSUserConstants.USER_DETAILS_MAP);
69
			appId			= (String) detailBean.get (IBSSUserConstants.USER_APPLICATION_KEY);
60 70
			
61
			setBeanMessage (IBSSUserConstants.USER_EMAIL, (String) m_oDetailBean.get (IBSSUserConstants.USER_EMAIL));
62
			setBeanMessage (IBSSUserConstants.USER_NAME, (String) m_oDetailBean.get (IBSSUserConstants.USER_NAME));
63
			setBeanMessage (IBSSUserConstants.USER_GENDER, (String) m_oDetailBean.get (IBSSUserConstants.USER_GENDER));
64
			setBeanMessage (IBSSUserConstants.USER_GROUP, String.valueOf (m_oDetailBean.get (IBSSUserConstants.USER_GROUP)));
65
			setBeanMessage (IBSSUserConstants.USER_MOBILE_NO, (String) m_oDetailBean.get (IBSSUserConstants.USER_MOBILE_NO));
66
			setBeanMessage (IBSSUserConstants.USER_HOME_PHONE, (String) m_oDetailBean.get (IBSSUserConstants.USER_HOME_PHONE));
67
			setBeanMessage (IBSSUserConstants.USER_TAC_PHONE, (String) m_oDetailBean.get (IBSSUserConstants.USER_TAC_PHONE));
68
			setBeanMessage (IBSSUserConstants.USER_OFFICE_NO, (String) m_oDetailBean.get (IBSSUserConstants.USER_OFFICE_NO));
69
			setBeanMessage (IBSSUserConstants.USER_DOB_BRD, (String) m_oDetailBean.get (IBSSUserConstants.USER_DOB_BRD));
70
			setBeanMessage (IBSSUserConstants.USER_RACE, (String) m_oDetailBean.get (IBSSUserConstants.USER_RACE));
71
			setBeanMessage (IBSSUserConstants.ADDRESS1, (String) m_oDetailBean.get (IBSSUserConstants.ADDRESS1));
72
			setBeanMessage (IBSSUserConstants.ADDRESS2, (String) m_oDetailBean.get (IBSSUserConstants.ADDRESS2));
73
			setBeanMessage (IBSSUserConstants.ADDRESS3, (String) m_oDetailBean.get (IBSSUserConstants.ADDRESS3));
74
			setBeanMessage (IBSSUserConstants.ADDRESS4, (String) m_oDetailBean.get (IBSSUserConstants.ADDRESS4));
75
			setBeanMessage (IBSSUserConstants.ADDRESS5, (String) m_oDetailBean.get (IBSSUserConstants.ADDRESS5));
71
			getIBSSDynaBean().set (IBSSUserConstants.USER_ID, ((Long)detailBean.get (IBSSUserConstants.USER_ID)).toString());
72
			setBeanMessage (IBSSUserConstants.USER_ALIAS, (String) detailBean.get (IBSSUserConstants.USER_ALIAS));
73
			setBeanMessage (IBSSUserConstants.USER_STATE_KEY, ((Long) detailBean.get (IBSSUserConstants.USER_STATE_KEY)).toString());
74
			setBeanMessage (IBSSUserConstants.USER_STATE, (String) detailBean.get (IBSSUserConstants.USER_STATE));
75
			setBeanMessage (IBSSUserConstants.USER_APPLICATION, (String) detailBean.get (IBSSUserConstants.USER_APPLICATION));
76
			setBeanMessage (IBSSUserConstants.USER_APPLICATION_KEY, appId);
77
			setBeanMessage (IBSSUserConstants.CREATION_DATE, (String) detailBean.get (IBSSUserConstants.CREATION_DATE));
76 78
			
77
			getIBSSDynaBean ().set (IBSSUserConstants.IBSS_USER_DETAIL, m_oDetailBean);
79
			if(Integer.valueOf(appId).equals(ClientApp.APP_ID_M2U))
80
			{
81
				setBeanMessage (IBSSUserConstants.M2U_PAN1, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.pan.1")));
82
				setBeanMessage (IBSSUserConstants.M2U_PAN2, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.pan.2")));
83
			}
84
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_STOCK))
85
			{
86
				setBeanMessage (IBSSUserConstants.ONLINE_STOCK_ID_NO, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.id.no")));
87
			}
88
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_ONLINE_TICKETING))
89
			{
90
				setBeanMessage (IBSSUserConstants.TICKETING_FIRST_NAME, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.first.name")));
91
				setBeanMessage (IBSSUserConstants.TICKETING_FULL_NAME, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.full.name")));
92
				setBeanMessage (IBSSUserConstants.TICKETING_LAST_NAME, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.last.name")));
93
				setBeanMessage (IBSSUserConstants.TICKETING_PAYEE_CODE, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.payee.code")));
94
			}
95
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_CCPP))
96
			{
97
				setBeanMessage (IBSSUserConstants.CCPP_PAN_CC, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.pan.cc")));
98
			}
99
			else if(Integer.valueOf(appId).equals(ClientApp.APP_ID_IM2U))
100
			{
101
				setBeanMessage (IBSSUserConstants.IM2U_WS_FLAG, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.ws.flag")));
102
				setBeanMessage (IBSSUserConstants.IM2U_WS_IDENT_CODE, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.ws.ident.code")));
103
				setBeanMessage (IBSSUserConstants.IM2U_WS_MYSG_ID, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.ws.my.sg.id")));
104
				setBeanMessage (IBSSUserConstants.IM2U_WS_REG_TIMESTAMP, detailMap.get(ResourcesUtils.getApplicationResourceMessage("user.ws.registration.time.stamp")));
105
			}
106
			
78 107
		}
79 108
		catch (Exception e)
80 109
		{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserEditResultServices.java
81 81
			
82 82
			int rc = upass.UA_ModifyUser(getIBSSessionObjects().getSessionUserAlias(), getIBSSessionObjects().getSessionUserPassword(), userAlias, userDescription, null);
83 83
			
84
			if(rc != MinimalConstants.ERR_SUCCESS)
84
			switch(rc)
85 85
			{
86
				switch(rc)
87
				{
88 86
				case MinimalConstants.ERR_SUCCESS:
89 87
					logReason = "Edit Successful: " + userAlias;
90 88
					status 	  = AuditLogConstants.SUCCESSFUL;
......
98 96
				default:
99 97
					logReason = "Unhandled Response: " + userAlias + " " + rc;
100 98
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
101
				}
102 99
			}
103 100
			
104 101
			getIBSSDynaBean ().set (IBSSUserConstants.JSP_TITLE, 

Also available in: Unified diff