Add modal to verdict

.classpath

@@ -22,7 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,12 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8

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

@@ -3,16 +3,10 @@ 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.DAOSearch;
-import entity.Entity;
-import entity.Judge;
 import entity.Lawyer;
 
 @RestController

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

@@ -1,20 +1,18 @@
 package org.develop.officialjournal.controllers;
 
+import java.util.Comparator;
 import java.util.List;
 
 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.DAOLawyer;
 import dao.DAOProcess;
 import dao.DAOSearch;
 import entity.DOProcess;
 import entity.Entity;
-import entity.Lawyer;
 
 @RestController
 public class ProcessController {
@@ -42,15 +40,36 @@ public class ProcessController {
 	}
 
 	@RequestMapping("/process/entity")
-	public List<DOProcess> getProcessByEntity(@RequestParam (required = true) Integer entityId,@RequestParam (required = true) String type ) 
+	public List<DOProcess> getProcessByEntity(@RequestParam (required = true)  Integer entityId,
+											  @RequestParam (required = true)  String type ,
+											  @RequestParam (required = false, defaultValue= "0") Integer processId   ) 
 	{
 		Entity entity = new Entity();
 		entity.setId(entityId);
 		entity.setType(type);
-		return daoSearch.search(entity, true);
+		return daoSearch.search(entity, true, processId);
 
 	}
 
+	
+	@RequestMapping("/process/number")
+	public List<DOProcess> getProcessByEntity(  @RequestParam (required = true)  String processNumber ,
+											  	@RequestParam (required = false, defaultValue= "0") Integer processId   ) 
+	{
+		
+		List<DOProcess> searchResults =  daoSearch.search(processNumber, true, processId);
+
+		searchResults.sort(new Comparator<DOProcess>() {
+
+			public int compare(DOProcess o1, DOProcess o2) {
+				// TODO Auto-generated method stub
+				return (int) (o1.getProcessDate().getTime() - o2.getProcessDate().getTime());
+				
+			}
+		});
+		return searchResults;
+		
+	}
 
 
 

src/main/resources/static/index.html

@@ -2,8 +2,24 @@
 
 <head>
 <title>Angular JS Modules</title>
-<script
-	src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
+
+  <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.0-rc2/angular-material.min.css">
+     
+ 
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-animate.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-aria.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular-messages.min.js"></script>
+
+  <!-- Angular Material Library -->
+  <script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.0-rc2/angular-material.min.js"></script>
+  
+  
+
+
+
+      
+
 <script src="script/module/app.js"></script>
 <!-- <script src="script/module/lawyer.js"></script> -->
 <script src="script/module/search.js"></script>
@@ -31,7 +47,7 @@ table tr:nth-child(even) {
 		<div ng-controller="searchController">
 
 			<input type="text" ng-model="entity.text" size="50">
-			<button ng-click="search()">Search</button>
+			<button ng-click="search()">Busca</button>
 
 
 			<table border="0">
@@ -50,7 +66,8 @@ table tr:nth-child(even) {
 				</tr>
 
 			</table>
-
+			<button ng-click="getProcessEntity()"> Processos</button>
+			
 
 			<br>
 			<br>
@@ -60,47 +77,31 @@ table tr:nth-child(even) {
 				<tr>
 					<td>Identificador</td>
 					<td>Numero</td>
+					<td>Data</td>
 					<td>Tipo</td>
-					<td>NumeroOAB</td>
 
 				</tr>
 
-				<tr>
+				<tr ng-repeat="process in processList">
 					<td><input type="text" ng-model="process.id" /></td>
-					<td><input type="text" ng-model="process.numberProcess" size="40" /></td>
-					<td><input type="text" ng-model="process.typeVerdict"></td>
-					<td><input type="text" ng-model="process.oabnumber"></td>
+					<td><input type="text" ng-model="process.processNumber" ng-click="getProcessNumber(process.processNumber)" size="40" /></td>
+					<td><input type="text" ng-model="process.processDate"></td>
+					<td><input type="text" ng-model="process.typeVerdict.name"></td>
+					<td >
+						<div ng-click="showVerdict(this)">Setença</div>
+						<div ng-model="process.verdict"  class="ng-hide" data-id="process.id"> </div>
+					</td>
 				</tr>
-
-
+				
+				
 			</table>
+			
+			
+			
 
 
 		</div>
-		<!-- 		<div ng-controller="processController"> -->
-
-		<!-- 			<table border="0"> -->
-
-		<!-- 				<tr> -->
-		<!-- 					<td>Id</td> -->
-		<!-- 					<td><input type="text" ng-model="student.id"></td> -->
-		<!-- 				</tr> -->
-
-		<!-- 				<tr> -->
-		<!-- 					<td>Name:</td> -->
-		<!-- 					<td><input type="text" ng-model="student.name"></td> -->
-		<!-- 				</tr> -->
-
-		<!-- 				<tr> -->
-		<!-- 					<td>OABNumber:</td> -->
-		<!-- 					<td><input type="text" ng-model="student.oabnumber"></td> -->
-		<!-- 				</tr> -->
-
-		<!-- 			</table> -->
-
-		<!-- 			<button ng-click="update()">Click Me!</button> -->
 
-		<!-- 		</div> -->
 
 
 	</div>

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

@@ -1,4 +1,4 @@
-var mainApp = angular.module("mainApp", []);
+var mainApp = angular.module("mainApp", ['ngMaterial']);
 
 
 

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

@@ -1,23 +1,115 @@
-mainApp.controller("searchController", function($scope, $http) {
+mainApp.controller("searchController", function($scope, $http, $mdDialog ) {
 
 	var urlBase = "http://localhost:8080"
 
 
+		
+		/**Search the entity*/
 		$scope.search = function(){
-			var url ="/search"+urlBase+"?text="+$scope.entity.text;
-			$http.get(url) .then(function(response) {
+			var url =urlBase+"/search"+"?text="+$scope.entity.text;
+			$http.get(url).then(function(response) {
 				$scope.entity =  response.data;
-		});
+				$scope.processList=[];
+				
+			});
+		};
+			
+			
+		/**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;});
+		};
+		
+		/**Return all process from entity*/
+		$scope.getProcessNumber = function(processNumber ){
+			
+		
+			var url =urlBase+"/process/number?processNumber="+processNumber;
+			
 			
+			var size = $scope.processList.length;
+//			
+//			if($scope.processList != undefined && size > 0   )
+//			{
+//				//url = url +"&processId="+$scope.processList[size -1].id;
+//				
+//			}
 			
-		$scope.getProcess = function(){
-			var url ="/search"+urlBase+"?text="+$scope.entity.text;
-			$http.get(url) .then(function(response) {
-			$scope.entity =  response.data;
-		});
+			
+			$http.get(url) .then(function(response) {$scope.processList =  response.data;});
+		};
+		
+		$scope.processList=[];
+		
+//		$scope.shwoVerdict = function(process){
+//			
+//		
+//			
+//			
+//			
+////			var idProcess = process.id;
+////			
+////			for(var i in $scope.processList)
+////			{
+////				var item = $scope.processList[i];
+////				
+////				if(item.id = idProcess)
+////				{
+////					console.log(id);
+////					
+////				}
+////				
+////			}
+//
+//			console.log(process.process.verdict);
+//			
+//			
+//			
+//			
+//		}
+		
+		
+		
+		
+		$scope.showVerdict = function(process) {
+		    
+			
+
+//			var url =urlBase+"/judge/"+process.process.judge.id;
+//			$http.get(url).then(function(response) {process.process.judge =  response.data;});
+//			
+			
+			$mdDialog.show(
+		      $mdDialog.alert()
+		        .clickOutsideToClose(true)
+		        .title(process.process.judge.name)
+		        .textContent(process.process.verdict)
+		        .ok('Fechar!')
+		        // You can specify either sting with query selector
+		        .openFrom('#left')
+		        // or an element
+		        .closeTo(angular.element(document.querySelector('#right')))
+		    );
+		};
+		
+		
+
+
+		
 		
 
-	}
+	
 
 });