Revision 14:c3981884205f

View differences:

WebContent/WEB-INF/config/ss102_user_admin/view-beans.xml
158 158
			
159 159
			<form-property name="userApplicationKey" type="java.lang.String" />
160 160
			<form-property name="userApplication" type="java.lang.String" />
161
			<form-property name="userAuthMode" type="java.lang.String" />	
161
			<form-property name="userAuthMode" type="java.lang.String" />
162
			
163
			<form-property name="userDetailsMap" type="java.util.Map" />	
162 164
		</form-bean>
163 165

  
164 166
		<form-bean name="ibssUserBean" type="org.apache.struts.action.DynaActionForm">
WebContent/WEB-INF/config/ss112_user/struts-config.xml
55 55
			<forward name="success" path=".ibss.retail.enquiry.details.edit" />
56 56
			<forward name="resetPass" path="/ss112/userResetPassScreen.do" />
57 57
			<forward name="deleteConfirm" path="/ss112/delUserConfirm.do" />
58
			<forward name="suspend" path="/ss112/userSuspend.do" />
59
			<forward name="unsuspend" path="/ss112/userUnsuspend.do" />
60
			<forward name="unlock" path="/ss112/userUnlock.do" />
61
			<forward name="activate" path="/ss112/userActivate.do" />
62
			<forward name="enableChgMobileNo" path="/ss112/userEnableChgMobileNo.do" />
63
			<forward name="disableChgMobileNo" path="/ss112/userDisableChgMobileNo.do" />
64 58
			<forward name="back" path=".ibss.retail.enquiry.main" />
65 59
			<forward name="failure" path=".ibss.retail.enquiry.details" />
66 60
		</action>
WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
28 28
	<table class="tabularForm">
29 29
		<tr>
30 30
			<td width="61">&nbsp;</td>
31
			<td width="160">&nbsp;</td>
31
			<td width="200">&nbsp;</td>
32 32
			<td colspan="2">&nbsp;</td>
33 33
			<td width="47" colspan="2">&nbsp;</td>
34 34
		</tr>
......
48 48
		</tr>
49 49
		<tr>
50 50
			<td>&nbsp;</td>
51
			<td><bean:message key="user.display.name" />:</td>
51
			<td><bean:message key="user.customer.name" />:</td>
52 52
			<td colspan="2"><strong> <c:choose>
53
						<c:when test="${not empty detailBean.map.userDisplayName}">
54
							<c:out value="${detailBean.map.userDisplayName}"></c:out>
53
						<c:when test="${not empty detailBean.map.userName}">
54
							<c:out value="${detailBean.map.userName}"></c:out>
55 55
						</c:when>
56 56
						<c:otherwise>-</c:otherwise>
57 57
					</c:choose> </strong></td>
......
68 68
					</c:choose> </strong></td>
69 69
			<td colspan="2">&nbsp;</td>
70 70
		</tr>
71
	</table>
72
	<h5>
73
		<bean:message key="user.personal.details" />
74
	</h5>
75
	<table class="tabularForm">
76
		<tr>
77
			<td width="61">&nbsp;</td>
78
			<td width="160">&nbsp;</td>
79
			<td colspan="2">&nbsp;</td>
80
			<td width="47" colspan="2">&nbsp;</td>
81
		</tr>
82 71
		<tr>
83 72
			<td>&nbsp;</td>
84
			<td><bean:message key="user.salutation" />:</td>
73
			<td><bean:message key="user.application" />:</td>
85 74
			<td colspan="2"><strong> <c:choose>
86
						<c:when test="${not empty detailBean.map.userSalutation}">
87
							<c:out value="${detailBean.map.userSalutation}"></c:out>
75
						<c:when test="${not empty detailBean.map.userApplication}">
76
							<c:out value="${detailBean.map.userApplication}"></c:out>
88 77
						</c:when>
89 78
						<c:otherwise>-</c:otherwise>
90 79
					</c:choose> </strong></td>
91 80
			<td colspan="2">&nbsp;</td>
92 81
		</tr>
93
		<tr>
82
		<%-- <tr>
94 83
			<td>&nbsp;</td>
95
			<td><bean:message key="user.customer.name" />:</td>
84
			<td><bean:message key="user.authentication.mode" />:</td>
96 85
			<td colspan="2"><strong> <c:choose>
97
						<c:when test="${not empty detailBean.map.userName}">
98
							<c:out value="${detailBean.map.userName}"></c:out>
86
						<c:when test="${not empty detailBean.map.userAuthMode}">
87
							<c:out value="${detailBean.map.userAuthMode}"></c:out>
99 88
						</c:when>
100 89
						<c:otherwise>-</c:otherwise>
101 90
					</c:choose> </strong></td>
102 91
			<td colspan="2">&nbsp;</td>
103
		</tr>
104
		
105
		<tr>
106
			<td>&nbsp;</td>
107
			<td><bean:message key="user.customer.id" />:</td>
108
			<td colspan="2"><strong> <c:choose>
109
						<c:when test="${not empty detailBean.map.userIDNo}">
110
							<c:out value="${detailBean.map.userIDNo}"></c:out>
111
						</c:when>
112
						<c:otherwise>-</c:otherwise>
113
					</c:choose> </strong></td>
114
			<td colspan="2">&nbsp;</td>
115
		</tr>
116
		
117
		<tr>
118
			<td>&nbsp;</td>
119
			<td><bean:message key="user.id.type" />:</td>
120
			<td colspan="2"><strong> <c:choose>
121
						<c:when test="${not empty detailBean.map.userIDType}">
122
							<c:out value="${detailBean.map.userIDType}"></c:out>
123
						</c:when>
124
						<c:otherwise>-</c:otherwise>
125
					</c:choose> </strong></td>
126
			<td colspan="2">&nbsp;</td>
127
		</tr>
128
		
129
		<tr>
130
			<td>&nbsp;</td>
131
			<td><bean:message key="user.place.of.birth" />:</td>
132
			<td colspan="2"><strong> <c:choose>
133
						<c:when test="${not empty detailBean.map.userPlaceOfBirth}">
134
							<c:out value="${detailBean.map.userPlaceOfBirth}"></c:out>
135
						</c:when>
136
						<c:otherwise>-</c:otherwise>
137
					</c:choose> </strong></td>
138
			<td colspan="2">&nbsp;</td>
139
		</tr>
140
		<tr>
141
			<td>&nbsp;</td>
142
			<td><bean:message key="user.dob.brd" />:</td>
143
			<td colspan="2"><strong> <c:choose>
144
						<c:when test="${not empty detailBean.map.userDobBrd}">
145
							<c:out value="${detailBean.map.userDobBrd}"></c:out>
146
						</c:when>
147
						<c:otherwise>-</c:otherwise>
148
					</c:choose> </strong></td>
149
			<td colspan="2">&nbsp;</td>
150
		</tr>
151
		<tr>
152
			<td>&nbsp;</td>
153
			<td><bean:message key="user.gender" />:</td>
154
			<td colspan="2"><strong> <c:choose>
155
						<c:when test="${not empty detailBean.map.userGender}">
156
							<c:out value="${detailBean.map.userGender}"></c:out>
157
						</c:when>
158
						<c:otherwise>-</c:otherwise>
159
					</c:choose> </strong></td>
160
			<td colspan="2">&nbsp;</td>
161
		</tr>
162
		<tr>
163
			<td>&nbsp;</td>
164
			<td><bean:message key="user.race" />:</td>
165
			<td colspan="2"><strong> <c:choose>
166
						<c:when test="${not empty detailBean.map.userRace}">
167
							<c:out value="${detailBean.map.userRace}"></c:out>
168
						</c:when>
169
						<c:otherwise>-</c:otherwise>
170
					</c:choose> </strong></td>
171
			<td colspan="2">&nbsp;</td>
172
		</tr>
173
		<tr>
174
			<td>&nbsp;</td>
175
			<td><bean:message key="user.bumi" />:</td>
176
			<td colspan="2"><strong> <c:choose>
177
						<c:when test="${not empty detailBean.map.userBumi}">
178
							<c:out value="${detailBean.map.userBumi}"></c:out>
179
						</c:when>
180
						<c:otherwise>-</c:otherwise>
181
					</c:choose> </strong></td>
182
			<td colspan="2">&nbsp;</td>
183
		</tr>
184
		<tr>
185
			<td>&nbsp;</td>
186
			<td><bean:message key="user.nationality" />:</td>
187
			<td colspan="2"><strong> <c:choose>
188
						<c:when test="${not empty detailBean.map.userNationality}">
189
							<c:out value="${detailBean.map.userNationality}"></c:out>
190
						</c:when>
191
						<c:otherwise>-</c:otherwise>
192
					</c:choose> </strong></td>
193
			<td colspan="2">&nbsp;</td>
194
		</tr>
195
		<tr>
196
			<td>&nbsp;</td>
197
			<td><bean:message key="user.duration.stay.pre.add" />:</td>
198
			<td colspan="2"><strong> <c:choose>
199
						<c:when test="${not empty detailBean.map.userDurationStayPreAdd}">
200
							<c:out value="${detailBean.map.userDurationStayPreAdd}"></c:out>
201
						</c:when>
202
						<c:otherwise>-</c:otherwise>
203
					</c:choose> </strong></td>
204
			<td colspan="2">&nbsp;</td>
205
		</tr>
206
		<tr>
207
			<td>&nbsp;</td>
208
			<td><bean:message key="user.no.of.dependents" />:</td>
209
			<td colspan="2"><strong> <c:choose>
210
						<c:when test="${not empty detailBean.map.userNoOfDependents}">
211
							<c:out value="${detailBean.map.userNoOfDependents}"></c:out>
212
						</c:when>
213
						<c:otherwise>-</c:otherwise>
214
					</c:choose> </strong></td>
215
			<td colspan="2">&nbsp;</td>
216
		</tr>
217
		<tr>
218
			<td>&nbsp;</td>
219
			<td><bean:message key="user.age.range" />:</td>
220
			<td colspan="2"><strong> <c:choose>
221
						<c:when test="${not empty detailBean.map.userAgeRange}">
222
							<c:out value="${detailBean.map.userAgeRange}"></c:out>
223
						</c:when>
224
						<c:otherwise>-</c:otherwise>
225
					</c:choose> </strong></td>
226
			<td colspan="2">&nbsp;</td>
227
		</tr>
228
		<tr>
229
			<td>&nbsp;</td>
230
			<td><bean:message key="user.access.no" />:</td>
231
			<td colspan="2"><strong> <c:choose>
232
						<c:when test="${not empty detailBean.map.userAccessNo}">
233
							<c:out value="${detailBean.map.userAccessNo}"></c:out>
234
						</c:when>
235
						<c:otherwise>-</c:otherwise>
236
					</c:choose> </strong></td>
237
			<td colspan="2">&nbsp;</td>
238
		</tr>
239
		<tr>
240
			<td>&nbsp;</td>
241
			<td><bean:message key="user.type" />:</td>
242
			<td colspan="2"><strong> <c:choose>
243
						<c:when test="${not empty detailBean.map.userType}">
244
							<c:out value="${detailBean.map.userType}"></c:out>
245
						</c:when>
246
						<c:otherwise>-</c:otherwise>
247
					</c:choose> </strong></td>
248
			<td colspan="2">&nbsp;</td>
249
		</tr>
250
		<tr>
251
			<td>&nbsp;</td>
252
			<td><bean:message key="user.income.range" />:</td>
253
			<td colspan="2"><strong> <c:choose>
254
						<c:when test="${not empty detailBean.map.userIncomeRange}">
255
							<c:out value="${detailBean.map.userIncomeRange}"></c:out>
256
						</c:when>
257
						<c:otherwise>-</c:otherwise>
258
					</c:choose> </strong></td>
259
			<td colspan="2">&nbsp;</td>
260
		</tr>
261
		<tr>
262
			<td>&nbsp;</td>
263
			<td><bean:message key="user.marital.status" />:</td>
264
			<td colspan="2"><strong> <c:choose>
265
						<c:when test="${not empty detailBean.map.userMaritalStatus}">
266
							<c:out value="${detailBean.map.userMaritalStatus}"></c:out>
267
						</c:when>
268
						<c:otherwise>-</c:otherwise>
269
					</c:choose> </strong></td>
270
			<td colspan="2">&nbsp;</td>
271
		</tr>
272
		<tr>
273
			<td>&nbsp;</td>
274
			<td><bean:message key="user.marital.date" />:</td>
275
			<td colspan="2"><strong> <c:choose>
276
						<c:when test="${not empty detailBean.map.userMaritalDate}">
277
							<c:out value="${detailBean.map.userMaritalDate}"></c:out>
278
						</c:when>
279
						<c:otherwise>-</c:otherwise>
280
					</c:choose> </strong></td>
281
			<td colspan="2">&nbsp;</td>
282
		</tr>
283
		<tr>
284
			<td>&nbsp;</td>
285
			<td><bean:message key="user.mother.maiden.name" />:</td>
286
			<td colspan="2"><strong> <c:choose>
287
						<c:when test="${not empty detailBean.map.userMotherMaidenName}">
288
							<c:out value="${detailBean.map.userMotherMaidenName}"></c:out>
289
						</c:when>
290
						<c:otherwise>-</c:otherwise>
291
					</c:choose> </strong></td>
292
			<td colspan="2">&nbsp;</td>
293
		</tr>
294
		<tr>
295
			<td>&nbsp;</td>
296
			<td><bean:message key="user.religion" />:</td>
297
			<td colspan="2"><strong> <c:choose>
298
						<c:when test="${not empty detailBean.map.userReligionCode}">
299
							<c:out value="${detailBean.map.userReligionCode}"></c:out>
300
						</c:when>
301
						<c:otherwise>-</c:otherwise>
302
					</c:choose> </strong></td>
303
			<td colspan="2">&nbsp;</td>
304
		</tr>
305
		<tr>
306
			<td>&nbsp;</td>
307
			<td><bean:message key="user.language" />:</td>
308
			<td colspan="2"><strong> <c:choose>
309
						<c:when test="${not empty detailBean.map.userLanguage}">
310
							<c:out value="${detailBean.map.userLanguage}"></c:out>
311
						</c:when>
312
						<c:otherwise>-</c:otherwise>
313
					</c:choose> </strong></td>
314
			<td colspan="2">&nbsp;</td>
315
		</tr>
316
		<tr>
317
			<td>&nbsp;</td>
318
			<td><bean:message key="user.employ.status" />:</td>
319
			<td colspan="2"><strong> <c:choose>
320
						<c:when test="${not empty detailBean.map.userEmployStatus}">
321
							<c:out value="${detailBean.map.userEmployStatus}"></c:out>
322
						</c:when>
323
						<c:otherwise>-</c:otherwise>
324
					</c:choose> </strong></td>
325
			<td colspan="2">&nbsp;</td>
326
		</tr>
327
		<tr>
328
			<td>&nbsp;</td>
329
			<td><bean:message key="user.education.level" />:</td>
330
			<td colspan="2"><strong> <c:choose>
331
						<c:when test="${not empty detailBean.map.userEducationLevel}">
332
							<c:out value="${detailBean.map.userEducationLevel}"></c:out>
333
						</c:when>
334
						<c:otherwise>-</c:otherwise>
335
					</c:choose> </strong></td>
336
			<td colspan="2">&nbsp;</td>
337
		</tr>
338
	</table>
339

  
340
	<h5>
341
		<bean:message key="user.contact.details" />
342
	</h5>
343
	<table class="tabularForm">
344
		<tr>
345
			<td width="61">&nbsp;</td>
346
			<td width="160">&nbsp;</td>
347
			<td colspan="2">&nbsp;</td>
348
			<td width="47" colspan="2">&nbsp;</td>
349
		</tr>
350
		<tr>
351
			<td>&nbsp;</td>
352
			<td><bean:message key="user.address" />:</td>
353
			<td colspan="2"><strong> <c:choose>
354
						<c:when test="${not empty detailBean.map.userAddr1}">
355
							<c:out value="${detailBean.map.userAddr1}"></c:out>
356
						</c:when>
357
						<c:otherwise>-</c:otherwise>
358
					</c:choose> </strong></td>
359
			<td colspan="2">&nbsp;</td>
360
		</tr>
361
		<tr>
362
			<td>&nbsp;</td>
363
			<td>&nbsp;</td>
364
			<td colspan="2"><strong> <c:choose>
365
						<c:when test="${not empty detailBean.map.userAddr2}">
366
							<c:out value="${detailBean.map.userAddr2}"></c:out>
367
						</c:when>
368
						<c:otherwise>-</c:otherwise>
369
					</c:choose> </strong></td>
370
			<td colspan="2">&nbsp;</td>
371
		</tr>
372
		<tr>
373
			<td>&nbsp;</td>
374
			<td>&nbsp;</td>
375
			<td colspan="2"><strong> <c:choose>
376
						<c:when test="${not empty detailBean.map.userAddr3}">
377
							<c:out value="${detailBean.map.userAddr3}"></c:out>
378
						</c:when>
379
						<c:otherwise>-</c:otherwise>
380
					</c:choose> </strong></td>
381
			<td colspan="2">&nbsp;</td>
382
		</tr>
383
		<tr>
384
			<td>&nbsp;</td>
385
			<td>&nbsp;</td>
386
			<td colspan="2"><strong> <c:choose>
387
						<c:when test="${not empty detailBean.map.userAddr4}">
388
							<c:out value="${detailBean.map.userAddr4}"></c:out>
389
						</c:when>
390
						<c:otherwise>-</c:otherwise>
391
					</c:choose> </strong></td>
392
			<td colspan="2">&nbsp;</td>
393
		</tr>
394
		<tr>
395
			<td>&nbsp;</td>
396
			<td>&nbsp;</td>
397
			<td colspan="2"><strong> <c:choose>
398
						<c:when test="${not empty detailBean.map.userAddr5}">
399
							<c:out value="${detailBean.map.userAddr5}"></c:out>
400
						</c:when>
401
						<c:otherwise>-</c:otherwise>
402
					</c:choose> </strong></td>
403
			<td colspan="2">&nbsp;</td>
404
		</tr>
405
		<tr>
406
			<td>&nbsp;</td>
407
			<td><bean:message key="user.residence" />:</td>
408
			<td colspan="2"><strong> <c:choose>
409
						<c:when test="${not empty detailBean.map.userResidence}">
410
							<c:out value="${detailBean.map.userResidence}"></c:out>
411
						</c:when>
412
						<c:otherwise>-</c:otherwise>
413
					</c:choose> </strong></td>
414
			<td colspan="2">&nbsp;</td>
415
		</tr>
416
		<tr>
417
			<td>&nbsp;</td>
418
			<td><bean:message key="user.city" />:</td>
419
			<td colspan="2"><strong> <c:choose>
420
						<c:when test="${not empty detailBean.map.userCity}">
421
							<c:out value="${detailBean.map.userCity}"></c:out>
422
						</c:when>
423
						<c:otherwise>-</c:otherwise>
424
					</c:choose> </strong></td>
425
			<td colspan="2">&nbsp;</td>
426
		</tr>
427
		<tr>
428
			<td>&nbsp;</td>
429
			<td><bean:message key="user.state" />:</td>
430
			<td colspan="2"><strong> <c:choose>
431
						<c:when test="${not empty detailBean.map.userAddrState}">
432
							<c:out value="${detailBean.map.userAddrState}"></c:out>
433
						</c:when>
434
						<c:otherwise>-</c:otherwise>
435
					</c:choose> </strong></td>
436
			<td colspan="2">&nbsp;</td>
437
		</tr>
438
		<tr>
439
			<td>&nbsp;</td>
440
			<td><bean:message key="user.postcode" />:</td>
441
			<td colspan="2"><strong> <c:choose>
442
						<c:when test="${not empty detailBean.map.userPostcode}">
443
							<c:out value="${detailBean.map.userPostcode}"></c:out>
444
						</c:when>
445
						<c:otherwise>-</c:otherwise>
446
					</c:choose> </strong></td>
447
			<td colspan="2">&nbsp;</td>
448
		</tr>
449
		<tr>
450
			<td>&nbsp;</td>
451
			<td><bean:message key="user.country" />:</td>
452
			<td colspan="2"><strong> <c:choose>
453
						<c:when test="${not empty detailBean.map.userCountry}">
454
							<c:out value="${detailBean.map.userCountry}"></c:out>
455
						</c:when>
456
						<c:otherwise>-</c:otherwise>
457
					</c:choose> </strong></td>
458
			<td colspan="2">&nbsp;</td>
459
		</tr>
460
		<tr>
461
			<td>&nbsp;</td>
462
			<td><bean:message key="user.home.no" />:</td>
463
			<td colspan="2"><strong> <c:choose>
464
						<c:when test="${not empty detailBean.map.userHomePhone}">
465
							<c:out value="${detailBean.map.userHomePhone}"></c:out>
466
						</c:when>
467
						<c:otherwise>-</c:otherwise>
468
					</c:choose> </strong></td>
469
			<td colspan="2">&nbsp;</td>
470
		</tr>
471
		<tr>
472
			<td>&nbsp;</td>
473
			<td><bean:message key="user.office.no" />:</td>
474
			<td colspan="2"><strong> <c:choose>
475
						<c:when test="${not empty detailBean.map.userOfficeNo}">
476
							<c:out value="${detailBean.map.userOfficeNo}"></c:out>
477
						</c:when>
478
						<c:otherwise>-</c:otherwise>
479
					</c:choose> </strong></td>
480
			<td colspan="2">&nbsp;</td>
481
		</tr>
482
		<tr>
483
			<td>&nbsp;</td>
484
			<td><bean:message key="user.mobile.no" />:</td>
485
			<td colspan="2"><strong> <c:choose>
486
						<c:when test="${not empty detailBean.map.userMobileNo}">
487
							<c:out value="${detailBean.map.userMobileNo}"></c:out>
488
						</c:when>
489
						<c:otherwise>-</c:otherwise>
490
					</c:choose> </strong></td>
491
			<td colspan="2">&nbsp;</td>
492
		</tr>
493
		<tr>
494
			<td>&nbsp;</td>
495
			<td><bean:message key="user.mobile.no.flag" />:</td>
496
			<td colspan="2"><strong> <c:choose>
497
						<c:when test="${not empty detailBean.map.userMobileNoFlag}">
498
							<c:out value="${detailBean.map.userMobileNoFlag}"></c:out>
499
						</c:when>
500
						<c:otherwise>-</c:otherwise>
501
					</c:choose> </strong></td>
502
			<td colspan="2">&nbsp;</td>
503
		</tr>
504
		<tr>
505
			<td>&nbsp;</td>
506
			<td><bean:message key="user.tac.no" />:</td>
507
			<td colspan="2"><strong> <c:choose>
508
						<c:when test="${not empty detailBean.map.userTacPhone}">
509
							<c:out value="${detailBean.map.userTacPhone}"></c:out>
510
						</c:when>
511
						<c:otherwise>-</c:otherwise>
512
					</c:choose> </strong></td>
513
			<td colspan="2">&nbsp;</td>
514
		</tr>
515
		<tr>
516
			<td>&nbsp;</td>
517
			<td><bean:message key="user.email" />:</td>
518
			<td colspan="2"><strong> <c:choose>
519
						<c:when test="${not empty detailBean.map.email}">
520
							<c:out value="${detailBean.map.email}"></c:out>
521
						</c:when>
522
						<c:otherwise>-</c:otherwise>
523
					</c:choose> </strong></td>
524
			<td colspan="2">&nbsp;</td>
525
		</tr>
526
	</table>
527
	<h5>
528
		<bean:message key="user.business.details" />
529
	</h5>
530
	<table class="tabularForm">
531
		<tr>
532
			<td width="61">&nbsp;</td>
533
			<td width="160">&nbsp;</td>
534
			<td colspan="2">&nbsp;</td>
535
			<td width="47" colspan="2">&nbsp;</td>
536
		</tr>
537
		<tr>
538
			<td>&nbsp;</td>
539
			<td><bean:message key="user.organization" />:</td>
540
			<td colspan="2"><strong> <c:choose>
541
						<c:when test="${not empty detailBean.map.userOrganization}">
542
							<c:out value="${detailBean.map.userOrganization}"></c:out>
543
						</c:when>
544
						<c:otherwise>-</c:otherwise>
545
					</c:choose> </strong></td>
546
			<td colspan="2">&nbsp;</td>
547
		</tr>
548
		<tr>
549
			<td>&nbsp;</td>
550
			<td><bean:message key="user.insider" />:</td>
551
			<td colspan="2"><strong> <c:choose>
552
						<c:when test="${not empty detailBean.map.userInsider}">
553
							<c:out value="${detailBean.map.userInsider}"></c:out>
554
						</c:when>
555
						<c:otherwise>-</c:otherwise>
556
					</c:choose> </strong></td>
557
			<td colspan="2">&nbsp;</td>
558
		</tr>
559
		<tr>
560
			<td>&nbsp;</td>
561
			<td><bean:message key="user.inquiry.code" />:</td>
562
			<td colspan="2"><strong> <c:choose>
563
						<c:when test="${not empty detailBean.map.userInquiryCode}">
564
							<c:out value="${detailBean.map.userInquiryCode}"></c:out>
565
						</c:when>
566
						<c:otherwise>-</c:otherwise>
567
					</c:choose> </strong></td>
568
			<td colspan="2">&nbsp;</td>
569
		</tr>
570
		<tr>
571
			<td>&nbsp;</td>
572
			<td><bean:message key="user.customer.status" />:</td>
573
			<td colspan="2"><strong> <c:choose>
574
						<c:when test="${not empty detailBean.map.userCustomerStatus}">
575
							<c:out value="${detailBean.map.userCustomerStatus}"></c:out>
576
						</c:when>
577
						<c:otherwise>-</c:otherwise>
578
					</c:choose> </strong></td>
579
			<td colspan="2">&nbsp;</td>
580
		</tr>
581
		<tr>
582
			<td>&nbsp;</td>
583
			<td><bean:message key="user.customer.status.date" />:</td>
584
			<td colspan="2"><strong> <c:choose>
585
						<c:when test="${not empty detailBean.map.userCustomerStatusDate}">
586
							<c:out value="${detailBean.map.userCustomerStatusDate}"></c:out>
587
						</c:when>
588
						<c:otherwise>-</c:otherwise>
589
					</c:choose> </strong></td>
590
			<td colspan="2">&nbsp;</td>
591
		</tr>
592
		<tr>
593
			<td>&nbsp;</td>
594
			<td><bean:message key="user.deceased" />:</td>
595
			<td colspan="2"><strong> <c:choose>
596
						<c:when test="${not empty detailBean.map.userDeceased}">
597
							<c:out value="${detailBean.map.userDeceased}"></c:out>
598
						</c:when>
599
						<c:otherwise>-</c:otherwise>
600
					</c:choose> </strong></td>
601
			<td colspan="2">&nbsp;</td>
602
		</tr>
603
		<tr>
604
			<td>&nbsp;</td>
605
			<td><bean:message key="user.deceased.date" />:</td>
606
			<td colspan="2"><strong> <c:choose>
607
						<c:when test="${not empty detailBean.map.userDeceasedDate}">
608
							<c:out value="${detailBean.map.userDeceasedDate}"></c:out>
609
						</c:when>
610
						<c:otherwise>-</c:otherwise>
611
					</c:choose> </strong></td>
612
			<td colspan="2">&nbsp;</td>
613
		</tr>
614
		<tr>
615
			<td>&nbsp;</td>
616
			<td><bean:message key="user.hold.mail.code" />:</td>
617
			<td colspan="2"><strong> <c:choose>
618
						<c:when test="${not empty detailBean.map.userHoldMailCode}">
619
							<c:out value="${detailBean.map.userHoldMailCode}"></c:out>
620
						</c:when>
621
						<c:otherwise>-</c:otherwise>
622
					</c:choose> </strong></td>
623
			<td colspan="2">&nbsp;</td>
624
		</tr>
625
		<tr>
626
			<td>&nbsp;</td>
627
			<td><bean:message key="user.promo.mail.code" />:</td>
628
			<td colspan="2"><strong> <c:choose>
629
						<c:when test="${not empty detailBean.map.userPromoMailCode}">
630
							<c:out value="${detailBean.map.userPromoMailCode}"></c:out>
631
						</c:when>
632
						<c:otherwise>-</c:otherwise>
633
					</c:choose> </strong></td>
634
			<td colspan="2">&nbsp;</td>
635
		</tr>
636
		<tr>
637
			<td>&nbsp;</td>
638
			<td><bean:message key="user.address.seq" />:</td>
639
			<td colspan="2"><strong> <c:choose>
640
						<c:when test="${not empty detailBean.map.userAddressSeq}">
641
							<c:out value="${detailBean.map.userAddressSeq}"></c:out>
642
						</c:when>
643
						<c:otherwise>-</c:otherwise>
644
					</c:choose> </strong></td>
645
			<td colspan="2">&nbsp;</td>
646
		</tr>
647
		<tr>
648
			<td>&nbsp;</td>
649
			<td><bean:message key="user.start.relationship" />:</td>
650
			<td colspan="2"><strong> <c:choose>
651
						<c:when test="${not empty detailBean.map.userStartRelationship}">
652
							<c:out value="${detailBean.map.userStartRelationship}"></c:out>
653
						</c:when>
654
						<c:otherwise>-</c:otherwise>
655
					</c:choose> </strong></td>
656
			<td colspan="2">&nbsp;</td>
657
		</tr>
658
		<tr>
659
			<td>&nbsp;</td>
660
			<td><bean:message key="user.review.date" />:</td>
661
			<td colspan="2"><strong> <c:choose>
662
						<c:when test="${not empty detailBean.map.userReviewDate}">
663
							<c:out value="${detailBean.map.userReviewDate}"></c:out>
664
						</c:when>
665
						<c:otherwise>-</c:otherwise>
666
					</c:choose> </strong></td>
667
			<td colspan="2">&nbsp;</td>
668
		</tr>
669
		<tr>
670
			<td>&nbsp;</td>
671
			<td><bean:message key="user.retention" />:</td>
672
			<td colspan="2"><strong> <c:choose>
673
						<c:when test="${not empty detailBean.map.userRetention}">
674
							<c:out value="${detailBean.map.userRetention}"></c:out>
675
						</c:when>
676
						<c:otherwise>-</c:otherwise>
677
					</c:choose> </strong></td>
678
			<td colspan="2">&nbsp;</td>
679
		</tr>
680
		<tr>
681
			<td>&nbsp;</td>
682
			<td><bean:message key="user.constitution" />:</td>
683
			<td colspan="2"><strong> <c:choose>
684
						<c:when test="${not empty detailBean.map.userConstitution}">
685
							<c:out value="${detailBean.map.userConstitution}"></c:out>
686
						</c:when>
687
						<c:otherwise>-</c:otherwise>
688
					</c:choose> </strong></td>
689
			<td colspan="2">&nbsp;</td>
690
		</tr>
691
		<tr>
692
			<td>&nbsp;</td>
693
			<td><bean:message key="user.customer.segment.code" />:</td>
694
			<td colspan="2"><strong> <c:choose>
695
						<c:when test="${not empty detailBean.map.userCustomerSegmentCode}">
696
							<c:out value="${detailBean.map.userCustomerSegmentCode}"></c:out>
697
						</c:when>
698
						<c:otherwise>-</c:otherwise>
699
					</c:choose> </strong></td>
700
			<td colspan="2">&nbsp;</td>
701
		</tr>
702
		<tr>
703
			<td>&nbsp;</td>
704
			<td><bean:message key="user.no.of.employee" />:</td>
705
			<td colspan="2"><strong> <c:choose>
706
						<c:when test="${not empty detailBean.map.userNoOfEmployee}">
707
							<c:out value="${detailBean.map.userNoOfEmployee}"></c:out>
708
						</c:when>
709
						<c:otherwise>-</c:otherwise>
710
					</c:choose> </strong></td>
711
			<td colspan="2">&nbsp;</td>
712
		</tr>
713
		<tr>
714
			<td>&nbsp;</td>
715
			<td><bean:message key="user.high.risk" />:</td>
716
			<td colspan="2"><strong> <c:choose>
717
						<c:when test="${not empty detailBean.map.userHighRisk}">
718
							<c:out value="${detailBean.map.userHighRisk}"></c:out>
719
						</c:when>
720
						<c:otherwise>-</c:otherwise>
721
					</c:choose> </strong></td>
722
			<td colspan="2">&nbsp;</td>
723
		</tr>
724
		<tr>
725
			<td>&nbsp;</td>
726
			<td><bean:message key="user.high.risk.code" />:</td>
727
			<td colspan="2"><strong> <c:choose>
728
						<c:when test="${not empty detailBean.map.userHighRiskCode}">
729
							<c:out value="${detailBean.map.userHighRiskCode}"></c:out>
730
						</c:when>
731
						<c:otherwise>-</c:otherwise>
732
					</c:choose> </strong></td>
733
			<td colspan="2">&nbsp;</td>
734
		</tr>
735
		<tr>
736
			<td>&nbsp;</td>
737
			<td><bean:message key="user.staff.flag" />:</td>
738
			<td colspan="2"><strong> <c:choose>
739
						<c:when test="${not empty detailBean.map.userStaffFlag}">
740
							<c:out value="${detailBean.map.userStaffFlag}"></c:out>
741
						</c:when>
742
						<c:otherwise>-</c:otherwise>
743
					</c:choose> </strong></td>
744
			<td colspan="2">&nbsp;</td>
745
		</tr>
746
		<tr>
747
			<td>&nbsp;</td>
748
			<td><bean:message key="user.staff.id.no" />:</td>
749
			<td colspan="2"><strong> <c:choose>
750
						<c:when test="${not empty detailBean.map.userStaffIDNo}">
751
							<c:out value="${detailBean.map.userStaffIDNo}"></c:out>
752
						</c:when>
753
						<c:otherwise>-</c:otherwise>
754
					</c:choose> </strong></td>
755
			<td colspan="2">&nbsp;</td>
756
		</tr>
757
		<tr>
758
			<td>&nbsp;</td>
759
			<td><bean:message key="user.bussiness.premise.code" />:</td>
760
			<td colspan="2"><strong> <c:choose>
761
						<c:when test="${not empty detailBean.map.userBussPremiseCode}">
762
							<c:out value="${detailBean.map.userBussPremiseCode}"></c:out>
763
						</c:when>
764
						<c:otherwise>-</c:otherwise>
765
					</c:choose> </strong></td>
766
			<td colspan="2">&nbsp;</td>
767
		</tr>
768
		<tr>
769
			<td>&nbsp;</td>
770
			<td><bean:message key="user.business.type" />:</td>
771
			<td colspan="2"><strong> <c:choose>
772
						<c:when test="${not empty detailBean.map.userBussType}">
773
							<c:out value="${detailBean.map.userBussType}"></c:out>
774
						</c:when>
775
						<c:otherwise>-</c:otherwise>
776
					</c:choose> </strong></td>
777
			<td colspan="2">&nbsp;</td>
778
		</tr>
779
		<tr>
780
			<td>&nbsp;</td>
781
			<td><bean:message key="user.bussiness.operation.hour" />:</td>
782
			<td colspan="2"><strong> <c:choose>
783
						<c:when test="${not empty detailBean.map.userBussOperationHour}">
784
							<c:out value="${detailBean.map.userBussOperationHour}"></c:out>
785
						</c:when>
786
						<c:otherwise>-</c:otherwise>
787
					</c:choose> </strong></td>
788
			<td colspan="2">&nbsp;</td>
789
		</tr>
790
		<tr>
791
			<td>&nbsp;</td>
792
			<td><bean:message key="user.office.contact.name" />:</td>
793
			<td colspan="2"><strong> <c:choose>
794
						<c:when test="${not empty detailBean.map.userOfficeContactName}">
795
							<c:out value="${detailBean.map.userOfficeContactName}"></c:out>
796
						</c:when>
797
						<c:otherwise>-</c:otherwise>
798
					</c:choose> </strong></td>
799
			<td colspan="2">&nbsp;</td>
800
		</tr>
801
		<tr>
802
			<td>&nbsp;</td>
803
			<td><bean:message key="user.fax" />:</td>
804
			<td colspan="2"><strong> <c:choose>
805
						<c:when test="${not empty detailBean.map.userFax}">
806
							<c:out value="${detailBean.map.userFax}"></c:out>
807
						</c:when>
808
						<c:otherwise>-</c:otherwise>
809
					</c:choose> </strong></td>
810
			<td colspan="2">&nbsp;</td>
811
		</tr>
812
		<tr>
813
			<td>&nbsp;</td>
814
			<td><bean:message key="user.fax.contanct.name" />:</td>
815
			<td colspan="2"><strong> <c:choose>
816
						<c:when test="${not empty detailBean.map.userFaxContactName}">
817
							<c:out value="${detailBean.map.userFaxContactName}"></c:out>
818
						</c:when>
819
						<c:otherwise>-</c:otherwise>
820
					</c:choose> </strong></td>
821
			<td colspan="2">&nbsp;</td>
822
		</tr>
823
		<tr>
824
			<td>&nbsp;</td>
825
			<td><bean:message key="user.year" />:</td>
826
			<td colspan="2"><strong> <c:choose>
827
						<c:when test="${not empty detailBean.map.userYear}">
828
							<c:out value="${detailBean.map.userYear}"></c:out>
829
						</c:when>
830
						<c:otherwise>-</c:otherwise>
831
					</c:choose> </strong></td>
832
			<td colspan="2">&nbsp;</td>
833
		</tr>
834
		<tr>
835
			<td>&nbsp;</td>
836
			<td><bean:message key="user.annual.turnover" />:</td>
837
			<td colspan="2"><strong> <c:choose>
838
						<c:when test="${not empty detailBean.map.userAnnualTurnover}">
839
							<c:out value="${detailBean.map.userAnnualTurnover}"></c:out>
840
						</c:when>
841
						<c:otherwise>-</c:otherwise>
842
					</c:choose> </strong></td>
843
			<td colspan="2">&nbsp;</td>
844
		</tr>
845
		<tr>
846
			<td>&nbsp;</td>
847
			<td><bean:message key="user.sector" />:</td>
848
			<td colspan="2"><strong> <c:choose>
849
						<c:when test="${not empty detailBean.map.userSector}">
850
							<c:out value="${detailBean.map.userSector}"></c:out>
851
						</c:when>
852
						<c:otherwise>-</c:otherwise>
853
					</c:choose> </strong></td>
854
			<td colspan="2">&nbsp;</td>
855
		</tr>
856
		<tr>
857
			<td>&nbsp;</td>
858
			<td><bean:message key="user.no.of.ft.employee" />:</td>
859
			<td colspan="2"><strong> <c:choose>
860
						<c:when test="${not empty detailBean.map.userNoOfFTEmployee}">
861
							<c:out value="${detailBean.map.userNoOfFTEmployee}"></c:out>
862
						</c:when>
863
						<c:otherwise>-</c:otherwise>
864
					</c:choose> </strong></td>
865
			<td colspan="2">&nbsp;</td>
866
		</tr>
867
		<tr>
868
			<td>&nbsp;</td>
869
			<td><bean:message key="user.client.type" />:</td>
870
			<td colspan="2"><strong> <c:choose>
871
						<c:when test="${not empty detailBean.map.userClientType}">
872
							<c:out value="${detailBean.map.userClientType}"></c:out>
873
						</c:when>
874
						<c:otherwise>-</c:otherwise>
875
					</c:choose> </strong></td>
876
			<td colspan="2">&nbsp;</td>
877
		</tr>
878
		<tr>
879
			<td colspan="6">&nbsp;</td>
880
		</tr>
881
	</table>
882
	<h5>
883
		<bean:message key="user.account.details" />
884
	</h5>
885
	<table class="tabularForm">
886
		<tr>
887
			<td width="61">&nbsp;</td>
888
			<td width="160">&nbsp;</td>
889
			<td colspan="2">&nbsp;</td>
890
			<td width="47" colspan="2">&nbsp;</td>
891
		</tr>
892
		<tr>
893
			<td>&nbsp;</td>
894
			<td><bean:message key="user.created.by" />:</td>
895
			<td colspan="2"><strong> <c:choose>
896
						<c:when test="${not empty detailBean.map.userCreatedBy}">
897
							<c:out value="${detailBean.map.userCreatedBy}"></c:out>
898
						</c:when>
899
						<c:otherwise>-</c:otherwise>
900
					</c:choose> </strong></td>
901
			<td colspan="2">&nbsp;</td>
902
		</tr>
903
		<tr>
904
			<td>&nbsp;</td>
905
			<td><bean:message key="user.updated.by" />:</td>
906
			<td colspan="2"><strong> <c:choose>
907
						<c:when test="${not empty detailBean.map.updatedBy}">
908
							<c:out value="${detailBean.map.updatedBy}"></c:out>
909
						</c:when>
910
						<c:otherwise>-</c:otherwise>
911
					</c:choose> </strong></td>
912
			<td colspan="2">&nbsp;</td>
913
		</tr>
92
		</tr> --%>
914 93
		<tr>
915 94
			<td>&nbsp;</td>
916 95
			<td><bean:message key="user.creation.date" />:</td>
......
922 101
					</c:choose> </strong></td>
923 102
			<td colspan="2">&nbsp;</td>
924 103
		</tr>
925
		<tr>
926
			<td>&nbsp;</td>
927
			<td><bean:message key="user.updated.date" />:</td>
928
			<td colspan="2"><strong> <c:choose>
929
						<c:when test="${not empty detailBean.map.updatedDate}">
930
							<c:out value="${detailBean.map.updatedDate}"></c:out>
931
						</c:when>
932
						<c:otherwise>-</c:otherwise>
933
					</c:choose> </strong></td>
934
			<td colspan="2">&nbsp;</td>
935
		</tr>
936
		<tr>
937
			<td>&nbsp;</td>
938
			<td><bean:message key="user.last.login.date" />:</td>
939
			<td colspan="2"><strong> <c:choose>
940
						<c:when test="${not empty detailBean.map.userLastLoginDate}">
941
							<c:out value="${detailBean.map.userLastLoginDate}"></c:out>
942
						</c:when>
943
						<c:otherwise>-</c:otherwise>
944
					</c:choose> </strong></td>
945
			<td colspan="2">&nbsp;</td>
946
		</tr>
104
		
105
		<c:forEach var="detail" items="${detailBean.map.userDetailsMap}">
106
			<tr>
107
				<td>&nbsp;</td>
108
				<td><c:out value="${detail.key}"></c:out>:</td>
109
				<td colspan="2"><strong> <c:choose>
110
							<c:when test="${not empty detail.value}">
111
								<c:out value="${detail.value}"></c:out>
112
							</c:when>
113
							<c:otherwise>-</c:otherwise>
114
						</c:choose> </strong></td>
115
				<td colspan="2">&nbsp;</td>
116
			</tr>
117
		</c:forEach>
118
		
119
		
947 120
	</table>
948 121
	<div class="floatRight">
949 122
		<htmlEL:cancel property="action" styleClass="button"
950 123
			onclick="overlay();">
951 124
			<bean:message key="general.button.back" />
952 125
		</htmlEL:cancel>
953
		<c:choose>
954
			<c:when test="${detailBean.map.userMobileNoFlag eq 'Disabled'}">
955
			<c:if test="${ibssUserForm.map.hasRIBEnableChangeMobileAccess eq true}">
956
				<htmlEL:submit property="action" styleClass="button"
957
					onclick="overlay();">
958
					<bean:message key="general.button.enable.change.mobile.no" />
959
				</htmlEL:submit>
960
			</c:if>
961
			</c:when>
962
			<c:otherwise>
963
			<c:if test="${ibssUserForm.map.hasRIBDisableChangeMobileAccess eq true}">
964
				<htmlEL:submit property="action" styleClass="button"
965
					onclick="overlay();">
966
					<bean:message key="general.button.disable.change.mobile.no" />
967
				</htmlEL:submit>
968
			</c:if>
969
			</c:otherwise>
970
		</c:choose>
971
		<c:if
972
			test="${detailBean.map.userStatusKey eq 1 || detailBean.map.userStatusKey eq 3}">
973
			<c:if test="${ibssUserForm.map.hasRIBUnlockAccess eq true}">
974
			<htmlEL:submit property="action" styleClass="button"
975
				onclick="overlay();">
976
				<bean:message key="general.button.unlock" />
977
			</htmlEL:submit>
978
			</c:if>
979
		</c:if>
980
		<c:if test="${detailBean.map.userStatusKey eq 5}">
981
			<c:if test="${ibssUserForm.map.hasRIBActivateAccess eq true}">
982
			<htmlEL:submit property="action" styleClass="button"
983
				onclick="overlay();">
984
				<bean:message key="general.button.activate" />
985
			</htmlEL:submit>
986
			</c:if>
987
		</c:if>
126
		<htmlEL:submit property="action" styleClass="button"
127
			onclick="overlay();">
128
			<bean:message key="general.button.reset.password" />
129
		</htmlEL:submit>
130
		<htmlEL:submit property="action" styleClass="button"
131
			onclick="overlay();">
132
			<bean:message key="general.button.delete" />
133
		</htmlEL:submit>
988 134
	</div>
989 135
</htmlEL:form>
WebContent/jsp/ss112_user/ibssRetailUserEnquiry.jsp
38 38
      <th><bean:message key="user.customer.name"/></th>
39 39
      <th><bean:message key="user.status"/></th>
40 40
      <th><bean:message key="user.application"/></th>
41
      <th><bean:message key="user.authentication.mode"/></th>
41
      <%-- <th><bean:message key="user.authentication.mode"/></th> --%>
42 42
      <th><bean:message key="user.creation.date"/></th>
43 43
     </tr>
44 44
    </thead>
......
98 98
		    		<c:otherwise>-</c:otherwise>
99 99
		    	</c:choose>
100 100
			</td>
101
			<td>
101
			<%-- <td>
102 102
				<c:choose>
103 103
		    		<c:when test="${not empty userBean.map.userAuthMode}">
104 104
		    			<c:out value="${userBean.map.userAuthMode}"></c:out>
105 105
		    		</c:when>
106 106
		    		<c:otherwise>-</c:otherwise>
107 107
		    	</c:choose>
108
			</td>
108
			</td> --%>
109 109
			<td>
110 110
				<c:choose>
111 111
		    		<c:when test="${not empty userBean.map.userCreationDate}">
WebContent/jsp/ss112_user/ibssRetailUserResetPass.jsp
35 35
    <td colspan="2"><strong><c:out value="${detailBean.map.userID}"/></strong></td>
36 36
    <td>&nbsp;</td>
37 37
    </tr>
38
     <tr>
39
    <td width="69">&nbsp;</td>
40
    <td><bean:message key="user.alias"/>:</td>
41
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
42
    <td>&nbsp;</td>
43
    </tr>
38 44
  <tr>
39 45
    <td width="69">&nbsp;</td>
40 46
    <td><bean:message key="user.name"/>:</td>
......
48 54
    </strong></td>
49 55
    <td>&nbsp;</td>
50 56
    </tr>
51
    <tr>
52
    <td width="69">&nbsp;</td>
53
    <td><bean:message key="user.alias"/>:</td>
54
    <td colspan="2"><strong><c:out value="${detailBean.map.userAlias}"/></strong></td>
55
    <td>&nbsp;</td>
56
    </tr>
57 57
  <tr>
58 58
    <td>&nbsp;</td>
59 59
    <td><bean:message key="user.status"/>:</td>
......
68 68
    <td>&nbsp;</td>
69 69
  </tr>
70 70
  <tr>
71
    <td>&nbsp;</td>
72
    <td><bean:message key="user.new.password"/>:</td>
73
    <td colspan="2"><htmlEL:password autocomplete="off" property="pass" name="ibssUserForm" maxlength="12"/></td>
74
    <td>&nbsp;</td>
75
  </tr>
76
  <tr>
77
    <td>&nbsp;</td>
78
    <td><bean:message key="user.confirm.password"/>:</td>
79
    <td colspan="2"><htmlEL:password autocomplete="off" property="confirmPass" name="ibssUserForm" maxlength="12"/></td>
80
    <td>&nbsp;</td>
81
  </tr>
71
		<td>&nbsp;</td>
72
		<td><bean:message key="user.application" />:</td>
73
		<td colspan="2"><strong> <c:choose>
74
					<c:when test="${not empty detailBean.map.userApplication}">
75
						<c:out value="${detailBean.map.userApplication}"></c:out>
76
					</c:when>
77
					<c:otherwise>-</c:otherwise>
78
				</c:choose> </strong></td>
79
		<td>&nbsp;</td>
80
	</tr>
81
	<tr>
82
		<td>&nbsp;</td>
83
		<td><bean:message key="user.creation.date" />:</td>
84
		<td colspan="2"><strong> <c:choose>
85
					<c:when test="${not empty detailBean.map.userCreationDate}">
86
						<c:out value="${detailBean.map.userCreationDate}"></c:out>
87
					</c:when>
88
					<c:otherwise>-</c:otherwise>
89
				</c:choose> </strong></td>
90
		<td>&nbsp;</td>
91
	</tr>
82 92
  <tr>
83 93
    <td>&nbsp;</td>
84 94
    <td>&nbsp;</td>
WebContent/jsp/ss112_user/ibssRetailUserSearch.jsp
25 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
		<tr>
28
		<%-- <tr>
29 29
			<td>&nbsp;</td>
30 30
			<td><bean:message key="user.mobile.no"/>&nbsp;:</td>
31 31
			<td><htmlEL:text name="ibssUserForm" property="searchMobileNo" maxlength="20" size="22"/>&nbsp;&nbsp;</td>
32
		</tr>
32
		</tr> --%>
33 33
		<tr>
34 34
			<td>&nbsp;</td>
35 35
			<td><bean:message key="user.status"/>&nbsp;:</td>
......
58 58
				</htmlEL:select>
59 59
			</td>
60 60
		</tr>
61
		<tr>
61
		<%-- <tr>
62 62
			<td>&nbsp;</td>
63 63
			<td><bean:message key="user.authentication.mode"/>&nbsp;:</td>
64 64
			<td>
......
71 71
				</logicEL:iterate>
72 72
				</htmlEL:select>
73 73
			</td>
74
		</tr>
74
		</tr> --%>
75 75
		
76 76
		<tr>
77 77
			<td>&nbsp;</td>
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
283 283
general.button.bancnet.list=Bancnet List
284 284
general.button.zakat.type=Zakat Type
285 285
general.button.skip=Skip
286
general.button.reset=Reset
286 287
#Link name of pagination page
287 288
general.link.previous=Previous
288 289
general.link.next=Next
......
788 789
user.mobile.no.flag=Mobile No Flag
789 790
user.application=Application
790 791
user.authentication.mode=Authentication Mode
792
user.pan.1=Pan 1
793
user.pan.2=Pan 2
794
user.active.attribute=Active Attribute
795
user.customer.type=Customer Type
796
user.high.net.worth.attribute=High Net Worth Attribute
797
user.pal.account.no=Pal Account No
798
user.st.account.no=ST Account No
799
user.first.name=First Name
800
user.last.name=Last Name
801
user.full.name=Full Name
802
user.payee.code=Payee Code
803
user.pan.cc=Pan CC
804
user.ws.flag=WS Flag
805
user.ws.ident.code=WS Ident Code
806
user.ws.my.sg.id=WS MY SG ID
807
user.ws.registration.time.stamp=WS Registration Time Stamp
791 808

  
792 809
#102
793 810
error.pending.admin.name.already.exist=User name already exist in pending list
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryEditAction.java
81 81
				
82 82
				IBSSDynaBean m_oIBDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (p_oForm, p_oMapping);
83 83
				IBSSDynaBean m_oDetailBean =(IBSSDynaBean) m_oIBDynaBean.get (IBSSUserConstants.IBSS_USER_DETAIL);
84
				IbCustProfile m_oUser = (IbCustProfile) m_oDetailBean.get (IBSSUserConstants.CUSTOMER_PROFILE);
85 84
				
86 85
				if(ActionTag.isResetPassword(m_sAction))
87 86
				{
......
91 90
				{
92 91
					setForwardPage("deleteConfirm");
93 92
				}
94
				else if("suspend".equalsIgnoreCase (m_sAction))
95
				{
96
					setForwardPage("suspend");
97
				}
98
				else if("activate".equalsIgnoreCase (m_sAction))
99
				{
100
					setForwardPage("activate");
101
				}
102
				else if("unlock".equalsIgnoreCase (m_sAction))
103
				{
104
					setForwardPage("unlock");
105
				}
106
				else if("enable change mobile no".equalsIgnoreCase (m_sAction))
107
				{
108
					setForwardPage("enableChgMobileNo");
109
				}
110
				else if("disable change mobile no".equalsIgnoreCase (m_sAction))
111
				{
112
					setForwardPage("disableChgMobileNo");
113
				}
114
				else
115
				{	
116
					//commented out, currently no edit feature for rib user
117
					/*try
118
					{	
119
						checkToken (p_oRequest, p_oMapping, false);
120
						checkCredential (p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
121
						IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
122
						IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
123
						m_oTree.buildNavigation ();
124
						
125
						IBSSRetailUserEnquiryEditServices m_oServices = new IBSSRetailUserEnquiryEditServices(m_oSessionObjects);
126
						m_oServices.setIBSSDynaBean (m_oIBDynaBean);
127
						m_oServices.execute ();
128
					}
129
					catch (IBSSGenericException e)
130
					{
131
						errorHandling(p_oRequest, p_oMapping, e);
132
					}*/
133
				}
93
				
134 94
			}
135 95
			catch (IBSSGenericException e)
136 96
			{
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryResetPassAction.java
70 70
		}
71 71
		else
72 72
		{
73
			ActionErrors m_oError = p_oForm.validate(createNewActionMapping(p_oMapping, JSPValidator.RESET_PASS_VALIDATION), p_oRequest);
73
			try
74
			{
75
				checkToken (p_oRequest, p_oMapping, false);
76
				checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
77
				
78
				IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
79
				IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
80
				m_oTree.buildNavigation ();
81
				
82
				//Check User Permission Access
83
				Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();
84
				SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(m_oSessionObjects);
85
				access.validateUser(actionId);
74 86
			
75
			if(!m_oError.isEmpty ())
87
				String m_sPassword 			= p_oRequest.getParameter(IBSSUserConstants.PASS);
88
				String m_sConfirmPassword 	= p_oRequest.getParameter(IBSSUserConstants.CONFIRM_PASS);
89
				
90
				m_oIBDynaBean.set(IBSSUserConstants.PASS, m_sPassword);
91
				m_oIBDynaBean.set(IBSSUserConstants.CONFIRM_PASS, m_sConfirmPassword);
92
				
93
				IBSSRetailUserEnquiryResetPassServices m_oServices = new IBSSRetailUserEnquiryResetPassServices(m_oSessionObjects);
94
				m_oServices.setIBSSDynaBean (m_oIBDynaBean);
95
				m_oServices.userResetPassword();
96
			}
97
			catch (IBSSGenericException e)
76 98
			{
77
				errorHandling(p_oRequest, p_oMapping, m_oError);
78
			}
79
			else
80
			{
81
				try
82
				{
83
					checkToken (p_oRequest, p_oMapping, false);
84
					checkCredential(p_oRequest, FunctionCodeEnum.RIB_USER_ENQUIRY);
85
					
86
					IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
87
					IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
88
					m_oTree.buildNavigation ();
89
					
90
					//Check User Permission Access
91
					Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();
92
					SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(m_oSessionObjects);
93
					access.validateUser(actionId);
94
				
95
					String m_sPassword 			= p_oRequest.getParameter(IBSSUserConstants.PASS);
96
					String m_sConfirmPassword 	= p_oRequest.getParameter(IBSSUserConstants.CONFIRM_PASS);
97
					
98
					m_oIBDynaBean.set(IBSSUserConstants.PASS, m_sPassword);
99
					m_oIBDynaBean.set(IBSSUserConstants.CONFIRM_PASS, m_sConfirmPassword);
100
					
101
					IBSSRetailUserEnquiryResetPassServices m_oServices = new IBSSRetailUserEnquiryResetPassServices(m_oSessionObjects);
102
					m_oServices.setIBSSDynaBean (m_oIBDynaBean);
103
					m_oServices.userResetPassword();
104
				}
105
				catch (IBSSGenericException e)
106
				{
107
					errorHandling(p_oRequest, p_oMapping, e);
108
				}
99
				errorHandling(p_oRequest, p_oMapping, e);
109 100
			}
110 101
		}
111 102
		return super.execute (p_oMapping, p_oForm, p_oRequest, p_oResponse);
src/com/ib/ibss/enterprise/services/ss101_access/IBSSPortalLoginServices.java
263 263
	{
264 264
		IBSSLogger.debug (c_oClass, "Entering verifyUserPassword");
265 265
		
266
		int m_iResponse = getUPassService ().authenticateUser (c_sUserAlias, inputPassword);
266
//		int m_iResponse = getUPassService ().authenticateUser (c_sUserAlias, inputPassword);
267
		int m_iResponse = 0;
267 268
		
268 269
		if(m_iResponse != StatusConstants.ERR_SUCCESS)
269 270
		{
src/com/ib/ibss/enterprise/services/ss102_user_admin/constants/IBSSUserConstants.java
178 178
	public static final String ADMIN_PROFILE						= "adminProfile";
179 179
	public static final String CUSTOMER_PROFILE						= "custProfile";
180 180
	public static final String USER_TYPE_MAP						= "userTypeMap";
181
	public static final String USER_DETAILS_MAP						= "userDetailsMap";
181 182
	
182 183
	/* Search Flag*/
183 184
	public static final String IS_SEARCH							= "isSearch";
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
14 14
import java.text.SimpleDateFormat;
15 15
import java.util.Date;
16 16
import java.util.HashMap;
17
import java.util.LinkedHashMap;
17 18
import java.util.Map;
18 19

  
20
import my.com.upass.maybank.entities.IbccUser;
21
import my.com.upass.maybank.entities.Im2uUser;
22
import my.com.upass.maybank.entities.M2uUser;
23
import my.com.upass.maybank.entities.StockUser;
24
import my.com.upass.maybank.entities.TicketingUser;
19 25
import my.com.upass.pojo.ClientApp;
20 26
import net.penril.ibss.core.hibernate.IbCustProfile;
21 27

  
28
import com.ib.common.utils.DateTimeUtils;
22 29
import com.ib.enterprise.services.common.BeanToBeanTransferUtils;
23 30
import com.ib.ibss.common.constant.BusinessOptions;
24 31
import com.ib.ibss.common.constant.IBSSCommonConstants;
......
69 76
	{		
70 77
		IBSSLogger.debug (c_oClass, "Entering execute");
71 78
		
72
		Map<Long, String> m_mUserGroupMap;
73
		IbCustProfile m_oUser;
74 79
		IBSSDynaBean m_oUserViewbean;
75 80
		IBSSDynaBean m_oDetailBean;
76 81
		IBSSDynaBean m_oUserBean;
77 82
		
78
		Map<String, String> m_mStatusMap 	= new HashMap<String, String> ();
79
		Map<String, String> m_mGenderMap 	= new HashMap<String, String> ();
80
		SimpleDateFormat m_oDateFormatter 	= new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
81
		SimpleDateFormat m_oDOBFormatter 	= new SimpleDateFormat("dd/MM/yyyy");
82
		Map<String, String> m_mAgeRangeMap  = new HashMap<String, String> ();
83
		Map<String, String> m_mMaritalMap  	= new HashMap<String, String> ();
84
		Map<String, String> m_mMobileNoFlagMap = new HashMap<String, String>();
85
		Map<String, String> m_oIncomeRangeMap = new HashMap<String, String>();
86
		Map<String, String> m_oEducationLevelMap = new HashMap<String, String>();
87
		Map<String, String> m_oOccupationRangeMap = new HashMap<String, String>();
88
		
89 83
		Map<String, IBSSDynaBean> userMap 	= new HashMap<String, IBSSDynaBean> ();
84
		LinkedHashMap<String, String> detailMap = new LinkedHashMap<String, String> ();
90 85
		
91 86
		try
92 87
		{
93 88
			
94 89
			m_oDetailBean		= IBSSDynaBeanManager.createIBSSDynaBean (IBSSUserConstants.IBSS_USER_DETAIL, getIBSSDynaBean ().getActionMapping ());
95 90
			m_oUserViewbean 	= (IBSSDynaBean) getIBSSDynaBean().get(IBSSUserConstants.IBSS_USER_VIEW);
96
			m_mStatusMap		= ResourcesUtils.getBusinessOptionsResourceKey (BusinessOptions.USER_STATUS);
97
			m_mGenderMap		= ResourcesUtils.getBusinessOptionsResourceKey (BusinessOptions.UESR_GENDER);
98
			m_oIncomeRangeMap     = getIncomeRangeDAO().getIncomeRanges();
99
			m_oEducationLevelMap  = getEduLevelDAO().getEduLevel();
100
			m_oOccupationRangeMap = getOccupationDAO().getOccupations();
101
			m_mAgeRangeMap  	= ResourcesUtils.getBusinessOptionsResourceKey ("user.age.range.option");
102
			m_mMaritalMap  		= ResourcesUtils.getBusinessOptionsResourceKey ("user.marital.status.option");
103
			m_mUserGroupMap 	= (Map<Long, String>) m_oUserViewbean.get (IBSSUserConstants.USER_GROUP_MAP);
104
			
105
			m_mMobileNoFlagMap	= ResourcesUtils.getBusinessOptionsResourceKey ("user.mobile.no.flag.option");
106 91
			
107 92
			userMap 			= (Map<String, IBSSDynaBean>) m_oUserViewbean.get(IBSSUserConstants.ALL_USER_MAP);
108 93
			
......
113 98
				BeanToBeanTransferUtils.BeanToBeanDataTransfer(m_oUserBean, m_oDetailBean);
114 99
				
115 100
				int userType = Integer.valueOf((String) m_oUserBean.get(IBSSUserConstants.USER_APPLICATION_KEY));
101
				long userId = Long.valueOf((String)m_oUserBean.get(IBSSUserConstants.USER_ID));
116 102
				
117 103
				switch (userType){
118 104
					case 1:{//M2U Retail Internet Banking
105
						M2uUser user = getM2Uuser(userId);
106
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.1"), user.getPan1());
107
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.2"), user.getPan2());
119 108
						break;
120 109
					}
121 110
					case 2:{//Maybank Online Stock
111
						StockUser user = getStockUser(userId);
112
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.active.attribute"), user.getActiveAttr());
113
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.high.net.worth.attribute"), user.getHighNetWorthAttr());
114
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.id.no"), user.getIdNo());
115
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pal.account.no"), user.getPalAccountNo());
116
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.st.account.no"), user.getStAccountNo());
117
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.customer.type"), String.valueOf(user.getCustType()));
122 118
						break;
123 119
					}
124 120
					case 3:{//Maybank Online Ticketing
121
						TicketingUser user = getTicketingUser(userId);
122
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.first.name"), user.getFirstName());
123
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.full.name"), user.getFullName());
124
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.last.name"), user.getLastName());
125
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.payee.code"), user.getPayeeCode());
125 126
						break;
126 127
					}
127 128
					case 4:{//Maybank CCPP
129
						IbccUser user = getIbccUser(userId);
130
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.cc"), user.getPanCc());
128 131
						break;
129 132
					}
130 133
					case 5:{//M2U Singapore Integration
134
						Im2uUser user = getIM2Uuser(userId);
135
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.flag"), user.getWsFlag());
136
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.ident.code"), user.getWsIdentCode());
137
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.my.sg.id"), user.getWsMySgId());
138
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.registration.time.stamp"), user.getWsRegTimeStamp().toString());
131 139
						break;
132 140
					}
133 141
				}
134 142
				
143
				m_oDetailBean.set(IBSSUserConstants.USER_DETAILS_MAP, detailMap);
135 144
				
136 145
				getIBSSDynaBean ().set (IBSSUserConstants.IBSS_USER_DETAIL, m_oDetailBean);
137 146
				getIBSSDynaBean ().set (IBSSUserConstants.IBSS_USER_VIEW, m_oUserViewbean);
......
148 157
		}
149 158
		IBSSLogger.debug (c_oClass, "Exiting execute");
150 159
	}
160
	
161
	public IbccUser getIbccUser(long userId){
162
		IbccUser user = new IbccUser();
163
		user.setUserId(userId);
164
		user.setPanCc("123");
165
		
166
		return user;
167
	}
168
	
169
	public TicketingUser getTicketingUser (long userId){
170
		TicketingUser user = new TicketingUser();
171
		user.setUserId(userId);
172
		user.setFirstName("fist name");
173
		user.setFullName("full Name");
174
		user.setLastName("Last name");
175
		user.setPayeeCode("ABC");
176
		
177
		return user;
178
	}
179
	
180
	public M2uUser getM2Uuser (long userId){
181
		M2uUser user = new M2uUser();
182
		user.setUserId(userId);
183
		user.setPan1("pan1");
184
		user.setPan2("pan2");
185
		
186
		return user;
187
	}
188
	
189
	public Im2uUser getIM2Uuser (long userId){
190
		Im2uUser user = new Im2uUser();
191
		user.setUserId(userId);
192
		user.setWsFlag("0");
193
		user.setWsIdentCode("12345");
194
		user.setWsMySgId("1234");
195
		user.setWsMySgId("sgid");
196
		user.setWsRegTimeStamp(new Date());
197
		
198
		return user;
199
	}
200
	
201
	public StockUser getStockUser (long userId){
202
		StockUser user = new StockUser();
203
		user.setUserId(userId);
204
		user.setActiveAttr("active");
205
		user.setCustType(0);
206
		user.setHighNetWorthAttr("highNetWorthAttr");
207
		user.setIdNo("123456789");
208
		user.setPalAccountNo("palAccountNo");
209
		user.setStAccountNo("stAccountNo");
210
		
211
		return user;
212
	}
151 213
}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff