Merge branch 'main' of rms-develop-main-branch-26-23-5.bundle

app/Services/Cartables/Mission/Report/ReportTradodService.php

@@ -27,7 +27,7 @@ class ReportTradodService
     public function countryActivity(Request $request): array
     {
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*
@@ -37,8 +37,8 @@ class ReportTradodService
                 -1 AS province_id,
                 COUNT(m.id) AS total,
                 COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
-                COALESCE(SUM(m.in_area_duration), 0) AS gps,
+                COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
-                COALESCE(SUM(m.mission_duration), 0) AS durations,
+                COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
                 COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
                 COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
                 COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -56,8 +56,8 @@ class ReportTradodService
                 p.id AS province_id,
                 COUNT(m.id) AS total,
                 COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
-                COALESCE(SUM(m.in_area_duration), 0) AS gps,
+                COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
-                COALESCE(SUM(m.mission_duration), 0) AS durations,
+                COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
                 COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
                 COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
                 COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -88,7 +88,7 @@ class ReportTradodService
     {
         $provinceId = $request->province_id ?? auth()->user()->province_id;
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*
@@ -98,8 +98,8 @@ class ReportTradodService
                 -1 AS city_id,
                 COUNT(m.id) AS total,
                 COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
-                COALESCE(SUM(m.in_area_duration), 0) AS gps,
+                COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
-                COALESCE(SUM(m.mission_duration), 0) AS durations,
+                COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
                 COALESCE(SUM(m.type = 1), 0) AS far_h,
                 COALESCE(SUM(m.type = 2), 0) AS far_d,
                 COALESCE(SUM(m.type = 3), 0) AS un_far_h,
@@ -118,8 +118,8 @@ class ReportTradodService
                 c.id AS city_id,
                 COUNT(m.id) AS total,
                 COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
-                COALESCE(SUM(m.in_area_duration), 0) AS gps,
+                COALESCE(SUM(m.in_area_duration)/3600, 0) AS gps,
-                COALESCE(SUM(m.mission_duration), 0) AS durations,
+                COALESCE(SUM(m.mission_duration)/3600, 0) AS durations,
                 COALESCE(SUM(m.type = 1), 0) AS far_h,
                 COALESCE(SUM(m.type = 2), 0) AS far_d,
                 COALESCE(SUM(m.type = 3), 0) AS un_far_h,

app/Services/Cartables/Mission/Report/ReportViolationService.php

@@ -27,7 +27,7 @@ class ReportViolationService
     public function countryActivity(Request $request): array
     {
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*
@@ -81,7 +81,7 @@ class ReportViolationService
     {
         $provinceId = $request->province_id ?? auth()->user()->province_id;
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*

database/migrations/2026_05_18_102119_add_end_km_to_missions_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('missions', function (Blueprint $table) {
+            $table->string('end_km')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('missions', function (Blueprint $table) {
+            $table->dropColumn('end_km');
+        });
+    }
+};

docker-compose.yml

@@ -0,0 +1,33 @@
+services:
+  mariadb:
+    image: mariadb:10.11.8
+    container_name: rms-mariadb
+    ports:
+      - "3307:3306"
+    environment:
+      MARIADB_DATABASE: ${DB_DATABASE}
+      MARIADB_USER: ${DB_USERNAME}
+      MARIADB_PASSWORD: ${DB_PASSWORD}
+      MARIADB_ROOT_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - /var/www/rmsdb:/var/lib/mysql
+    networks:
+      - rms
+
+  backend:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: rms
+    ports:
+      - "8003:80"
+    volumes:
+      - ./:/var/www/rms
+    depends_on:
+      - mariadb
+    networks:
+      - rms
+
+networks:
+  rms:
+    driver: bridge