Skip to content

Commit 34cd7bd

Browse files
GGcode1llambda
GGcode1
authored and
llambda
committed
Fix report rows
1 parent f9b31d5 commit 34cd7bd

File tree

1 file changed

+97
-93
lines changed

1 file changed

+97
-93
lines changed

‎src/client/components/reports.js

Lines changed: 97 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function Daily({results, vehicles}) {
147147
</tr>
148148
</thead>
149149
<tbody>
150-
{ Object.keys(vehicles).map(vid => <>
150+
{ Object.keys(vehicles).map(vid => <Fragment key={vid}>
151151
<tr key={count++}>
152152
<td colSpan="7" className="group">{ vehicles[vid].name }</td>
153153
</tr>
@@ -160,7 +160,7 @@ function Daily({results, vehicles}) {
160160
<td>{ tomiles(result.endOdometer) }</td>
161161
<td>{ tomiles(result.distance) }</td>
162162
</tr>)}
163-
</>
163+
</Fragment>
164164
)}
165165
</tbody>
166166
</table>
@@ -323,24 +323,25 @@ function Ignition({results, vehicles}) {
323323
</thead>
324324
<tbody>
325325
{
326-
Object.keys(vehicles).map(vid =>
327-
<tr key={ key++ }>
326+
Object.keys(vehicles).map(vid => <Fragment key={vid}>
327+
<tr>
328328
<td colSpan="8" className="group">{ vehicles[vid] && vehicles[vid].name }</td>
329-
{
330-
results[vid].map(item =>
331-
<tr key={ key++ }>
332-
<td>{ item.startTime && formatDate(item.startTime) }</td>
333-
<td>{ formatDate(item.d) }</td>
334-
<td>{ item.transitTime && tohms(item.transitTime) }</td>
335-
<td>{ tomiles(item.startStopMileage) }</td>
336-
<td>{ full(item) }</td>
337-
<td>{ item.parkedEnd && formatDate(item.parkedEnd) }</td>
338-
<td>{ item.parkedDuration && tohms(item.parkedDuration) }</td>
339-
<td>{ item.idleDuration && tohms(item.idleDuration) }</td>
340-
</tr>
341-
)
342-
}
343-
</tr>)
329+
</tr>
330+
{
331+
results[vid].map(item =>
332+
<tr>
333+
<td>{ item.startTime && formatDate(item.startTime) }</td>
334+
<td>{ formatDate(item.d) }</td>
335+
<td>{ item.transitTime && tohms(item.transitTime) }</td>
336+
<td>{ tomiles(item.startStopMileage) }</td>
337+
<td>{ full(item) }</td>
338+
<td>{ item.parkedEnd && formatDate(item.parkedEnd) }</td>
339+
<td>{ item.parkedDuration && tohms(item.parkedDuration) }</td>
340+
<td>{ item.idleDuration && tohms(item.idleDuration) }</td>
341+
</tr>
342+
)
343+
}
344+
</Fragment>)
344345
}
345346
</tbody>
346347
</table>
@@ -367,24 +368,25 @@ function Start({results, vehicles}) {
367368
</thead>
368369
<tbody>
369370
{
370-
Object.keys(vehicles).map(vid =>
371+
Object.keys(vehicles).map(vid => <Fragment key={vid}>
371372
<tr key={ key++ }>
372373
<td colSpan="8" className="group">{ vehicles[vid] && vehicles[vid].name }</td>
373-
{
374-
results[vid].map(item =>
375-
<tr key={ key++ }>
376-
<td>{ item.startTime && formatDate(item.startTime) }</td>
377-
<td>{ formatDate(item.d) }</td>
378-
<td>{ item.transitTime && tohms(item.transitTime) }</td>
379-
<td>{ tomiles(item.startStopMileage) }</td>
380-
<td>{ full(item) }</td>
381-
<td>{ item.parkedEnd && formatDate(item.parkedEnd) }</td>
382-
<td>{ item.parkedDuration && tohms(item.parkedDuration) }</td>
383-
<td>{ item.idleDuration && tohms(item.idleDuration) }</td>
384-
</tr>
385-
)
386-
}
387-
</tr>)
374+
</tr>
375+
{
376+
results[vid].map(item =>
377+
<tr key={ key++ }>
378+
<td>{ item.startTime && formatDate(item.startTime) }</td>
379+
<td>{ formatDate(item.d) }</td>
380+
<td>{ item.transitTime && tohms(item.transitTime) }</td>
381+
<td>{ tomiles(item.startStopMileage) }</td>
382+
<td>{ full(item) }</td>
383+
<td>{ item.parkedEnd && formatDate(item.parkedEnd) }</td>
384+
<td>{ item.parkedDuration && tohms(item.parkedDuration) }</td>
385+
<td>{ item.idleDuration && tohms(item.idleDuration) }</td>
386+
</tr>
387+
)
388+
}
389+
</Fragment>)
388390
}
389391
</tbody>
390392
</table>
@@ -414,7 +416,7 @@ function Summary({results, vehicles}) {
414416
</thead>
415417
<tbody>
416418
{
417-
Object.keys(vehicles).map(vid => <tr key={ key++ }>
419+
Object.keys(vehicles).map(vid => <tr key={vid}>
418420
<td>{ vehicles[vid].name }</td>
419421
<td>{ tohms(results[vid].totalTransit) }</td>
420422
<td>{ tomiles(results[vid].distance) }</td>
@@ -464,41 +466,42 @@ function Obd({results, vehicles}) {
464466
</thead>
465467
<tbody>
466468
{
467-
Object.keys(vehicles).map(vid =>
469+
Object.keys(vehicles).map(vid => <Fragment key={vid}>
468470
<tr key={ key++ }>
469471
<td colSpan="19" className="group">{ vehicles[vid].name }</td>
470-
{
471-
results[vid].map(result => {
472-
if (!result.obd) {
473-
result.obd = {};
474-
}
475-
if (!result.obd.diagnosticTroubleCodes) {
476-
result.obd.diagnosticTroubleCodes = [];
477-
}
478-
return <tr key={ key++ }>
479-
<td>{ formatDate(result.d) }</td>
480-
<td>{ street(result) }</td>
481-
<td>{ city(result) }</td>
482-
<td>{ state(result) }</td>
483-
<td>{ result.obd.connect && "✓" }</td>
484-
<td>{ result.obd.malfunction && result.obd.diagnosticTroubleCodes.length + "⚠" }</td>
485-
<td>{ result.obd.diagnosticTroubleCodes.map(code => <a href={ `http://www.obd-codes.com/p${code}` } target="_new">{ code }</a>) }</td>
486-
<td>{ result.obd.temp && result.obd.temp }</td>
487-
<td>{ result.obd.fuelLevelInput && result.obd.fuelLevelInput + "%" }</td>
488-
<td>{ result.obd.engineLoad }</td>
489-
<td>{ result.obd.throttlePosition }</td>
490-
<td>{ result.obd.RPMs }</td>
491-
<td>{ result.obd.fuelConsumption }</td>
492-
<td>{ result.obd.supportPIDs }</td>
493-
<td>{ toMiles(result.obd.speed) }</td>
494-
<td>{ result.obd.powermv && result.obd.powermV / 1000 + "V" }</td>
495-
<td>{ result.obd.vin }</td>
496-
<td>{ toMiles(result.obd.mileage) }</td>
497-
<td>{ toMiles(result.m) }</td>
498-
</tr>
499-
})
500-
}
501-
</tr>)
472+
</tr>
473+
{
474+
results[vid].map(result => {
475+
if (!result.obd) {
476+
result.obd = {};
477+
}
478+
if (!result.obd.diagnosticTroubleCodes) {
479+
result.obd.diagnosticTroubleCodes = [];
480+
}
481+
return <tr key={ key++ }>
482+
<td>{ formatDate(result.d) }</td>
483+
<td>{ street(result) }</td>
484+
<td>{ city(result) }</td>
485+
<td>{ state(result) }</td>
486+
<td>{ result.obd.connect && "✓" }</td>
487+
<td>{ result.obd.malfunction && result.obd.diagnosticTroubleCodes.length + "⚠" }</td>
488+
<td>{ result.obd.diagnosticTroubleCodes.map(code => <a href={ `http://www.obd-codes.com/p${code}` } target="_new">{ code }</a>) }</td>
489+
<td>{ result.obd.temp && result.obd.temp }</td>
490+
<td>{ result.obd.fuelLevelInput && result.obd.fuelLevelInput + "%" }</td>
491+
<td>{ result.obd.engineLoad }</td>
492+
<td>{ result.obd.throttlePosition }</td>
493+
<td>{ result.obd.RPMs }</td>
494+
<td>{ result.obd.fuelConsumption }</td>
495+
<td>{ result.obd.supportPIDs }</td>
496+
<td>{ toMiles(result.obd.speed) }</td>
497+
<td>{ result.obd.powermv && result.obd.powermV / 1000 + "V" }</td>
498+
<td>{ result.obd.vin }</td>
499+
<td>{ toMiles(result.obd.mileage) }</td>
500+
<td>{ toMiles(result.m) }</td>
501+
</tr>
502+
})
503+
}
504+
</Fragment>)
502505
}
503506
</tbody>
504507
</table>
@@ -527,32 +530,33 @@ function Jes({results, vehicles}) {
527530
</thead>
528531
<tbody>
529532
{
530-
Object.keys(vehicles).map(vid =>
533+
Object.keys(vehicles).map(vid => <Fragment key={vid}>
531534
<tr key={ key++ }>
532535
<td colSpan="18" className="group">{ vehicles[vid].name }</td>
533-
{
534-
results[vid].map(result => {
535-
if (!result.obd) {
536-
result.obd = {};
537-
}
538-
if (!result.obd.diagnosticTroubleCodes) {
539-
result.obd.diagnosticTroubleCodes = [];
540-
}
541-
return <tr key={ key++ }>
542-
<td>{ formatDate(result.d) }</td>
543-
<td>{ street(result) }</td>
544-
<td>{ city(result) }</td>
545-
<td>{ state(result) }</td>
546-
<td>{ get(result, 'jes.maxRPM') }</td>
547-
<td>{ get(result, 'jes.averageRPM') }</td>
548-
<td>{ get(result, 'jes.maxThrottlePosition') }</td>
549-
<td>{ get(result, 'jes.averageThrottlePosition') }</td>
550-
<td>{ get(result, 'jes.maxEngineLoad') }</td>
551-
<td>{ get(result, 'jes.averageEngineLoad') }</td>
552-
</tr>
553-
})
554-
}
555-
</tr>)
536+
</tr>
537+
{
538+
results[vid].map(result => {
539+
if (!result.obd) {
540+
result.obd = {};
541+
}
542+
if (!result.obd.diagnosticTroubleCodes) {
543+
result.obd.diagnosticTroubleCodes = [];
544+
}
545+
return <tr key={ key++ }>
546+
<td>{ formatDate(result.d) }</td>
547+
<td>{ street(result) }</td>
548+
<td>{ city(result) }</td>
549+
<td>{ state(result) }</td>
550+
<td>{ get(result, 'jes.maxRPM') }</td>
551+
<td>{ get(result, 'jes.averageRPM') }</td>
552+
<td>{ get(result, 'jes.maxThrottlePosition') }</td>
553+
<td>{ get(result, 'jes.averageThrottlePosition') }</td>
554+
<td>{ get(result, 'jes.maxEngineLoad') }</td>
555+
<td>{ get(result, 'jes.averageEngineLoad') }</td>
556+
</tr>
557+
})
558+
}
559+
</Fragment>)
556560
}
557561
</tbody>
558562
</table>

0 commit comments

Comments
 (0)