WebSVN - bacoAlunos - Path Comparison - / Rev 1699 and / Rev 1700

Ignore whitespace Rev 1699 → Rev 1700

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
 ,7 → 1166,7
         return importer;
     }
-    public UserRoleConfig createRoleCourseComission(long courseId,UserSession userSession) throws AccessDeniedException
+    public UserRoleConfigService.ReplaceRoleResult createRoleCourseComission(long courseId,UserSession userSession) throws AccessDeniedException
     {
         Course c = DaoFactory.getCourseDaoImpl().load(courseId);
         String normalizedName = StringsUtils.getNormalizedNameSafeforCode(c.getName());
 ,7 → 1202,7
                 throw new AccessDeniedException("Tentado CRIAR um Role que já existe e não é Administrador nem Super user");
             }
             c.setValidationRole(roleValidation);
-            return  newUserRoleConfig;
+            return result;
         } catch (AccessDeniedException e) {
             logger.error("Tentado alterar um Role e não é Administrador nem Super user");
             throw e;

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/users/UserRoleConfigService.java
 ,7 → 96,9
                 }
             }
             else
-                replaceRoleResult = new ReplaceRoleResult();
+            {
+                replaceRoleResult = new ReplaceRoleResult(newRoleStr);
+            }
         }
 ,6 → 119,11
     public static class ReplaceRoleResult
     {
+        public ReplaceRoleResult(String requestedNewRole) {
+            this.requestedNewRole = requestedNewRole;
+        }
+        public String requestedNewRole = null;
         public int afetectedUsers = 0;
         public int afetectedCoursesValidatePrograms = 0;
 ,9 → 165,8
      */
     public ReplaceRoleResult replaceOrCreateRoleKey(String oldRole, String newRole, UserSession sess)
     {
-        ReplaceRoleResult result = new ReplaceRoleResult();
+        ReplaceRoleResult result = new ReplaceRoleResult(newRole);
         UserRoleConfig roleConfig = DaoFactory.getUserRoleConfigDaoImpl().findByRole(newRole);
         if(roleConfig != null)
         {

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesController.java
 ,7 → 7,6
 import org.json.JSONObject;
 import pt.estgp.estgweb.domain.CourseStudiesPlanImpl;
 import pt.estgp.estgweb.domain.Teacher;
-import pt.estgp.estgweb.domain.UserRoleConfig;
 import pt.estgp.estgweb.domain.views.CourseView;
 import pt.estgp.estgweb.filters.exceptions.NotFoundException;
 import pt.estgp.estgweb.services.courses.CoursesService;
 ,6 → 18,8
 import pt.estgp.estgweb.services.courseunits.DirectedCoordinatedCourses;
 import pt.estgp.estgweb.services.courseunits.DirectedCoordinatedUnitsService;
 import pt.estgp.estgweb.services.expceptions.AlreadyExistsException;
+import pt.estgp.estgweb.services.users.UserRoleConfigService;
+import pt.estgp.estgweb.web.controllers.configuration.UserRolesController;
 import pt.estgp.estgweb.web.controllers.courseunits.CourseUnitsController;
 import pt.estgp.estgweb.web.controllers.widgetmodel.ModelWidgetController;
 import pt.estgp.estgweb.web.exceptions.NoCookiesException;
 ,8 → 957,8
         IServiceManager sm = ServiceManager.getInstance();
         String[] names = new String[]{};
         Object[] args = new Object[]{Long.parseLong(courseId)};
-        UserRoleConfig role = (UserRoleConfig) sm.execute(RequestUtils.getRequester(request, response), "CreateRoleCourseComission", args, names);
-        addMessage(request,"course.comission.role.added.success",role.getValue());
+        UserRoleConfigService.ReplaceRoleResult result = (UserRoleConfigService.ReplaceRoleResult) sm.execute(RequestUtils.getRequester(request, response), "CreateRoleCourseComission", args, names);
+        UserRolesController.evaluateUpdateRoleResult(this,request,result);
         UserRoleProxy.setDirty();
         return true;
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/UserRolesController.java
 ,55 → 121,13
             ur.setDirty(false);
             UserRoleProxy.setDirty();
-            //f.setUserRoleConfigs(null);
-            if(replaceRoleResult.roleKeyAlreadyExist)
-                addError(request, "configuration.roles.already.exist",ur.getRole());
-            else
+            if(evaluateUpdateRoleResult(this,request, replaceRoleResult))
             {
-                if(replaceRoleResult.afetectedUsers > 0)
-                    addMessage(request, "configuration.roles.affected.users",""+replaceRoleResult.afetectedUsers);
+                addMessage(request, "configuration.role.saved",ur.getValue());
+            }
-                if(replaceRoleResult.afetectedCoursesValidatePrograms > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedCoursesValidatePrograms + " Cursos afetados no papel das comissões");
-                if(replaceRoleResult.afetectedDepartmentsDirectors > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedDepartmentsDirectors + " departamentos afetados no papel dos directores");
-                if(replaceRoleResult.afetectedDepartmentsBoards > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedDepartmentsBoards + " departamentos afetados no papel dos membros da direcção");
-                if(replaceRoleResult.afetectedSchoolsDirectors > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsDirectors + " escolas afetadas no papel dos directores");
-                if(replaceRoleResult.afetectedSchoolsBoard > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsBoard + " escolas afetadas no papel do board da direcção");
-                if(replaceRoleResult.afetectedSchoolsSecretario > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsSecretario + " escolas afetadas no papel dos secretários");
-                if(replaceRoleResult.afetectedSchoolsPresidentPedagogico > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsPresidentPedagogico + " escolas afetadas no papel dos presidentes do pedagógico");
-                if(replaceRoleResult.afetectedSchoolsMemberPedagogico > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsMemberPedagogico + " escolas afetadas no papel dos membros do pedagógico");
-                if(replaceRoleResult.afetectedSchoolsSecretarioPedagogico > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsSecretarioPedagogico + " escolas afetadas no papel dos secretários do pedagógico");
-                if(replaceRoleResult.afetectedSchoolsPresidentCtc > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsPresidentCtc + " escolas afetadas no papel dos presidentes do CTC");
-                if(replaceRoleResult.afetectedSchoolsMemberCtc > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsMemberCtc + " escolas afetadas no papel dos membros do CTC");
-                if(replaceRoleResult.afetectedSchoolsSecretarioCtc > 0)
-                    addMessageAsString(request,replaceRoleResult.afetectedSchoolsSecretarioCtc + " escolas afetadas no papel dos secretários do CTC");
-                if(replaceRoleResult.afectedEventClassManagers > 0)
-                    addMessageAsString(request,replaceRoleResult.afectedEventClassManagers + " gestores de eventos afetados");
-                if(replaceRoleResult.afectedActorPoolRoles > 0)
-                    addMessageAsString(request,replaceRoleResult.afectedActorPoolRoles + " Papeis em Pools de Processos BPMN afetados");
-                if(replaceRoleResult.afectedActorPoolRolesInstances > 0)
-                    addMessageAsString(request,replaceRoleResult.afectedActorPoolRolesInstances + " Papeis em Instancias de Pools de Processos BPMN afetados");
-                addMessage(request, "configuration.role.saved",ur.getValue());
-            }
         }
         catch (FilterChainFailedException e)
         {
 ,6 → 141,61
         return mapping.findForward("userRoles");
     }
+    public static boolean evaluateUpdateRoleResult(ApplicationDispatchController controllerFrom,HttpServletRequest request, UserRoleConfigService.ReplaceRoleResult replaceRoleResult) {
+        if(replaceRoleResult.roleKeyAlreadyExist)
+        {
+            controllerFrom.addError(request, "configuration.roles.already.exist",replaceRoleResult.requestedNewRole);
+            return false;
+        }
+        if(replaceRoleResult.afetectedUsers > 0)
+            controllerFrom.addMessage(request, "configuration.roles.affected.users", "" + replaceRoleResult.afetectedUsers);
+        if(replaceRoleResult.afetectedCoursesValidatePrograms > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedCoursesValidatePrograms + " Cursos afetados no papel das comissões");
+        if(replaceRoleResult.afetectedDepartmentsDirectors > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedDepartmentsDirectors + " departamentos afetados no papel dos directores");
+        if(replaceRoleResult.afetectedDepartmentsBoards > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedDepartmentsBoards + " departamentos afetados no papel dos membros da direcção");
+        if(replaceRoleResult.afetectedSchoolsDirectors > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsDirectors + " escolas afetadas no papel dos directores");
+        if(replaceRoleResult.afetectedSchoolsBoard > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsBoard + " escolas afetadas no papel do board da direcção");
+        if(replaceRoleResult.afetectedSchoolsSecretario > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsSecretario + " escolas afetadas no papel dos secretários");
+        if(replaceRoleResult.afetectedSchoolsPresidentPedagogico > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsPresidentPedagogico + " escolas afetadas no papel dos presidentes do pedagógico");
+        if(replaceRoleResult.afetectedSchoolsMemberPedagogico > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsMemberPedagogico + " escolas afetadas no papel dos membros do pedagógico");
+        if(replaceRoleResult.afetectedSchoolsSecretarioPedagogico > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsSecretarioPedagogico + " escolas afetadas no papel dos secretários do pedagógico");
+        if(replaceRoleResult.afetectedSchoolsPresidentCtc > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsPresidentCtc + " escolas afetadas no papel dos presidentes do CTC");
+        if(replaceRoleResult.afetectedSchoolsMemberCtc > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsMemberCtc + " escolas afetadas no papel dos membros do CTC");
+        if(replaceRoleResult.afetectedSchoolsSecretarioCtc > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afetectedSchoolsSecretarioCtc + " escolas afetadas no papel dos secretários do CTC");
+        if(replaceRoleResult.afectedEventClassManagers > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afectedEventClassManagers + " gestores de eventos afetados");
+        if(replaceRoleResult.afectedActorPoolRoles > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afectedActorPoolRoles + " Papeis em Pools de Processos BPMN afetados");
+        if(replaceRoleResult.afectedActorPoolRolesInstances > 0)
+            controllerFrom.addMessageAsString(request, replaceRoleResult.afectedActorPoolRolesInstances + " Papeis em Instancias de Pools de Processos BPMN afetados");
+        return true;
+    }
     public ActionForward checkNewRoles(ActionMapping mapping,
                                       ActionForm form,
                                       HttpServletRequest request,

 /branches/v3/impl/src/web/admin/configuration/userRoles.jsp
 ,7 → 118,9
                             <th class="transl">Tradução ES</th>
                             <th class="transl">Tradução FR</th>
                             <th>Observações</th>
-                            <th class="filter-false" data-sorter="false"><a class="btn btn-success" href="javascript:this.form.op.value='saveAllDirty';set(this.form,'saveAllDirty');this.form.submit()">Salvar Alterados</a></th>
+                            <th class="filter-false" data-sorter="false">
+                            </th>
                             <baco:isSuperUser>
                             <th class="filter-false" data-sorter="false">Apagar</th>
                             </baco:isSuperUser>

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1699 → Rev 1700