Merge branch 'stable-version' of UV-APPS/UV_SAIC_DATA into master

src/main/java/es/uv/saic/service/IndicadorEnquestaService.java

@@ -76,11 +76,11 @@ public class IndicadorEnquestaService {
 	}
 	
 	public List<IndicadorEnquesta> getAllInds(Organ o, Integer curs){
-		return this.r.getAllIndsByEstudi(o.getId().getLugar(), o.getOrgan().getId().getLugar(), curs, o.getTambit());
+		return this.r.getAllIndsByEstudi(curs, o.getRuct(), o.getOrgan().get, o.getTambit());
 	}
 
 	public List<IndicadorEnquesta> getAllInds(OrganDTO o, Integer curs){
-		return this.r.getAllIndsByEstudi(o.getLugar(), o.getLugar2(), curs, o.getTambit());
+		return this.r.getAllIndsByEstudi(curs, o.getLugar2(), curs, o.getTambit());
 	}
 
 	public List<IndicadorEnquesta> getAllIndsByRuct(Integer ruct, Integer curs){

src/main/java/es/uv/saic/service/TemplateService.java

@@ -66,7 +66,7 @@ public class TemplateService {
 		doc = iterateLoopAttr(idCentre, cursAvaluat, doc, context);
 		
 		/** Add template data (non iterated data)**/
-		ic.getTemplateData(idTitulacio, idCentre, cursAvaluat, context);	
+		context = ic.getTemplateData(idTitulacio, idCentre, cursAvaluat, context);	
 		this.replaceValues(doc, context, header, img);
 		
 		/** Replace sections if specified in options **/
@@ -176,7 +176,7 @@ public class TemplateService {
 		doc = iterateLoopAttr(idCentre, curs, doc, context);
 		
 		/** Add template data (non iterated data)**/
-		ic.getTemplateData(idTitulacio, idCentre, curs, context);	
+		context = ic.getTemplateData(idTitulacio, idCentre, curs, context);	
 		this.replaceValues(doc, context, header, img);
 		
 		return doc.html();	

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

@@ -183,7 +183,7 @@ public class IndicadorController {
     }
     
     @PostMapping("/templatedata")
-    public void getTemplateData(@RequestParam Integer idTitulacio, @RequestParam Integer idCentre, @RequestParam Integer curs, @RequestParam HashMap<String, Object> context) {
+    public HashMap<String, String> getTemplateData(@RequestParam Integer idTitulacio, @RequestParam Integer idCentre, @RequestParam Integer curs, @RequestParam HashMap<String, String> context) {
 		
 		/*  Indicadores del data warehouse */
 		try {
@@ -214,6 +214,8 @@ public class IndicadorController {
 			}
 			
 		}
+
+        return context;
 	}
 
 

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

@@ -23,7 +23,7 @@ public class TemplateController {
     }
     
     @PostMapping("/addData2")
-    public String addTemplateData2(@RequestParam String idTitulacio, @RequestParam String idCentre, @RequestParam String curs, @RequestParam String template) {
-        return ts.addTemplateData(Integer.parseInt(idTitulacio), Integer.parseInt(curs), Integer.parseInt(idCentre), template);        
+    public String addTemplateData2(@RequestParam String idTitulacio, @RequestParam String idCentre, @RequestParam String curs, @RequestBody String template) {
+        return ts.addTemplateData(Integer.parseInt(idTitulacio), Integer.parseInt(idCentre), Integer.parseInt(curs), template);        
     }
 }