diff --git a/src/main/java/org/fenixedu/academic/domain/serviceRequests/PartialRegistrationRegimeRequest.java b/src/main/java/org/fenixedu/academic/domain/serviceRequests/PartialRegistrationRegimeRequest.java index c3128f8a2e2..003a0d560af 100644 --- a/src/main/java/org/fenixedu/academic/domain/serviceRequests/PartialRegistrationRegimeRequest.java +++ b/src/main/java/org/fenixedu/academic/domain/serviceRequests/PartialRegistrationRegimeRequest.java @@ -62,10 +62,10 @@ private void checkEctsCredits(final Registration registration, final ExecutionYe } - if (enroledEctsCredits > MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS_PARTIAL_TIME) { + if (enroledEctsCredits > MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS) { throw new DomainException("error.RegistrationRegime.semester.has.more.ects.than.maximum.allowed", String.valueOf(enroledEctsCredits), executionYear.getQualifiedName(), - String.valueOf(MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS_PARTIAL_TIME)); + String.valueOf(MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS)); } } diff --git a/src/main/java/org/fenixedu/academic/domain/student/RegistrationRegime.java b/src/main/java/org/fenixedu/academic/domain/student/RegistrationRegime.java index cbb05bdbef0..23a74da486a 100644 --- a/src/main/java/org/fenixedu/academic/domain/student/RegistrationRegime.java +++ b/src/main/java/org/fenixedu/academic/domain/student/RegistrationRegime.java @@ -85,10 +85,10 @@ private void checkEctsCredits(final Registration registration, final ExecutionYe enroledEctsCredits += studentCurricularPlan.getAccumulatedEctsCredits(semester); } - if (enroledEctsCredits > MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS_PARTIAL_TIME) { + if (enroledEctsCredits > MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS) { throw new DomainException("error.RegistrationRegime.semester.has.more.ects.than.maximum.allowed", String.valueOf(enroledEctsCredits), executionYear.getQualifiedName(), - String.valueOf(MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS_PARTIAL_TIME)); + String.valueOf(MaximumNumberOfCreditsForEnrolmentPeriod.MAXIMUM_NUMBER_OF_CREDITS)); } } diff --git a/src/main/java/org/fenixedu/academic/ui/struts/action/administrativeOffice/serviceRequests/AcademicServiceRequestsManagementDispatchAction.java b/src/main/java/org/fenixedu/academic/ui/struts/action/administrativeOffice/serviceRequests/AcademicServiceRequestsManagementDispatchAction.java index c51316da0d0..1c4d654c55d 100644 --- a/src/main/java/org/fenixedu/academic/ui/struts/action/administrativeOffice/serviceRequests/AcademicServiceRequestsManagementDispatchAction.java +++ b/src/main/java/org/fenixedu/academic/ui/struts/action/administrativeOffice/serviceRequests/AcademicServiceRequestsManagementDispatchAction.java @@ -247,7 +247,7 @@ public ActionForward processNewAcademicServiceRequest(ActionMapping mapping, Act addActionMessage(request, "academic.service.request.processed.with.success"); } catch (DomainException ex) { addActionMessage(request, ex.getKey(), ex.getArgs()); - request.setAttribute("failingCondition", ex.getKey()); + request.setAttribute("failingCondition", ex.getLocalizedMessage()); return mapping.findForward("prepareRejectAcademicServiceRequest"); } diff --git a/src/main/webapp/WEB-INF/fenixedu-academic/schemas/executionCourse-schemas.xml b/src/main/webapp/WEB-INF/fenixedu-academic/schemas/executionCourse-schemas.xml index b3035562ffb..30196e5e31c 100644 --- a/src/main/webapp/WEB-INF/fenixedu-academic/schemas/executionCourse-schemas.xml +++ b/src/main/webapp/WEB-INF/fenixedu-academic/schemas/executionCourse-schemas.xml @@ -302,7 +302,7 @@ - + diff --git a/src/main/webapp/academicAdminOffice/serviceRequests/prepareCancelAcademicServiceRequest.jsp b/src/main/webapp/academicAdminOffice/serviceRequests/prepareCancelAcademicServiceRequest.jsp index 6fa3d4af4f7..c81d6a7c5f7 100644 --- a/src/main/webapp/academicAdminOffice/serviceRequests/prepareCancelAcademicServiceRequest.jsp +++ b/src/main/webapp/academicAdminOffice/serviceRequests/prepareCancelAcademicServiceRequest.jsp @@ -64,10 +64,7 @@

- - - - + diff --git a/src/main/webapp/academicAdminOffice/serviceRequests/prepareRejectAcademicServiceRequest.jsp b/src/main/webapp/academicAdminOffice/serviceRequests/prepareRejectAcademicServiceRequest.jsp index ed0375124e0..6b8a45333b2 100644 --- a/src/main/webapp/academicAdminOffice/serviceRequests/prepareRejectAcademicServiceRequest.jsp +++ b/src/main/webapp/academicAdminOffice/serviceRequests/prepareRejectAcademicServiceRequest.jsp @@ -64,10 +64,7 @@

- - - - + @@ -95,4 +92,4 @@ function checkJustification(){ return false; } } - \ No newline at end of file + diff --git a/src/main/webapp/alumni/administrativeOfficeServices/documentRequests/prepareCancelAcademicServiceRequest.jsp b/src/main/webapp/alumni/administrativeOfficeServices/documentRequests/prepareCancelAcademicServiceRequest.jsp index 2a55f0e2c02..f04af084fe6 100644 --- a/src/main/webapp/alumni/administrativeOfficeServices/documentRequests/prepareCancelAcademicServiceRequest.jsp +++ b/src/main/webapp/alumni/administrativeOfficeServices/documentRequests/prepareCancelAcademicServiceRequest.jsp @@ -61,10 +61,7 @@

- - - - + diff --git a/src/main/webapp/student/administrativeOfficeServices/documentRequest/prepareCancelAcademicServiceRequest.jsp b/src/main/webapp/student/administrativeOfficeServices/documentRequest/prepareCancelAcademicServiceRequest.jsp index 2a55f0e2c02..f04af084fe6 100644 --- a/src/main/webapp/student/administrativeOfficeServices/documentRequest/prepareCancelAcademicServiceRequest.jsp +++ b/src/main/webapp/student/administrativeOfficeServices/documentRequest/prepareCancelAcademicServiceRequest.jsp @@ -61,10 +61,7 @@

- - - - +