Revision 51:348c25d80cdd

View differences:

WebContent/jsp/ss100_navigation/ibssNavigationEdit.jsp
49 49
    <td colspan="2"><strong><htmlEL:textarea name="ibssNavigationForm" property="nodeDescription" /></strong></td>
50 50
    <td colspan="2">&nbsp;</td>
51 51
  </tr>
52
  <c:if test="${ibssNavigationForm.map.nodeID ne 19 }">
53
  <c:if test="${ibssNavigationForm.map.nodeCode ne 'ANAV' }">
52 54
  <tr>
53 55
    <td>&nbsp;</td>
54 56
    <td><bean:message key="navigation.status"/>:</td>
55
    <td colspan="2"><strong><c:out value="${ibssNavigationForm.map.nodeStatusDisplay}"/></strong></td>
57
    <td colspan="2">
58
    	<strong>
59
    		<htmlEL:select property="nodeStatus" name="ibssNavigationForm">
60
    			<htmlEL:option value="true"><bean:message key="navigation.online.selection"/></htmlEL:option>
61
    			<htmlEL:option value="false"><bean:message key="navigation.offline.selection"/></htmlEL:option>
62
    		</htmlEL:select>
63
    	</strong>
64
    </td>
56 65
    <td colspan="2">&nbsp;</td>
57 66
  </tr>
67
  </c:if>
68
  </c:if>
58 69
  <tr>
59 70
    <td>&nbsp;</td>
60 71
    <td>&nbsp;</td>
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationEditResultServices.java
73 73
	StringBuffer c_sLogDescription	= new StringBuffer();
74 74
	String c_sLogReason 			= "";
75 75
	String c_sNodeDescription;
76
//	boolean c_bNodeStatus;
76
	boolean c_bNodeStatus;
77 77
	String c_sNodeName;
78 78
	String c_sNodeNameOri;
79 79
	String c_sNodeCode;
......
157 157
			c_oNavigation.setNodeDescription (c_sNodeDescription);
158 158
			c_oNavigation.setNodeName (c_sNodeName);
159 159
			c_oNavigation.setNodeUpdatedDate (new Date());
160
//			c_oNavigation.setNodeStatus (c_bNodeStatus ? "0" : "1");
160
			c_oNavigation.setNodeStatus (c_bNodeStatus ? "0" : "1");
161 161
			c_oNavigation.setNodeUpdatedBy (getIBSSessionObjects ().getSessionUser ().getUserId ());
162 162
			
163 163
			/* This service to be shared among admin features and MK features */
......
194 194
		c_oDetailBean 		= (IBSSDynaBean) getIBSSDynaBean ().get (IBSSNavigationConstants.NAVIGATION_DETAIL_BEAN);
195 195
		c_oID				= Long.valueOf (getBeanMessage(IBSSNavigationConstants.NODE_ID));
196 196
		c_sNodeDescription 	= getBeanMessage (IBSSNavigationConstants.NODE_DESCRIPTION_FL);
197
//		c_bNodeStatus		= (Boolean) getIBSSDynaBean ().get (IBSSNavigationConstants.NODE_STATUS);
197
		c_bNodeStatus		= (Boolean) getIBSSDynaBean ().get (IBSSNavigationConstants.NODE_STATUS);
198 198
		c_sNodeName			= getBeanMessage (IBSSNavigationConstants.NODE_NAME_FL);
199 199
		c_sNodeNameOri		= getBeanMessage (IBSSNavigationConstants.NODE_NAME_ORI);
200 200
		c_sNodeCode			= getBeanMessage (IBSSNavigationConstants.NODE_CODE);
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationEditServices.java
65 65
				setBeanMessage (IBSSNavigationConstants.NODE_NAME_FL, m_oNavigation.getNodeName ());
66 66
				setBeanMessage (IBSSNavigationConstants.NODE_NAME_ORI, m_oNavigation.getNodeName ());
67 67
				setBeanMessage (IBSSNavigationConstants.NODE_DESCRIPTION_FL, m_oNavigation.getNodeDescription ());
68
				getIBSSDynaBean ().set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, "0".equals (m_oNavigation.getNodeStatus ()) ? "Online" : "OffLine");
68
				getIBSSDynaBean ().set (IBSSNavigationConstants.NODE_STATUS, "0".equals (m_oNavigation.getNodeStatus ()) ? true : false);
69 69
				setBeanMessage (IBSSNavigationConstants.NODE_CODE, m_oNavigation.getNodeCode ());
70 70
				setBeanMessage (IBSSNavigationConstants.NODE_ID, String.valueOf (m_oNavigation.getNodeId ()));
71 71
			}
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserCreateResultServices.java
11 11

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

  
14
import java.util.LinkedHashSet;
15
import java.util.Set;
16

  
14 17
import net.penril.ibss.audit.log.AuditLogConstants;
15 18
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
19
import net.penril.ibss.core.hibernate.AdminPermission;
16 20
import net.penril.ibss.core.hibernate.AdminUserProfile;
17 21

  
18 22
import com.ib.ibss.common.utils.IBSSLogger;
......
60 64
					getBeanMessage (IBSSUserConstants.LOGIN_ID),
61 65
					"Password");
62 66
			
67
//			/* Set admin permission */
68
//			Set<AdminPermission> permissionSet = new LinkedHashSet<AdminPermission>();
69
			
63 70
			/* Populate admin info into beans */
64 71
			AdminUserProfile m_oAdmin = m_oAdminService.populateUserProfile (
65 72
					getBeanMessage (IBSSUserConstants.LOGIN_ID),
......
71 78
					getIBSSessionObjects ().getSessionUser ().getUserId (),
72 79
					userAdminRole);
73 80
			
81
//			//Test Observation no actionId
82
//			if(!ModeType.OBSERVATION.getModeIdentifier().equalsIgnoreCase(groupMode)){
83
//				if(actionIdList != null){
84
//					for(int i = 0; i<actionIdList.length; i++){
85
//						AdminPermission permission = new AdminPermission();
86
//						permission.setApprover(isChecker);
87
//						permission.setAdminAuthPermissionId(new AdminPermissionId(m_oAdmin.getUserId(), actionIdList[i]));
88
//						permissionSet.add(permission);
89
////				m_oAdmin.getAdminPermissions().add(permission);
90
//					}
91
//					m_oAdmin.getAdminPermissions().addAll(permissionSet);					
92
//				}
93
//			}
94
			
74 95
			/* Create the user into database */
75 96
			m_sLogReason = m_oAdminService.createUserProfile (
76 97
							getBeanMessage (IBSSUserConstants.PASS),
src/com/ib/ibss/enterprise/services/ss102_user_admin/IBSSUserEnquiryDetailsServices.java
306 306
		List<AdminNavigation> parent = d.getParentNavigationByNodeId(a);
307 307
		List<AdminNavigation> child = d.getActionListByNodeId(a);
308 308
		List<AdminNavigation> newParent = new LinkedList<AdminNavigation>();
309
		System.out.println("Size of AdminNavigation list : "+parent.size());
310 309
		for(AdminNavigation eachP : parent){
311 310
			AdminNavigation navP = new AdminNavigation();
312 311
			navP.setNodeId(eachP.getNodeId());
......
324 323
		//Display
325 324
		for(AdminNavigation eachP : newParent){
326 325
			Set<AdminNavigation> navP = eachP.getSubNavigations();
327
			System.out.println("Parent ID "+eachP.getNodeId()+" : "+eachP.getNodeName());
328 326
			for(AdminNavigation eachC : navP){
329
				System.out.println("Node ID "+eachC.getNodeId()+" : "+eachC.getNodeName());
330 327
				Set<AdminAction> actionList = eachC.getActionList();
331 328
				for(AdminAction eachA : actionList){
332
					System.out.println("Action Id "+eachA.getActionId()+" : "+eachA.getAction());
333 329
				}
334 330
			}
335 331
		}

Also available in: Unified diff