Core logic is now on GUI side

src/main/java/es/uv/saic/web/DashboardController.java

@@ -51,7 +51,7 @@ public class DashboardController {
                 dbc.getOrganList(((Usuari) auth.getPrincipal()).getUsuari());
 
         if (response != null && response.get("redirect") != null) {
-            return response.get("redirect").toString();
+            return response.get("organ").toString() == "0" ? "dashboard" : "redirect:/dashboard/" + response.get("organ").toString();
         }
 
         return "401";
@@ -87,7 +87,15 @@ public class DashboardController {
             }
 
             model.addAllAttributes(response);
-            return response.get("redirect").toString();
+
+			String status = response.get("redirect").toString();
+			if(status.equals("U")) {
+				return "dashboardUniversitat";
+			} else if (status.equals("C")) {
+				return "dashboardCentre";
+			} else if (status.equals("T")){
+				return "dashboardTitulacio";
+			}
         }
 
         return "401";

src/main/java/es/uv/saic/web/ProceduresController.java

@@ -293,9 +293,9 @@ public class ProceduresController {
 		
 		HashMap<String, Object> response =
                 pc.findProcedure(idProces.toString(), action);
-            if (response != null && response.get("redirect") != null) {
+            if (response != null && response.get("remove") != null) {
                 model.addAllAttributes(response);
-                return response.get("redirect").toString();
+                return action.equals("remove") ? "components/form_procedure_remove_confirm" : "components/form_procedure"; 
             }
 
 		return "401";
@@ -310,7 +310,7 @@ public class ProceduresController {
                 pc.formTemplate(idPlantilla, action);
             if (response != null && response.get("redirect") != null) {
                 model.addAllAttributes(response);
-                return response.get("redirect").toString();
+                return (boolean) response.get("redirect") ? "components/form_template" : "";
             }
 
 		return "401";