Missing execution year context on edit curricular plan interfaces ACD…

…M-1705 #resolve (#1577)
FenixEdu · Jan 13, 2020 · 572be93 · 572be93
1 parent 903dac7
commit 572be93
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 3 deletions.
diff --git a/...c/ui/faces/bean/bolonhaManager/curricularPlans/CurricularCourseManagementBackingBean.java b/...c/ui/faces/bean/bolonhaManager/curricularPlans/CurricularCourseManagementBackingBean.java
@@ -518,6 +518,7 @@ protected List<SelectItem> readExecutionPeriodItems() {
         final ExecutionSemester minimumExecutionPeriod = getMinimumExecutionPeriod();
         final List<ExecutionSemester> notClosedExecutionPeriods = ExecutionSemester.readNotClosedExecutionPeriods();
         Collections.sort(notClosedExecutionPeriods);
+        Collections.reverse(notClosedExecutionPeriods);
 
         final List<SelectItem> result = new ArrayList<SelectItem>();
         for (final ExecutionSemester notClosedExecutionPeriod : notClosedExecutionPeriods) {

diff --git a/src/main/webapp/academicAdministration/bolonha/curricularPlans/createCurricularCourse.jsp b/src/main/webapp/academicAdministration/bolonha/curricularPlans/createCurricularCourse.jsp
@@ -133,13 +133,19 @@
 			<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.curricularYears}" />
 		</fc:selectOneMenu>
 		<h:outputText value="</p>" escape="false"/>
-			
+
 		<h:outputText value="<p><label>#{bolonhaBundle['semester']}:</label>" escape="false"/>
 		<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesterID}">
 			<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesters}" />
 		</fc:selectOneMenu>
 		<h:outputText value="</p>" escape="false"/>
-
+
+		<h:outputText value="<p><label>#{bolonhaBundle['term']}:</label>" escape="false"/>
+		<fc:selectOneMenu value="#{CurricularCourseManagement.term}">
+			<f:selectItems value="#{CurricularCourseManagement.terms}" />
+		</fc:selectOneMenu>
+		<h:outputText value="</p>" escape="false"/>
+
 		<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
 		<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.beginExecutionPeriodID}">
 			<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.beginExecutionPeriodItems}" />

diff --git a/src/main/webapp/academicAdministration/bolonha/curricularPlans/editCurricularCourse.jsp b/src/main/webapp/academicAdministration/bolonha/curricularPlans/editCurricularCourse.jsp
@@ -153,6 +153,13 @@
 			<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesterID}">
 				<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesters}" />
 			</fc:selectOneMenu>
+			<h:outputText value="</p>" escape="false"/>
+
+			<h:outputText value="<p><label>#{bolonhaBundle['term']}:</label>" escape="false"/>
+			<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.term}">
+				<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.terms}" />
+			</fc:selectOneMenu>
+			<h:outputText value="</p>" escape="false"/>
 
 			<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
 			<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.beginExecutionPeriodID}">
@@ -189,7 +196,12 @@
 					<h:outputText value="#{context.parentCourseGroup.oneFullName}</p>" escape="false"/>
 
 					<h:outputText value="<p><label>#{bolonhaBundle['curricularPeriod']}:</label>" escape="false"/>
-					<h:outputText value="#{context.curricularPeriod.fullLabel}</p>" escape="false"/>
+					<h:outputText value="#{context.curricularPeriod.fullLabel}" escape="false"/>
+					<h:panelGroup rendered="#{not empty context.fakeTerm}">
+						<h:outputText value=", #{bolonhaBundle['term']} " escape="false"/>
+						<h:outputText value="#{context.term}" escape="false"/>
+					</h:panelGroup>
+					<h:outputText value="</p>" escape="false"/>
 
 					<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
 					<h:outputText value="#{context.beginExecutionPeriod.qualifiedName}</p>" escape="false"/>
@@ -239,6 +251,13 @@
 					<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesterID}">
 						<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.curricularSemesters}" />
 					</fc:selectOneMenu>
+					<h:outputText value="</p>" escape="false"/>
+
+					<h:outputText value="<p><label>#{bolonhaBundle['term']}:</label>" escape="false"/>
+					<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.term}">
+						<f:selectItems value="#{AcademicAdministrationCurricularCourseManagement.terms}" />
+					</fc:selectOneMenu>
+					<h:outputText value="</p>" escape="false"/>
 
 					<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
 					<fc:selectOneMenu value="#{AcademicAdministrationCurricularCourseManagement.beginExecutionPeriodID}">

diff --git a/src/main/webapp/bolonhaManager/curricularPlans/createCurricularCourse.jsp b/src/main/webapp/bolonhaManager/curricularPlans/createCurricularCourse.jsp
@@ -140,6 +140,18 @@
 		<fc:selectOneMenu value="#{CurricularCourseManagement.term}">
 			<f:selectItems value="#{CurricularCourseManagement.terms}" />
 		</fc:selectOneMenu>
+		<h:outputText value="</p>" escape="false"/>
+
+		<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
+		<fc:selectOneMenu value="#{CurricularCourseManagement.beginExecutionPeriodID}">
+			<f:selectItems value="#{CurricularCourseManagement.beginExecutionPeriodItems}" />
+		</fc:selectOneMenu>
+		<h:outputText value="</p>" escape="false"/>
+
+		<h:outputText value="<p><label>#{bolonhaBundle['endExecutionPeriod.validity']}:</label> " escape="false"/>
+		<fc:selectOneMenu value="#{CurricularCourseManagement.endExecutionPeriodID}">
+			<f:selectItems value="#{CurricularCourseManagement.endExecutionPeriodItems}" />
+		</fc:selectOneMenu>
 		<h:outputText value="</p></fieldset></div>" escape="false"/>
 
 		<h:commandButton alt="#{htmlAltBundle['commandButton.create']}" styleClass="inputbutton" value="#{bolonhaBundle['create']}"

diff --git a/src/main/webapp/bolonhaManager/curricularPlans/editCurricularCourse.jsp b/src/main/webapp/bolonhaManager/curricularPlans/editCurricularCourse.jsp
@@ -109,6 +109,7 @@
 		<h:outputLink value="#{facesContext.externalContext.requestContextPath}/bolonhaManager/curricularPlans/editCurricularCourse.faces">
 			<h:outputText value="#{bolonhaBundle['newContext']}" />
 			<f:param name="degreeCurricularPlanID" value="#{CurricularCourseManagement.degreeCurricularPlanID}" />
+			<f:param name="executionYearID" value="#{CurricularCourseManagement.executionYearID}" />
 			<f:param name="curricularCourseID" value="#{CurricularCourseManagement.curricularCourseID}" />
 			<f:param name="organizeBy" value="#{CurricularCourseManagement.organizeBy}" />
 		</h:outputLink>
@@ -141,6 +142,17 @@
 			</fc:selectOneMenu>
 			<h:outputText value="</p>" escape="false"/>
 
+			<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
+			<fc:selectOneMenu value="#{CurricularCourseManagement.beginExecutionPeriodID}">
+				<f:selectItems value="#{CurricularCourseManagement.beginExecutionPeriodItems}" />
+			</fc:selectOneMenu>
+			<h:outputText value="</p>" escape="false"/>
+
+			<h:outputText value="<p><label>#{bolonhaBundle['endExecutionPeriod.validity']}:</label> " escape="false"/>
+			<fc:selectOneMenu value="#{CurricularCourseManagement.endExecutionPeriodID}">
+				<f:selectItems value="#{CurricularCourseManagement.endExecutionPeriodItems}" />
+			</fc:selectOneMenu>
+
 			<h:outputText value="<p class='mtop05'><label class='lempty'>.</label>" escape="false"/>
 			<h:commandButton alt="#{htmlAltBundle['commandButton.add']}" styleClass="inputbutton" value="#{bolonhaBundle['add']}"
 				action="" actionListener="#{CurricularCourseManagement.addContext}"/>
@@ -167,10 +179,18 @@
 					</h:panelGroup>
 					<h:outputText value="</p>" escape="false"/>
 
+					<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
+					<h:outputText value="#{context.beginExecutionPeriod.qualifiedName}</p>" escape="false"/>
+
+					<h:outputText value="<p><label>#{bolonhaBundle['endExecutionPeriod.validity']}:</label> " escape="false"/>
+					<h:outputText value="#{context.endExecutionPeriod.qualifiedName}</p>" escape="false" rendered="#{!empty context.endExecutionPeriod}"/>
+					<h:outputText value="#{bolonhaBundle['opened']}</p>" escape="false" rendered="#{empty context.endExecutionPeriod}"/>
+
 					<h:outputText value="<p class='mtop05'><label class='lempty'>.</label>" escape="false"/>
 					<h:outputLink value="#{facesContext.externalContext.requestContextPath}/bolonhaManager/curricularPlans/editCurricularCourse.faces">
 						<h:outputText value="#{bolonhaBundle['edit']}" />
 						<f:param name="degreeCurricularPlanID" value="#{CurricularCourseManagement.degreeCurricularPlanID}" />
+						<f:param name="executionYearID" value="#{CurricularCourseManagement.executionYearID}" />
 						<f:param name="courseGroupID" value="#{context.parentCourseGroup.externalId}" />
 						<f:param name="contextID" value="#{context.externalId}" />
 						<f:param name="curricularCourseID" value="#{CurricularCourseManagement.curricularCourseID}" />
@@ -211,6 +231,17 @@
 					</fc:selectOneMenu>
 					<h:outputText value="</p>" escape="false"/>
 
+					<h:outputText value="<p><label>#{bolonhaBundle['beginExecutionPeriod.validity']}:</label> " escape="false"/>
+					<fc:selectOneMenu value="#{CurricularCourseManagement.beginExecutionPeriodID}">
+						<f:selectItems value="#{CurricularCourseManagement.beginExecutionPeriodItems}" />
+					</fc:selectOneMenu>
+					<h:outputText value="</p>" escape="false"/>
+
+					<h:outputText value="<p><label>#{bolonhaBundle['endExecutionPeriod.validity']}:</label> " escape="false"/>
+					<fc:selectOneMenu value="#{CurricularCourseManagement.endExecutionPeriodID}">
+						<f:selectItems value="#{CurricularCourseManagement.endExecutionPeriodItems}" />
+					</fc:selectOneMenu>
+
 					<h:outputText value="<p class='mtop05'><label class='lempty'>.</label>" escape="false"/>
 					<h:outputText escape="false" value="<input alt='input.contextID' id='contextID' name='contextID' type='hidden' value='#{context.externalId}'/>"/>
 					<h:commandButton alt="#{htmlAltBundle['commandButton.update']}" styleClass="inputbutton" value="#{bolonhaBundle['update']}"