This commit is contained in:
Rob Tucker 2019-11-26 11:33:32 +00:00
Родитель edc6e3c589
Коммит 9450ac0216
2 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -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++) {