فهرست منبع

Core logic is now on GUI side

Mario Martínez Hernández 1 روز پیش
والد
کامیت
d013466ae3
2فایلهای تغییر یافته به همراه11 افزوده شده و 14 حذف شده
  1. 7 7
      src/main/java/es/uv/saic/web/DashboardController.java
  2. 4 7
      src/main/java/es/uv/saic/web/ProceduresController.java

+ 7 - 7
src/main/java/es/uv/saic/web/DashboardController.java

@@ -130,7 +130,7 @@ public class DashboardController {
 		
 		if(urs.isGrantedUser(u)){
 			Organ o = os.findByID("C", 0);
-			model.put("redirect", "redirect:/dashboard/"+o.getRuct());
+			model.put("organ", o.getRuct());
 			return model;
 		}		
 		else if(urs.isGrantedSupervisor(u)) {
@@ -158,17 +158,17 @@ public class DashboardController {
 							 .collect(Collectors.toList());
 		}
 		if(centres.size() == 1) {
-			model.put("redirect", "redirect:/dashboard/"+centres.get(0).getRuct());
+			model.put("organ", centres.get(0).getRuct());
 			return model;
 		}
 		else if(titulacions.size() == 1) {
-			model.put("redirect", "redirect:/dashboard/"+titulacions.get(0).getRuct());
+			model.put("organ", titulacions.get(0).getRuct());
 			return model;
 		}
 		else {
 			model.put("showCentres", showCentres);
 			model.put("titulacions", titulacions.stream().map(OrganDTO::new).toList());
-			model.put("redirect", "dashboard");
+			model.put("organ", 0);
 			return model;
 		}
 	}
@@ -210,14 +210,14 @@ public class DashboardController {
 			model.put("showCentres", true);
 			c = cs.findFirstLevelAndU(o.getId().getTlugar());
 			model.put("categories", c);
-			model.put("redirect", "dashboardUniversitat");
+			model.put("redirect", "U");
 			return model;
 		}
 		else if(o.getTambit().equals("C")) {
-			model.put("redirect", "dashboardCentre");
+			model.put("redirect", "C");
 			return model;
 		}
-		model.put("redirect", "dashboardTitulacio");
+		model.put("redirect", "T");
 		return model;
 	}
 	

+ 4 - 7
src/main/java/es/uv/saic/web/ProceduresController.java

@@ -657,20 +657,17 @@ public class ProceduresController {
 			model.put("procedure", p);
 			List<Rol> roles = rs.findAssignables();
 			model.put("roles", roles.stream().map(RolDTO::new).toList());
-			model.put("redirect", "components/form_procedure");
             return model;
 		}
 		else if(!idProces.equals("0") && action.equals("remove")) {
 			p = ps.findByID(Integer.parseInt(idProces));
 			model.put("procedure", p);
-            model.put("redirect", "components/form_procedure_remove_confirm");
 			return model;
 		}
 		else {
 			model.put("procedure", p);
 			List<Rol> roles = rs.findAssignables();
 			model.put("roles", roles);
-            model.put("redirect", "components/form_procedure");
 			return model;
 		}	
 	}
@@ -685,14 +682,14 @@ public class ProceduresController {
 			Plantilla p = new Plantilla();
 				model.put("editable", true);
 			model.put("template", p);
-			model.put("redirect", "components/form_template");
+			model.put("redirect", true);
 			return model;
 		}
 		else if(action.equals("edit")) {
 			Plantilla p = plc.findByID(idPlantilla);
 			model.put("editable", false);
 			model.put("template", p);
-			model.put("redirect", "components/form_template");
+			model.put("redirect", true);
 			return model;
 		}
 		else if(action.equals("duplicate")) {
@@ -700,10 +697,10 @@ public class ProceduresController {
 			p.setVersio(p.getVersio()+1);
 			model.put("editable", true);
 			model.put("template", p);
-			model.put("redirect", "components/form_template");
+			model.put("redirect", true);
 			return model;
 		}
-		model.put("redirect", "");
+		model.put("redirect", false);
 		return model;
 	}