Revision 68:b376781d30ff

View differences:

WebContent/jsp/ss100_navigation/ibssNavigationEnquiry.jsp
20 20
<br />
21 21
<c:choose>
22 22
	<c:when test="${not empty viewBean.map.navigationBranchSummary}">
23
		<h5><bean:message key="navigation.branch.navigation"/></h5>
23
		<h5><bean:message key="navigation.node.navigation"/></h5>
24 24
		<table class="tabularData" cellspacing="0">
25 25
			<thead>
26 26
				<tr>
......
51 51
							paramsName.put ("SECONDARY_TOKEN", request.getSession ().getAttribute ("PRIMARY_TOKEN"));
52 52
							pageContext.setAttribute ("paramsName", paramsName);
53 53
						%>
54
						<td width="150"><htmlEL:link action="/ss100/subNavigationEnquiry.do" name="paramsName" onclick="overlay();">
54
						<%-- <td width="150"><htmlEL:link action="/ss100/subNavigationEnquiry.do" name="paramsName" onclick="overlay();">
55 55
							<c:out value="${bean.map.nodeCode}"/>
56
						</htmlEL:link></td>
56
						</htmlEL:link></td> --%>
57
						<td width="150"><c:out value="${bean.map.nodeCode}"/></td>
57 58
						<td width="300"><c:out value="${bean.map.nodeName}"/></td>
58 59
						<td width="10">&nbsp;</td>
59 60
						<td><htmlEL:link action="/ss100/navigationDetails.do" name="paramsName" onclick="overlay();">
WebContent/template/sideMenu.jsp
26 26
					</c:if>
27 27
					<c:set var="pagePath1" value="${firstLvl.pagePath}?selected=${firstLvl.nodeCode}" />
28 28
					
29
					<c:choose>
29
					<%-- <c:choose>
30 30
						<c:when test="${not empty firstLvl.pagePath}">
31 31
							<htmlEL:link styleId="${firstLvl.nodeId}" action="${pagePath1}" name="paramsName" onclick="overlay();" styleClass="${select1}" >
32 32
								<c:out value="${firstLvl.nodeName}" />
......
35 35
						<c:otherwise>
36 36
							<a href="#" id="<%=nodeId %>" class="<c:out value='${select1}' />"><c:out value="${firstLvl.nodeName}" /></a>
37 37
						</c:otherwise>
38
					</c:choose>
38
					</c:choose> --%>
39 39
					
40 40
<%-- 					<script type="text/javascript">
41 41
						$("#<%=nodeId %>").click(function() {
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationMainServices.java
11 11

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

  
14
import java.text.SimpleDateFormat;
14 15
import java.util.Iterator;
15 16
import java.util.LinkedList;
16 17
import java.util.List;
......
20 21

  
21 22
import com.ib.ibss.common.constant.AdminPermissionModeType.IBAMPermission;
22 23
import com.ib.ibss.common.constant.FunctionConstants.FunctionCodeEnum;
24
import com.ib.ibss.common.constant.IBSSCommonConstants;
23 25
import com.ib.ibss.common.utils.IBSSLogger;
24 26
import com.ib.ibss.common.utils.IBSSNavigationUtil;
25 27
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
......
66 68
		
67 69
		IBSSDynaBean viewBean = null;
68 70
		IBSSDynaBean bean = null;
69
		List<AdminNavigation> navigationsList = null;
71
//		List<AdminNavigation> navigationsList = null;
70 72
		List<IBSSDynaBean> nodeDisplay = new LinkedList<IBSSDynaBean> ();
71 73
		List<IBSSDynaBean> branchDisplay = new LinkedList<IBSSDynaBean> ();
72 74
		
73 75
		AdminNavigation navigation;
76
		AdminNavigation each;
77
		
78
		SimpleDateFormat sdf = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
74 79
		
75 80
		try
76 81
		{
77
			navigationsList = getAdminNavigationDAO ().getNavigationByCategory (new Long(1));
82
//			navigationsList = getAdminNavigationDAO ().getNavigationByCategory (new Long(1));
78 83
			viewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_VIEW, getIBSSDynaBean().getActionMapping());
79 84
			
80
			for(Iterator<AdminNavigation> it = navigationsList.iterator ();it.hasNext ();)
85
			navigation = getAdminNavigationDAO ().getNavigationByID (IBSSNavigationConstants.USS_ADMIN_NAVI_ID);
86
			
87
//			for(Iterator<AdminNavigation> it = navigationsList.iterator ();it.hasNext ();)
88
//			{
89
//				navigation = it.next ();
90
//				
91
//				bean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
92
//				bean.set (IBSSNavigationConstants.NODE_ID, navigation.getNodeId ());
93
//				bean.set (IBSSNavigationConstants.NODE_CODE, navigation.getNodeCode ());
94
//				bean.set (IBSSNavigationConstants.NODE_NAME_FL, navigation.getNodeName ());
95
//				bean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, "0".equals (navigation.getNodeStatus ()) ? "Online" : "Offline");
96
//				bean.set (IBSSNavigationConstants.PARENT_ID, navigation.getParentId ());
97
//				
98
//				if("0".equals (navigation.getNodeType ()))
99
//				{
100
//					branchDisplay.add (bean);
101
//				}
102
//				else
103
//				{
104
//					nodeDisplay.add (bean);
105
//				}
106
//			}
107
			
108
			if(navigation != null)
81 109
			{
82
				navigation = it.next ();
83
				
84
				bean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
85
				bean.set (IBSSNavigationConstants.NODE_ID, navigation.getNodeId ());
86
				bean.set (IBSSNavigationConstants.NODE_CODE, navigation.getNodeCode ());
87
				bean.set (IBSSNavigationConstants.NODE_NAME_FL, navigation.getNodeName ());
88
				bean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, "0".equals (navigation.getNodeStatus ()) ? "Online" : "Offline");
89
				bean.set (IBSSNavigationConstants.PARENT_ID, navigation.getParentId ());
90
				
91
				if("0".equals (navigation.getNodeType ()))
110
				for(Iterator<AdminNavigation> it = navigation.getSubNavigations ().iterator ();it.hasNext ();)
92 111
				{
93
					branchDisplay.add (bean);
94
				}
95
				else
96
				{
97
					nodeDisplay.add (bean);
112
					each = it.next ();
113
					bean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
114
					bean.set (IBSSNavigationConstants.NODE_ID, each.getNodeId ());
115
					bean.set (IBSSNavigationConstants.NODE_CODE, each.getNodeCode ());
116
					bean.set (IBSSNavigationConstants.NODE_NAME_FL, each.getNodeName ());
117
					bean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, ("0".equals (each.getNodeStatus ()) ? "Navigable" : "Not Navigable"));
118
					bean.set (IBSSNavigationConstants.PARENT_ID, each.getParentId ());
119
					bean.set (IBSSNavigationConstants.NODE_UPDATED_DATE, each.getNodeUpdatedDate () != null ? sdf.format (each.getNodeUpdatedDate ()) : "");
120
					
121
					if("1".equals (each.getNodeType ()))
122
					{
123
						branchDisplay.add (bean);
124
					}
125
					else
126
					{
127
						nodeDisplay.add (bean);
128
					}
98 129
				}
99 130
			}
100 131
			
......
112 143
				}
113 144
			}
114 145
			
115
			viewBean.set (IBSSNavigationConstants.NAVIGATIONS, navigationsList);
146
//			viewBean.set (IBSSNavigationConstants.NAVIGATIONS, navigationsList);
116 147
			viewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, nodeDisplay);
117 148
			viewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, branchDisplay);
118 149
			getIBSSDynaBean ().set (IBSSNavigationConstants.NAVIGATION_VIEW, viewBean);
119 150
			getIBSSDynaBean().set(IBSSNavigationConstants.IS_SEARCH, false);
120 151
			
121
			IBSSNavigationUtil.constructRootNavigationBreadCrumb (getIBSSessionObjects(), "/ss100/navigationEnquiryMain.do");
152
//			IBSSNavigationUtil.constructRootNavigationBreadCrumb (getIBSSessionObjects(), "/ss100/navigationEnquiryMain.do");
122 153

  
123 154
		}
124 155
		catch (Exception e)
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSSubNavigationServices.java
96 96
					bean.set (IBSSNavigationConstants.PARENT_ID, each.getParentId ());
97 97
					bean.set (IBSSNavigationConstants.NODE_UPDATED_DATE, each.getNodeUpdatedDate () != null ? sdf.format (each.getNodeUpdatedDate ()) : "");
98 98
					
99
					if("0".equals (each.getNodeType ()))
99
					if("1".equals (each.getNodeType ()))
100 100
					{
101 101
						branchDisplay.add (bean);
102 102
					}
......
124 124
					}
125 125
				}
126 126
				
127
				IBSSNavigationUtil.constructSecondSegmentAdminNavigationBreadCrumb (getAdminNavigationDAO (), navigation, getIBSSessionObjects(), "/ss100/subNavigationEnquiry.do","/ss100/searchNavigation.do", true);
127
//				IBSSNavigationUtil.constructSecondSegmentAdminNavigationBreadCrumb (getAdminNavigationDAO (), navigation, getIBSSessionObjects(), "/ss100/subNavigationEnquiry.do","/ss100/searchNavigation.do", true);
128 128
				
129 129
				viewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, nodeDisplay);
130 130
				viewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, branchDisplay);
src/com/ib/ibss/enterprise/services/ss100_navigation/constants/IBSSNavigationConstants.java
106 106
	public static final String SEARCH_LINK_NAME									= "searchLinkName";
107 107
	public static final String LINK_MAP											= "linkMap";
108 108
	
109
	//USS Admin navigation
110
	public static final Long USS_ADMIN_NAVI_ID							= 19L;
109 111
}
110 112

  

Also available in: Unified diff