Fixed Subdivision Exports

This commit is contained in:
2026-07-20 22:19:10 -04:00
parent 3de8593785
commit 3285360d75
8 changed files with 217 additions and 86 deletions
+12 -12
View File
@@ -46,20 +46,20 @@ class Export_AllPermitsBySubdivision_CSV extends Base {
$permit_value = 0.00;
foreach ($permits as $permit) {
$county_name = $permit->county_name_verbose;
$subdivision = $permit->permit_sub_div_name;
$address = "{$permit->permit_address} {$permit->permit_city} {$permit->permit_state} {$permit->permit_zip}";
$city = $permit->permit_city;
$builder = $permit->permit_company;
$permit_date = $permit->permit_permit_date_verbose;
$square_footage = $permit->permit_size_verbose;
$value = $permit->permit_value_verbose;
$county_name = $permit->rdi_county_name_verbose;
$subdivision = $permit->rdi_sub_div_name;
$address = "{$permit->rdi_address} {$permit->rdi_city} {$permit->rdi_state} {$permit->rdi_zip}";
$city = $permit->rdi_city;
$builder = $permit->rdi_company;
$permit_date = $permit->rdi_permit_date_verbose;
$square_footage = $permit->rdi_size_verbose;
$value = $permit->rdi_value_verbose;
$permit_ytd_value = "$" . number_format((int) $permit->permit_ytd_value, 2);
$permit_value = "$" . number_format((int) $permit->permit_value, 2);
$permit_ytd_value = "$" . number_format((int) $permit->rdi_ytd_value, 2);
$permit_value = "$" . number_format((int) $permit->rdi_value, 2);
$permit_data = array($county_name, $subdivision, $address, $city, $builder, $permit_date, $square_footage, $value);
$permit_data = array($county_name, $subdivision, $address, $city, $builder, $permit_date, $square_footage, $value);
fputcsv($output, $permit_data, ',', '"', '\\');
}
@@ -35,7 +35,7 @@ class Export_AllPermitsBySubdivision_Excel extends Base {
$permit_area = $subscription->record->subscription_area;
$projecttype = $subscription->record->subscription_projecttype;
$permits = (new PermitsBySubdivision())->getAllPermitsBySubdivision($permit_area, $projecttype);
$permits = (new PermitsBySubdivision())->getAllPermitsBySubdivision($permit_area, $projecttype, $_POST);
// Create the Spreadsheet.
@@ -89,16 +89,16 @@ class Export_AllPermitsBySubdivision_Excel extends Base {
foreach ($permits as $permit) {
$address = "{$permit->rdi_address} {$permit->rdi_city}, {$permit->rdi_state} {$permit->rdi_zip}";
$address = "{$permit->permit_address} {$permit->permit_city}, {$permit->permit_state} {$permit->permit_zip}";
$spreadsheet->getActiveSheet()->setCellValue("A" . $row, (string) $permit->rdi_county_name_verbose);
$spreadsheet->getActiveSheet()->setCellValue("B" . $row, (string) $permit->rdi_sub_div_name);
$spreadsheet->getActiveSheet()->setCellValue("A" . $row, (string) $permit->county_name_verbose);
$spreadsheet->getActiveSheet()->setCellValue("B" . $row, (string) $permit->permit_sub_div_name);
$spreadsheet->getActiveSheet()->setCellValue("C" . $row, (string) $address);
$spreadsheet->getActiveSheet()->setCellValue("D" . $row, (string) $permit->rdi_city);
$spreadsheet->getActiveSheet()->setCellValue("E" . $row, (string) $permit->rdi_company);
$spreadsheet->getActiveSheet()->setCellValue("F" . $row, (string) $permit->rdi_permit_date_verbose);
$spreadsheet->getActiveSheet()->setCellValue("G" . $row, (string) $permit->rdi_size_verbose);
$spreadsheet->getActiveSheet()->setCellValue("H" . $row, (string) $permit->rdi_value_verbose);
$spreadsheet->getActiveSheet()->setCellValue("D" . $row, (string) $permit->permit_city);
$spreadsheet->getActiveSheet()->setCellValue("E" . $row, (string) $permit->permit_company);
$spreadsheet->getActiveSheet()->setCellValue("F" . $row, (string) $permit->permit_permit_date_verbose);
$spreadsheet->getActiveSheet()->setCellValue("G" . $row, (string) $permit->permit_size_verbose);
$spreadsheet->getActiveSheet()->setCellValue("H" . $row, (string) $permit->permit_value_verbose);
$row++;
}
+8 -8
View File
@@ -99,7 +99,7 @@ class AllPermitsBySubdivision_Print extends TCPDF {
// Get the data for the report
$permits = (new PermitsBySubdivision())->getAllPermitsBySubdivision($permit_area, $projecttype);
$permits = (new PermitsBySubdivision())->getAllPermitsBySubdivision($permit_area, $projecttype, $_POST);
// -------
// Permits
@@ -141,16 +141,16 @@ class AllPermitsBySubdivision_Print extends TCPDF {
$this->stripeLine($rowCount, 268);
$rowCount++;
$address = "{$permit->rdi_address} {$permit->rdi_city}, {$permit->rdi_state} {$permit->rdi_zip}";
$address = "{$permit->permit_address} {$permit->permit_city}, {$permit->permit_state} {$permit->permit_zip}";
$permit_value = "$" . number_format((int) $permit->rdi_value, 2);
$permit_value = "$" . number_format((int) $permit->permit_value, 2);
$this->Cell(15, 0, $permit->rdi_county_name_verbose, 0, 0, "L", false, "", 3);
$this->Cell(40, 0, $permit->rdi_sub_div_name, 0, 0, "L", false, "", 3);
$this->Cell(15, 0, $permit->county_name_verbose, 0, 0, "L", false, "", 3);
$this->Cell(40, 0, $permit->permit_sub_div_name, 0, 0, "L", false, "", 3);
$this->Cell(85, 0, $address, 0, 0, "L", false, "", 3);
$this->Cell(60, 0, $permit->rdi_company, 0, 0, "L", false, "", 3);
$this->Cell(20, 0, $permit->rdi_permit_date_verbose, 0, 0, "L", false, "", 3);
$this->Cell(15, 0, $permit->rdi_size, 0, 0, "L", false, "", 3);
$this->Cell(60, 0, $permit->permit_company, 0, 0, "L", false, "", 3);
$this->Cell(20, 0, $permit->permit_permit_date_verbose, 0, 0, "L", false, "", 3);
$this->Cell(15, 0, $permit->permit_size_verbose, 0, 0, "L", false, "", 3);
$this->Cell(20, 0, $permit_value, 0, 0, "L", false, "", 3);
$this->Ln(4);