| /impl/conf/WEB-INF/struts/tiles-courseunits.xml |
|---|
| 181,13 → 181,13 |
| <!--Remocao de unidades curriculares--> |
| <definition name="page.courseunit.delete.admin" extends="base.separators.home"> |
| <definition name="page.courseunit.delete.admin" extends="page.separators.home"> |
| <put name="title" value="Apagar Unidades Curriculares Administração"/> |
| <put name="topnav" value="/admin/courseunits/topnavCourseUnitDeleteAdministration.jsp"/> |
| <put name="body" value="/admin/courseunits/courseUnitDeleteAdministration.jsp"/> |
| </definition> |
| <definition name="page.edit.courseunit.admin.from.course.unit.delete" extends="base.separators.home"> |
| <definition name="page.edit.courseunit.admin.from.course.unit.delete" extends="page.separators.home"> |
| <put name="title" value="Unidade Curricular"/> |
| <put name="topnav" value="/admin/courseunits/topnavEditCourseUnitFromDelete.jsp"/> |
| <put name="body" value="/admin/courseunits/courseunit.jsp"/> |
| /impl/src/web/admin/courseunits/topnavEditCourseUnitFromDelete.jsp |
|---|
| 3,9 → 3,17 |
| <%@page import="jomm.web.utils.NavPlaceServer"%> |
| <%@ page import="jomm.web.utils.TopNav" %> |
| <% |
| String importYear = request.getParameter("importYear"); |
| if(importYear != null) |
| { |
| importYear = "?importYear=" + importYear; |
| } |
| else |
| importYear =""; |
| TopNav topNav = NavPlaceServer.getInstance().createTopNav(request); |
| topNav.addNavPlace("/user/startHome.do", "intranet.separator.home.back"); |
| topNav.addNavPlace("/admin/courseUnitsDeleteAdmin.do", "courseunit.delete.administration"); |
| topNav.addNavPlace("/admin/courseUnitsDeleteAdmin.do" + importYear, "courseunit.delete.administration"); |
| topNav.addNavPlace(null, "courseunit.edit"); |
| %> |
| <jsp:include page="/layout/topnav.jsp"/> |
| /impl/src/web/admin/courseunits/courseUnitDeleteAdministration.jsp |
|---|
| 5,6 → 5,7 |
| <%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %> |
| <%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %> |
| <%@ page import="java.util.List" %> |
| <%@ page import="pt.estgp.estgweb.domain.views.CourseUnitView" %> |
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> |
| <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
| <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
| 14,8 → 15,17 |
| <% |
| String importYear = request.getParameter("importYear"); |
| if(importYear == null) |
| importYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYearCreateTransaction(); |
| { |
| CourseUnitView view = (CourseUnitView) request.getAttribute("CourseUnitView"); |
| if(view == null) |
| importYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYearCreateTransaction(); |
| else |
| { |
| importYear = view.getImportYear(); |
| } |
| } |
| IServiceManager sm = ServiceManager.getInstance(); |
| 95,7 → 105,7 |
| </div> |
| <div class="modal-footer"> |
| <logic:equal value="true" name="contentsInfo" property="canDelete"> |
| <button class="btn btn-danger" data-href="<%=request.getContextPath()%>/user/startDeleteCourseUnitAdminFromUnitsDeleteAdministration.do?dispatch=delete&id=${contentsInfo.cuv.id}" data-toggle="modal" data-target="#confirm-delete${contentsInfo.cuv.id}"> |
| <button class="btn btn-danger" data-href="<%=request.getContextPath()%>/user/startDeleteCourseUnitAdminFromUnitsDeleteAdministration.do?dispatch=delete&id=${contentsInfo.cuv.id}&importYear=<%=importYear%>" data-toggle="modal" data-target="#confirm-delete${contentsInfo.cuv.id}"> |
| <bean:message key="delete"/> |
| </button> |
| </logic:equal> |
| 183,7 → 193,7 |
| </logic:equal> |
| </td> |
| <td> |
| <html:link styleClass="btn btn-warning" action="/user/startEditCourseUnitAdminFromUnitsDeleteAdministration?id=${contentsInfo.cuv.id}"><bean:message key="edit"/><span class="glyphicon glyphicon-pencil"></span></html:link> |
| <a class="btn btn-warning" href="<%=request.getContextPath()%>/user/startEditCourseUnitAdminFromUnitsDeleteAdministration.do?id=${contentsInfo.cuv.id}&importYear=<%=importYear%>"><bean:message key="edit"/><span class="glyphicon glyphicon-pencil"></span></a> |
| </td> |
| <td> |
| <logic:notEmpty name="contentsInfo" property="warnings"> |
| /impl/src/web/admin/courseunits/courseunit.jsp |
|---|
| 71,7 → 71,18 |
| %> |
| <html:form styleClass="form" action="${user}/courseUnitControllerAdmin${fromAction}${from}" enctype="multipart/form-data"> |
| <%--<html:form styleClass="form" action="/user/courseUnitControllerAdminFromServiceZone" enctype="multipart/form-data">--%> |
| <% |
| if(request.getParameter("importYear")!=null) |
| { |
| %> |
| <input type="hidden" name="importYear" value="<%=request.getParameter("importYear")%>"> |
| <% |
| } |
| %> |
| <input type="hidden" name="dispatch" value="createOrUpdateAdmin"> |
| <html:hidden property="courseUnitView.id"/> |
| <html:hidden property="id"/> |