Changeset 1353 for trunk/workflow/inc
- Timestamp:
- 08/19/09 17:39:01 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/class.so_orgchart.inc.php
r1305 r1353 147 147 $organizations = $this->acl->getUserPermissions("ORG", $this->userID); 148 148 $organizations[] = -1; 149 $query = "SELECT organizacao_id, nome, descricao, url_imagem, ativaFROM organizacao WHERE (organizacao_id IN (" . implode(',', $organizations) . ")) ORDER BY nome";149 $query = "SELECT organizacao_id, nome, descricao, ativa, url_imagem, sitio FROM organizacao WHERE (organizacao_id IN (" . implode(',', $organizations) . ")) ORDER BY nome"; 150 150 } 151 151 $result = $this->db->query($query); … … 1120 1120 } 1121 1121 1122 $titulo = NULL; 1123 if ( !empty( $employeeInfo['titulo'] ) ) 1124 { 1125 $titulo = $employeeInfo['titulo']; 1126 } 1127 1128 $outputInfo[] = array( 1129 'name' => 'Título', 1130 'value' => ( $titulo ? $titulo : '' ) 1131 ); 1132 1122 1133 $cargo = NULL; 1123 if ( !empty( $employeeInfo['titulo'] ) ) 1124 { 1125 $cargo = $employeeInfo['titulo']; 1126 } 1127 else if ( !empty($employeeInfo['cargo_id']) ) 1134 if ( !empty($employeeInfo['cargo_id']) ) 1128 1135 { 1129 1136 $jobTitleInfo = $orgchart->getJobTitle($employeeInfo['cargo_id']); … … 1131 1138 } 1132 1139 1133 if ( $cargo )1134 $cargo .= ( !empty($employeeInfo['nivel']) ? " (Nível: {$employeeInfo['nivel']})" : '' );1135 1136 1140 $outputInfo[] = array( 1137 1141 'name' => 'Cargo', 1138 1142 'value' => ( $cargo ? $cargo : '' ) 1143 ); 1144 1145 $nivel = NULL; 1146 if ( !empty($employeeInfo['nivel']) ) 1147 { 1148 $nivel = $employeeInfo['nivel']; 1149 } 1150 1151 $outputInfo[] = array( 1152 'name' => 'Nível', 1153 'value' => ( $nivel ? $nivel : '' ) 1139 1154 ); 1140 1155
Note: See TracChangeset
for help on using the changeset viewer.