Browse Source

Supervision form now is completely organized

Mario Martínez Hernández 6 hours ago
parent
commit
2464c831f1

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

@@ -191,6 +191,7 @@ public class OrganController {
 
 		if(centres == null) { centres = us.getSupervisableCentres(u); }
 		List<Organ> org_list = this.os.findTitulacionsByCentre(centres);
+
 		List<DummyDataTransfer> supervisable_cents = new ArrayList<DummyDataTransfer>();
 		for(Organ or : org_list) {
 			DummyDataTransfer c = new DummyDataTransfer();
@@ -199,6 +200,7 @@ public class OrganController {
 			c.setValue(or.getId().getLugar());
 			supervisable_cents.add(c);
 		}
+		
 		DummyDataTransfer o = new DummyDataTransfer();
 		o = new DummyDataTransfer();
 		Organ org = os.findByID("T", 1);
@@ -218,6 +220,11 @@ public class OrganController {
 		o.setText2(org.getNomVal());
 		o.setValue(0);
 		supervisable_cents.add(o);
+
+		Collections.sort(supervisable_cents, (a, b) -> {
+			return a.getText2().compareTo(b.getText2());
+		});
+
 		model.put("sup_orgs", supervisable_cents);
 		return model;
 	}

+ 5 - 0
src/main/java/es/uv/saic/web/ProceduresController.java

@@ -594,6 +594,11 @@ public class ProceduresController {
 				d.setText(Integer.toString(c-1) + " - " + Integer.toString(c));
 				supervisable_years.add(d);
 			}
+
+			Collections.sort(supervisable_years, (a, b) -> {
+				return a.getText().compareTo(b.getText());
+			});
+
 			model.put("sup_years", supervisable_years);
 		return model;
 	}