diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
index 3a7fbd81..8641cec7 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
@@ -231,48 +231,55 @@
     };
 
     $scope.cancel = function(){
+    	
+    	var buttons = {
+            cancelar: {
+                label: 'Cancelar',
+                className: 'btn-default',
+                callback: function() {                        
+                    //cancelar diálogo                        
+                }
+            },
+            anular: {
+                label: 'Anular',
+                className: 'btn-danger',
+                callback: function() {
+                    
+                    globals.plugins.hideFloatingSideMenu();
 
+                    $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+            
+                        angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+                    });  
+                }
+            }
+    	};
+    	
+    	if(!$scope.editing.ficha.data_conclusao)
+    	{    		
+    		angular.extend(buttons, {
+    			gravar: {
+    				label: 'Gravar',
+    				className: 'btn-success',
+    				callback: function() {
+	
+		                $scope.save(false);   
+		                  
+		                globals.plugins.hideFloatingSideMenu();
+		
+		                $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+		          
+		                	angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+		                });
+    				}
+				}
+    		});
+    	};
+    	
         globals.message.custom({
             title: null,
             message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
-            buttons: {
-                cancelar: {
-                    label: 'Cancelar',
-                    className: 'btn-default',
-                    callback: function() {                        
-                        //cancelar diálogo                        
-                    }
-                },
-                anular: {
-                    label: 'Anular',
-                    className: 'btn-danger',
-                    callback: function() {
-                        
-                        globals.plugins.hideFloatingSideMenu();
-
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
-                    }
-                },
-                gravar: {
-                    label: 'Gravar',
-                    className: 'btn-success',
-                    callback: function() {
-
-                        $scope.save(false);   
-                        
-                        globals.plugins.hideFloatingSideMenu();
-
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
-
-                    }
-                }
-            }
+            buttons: buttons
         });
     };
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
index 18af2d7c..51bf6799 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
@@ -119,8 +119,8 @@
 
         <div class="row">
             <div class="col-md-12">
-                <button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
-                <button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
                 
                 <!-- <button ng-click="cancel()" type="button" class="btn btn-link">Cancelar</button> -->
             </div>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
index bfeca140..a6bac6ab 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
@@ -105,32 +105,34 @@
     };
 
     $scope.cancel = function(){
-        
-        globals.message.custom({
-            title: null,
-            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
-            buttons: {
-                cancelar: {
-                    label: 'Cancelar',
-                    className: 'btn-default',
-                    callback: function() {                        
-                        //cancelar diálogo                        
-                    }
-                },
-                anular: {
-                    label: 'Anular',
-                    className: 'btn-danger',
-                    callback: function() {
-                        
-                        globals.plugins.hideFloatingSideMenu();
+    	
+    	var buttons = {
+            cancelar: {
+                label: 'Cancelar',
+                className: 'btn-default',
+                callback: function() {                        
+                    //cancelar diálogo                        
+                }
+            },
+            anular: {
+                label: 'Anular',
+                className: 'btn-danger',
+                callback: function() {
+                    
+                    globals.plugins.hideFloatingSideMenu();
 
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
-                    }
-                },
-                gravar: {
+                    $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+            
+                        angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+                    });  
+                }
+            }
+    	};
+        	
+    	if(!$scope.editing.ficha.data_conclusao)
+    	{    		
+    		angular.extend(buttons, {
+    			gravar: {
                     label: 'Gravar',
                     className: 'btn-success',
                     callback: function() {
@@ -143,8 +145,14 @@
                             angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
                         });  
                     }
-                }
-            }
+				}
+    		});
+    	};
+        
+        globals.message.custom({
+            title: null,
+            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
+            buttons: buttons
         });
     };
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
index 6111e087..9cfbaffc 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
@@ -74,9 +74,8 @@
 
         <div class="row">
             <div class="col-md-12">
-                <button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
-
-                <button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
             </div>
         </div>
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
index d46f9143..aac07893 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
@@ -101,32 +101,34 @@
     };
 
     $scope.cancel = function(){
-        
-        globals.message.custom({
-            title: null,
-            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
-            buttons: {
-                cancelar: {
-                    label: 'Cancelar',
-                    className: 'btn-default',
-                    callback: function() {                        
-                        //cancelar diálogo                        
-                    }
-                },
-                anular: {
-                    label: 'Anular',
-                    className: 'btn-danger',
-                    callback: function() {
-                        
-                        globals.plugins.hideFloatingSideMenu();
+    	
+    	var buttons = {
+            cancelar: {
+                label: 'Cancelar',
+                className: 'btn-default',
+                callback: function() {                        
+                    //cancelar diálogo                        
+                }
+            },
+            anular: {
+                label: 'Anular',
+                className: 'btn-danger',
+                callback: function() {
+                    
+                    globals.plugins.hideFloatingSideMenu();
 
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
-                    }
-                },
-                gravar: {
+                    $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+            
+                        angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+                    });  
+                }
+            }
+    	};
+    	
+    	if(!$scope.editing.ficha.data_conclusao)
+    	{    		
+    		angular.extend(buttons, {
+    			gravar: {
                     label: 'Gravar',
                     className: 'btn-success',
                     callback: function() {
@@ -139,8 +141,14 @@
                             angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
                         });
                     }
-                }
-            }
+				}
+    		});
+    	};
+        
+        globals.message.custom({
+            title: null,
+            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
+            buttons: buttons
         });
     };
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
index 2deac12e..a699bfdb 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
@@ -124,9 +124,8 @@
 
         <div class="row">
             <div class="col-md-12">
-                <button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
-
-                <button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
             </div>
         </div>
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
index 6b47da4f..cc78a9f6 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
@@ -232,47 +232,54 @@
 
     $scope.cancel = function(){
 
-        globals.message.custom({
-            title: null,
-            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
-            buttons: {
-                cancelar: {
-                    label: 'Cancelar',
-                    className: 'btn-default',
-                    callback: function() {                        
-                        //cancelar diálogo                        
-                    }
-                },
-                anular: {
-                    label: 'Anular',
-                    className: 'btn-danger',
-                    callback: function() {
-                        
-                        globals.plugins.hideFloatingSideMenu();
-
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
-                    }
-                },
-                gravar: {
-                    label: 'Gravar',
-                    className: 'btn-success',
-                    callback: function() {
-
-                        $scope.save(false);   
-                        
-                        globals.plugins.hideFloatingSideMenu();
-
-                        $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
-                
-                            angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
-                        });  
+    	var buttons = {
+            cancelar: {
+                label: 'Cancelar',
+                className: 'btn-default',
+                callback: function() {                        
+                    //cancelar diálogo                        
+                }
+            },
+            anular: {
+                label: 'Anular',
+                className: 'btn-danger',
+                callback: function() {
+                    
+                    globals.plugins.hideFloatingSideMenu();
 
-                    }
+                    $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+            
+                        angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+                    });  
                 }
             }
+    	};
+    	
+    	if(!$scope.editing.ficha.data_conclusao)
+    	{    		
+    		angular.extend(buttons, {
+    			gravar: {
+    				label: 'Gravar',
+    				className: 'btn-success',
+    				callback: function() {
+	
+		                $scope.save(false);   
+		                  
+		                globals.plugins.hideFloatingSideMenu();
+		
+		                $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+		          
+		                	angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+		                });
+    				}
+				}
+    		});
+    	};
+    	
+        globals.message.custom({
+            title: null,
+            message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
+            buttons: buttons
         });
     };
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
index dd0dbd2b..b5eb4e4d 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
@@ -140,8 +140,8 @@
 
         <div class="row">
             <div class="col-md-12">
-                <button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
-                <button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
+                <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
             </div>
         </div>
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
index 13f7d3e4..13b3e09d 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
@@ -95,15 +95,15 @@
                                 <tr>
                                     <th class="col-md-2 hidden-xs">Data</th>
                                     <th class="col-md-3 hidden-xs">Tipo</th>
-                                    <th class="col-md-3">Autor</th>
+                                    <th class="col-md-2">Autor</th>
                                     <th class="col-md-2">Estado</th>
                                     <th class="col-md-1">&nbsp;</th>
-                                    <th class="col-md-1">Ficha A.</th>
+                                    <th class="col-md-2">F. Aptidão</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr ng-repeat="item in storeFichasTrabalhador.items">
-                                    <td class="hidden-xs"><span ng-bind="item.data | date: 'yyyy-MM-dd hh:mm'"></span></td>
+                                    <td class="hidden-xs"><span ng-bind="item.data | date: globals.settings.dateTimeFormat"></span></td>
                                     <td class="hidden-xs"><span ng-bind="item.tipo"></span></td>
                                     <td><span ng-bind="item.responsavel"></span></td>
                                     <td><span ng-class="{'label label-success': item.concluido, 'label label-primary': !item.concluido}">{{item.concluido ? 'Concluído' : 'Em Aberto'}}</span></td>
@@ -118,7 +118,10 @@
                                             <span class="glyphicon glyphicon-plus"></span> <span>Emitir</span>
                                         </button>
                                         
-                                        <span ng-show="item.emissao_ficha_aptidao && emiteFichaAptidao(item)" class="label label-success" data-toggle="tooltip" data-placement="right" title="Ficha de Aptidão Emitida">Emitida</span>
+                                        <span ng-show="item.emissao_ficha_aptidao" class="label label-success" data-toggle="tooltip" data-placement="right" 
+                                        	ng-attr-title="Ficha de Aptidão Emitida em {{item.emissao_ficha_aptidao ? (item.emissao_ficha_aptidao | date: globals.settings.dateTimeFormat) : null}}">
+                                        	Emitida
+                                       	</span>
                                     </td>
                                 </tr>
                             </tbody>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/datatable.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/datatable.js
index 1a1235b0..11420411 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/datatable.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/datatable.js
@@ -82,9 +82,10 @@
                         });
                         
                         //Activate tooltips
-                        $(row).find("[data-toggle='tooltip']").tooltip();
-                        
-                        
+                        $timeout(function() {
+                        	
+                        	$(row).find("[data-toggle='tooltip']").tooltip();    
+                        });
                     });
                 }
             };
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Message.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Message.js
index 716f1f85..9989a3d7 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Message.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Message.js
@@ -70,6 +70,25 @@ evoapp.factory('message', function($rootScope) {
             buttons: buttons
         });
     };
+    
+//    var custom2 = function(){
+//
+//        var me = this;
+//
+//        var message = arguments[0].message,
+//            title = arguments[0].title,
+//            buttons = arguments[0].buttons; 
+//        
+//        me.show = function(){
+//        	
+//	      bootbox.dialog({
+//	          message: message,
+//	          buttons: buttons
+//	      });
+//        };
+//        
+//        return me;
+//    };
 
     return {
         confirm: confirm,