This commit is contained in:
Jake Kasper
2025-08-29 14:36:24 -04:00
parent a5ce1c9498
commit 80645dac1c
2 changed files with 4 additions and 36 deletions

View File

@@ -931,9 +931,7 @@ router.put('/plans/:id/status', validateParams(idParamSchema), async (req, res,
// @access Private // @access Private
router.get('/logs', async (req, res, next) => { router.get('/logs', async (req, res, next) => {
try { try {
console.log('=== FIRST LOGS ENDPOINT CALLED ===');
const { property_id, start_date, end_date, limit = 50, planId } = req.query; const { property_id, start_date, end_date, limit = 50, planId } = req.query;
console.log('Query params:', { property_id, start_date, end_date, limit, planId });
let whereConditions = ['al.user_id = $1']; let whereConditions = ['al.user_id = $1'];
let queryParams = [req.user.id]; let queryParams = [req.user.id];
@@ -986,18 +984,6 @@ router.get('/logs', async (req, res, next) => {
queryParams queryParams
); );
console.log(`Found ${result.rows.length} logs`);
if (result.rows.length > 0) {
console.log('First log gps_track:', result.rows[0].gps_track);
console.log('First log raw data sample:', {
id: result.rows[0].id,
plan_id: result.rows[0].plan_id,
gps_track: result.rows[0].gps_track,
average_speed: result.rows[0].average_speed,
area_covered: result.rows[0].area_covered,
notes: result.rows[0].notes
});
}
res.json({ res.json({
success: true, success: true,

View File

@@ -11,22 +11,14 @@ const ApplicationViewModal = ({ application, propertyDetails, onClose }) => {
// Calculate coverage percentage based on GPS tracking and equipment specifications // Calculate coverage percentage based on GPS tracking and equipment specifications
const calculateCoverage = (application, log) => { const calculateCoverage = (application, log) => {
console.log('calculateCoverage called with:', { application, log });
console.log('GPS track points:', log?.gpsTrack?.points?.length || 0);
console.log('GPS track structure:', log?.gpsTrack);
if (!log?.gpsTrack?.points || log.gpsTrack.points.length < 2) { if (!log?.gpsTrack?.points || log.gpsTrack.points.length < 2) {
console.log('No GPS points or insufficient points for coverage calculation');
return 0; // No movement = no coverage return 0; // No movement = no coverage
} }
const totalDistance = log.gpsTrack.totalDistance || 0; const totalDistance = log.gpsTrack.totalDistance || 0;
const plannedArea = application.totalSectionArea || 0; const plannedArea = application.totalSectionArea || 0;
console.log('Total distance:', totalDistance, 'Planned area:', plannedArea);
if (totalDistance === 0 || plannedArea === 0) { if (totalDistance === 0 || plannedArea === 0) {
console.log('Zero distance or area, returning 0 coverage');
return 0; return 0;
} }
@@ -70,22 +62,10 @@ const ApplicationViewModal = ({ application, propertyDetails, onClose }) => {
// Try to fetch application logs to get GPS tracking data // Try to fetch application logs to get GPS tracking data
try { try {
console.log('Fetching logs for planId:', application.id); const logsResponse = await applicationsAPI.getLogs({ planId: application.id });
// Add cache-busting parameter to force fresh request
const logsResponse = await applicationsAPI.getLogs({
planId: application.id,
_t: Date.now()
});
console.log('Logs response:', logsResponse);
const logs = logsResponse.data.data.logs; const logs = logsResponse.data.data.logs;
console.log('Parsed logs:', logs);
if (logs && logs.length > 0) { if (logs && logs.length > 0) {
console.log('Setting application log to:', logs[0]);
console.log('Log GPS track property:', logs[0].gpsTrack);
console.log('Full log object keys:', Object.keys(logs[0]));
setApplicationLog(logs[0]); // Get the most recent log setApplicationLog(logs[0]); // Get the most recent log
} else {
console.log('No logs found in response');
} }
} catch (error) { } catch (error) {
console.log('No application logs found:', error); console.log('No application logs found:', error);
@@ -234,7 +214,9 @@ const ApplicationViewModal = ({ application, propertyDetails, onClose }) => {
<div className="grid grid-cols-2 lg:grid-cols-5 gap-4"> <div className="grid grid-cols-2 lg:grid-cols-5 gap-4">
<div className="bg-blue-50 p-3 rounded-lg"> <div className="bg-blue-50 p-3 rounded-lg">
<div className="text-sm text-blue-600 font-medium">Average Speed</div> <div className="text-sm text-blue-600 font-medium">Average Speed</div>
<div className="text-xl font-bold text-blue-900">{applicationLog.averageSpeed?.toFixed(1)} mph</div> <div className="text-xl font-bold text-blue-900">
{(applicationLog.gpsTrack?.averageSpeed || applicationLog.averageSpeed || 0).toFixed(1)} mph
</div>
</div> </div>
<div className="bg-green-50 p-3 rounded-lg"> <div className="bg-green-50 p-3 rounded-lg">
<div className="text-sm text-green-600 font-medium">GPS Points</div> <div className="text-sm text-green-600 font-medium">GPS Points</div>