Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/api/companies.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import axios from "@/lib/axios";

export interface CreateCompanyPayload {
name: string;
address: string;
email: string;
codeConfirm: string;
phoneNumber: string;
industryType: string;
picName: string;
picPhone: string;
startDate: string;
endDate: string;
isActive: boolean;
}

export const getCompaniesApi = async () => {
const res = await axios.get("/companies");
return res.data.data;
}

export const createCompanyApi = async (companyData: CreateCompanyPayload) => {
const res = await axios.post("/companies", companyData);
return res.data.data;
}

export const updateCompanyApi = async (id: number, companyData: Partial<CreateCompanyPayload>) => {
const res = await axios.put(`/companies/${id}`, companyData);
return res.data.data;
}

export const deleteCompanyApi = async (id: number) => {
const res = await axios.delete(`/companies/${id}`);
return res.data.data;
}
1 change: 1 addition & 0 deletions src/api/device.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// nanti tunggu ui/ux ada
57 changes: 53 additions & 4 deletions src/api/vehicle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ export const getMachineActiveVehicle = async (companyId: number) => {
return res.data.data;
};

export const getVehicleDetail = async (vehicleId: number) => {
const res = await axios.get(`vehicles/vehicle-detail/${vehicleId}`);
return res.data.data;
};

export const getVehicleActivityReport = async ( vehicleId: number, date: string ) => {
const res = await axios.get(`vehicles/activity/trip-report/${vehicleId}/date`, { params: { date } });
Expand Down Expand Up @@ -77,3 +73,56 @@ export const toggleVehicleStarter = async (
);
return res.data;
};

// api to get detailed list of vehicles by company - super admin
export const getDetailedListVehiclesByCompany = async (companyId: number) => {
const res = await axios.get(`vehicles/list/sa/${companyId}/detailed`);
return res.data.data;
};

// count company - super admin

export const getVehiclesCountAllCompanies = async () => {
const res = await axios.get(`vehicles/count/sa`);
return res.data.data.vehicle_count ?? 0;
};

export const getVehiclesCountByCompany = async (companyId: number) => {
const res = await axios.get(`vehicles/count/sa/${companyId}`);
return res.data.data.vehicle_count ?? 0;
}

export const deleteVehicleById = async (vehicleId: number) => {
const res = await axios.delete(`vehicles/${vehicleId}`);
return res.data;
}

// Vehicles API
export const editVehiclesById = async (vehicleId: number, vehicleData: object) => {
const res = await axios.put(`vehicles/${vehicleId}`, vehicleData);
return res.data;
}

export const getVehicleDetail = async (vehicleId: number, companyId: number) => {
const res = await axios.get(`vehicles/vehicle-details/${vehicleId}`, {
params: { companyId }
});
return res.data.data;
};

// MODEL VEHICLE API

export const addVehicleModel = async (modelData: number) => {
const res = await axios.post(`vehicles/models`, modelData);
return res.data;
}

export const editVehicleModelById = async (modelId: number, modelData: number) => {
const res = await axios.put(`vehicles/models/${modelId}`, modelData);
return res.data;
}

export const deleteVehicleModelById = async (modelId: number) => {
const res = await axios.delete(`vehicles/models/${modelId}`);
return res.data;
}
2 changes: 1 addition & 1 deletion src/components/leftbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const data = {
},
{
title: "Manajemen Device",
url: "/device-management",
url: "/manajemen-device",
icon: Car,
},
{
Expand Down
37 changes: 31 additions & 6 deletions src/components/vehicle-map .tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ import L from "leaflet";
import "leaflet/dist/leaflet.css";
import { Vehicle } from "@/types/types";
import { FitBoundsToVehicles } from "./focus-vehicle";
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import { getCompaniesApi } from "@/api/companies";

interface Company {
id: number;
name: string;
address: string;
email: string;
phoneNumber: string;
industryType: string;
picName: string;
picPhone: string;
isActive: boolean;
}

interface VehicleMapProps {
vehicleLocations: Vehicle[];
Expand Down Expand Up @@ -143,13 +156,25 @@ const formatVehicleType = (type: string | undefined) => {


const VehicleMap: React.FC<VehicleMapProps> = ({ vehicleLocations }) => {
// Ambil daftar unik perusahaan dari data kendaraan
const companyList = Array.from(
new Set(vehicleLocations.map((v) => v.company_name).filter(Boolean))
);

const [companyList, setCompanyList] = useState<string[]>([]);
const [selectedCompany, setSelectedCompany] = useState<string | "">("");

// Fetch companies dari API
useEffect(() => {
const fetchCompanies = async () => {
try {
const companies: Company[] = await getCompaniesApi();
const companyNames = companies.map((company) => company.name);
setCompanyList(companyNames);
} catch (error) {
console.error("Error fetching companies:", error);
setCompanyList([]);
}
};

fetchCompanies();
}, []);

// Filter kendaraan berdasarkan perusahaan yang dipilih
const filteredVehicles =
selectedCompany && selectedCompany !== ""
Expand Down
Empty file.
Loading
Loading