Skip to content

Commit 5f924ba

Browse files
Merge pull request #3824 from OneCommunityGlobal/Ramakrishna_Fix_losehours
Ramakrishna Fix bugs in way for me to manually add in lost hours for past years editing/deleting bug
2 parents 497d4aa + 59fc7d5 commit 5f924ba

4 files changed

Lines changed: 41 additions & 8 deletions

File tree

src/components/Header/Header.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ export function Header(props) {
160160
const [hasProfileLoaded, setHasProfileLoaded] = useState(false);
161161
const dismissalKey = `lastDismissed_${userId}`;
162162
const [lastDismissed, setLastDismissed] = useState(localStorage.getItem(dismissalKey));
163+
const [isAckLoading, setIsAckLoading] = useState(false);
163164
const unreadNotifications = props.notification?.unreadNotifications; // List of unread notifications
164165
const dispatch = useDispatch();
165166
const history = useHistory();

src/components/Reports/LostTime/AddLostTime.jsx

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@ function AddLostTime(props) {
3232
isTangible: true,
3333
};
3434

35+
const formatText = result =>{
36+
try {
37+
return result
38+
.toLowerCase()
39+
.trim()
40+
.replace(/\s+/g, '');
41+
} catch (error) {
42+
console.log(error);
43+
return "null";
44+
}
45+
}
46+
47+
3548
const TINY_MCE_INIT_OPTIONS = {
3649
license_key: 'gpl',
3750
menubar: false,
@@ -60,6 +73,8 @@ function AddLostTime(props) {
6073
const [selectedProject, setSelectProject] = useState(undefined);
6174
const [searchText, setSearchText] = useState('');
6275
const [searchTeamText, setSearchTeamText] = useState('');
76+
const [isUserIsNotSelectedAutoComplete, isSetUserIsNotSelectedAutoComplete] = useState(false);
77+
const [isOpenDropdown, setIsOpenDropdown] = useState(false);
6378
const [newTeamName, setNewTeamName] = useState('');
6479

6580
const [errors, setErrors] = useState({});
@@ -79,16 +94,16 @@ function AddLostTime(props) {
7994
}
8095

8196
useEffect(() => {
82-
if (inputs.personId && props.userProfile._id !== inputs.personId) {
83-
props.getUserProfile(inputs.personId);
84-
}
85-
});
97+
if (inputs.personId && props.userProfile._id !== inputs.personId) {
98+
props.getUserProfile(inputs.personId);
99+
}
100+
}, [inputs.personId, props.userProfile._id]);
86101

87102
useEffect(() => {
88103
if (!props.isOpen && entryType !== '') {
89104
resetForm();
90105
}
91-
});
106+
},[]);
92107

93108
const selectProject = project => {
94109
setInputs(prevInputs => ({
@@ -131,6 +146,11 @@ function AddLostTime(props) {
131146
projectsData={props.projects}
132147
onDropDownSelect={selectProject}
133148
selectedProject={selectedProject}
149+
setIsOpenDropdown = {setIsOpenDropdown}
150+
searchText={searchText}
151+
onInputChange={setSearchText}
152+
isSetUserIsNotSelectedAutoComplete={isSetUserIsNotSelectedAutoComplete}
153+
formatText={formatText}
134154
/>
135155
{'projectId' in errors && (
136156
<div className="text-danger">

src/components/Reports/ViewReportsByDate/ViewReportsByDate.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,19 @@ class ViewReportByDate extends Component {
3434
}
3535

3636
clearDates() {
37-
this.setState({
37+
try {
38+
this.setState({
3839
startDate: new Date(this.props.minDate),
3940
endDate: new Date(),
4041
});
4142
this.props.onClearFilters();
43+
} catch (error) {
44+
this.setState({
45+
startDate: new Date(this.props.minDate),
46+
endDate: new Date(),
47+
});
48+
}
49+
4250
}
4351

4452
render() {

src/components/UserProfile/TeamsAndProjects/AddProjectsAutoComplete.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ const AddProjectsAutoComplete = React.memo(props => {
99
const darkMode = useSelector(state => state.theme.darkMode);
1010

1111
useEffect(() => {
12-
if (!props.selectedProject) props.onInputChange('');
13-
else props.onInputChange(props.selectedProject.projectName);
12+
try {
13+
if (!props.selectedProject) props.onInputChange('');
14+
else props.onInputChange(props.selectedProject.projectName);
15+
} catch (error) {
16+
if (!props.selectedProject) props.onInputChange('');
17+
}
1418
}, [props.selectedProject]);
1519

1620
return (

0 commit comments

Comments
 (0)