Various Issues have been resolved in this commit.
This commit is contained in:
@@ -61,7 +61,7 @@ class Export_AllPermitFactsToCSV extends Base {
|
||||
// Add CSV headers
|
||||
|
||||
$header_array = [
|
||||
'permitfact_serial', 'permitfact_entry_date_verbose', 'permitfact_permit_number', 'permitfact_permit_date_verbose', 'permitfact_project_address', 'permitfact_project_name',
|
||||
'permitfact_legacy_id', 'permitfact_entry_date_verbose', 'permitfact_permit_number', 'permitfact_permit_date_verbose', 'permitfact_project_address', 'permitfact_project_name',
|
||||
'permitfact_project_type_verbose', 'project_city_verbose', 'permitfact_project_state', 'permitfact_project_zip', 'permitfact_company', 'permitfact_address',
|
||||
'permitfact_city_verbose', 'permitfact_state', 'permitfact_zip', 'permitfact_phone', 'permitfact_size', 'permitfact_value', 'permitfact_work_type_verbose',
|
||||
'permitfact_building_type_verbose', 'permitfact_county_name_verbose', 'permitfact_lot_block', 'permitfact_dist_ll', 'permitfact_owner_name', 'permitfact_owner_address',
|
||||
|
||||
@@ -60,16 +60,24 @@ class Export_PermitFactsToCSV extends Base {
|
||||
|
||||
// Add CSV headers
|
||||
|
||||
$header_array_legacy = [
|
||||
'PermitFactsID', 'EntryDate', 'PermitNum', 'PermitDate', 'ProjectAddr', 'ProjectName',
|
||||
'ProjectType', 'ProjectCity', 'ProjectState', 'ProjectZip', 'Company', 'Address',
|
||||
'City', 'State', 'Zip', 'Phone', 'Size', 'Value', 'WorkType',
|
||||
'BldgType', 'County', 'Lot_BLK', 'Dist_LL', 'OwnerName', 'OwnerAddress',
|
||||
'OwnerCity', 'OwnerState', 'OwnerZip', 'OwnerPhone'
|
||||
];
|
||||
|
||||
fputcsv($output, $header_array_legacy, ',', '"', '\\');
|
||||
|
||||
$header_array = [
|
||||
'permitfact_serial', 'permitfact_entry_date_verbose', 'permitfact_permit_number', 'permitfact_permit_date_verbose', 'permitfact_project_address', 'permitfact_project_name',
|
||||
'permitfact_legacy_id', 'permitfact_entry_date_verbose', 'permitfact_permit_number', 'permitfact_permit_date_verbose', 'permitfact_project_address', 'permitfact_project_name',
|
||||
'permitfact_project_type_verbose', 'project_city_verbose', 'permitfact_project_state', 'permitfact_project_zip', 'permitfact_company', 'permitfact_address',
|
||||
'permitfact_city_verbose', 'permitfact_state', 'permitfact_zip', 'permitfact_phone', 'permitfact_size', 'permitfact_value', 'permitfact_work_type_verbose',
|
||||
'permitfact_building_type_verbose', 'permitfact_county_name_verbose', 'permitfact_lot_block', 'permitfact_dist_ll', 'permitfact_owner_name', 'permitfact_owner_address',
|
||||
'owner_city_verbose', 'permitfact_owner_state', 'permitfact_owner_zip', 'permitfact_owner_phone'
|
||||
];
|
||||
|
||||
fputcsv($output, $header_array, ',', '"', '\\');
|
||||
|
||||
foreach ($permits->record as $permit) {
|
||||
|
||||
$row = [];
|
||||
|
||||
@@ -87,7 +87,7 @@ class Export_PermitFactsToExcel extends Base {
|
||||
$spreadsheet->getActiveSheet()->getStyle("A1:AA1")->getFont()->setBold(true);
|
||||
$spreadsheet->getActiveSheet()->getStyle("A1:AA1")->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB("D3D3D3");
|
||||
|
||||
$spreadsheet->setActiveSheetIndex(0)->setCellValue("A1", "permitfact_serial")
|
||||
$spreadsheet->setActiveSheetIndex(0)->setCellValue("A1", "permitfact_legacy_id")
|
||||
->setCellValue("B1", "Entry Date")
|
||||
->setCellValue("C1", "Permit Number")
|
||||
->setCellValue("D1", "Permit Date")
|
||||
@@ -150,7 +150,7 @@ class Export_PermitFactsToExcel extends Base {
|
||||
|
||||
foreach ($permitfacts as $permitfact) {
|
||||
|
||||
$spreadsheet->getActiveSheet()->setCellValue("A" . $row, (string) $permitfact->permitfact_serial);
|
||||
$spreadsheet->getActiveSheet()->setCellValue("A" . $row, (string) $permitfact->permitfact_legacy_id);
|
||||
$spreadsheet->getActiveSheet()->setCellValue("B" . $row, (string) $permitfact->permitfact_entry_date_verbose);
|
||||
$spreadsheet->getActiveSheet()->setCellValue("C" . $row, (string) $permitfact->permitfact_permit_number);
|
||||
$spreadsheet->getActiveSheet()->setCellValue("D" . $row, (string) $permitfact->permitfact_permit_date_verbose);
|
||||
|
||||
@@ -201,7 +201,7 @@ class PermitFacts_Print extends TCPDF {
|
||||
|
||||
$d = [
|
||||
// Left Side of Card
|
||||
'permitfact_serial' => trim((string) $permit['permitfact_serial']),
|
||||
'permitfact_legacy_id' => trim((string) $permit['permitfact_legacy_id']),
|
||||
'permitfact_project_name' => trim((string) $permit['permitfact_project_name']),
|
||||
'permitfact_permit_number' => trim((string) $permit['permitfact_permit_number']),
|
||||
'permitfact_project_address' => trim((string) $permit['permitfact_project_address']),
|
||||
|
||||
@@ -89,7 +89,7 @@ class PZFacts_Print extends TCPDF {
|
||||
$userssubscription = (new Users())->getUserSubscription($this->usersubscription_serial);
|
||||
|
||||
$user_subscription_start_date = $userssubscription->record->usersubscription_start_date;
|
||||
$user_subscription_end_date = $userssubscription->record->usersubscription_end_date;
|
||||
$user_subscription_end_date = $userssubscription->record->usersubscription_end_date;
|
||||
|
||||
$planningzoningfacts = (new PlanningAndZoningFacts())->getPZFactsPage($user_subscription_start_date, $user_subscription_end_date);
|
||||
|
||||
@@ -185,14 +185,14 @@ class PZFacts_Print extends TCPDF {
|
||||
$curY = $this->GetY() + 1;
|
||||
};
|
||||
|
||||
$row2('Project Description:', $d['pzfact_project_description'], 'Project Type:', $d['pzfact_project_type']);
|
||||
$row2('Architect/Engineer: ', $d['pzfact_professional_name'], 'Estimated Project Value:', $d['pzfact_dollar_value']);
|
||||
$row2('', '', 'District:', $d['pzfact_district']);
|
||||
$row2('Owner Name: ', $d['pzfact_owner_name'], 'Land Lot:', $d['pzfact_land_lot']);
|
||||
$row2('Owner Address: ', $d['pzfact_owner_address'], 'Action Code:', $d['pzfact_action_code']);
|
||||
$row2('Owner Phone: ', $d['pzfact_owner_phone'], 'Action Date:', $d['pzfact_action_date']);
|
||||
$row2('', '', 'Lot Acres:', $d['pzfact_acres']);
|
||||
$row2('', '', '', '');
|
||||
$row2('Project Description:', $d['pzfact_project_description'], 'Project Type:', $d['pzfact_project_type']);
|
||||
$row2('Architect/Engineer: ', $d['pzfact_professional_name'], 'Estimated Project Value:', $d['pzfact_dollar_value']);
|
||||
$row2('', '', 'District:', $d['pzfact_district']);
|
||||
$row2('Owner Name: ', $d['pzfact_owner_name'], 'Land Lot:', $d['pzfact_land_lot']);
|
||||
$row2('Owner Address: ', $d['pzfact_owner_address'], 'Action Code:', $d['pzfact_action_code']);
|
||||
$row2('Owner Phone: ', $d['pzfact_owner_phone'], 'Action Date:', $d['pzfact_action_date']);
|
||||
$row2('', '', 'Lot Acres:', $d['pzfact_acres']);
|
||||
$row2('', '', '', '');
|
||||
|
||||
$row1('Status:', $d['pzfact_status']);
|
||||
};
|
||||
@@ -203,19 +203,19 @@ class PZFacts_Print extends TCPDF {
|
||||
|
||||
$marginL = 10;
|
||||
$marginT = 20; // below header area
|
||||
$pageW = $this->getPageWidth();
|
||||
$pageH = $this->getPageHeight();
|
||||
$pageW = $this->getPageWidth();
|
||||
$pageH = $this->getPageHeight();
|
||||
|
||||
$usableW = $pageW - ($marginL * 2);
|
||||
$usableH = $pageH - $marginT - 12; // leave footer space
|
||||
|
||||
$gapY = 6;
|
||||
$gapY = 6;
|
||||
|
||||
// Two rows per page
|
||||
$cardW = $usableW;
|
||||
$cardH = ($usableH - $gapY) / 2;
|
||||
$cardW = $usableW;
|
||||
$cardH = ($usableH - $gapY) / 2;
|
||||
|
||||
$index = 0;
|
||||
$index = 0;
|
||||
|
||||
foreach ($planningzoningfacts->record as $planningzoningfact) {
|
||||
|
||||
|
||||
@@ -221,7 +221,7 @@ class PermitFacts_Print extends TCPDF {
|
||||
|
||||
$d = [
|
||||
// Left Side of Card
|
||||
'permitfact_serial' => trim((string) $permit->permitfact_serial),
|
||||
'permitfact_legacy_id' => trim((string) $permit->permitfact_legacy_id),
|
||||
'permitfact_project_name' => trim((string) $permit->permitfact_project_name),
|
||||
'permitfact_permit_number' => trim((string) $permit->permitfact_permit_number),
|
||||
'permitfact_project_address' => trim((string) $permit->permitfact_project_address),
|
||||
|
||||
Reference in New Issue
Block a user