зеркало из https://github.com/mozilla/oldpto.git
Reordering fields for export
This commit is contained in:
Родитель
edc6e3c589
Коммит
9450ac0216
|
@ -145,17 +145,17 @@ class Filtering {
|
|||
if ($ldap_contact) {
|
||||
$aRecords[] = array(
|
||||
'id' => $aMysqlRecord['id'],
|
||||
'employeenumber'=> $ldap_contact['employeenumber'],
|
||||
'first_name' => $ldap_contact['first_name'],
|
||||
'last_name' => $ldap_contact['last_name'],
|
||||
'email' => $sMail,
|
||||
'pto_hours' => $aMysqlRecord['hours'],
|
||||
'start_date' => $aMysqlRecord['start'],
|
||||
'end_date' => $aMysqlRecord['end'],
|
||||
'filed_date' => $aMysqlRecord['added'],
|
||||
'details' => $aMysqlRecord['details'],
|
||||
'pto_hours' => $aMysqlRecord['hours'],
|
||||
'first_name' => $ldap_contact['first_name'],
|
||||
'last_name' => $ldap_contact['last_name'],
|
||||
'primaryofficecountry' => $ldap_contact['primaryofficecountry'],
|
||||
'hours_daily'=> $aMysqlRecord['hours_daily'],
|
||||
'employeenumber'=> $ldap_contact['employeenumber']
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -74,16 +74,16 @@ function output_csv($data, $from, $to, $send_headers=TRUE) {
|
|||
}
|
||||
$aFields = array(
|
||||
'Id',
|
||||
'Employee ID',
|
||||
'First Name',
|
||||
'Last Name',
|
||||
'Email',
|
||||
'PTO Hours',
|
||||
'Start Date',
|
||||
'End Date',
|
||||
'Filed Date',
|
||||
'Details',
|
||||
'PTO Hours',
|
||||
'First Name',
|
||||
'Last Name',
|
||||
'Country',
|
||||
'Employee ID',
|
||||
);
|
||||
$sFields = '';
|
||||
for ($n=0; $n<count($aFields); $n++) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче