Commit Graph

  • b1cb715c84 made separate useActivityMaster hook that directly calling inside taskModal Pramod Mahajan 2025-05-03 19:21:43 +05:30
  • 02f37be504 Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_April_5W Pramod Mahajan 2025-05-03 13:57:39 +05:30
  • 80f2cce931 prevent unnecessary activity master refresh on task form submission Pramod Mahajan 2025-05-03 13:56:21 +05:30
  • 9aaedede20 Add colors to floor and workarea in infra panel to identify them easily Vikas Nale 2025-05-03 13:15:24 +05:30
  • 7d5d262728 normalize activity data to ensure consistent display names. Pramod Mahajan 2025-05-03 12:25:23 +05:30
  • 80d64c87c6 Improve safety and sorting for building dropdown Pramod Mahajan 2025-05-03 11:07:57 +05:30
  • 5be4f781cf safely sort and render building options with fallbacks pramod_Bug#152InfraModals Pramod Mahajan 2025-05-03 10:37:08 +05:30
  • 18e4b91754 Merge pull request 'pramod_Bug#152InfraModals' (#58) from pramod_Bug#152InfraModals into Issues_April_5W Vikas Nale 2025-05-03 04:40:13 +00:00
  • 6496fd7eb2 sorted all dropdown list Pramod Mahajan 2025-05-03 10:07:18 +05:30
  • 6daf3f8a35 sorted activity list in ascedning order. Pramod Mahajan 2025-05-03 09:38:31 +05:30
  • 1a98aeb934 added Toast and modal open until not close using button Pramod Mahajan 2025-05-03 01:28:30 +05:30
  • 8f42cb8cf6 removed debugger and close modal fun Pramod Mahajan 2025-05-03 01:03:45 +05:30
  • 4a77fb82a4 added Toast and modal not close until click on close button Pramod Mahajan 2025-05-03 01:02:27 +05:30
  • fe0b023580 revent WorkArea modal from closing after form submission Pramod Mahajan 2025-05-02 17:26:49 +05:30
  • f98efe4b38 prevent close createTask modal Pramod Mahajan 2025-05-02 17:14:39 +05:30
  • 5cc5ff49c2 sorted all dropdown list Pramod Mahajan 2025-05-03 10:07:18 +05:30
  • 5e3ef399b2 sorted activity list in ascedning order. Pramod Mahajan 2025-05-03 09:38:31 +05:30
  • df4d66413d added Toast and modal open until not close using button Pramod Mahajan 2025-05-03 01:28:30 +05:30
  • 4037fb76fd removed debugger and close modal fun Pramod Mahajan 2025-05-03 01:03:45 +05:30
  • b039bf345b added Toast and modal not close until click on close button Pramod Mahajan 2025-05-03 01:02:27 +05:30
  • 9a923732ba revent WorkArea modal from closing after form submission Pramod Mahajan 2025-05-02 17:26:49 +05:30
  • 130000f05f prevent close createTask modal Pramod Mahajan 2025-05-02 17:14:39 +05:30
  • 55fed17fe2 removed unused ModalContext Pramod Mahajan 2025-05-02 14:28:27 +05:30
  • c3d3529d34 view button color changed, success to seconday Pramod Mahajan 2025-05-02 14:27:32 +05:30
  • 062f0d98d5 added sorting group by name, checkIn , checkOut, regularize, approved and reject Pramod Mahajan 2025-05-02 14:26:52 +05:30
  • 8e04dd2191 added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day. Pramod Mahajan 2025-05-02 14:25:10 +05:30
  • cb2950338c added one more codition if emp checkIn and checkOut and checkout day is current , so ee can able to checkIn otherwise their attendance approved of that day Pramod Mahajan 2025-05-02 14:23:18 +05:30
  • 9b045ec727 Merge pull request 'remove accordion functionality from DailyTask component' (#56) from pramod_Bug#135 into Issues_April_5W Vikas Nale 2025-05-02 04:51:46 +00:00
  • 8b9206ec74 remove accordion functionality from DailyTask component Pramod Mahajan 2025-04-30 20:53:06 +05:30
  • f8c39cce66 Merge pull request 'add required validation for plannedTask using Zod schema' (#55) from pramod_bug138 into Issues_April_5W Vikas Nale 2025-05-02 04:49:11 +00:00
  • 22be64d393 update TimePicker slot logic based on check-in and check-out time conditions Pramod Mahajan 2025-05-01 02:40:11 +05:30
  • 4e2c7e2adb config checkIn and checkout in handleModalData for which slots show to user Pramod Mahajan 2025-05-01 02:39:08 +05:30
  • 6372362a33 passed checkout time to timepicker as props Pramod Mahajan 2025-05-01 02:37:53 +05:30
  • ceba57884c thresh_hold chnaged Pramod Mahajan 2025-05-01 02:36:37 +05:30
  • 82a40165e0 remove accordion functionality from DailyTask component Pramod Mahajan 2025-04-30 20:53:06 +05:30
  • d966cbe23e add required validation for plannedTask using Zod schema Pramod Mahajan 2025-04-30 18:24:35 +05:30
  • 101565e4ae add required validation for plannedTask using Zod schema pramod_Bug#128 Pramod Mahajan 2025-04-30 17:20:59 +05:30
  • 852b95d7ee Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#128 Pramod Mahajan 2025-04-30 17:19:18 +05:30
  • 26ab62cb3b Merge pull request 'pramod_Bug#128' (#54) from pramod_Bug#128 into Issues_April_5W Vikas Nale 2025-04-30 11:25:39 +00:00
  • 047fcc3222 Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit Pramod Mahajan 2025-04-30 16:08:44 +05:30
  • 655967746f handle modal visibility with React state instead of Bootstrap Pramod Mahajan 2025-04-30 16:03:48 +05:30
  • 84f0e52f90 Merge pull request 'pramod_Bug#126ManageRole - Role selection UI bugs, empty state handling, and async refactor' (#53) from pramod_Bug#126ManageRole into Issues_April_5W Vikas Nale 2025-04-30 11:25:17 +00:00
  • d262244358 Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit Pramod Mahajan 2025-04-30 16:08:44 +05:30
  • 4f13b70ed8 handle modal visibility with React state instead of Bootstrap Pramod Mahajan 2025-04-30 16:03:48 +05:30
  • 58c3f22744 time slot should display according activity Pramod Mahajan 2025-04-30 13:30:00 +05:30
  • ee2d44b5fc fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await Pramod Mahajan 2025-04-30 00:03:08 +05:30
  • 75507707c0 Handle role deselection and employee switching Pramod Mahajan 2025-04-29 23:56:36 +05:30
  • fec6de8a54 removed console Pramod Mahajan 2025-04-29 23:54:59 +05:30
  • 0b797a8c58 Add ErrorPage component to handle route errors Pramod Mahajan 2025-04-29 11:05:18 +05:30
  • 7e45f6c429 Fixed issue where logged-in users couldn't select future time slots Pramod Mahajan 2025-04-29 11:04:21 +05:30
  • c53aa1ec92 Add activity column to logs for clearer action tracking Pramod Mahajan 2025-04-29 00:56:01 +05:30
  • 4f1cf7c0a5 Update logs to reflect check-in/check-out operations immediately Pramod Mahajan 2025-04-29 00:54:31 +05:30
  • 054ef8fd17 Updated TimePicker to disable future times and allow only current or past selections Pramod Mahajan 2025-04-29 00:51:31 +05:30
  • 5b88c86df5 added Spinning Animation for refresh button Pramod Mahajan 2025-04-29 00:49:52 +05:30
  • f42b2d2724 clean up unused code Pramod Mahajan 2025-04-29 00:48:58 +05:30
  • 6b241b14de Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active Pramod Mahajan 2025-04-29 00:47:32 +05:30
  • 6dc30f8e2a modified project/team api, it can fromdate to todate Pramod Mahajan 2025-04-29 00:43:10 +05:30
  • bf7adc2cc6 immediately update log attendances after marking attendance Pramod Mahajan 2025-04-29 00:41:16 +05:30
  • 9b742a2f7f removed console Pramod Mahajan 2025-04-28 12:04:33 +05:30
  • 4a2dcd82d4 comment default option -select a Job role. Pramod Mahajan 2025-04-28 12:02:40 +05:30
  • d88fd3180f modified request for manage role. Pramod Mahajan 2025-04-28 11:36:34 +05:30
  • a84cb355c8 changed image and directory icons Pramod Mahajan 2025-04-28 09:27:49 +05:30
  • fbc9ba7ae4 updated master activity api url Pramod Mahajan 2025-04-28 09:27:05 +05:30
  • b595fe6a0f added id in roles obj request Pramod Mahajan 2025-04-26 22:56:59 +05:30
  • 66703de72e changed btn size. to sm Pramod Mahajan 2025-04-26 18:43:06 +05:30
  • 1ca337067a fixed previous role feature to current user role. Pramod Mahajan 2025-04-26 18:31:20 +05:30
  • 3777d4b7c5 set default view is cards Pramod Mahajan 2025-04-26 18:25:02 +05:30
  • c0a766e7e1 Email field will be empty once response is received. Pramod Mahajan 2025-04-26 18:17:56 +05:30
  • c900dc80a9 hide uneccessary msg or fixed loading condition for create new employee Pramod Mahajan 2025-04-26 18:15:49 +05:30
  • 162c91c1aa Merge pull request 'pramod_Task#105' (#52) from pramod_Task#105 into Issues_April_4W Gitea Admin 2025-04-25 11:02:03 +00:00
  • dbd84def0d remove unnecessary stuff Pramod Mahajan 2025-04-25 12:36:59 +05:30
  • 8c96edea17 added new directory page for conatct -list page Pramod Mahajan 2025-04-25 12:32:51 +05:30
  • 98a327fbb6 added new one route -directory Pramod Mahajan 2025-04-25 12:32:04 +05:30
  • c3e75f3f48 changed Status-filter icon size Pramod Mahajan 2025-04-25 12:31:25 +05:30
  • d08b64dc3b added new directory tab Pramod Mahajan 2025-04-25 12:30:02 +05:30
  • a1a3da61db new directory components Pramod Mahajan 2025-04-25 12:29:36 +05:30
  • 786a5a689e made custome TagInput. Pramod Mahajan 2025-04-25 12:28:56 +05:30
  • 3160da69d2 added one more css property radius Pramod Mahajan 2025-04-25 12:28:30 +05:30
  • a7e9605ae3 added css for scroll bar modified Pramod Mahajan 2025-04-25 12:26:56 +05:30
  • a2f6d77dcd Merge pull request 'pramod_Feature#51ProjectLisFilter' (#51) from pramod_Feature#51ProjectLisFilter into Issues_April_4W Gitea Admin 2025-04-25 11:00:43 +00:00
  • a92a041333 Prevent multiple API calls and display correct data for selected project Pramod Mahajan 2025-04-24 11:54:00 +05:30
  • d2d1c3cc86 default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions. Pramod Mahajan 2025-04-24 10:31:40 +05:30
  • f2f7898970 joining date will no wrap Pramod Mahajan 2025-04-24 10:26:31 +05:30
  • b53286672a remove unnecessary stuff Pramod Mahajan 2025-04-25 12:36:59 +05:30
  • de231145d4 added new directory page for conatct -list page Pramod Mahajan 2025-04-25 12:32:51 +05:30
  • 8eab23bb36 added new one route -directory Pramod Mahajan 2025-04-25 12:32:04 +05:30
  • 0a200f5aa3 changed Status-filter icon size Pramod Mahajan 2025-04-25 12:31:25 +05:30
  • 3bda6b5ceb added new directory tab Pramod Mahajan 2025-04-25 12:30:02 +05:30
  • a08089d1b9 new directory components Pramod Mahajan 2025-04-25 12:29:36 +05:30
  • 15aa726857 made custome TagInput. Pramod Mahajan 2025-04-25 12:28:56 +05:30
  • 3563c0a857 added one more css property radius Pramod Mahajan 2025-04-25 12:28:30 +05:30
  • 77b7faa875 added css for scroll bar modified Pramod Mahajan 2025-04-25 12:26:56 +05:30
  • dbfd536ba3 Prevent multiple API calls and display correct data for selected project Pramod Mahajan 2025-04-24 11:54:00 +05:30
  • 2dd324e725 Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter Pramod Mahajan 2025-04-24 11:09:02 +05:30
  • e102abb117 default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions. Pramod Mahajan 2025-04-24 10:31:40 +05:30
  • fd9a02aa4f joining date will no wrap Pramod Mahajan 2025-04-24 10:26:31 +05:30
  • b30f3b8d98 Merge pull request 'pramod_Feature#51ProjectLisFilter' (#50) from pramod_Feature#51ProjectLisFilter into Issues_April_4W Gitea Admin 2025-04-23 09:05:08 +00:00
  • 3ee5a71cc9 added status and search filter filter Pramod Mahajan 2025-04-23 12:16:40 +05:30
  • c61cb3bb63 added userPermissions Pramod Mahajan 2025-04-23 12:14:30 +05:30
  • 38fbc6dc84 reafactor code for reuasability Pramod Mahajan 2025-04-23 11:08:02 +05:30