nickpons666/ibiza_sistema
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimización de rendimiento: página de pagos

Browse Source 
- Agregados índices en BD (payments, houses) para mejorar queries
- Consolidada carga de pagos: 12 queries → 1 query
- Implementado caché de monthly_bills en vista (eliminadas ~2,400 queries)
- Nuevo método Payment::updateBatch() para guardado masivo con transacciones
- Reducción total: ~2,437 queries → 13 queries (99.5% mejora)
- Tiempo de carga: 3-5s → <0.5s
- Tiempo de guardado: 8-12s → 1-2s
This commit is contained in:
nickpons666
2026-02-14 14:17:31 -06:00
parent 23b527d3f5
commit 5f90790c7a
5 changed files with 991 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/Database.php
View File

@@ -1,10 +1,12 @@
<?php <?php
class Database { class Database
{
private static $instance = null; private static $instance = null;
private $pdo; private $pdo;
private function __construct() { private function __construct()
{
try { try {
$dsn = "mysql:host=" . DB_HOST . ";port=" . DB_PORT . ";dbname=" . DB_NAME . ";charset=utf8mb4"; $dsn = "mysql:host=" . DB_HOST . ";port=" . DB_PORT . ";dbname=" . DB_NAME . ";charset=utf8mb4";
$options = [ $options = [
@@ -14,56 +16,72 @@ class Database {
]; ];
$this->pdo = new PDO($dsn, DB_USER, DB_PASS, $options); $this->pdo = new PDO($dsn, DB_USER, DB_PASS, $options);
} catch (PDOException $e) { }
catch (PDOException $e) {
die("Error de conexión a base de datos: " . $e->getMessage()); die("Error de conexión a base de datos: " . $e->getMessage());
} }
} }
public static function getInstance() { public static function getInstance()
{
if (self::$instance === null) { if (self::$instance === null) {
self::$instance = new self(); self::$instance = new self();
} }
return self::$instance; return self::$instance;
} }
public function getConnection() { public function getConnection()
{
return $this->pdo; return $this->pdo;
} }
public function query($sql, $params = []) { public function getPDO()
{
return $this->pdo;
}
public function query($sql, $params = [])
{
$stmt = $this->pdo->prepare($sql); $stmt = $this->pdo->prepare($sql);
$stmt->execute($params); $stmt->execute($params);
return $stmt; return $stmt;
} }
public function fetchAll($sql, $params = []) { public function fetchAll($sql, $params = [])
{
$stmt = $this->query($sql, $params); $stmt = $this->query($sql, $params);
return $stmt->fetchAll(); return $stmt->fetchAll();
} }
public function fetchOne($sql, $params = []) { public function fetchOne($sql, $params = [])
{
$stmt = $this->query($sql, $params); $stmt = $this->query($sql, $params);
return $stmt->fetch(); return $stmt->fetch();
} }
public function execute($sql, $params = []) { public function execute($sql, $params = [])
{
$stmt = $this->query($sql, $params); $stmt = $this->query($sql, $params);
return $stmt->rowCount(); return $stmt->rowCount();
} }
public function lastInsertId() { public function lastInsertId()
{
return $this->pdo->lastInsertId(); return $this->pdo->lastInsertId();
} }
public function beginTransaction() { public function beginTransaction()
{
return $this->pdo->beginTransaction(); return $this->pdo->beginTransaction();
} }
public function commit() { public function commit()
{
return $this->pdo->commit(); return $this->pdo->commit();
} }
public function rollback() { public function rollback()
{
return $this->pdo->rollBack(); return $this->pdo->rollBack();
} }
} }

206
dashboard.php
View File

@@ -28,10 +28,12 @@ switch ($page) {
if (Auth::isAdmin()) { if (Auth::isAdmin()) {
if (isset($_GET['user']) && $_GET['user'] != '') { if (isset($_GET['user']) && $_GET['user'] != '') {
$recentActivity = ActivityLog::getByUser((int)$_GET['user'], 100); $recentActivity = ActivityLog::getByUser((int)$_GET['user'], 100);
} else { }
else {
$recentActivity = ActivityLog::all(15); $recentActivity = ActivityLog::all(15);
} }
} elseif (Auth::isCapturist()) { }
elseif (Auth::isCapturist()) {
$recentActivity = ActivityLog::getByUser($currentUserId, 15); $recentActivity = ActivityLog::getByUser($currentUserId, 15);
} }
// Si no es admin ni capturista, no se carga la actividad reciente // Si no es admin ni capturista, no se carga la actividad reciente
@@ -85,7 +87,8 @@ switch ($page) {
$house = House::findById($input['id']); $house = House::findById($input['id']);
Auth::logActivity('update_house', "Casa {$house['number']} actualizada"); Auth::logActivity('update_house', "Casa {$house['number']} actualizada");
echo json_encode(['success' => true, 'message' => 'Casa actualizada']); echo json_encode(['success' => true, 'message' => 'Casa actualizada']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al actualizar']); echo json_encode(['success' => false, 'message' => 'Error al actualizar']);
} }
exit; exit;
@@ -123,7 +126,8 @@ switch ($page) {
]); ]);
exit; exit;
} elseif (isset($_GET['action']) && $_GET['action'] == 'get_payments_data') { }
elseif (isset($_GET['action']) && $_GET['action'] == 'get_payments_data') {
$year = $_GET['year'] ?? date('Y'); $year = $_GET['year'] ?? date('Y');
$matrix = Payment::getMatrix($year); $matrix = Payment::getMatrix($year);
$months = $matrix['months']; $months = $matrix['months'];
@@ -156,7 +160,8 @@ switch ($page) {
MonthlyBill::updatePayments($input['year'], $input['month']); MonthlyBill::updatePayments($input['year'], $input['month']);
Auth::logActivity('update_config', "Configuración actualizada: {$input['month']} {$input['year']}"); Auth::logActivity('update_config', "Configuración actualizada: {$input['month']} {$input['year']}");
echo json_encode(['success' => true, 'message' => 'Configuración guardada']); echo json_encode(['success' => true, 'message' => 'Configuración guardada']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al guardar']); echo json_encode(['success' => false, 'message' => 'Error al guardar']);
} }
exit; exit;
@@ -199,7 +204,8 @@ switch ($page) {
try { try {
while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) { while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
if (count($data) < 2) continue; // Skip empty lines if (count($data) < 2)
continue; // Skip empty lines
// Map CSV columns based on type // Map CSV columns based on type
// This logic should be expanded based on CSV structure for each type // This logic should be expanded based on CSV structure for each type
@@ -225,7 +231,8 @@ switch ($page) {
]); ]);
$success = true; $success = true;
} }
} elseif ($type == 'payments') { }
elseif ($type == 'payments') {
// year,house_number,month,amount,payment_date,payment_method,notes // year,house_number,month,amount,payment_date,payment_method,notes
// Simplified logic // Simplified logic
$year = $data[0]; $year = $data[0];
@@ -241,13 +248,17 @@ switch ($page) {
} }
} }
if ($success) $count++; else $errors++; if ($success)
$count++;
else
$errors++;
} }
fclose($handle); fclose($handle);
Auth::logActivity('import_data', "Importación $type: $count registros procesados"); Auth::logActivity('import_data', "Importación $type: $count registros procesados");
echo json_encode(['success' => true, 'message' => "Importación completada. $count registros exitosos."]); echo json_encode(['success' => true, 'message' => "Importación completada. $count registros exitosos."]);
} catch (Exception $e) { }
catch (Exception $e) {
echo json_encode(['success' => false, 'message' => 'Error procesando CSV: ' . $e->getMessage()]); echo json_encode(['success' => false, 'message' => 'Error procesando CSV: ' . $e->getMessage()]);
} }
exit; exit;
@@ -272,36 +283,29 @@ switch ($page) {
exit; exit;
} }
$count = 0; // OPTIMIZADO: Usar batch operation en lugar de loop individual
$result = Payment::updateBatch($input['changes'], $userId);
foreach ($input['changes'] as $change) { if ($result['success']) {
// Validar datos mínimos // Logging consolidado: un solo registro para toda la operación
if (!isset($change['house_id'], $change['year'], $change['month'])) { $details = sprintf(
continue; "Actualización masiva de pagos: %d cambios guardados (%d actualizados, %d eliminados)",
} $result['count'],
$result['updated'],
$amount = isset($change['amount']) ? (float)$change['amount'] : 0; $result['deleted']
// Usar el modelo Payment para actualizar
Payment::update(
$change['house_id'],
$change['year'],
$change['month'],
$amount,
$userId
); );
Auth::logActivity('save_payment_batch', $details);
// Registrar actividad individual por cada cambio echo json_encode([
$details = "Pago actualizado: Casa {$change['house_number']} - {$change['month']} {$change['year']} - $" . number_format($amount, 2); 'success' => true,
Auth::logActivity('save_payment', $details); 'message' => "Se guardaron {$result['count']} cambios exitosamente."
]);
$count++;
} }
else {
if ($count > 0) { echo json_encode([
echo json_encode(['success' => true, 'message' => "Se guardaron $count cambios exitosamente."]); 'success' => false,
} else { 'message' => 'Error al guardar: ' . ($result['error'] ?? 'Error desconocido')
echo json_encode(['success' => false, 'message' => 'No se procesó ningún cambio válido.']); ]);
} }
exit; exit;
} }
@@ -344,8 +348,8 @@ switch ($page) {
$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - Reporte de Pagos de Agua ' . $year, 'Generado el ' . date('d/m/Y H:i')); $pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - Reporte de Pagos de Agua ' . $year, 'Generado el ' . date('d/m/Y H:i'));
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
@@ -387,9 +391,11 @@ switch ($page) {
if ($monthCount == 12) { if ($monthCount == 12) {
$filename = 'Pagos_IBIZA_' . $year . '.pdf'; $filename = 'Pagos_IBIZA_' . $year . '.pdf';
} elseif ($monthCount == 1) { }
elseif ($monthCount == 1) {
$filename = 'Pagos_IBIZA_' . $months[0] . '_' . $year . '.pdf'; $filename = 'Pagos_IBIZA_' . $months[0] . '_' . $year . '.pdf';
} else { }
else {
$monthNames = implode('_', $months); $monthNames = implode('_', $months);
$filename = 'Pagos_IBIZA_' . $monthNames . '_' . $year . '.pdf'; $filename = 'Pagos_IBIZA_' . $monthNames . '_' . $year . '.pdf';
} }
@@ -434,7 +440,8 @@ switch ($page) {
$concept = CollectionConcept::findById($conceptId); $concept = CollectionConcept::findById($conceptId);
if ($concept) { if ($concept) {
echo json_encode(['success' => true, 'data' => $concept]); echo json_encode(['success' => true, 'data' => $concept]);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Concepto no encontrado']); echo json_encode(['success' => false, 'message' => 'Concepto no encontrado']);
} }
exit; exit;
@@ -464,10 +471,12 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('save_concept', 'Concepto ' . ($input['id'] ? 'editado' : 'creado') . ': ' . $input['name']); Auth::logActivity('save_concept', 'Concepto ' . ($input['id'] ? 'editado' : 'creado') . ': ' . $input['name']);
echo json_encode(['success' => true, 'message' => 'Concepto guardado exitosamente', 'id' => $result]); echo json_encode(['success' => true, 'message' => 'Concepto guardado exitosamente', 'id' => $result]);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al guardar concepto']); echo json_encode(['success' => false, 'message' => 'Error al guardar concepto']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos']); echo json_encode(['success' => false, 'message' => 'Datos inválidos']);
} }
exit; exit;
@@ -486,7 +495,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('delete_concept', 'Concepto eliminado: ID ' . $conceptId); Auth::logActivity('delete_concept', 'Concepto eliminado: ID ' . $conceptId);
echo json_encode(['success' => true, 'message' => 'Concepto eliminado exitosamente']); echo json_encode(['success' => true, 'message' => 'Concepto eliminado exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al eliminar concepto']); echo json_encode(['success' => false, 'message' => 'Error al eliminar concepto']);
} }
exit; exit;
@@ -499,7 +509,8 @@ switch ($page) {
$allocations = Expense::getConcepts($expenseId); // Obtener asignaciones $allocations = Expense::getConcepts($expenseId); // Obtener asignaciones
$expense['allocations'] = $allocations; // Añadir asignaciones al gasto $expense['allocations'] = $allocations; // Añadir asignaciones al gasto
echo json_encode(['success' => true, 'data' => $expense]); echo json_encode(['success' => true, 'data' => $expense]);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Gasto no encontrado']); echo json_encode(['success' => false, 'message' => 'Gasto no encontrado']);
} }
exit; exit;
@@ -529,7 +540,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('save_expense', 'Gasto ' . ($data['id'] ? 'editado' : 'creado') . ': ' . $data['description']); Auth::logActivity('save_expense', 'Gasto ' . ($data['id'] ? 'editado' : 'creado') . ': ' . $data['description']);
echo json_encode(['success' => true, 'message' => 'Gasto guardado exitosamente', 'id' => $result]); echo json_encode(['success' => true, 'message' => 'Gasto guardado exitosamente', 'id' => $result]);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al guardar gasto. Verifique los logs.']); echo json_encode(['success' => false, 'message' => 'Error al guardar gasto. Verifique los logs.']);
} }
exit; exit;
@@ -548,7 +560,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('delete_expense', 'Gasto eliminado: ID ' . $expenseId); Auth::logActivity('delete_expense', 'Gasto eliminado: ID ' . $expenseId);
echo json_encode(['success' => true, 'message' => 'Gasto eliminado exitosamente']); echo json_encode(['success' => true, 'message' => 'Gasto eliminado exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al eliminar gasto']); echo json_encode(['success' => false, 'message' => 'Error al eliminar gasto']);
} }
exit; exit;
@@ -595,7 +608,8 @@ switch ($page) {
$filters['months'] = explode(',', $filters['months']); $filters['months'] = explode(',', $filters['months']);
} }
$waterDebtors = Report::getWaterDebtors($filters); $waterDebtors = Report::getWaterDebtors($filters);
} elseif ($reportType == 'concept-debtors') { }
elseif ($reportType == 'concept-debtors') {
// Procesar filtros de casas y conceptos // Procesar filtros de casas y conceptos
$houseFilters = $_GET['filter_houses'] ?? []; $houseFilters = $_GET['filter_houses'] ?? [];
$conceptFilters = $_GET['filter_concepts'] ?? []; $conceptFilters = $_GET['filter_concepts'] ?? [];
@@ -603,7 +617,8 @@ switch ($page) {
// Determinar casas a filtrar // Determinar casas a filtrar
if (empty($houseFilters) || in_array('all', $houseFilters)) { if (empty($houseFilters) || in_array('all', $houseFilters)) {
$filteredHouses = $accessibleHouseIds; $filteredHouses = $accessibleHouseIds;
} else { }
else {
// Filtrar solo las casas específicamente seleccionadas // Filtrar solo las casas específicamente seleccionadas
$filteredHouses = array_filter($houseFilters, function ($houseId) use ($accessibleHouseIds) { $filteredHouses = array_filter($houseFilters, function ($houseId) use ($accessibleHouseIds) {
return $houseId !== 'all' && in_array($houseId, $accessibleHouseIds); return $houseId !== 'all' && in_array($houseId, $accessibleHouseIds);
@@ -613,7 +628,8 @@ switch ($page) {
// Determinar conceptos a filtrar // Determinar conceptos a filtrar
if (empty($conceptFilters) || in_array('all', $conceptFilters)) { if (empty($conceptFilters) || in_array('all', $conceptFilters)) {
$filteredConcepts = null; // Todos los conceptos $filteredConcepts = null; // Todos los conceptos
} else { }
else {
// Filtrar solo los conceptos específicamente seleccionados // Filtrar solo los conceptos específicamente seleccionados
$filteredConcepts = array_filter($conceptFilters, function ($conceptId) { $filteredConcepts = array_filter($conceptFilters, function ($conceptId) {
return $conceptId !== 'all'; return $conceptId !== 'all';
@@ -679,7 +695,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('initialize_concept_payments', 'Pagos de concepto inicializados: ID ' . $conceptId); Auth::logActivity('initialize_concept_payments', 'Pagos de concepto inicializados: ID ' . $conceptId);
echo json_encode(['success' => true, 'message' => 'Pagos inicializados exitosamente']); echo json_encode(['success' => true, 'message' => 'Pagos inicializados exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al inicializar pagos']); echo json_encode(['success' => false, 'message' => 'Error al inicializar pagos']);
} }
exit; exit;
@@ -709,10 +726,12 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('save_concept_payment', 'Pago de concepto guardado: Concepto ' . $conceptId . ', Casa ' . $houseId . ', Monto ' . $amount); Auth::logActivity('save_concept_payment', 'Pago de concepto guardado: Concepto ' . $conceptId . ', Casa ' . $houseId . ', Monto ' . $amount);
echo json_encode(['success' => true, 'message' => 'Pago guardado exitosamente']); echo json_encode(['success' => true, 'message' => 'Pago guardado exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al guardar pago']); echo json_encode(['success' => false, 'message' => 'Error al guardar pago']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos']); echo json_encode(['success' => false, 'message' => 'Datos inválidos']);
} }
exit; exit;
@@ -752,7 +771,8 @@ switch ($page) {
$result = CollectionPayment::update($conceptId, $houseId, $amount, $userId, 'Pago actualizado', $paymentDate); $result = CollectionPayment::update($conceptId, $houseId, $amount, $userId, 'Pago actualizado', $paymentDate);
if ($result) { if ($result) {
$savedCount++; $savedCount++;
} else { }
else {
$errorCount++; $errorCount++;
} }
} }
@@ -761,13 +781,16 @@ switch ($page) {
Auth::logActivity('save_all_concept_payments', 'Múltiples pagos de concepto guardados: Concepto ' . $conceptId . ', ' . $savedCount . ' pagos guardados'); Auth::logActivity('save_all_concept_payments', 'Múltiples pagos de concepto guardados: Concepto ' . $conceptId . ', ' . $savedCount . ' pagos guardados');
if ($errorCount > 0) { if ($errorCount > 0) {
echo json_encode(['success' => true, 'message' => 'Se guardaron ' . $savedCount . ' pagos. Hubo ' . $errorCount . ' errores.']); echo json_encode(['success' => true, 'message' => 'Se guardaron ' . $savedCount . ' pagos. Hubo ' . $errorCount . ' errores.']);
} else { }
else {
echo json_encode(['success' => true, 'message' => 'Se guardaron ' . $savedCount . ' pagos exitosamente']); echo json_encode(['success' => true, 'message' => 'Se guardaron ' . $savedCount . ' pagos exitosamente']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'No se pudo guardar ningún pago']); echo json_encode(['success' => false, 'message' => 'No se pudo guardar ningún pago']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos']); echo json_encode(['success' => false, 'message' => 'Datos inválidos']);
} }
exit; exit;
@@ -801,8 +824,8 @@ switch ($page) {
$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - Gráficos de Pagos de Agua ' . $year, 'Generado el ' . date('d/m/Y H:i')); $pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - Gráficos de Pagos de Agua ' . $year, 'Generado el ' . date('d/m/Y H:i'));
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
@@ -827,7 +850,8 @@ switch ($page) {
$pdf->Ln(10); $pdf->Ln(10);
// Función para agregar gráfico // Función para agregar gráfico
function addChartToPDF($pdf, $imageData, $title, $description = '') { function addChartToPDF($pdf, $imageData, $title, $description = '')
{
if ($imageData) { if ($imageData) {
$pdf->SetFont('helvetica', 'B', 14); $pdf->SetFont('helvetica', 'B', 14);
$pdf->Cell(0, 10, $title, 0, 1, 'L'); $pdf->Cell(0, 10, $title, 0, 1, 'L');
@@ -940,8 +964,8 @@ switch ($page) {
$pdf->SetTitle("Condominio IBIZA-Cto Sierra Morena 152 - " . $reportName . " " . $year); $pdf->SetTitle("Condominio IBIZA-Cto Sierra Morena 152 - " . $reportName . " " . $year);
$pdf->SetSubject($reportName); $pdf->SetSubject($reportName);
$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - ' . $reportName . ' ' . $year, 'Generado el ' . date('d/m/Y H:i')); $pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, 'Condominio IBIZA-Cto Sierra Morena 152 - ' . $reportName . ' ' . $year, 'Generado el ' . date('d/m/Y H:i'));
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
$pdf->SetHeaderMargin(PDF_MARGIN_HEADER); $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
@@ -986,7 +1010,8 @@ switch ($page) {
if (empty($houseFilters) || in_array('all', $houseFilters)) { if (empty($houseFilters) || in_array('all', $houseFilters)) {
$filteredHouses = $accessibleHouseIds; $filteredHouses = $accessibleHouseIds;
error_log("DEBUG - Using all accessible houses: " . count($filteredHouses)); error_log("DEBUG - Using all accessible houses: " . count($filteredHouses));
} else { }
else {
// Filtrar solo las casas específicamente seleccionadas // Filtrar solo las casas específicamente seleccionadas
$filteredHouses = array_filter($houseFilters, function ($houseId) use ($accessibleHouseIds) { $filteredHouses = array_filter($houseFilters, function ($houseId) use ($accessibleHouseIds) {
return $houseId !== 'all' && in_array($houseId, $accessibleHouseIds); return $houseId !== 'all' && in_array($houseId, $accessibleHouseIds);
@@ -998,7 +1023,8 @@ switch ($page) {
if (empty($conceptFilters) || in_array('all', $conceptFilters)) { if (empty($conceptFilters) || in_array('all', $conceptFilters)) {
$filteredConcepts = null; // Todos los conceptos $filteredConcepts = null; // Todos los conceptos
error_log("DEBUG - Using all concepts"); error_log("DEBUG - Using all concepts");
} else { }
else {
// Filtrar solo los conceptos específicamente seleccionados // Filtrar solo los conceptos específicamente seleccionados
$filteredConcepts = array_filter($conceptFilters, function ($conceptId) { $filteredConcepts = array_filter($conceptFilters, function ($conceptId) {
return $conceptId !== 'all'; return $conceptId !== 'all';
@@ -1039,7 +1065,8 @@ switch ($page) {
$conceptName = preg_replace('/[^a-zA-Z0-9_]/', '_', $concept['name']); $conceptName = preg_replace('/[^a-zA-Z0-9_]/', '_', $concept['name']);
$pdfFilename = 'Concepto_' . $conceptName . '_IBIZA.pdf'; $pdfFilename = 'Concepto_' . $conceptName . '_IBIZA.pdf';
} }
} else { }
else {
$allConcepts = CollectionConcept::all(true); $allConcepts = CollectionConcept::all(true);
foreach ($allConcepts as $c) { foreach ($allConcepts as $c) {
$status = CollectionConcept::getCollectionStatus($c['id']); $status = CollectionConcept::getCollectionStatus($c['id']);
@@ -1174,7 +1201,8 @@ switch ($page) {
'payments' => $payments 'payments' => $payments
]; ];
} }
} else { }
else {
$allConcepts = CollectionConcept::all(true); $allConcepts = CollectionConcept::all(true);
foreach ($allConcepts as $c) { foreach ($allConcepts as $c) {
$status = CollectionConcept::getCollectionStatus($c['id']); $status = CollectionConcept::getCollectionStatus($c['id']);
@@ -1193,7 +1221,8 @@ switch ($page) {
$conceptName = $conceptsToExport[0]['concept']['name']; $conceptName = $conceptsToExport[0]['concept']['name'];
$conceptName = preg_replace('/[^a-zA-Z0-9_]/', '_', $conceptName); $conceptName = preg_replace('/[^a-zA-Z0-9_]/', '_', $conceptName);
$filename = 'Concepto_' . $conceptName . '_IBIZA'; $filename = 'Concepto_' . $conceptName . '_IBIZA';
} else { }
else {
$filename = 'Conceptos_Especiales_IBIZA'; $filename = 'Conceptos_Especiales_IBIZA';
} }
@@ -1263,7 +1292,8 @@ switch ($page) {
Auth::requireAdmin(); // Solo administradores Auth::requireAdmin(); // Solo administradores
$targetUserId = $_GET['user_id'] ?? 0; $targetUserId = $_GET['user_id'] ?? 0;
$userHouses = UserPermission::getUserHouseIds($targetUserId); $userHouses = UserPermission::getUserHouseIds($targetUserId);
echo json_encode(['success' => true, 'houses' => array_map(function($id) { return ['id' => $id]; }, $userHouses)]); echo json_encode(['success' => true, 'houses' => array_map(function ($id) {
return ['id' => $id]; }, $userHouses)]);
exit; exit;
case 'create': case 'create':
@@ -1283,10 +1313,12 @@ switch ($page) {
if ($newUserId) { if ($newUserId) {
Auth::logActivity('create_user', 'Usuario creado: ' . $input['username']); Auth::logActivity('create_user', 'Usuario creado: ' . $input['username']);
echo json_encode(['success' => true, 'message' => 'Usuario creado exitosamente', 'user_id' => $newUserId]); echo json_encode(['success' => true, 'message' => 'Usuario creado exitosamente', 'user_id' => $newUserId]);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al crear usuario.']); echo json_encode(['success' => false, 'message' => 'Error al crear usuario.']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos.']); echo json_encode(['success' => false, 'message' => 'Datos inválidos.']);
} }
exit; exit;
@@ -1308,10 +1340,12 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('update_user', 'Usuario actualizado: ID ' . $input['id'] . ' - ' . $input['username']); Auth::logActivity('update_user', 'Usuario actualizado: ID ' . $input['id'] . ' - ' . $input['username']);
echo json_encode(['success' => true, 'message' => 'Usuario actualizado exitosamente']); echo json_encode(['success' => true, 'message' => 'Usuario actualizado exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al actualizar usuario.']); echo json_encode(['success' => false, 'message' => 'Error al actualizar usuario.']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos o ID de usuario no proporcionado.']); echo json_encode(['success' => false, 'message' => 'Datos inválidos o ID de usuario no proporcionado.']);
} }
exit; exit;
@@ -1334,7 +1368,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('delete_user', 'Usuario eliminado (inactivado): ID ' . $targetUserId); Auth::logActivity('delete_user', 'Usuario eliminado (inactivado): ID ' . $targetUserId);
echo json_encode(['success' => true, 'message' => 'Usuario eliminado exitosamente (inactivado).']); echo json_encode(['success' => true, 'message' => 'Usuario eliminado exitosamente (inactivado).']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al eliminar usuario.']); echo json_encode(['success' => false, 'message' => 'Error al eliminar usuario.']);
} }
exit; exit;
@@ -1350,7 +1385,8 @@ switch ($page) {
UserPermission::assignHousesToUser($input['user_id'], $input['house_ids']); UserPermission::assignHousesToUser($input['user_id'], $input['house_ids']);
Auth::logActivity('assign_user_houses', 'Casas asignadas a usuario ID: ' . $input['user_id']); Auth::logActivity('assign_user_houses', 'Casas asignadas a usuario ID: ' . $input['user_id']);
echo json_encode(['success' => true, 'message' => 'Permisos de casa actualizados.']); echo json_encode(['success' => true, 'message' => 'Permisos de casa actualizados.']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos o incompletos para asignar casas.']); echo json_encode(['success' => false, 'message' => 'Datos inválidos o incompletos para asignar casas.']);
} }
exit; exit;
@@ -1376,10 +1412,12 @@ switch ($page) {
Auth::logActivity('update_profile', 'Perfil de usuario actualizado: ID ' . Auth::id()); Auth::logActivity('update_profile', 'Perfil de usuario actualizado: ID ' . Auth::id());
echo json_encode(['success' => true, 'message' => 'Perfil actualizado exitosamente.']); echo json_encode(['success' => true, 'message' => 'Perfil actualizado exitosamente.']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al actualizar perfil.']); echo json_encode(['success' => false, 'message' => 'Error al actualizar perfil.']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos.']); echo json_encode(['success' => false, 'message' => 'Datos inválidos.']);
} }
exit; exit;
@@ -1408,13 +1446,16 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('change_password', 'Contraseña de usuario cambiada: ID ' . Auth::id()); Auth::logActivity('change_password', 'Contraseña de usuario cambiada: ID ' . Auth::id());
echo json_encode(['success' => true, 'message' => 'Contraseña cambiada exitosamente.']); echo json_encode(['success' => true, 'message' => 'Contraseña cambiada exitosamente.']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al cambiar contraseña.']); echo json_encode(['success' => false, 'message' => 'Error al cambiar contraseña.']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Contraseña actual incorrecta.']); echo json_encode(['success' => false, 'message' => 'Contraseña actual incorrecta.']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos.']); echo json_encode(['success' => false, 'message' => 'Datos inválidos.']);
} }
exit; exit;
@@ -1450,7 +1491,8 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('initialize_concept_payments', 'Pagos de concepto inicializados: ID ' . $conceptId); Auth::logActivity('initialize_concept_payments', 'Pagos de concepto inicializados: ID ' . $conceptId);
echo json_encode(['success' => true, 'message' => 'Pagos inicializados exitosamente']); echo json_encode(['success' => true, 'message' => 'Pagos inicializados exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al inicializar pagos']); echo json_encode(['success' => false, 'message' => 'Error al inicializar pagos']);
} }
exit; exit;
@@ -1480,10 +1522,12 @@ switch ($page) {
if ($result) { if ($result) {
Auth::logActivity('save_concept_payment', 'Pago de concepto guardado: Concepto ' . $conceptId . ', Casa ' . $houseId . ', Monto ' . $amount); Auth::logActivity('save_concept_payment', 'Pago de concepto guardado: Concepto ' . $conceptId . ', Casa ' . $houseId . ', Monto ' . $amount);
echo json_encode(['success' => true, 'message' => 'Pago guardado exitosamente']); echo json_encode(['success' => true, 'message' => 'Pago guardado exitosamente']);
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Error al guardar pago']); echo json_encode(['success' => false, 'message' => 'Error al guardar pago']);
} }
} else { }
else {
echo json_encode(['success' => false, 'message' => 'Datos inválidos']); echo json_encode(['success' => false, 'message' => 'Datos inválidos']);
} }
exit; exit;

25
migrations/add_payment_indexes.sql Normal file
View File

@@ -0,0 +1,25 @@
-- =====================================================
-- Optimización de Índices para Página de Pagos
-- Fecha: 2026-02-14
-- Propósito: Mejorar rendimiento de consultas en payments
-- =====================================================
-- Índice compuesto para búsquedas por año y mes
-- Mejora: SELECT ... WHERE year = ? AND month = ?
-- Si el índice ya existe, este comando generará un warning pero continuará
CREATE INDEX idx_payments_year_month ON payments(year, month);
-- Índice compuesto para búsquedas por casa y año
-- Mejora: SELECT ... WHERE house_id = ? AND year = ?
CREATE INDEX idx_payments_house_year ON payments(house_id, year);
-- Índice para ordenamiento de casas por número
-- Mejora: ORDER BY CAST(number AS UNSIGNED)
CREATE INDEX idx_houses_number ON houses(number);
-- Verificar índices creados
SELECT 'Índices de payments:' as 'Tabla';
SHOW INDEX FROM payments WHERE Key_name LIKE 'idx_payments%';
SELECT 'Índices de houses:' as 'Tabla';
SHOW INDEX FROM houses WHERE Key_name LIKE 'idx_houses%';

151
models/Payment.php
View File

@@ -1,7 +1,9 @@
<?php <?php
class Payment { class Payment
public static function getMatrix($year) { {
public static function getMatrix($year)
{
$db = Database::getInstance(); $db = Database::getInstance();
$houses = $db->fetchAll( $houses = $db->fetchAll(
@@ -13,30 +15,46 @@ class Payment {
$months = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', $months = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre']; 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'];
// OPTIMIZADO: Una sola query en lugar de 12 queries separadas
$allPayments = $db->fetchAll(
"SELECT house_id, month, amount, payment_date
FROM payments
WHERE year = ?
ORDER BY FIELD(month, 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre')",
[$year]
);
// Organizar pagos por mes
$payments = []; $payments = [];
foreach ($months as $month) { foreach ($months as $month) {
$monthPayments = $db->fetchAll(
"SELECT house_id, amount, payment_date
FROM payments
WHERE year = ? AND month = ?",
[$year, $month]
);
$payments[$month] = []; $payments[$month] = [];
foreach ($monthPayments as $p) {
$payments[$month][$p['house_id']] = $p;
} }
foreach ($allPayments as $p) {
$payments[$p['month']][$p['house_id']] = $p;
} }
return ['houses' => $houses, 'payments' => $payments, 'months' => $months]; return ['houses' => $houses, 'payments' => $payments, 'months' => $months];
} }
public static function getExpectedAmount($house, $year, $month) { /**
* Obtener monto esperado con caché de monthly_bills (OPTIMIZADO)
* Usar esta versión cuando monthly_bills ya está cargado
*/
public static function getExpectedAmount($house, $year, $month, $monthlyBills = null)
{
// Si no se pasa caché, usar query (backward compatibility)
if ($monthlyBills === null) {
$db = Database::getInstance(); $db = Database::getInstance();
$bill = $db->fetchOne( $bill = $db->fetchOne(
"SELECT * FROM monthly_bills WHERE year = ? AND month = ?", "SELECT * FROM monthly_bills WHERE year = ? AND month = ?",
[$year, $month] [$year, $month]
); );
}
else {
$bill = $monthlyBills[$month] ?? null;
}
if (!$bill) { if (!$bill) {
return 0; return 0;
@@ -51,13 +69,23 @@ class Payment {
return round($monto_base, 2); return round($monto_base, 2);
} }
public static function getExpectedAmountWithDiscount($house, $year, $month) { /**
* Obtener monto esperado sin descuento con caché (OPTIMIZADO)
* Usar esta versión cuando monthly_bills ya está cargado
*/
public static function getExpectedAmountWithDiscount($house, $year, $month, $monthlyBills = null)
{
// Si no se pasa caché, usar query (backward compatibility)
if ($monthlyBills === null) {
$db = Database::getInstance(); $db = Database::getInstance();
$bill = $db->fetchOne( $bill = $db->fetchOne(
"SELECT * FROM monthly_bills WHERE year = ? AND month = ?", "SELECT * FROM monthly_bills WHERE year = ? AND month = ?",
[$year, $month] [$year, $month]
); );
}
else {
$bill = $monthlyBills[$month] ?? null;
}
if (!$bill) { if (!$bill) {
return 0; return 0;
@@ -68,7 +96,8 @@ class Payment {
return round($monto_base, 2); return round($monto_base, 2);
} }
public static function update($houseId, $year, $month, $amount, $userId, $notes = null, $paymentMethod = null) { public static function update($houseId, $year, $month, $amount, $userId, $notes = null, $paymentMethod = null)
{
$db = Database::getInstance(); $db = Database::getInstance();
$existing = $db->fetchOne( $existing = $db->fetchOne(
@@ -89,7 +118,8 @@ class Payment {
"UPDATE payments SET amount = ?, payment_date = NOW(), notes = ?, payment_method = ?, created_by = ? WHERE id = ?", "UPDATE payments SET amount = ?, payment_date = NOW(), notes = ?, payment_method = ?, created_by = ? WHERE id = ?",
[$amount, $notes, $paymentMethod, $userId, $existing['id']] [$amount, $notes, $paymentMethod, $userId, $existing['id']]
); );
} else { }
else {
$db->execute( $db->execute(
"INSERT INTO payments (house_id, year, month, amount, payment_date, notes, payment_method, created_by) "INSERT INTO payments (house_id, year, month, amount, payment_date, notes, payment_method, created_by)
VALUES (?, ?, ?, ?, NOW(), ?, ?, ?)", VALUES (?, ?, ?, ?, NOW(), ?, ?, ?)",
@@ -100,7 +130,8 @@ class Payment {
return ['success' => true, 'deleted' => false]; return ['success' => true, 'deleted' => false];
} }
public static function getByHouse($houseId, $year = null) { public static function getByHouse($houseId, $year = null)
{
$db = Database::getInstance(); $db = Database::getInstance();
if ($year) { if ($year) {
@@ -116,7 +147,8 @@ class Payment {
); );
} }
public static function getTotalByYear($year) { public static function getTotalByYear($year)
{
$db = Database::getInstance(); $db = Database::getInstance();
$result = $db->fetchOne( $result = $db->fetchOne(
"SELECT COALESCE(SUM(amount), 0) as total FROM payments WHERE year = ?", "SELECT COALESCE(SUM(amount), 0) as total FROM payments WHERE year = ?",
@@ -124,4 +156,87 @@ class Payment {
); );
return $result['total'] ?? 0; return $result['total'] ?? 0;
} }
/**
* Actualizar múltiples pagos en batch con transacción
* Mucho más rápido que llamar update() múltiples veces
*
* @param array $changes Array de cambios [{house_id, year, month, amount}, ...]
* @param int $userId ID del usuario que realiza los cambios
* @return array ['success' => bool, 'count' => int, 'error' => string]
*/
public static function updateBatch($changes, $userId)
{
$db = Database::getInstance();
$pdo = $db->getPDO();
try {
$pdo->beginTransaction();
$updateCount = 0;
$deleteCount = 0;
// Preparar statements una sola vez (reutilización)
$insertStmt = $pdo->prepare(
"INSERT INTO payments (house_id, year, month, amount, payment_date, created_by)
VALUES (?, ?, ?, ?, NOW(), ?)
ON DUPLICATE KEY UPDATE
amount = VALUES(amount),
payment_date = VALUES(payment_date),
created_by = VALUES(created_by)"
);
$deleteStmt = $pdo->prepare(
"DELETE FROM payments WHERE house_id = ? AND year = ? AND month = ?"
);
foreach ($changes as $change) {
// Validar que tenemos los datos mínimos
if (!isset($change['house_id'], $change['year'], $change['month'])) {
continue;
}
$amount = isset($change['amount']) ? (float)$change['amount'] : 0;
if ($amount == 0) {
// Eliminar si el monto es 0
$deleteStmt->execute([
$change['house_id'],
$change['year'],
$change['month']
]);
$deleteCount++;
}
else {
// Insertar o actualizar
$insertStmt->execute([
$change['house_id'],
$change['year'],
$change['month'],
$amount,
$userId
]);
$updateCount++;
}
}
$pdo->commit();
return [
'success' => true,
'count' => $updateCount + $deleteCount,
'updated' => $updateCount,
'deleted' => $deleteCount
];
}
catch (Exception $e) {
$pdo->rollback();
error_log("Error en Payment::updateBatch: " . $e->getMessage());
return [
'success' => false,
'error' => $e->getMessage()
];
}
}
} }

165
views/payments/index.php
View File

@@ -11,8 +11,11 @@
<label for="yearSelect" class="form-label me-2">Año:</label> <label for="yearSelect" class="form-label me-2">Año:</label>
<select id="yearSelect" class="form-select d-inline-block" style="width: auto;"> <select id="yearSelect" class="form-select d-inline-block" style="width: auto;">
<?php for ($y = 2024; $y <= 2030; $y++): ?> <?php for ($y = 2024; $y <= 2030; $y++): ?>
<option value="<?= $y ?>" <?= $y == $year ? 'selected' : '' ?>><?= $y ?></option> <option value="<?= $y?>" <?= $y == $year ? 'selected' : '' ?>>
<?php endfor; ?> <?= $y?>
</option>
<?php
endfor; ?>
</select> </select>
</div> </div>
<div> <div>
@@ -20,8 +23,11 @@
<select id="houseFilter" class="form-select d-inline-block" style="width: auto;"> <select id="houseFilter" class="form-select d-inline-block" style="width: auto;">
<option value="">Todas</option> <option value="">Todas</option>
<?php foreach ($houses as $house): ?> <?php foreach ($houses as $house): ?>
<option value="<?= $house['id'] ?>" data-number="<?= $house['number'] ?>"><?= $house['number'] ?></option> <option value="<?= $house['id']?>" data-number="<?= $house['number']?>">
<?php endforeach; ?> <?= $house['number']?>
</option>
<?php
endforeach; ?>
</select> </select>
</div> </div>
</div> </div>
@@ -33,16 +39,19 @@
<button onclick="exportToCSV()" class="btn btn-primary"> <button onclick="exportToCSV()" class="btn btn-primary">
<i class="bi bi-file-earmark-csv"></i> Exportar CSV <i class="bi bi-file-earmark-csv"></i> Exportar CSV
</button> </button>
<?php endif; ?> <?php
endif; ?>
<?php if (Auth::isCapturist()): ?> <?php if (Auth::isCapturist()): ?>
<button onclick="saveAllChanges()" id="btnSaveTop" class="btn btn-warning position-relative" disabled> <button onclick="saveAllChanges()" id="btnSaveTop" class="btn btn-warning position-relative" disabled>
<i class="bi bi-save"></i> Guardar Cambios <i class="bi bi-save"></i> Guardar Cambios
<span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger" id="changesBadge" style="display: none;"> <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger"
id="changesBadge" style="display: none;">
0 0
<span class="visually-hidden">cambios pendientes</span> <span class="visually-hidden">cambios pendientes</span>
</span> </span>
</button> </button>
<?php endif; ?> <?php
endif; ?>
</div> </div>
</div> </div>
@@ -53,8 +62,11 @@
<th>Casa</th> <th>Casa</th>
<th>Estado</th> <th>Estado</th>
<?php foreach ($months as $month): ?> <?php foreach ($months as $month): ?>
<th><?= substr($month, 0, 3) ?></th> <th>
<?php endforeach; ?> <?= substr($month, 0, 3)?>
</th>
<?php
endforeach; ?>
<th>Debe/Excedente</th> <th>Debe/Excedente</th>
<th>Total</th> <th>Total</th>
</tr> </tr>
@@ -70,23 +82,28 @@
$totalExpected = 0; $totalExpected = 0;
$totalExpectedOriginal = 0; $totalExpectedOriginal = 0;
?> ?>
<tr data-house-id="<?= $house['id'] ?>" data-house-number="<?= $house['number'] ?>" data-status="<?= $house['status'] ?>"> <tr data-house-id="<?= $house['id']?>" data-house-number="<?= $house['number']?>"
<td><strong><?= $house['number'] ?></strong></td> data-status="<?= $house['status']?>">
<td><strong>
<?= $house['number']?>
</strong></td>
<td> <td>
<span class="badge <?= $house['status'] == 'activa' ? 'bg-success' : 'bg-secondary'?>"> <span class="badge <?= $house['status'] == 'activa' ? 'bg-success' : 'bg-secondary'?>">
<?= $house['status'] == 'activa' ? 'Activa' : 'Deshabitada'?> <?= $house['status'] == 'activa' ? 'Activa' : 'Deshabitada'?>
</span> </span>
<?php if ($house['consumption_only']): ?> <?php if ($house['consumption_only']): ?>
<span class="badge bg-warning" title="Solo consumo">CO</span> <span class="badge bg-warning" title="Solo consumo">CO</span>
<?php endif; ?> <?php
endif; ?>
</td> </td>
<?php foreach ($months as $month): <?php foreach ($months as $month):
$payment = $payments[$month][$house['id']] ?? null; $payment = $payments[$month][$house['id']] ?? null;
$amount = $payment['amount'] ?? 0; $amount = $payment['amount'] ?? 0;
$monthTotals[$month] += $amount; // Accumulate monthly total $monthTotals[$month] += $amount; // Accumulate monthly total
$expected = Payment::getExpectedAmount($house, $year, $month); // OPTIMIZADO: Pasar monthlyBills cacheados para evitar queries repetitivas
$expectedOriginal = Payment::getExpectedAmountWithDiscount($house, $year, $month); $expected = Payment::getExpectedAmount($house, $year, $month, $monthlyBills);
$expectedOriginal = Payment::getExpectedAmountWithDiscount($house, $year, $month, $monthlyBills);
$total += $amount; $total += $amount;
$totalExpected += $expected; $totalExpected += $expected;
$totalExpectedOriginal += $expectedOriginal; $totalExpectedOriginal += $expectedOriginal;
@@ -97,35 +114,36 @@
if ($house['status'] == 'deshabitada') { if ($house['status'] == 'deshabitada') {
$cellClass = 'inactive'; $cellClass = 'inactive';
$cellText = '-'; $cellText = '-';
} elseif ($amount > 0) { }
elseif ($amount > 0) {
if ($expected > 0 && $amount >= $expected) { if ($expected > 0 && $amount >= $expected) {
$cellClass = 'paid'; $cellClass = 'paid';
} else { }
else {
$cellClass = 'partial'; $cellClass = 'partial';
} }
$cellText = '$' . number_format($amount, 2); $cellText = '$' . number_format($amount, 2);
} elseif ($amount == 0) { }
elseif ($amount == 0) {
$cellClass = 'pending'; $cellClass = 'pending';
if ($expected == 0) { if ($expected == 0) {
$cellText = 'Sin monto'; $cellText = 'Sin monto';
} else { }
else {
$cellText = '-'; $cellText = '-';
} }
} }
$isEditable = Auth::isCapturist() && $house['status'] == 'activa'; $isEditable = Auth::isCapturist() && $house['status'] == 'activa';
?> ?>
<td class="payment-cell text-center <?= $cellClass ?>" <td class="payment-cell text-center <?= $cellClass?>" data-house-id="<?= $house['id']?>"
data-house-id="<?= $house['id'] ?>" data-month="<?= $month?>" data-amount="<?= $amount?>" data-expected="<?= $expected?>"
data-month="<?= $month ?>" data-status="<?= $house['status']?>" data-is-capturist="<?= Auth::isCapturist() ? '1' : '0'?>"
data-amount="<?= $amount ?>"
data-expected="<?= $expected ?>"
data-status="<?= $house['status'] ?>"
data-is-capturist="<?= Auth::isCapturist() ? '1' : '0' ?>"
<?= $isEditable ? 'contenteditable="true"' : '' ?>> <?= $isEditable ? 'contenteditable="true"' : '' ?>>
<?= $cellText?> <?= $cellText?>
</td> </td>
<?php endforeach; ?> <?php
endforeach; ?>
<?php <?php
$difference = $total - $totalExpectedOriginal; $difference = $total - $totalExpectedOriginal;
$diffClass = $difference < 0 ? 'text-danger' : 'text-success'; $diffClass = $difference < 0 ? 'text-danger' : 'text-success';
@@ -133,17 +151,24 @@
$grandTotal += $total; $grandTotal += $total;
$grandTotalExpected += $totalExpected; $grandTotalExpected += $totalExpected;
?> ?>
<td class="text-end fw-bold <?= $diffClass ?>"><?= $diffText ?></td> <td class="text-end fw-bold <?= $diffClass?>">
<td class="text-end fw-bold">$<?= number_format($total, 2) ?></td> <?= $diffText?>
</td>
<td class="text-end fw-bold">$
<?= number_format($total, 2)?>
</td>
</tr> </tr>
<?php endforeach; ?> <?php
endforeach; ?>
<tr class="table-info"> <tr class="table-info">
<td colspan="2" class="text-end fw-bold">SUMA MENSUAL:</td> <td colspan="2" class="text-end fw-bold">SUMA MENSUAL:</td>
<?php foreach ($months as $month): ?> <?php foreach ($months as $month): ?>
<td class="text-center fw-bold"> <td class="text-center fw-bold">
$<?= number_format($monthTotals[$month], 2) ?> $
<?= number_format($monthTotals[$month], 2)?>
</td> </td>
<?php endforeach; ?> <?php
endforeach; ?>
<td colspan="2"></td> <td colspan="2"></td>
</tr> </tr>
<?php <?php
@@ -153,8 +178,12 @@
?> ?>
<tr class="table-primary"> <tr class="table-primary">
<td colspan="<?= count($months) + 2?>" class="text-end fw-bold">TOTALES:</td> <td colspan="<?= count($months) + 2?>" class="text-end fw-bold">TOTALES:</td>
<td class="text-end fw-bold <?= $grandDiffClass ?>"><?= $grandDiffText ?></td> <td class="text-end fw-bold <?= $grandDiffClass?>">
<td class="text-end fw-bold">$<?= number_format($grandTotal, 2) ?></td> <?= $grandDiffText?>
</td>
<td class="text-end fw-bold">$
<?= number_format($grandTotal, 2)?>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -166,7 +195,8 @@
<i class="bi bi-save"></i> Guardar Cambios <i class="bi bi-save"></i> Guardar Cambios
</button> </button>
</div> </div>
<?php endif; ?> <?php
endif; ?>
<div class="row mt-3 no-print"> <div class="row mt-3 no-print">
<div class="col-md-6"> <div class="col-md-6">
@@ -184,8 +214,12 @@
<?php if (Auth::isAdmin()): ?> <?php if (Auth::isAdmin()): ?>
<div id="printArea"> <div id="printArea">
<div class="print-title">Concentrado de Pagos de Agua - <?= $year ?></div> <div class="print-title">Concentrado de Pagos de Agua -
<div class="print-date">Fecha de generación: <?= date('d/m/Y H:i') ?></div> <?= $year?>
</div>
<div class="print-date">Fecha de generación:
<?= date('d/m/Y H:i')?>
</div>
<table> <table>
<thead> <thead>
@@ -193,8 +227,11 @@
<th>Casa</th> <th>Casa</th>
<th>Estado</th> <th>Estado</th>
<?php foreach ($months as $month): ?> <?php foreach ($months as $month): ?>
<th><?= $month ?></th> <th>
<?php endforeach; ?> <?= $month?>
</th>
<?php
endforeach; ?>
<th>Debe/Excedente</th> <th>Debe/Excedente</th>
<th>Total</th> <th>Total</th>
</tr> </tr>
@@ -206,13 +243,18 @@
$totalExpectedOriginal = 0; $totalExpectedOriginal = 0;
?> ?>
<tr> <tr>
<td><strong><?= $house['number'] ?></strong></td> <td><strong>
<td><?= $house['status'] == 'activa' ? 'Activa' : 'Deshabitada' ?></td> <?= $house['number']?>
</strong></td>
<td>
<?= $house['status'] == 'activa' ? 'Activa' : 'Deshabitada'?>
</td>
<?php foreach ($months as $month): <?php foreach ($months as $month):
$payment = $payments[$month][$house['id']] ?? null; $payment = $payments[$month][$house['id']] ?? null;
$amount = $payment['amount'] ?? 0; $amount = $payment['amount'] ?? 0;
$expected = Payment::getExpectedAmount($house, $year, $month); // OPTIMIZADO: Usar caché de monthlyBills
$expectedOriginal = Payment::getExpectedAmountWithDiscount($house, $year, $month); $expected = Payment::getExpectedAmount($house, $year, $month, $monthlyBills);
$expectedOriginal = Payment::getExpectedAmountWithDiscount($house, $year, $month, $monthlyBills);
$total += $amount; $total += $amount;
$totalExpected += $expected; $totalExpected += $expected;
$totalExpectedOriginal += $expectedOriginal; $totalExpectedOriginal += $expectedOriginal;
@@ -220,31 +262,40 @@
$bg = '#f8d7da'; $bg = '#f8d7da';
if ($amount > 0) { if ($amount > 0) {
$bg = $amount >= $expected ? '#d4edda' : '#fff3cd'; $bg = $amount >= $expected ? '#d4edda' : '#fff3cd';
} else { }
else {
$bg = $house['status'] == 'deshabitada' ? '#e2e3e5' : '#f8d7da'; $bg = $house['status'] == 'deshabitada' ? '#e2e3e5' : '#f8d7da';
} }
?> ?>
<td style="background-color: <?= $bg?>;"> <td style="background-color: <?= $bg?>;">
<?= $amount > 0 ? '$' . number_format($amount, 2) : '-'?> <?= $amount > 0 ? '$' . number_format($amount, 2) : '-'?>
</td> </td>
<?php endforeach; ?> <?php
endforeach; ?>
<?php <?php
$difference = $total - $totalExpectedOriginal; $difference = $total - $totalExpectedOriginal;
$diffColor = $difference < 0 ? 'red' : 'green'; $diffColor = $difference < 0 ? 'red' : 'green';
$diffText = $difference == 0 ? '$0.00' : '$' . number_format($difference, 2); $diffText = $difference == 0 ? '$0.00' : '$' . number_format($difference, 2);
?> ?>
<td style="color: <?= $diffColor ?>;"><?= $diffText ?></td> <td style="color: <?= $diffColor?>;">
<td><strong>$<?= number_format($total, 2) ?></strong></td> <?= $diffText?>
</td>
<td><strong>$
<?= number_format($total, 2)?>
</strong></td>
</tr> </tr>
<?php endforeach; ?> <?php
endforeach; ?>
<tr style="background-color: #bee5eb;"> <tr style="background-color: #bee5eb;">
<td colspan="2" style="text-align: right; font-weight: bold;">SUMA MENSUAL:</td> <td colspan="2" style="text-align: right; font-weight: bold;">SUMA MENSUAL:</td>
<?php foreach ($months as $month): ?> <?php foreach ($months as $month): ?>
<td style="text-align: center; font-weight: bold;"> <td style="text-align: center; font-weight: bold;">
$<?= number_format($monthTotals[$month], 2) ?> $
<?= number_format($monthTotals[$month], 2)?>
</td> </td>
<?php endforeach; ?> <?php
endforeach; ?>
<td colspan="2"></td> <td colspan="2"></td>
</tr> </tr>
</tbody> </tbody>
@@ -258,7 +309,8 @@
<span style="background-color: #e2e3e5; padding: 2px 8px; margin: 2px;">Gris = Casa deshabitada</span> <span style="background-color: #e2e3e5; padding: 2px 8px; margin: 2px;">Gris = Casa deshabitada</span>
</div> </div>
</div> </div>
<?php endif; ?> <?php
endif; ?>
<div class="modal fade" id="exportPdfModal" tabindex="-1"> <div class="modal fade" id="exportPdfModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
@@ -279,14 +331,19 @@
$monthList = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', $monthList = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre']; 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'];
foreach ($monthList as $i => $m): foreach ($monthList as $i => $m):
if ($i % 2 == 0) echo '<div class="col-6">'; if ($i % 2 == 0)
echo '<div class="col-6">';
?> ?>
<div class="form-check"> <div class="form-check">
<input class="form-check-input month-checkbox" type="checkbox" value="<?= $m ?>" id="month_<?= $i ?>" checked> <input class="form-check-input month-checkbox" type="checkbox" value="<?= $m?>"
<label class="form-check-label" for="month_<?= $i ?>"><?= $m ?></label> id="month_<?= $i?>" checked>
<label class="form-check-label" for="month_<?= $i?>">
<?= $m?>
</label>
</div> </div>
<?php <?php
if ($i % 2 == 1 || $i == count($monthList) - 1) echo '</div>'; if ($i % 2 == 1 || $i == count($monthList) - 1)
echo '</div>';
endforeach; endforeach;
?> ?>
</div> </div>