From a7c80e1327555e9315173c23273082436391e704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20Fefli=C5=84ski?= <feflik@gmail.com>
Date: Thu, 5 Feb 2026 12:59:40 +0100
Subject: [PATCH] Porzadki po refaktorze

---
 includes/admin/pages/page-equipment.php | 54 +++++++++++++------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/includes/admin/pages/page-equipment.php b/includes/admin/pages/page-equipment.php
index 570582d..bb57c89 100644
--- a/includes/admin/pages/page-equipment.php
+++ b/includes/admin/pages/page-equipment.php
@@ -23,13 +23,23 @@ function mystat_equipment_page() {
 
 		if ( ! empty( $data['name'] ) ) {
 			if ( $item_id > 0 ) { // Update
-				$wpdb->update( $table_equipment, $data, array( 'id' => $item_id ) );
-				$message      = 'Sprzęt zaktualizowany.';
-				$notice_class = 'notice-success';
+				$result = $wpdb->update( $table_equipment, $data, array( 'id' => $item_id ) );
+				if ( false !== $result ) {
+					$message      = 'Sprzęt zaktualizowany.';
+					$notice_class = 'notice-success';
+				} else {
+					$message      = 'Błąd podczas aktualizacji sprzętu: ' . $wpdb->last_error;
+					$notice_class = 'notice-error';
+				}
 			} else { // Insert
-				$wpdb->insert( $table_equipment, $data );
-				$message      = 'Sprzęt dodany.';
-				$notice_class = 'notice-success';
+				$result = $wpdb->insert( $table_equipment, $data );
+				if ( false !== $result ) {
+					$message      = 'Sprzęt dodany.';
+					$notice_class = 'notice-success';
+				} else {
+					$message      = 'Błąd podczas dodawania sprzętu: ' . $wpdb->last_error;
+					$notice_class = 'notice-error';
+				}
 			}
 		} else {
 			$message      = 'Nazwa sprzętu nie może być pusta.';
@@ -63,28 +73,22 @@ function mystat_equipment_page() {
 	}
 
 	$table_activities = $wpdb->prefix . 'mystat_activities';
-	$equipment_list   = $wpdb->get_results(
-		"
+	$equipment_list = $wpdb->get_results("
 		SELECT
-			eq.*,
-			stats.total_distance,
-			stats.total_seconds,
-			stats.activity_count
+			eq.id,
+			eq.name,
+			eq.type,
+			eq.status,
+			SUM(a.distance) as total_distance,
+			COUNT(a.id) as activity_count
 		FROM
 			{$table_equipment} eq
-		LEFT JOIN (
-			SELECT
-				equipment_id,
-				SUM(distance) as total_distance,
-				SUM(TIME_TO_SEC(duration)) as total_seconds,
-				COUNT(id) as activity_count
-			FROM
-				{$table_activities}
-			WHERE equipment_id IS NOT NULL
-			GROUP BY
-				equipment_id
-		) as stats ON eq.id = stats.equipment_id
-		ORDER BY eq.status ASC, eq.name ASC "
+		LEFT JOIN
+			{$table_activities} a ON eq.id = a.equipment_id
+		GROUP BY
+			eq.id, eq.name, eq.type, eq.status
+		ORDER BY 
+			eq.status ASC, eq.name ASC"
 	);
 	?>
 	<div class="wrap">