Revision 87:2d3c55260785

View differences:

WebContent/WEB-INF/config/ss221_settings/form-beans.xml
46 46
			
47 47
			<form-property name="upassApplicationSelect" type="java.lang.String"></form-property>
48 48
			<form-property name="passExpiryInd" type="java.lang.String"></form-property>
49
			<form-property name="applicationName" type="java.lang.String"></form-property>
49 50
			
50 51
			<!-- User Access -->
51 52
			<form-property name="hasEditAccess" type="java.lang.Boolean" />
WebContent/WEB-INF/config/ss221_settings/validation.xml
57 57
				</var>
58 58
			</field>
59 59

  
60
			<field depends="required, numeric" property="AUTO_LOGOFF">
60
			<!-- <field depends="required, numeric" property="AUTO_LOGOFF">
61 61
				<arg0 key="upass.auto.logoff.time"/> 
62
			</field>
62
			</field> -->
63 63
		
64 64
			<field depends="required, numeric" property="PASSWORD_MAX_ERROR">
65 65
				<arg0 key="upass.password.max.error.attempt"/> 
WebContent/jsp/ss221_settings/ibssUpassMaintenanceConfirm.jsp
10 10
<bean:define id="upassSettingsView" name="settingsForm" property="upassSettingsView" />
11 11

  
12 12
<h3 class="title"><strong>
13
Admin 
13
<c:out value="${settingsForm.map.applicationName}"/> 
14 14
<c:out value="${sessionScope.displayDesc}"/>
15 15
</strong></h3>
16 16
<table id="errorTable">
......
35 35
  <tr>
36 36

  
37 37
    <td height="28">&nbsp;</td>
38
    <td colspan="2"><bean:message key="settings.upass"/> <strong>Admin </strong>
38
    <td colspan="2"><bean:message key="settings.upass"/> <strong><c:out value="${settingsForm.map.applicationName}"/> </strong>
39 39
    <bean:message key="general.status.edit.confirm"/>
40 40
    </td>
41 41
    <td>&nbsp;</td>
......
84 84
		<td><bean:message key="upass.period.day"/></td>
85 85
</tr>
86 86

  
87
<!-- <tr> -->
88
<!-- 		<td width="10%">&nbsp;</td> -->
89
<%-- 		<td width="35%"><bean:message key="upass.auto.logoff.time"/>:</td> --%>
90
<!-- 		<td width="35%"><strong> -->
91
<%-- 			<c:choose> --%>
92
<%-- 				<c:when test="${not empty settingsForm.map.AUTO_LOGOFF}"> --%>
93
<%-- 					<c:out value="${settingsForm.map.AUTO_LOGOFF}"/> --%>
94
<%-- 				</c:when> --%>
95
<%-- 				<c:otherwise>-</c:otherwise> --%>
96
<%-- 			</c:choose> --%>
97
<!-- 		</strong></td> -->
98
<%-- 		<td><bean:message key="upass.period.minute"/></td> --%>
99
<!-- </tr> -->
100

  
87 101
<tr>
88 102
		<td width="10%">&nbsp;</td>
89 103
		<td width="35%"><bean:message key="upass.password.expiry.notif.alert"/>:</td>
WebContent/jsp/ss221_settings/ibssUpassMaintenanceDetails.jsp
9 9

  
10 10
<bean:define id="upassSettingsView" name="settingsForm" property="upassSettingsView" />
11 11

  
12
<h3 class="title"><strong>Admin 
12
<h3 class="title"><strong>
13
<c:out value="${settingsForm.map.applicationName}"/> 
13 14
<c:out value="${sessionScope.displayDesc}"/>
14 15
</strong></h3>
15 16
<table id="errorTable">
......
61 62
		<td><bean:message key="upass.period.day"/></td>
62 63
</tr>
63 64

  
65
<!-- <tr> -->
66
<!-- 		<td width="10%">&nbsp;</td> -->
67
<%-- 		<td width="35%"><bean:message key="upass.auto.logoff.time"/>:</td> --%>
68
<!-- 		<td width="5%"><strong> -->
69
<%-- 			<c:choose> --%>
70
<%-- 				<c:when test="${not empty upassSettingsView.map.AUTO_LOGOFF}"> --%>
71
<%-- 					<c:out value="${upassSettingsView.map.AUTO_LOGOFF}"/> --%>
72
<%-- 				</c:when> --%>
73
<%-- 				<c:otherwise>-</c:otherwise> --%>
74
<%-- 			</c:choose> --%>
75
<!-- 		</strong></td> -->
76
<%-- 		<td><bean:message key="upass.period.minute"/></td> --%>
77
<!-- </tr> -->
78

  
64 79
<tr>
65 80
		<td width="10%">&nbsp;</td>
66 81
		<td width="35%"><bean:message key="upass.password.expiry.notif.alert"/>:</td>
......
149 164
	<htmlEL:submit property="action" styleClass="button floatRight"	onclick="overlay();"><bean:message key="general.button.edit" /></htmlEL:submit>
150 165
</htmlEL:form>
151 166
</div>
152
</c:if>
167
</c:if>
168

  
169
<div class="floatRight">
170
<htmlEL:form action="/ss221/settings.do">
171
	<htmlEL:submit property="action" styleClass="button floatRight"	onclick="overlay();"><bean:message key="general.button.back" /></htmlEL:submit>
172
</htmlEL:form>
173
</div>
WebContent/jsp/ss221_settings/ibssUpassSettingsEdit.jsp
6 6
<%@ taglib uri="/WEB-INF/tld/struts-logic-el" prefix="logicEL" %>
7 7
<%@ taglib uri="/WEB-INF/tld/c" prefix="c" %>
8 8

  
9
<h3 class="title"><strong>Admin 
9
<h3 class="title"><strong>
10
<c:out value="${settingsForm.map.applicationName}"/> 
10 11
<c:out value="${sessionScope.displayDesc}"/>
11 12
</strong></h3>
12 13
<table id="errorTable">
......
45 46
		<td>:</td>
46 47
		<td><htmlEL:text property="PASSWORD_EXPIRY_DAY" name="settingsForm" maxlength="2" autocomplete="off" size="40"/>&nbsp;&nbsp;<bean:message key="upass.period.day"/></td>
47 48
	</tr>
49
	
50
	<!-- 	<tr> -->
51
<!-- 		<td>&nbsp;</td> -->
52
<%-- 		<td><bean:message key="upass.auto.logoff.time"/></td> --%>
53
<!-- 		<td>:</td> -->
54
<%-- 		<td><htmlEL:text property="AUTO_LOGOFF" name="settingsForm" maxlength="2" autocomplete="off" size="40"/>&nbsp;&nbsp;<bean:message key="upass.period.minute"/></td> --%>
55
<!-- 	</tr> -->
56
	
48 57
	<tr>
49 58
		<td>&nbsp;</td>
50 59
		<td><bean:message key="upass.password.expiry.notif.alert"/></td>
resource/com/ib/ibss/resources/message/IBSSApplicationResources.properties
143 143
general.format.date.sample= Eg. 01/01/2013
144 144
general.format.time.24hours.sample = Eg. 0000 (12:00 AM midnight), 2359 (11:59 PM)
145 145
general.will.be.deleted.desc=will be deleted
146
general.uss.admin=USS Admin
147
general.m2u=M2U Internet Banking
148
general.online.ticketing=Online Ticketing
149
general.ccpp=CCPP
146 150

  
147 151
#General error message
148 152
general.error.message=Service is currently unavailable.<br />Please try again later.
resource/com/ib/ibss/resources/message/IBSSBusinessOptionsResources.properties
159 159
content.payee.type.display=Bill Payment;Zakat;Others
160 160

  
161 161
# Upass Maintenance
162
upass.application.option.value=1
163
upass.application.option.display=Admin
162
upass.application.option.value=0;1;3;4
163
upass.application.option.display=USS;M2U Internet Banking;Online Ticketing;CCPP
164 164

  
165 165
authentication.mode.option.value=0;1
166 166
authentication.mode.option.display=Static Password;Token (Secure Pass)
src/com/ib/ibss/enterprise/services/ss102_user_admin/constants/IBSSUserConstants.java
81 81
	public static final String USER_MARITAL_STATUS					= "userMaritalStatus";
82 82
	public static final String USER_EMPLOY_STATUS					= "userEmployStatus";
83 83
	public static final String USER_EDUCATION_LEVEL					= "userEducationLevel";
84
	public static final String APP_NAME								= "applicationName";
84 85
	
85 86
	public static final String USER_ORGANIZATION_ID					= "userOrganizationID";
86 87
	public static final String USER_ORGANIZATION					= "userOrganization";
......
239 240
	public static final String HAS_RIB_UNLOCK_ACCESS						= "hasRIBUnlockAccess";
240 241
	public static final String HAS_RIB_UNLOCK_TAC_ACCESS					= "hasRIBUnlockTACAccess";
241 242
	public static final String HAS_RIB_ACTIVATE_ACCESS						= "hasRIBActivateAccess";
242

  
243
	
243 244
}
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceConfirmServices.java
19 19
	public void execute () throws IBSSGenericException
20 20
	{
21 21
		IBSSDynaBean m_oViewBean = (IBSSDynaBean) getIBSSDynaBean().get(IBSSSettingConstants.UPASS_SETTINGS_VIEW);
22
		
22 23
		try
23 24
		{
24 25

  
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceDetailsServices.java
8 8
import my.com.upass.pojo.ConfigurationBean;
9 9
import com.ib.ibss.common.constant.AdminPermissionModeType.IBAMPermission;
10 10
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
11
import com.ib.ibss.common.utils.ResourcesUtils;
11 12
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
12 13
import com.ib.ibss.enterprise.services.common.SessionUserPermissionVerificationService;
14
import com.ib.ibss.enterprise.services.ss102_user_admin.constants.IBSSUserConstants;
13 15
import com.ib.ibss.error.exception.IBSSGenericException;
14 16
import com.ib.ibss.error.handler.IBSSErrorHandler;
15 17
import com.ib.ibss.struts.utils.IBSSDynaBean;
16
import com.ib.ibss.struts.utils.IBSSDynaBeanManager;
17 18
import com.ib.ibss.struts.utils.IBSSSessionObjects;
18 19

  
19 20
public class IBSSUpassMaintenanceDetailsServices extends IBSSEnterpriseServicesWorkspace {
......
27 28
	@SuppressWarnings("unchecked")
28 29
	public void getUpassConfigurationFromDatabase () throws IBSSGenericException
29 30
	{
30
		IBSSDynaBean viewBean = null;
31
		
31
		String applicationName = "";
32 32
		try {
33
			viewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSSettingConstants.UPASS_SETTINGS_VIEW, getIBSSDynaBean ().getActionMapping ());
33
			String applicationId = (String) getIBSSDynaBean().get(IBSSSettingConstants.UPASS_APPLICATION_SELECT);
34 34
			
35
			List<ConfigurationBean> conf = getTbAmConfigDAO().getTbAmConfigByapplicationId(Integer.parseInt(IBSSSettingConstants.UPASS_ADMIN_APP_ID));
35
			if(applicationId.equals("0")){
36
				applicationName = ResourcesUtils.getApplicationResourceMessage("general.uss.admin");
37
			}else if(applicationId.equals("1")){
38
				applicationName = ResourcesUtils.getApplicationResourceMessage("general.m2u");
39
			}else if(applicationId.equals("3")){
40
				applicationName = ResourcesUtils.getApplicationResourceMessage("general.online.ticketing");
41
			}else if(applicationId.equals("4")){
42
				applicationName = ResourcesUtils.getApplicationResourceMessage("general.ccpp");
43
			}
44
			
45
			getIBSSDynaBean().set(IBSSUserConstants.APP_NAME, applicationName);
46
			
47
			IBSSDynaBean viewBean = (IBSSDynaBean)getIBSSDynaBean().get(IBSSSettingConstants.UPASS_SETTINGS_VIEW);
48
			List<ConfigurationBean> conf = getTbAmConfigDAO().getTbAmConfigByapplicationId(Integer.parseInt(applicationId));
36 49
			
37 50
			ConfigurationBean config;
38 51
			IBSSSettingField setting;
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceEditServices.java
27 27
		IBSSLogger.debug (c_oClass, "Entering execute");
28 28
		
29 29
		try {
30
			String applicationId = (String) getIBSSDynaBean().get(IBSSSettingConstants.UPASS_APPLICATION_SELECT);
31
			
30 32
			IBSSDynaBean formBean = getIBSSDynaBean();
31
			List<ConfigurationBean> conf = getTbAmConfigDAO().getTbAmConfigByapplicationId(Integer.parseInt(IBSSSettingConstants.UPASS_ADMIN_APP_ID));
33
			List<ConfigurationBean> conf = getTbAmConfigDAO().getTbAmConfigByapplicationId(Integer.parseInt(applicationId));
32 34
			
33 35
			ConfigurationBean config;
34 36
			IBSSSettingField setting;
src/com/ib/ibss/enterprise/services/ss221_settings/IBSSUpassMaintenanceResultServices.java
33 33
		
34 34
		try {
35 35
			
36
			getSettingField(null);
36
			String applicationId = (String) getIBSSDynaBean().get(IBSSSettingConstants.UPASS_APPLICATION_SELECT);
37
			String applicationName = (String) getIBSSDynaBean().get(IBSSUserConstants.APP_NAME);
38
			
39
			getSettingField(applicationId,null);
37 40
			/* Update configuration */
38 41
			getTbAmConfigDAO().updateConfigChange();
39 42
			/* Log successful */
40 43
			m_oLogStatus = AuditLogConstants.SUCCESSFUL;
41 44
			
42 45
			setBeanMessage (IBSSUserConstants.JSP_TITLE, 
43
					ResourcesUtils.getApplicationResourceMessage ("settings.upass") + " " + "Admin" + " " +
46
					ResourcesUtils.getApplicationResourceMessage ("settings.upass") + " " + applicationName + " " +
44 47
					ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
45 48
					ResourcesUtils.getApplicationResourceMessage ("user.edited"));
46 49
			
......
73 76
		IBSSLogger.debug (c_oClass, "Exiting updateUpass");
74 77
	}
75 78
	
76
	public List<ConfigurationBean> getSettingField (List<ConfigurationBean> updatedConfigList) throws Exception{
79
	public List<ConfigurationBean> getSettingField (String applicationId, List<ConfigurationBean> updatedConfigList) throws Exception{
77 80
		
78 81
		ConfigurationBean updateTbAmConfig;
79 82
		String configValue;
80 83
		
81 84
		for (IBSSSettingField each : IBSSSettingField.values())
82 85
		{
83
			updateTbAmConfig = getTbAmConfigDAO().getTbAmConfigByConfigNameAppId(each.toString(),Integer.parseInt(IBSSSettingConstants.UPASS_ADMIN_APP_ID));
86
			updateTbAmConfig = getTbAmConfigDAO().getTbAmConfigByConfigNameAppId(each.toString(),Integer.parseInt(applicationId));
84 87
		    configValue =  (String) getIBSSDynaBean().get(each.toString());
85 88
		    
86 89
		    

Also available in: Unified diff