Add graphic

src/main/java/org/develop/officialjournal/controllers/ProcessController.java

@@ -38,6 +38,19 @@ public class ProcessController {
 		return process;
 
 	}
+	
+	@RequestMapping("/process/{id}/all")
+	public DOProcess getAllInfo(@PathVariable Integer id ) {
+
+		if(daoProcess == null)
+			daoProcess = Database.get().getDaoProcess();
+		
+		System.out.println("DAOPROCESS " +daoProcess);
+		DOProcess process = this.daoProcess.getAllInfo(id);
+		
+		return process;
+
+	}
 
 	@RequestMapping("/process/entity")
 	public List<DOProcess> getProcessByEntity(@RequestParam (required = true)  Integer entityId,
@@ -47,7 +60,7 @@ public class ProcessController {
 		Entity entity = new Entity();
 		entity.setId(entityId);
 		entity.setType(type);
-		return daoSearch.search(entity, true, processId);
+		return daoSearch.search(entity, false, processId);
 
 	}
 
@@ -70,6 +83,10 @@ public class ProcessController {
 		return searchResults;
 		
 	}
+	
+	
+	
+	
 
 
 

src/main/java/org/develop/officialjournal/controllers/SearchController.java

@@ -1,16 +1,13 @@
 package org.develop.officialjournal.controllers;
 
 import org.develop.officialjournal.services.Database;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import dao.DAOEntity;
 import dao.DAOJudge;
 import dao.DAOLawyer;
-import dao.DAOProcess;
 import dao.DAOSearch;
 import entity.Entity;
 import entity.Info;
@@ -24,7 +21,6 @@ public class SearchController {
 	private DAOJudge daoJudge;
 	private DAOEntity daoEntity;
 	private DAOSearch daoSearch;
-	private DAOProcess daoProcess;
 	
 	
 	public SearchController() {
@@ -33,7 +29,6 @@ public class SearchController {
 		daoJudge =  Database.get().getDaoJudge();
 		daoEntity =  Database.get().getDaoEntity();
 		daoSearch = Database.get().getDaoSearch();
-		daoProcess = Database.get().getDaoProcess();
 		
 	}
 	

src/main/java/org/develop/officialjournal/services/Database.java

@@ -89,6 +89,10 @@ public class Database {
 	 * @return the daoProcess
 	 */
 	public DAOProcess getDaoProcess() {
+		if(this.daoProcess == null)
+		{
+			this.daoProcess = new DAOProcess(connector.getConnection());
+		}
 		return daoProcess;
 	}
 
@@ -100,7 +104,6 @@ public class Database {
 	}
 
 
-
 	/**
 	 * @return the daoEntity
 	 */

src/main/resources/static/script/module/search.js

@@ -18,15 +18,43 @@ mainApp.controller("searchController", function($scope, $http, $mdDialog ) {
 	/**Return all process from entity*/
 	$scope.getProcessEntity = function(){
 		var url =urlBase+"/process/entity?type="+$scope.entity.type +"&entityId="+$scope.entity.id;
-
 		var size = $scope.processList.length;
-
 		if($scope.processList != undefined && size > 0   )
 		{
 			url = url +"&processId="+$scope.processList[size -1].id;
 		}
 
-		$http.get(url) .then(function(response) {$scope.processList =  response.data;});
+		
+		$http.get(url) .then(function(response) {
+			
+			$scope.processList =  response.data;
+			var k=0;
+
+			for( var i in $scope.processList)
+			{
+				var process =  $scope.processList[i];
+				
+				
+				var urlProcess =urlBase+"/process/"+process.id+"/all";
+
+				if(process.lawyers.length == 0)
+				{
+					$http.get(urlProcess).then(function(response) {
+						$scope.processList[k] =  response.data;
+						k++;
+						
+					});
+				}
+				
+			}
+		
+		
+		});
+		
+		
+		
+		
+		
 	};
 
 
@@ -61,44 +89,37 @@ mainApp.controller("searchController", function($scope, $http, $mdDialog ) {
 
 
 	};
+	
+	/**Show a popUp with a process**/
 
-
-	$scope.getInfo = function(process) {
-
-		
+	$scope.showPopUp = function(process)
+	{
 		var judge  = " <p> JUIZ: "+process.process.judge.name +" </p> ";
-		var lawyer = "";// <p> ADVOGADO: "+process.process.judge.name +" </p>";
-		
+		var lawyer = "";
+
 		for(var i in process.process.lawyers)
 		{
 			var lawyerObj = process.process.lawyers[i];
-			
-			lawyer = lawyer + "<p> ADVOGADO: "+lawyerObj.name +" </p>";
-			
+			if(lawyerObj.id != 22)
+			{
+				lawyer = lawyer + "<p> ADVOGADO: "+lawyerObj.name +" </p>";
+			}
 		}
-		
-		
-		
 		var entities = "";
 		for(var i in process.process.otherEntities)
 		{
 			var entityObject = process.process.otherEntities[i];
-			
+
 			entities = entities +  "<p> "+entityObject.type+" : "+entityObject.name +" </p>";
-			
+
 		}
-		
-		var modalText = "<div id=\"verditctText\" > " + juiz + advogado + entities +"</div>"
-		
-		
-		
-		
-		
+
+		var modalText = "<div id=\"verditctText\" > " + judge + lawyer + entities +"</div>"
+
 		$mdDialog.show({
 			clickOutsideToClose: true,
 			scope: $scope,        // use parent scope in template
 			preserveScope: true,  // do not forget this if use parent scope
-
 			template: modalText	,
 			controller: function DialogController($scope, $mdDialog) {
 				$scope.closeDialog = function() {
@@ -106,10 +127,32 @@ mainApp.controller("searchController", function($scope, $http, $mdDialog ) {
 				}
 			}
 		});
+		
+		
+	};
+	
+	
+	/**Get All Info about the user*/
+	
+	$scope.getInfo = function(process) {
 
+		var url =urlBase+"/process/"+process.process.id+"/all";
 
+		if(process.process.lawyers.length == 0)
+		{
+			$http.get(url) .then(function(response) {
+				process.process =  response.data;
+				$scope.showPopUp(process);
+			});
+		}
+		else{
+			$scope.showPopUp(process);
+		}
 	};
 
+
+	/**Info of entity and build the graphic**/
+
 	$scope.getInfoEntity = function(){
 
 		var url =urlBase+"/search/info?type="+$scope.entity.type +"&entityId="+$scope.entity.id;
@@ -119,26 +162,26 @@ mainApp.controller("searchController", function($scope, $http, $mdDialog ) {
 
 			$scope.myChartObject = {};
 			$scope.myChartObject.type = "ColumnChart";
-			
-			
+
+
 			$scope.myChartObject.data = 
 			{
-			"cols": [   {id: "t", label: "Topping", type: "string"},
-			            {id: "s", label: "Diarios", type: "number" } ,
-			            {role: "style", type: "string"} 
-			            
-			            
-			], 
-			"rows": [
-			       {c: [{v: "Deferidos"},	{v: response.data.deferredProcess }	,	{v: "green"} 	]},
-			       {c: [{v: "Indeferidos"},	{v: response.data.rejectedProcess } ,	{v: "red"}		]},
-			       {c: [{v: "Transito"},	{v: response.data.transtitProcess }	,	{v: "beige"}	]}  
-			       ]
+					"cols": [   {id: "t", label: "Topping", type: "string"},
+					            {id: "s", label: "Diarios", type: "number" } ,
+					            {role: "style", type: "string"} 
+
+
+					            ], 
+					            "rows": [
+					                     {c: [{v: "Deferidos"},	{v: response.data.deferredProcess }	,	{v: "green"} 	]},
+					                     {c: [{v: "Indeferidos"},	{v: response.data.rejectedProcess } ,	{v: "red"}		]},
+					                     {c: [{v: "Transito"},	{v: response.data.transtitProcess }	,	{v: "beige"}	]}  
+					                     ]
 			};
-			
+
 			$scope.myChartObject.options = {'title': 'Informaçoes sobre a entidade'	};
-			
-			
+
+
 
 		});