From 3eeb734ac69befeb4fdbd22fbee6fc8acd94442a Mon Sep 17 00:00:00 2001
From: Carlos Roque <deactivated@coded.pt>
Date: Wed, 15 Oct 2014 13:59:25 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@2012
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 trunk/SiprpWebFichasClinicas/.classpath       |  1 +
 .../html/app/Documents/DocumentsController.js | 33 ++-----------------
 .../html/app/Documents/DocumentsView.html     |  2 +-
 .../html/app/SearchForm/SearchController.js   | 15 ++++++++-
 .../fichasclinicas/logic/DocumentosLogic.java | 15 +++++----
 .../provider/DocumentosDataProvider.java      |  5 ++-
 .../webservices/jaxrs/DocumentosImpl.java     |  2 +-
 7 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/trunk/SiprpWebFichasClinicas/.classpath b/trunk/SiprpWebFichasClinicas/.classpath
index 1109ceb6..e51bc0fe 100644
--- a/trunk/SiprpWebFichasClinicas/.classpath
+++ b/trunk/SiprpWebFichasClinicas/.classpath
@@ -144,5 +144,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0 - Java 7"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsController.js
index 637e3b77..09dfe56d 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsController.js
@@ -2,38 +2,9 @@
 {
     $scope.globals = globals;
 
-    $scope.globals = globals;
-
     $scope.showList = true;
     $scope.showEdit = false; 
 
-    var documentos = [
-        {
-            id: 1,
-            nome: 'documento 1'
-        },
-        {
-            id: 2,
-            nome: 'documento 2'
-        },
-        {
-            id: 3,
-            nome: 'documento 3'
-        },
-        {
-            id: 4,
-            nome: 'documento 4'
-        },
-        {
-            id: 5,
-            nome: 'documento 5'
-        },
-        {
-            id: 6,
-            nome: 'documento 6'
-        }
-    ];
-
     $scope.storeDocuments = new globals.dataService.store({
         model: null,
         serviceBase: window.evoapp.DOCPATH,
@@ -92,9 +63,9 @@
 
         if(isValid)
         {
-            //TODO: store upsert
             $scope.uploadDocument();
             $scope.list();
+            $rootScope.$emit('ondocumentsave');
         }
     };
 
@@ -130,7 +101,7 @@
     };
 
     $scope.download = function(item){
-      window.location.assign( window.evoapp.DOCPATH + "documentos/getDocumento?documentoID=" + encodeURIComponent( item.id ) );
+      window.location.assign( window.evoapp.DOCPATH + "documento?documentoID=" + encodeURIComponent( item.id ) );
     };
 
     $scope.uploadDocument = function(){
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html
index d6c356cd..0d37adcc 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html
@@ -15,7 +15,7 @@
                 </thead>-->
                 <tbody>
                     <tr ng-repeat="item in storeDocuments.items">
-                        <td style="width:80%;">{{item.nome}}</td>
+                        <td style="width:80%;" data-ng-bind="item.detalhe">N/A</td>
                         <td style="width:20%">
                             <button data-toggle="tooltip" data-placement="left" title="Download do Documento" ng-click="download(item)" class="btn btn-xs btn-default pull-right m-r-5">
                                 <i class="glyphicon glyphicon-download-alt"></i>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
index e0f71565..47406903 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
@@ -150,7 +150,6 @@
             {
 
             });
-
         }
     };
 
@@ -237,6 +236,20 @@
             });
     	}
     };
+    
+    var unbind = $rootScope.$on('ondocumentsave', function(event, args)
+    { 
+    	$scope.numDocumentos.extraParams = {
+	        trabalhadorID: selectedRecord.id
+	    };
+	
+	    $scope.numDocumentos.get( function(response)
+	    {
+	
+	    });
+    });
+    
+    $scope.$on('$destroy', unbind);
 
     $scope.$on('afterrender', function(event, args){ 
    	
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/DocumentosLogic.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/DocumentosLogic.java
index 0af97665..5796c598 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/DocumentosLogic.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/DocumentosLogic.java
@@ -53,7 +53,7 @@ public class DocumentosLogic
 			result.setSuccess(false);
 			EvoMessageBean msg = new EvoMessageBean();
 			msg.setType(EvoMessageTypeBean.SESSIONTIMEOUT);
-			msg.setMessageData("Utilizador asssociado \u00e0 sess\u00e3o inv\u00e1lido/inexistente!");
+			msg.setMessageData("Utilizador asssociado a sess\u00e3o inv\u00e1lida/inexistente!");
 			result.addMessage(msg);
 		}
 		return result;
@@ -103,7 +103,7 @@ public class DocumentosLogic
 			result.setSuccess(false);
 			EvoMessageBean msg = new EvoMessageBean();
 			msg.setType(EvoMessageTypeBean.SESSIONTIMEOUT);
-			msg.setMessageData("Utilizador asssociado \u00e0 sess\u00e3o inv\u00e1lido/inexistente!");
+			msg.setMessageData("Utilizador asssociado a sess\u00e3o inv\u00e1lida/inexistente!");
 			result.addMessage(msg);
 		}
 		return result;
@@ -120,7 +120,7 @@ public class DocumentosLogic
 
 				if(doc != null)
 				{
-					response = Response.ok(doc.getFile_data(),doc.getMime_type()).header("Content-Disposition", "inline; filename=\""+doc.getName()+"\"").build();
+					response = Response.ok(doc.getFile_data(), doc.getMime_type()).header("Content-Disposition", "attachment; filename=\""+doc.getName()+"\"").build();
 				}
 				else
 				{
@@ -148,6 +148,7 @@ public class DocumentosLogic
 		{
 			try
 			{
+				System.out.println(documentoUploadBean.getTrabalhadorId());
 				if( documentosProvider.trabalhadorExists( documentoUploadBean.getTrabalhadorId() ) )
 				{
 					documentosProvider.saveDocumento( documentoUploadBean );
@@ -182,7 +183,7 @@ public class DocumentosLogic
 			result.setSuccess(false);
 			EvoMessageBean msg = new EvoMessageBean();
 			msg.setType(EvoMessageTypeBean.SESSIONTIMEOUT);
-			msg.setMessageData("Utilizador asssociado \u00e0 sess\u00e3o inv\u00e1lido/inexistente!");
+			msg.setMessageData("Utilizador asssociado a sess\u00e3o inv\u00e1lida/inexistente!");
 			result.addMessage(msg);
 		}
 		return result;
@@ -205,7 +206,7 @@ public class DocumentosLogic
 					responseBean.setSuccess(true);
 					EvoMessageBean msg = new EvoMessageBean();
 					msg.setType( EvoMessageTypeBean.INFO );
-					msg.setMessageData( "Remo\u00e7\u00e3o do documento bem sucedida" );
+					msg.setMessageData( "Remoção do documento bem sucedida" );
 					responseBean.addMessage( msg );
 
 				}
@@ -214,7 +215,7 @@ public class DocumentosLogic
 					responseBean.setSuccess(false);
 					EvoMessageBean msg = new EvoMessageBean();
 					msg.setType(EvoMessageTypeBean.ERROR);
-					msg.setMessageData("O documento dado n\u00e3o \u00e9 v\u00e0lido.");
+					msg.setMessageData("O documento dado não é válido.");
 					responseBean.addMessage(msg);
 				}
 			}
@@ -233,7 +234,7 @@ public class DocumentosLogic
 			responseBean.setSuccess(false);
 			EvoMessageBean msg = new EvoMessageBean();
 			msg.setType(EvoMessageTypeBean.SESSIONTIMEOUT);
-			msg.setMessageData("Utilizador asssociado \u00e0 sess\u00e3o inv\u00e1lido/inexistente!");
+			msg.setMessageData("Utilizador asssociado a sess\u00e3o inv\u00e1lida/inexistente!");
 			responseBean.addMessage(msg);
 		}
 		return responseBean;
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/DocumentosDataProvider.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/DocumentosDataProvider.java
index 015af8f5..55ad0cc3 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/DocumentosDataProvider.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/DocumentosDataProvider.java
@@ -76,7 +76,9 @@ public class DocumentosDataProvider
 	{
 		Select sel = new Select2( TrabalhadoresData.TABLENAME, new Field( TrabalhadoresData.ID_FULL ).isEqual( trabalhadorID ), "count(*)" );
 		Virtual2DArray array = siprpProvidersBean.getDBMANAGER().getSharedExecuter( this ).executeQuery( sel );
-		return array.rowCount() > 0 && array.get( 0, 0 ).equals( 1 );
+		System.out.println(array.rowCount());
+		System.out.println( array.rowCount() > 0 ? (Long) array.get(0, 0) : 0l);
+		return array.rowCount() > 0 && ( (Long) array.get( 0, 0 ) ).equals( 1l );
 	}
 
 	public void saveDocumento( DocumentoUploadBean documentoUploadBean ) throws Exception
@@ -106,6 +108,7 @@ public class DocumentosDataProvider
 		fileData.refresh();
 
 		FilFileTrabalhadorData fileTrabalhadorData = new FilFileTrabalhadorData();
+		fileTrabalhadorData.setProvider( siprpProvidersBean.getENTITY_PROVIDER() );
 		fileTrabalhadorData.setFile_id( fileData.getId() );
 		fileTrabalhadorData.setOnline( true );
 		fileTrabalhadorData.setTrabalhador_id( documentoUploadBean.getTrabalhadorId() );
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/DocumentosImpl.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/DocumentosImpl.java
index eb9791be..68af6838 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/DocumentosImpl.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservices/jaxrs/DocumentosImpl.java
@@ -80,7 +80,7 @@ public class DocumentosImpl {
 			String desc = multiPart.getField( "nome" ).getValue();
 			String nome = documento.getContentDisposition().getFileName();
 			Long size = documento.getContentDisposition().getSize();
-			String mime = documento.getContentDisposition().getType();
+			String mime = documento.getMediaType().toString();
 			InputStream inputStream = documento.getValueAs( InputStream.class );
 			Integer trabalhadorID = Integer.parseInt( multiPart.getField( "trabalhador_id" ).getValue() );