commit 8b51d71e1ff712ed66144b1f39a0a8a19f37366e (HEAD -> master, origin/master, origin/HEAD) Merge: 0a4e5a7 32d9045 Author: Frederick Crisostomo Date: Thu Jan 23 05:26:50 2025 +0000 Fix Attendance Posting re: computation of late undertime wherein time-in falls on breaktime Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!117 commit 32d9045c007a7c1340959ca06badd313b342cdfc Author: Frederick Crisostomo Date: Thu Jan 23 13:10:05 2025 +0800 Fix Attendance Posting re: computation of late undertime wherein time-in falls on breaktime Also add the edit timelog method commit 0a4e5a7187a852c750c22106b40ab063286795da Merge: 43dc156 264a080 Author: Anjury Patawaran Date: Wed Jan 22 23:32:23 2025 +0000 fix tardiness issue when there is halfday leave Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!116 commit 264a080bffc22059cb53729465247268f8287cf1 Author: Anjury Patawaran Date: Thu Jan 23 07:31:31 2025 +0800 fix tardiness issue when there is halfday leave commit 43dc15654971f9c810824b83f96bdb48cddfcf7f Merge: bb38035 5d0e4b6 Author: Anjury Patawaran Date: Wed Jan 22 00:05:22 2025 +0000 Biometric connection notification added. fix tardiness on calendar. Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!115 commit 5d0e4b65c71985e9fde862dbec026ef753c158da Author: Anjury Patawaran Date: Wed Jan 22 08:05:13 2025 +0800 Biometric connection notification added. fix tardiness on calendar. commit bb38035f22e13085c9e1c079d63c65d7ffb6a86a Merge: d5cfb0b 41de1fd Author: Frederick Crisostomo Date: Mon Jan 20 09:13:25 2025 +0000 Update EmployeeAttendanceController re: attendance posting error when with schedule is null Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!114 commit 41de1fd532748fc0b225f132e89486c765e951f1 Author: Frederick Crisostomo Date: Mon Jan 20 17:12:19 2025 +0800 Update EmployeeAttendanceController re: attendance posting error when with schedule is null commit d5cfb0b6b8b72187d5a85a1f45e27cd8e47c24b7 Merge: f232569 f8c39af Author: Frederick Crisostomo Date: Mon Jan 20 04:24:22 2025 +0000 Fix fetching company permission re: query string exceed the limit. Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!113 commit f8c39af8f8c3f65cf16bb5fe90c41084436aeb19 Author: Frederick Crisostomo Date: Mon Jan 20 12:23:08 2025 +0800 Fix fetching company permission re: query string exceed the limit. Remove the muti array in query string, provide role ids array only commit f2325691ee0049943cb2151509079180e1f76fe4 Merge: 6b002fd 1880629 Author: Jayson Dela Paz Date: Mon Jan 20 01:53:49 2025 +0000 Deploy Back End Fixes Employee api for Report and Analytics Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!112 commit 1880629f2e629e8a1e070803cd119ad9a4cdc9a8 Author: Jayson Dela Paz Date: Mon Jan 20 09:52:50 2025 +0800 Deploy Back End Fixe Employee api for Report and Analytics commit 6b002fd4e078fe737bb1119a9526d23df7a66887 Merge: c86774a 02b00d9 Author: Anjury Patawaran Date: Mon Jan 20 01:41:56 2025 +0000 move office controller to api/v1, added migration for families added deceased.... Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!111 commit 02b00d9f2de7ac56f6df6ad585c09f2fb684ad7c Author: Anjury Patawaran Date: Mon Jan 20 09:40:41 2025 +0800 move office controller to api/v1, added migration for families added deceased. added function of getting employee working hours for change schedule commit c86774a4cd8c5ea4ca5c733f92741e2d522fcd18 Merge: dad1a04 b99cbb3 Author: Frederick Crisostomo Date: Mon Jan 20 01:19:08 2025 +0000 Update computation of tardiness re:CWS, fix ob not recognized, apply change... Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!110 commit b99cbb3994254c624699dc8d108f0b2a99814311 Author: Frederick Crisostomo Date: Mon Jan 20 09:15:49 2025 +0800 Update computation of tardiness re:CWS, fix ob not recognized, apply change schedule on attendance posting commit dad1a04b7839444b561fa16c7d113cc62d81e431 Merge: 111f50e a1cd48a Author: Anjury Patawaran Date: Mon Jan 20 00:41:25 2025 +0000 added employee id on addSchedule fix all change schedule shown on calendar Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!109 commit a1cd48ae1fb69f5fb4b33d7aeef831b7e183b68d Author: Anjury Patawaran Date: Mon Jan 20 08:40:29 2025 +0800 added employee id on addSchedule fix all change schedule shown on calendar commit 111f50e613d636c52ab46c6c50ef97cce2e549e0 Merge: 4e7055e 6aa17ce Author: Jayson Dela Paz Date: Sat Jan 18 02:16:02 2025 +0000 Master Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!108 commit 6aa17ce8fe8dea116d6e3e9975206fddd365fe18 Author: Jayson Dela Paz Date: Sat Jan 18 10:14:49 2025 +0800 Redeploy Backend api Overtime commit 68e03461f0bd2d934e643b3c4e53b2c928d3573a Author: Jayson Dela Paz Date: Fri Jan 17 16:33:17 2025 +0800 Deploy Backend API Overtime commit 4e7055ebac673fd0d8b05b6e18cf64d459fe5b39 Merge: cbeff84 7b25aa5 Author: Anjury Patawaran Date: Fri Jan 17 06:43:50 2025 +0000 fix employee on master list not showing and remove the notification on schedule Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!107 commit 7b25aa5e0725c441257e59e34dbebce2647af7a1 Author: Anjury Patawaran Date: Fri Jan 17 14:30:39 2025 +0800 fix employee on master list not showing and remove the notification on schedule commit cbeff843bca88d7b9d32e30c18375ea233b85b5d Merge: 5c44b87 9a84d0e Author: Frederick Crisostomo Date: Thu Jan 16 10:48:42 2025 +0000 Add API and migration file for timelog edit Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!106 commit 9a84d0ead6c5c7a68f1774a71459e25cb0e983a9 Author: Frederick Crisostomo Date: Thu Jan 16 18:47:35 2025 +0800 Add API and migration file for timelog edit commit 5c44b87bae2d96f9ea15802e1aa5c4e2fc0aa45c Merge: 529ce1e 4fde578 Author: Frederick Crisostomo Date: Thu Jan 16 10:45:44 2025 +0000 Update Get Holiday recurring. Update Payroll computation re: daily basis and get adjustments Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!105 commit 4fde5787e7c4a0676e04d1f3302fb1437942fa1a Author: Frederick Crisostomo Date: Thu Jan 16 18:42:58 2025 +0800 Update Get Holiday recurring. Update Payroll computation re: daily basis and get adjustments Update dealership re: departments commit 529ce1e824204edec38e7baf0e67bf05904fe739 Merge: eb4e40b 8d222aa Author: Frederick Crisostomo Date: Thu Jan 16 07:00:50 2025 +0000 Fix menu cannot redirect to PRF due to incorrect filtering of roles thus no menus were fetched Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!104 commit 8d222aa5f6df2eb9989a60c855fde8d8c3aef447 Author: Frederick Crisostomo Date: Thu Jan 16 14:59:32 2025 +0800 Fix menu cannot redirect to PRF due to incorrect filtering of roles thus no menus were fetched commit eb4e40be226666a30a7f89eac19c98f48fa07cc4 Merge: d17b36f 65d7e51 Author: Anjury Patawaran Date: Wed Jan 15 19:52:18 2025 +0000 update searchbar Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!103 commit 65d7e51ac08b24377a8db90a96e823ccf8e64586 Author: Anjury Patawaran Date: Thu Jan 16 03:45:17 2025 +0800 update searchbar commit d17b36f119bb5e8e0fb4fc7ad7fd10362da9cf4e Merge: 8a7b741 cd61a89 Author: Frederick Crisostomo Date: Wed Jan 15 04:11:03 2025 +0000 Fix searching of employee leave credits Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!102 commit cd61a89203e33d6052a2beb85fa3171dfe5f14be Author: Frederick Crisostomo Date: Wed Jan 15 12:09:46 2025 +0800 Fix searching of employee leave credits commit 8a7b741c8078722c73982c8bc220597f1722d642 Merge: 5e5ce31 4ede790 Author: Jayson Dela Paz Date: Wed Jan 15 02:18:31 2025 +0000 Master Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!101 commit 4ede790a24133d6bfa3aa93afc93f4abea960a57 Author: Jayson Dela Paz Date: Wed Jan 15 10:17:33 2025 +0800 Deploy Backend Api update HR Validation commit 3cf65ec195ec832ea2bd6278e36252d2143eaaa2 Merge: 71c5bd5 5e5ce31 Author: Jayson Dela Paz Date: Wed Jan 15 10:15:51 2025 +0800 Merge remote-tracking branch 'upstream/master' commit 5e5ce31604cc7d9d8dbe8f1b1283e9e3fde21e71 Merge: 734b249 51b69ed Author: Frederick Crisostomo Date: Tue Jan 14 06:57:10 2025 +0000 Fix User edit, cannot empty role of user. It always needs to have at least 1 role Author: Frederick Crisostomo See merge request ahg-appdev/webdev/backend/ahg-hr-api!100 commit 51b69edeb47da70836745d33fcb01ae1b73b7dc3 Author: Frederick Crisostomo Date: Tue Jan 14 14:37:05 2025 +0800 Fix User edit, cannot empty role of user. It always needs to have at least 1 role commit 734b249ba6bfba247433a53c9274924271311d1a Merge: a7ed860 6ab15db Author: Anjury Patawaran Date: Tue Jan 14 04:02:56 2025 +0000 Master Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!99 commit 6ab15dbad04f0ae1901f795dead354ba95b3d450 Merge: 5795df6 a7ed860 Author: Anjury Patawaran Date: Tue Jan 14 11:59:11 2025 +0800 Merge remote-tracking branch 'upstream/master' # Conflicts: # app/Notifications/Travel.php commit 71c5bd5a6ba26022bc14087e701a004d51829094 Author: Jayson Dela Paz Date: Mon Jan 13 17:06:32 2025 +0800 Deploy Backend OB with meal and transportation amount commit a7ed8604839cb39563e93510abb5806e3f494f51 Merge: f826427 ef4a772 Author: Jayson Dela Paz Date: Mon Jan 13 07:58:00 2025 +0000 Deploy Backend Api OB HrValidation Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!98 commit ef4a7729eac3eedd1967c727d9913c1cafd7e07d Author: Jayson Dela Paz Date: Mon Jan 13 15:57:21 2025 +0800 Deploy Backend Api OB HrValidation commit 5795df6741fb2c55f29294cae7c6a4b25b130f0f Author: Anjury Patawaran Date: Mon Jan 13 14:48:17 2025 +0800 update the url notification if clicked commit f826427274b8c49a77643b843e71ea44345eca21 Merge: 8422193 6d8e360 Author: Anjury Patawaran Date: Sat Jan 11 03:05:24 2025 +0000 Enhance announcement for per company and created by Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!97 commit 6d8e360640e50c06fe62f4d446babe15e46901ce Author: Anjury Patawaran Date: Sat Jan 11 10:58:48 2025 +0800 Enhance announcement for per company and created by approver contoller remove the duplicated employee id add employee on annouuncement added migration for announcemenet commit 84221939c99924d38122021583ee8f172573ae48 Merge: c115529 581041d Author: Jayson Dela Paz Date: Fri Jan 10 09:04:22 2025 +0000 Deploy Backend API Overtime Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!96 commit 581041d1688bae5478b746fc9c7b1ad59711f977 Author: Jayson Dela Paz Date: Fri Jan 10 17:01:33 2025 +0800 Deploy Backend API Overtime commit c11552941cd5969cc3d7b55f720caed0bae67469 Merge: 8a24810 9354401 Author: Anjury Patawaran Date: Fri Jan 10 07:11:47 2025 +0000 employee attendance changed for rows schedule shifting Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!95 commit 9354401baf06df8d3bbe1646658bfe2ee76fadf0 Author: Anjury Patawaran Date: Fri Jan 10 14:11:24 2025 +0800 employee attendance changed for rows schedule shifting Empoyee controller for change of password schedule shift controller change migration for schedule shift commit 8a248104e3288c4033c088cc6a0afed8a0e1bb95 Merge: b9e64e3 a528f8d Author: Jayson Dela Paz Date: Thu Jan 9 08:56:14 2025 +0000 Master Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!94 commit a528f8d89fbed9c8dbcee561a3722a9ddb850a95 Author: Jayson Dela Paz Date: Thu Jan 9 16:55:27 2025 +0800 Deploy Wfh migration commit 94a1616f37b9a42536e6de0d9880d854ff03ede2 Author: Jayson Dela Paz Date: Thu Jan 9 16:53:45 2025 +0800 Deploy Backend Api HR Validation commit b9e64e36dfc200e3e6dbc9c55565f083f1407f55 Merge: f985274 08faec6 Author: Jayson Dela Paz Date: Thu Jan 9 06:53:23 2025 +0000 Deploy Backend Api Employee change schedule HrValidation Author: Jayson Dela Paz See merge request ahg-appdev/webdev/backend/ahg-hr-api!93 commit 08faec673d924725f82b4765c0bce8427a00c000 Author: Jayson Dela Paz Date: Thu Jan 9 14:49:39 2025 +0800 Deploy Backend Api Employee change schedule HrValidation commit f98527403b77c10eb8366dcae9386662df1133f5 Merge: 850026d 3630a6d Author: Anjury Patawaran Date: Thu Jan 9 06:03:00 2025 +0000 change api and employee controller for error fixing Author: Anjury Patawaran See merge request ahg-appdev/webdev/backend/ahg-hr-api!92