From 42f8aed42efdd0b61637809751442e74bf8fb58d Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sat, 3 Apr 2010 22:42:06 +0000
Subject: [PATCH] Working on short view for educational background.

---
 .../forms/personHasEducationalBackground.jsp  |  2 +-
 .../entity/edBackgroundShortView.jsp          | 53 +++++++++++++------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/productMods/edit/forms/personHasEducationalBackground.jsp b/productMods/edit/forms/personHasEducationalBackground.jsp
index 23e7c85b..62d8ada2 100644
--- a/productMods/edit/forms/personHasEducationalBackground.jsp
+++ b/productMods/edit/forms/personHasEducationalBackground.jsp
@@ -30,7 +30,7 @@
     vreq.setAttribute("defaultNamespace", ""); //empty string triggers default new URI behavior
     
     String flagURI = null;
-    if (vreq.getAppBean().isFlag1Active()) {
+    if (wdf.getApplicationDao().isFlag1Active()) {
         flagURI = VitroVocabulary.vitroURI+"Flag1Value"+vreq.getPortal().getPortalId()+"Thing";
     } else {
         flagURI = wdf.getVClassDao().getTopConcept().getURI();  // fall back to owl:Thing if not portal filtering
diff --git a/productMods/templates/entity/edBackgroundShortView.jsp b/productMods/templates/entity/edBackgroundShortView.jsp
index a7037440..226c695c 100644
--- a/productMods/templates/entity/edBackgroundShortView.jsp
+++ b/productMods/templates/entity/edBackgroundShortView.jsp
@@ -10,6 +10,12 @@
 	In this JSP that is the  Educational Background, not the Person, Organization or DegreeType
  --%>
 
+<c:if test="${sessionScope.loginHandler != null &&
+              sessionScope.loginHandler.loginStatus == 'authenticated' &&
+              sessionScope.loginHandler.loginRole >= sessionScope.loginHandler.dba }">
+              <c:set var="showEdBackgroundContextNode" value="true"/>
+</c:if>
+
 <c:choose>
 	<c:when test="${!empty individual}">		   		
 	    <c:choose>
@@ -18,8 +24,22 @@
 		        <c:set var="year" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#year'].dataPropertyStatements[0].data}"/>
 		        <c:set var="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/>
 		        
-		        <c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>
-		        <c:set var="selectedOrganizationName" value="${selectedOrganization.name}"/>
+		        <c:set var="degreeSupplementalInfo" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#supplementalInformation'].dataPropertyStatements[0].data}"/>
+				<c:if test="${ not empty degreeSupplementalInfo }">
+					<c:set var="degreeSupplementalInfo" value=", ${degreeSupplementalInfo}"/> 
+				</c:if>		        
+				
+		        <c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>		       
+		        <c:url var="selectedOrganizationURL" value="/individual">
+		        	<c:param name="uri" value="${selectedOrganization.URI}"/>
+				</c:url>
+		        <c:set var="selectedOrganizationStr" >, <a href='${selectedOrganizationURL}'><p:process>${selectedOrganization.name}</p:process></a></c:set>
+		        
+		        <c:set var="degreeDeptOrSchool" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#departmentOrSchool'].dataPropertyStatements[0].data}"/>
+		        <c:if test="${ not empty degreeDeptOrSchool }">
+					<c:set var="selectedOrganizationStr">${selectedOrganizationStr}, <p:process>${degreeDeptOrSchool}</p:process></c:set> 
+				</c:if>
+		        
 		        
 		        <c:set var="degreeType" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#degreeTypeAwarded'].objectPropertyStatements[0].object}"/>
 				<c:set var="degreeAbbreviation" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#degreeAbbreviation'].dataPropertyStatements[0].data}"/>
@@ -27,25 +47,26 @@
 					  <c:set var="degreeAbbreviation" value="${degreeType.name}"/>
 				</c:if>
 	
+				<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
+				<c:if test="${showEdBackgroundContextNode}">
+					<c:set var="contextNodeURL" value="<a href='${objLink}'> context node</a>"/>
+				</c:if>
+				
 				<c:choose>
-			    	<c:when test="${! empty year && ! empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }">
-			            <c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
-		                <a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation} in ${degreeMajor}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process>
+				   <%-- degreeMajor, year, org and abbreviation are all required --%>
+			    	<c:when test="${! empty year && ! empty degreeMajor && ! empty selectedOrganizationStr }">			            
+						<p:process>${degreeAbbreviation} in ${degreeMajor}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
+		            </c:when>		            
+		            <c:when test="${! empty year && empty degreeMajor && ! empty selectedOrganizationStr  }">
+		                <p:process>${degreeAbbreviation}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
 		            </c:when>
-		            <c:when test="${! empty year && empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }">
-			            <c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
-		                <a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process>
+		            <c:when test="${ empty year && empty degreeMajor && ! empty selectedOrganizationStr  }">
+		                <p:process>${degreeAbbreviation}</p:process> {selectedOrganizationStr} <p:process> ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
 		            </c:when>
-		            <c:when test="${ empty year && empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }">
-			            <c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
-		                <a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${selectedOrganizationName}</p:process>
-		            </c:when>
-		            <c:when test="${ ! empty year &&  empty degreeMajor && empty selectedOrganizationName && ! empty degreeAbbreviation }">
-			            <c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
-		                <a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${year}</p:process>
+		            <c:when test="${ ! empty year &&  empty degreeMajor && empty selectedOrganizationStr }">
+		                <p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
 		            </c:when>
 		            <c:otherwise>
-		                <c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
 	        			<a href="${objLink}"><p:process>${individual.name}</p:process></a>		                 
 		            </c:otherwise>
 	       		</c:choose>