Changeset 6589 for branches/2.4/workflow/js/userinterface/orgchartPrint.js

Timestamp:

06/22/12 17:42:39 (12 years ago)

Author:

viani

Message:

Ticket #2851 - Atualização do organograma no branch 2.4

File:

• branches/2.4/workflow/js/userinterface/orgchartPrint.js (modified) (3 diffs)

branches/2.4/workflow/js/userinterface/orgchartPrint.js

@@ -88 +88 @@
         if (showUserPhoto){
                 var content = '<img src="workflow/showUserPicture.php?userID=' + areas[area_id].employees[user_id].funcionario_id + '"/>';
-                element.append($('<td>' + content + '</td>').css('width', '8%'));
+                element.append($('<td valign="top">' + content + '</td>').css('width', '8%'));
         }
 
         /* name: first column */
         element.append(
-                                $('<td></td>')
+                                $('<td valign="top"></td>')
                                         .append(
                                                 $('<span></span>')
@@ -99 +99 @@
                                                         .append(areas[area_id].employees[user_id].cn)
                                                 )
-                                                        .css('width', '30%')
+                                                        .css('width', '23.5%')
                         );
 
@@ -106 +106 @@
                 element.append(
                                                 $('<td>' + areas[area_id].sigla + '</td>')
-                                                        .css('width', '10%')
                                         );
 
         /* login: show uid attribute */
         element.append(
-                                        $('<td>' + areas[area_id].employees[user_id].uid + '</td>')
-                                                .css('width', '15%') 
-                                        ) 
-
-
+                                        $('<td valign="top">' + areas[area_id].employees[user_id].uid + '</td>')
+                                                .css('width', '11%')
+                                        )
+                                        
+        
         /* telephone: last column */
         element.append(
-                                        $('<td>' + areas[area_id].employees[user_id].telephoneNumber + '</td>')
-                                                .css('width', '15%') 
-                                        ) 
-                                                         
-        /* Vínculo: show cargo vínculo */ 
-        element.append( 
-                                        $('<td>' + areas[area_id].employees[user_id].vinculo + '</td>') 
-                                                .css('width', '15%') 
-                                        ) 
-                 
-        /* Cargo: show cargo attribute */ 
-        element.append( 
-                                        $('<td>' + areas[area_id].employees[user_id].cargo + '</td>') 
-                                                .css('width', '15%') 
-                                        ) 
-                 
+                                        $('<td valign="top">' + areas[area_id].employees[user_id].telephoneNumber + '</td>')
+                                                .css('width', '9.75%')
+                                        )
+                                        
+        /* Vínculo: show cargo vínculo */
+        element.append(
+                                        $('<td valign="top">' + areas[area_id].employees[user_id].vinculo + '</td>')
+                                                .css('width', '9%')
+                                        )
+
+        /* Cargo: show cargo attribute */
+        element.append(
+                                        $('<td valign="top">' + areas[area_id].employees[user_id].cargo + '</td>')
+                                                .css('width', '12.5%')
+                                        )
+                                        
+                /* data_admissao: show data_admissao attribute */
+        element.append(
+                                        $('<td valign="top">' + areas[area_id].employees[user_id].data_admissao + '</td>')
+                                                .css('width', '6.75%')
+                                        )
+                                        
+        /* Funcao: show funcao attribute */
+        element.append(
+                                $('<td valign="top"> ' + areas[area_id].employees[user_id].funcao + ' </td>')
+                                                .css('width', '26%')
+                                        )
+
+
                                 .addClass('employees');