Skip to content

Commit 50a2d35

Browse files
committed
fix: resolve duplicate PropTypes imports and JSX fragment mismatch
1 parent 8a05674 commit 50a2d35

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/components/BMDashboard/WeeklyProjectSummary/ToolStatusDonutChart/ToolStatusDonutChart.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ import PropTypes from 'prop-types';
22
import { useState, useEffect, useMemo } from 'react';
33
import { useDispatch, useSelector } from 'react-redux';
44
import Select from 'react-select';
5-
import axios from 'axios';
65
import { PieChart, Pie, Cell, Tooltip, ResponsiveContainer } from 'recharts';
76
import { fetchToolAvailability, fetchTools } from '../../../../actions/bmdashboard/toolActions';
87
import styles from './ToolStatusDonutChart.module.css';
9-
import PropTypes from 'prop-types';
108

119
const COLORS = {
1210
AVAILABLE: '#220F57',

src/components/BMDashboard/WeeklyProjectSummary/Tools/ToolsHorizontalBarChart.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import { BarChart, Bar, XAxis, YAxis, Tooltip, ResponsiveContainer, CartesianGri
66
import axios from 'axios';
77
import { ENDPOINTS } from '../../../../utils/URL';
88
import styles from './ToolsHorizontalBarChart.module.css';
9-
import PropTypes from 'prop-types';
10-
119
function CustomTooltip({ active, payload, label, darkMode }) {
1210
if (!active || !payload || !payload.length) {
1311
return null;

src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.jsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import ExpenseBarChart from './Financials/ExpenseBarChart';
2020
import CostBreakDown from './Financials/CostBreakDown/CostBreakDown';
2121
import ActualVsPlannedCost from './ActualVsPlannedCost/ActualVsPlannedCost';
2222
import TotalMaterialCostPerProject from './TotalMaterialCostPerProject/TotalMaterialCostPerProject';
23+
import EmbedInteractiveMap from '../InteractiveMap/EmbedInteractiveMap';
2324
import InteractiveMap from '../InteractiveMap/InteractiveMap';
2425
import styles from './WeeklyProjectSummary.module.css';
2526
import LossTrackingLineChart from './Financials/LossTrackingLineCharts/LossTrackingLineChart';
27+
import SupplierPerformanceGraph from './SupplierPerformanceGraph.jsx';
2628
import MostFrequentKeywords from './MostFrequentKeywords/MostFrequentKeywords';
2729
import LessonsLearntChart from '../LessonsLearnt/LessonsLearntChart';
2830
import DistributionLaborHours from './DistributionLaborHours/DistributionLaborHours';
@@ -293,7 +295,7 @@ function WeeklyProjectSummary() {
293295
{
294296
title: 'Tools and Equipment Tracking',
295297
key: 'Tools and Equipment Tracking',
296-
className: 'full',
298+
className: 'half',
297299
content: (
298300
<>
299301
{/* <div className="weekly-project-summary-card normal-card tools-tracking-layout"> */}
@@ -309,7 +311,13 @@ function WeeklyProjectSummary() {
309311
>
310312
<SupplierPerformanceGraph />
311313
</div>
312-
</div>
314+
<div
315+
className={`${styles.weeklyProjectSummaryCard} ${styles.normalCard}`}
316+
style={{ minHeight: '300px', gridColumn: 'span 2' }}
317+
>
318+
<ToolsStoppageHorizontalBarChart />
319+
</div>
320+
</>
313321
),
314322
},
315323
{

0 commit comments

Comments
 (0)