Skip to content
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

58 mock ups of view timesheet changes admin #59

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

izzyconner
Copy link
Collaborator

ℹ️ Issue
Closes clickup ticket link

📝 Description
Briefly list the changes made to the code:

Added support for this.
And removed redunant use of that.
Also this was included for reasons.

✔️ Testing
What steps did you take to verify your changes work? These should be clear enough for someone to be able to clone the branch and follow the steps themselves.

Provide screenshots of any new components, styling changes, or pages.

🏕️ (Optional) Future Work / Notes
Did you notice anything ugly during the course of this ticket? Any bugs, design challenges, or unexpected behavior? Write it down so we can clean it up in a future ticket!

@izzyconner izzyconner linked an issue Sep 15, 2023 that may be closed by this pull request
// 1. associate submitted a time, and supervisor did not
// 2. Supervisor submitted a time for this entry, and associate did not
// 3. Associate time and supervisor reported time differ
var hasConflict = hasAssociateTime !== hasSupervisorTime ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

possible issue of associate has time and supervisor doesnt which shouldn't lead to a conflict

* and allows for conflicts to be shown.
*/
export function ConflicatableTimeEntry(props: ConflicatableTimeEntryProps) {
const [selectedTime, setSelectedTime] = useState(null);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not undefined?

export function TimeConflictPopup(props: TimeConflictPopupProps) {
const { isOpen, onOpen, onClose } = useDisclosure();

const hasAssociateTime: boolean = props.associateEntry !== undefined && props.associateEntry !== null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined instead?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mock-ups of View Timesheet Changes [Admin]
2 participants