diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
index c5c446fd..9d28e7aa 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
@@ -159,6 +159,8 @@
     	
 		if(tipo_ficha_id){
 			
+			$scope.motivos.items = [];
+			
             $scope.storeDadosFicha.extraParams = {
         		tipoFichaID: tipo_ficha_id
             };
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
index d9a2b7a3..c3db4116 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
@@ -20,60 +20,7 @@
 
     <form role="form" name="editForm" parsley-validate>
 
-        <div class="panel panel-default">
-            <div class="panel-body">
-
-                <div class="form-horizontal">
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Data</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Empresa</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">Trabalhador</label>
-                        <div class="col-sm-10">
-                            <input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control" readonly/>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Idade</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="calculatedAge" type="text" class="form-control" disabled/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Função Actual</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
+		<partials-renderer partial-id="DadosTrabalhador-1"></partials-renderer>		
 
         <div class="panel panel-default">
             <div class="panel-body">
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
index b7afdf0c..521dff2f 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
@@ -20,60 +20,7 @@
 
     <form role="form" name="editForm" parsley-validate>
 
-        <div class="panel panel-default">
-            <div class="panel-body">
-
-                <div class="form-horizontal">
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Data</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Empresa</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">Trabalhador</label>
-                        <div class="col-sm-10">
-                            <input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control" readonly/>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Idade</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="calculatedAge" type="text" class="form-control" disabled/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Função Actual</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
+        <partials-renderer partial-id="DadosTrabalhador-1"></partials-renderer>	
 
         <div class="panel panel-default">
             <div class="panel-heading">Motivo do Exame</div>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
index ac083d92..3c889f75 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
@@ -20,60 +20,7 @@
 
     <form role="form" name="editForm" parsley-validate>
 
-        <div class="panel panel-default" id="section1">
-            <div class="panel-body">
-
-                <div class="form-horizontal">
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Data</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Empresa</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">Trabalhador</label>
-                        <div class="col-sm-10">
-                            <input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control" readonly/>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Idade</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="calculatedAge" type="text" class="form-control" disabled/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">Função Actual</label>
-                                <div class="col-sm-8">
-                                    <input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control" readonly/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
+        <partials-renderer partial-id="DadosTrabalhador-1"></partials-renderer>	
 
         <div class="panel panel-default">
             <div class="panel-body">
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
index d660d3a9..95f9ac4d 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
@@ -9,6 +9,7 @@
             destroy: 'doLogout'
         }
     });
+    
     $scope.storeUserSession.broadcastEvents = true;
 
     //will contain all user session info ...
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
index 449a9ef9..d23f04d3 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
@@ -165,8 +165,8 @@
         });
     };
 
-    $scope.$on('afterrender', function(event, args){
-
+    $scope.$on('afterrender', function(event, args){ 
+   	
         $scope.comboEmpresas.loadStore(function(response, status, headers, config, items){            
             
         });
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/partialsRenderer.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/partialsRenderer.js
new file mode 100755
index 00000000..ea44d69a
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/partialsRenderer.js
@@ -0,0 +1,40 @@
+
+//	usage:	<partials-renderer partial-id="partial-1"></partials-renderer>
+
+evoapp.directive('partialsRenderer', function($rootScope, $compile) {
+
+    return {
+    	restrict: 'AE',
+        link: function (scope, elem, attrs) {   
+        	
+        	scope.partialId = attrs.partialId || null;
+        	
+        	if(scope.partialId != null){
+        		
+                var partialEL = $rootScope.viewCache.find('[id=' + scope.partialId + ']');
+                
+                if(partialEL.length == 0){               	
+                	throw Error('partial ' + scope.partialId + ' not found!');
+                }else{
+                	
+                	if(partialEL.length > 1){  
+                		throw Error('more than one partial ' + scope.partialId + ' was found!');                		
+                	}else{
+                		
+                		var finalEl = $.parseHTML(partialEL.html());
+                		
+                		$(finalEl).insertAfter(elem);
+                		
+                		elem.remove();
+                		
+                		$compile(finalEl)(scope);
+                	}                	
+                }
+        		
+        	}
+          
+
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DadosTrabalhador-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DadosTrabalhador-1.html
new file mode 100644
index 00000000..6223a36b
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DadosTrabalhador-1.html
@@ -0,0 +1,64 @@
+<!-- 
+
+DadosTrabalhador-1
+
+notice: only contents inside this div will be rendered/compiled  
+-->
+<div id="DadosTrabalhador-1">
+
+	<div class="panel panel-default" id="section1">
+	    <div class="panel-body">
+	
+	        <div class="form-horizontal">
+	
+	            <div class="row">
+	                <div class="col-sm-6">
+	                    <div class="form-group">
+	                        <label class="col-sm-4 control-label">Data</label>
+	                        <div class="col-sm-8">
+	                            <input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
+	                        </div>
+	                    </div>
+	                </div>
+	                <div class="col-sm-6">
+	                    <div class="form-group">
+	                        <label class="col-sm-4 control-label">Empresa</label>
+	                        <div class="col-sm-8">
+	                            <input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control" readonly/>
+	                        </div>
+	                    </div>
+	                </div>
+	            </div>
+	
+	            <div class="form-group">
+	                <label class="col-sm-2 control-label">Trabalhador</label>
+	                <div class="col-sm-10">
+	                    <input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control" readonly/>
+	                </div>
+	            </div>
+	
+	            <div class="row">
+	                <div class="col-sm-6">
+	                    <div class="form-group">
+	                        <label class="col-sm-4 control-label">Idade</label>
+	                        <div class="col-sm-8">
+	                            <input ng-model="calculatedAge" type="text" class="form-control" disabled/>
+	                        </div>
+	                    </div>
+	                </div>
+	                <div class="col-sm-6">
+	                    <div class="form-group">
+	                        <label class="col-sm-4 control-label">Função Actual</label>
+	                        <div class="col-sm-8">
+	                            <input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control" readonly/>
+	                        </div>
+	                    </div>
+	                </div>
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html
index ea256b2e..1ebc0862 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html
@@ -126,6 +126,7 @@
     <script src="app/directives/modalWindow.js"></script>
     <script src="app/directives/pagingToolbar.js"></script>
     <script src="app/directives/fileUpload.js"></script>
+    <script src="app/directives/partialsRenderer.js"></script>
 
     <script src="app/Main/MainController.js"></script>
     <script src="app/Login/LoginController.js"></script>