Changeset 2371 for sandbox/workflow
- Timestamp:
- 03/29/10 14:36:50 (14 years ago)
- Location:
- sandbox/workflow/trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/workflow/trunk/inc/local/classes/class.wf_orgchart.php
r2056 r2371 140 140 " LEFT OUTER JOIN substituicao s " . 141 141 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 142 " WHERE " . 142 " WHERE " . 143 143 " (a.organizacao_id = ?) " . 144 144 " ORDER BY a.sigla, a.descricao"; … … 331 331 " LEFT OUTER JOIN substituicao s " . 332 332 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 333 " WHERE " . 333 " WHERE " . 334 334 " (a.area_id = ?) " . 335 335 " ORDER BY a.sigla, a.descricao"; … … 374 374 " LEFT OUTER JOIN substituicao s " . 375 375 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 376 " WHERE " . 376 " WHERE " . 377 377 " (UPPER(a.sigla) = UPPER(?)) " . 378 " AND " . 378 " AND " . 379 379 " (a.organizacao_id = ?) " . 380 380 " ORDER BY a.sigla, a.descricao"; … … 420 420 " LEFT OUTER JOIN substituicao s " . 421 421 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 422 " WHERE " . 422 " WHERE " . 423 423 " (a.area_status_id = ?) " . 424 424 " ORDER BY a.sigla, a.descricao"; … … 468 468 " LEFT OUTER JOIN substituicao s " . 469 469 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 470 " WHERE " . 470 " WHERE " . 471 471 " (a.area_id IN ($areas)) " . 472 472 " ORDER BY a.sigla, a.descricao"; … … 542 542 " LEFT OUTER JOIN substituicao s " . 543 543 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 544 " WHERE " . 544 " WHERE " . 545 545 " (a.superior_area_id = ?) "; 546 546 … … 1202 1202 return false; 1203 1203 1204 return $employee['centro_custo_id']; 1204 $costCenterID = $employee['centro_custo_id']; 1205 if(!empty($costCenterID)){ 1206 return $costCenterID; 1207 } else { 1208 $employeeArea = $this->getArea($employee['area_id']); 1209 return $employeeArea['centro_custo_id']; 1210 } 1205 1211 } 1206 1212 -
sandbox/workflow/trunk/js/jscode/abas.js
r795 r2371 24 24 { 25 25 m = document.getElementById(BordersArray[i].border_id); 26 m.className = ' abas_menu';26 m.className = 'menu'; 27 27 c = document.getElementById("content_id_"+BordersArray[i].sequence); 28 28 if (is_ie) { … … 33 33 34 34 m = document.getElementById("border_id_"+ID); 35 m.className = ' abas_menu_sel';35 m.className = 'menu-sel'; 36 36 c = document.getElementById("content_id_"+ID); 37 37 c.style.display = ''; … … 47 47 td.id="border_id_" + ID; 48 48 td.setAttribute("width", "auto"); 49 td.className = " abas_menu";49 td.className = "menu"; 50 50 td.setAttribute("align", "right"); 51 51 td.onclick = function(){alternate_border(ID);}; … … 72 72 div.className = "conteudo_div_ie"; 73 73 } else { 74 div.className = "conteudo _div";74 div.className = "conteudo"; 75 75 } 76 76 div.style.display=''; … … 87 87 { 88 88 m = document.getElementById(BordersArray[i].border_id); 89 if (m.className == ' abas_menu_sel')89 if (m.className == 'menu-sel') 90 90 border_selected = BordersArray[i].border_id; 91 91 } -
sandbox/workflow/trunk/js/orgchart/utils.js
r2042 r2371 18 18 /* cabeçalho */ 19 19 tr = document.createElement("TR"); 20 tr.className = 'message_header'; 20 21 for (i in header) 21 22 { … … 24 25 td = document.createElement("TH"); 25 26 td.innerHTML = header[i]; 27 td.className = 'message_header'; 26 28 tr.appendChild(td); 27 29 } -
sandbox/workflow/trunk/js/userinterface/orgchart.js
r2085 r2371 321 321 /* build the display table (headers)*/ 322 322 content += '<table id="employeeList" class="employeeList" style="clear: both">'; 323 content += '<tr >';323 content += '<tr class="message_header">'; 324 324 content += '<th>Nome</th>'; 325 325 if (useArea) -
sandbox/workflow/trunk/templates/default/adminaccess.tpl
r795 r2371 13 13 </td> 14 14 {/foreach} 15 <td nowrap id="border_blank" class=" abas_last_menu" width="100%">15 <td nowrap id="border_blank" class="last_menu" width="100%"> 16 16 17 17 </td> … … 20 20 </table> 21 21 {foreach from=$tabs item=tab name="feTabs"} 22 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo _div"></div>22 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo"></div> 23 23 {/foreach} 24 24 </div> -
sandbox/workflow/trunk/templates/default/adminsource.tpl
r795 r2371 14 14 </td> 15 15 {/foreach} 16 <td nowrap id="border_blank" class=" abas_last_menu" width="100%">16 <td nowrap id="border_blank" class="last_menu" width="100%"> 17 17 18 18 </td> … … 21 21 </table> 22 22 {foreach from=$tabs item=tab name="feTabs"} 23 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo _div"></div>23 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo"></div> 24 24 {/foreach} 25 25 </div> -
sandbox/workflow/trunk/templates/default/css/common.css
r795 r2371 189 189 190 190 .info_tr_header{ 191 background-color: #cccccc;191 /*background-color: #cccccc;*/ 192 192 font-weight: bold; 193 193 font-size: 13px; … … 268 268 269 269 .table_elements_tr_header { 270 background-color: #CCCCCC;270 /*background-color: #ABC6E1;*/ 271 271 } 272 272 -
sandbox/workflow/trunk/templates/default/css/orgchart.css
r795 r2371 16 16 table.organizationList tbody tr th 17 17 { 18 background-color: #CCCCCC;18 /*background-color: #CCCCCC;*/ 19 19 } 20 20 21 21 table.organizationList tbody tr.linha0 22 22 { 23 background-color: #F2F2F2;23 /*background-color: #F2F2F2;*/ 24 24 font-size: 12px; 25 25 } … … 27 27 table.organizationList tbody tr.linha1 28 28 { 29 background-color: #E5E5E5;29 /*background-color: #E5E5E5;*/ 30 30 font-size: 12px; 31 31 } … … 106 106 table.employeeList tbody th 107 107 { 108 background-color: #CCCCCC;108 /*background-color: #CCCCCC;*/ 109 109 font-size: 13px; 110 110 } … … 112 112 table.employeeList tbody tr.linha0 113 113 { 114 background-color: #FFF;114 /*background-color: #FFF;*/ 115 115 font-size: 12px; 116 116 } … … 118 118 table.employeeList tbody tr.linha1 119 119 { 120 background-color: #F7F7F7;120 /*background-color: #F7F7F7;*/ 121 121 font-size: 12px; 122 122 } -
sandbox/workflow/trunk/templates/default/css/userinterface.css
r795 r2371 126 126 font-size: 11px !important; 127 127 font-weight: normal; 128 background-color: #CCCCCC;128 /*background-color: #ABC6E1;*/ 129 129 } 130 130 -
sandbox/workflow/trunk/templates/default/monitors.tpl
r795 r2371 13 13 </td> 14 14 {/foreach} 15 <td nowrap id="border_blank" class=" abas_last_menu" width="100%">15 <td nowrap id="border_blank" class="last_menu" width="100%"> 16 16 17 17 </td> … … 20 20 </table> 21 21 {foreach from=$tabs item=tab name="feTabs"} 22 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo _div"></div>22 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo"></div> 23 23 {/foreach} 24 24 </div> -
sandbox/workflow/trunk/templates/default/orgchart.tpl
r795 r2371 7 7 <tbody id="border_tbody"> 8 8 <tr id="border_tr"> 9 <td nowrap class=" abas_menu" id="border_id_0" onClick="(alternate_border(0) == 0) ? draw_org_folder() : ''">9 <td nowrap class="menu" id="border_id_0" onClick="(alternate_border(0) == 0) ? draw_org_folder() : ''"> 10 10 Organograma 11 11 </td> 12 <td nowrap id="border_blank" class=" abas_last_menu" width="100%">12 <td nowrap id="border_blank" class="last_menu" width="100%"> 13 13 14 14 </td> … … 16 16 </tbody> 17 17 </table> 18 <div id="content_id_0" class="conteudo _div"></div>18 <div id="content_id_0" class="conteudo"></div> 19 19 </div> 20 20 {$footer} -
sandbox/workflow/trunk/templates/default/userinterface.tpl
r795 r2371 10 10 {foreach from=$tabs item=tab name="feTabs"} 11 11 {assign var='index' value=$smarty.foreach.feTabs.index} 12 <td nowrap class=" abas_menu" id="border_id_{$index}" onClick="changeTab({$index})">12 <td nowrap class="menu" id="border_id_{$index}" onClick="changeTab({$index})"> 13 13 {$tab} 14 14 </td> 15 15 {/foreach} 16 <td nowrap id="border_blank" class=" abas_last_menu" width="100%">16 <td nowrap id="border_blank" class="last_menu" width="100%"> 17 17 18 18 </td> … … 21 21 </table> 22 22 {foreach from=$tabs item=tab name="feTabs"} 23 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo _div"></div>23 <div id="content_id_{$smarty.foreach.feTabs.index}" class="conteudo"></div> 24 24 {/foreach} 25 25 </div>
Note: See TracChangeset
for help on using the changeset viewer.