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.

Sign up for GitHub

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

Jump to bottom

Ticket 23 #25

Merged
merged 67 commits into from
Oct 15, 2024
Merged

Ticket 23 #25

merged 67 commits into from
Oct 15, 2024

Conversation

solai-y
Copy link
Collaborator

@solai-y solai-y commented Oct 15, 2024

No description provided.

Somnus22 and others added 30 commits September 26, 2024 14:04
@Somnus22 @neojw1505 @songdre123
Pull DB changes from dev into ticket-29 (#12)
e213c3e 
* feat(migration): create RequestLog table with PostgreSQL enum type for state management

The migration also includes a check for the existence of the `status` enum type, ensuring it is created only if it does not already exist, and properly handles the rollback of changes.

* feat(db): pull backend database configurations (#10)

* yarn dependecies updated

* added components for apply wfh

* Modified colours for submit button

* changed folder/file structure to follow coding standards

* Components will adjust accordingly to screen size

* Added React states for form submission

* Pass data to Page render.

* Fixed dependencies

* Change configs for db

* fix: Fixed DB connection issues

* Started backend api for wfh request

---------

Co-authored-by: elliot <[email protected]>

* Setup navs and login

* Fix Auth page and Nav

Fixed the Auth Page and Nav, finishing their scaffolding

* Scaffold calendar

Scaffold WFH calendar for both mobile and desktop

* Refinements

Refine Nav and Calendar

* Front end Fixes

Remove dark mode

Tidy up schedule

Show clearer difference between am, pm and full day wfh

Marked which day is today

improve mobile responsiveness

---------

Co-authored-by: neojw1505 <[email protected]>
Co-authored-by: elliot <[email protected]>
Co-authored-by: songdre123 <[email protected]>
feat(api): complete backend endpoint for creating request
8b6cf46 
- Added API functionality to create a new request with staff and approver details
- Created request and request log records
- Started implementing modal to display success or failure on request submission
feat(api): complete backend endpoint for creating request
13e4cc8 
- Added API functionality to create a new request with staff and approver details
- Created request and request log records
- Started implementing modal to display success or failure on request submission
feat(api): backend endpoint for creating request
7aa0bae
@Somnus22
Squashed commit of the following:
039fa3e 
commit afc27d7
Author: Zavier <[email protected]>
Date:   Sat Sep 28 23:13:02 2024 +0800

    feat: create History page and add global session for employee ID (#15)

    * feat: added manage requests page

    - Added /history route to access requests
    - RequestEntry & RequestTable components created for history
    - Currently using static data from constants

    * feat: Integrated History page with backend

    - Added session global variable for employeeid
    - Minor UI update on history page
    - Updated nav bar links to apply and history page

commit 9bdeb27
Author: neojw1505 <[email protected]>
Date:   Sat Sep 28 16:05:48 2024 +0800

    chore: switch Cypress installation to Yarn

commit b73b161
Author: neojw1505 <[email protected]>
Date:   Sat Sep 28 15:52:13 2024 +0800

    feat(tests): add ScheduleSeeder in scheduleTest, fix typo in RequestLog_RequestId foreign key

commit 454aeef
Merge: 3cbdb22 0b1c092
Author: solai-y <[email protected]>
Date:   Sat Sep 28 15:07:04 2024 +0800

    Merge branch 'dev_wfh' into origin/TICKET-37

commit 3cbdb22
Author: solai-y <[email protected]>
Date:   Sat Sep 28 15:06:58 2024 +0800

    Test File for schedule

commit 0b1c092
Author: neojw1505 <[email protected]>
Date:   Sat Sep 28 15:01:49 2024 +0800

    chore(e2e): setup Cypress for end-to-end testing in Next.js app

commit 1c5ad77
Author: DESKTOP-G5I4U2Q\JW <[email protected]>
Date:   Sat Sep 28 11:12:18 2024 +0800

    fix(tests): add missing Unit folder to track unit tests

commit 6530fca
Author: neojw1505 <[email protected]>
Date:   Fri Sep 27 10:52:21 2024 +0800

    test: add test cases for employee API by ID and email

    - Added test cases for getting employee by ID: valid, non-existing, and invalid ID scenarios.
    - Added test cases for getting employee by email: valid, non-existing, and invalid email format scenarios.

commit bb8cf5c
Author: e-tayfw <[email protected]>
Date:   Fri Sep 27 08:42:12 2024 +0800

    feat(api): integrated backend ownSchedule api with frontend, redux global store (#13)

    resolved conflict with dev_wfh before making this pull request

    added the integrated backend ownSchedule api with the frontend, along with implementation of the new redux global store

    ---------

    Co-authored-by: songdre123 <[email protected]>
    Co-authored-by: solai-y <[email protected]>
    Co-authored-by: neojw1505 <[email protected]>
    Co-authored-by: Elliot Tan <[email protected]>
    Co-authored-by: elliot <[email protected]>

commit 9c45a7d
Author: neojw1505 <[email protected]>
Date:   Thu Sep 26 15:43:45 2024 +0800

    chore(tests): remove DB_USERNAME and DB_PASSWORD from phpunit.xml

commit e508ae0
Merge: 4c71ecf e43b312
Author: Elliot Tan <[email protected]>
Date:   Thu Sep 26 14:03:59 2024 +0800

    Merge branch 'TICKET-29' into dev_wfh

commit 4c71ecf
Author: songdre123 <[email protected]>
Date:   Sun Sep 22 14:55:03 2024 +0800

    Front end Fixes

    Remove dark mode

    Tidy up schedule

    Show clearer difference between am, pm and full day wfh

    Marked which day is today

    improve mobile responsiveness

commit bfb3bdf
Author: songdre123 <[email protected]>
Date:   Sat Sep 21 17:52:44 2024 +0800

    Refinements

    Refine Nav and Calendar

commit 3e87fe5
Author: songdre123 <[email protected]>
Date:   Sat Sep 21 14:36:29 2024 +0800

    Scaffold calendar

    Scaffold WFH calendar for both mobile and desktop

commit ae10f6b
Author: songdre123 <[email protected]>
Date:   Fri Sep 20 09:37:32 2024 +0800

    Fix Auth page and Nav

    Fixed the Auth Page and Nav, finishing their scaffolding

commit 3ccff0f
Author: songdre123 <[email protected]>
Date:   Thu Sep 19 01:40:09 2024 +0800

    Setup navs and login

commit 7f7964d
Author: Elliot Tan <[email protected]>
Date:   Tue Sep 24 20:35:16 2024 +0800

    feat(db): pull backend database configurations (#10)

    * yarn dependecies updated

    * added components for apply wfh

    * Modified colours for submit button

    * changed folder/file structure to follow coding standards

    * Components will adjust accordingly to screen size

    * Added React states for form submission

    * Pass data to Page render.

    * Fixed dependencies

    * Change configs for db

    * fix: Fixed DB connection issues

    * Started backend api for wfh request

    ---------

    Co-authored-by: elliot <[email protected]>

commit e7ea312
Author: neojw1505 <[email protected]>
Date:   Tue Sep 24 14:18:29 2024 +0800

    feat(migration): create RequestLog table with PostgreSQL enum type for state management

    The migration also includes a check for the existence of the `status` enum type, ensuring it is created only if it does not already exist, and properly handles the rollback of changes.
@Somnus22
feat(frontend): add TypeScript types to Apply components
6959ce4
@Somnus22
fix(frontend): correct TypeScript declarations for Flowbite Datepicker
543d062
@Somnus22
Merge branch 'dev_wfh' into TICKET-29
1d0b36a
@Somnus22
update index.tsx
fdc15ea
@Somnus22
fix(branch): resolve conflicts and align with remote
b01e358
@Somnus22
fix(branch): resolve conflicts and align with remote
42e6950
@Somnus22
fix(branch): resolve conflicts and align with remote
c444049
@Somnus22
fix(tailwind): correct tailwind.config.ts settings
ed4aed1
@Somnus22
feat(frontend): implement modal for form submission feedback, impleme…
39b1285 
…nt simulated API response scenarios
@zavierr01
bug fix/chore: Fixed autoincrement in Request.sql insertion script
59355e8
@Somnus22
chore(frontend): add commented axios POST for future backend integration
09b97ac
@Somnus22
chore(frontend): adjusted commented axios POST for future backend int…
7e8dfa0 
…egration
@Somnus22
chore(frontend): adjusted commented axios POST for future backend int…
64930ea 
…egration
@Somnus22
fix(backend-api): brief description of the fix
039e33d
@Somnus22
Merge branch 'dev_wfh' into TICKET-29
61be6b1
@Somnus22
feat(db): implement schema changes for work-from-home requests
7769174
@Somnus22
Merge branch 'dev_wfh' into TICKET-29
2fa9237
@Somnus22
Update index.tsx
15b9988
@solai-y
feat(api): Created an API to get proportion of team that is working f…
e30993a 
…rom home

Untested, need to populate DB to test.
@solai-y
feat(api): API to get request proportion by date
7aa2123
@solai-y
feat(api): Reject request endpoint created
1f802d8 
Tested and added into postman all test cases

Also created scaffold for the approve request
@solai-y
feat(api): Approve Request endpoint
7784777 
Tests for
-check if the requst is already approved
-check if the person rejecting the request is the approver
-check for 50% rule violation
@solai-y
feat(api): Added check for request batch
857ddee 
Prevents requests that are from batch requests from being approved or rejected individually
@solai-y
Test (Requests): Test cases for requests API endpoints
3d8b423
@solai-y
tests(requests): Added more test cases for proportion of team
05d60a7
solai-y and others added 24 commits October 5, 2024 18:57
@solai-y
chore(variables): removed variables that were not being used
5c5578e
@neojw1505
feat(api): add staff withdraw request APIs and test cases
2e0115e 
- Added APIs to handle staff withdraw requests with different statuses
- Implemented status transitions like 'Withdraw Pending', 'Withdrawn', and 'Rejected'
- Created test cases to validate API behavior for all scenarios
@zavierr01
chore(integration): Removed not needed variables
6816e75
@zavierr01
feat: Added WIthdraw Functionality to Withdraw Requests
ba2863d
@solai-y
test(createRequest): created test cases for the create request endpoint
5c457b8 
Invalid ID: returns code 404
Success: returns code 200
Repeated request made: returns code 400
invalid date format: returns code 400
@neojw1505
feat(api): update withdrawRequest API implementation and rewrite test…
c9cf9b4 
… cases - Refactored the withdrawRequest API to use a payload with Request_ID, Employee_ID, and Reason. - Rewrote the test cases to support the new payload structure for the withdrawRequest API. - Included Request_ID in the createRequest API response for consistency.

- Refactored the withdrawRequest API to use a payload with Request_ID, Employee_ID, and Reason.
- Rewrote the test cases to support the new payload structure for the withdrawRequest API.
- Included Request_ID in the createRequest API response for consistency.
@zavierr01
feat: Added refresh on change of status
9a4012b
@zavierr01
fix(bug): Added automatic refresh & Fixed Integration
2c38256
@zavierr01
feat: Added Withdraw button for Withdraw Rejected requests
aa4a99f
@zavierr01
chore(UI): Fixed UI for staff with no direct reports
3b1f9a1
@solai-y
test(approveRequest)
6bd432c
@solai-y
Merge branch 'TICKET-29' into TICKET-23
2fe0e01
@solai-y
test(approve request)
42b071e
@solai-y
test(reject request)
235fdf8
@solai-y
feat(withdraw reqeusts)
d796fa1
@zavierr01
feat (integration): Updated frontend to approve and reject withdraw r…
55a10c8 
…equests
@zavierr01
chore (eslint): Update typing
d1ed210
@zavierr01
feat(UI): Added Filtering by status and pagination
36d75b3
@zavierr01
feat(ui): Added search by staff name
c305b49
@zavierr01
feat(UI): Added search by staff name
d71f19d
@solai-y
Merge branch 'TICKET-23' of https://github.com/e-tayfw/WorkFromHome i…
e31c5e0 
…nto TICKET-23
@solai-y
fix (FE import)
27f0ca3
@zavierr01
chore (tests): Added JEST testing
581859c
@solai-y
Merge branch 'dev_wfh' into TICKET-23
2ed104e
@solai-y solai-y requested a review from e-tayfw October 15, 2024 06:01
@vercel Vercel
Copy link

vercel bot commented Oct 15, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
work-from-home ❌ Failed (Inspect) Oct 15, 2024 9:35am

e-tayfw
e-tayfw approved these changes Oct 15, 2024
View reviewed changes
Copy link
Owner

@e-tayfw e-tayfw left a comment

Choose a reason for hiding this comment

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

Changes approved for this ticket. Only feedback is, in the future do try to remove any eslint issues or any unused variables, or edit wrongly typed variables before pushing or pull request

@solai-y solai-y merged commit ca9bb22 into dev_wfh Oct 15, 2024
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@e-tayfw e-tayfw e-tayfw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@solai-y @e-tayfw @Somnus22 @zavierr01 @neojw1505