Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lng2020 committed Jan 26, 2025
1 parent 9c9b711 commit d2bba6f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 18 deletions.
1 change: 1 addition & 0 deletions src/components/Reports/LostTime/LostTimeHistory.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function LostTimeHistory(props) {
isTangible={entry.isTangible}
entryType={entry.entryType}
allData={props.allData}
// eslint-disable-next-line no-use-before-define
reload={reload}
darkMode={darkMode}
/>
Expand Down
1 change: 1 addition & 0 deletions src/components/Reports/PeopleReport/PeopleReport.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-nested-ternary */
import { Component } from 'react';
import '../../Teams/Team.css';
import './PeopleReport.css';
Expand Down
1 change: 1 addition & 0 deletions src/components/Reports/PeopleTableDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ function PeopleTableDetails(props) {
</div>
<div className="people-table">
{filteredTasks.map(value => (
// eslint-disable-next-line react/no-unstable-nested-components
<NewModal header="Task info" trigger={() => <> {(windowWidth <= 1020) ? renderMobileFilteredTask(value) : renderFilteredTask(value)}</>}>
<div>Why This Task is important</div>
<textarea className="rectangle" type="text" value={value.whyInfo} />
Expand Down
14 changes: 4 additions & 10 deletions src/components/Reports/ReportFilter/ReportFilter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ import ReportTableSearchPanel from '../ReportTableSearchPanel';
class ReportFilter extends Component {
constructor(props) {
super(props);
this.state = {
wildCardSearchText: '',
teamNameSearchText: '',
};

this.setActive = this.setActive.bind(this);
this.setInActive = this.setInActive.bind(this);
this.setAll = this.setAll.bind(this);
this.onWildCardSearch = this.onWildCardSearch.bind(this);
}

onWildCardSearch(searchText) {
this.props.onWildCardSearch(searchText);
}

setActive() {
this.props.setFilterStatus('true');
}
Expand All @@ -27,11 +26,6 @@ class ReportFilter extends Component {
this.props.setFilterStatus('');
}

onWildCardSearch(searchText) {
this.setState({ wildCardSearchText: searchText });
this.props.onWildCardSearch(searchText);
}

render() {
return (
<div>
Expand Down
3 changes: 0 additions & 3 deletions src/components/Reports/TasksTable/TasksTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
/* eslint-disable camelcase */
/* eslint-disable import/prefer-default-export */
import { useState, useEffect, useRef } from 'react';
import { useSelector } from 'react-redux';
import '../../Teams/Team.css';
import 'react-datepicker/dist/react-datepicker.css';
// eslint-disable-next-line import/order
import { getTasksTableData } from './selectors';
import './TasksTable.css';
import Select from 'react-select';
import { Checkbox } from 'components/common/Checkbox';
Expand Down
7 changes: 4 additions & 3 deletions src/components/Reports/TeamTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ import hasPermission from 'utils/permissions';
import { updateTeam } from 'actions/allTeamsAction';
import { boxStyle, boxStyleDark } from 'styles';

function TeamTable({ allTeams, auth, hasPermission, darkMode }) {
function TeamTable({ allTeams, auth, darkMode }) {
// Display project lists
let TeamsList = [];
const canEditTeamCode = hasPermission('editTeamCode') || auth.user.role === 'Owner';

// eslint-disable-next-line react/no-unstable-nested-components
function EditTeamCode({team}) {

const [teamCode, setTeamCode] = useState(team.teamCode);
const [hasError, setHasError] = useState(false);
const fullCodeRegex = /^.{5,7}$/;

const handleOnChange = (value, team) => {
updateTeam(team.teamName, team._id, team.isActive, value);
const handleOnChange = (value, teamData) => {
updateTeam(teamData.teamName, teamData._id, teamData.isActive, value);
};

const handleCodeChange = e => {
Expand Down
3 changes: 1 addition & 2 deletions src/components/Reports/WbsTable/WbsTable.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from "react";
import { Stub } from "components/common/Stub";
import "./WbsTable.css";
import CopyToClipboard from 'components/common/Clipboard/CopyToClipboard';
Expand All @@ -24,7 +23,7 @@ export function WbsTable({ wbs, skip, take, match, canViewWBS, darkMode }) {
<div className="projects__active--input">
{item.isActive ? (
<div className="isActive">
<i className="fa fa-circle" aria-hidden="true"></i>
<i className="fa fa-circle" aria-hidden="true" />
</div>
) : (
<div className="isNotActive">
Expand Down

0 comments on commit d2bba6f

Please sign in to comment.