| 
						
						
						
					 | 
					 | 
					@ -1,5 +1,7 @@
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					package info.bukova.isspst.reporting;
 | 
					 | 
					 | 
					 | 
					package info.bukova.isspst.reporting;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					import info.bukova.isspst.services.Service;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.io.Serializable;
 | 
					 | 
					 | 
					 | 
					import java.io.Serializable;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.util.ArrayList;
 | 
					 | 
					 | 
					 | 
					import java.util.ArrayList;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.util.HashMap;
 | 
					 | 
					 | 
					 | 
					import java.util.HashMap;
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					 | 
					@ -17,6 +19,7 @@ public class ReportDefinition implements Serializable {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
						private Map<String, Object> params;
 | 
					 | 
					 | 
					 | 
						private Map<String, Object> params;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
						private List<String> fieldsToPrint;
 | 
					 | 
					 | 
					 | 
						private List<String> fieldsToPrint;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
						private String reportTitle;
 | 
					 | 
					 | 
					 | 
						private String reportTitle;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
						private Service<Object>	service;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 	public ReportDefinition() {
 | 
					 | 
					 | 
					 | 
					 	public ReportDefinition() {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 		params = new HashMap<String, Object>();
 | 
					 | 
					 | 
					 | 
					 		params = new HashMap<String, Object>();
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -87,6 +90,7 @@ public class ReportDefinition implements Serializable {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							fieldsToPrint.clear();
 | 
					 | 
					 | 
					 | 
							fieldsToPrint.clear();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							dataSet = null;
 | 
					 | 
					 | 
					 | 
							dataSet = null;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							reportTitle = "";
 | 
					 | 
					 | 
					 | 
							reportTitle = "";
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
							service = null;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							params.clear();
 | 
					 | 
					 | 
					 | 
							params.clear();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
						}
 | 
					 | 
					 | 
					 | 
						}
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					 | 
					@ -98,4 +102,12 @@ public class ReportDefinition implements Serializable {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							this.reportTitle = reportTitle;
 | 
					 | 
					 | 
					 | 
							this.reportTitle = reportTitle;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
						}
 | 
					 | 
					 | 
					 | 
						}
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
						public Service<Object> getService() {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
							return service;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
						}
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
						public void setService(Service<Object> service) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
							this.service = service;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
						}
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					}
 | 
					 | 
					 | 
					 | 
					}
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
					 | 
					 | 
					
 
 |