-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
TASK-304 Another iteration over drawer for managing workers #279
Merged
Qwebeck
merged 8 commits into
develop
from
TASK-304-work-hour-conversion-in-worker-input
Mar 20, 2021
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3f40589
TASK-304 usable worker drawer
Qwebeck fbb8990
Merge branch 'develop' into TASK-304-work-hour-conversion-in-worker-i…
Qwebeck 2dac106
Fixes validation messages
Qwebeck 860fbb1
Merge branch 'develop' into TASK-304-work-hour-conversion-in-worker-i…
Qwebeck dcff596
Adds normal validation meesages, addresses review comments
Qwebeck 30dff1c
Merge branch 'develop' into TASK-304-work-hour-conversion-in-worker-i…
Qwebeck b82c730
Adds scroll to drawer
Qwebeck 7f56a2d
Merge branch 'develop' into TASK-304-work-hour-conversion-in-worker-i…
Qwebeck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ | ||
import * as _ from "lodash"; | ||
import { useEffect, useState } from "react"; | ||
import { useSelector } from "react-redux"; | ||
import { ShiftCode } from "../../common-models/shift-info.model"; | ||
import { ContractType, WorkersInfoModel, WorkerType } from "../../common-models/worker-info.model"; | ||
import { ApplicationStateModel } from "../../state/models/application-state.model"; | ||
import { WorkerInfoExtendedInterface } from "./worker-edit/worker-edit.models"; | ||
|
||
interface UseWorkerInfoReturn { | ||
workerInfo: WorkerInfo; | ||
setWorkerInfo: (workerInfo: WorkerInfo) => void; | ||
} | ||
export function useWorkerInfo(workerName: string): UseWorkerInfoReturn { | ||
const [workerInfo, setWorkerInfo] = useState<WorkerInfo>(new WorkerInfo()); | ||
const getWorkerInfo = <T>( | ||
state: ApplicationStateModel, | ||
key: keyof WorkersInfoModel | ||
): T | undefined => | ||
state.actualState.persistentSchedule.present.employee_info[key]?.[workerName] as T | undefined; | ||
const workerTime = useSelector((state: ApplicationStateModel) => | ||
getWorkerInfo<number>(state, "time") | ||
); | ||
const workerType = useSelector((state: ApplicationStateModel) => | ||
getWorkerInfo<WorkerType>(state, "type") | ||
); | ||
const workerContractType = useSelector((state: ApplicationStateModel) => | ||
getWorkerInfo<ContractType>(state, "contractType") | ||
); | ||
const workerShifts = useSelector( | ||
(state: ApplicationStateModel) => | ||
state.actualState.persistentSchedule.present.shifts[workerName] | ||
); | ||
useEffect(() => { | ||
const newWorkerInfo = new WorkerInfo( | ||
workerName, | ||
workerContractType, | ||
workerTime, | ||
workerType, | ||
workerShifts | ||
); | ||
setWorkerInfo(newWorkerInfo); | ||
}, [workerName, workerContractType, workerTime, workerType, workerShifts]); | ||
return { | ||
workerInfo, | ||
setWorkerInfo, | ||
}; | ||
} | ||
|
||
export class WorkerInfo { | ||
Qwebeck marked this conversation as resolved.
Show resolved
Hide resolved
|
||
public previousWorkerName: string; | ||
constructor( | ||
public workerName: string = "", | ||
public contractType?: ContractType, | ||
public workerTime: number = 1, | ||
public workerType?: WorkerType, | ||
public workerShifts: ShiftCode[] = [] | ||
) { | ||
this.previousWorkerName = workerName; | ||
} | ||
|
||
public withNewName(newName: string): WorkerInfo { | ||
const copy = _.cloneDeep(this); | ||
copy.workerName = newName; | ||
return copy; | ||
} | ||
|
||
public withNewWorkerTime(newWorkerTime: number): WorkerInfo { | ||
const copy = _.cloneDeep(this); | ||
copy.workerTime = newWorkerTime; | ||
return copy; | ||
} | ||
|
||
public withNewContractType(newContractType: ContractType): WorkerInfo { | ||
const copy = _.cloneDeep(this); | ||
copy.contractType = newContractType; | ||
return copy; | ||
} | ||
|
||
public withNewWorkerType(newWorkerType: WorkerType): WorkerInfo { | ||
const copy = _.cloneDeep(this); | ||
copy.workerType = newWorkerType; | ||
return copy; | ||
} | ||
|
||
asWorkerInfoExtendedInterface(): WorkerInfoExtendedInterface { | ||
return { | ||
prevName: this.previousWorkerName, | ||
workerName: this.workerName, | ||
workerType: this.workerType, | ||
contractType: this.contractType, | ||
time: this.workerTime, | ||
}; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
może być krótszy
import { WorkerInfoExtendedInterface } from "./worker-edit";