Porzadki po refaktorze
This commit is contained in:
@@ -23,13 +23,23 @@ function mystat_equipment_page() {
|
|||||||
|
|
||||||
if ( ! empty( $data['name'] ) ) {
|
if ( ! empty( $data['name'] ) ) {
|
||||||
if ( $item_id > 0 ) { // Update
|
if ( $item_id > 0 ) { // Update
|
||||||
$wpdb->update( $table_equipment, $data, array( 'id' => $item_id ) );
|
$result = $wpdb->update( $table_equipment, $data, array( 'id' => $item_id ) );
|
||||||
|
if ( false !== $result ) {
|
||||||
$message = 'Sprzęt zaktualizowany.';
|
$message = 'Sprzęt zaktualizowany.';
|
||||||
$notice_class = 'notice-success';
|
$notice_class = 'notice-success';
|
||||||
|
} else {
|
||||||
|
$message = 'Błąd podczas aktualizacji sprzętu: ' . $wpdb->last_error;
|
||||||
|
$notice_class = 'notice-error';
|
||||||
|
}
|
||||||
} else { // Insert
|
} else { // Insert
|
||||||
$wpdb->insert( $table_equipment, $data );
|
$result = $wpdb->insert( $table_equipment, $data );
|
||||||
|
if ( false !== $result ) {
|
||||||
$message = 'Sprzęt dodany.';
|
$message = 'Sprzęt dodany.';
|
||||||
$notice_class = 'notice-success';
|
$notice_class = 'notice-success';
|
||||||
|
} else {
|
||||||
|
$message = 'Błąd podczas dodawania sprzętu: ' . $wpdb->last_error;
|
||||||
|
$notice_class = 'notice-error';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$message = 'Nazwa sprzętu nie może być pusta.';
|
$message = 'Nazwa sprzętu nie może być pusta.';
|
||||||
@@ -63,28 +73,22 @@ function mystat_equipment_page() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$table_activities = $wpdb->prefix . 'mystat_activities';
|
$table_activities = $wpdb->prefix . 'mystat_activities';
|
||||||
$equipment_list = $wpdb->get_results(
|
$equipment_list = $wpdb->get_results("
|
||||||
"
|
|
||||||
SELECT
|
SELECT
|
||||||
eq.*,
|
eq.id,
|
||||||
stats.total_distance,
|
eq.name,
|
||||||
stats.total_seconds,
|
eq.type,
|
||||||
stats.activity_count
|
eq.status,
|
||||||
|
SUM(a.distance) as total_distance,
|
||||||
|
COUNT(a.id) as activity_count
|
||||||
FROM
|
FROM
|
||||||
{$table_equipment} eq
|
{$table_equipment} eq
|
||||||
LEFT JOIN (
|
LEFT JOIN
|
||||||
SELECT
|
{$table_activities} a ON eq.id = a.equipment_id
|
||||||
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
|
GROUP BY
|
||||||
equipment_id
|
eq.id, eq.name, eq.type, eq.status
|
||||||
) as stats ON eq.id = stats.equipment_id
|
ORDER BY
|
||||||
ORDER BY eq.status ASC, eq.name ASC "
|
eq.status ASC, eq.name ASC"
|
||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
<div class="wrap">
|
<div class="wrap">
|
||||||
|
|||||||
Reference in New Issue
Block a user