admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 637b7990f5 added limitation for phone no Pramod Mahajan 2025-04-19 22:45:15 +05:30
  • 4ba3b0e5a9 Merge pull request 'Pramod_Bug#80' (#38) from Pramod_Bug#80 into Issues_April_4W Vikas Nale 2025-04-20 08:32:14 +00:00
  • f76a3660cc added icons for dropdown Pramod Mahajan 2025-04-19 22:12:45 +05:30
  • 4182cd9077 modified response format Pramod Mahajan 2025-04-19 22:12:12 +05:30
  • 80fe6d64d1 modified response format Pramod Mahajan 2025-04-19 22:11:45 +05:30
  • 0798a12598 added character limitation Pramod Mahajan 2025-04-19 22:11:15 +05:30
  • 5e40817f3c clear cache after update or new create employee. and added character limitation for address and email Pramod Mahajan 2025-04-19 22:10:26 +05:30
  • ebb20b0612 Merge pull request 'Refactor token validation and refresh logic in ProtectedRoute component' (#37) from Vaibhav_Bug-#95 into Issues_April_4W Vikas Nale 2025-04-20 08:27:33 +00:00
  • c6b11b8979 Refresh Token Condition changes Vikas Nale 2025-04-20 13:57:02 +05:30
  • 9dc53d1dba Refactor token validation and refresh logic in ProtectedRoute component Vaibhav Surve 2025-04-19 17:51:53 +05:30
  • 682f3312d0 Refresh Token Condition changes Vikas Nale 2025-04-20 13:57:02 +05:30
  • 5663a0f071 removed condiational vaiable and added tooltip for edit and delet icon. Pramod Mahajan 2025-04-20 13:49:05 +05:30
  • 1b03ea646d Fetched workItem from cache instead of props to resolve state inconsistency issue. Pramod Mahajan 2025-04-20 13:47:30 +05:30
  • dc5f452881 Fixed state sync issue by clearing cache and re-fetching project data after task creation. Pramod Mahajan 2025-04-20 13:44:47 +05:30
  • c3faca41e2 Merge pull request 'Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components' (#36) from Ashutosh_Bug#94_Rename_CheckList_Variable into Issues_April_4W Vikas Nale 2025-04-20 06:44:08 +00:00
  • 5ceb7eebaf Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components ashutosh.nehete 2025-04-19 17:21:58 +05:30
  • 4f2dc1c6a0 Merge pull request 'added task compeleted and planned work data' (#35) from pramod_Bug#93ProjectOverview into Issues_April_4W Vikas Nale 2025-04-20 06:42:55 +00:00
  • aada35e6ea added task compeleted and planned work data Pramod Mahajan 2025-04-19 17:03:18 +05:30
  • ad9358f38e Merge pull request 'Fixed the bug of mismatch dates where dates showing one day earlier than expected' (#34) from Ashutosh_Bug#92_Date_MisMatch into Issues_April_4W Vikas Nale 2025-04-20 06:38:21 +00:00
  • b475cb0d7e added limitation for phone no Pramod Mahajan 2025-04-19 22:45:15 +05:30
  • addf44847a added icons for dropdown Pramod Mahajan 2025-04-19 22:12:45 +05:30
  • 61542e6d4f modified response format Pramod Mahajan 2025-04-19 22:12:12 +05:30
  • 7df16d0b59 modified response format Pramod Mahajan 2025-04-19 22:11:45 +05:30
  • ee07d73ee4 added character limitation Pramod Mahajan 2025-04-19 22:11:15 +05:30
  • 37b74270cd clear cache after update or new create employee. and added character limitation for address and email Pramod Mahajan 2025-04-19 22:10:26 +05:30
  • d48da2ea8f Refactor token validation and refresh logic in ProtectedRoute component Vaibhav Surve 2025-04-19 17:51:53 +05:30
  • 83d4103da7 Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components ashutosh.nehete 2025-04-19 17:21:58 +05:30
  • 070d01856b added task compeleted and planned work data Pramod Mahajan 2025-04-19 17:03:18 +05:30
  • 68b23c8d5e Fixed the bug of mismatch dates where dates showing one day earlier than expected ashutosh.nehete 2025-04-19 16:36:21 +05:30
  • 8d4c9e4f39 Adjust font style for floor in infra grid if no workarea defined Vikas Nale 2025-04-19 15:59:26 +05:30
  • 7627b13cc8 spell mistake Vikas Nale 2025-04-19 12:51:19 +05:30
  • 2f09c947a0 Move request demo api to separate market controller Vikas Nale 2025-04-19 12:38:29 +05:30
  • ad449d6e5c Modified css ad adjust padding for popup after adding new css Vikas Nale 2025-04-19 11:35:02 +05:30
  • e236e4f5bf Merge branch 'Ashutosh_Task#67_Request_Demo' into Feature_Task_Management Vikas Nale 2025-04-19 11:06:14 +05:30
  • 49cf2db206 Merge pull request 'pramod_Task#69NavigateDailyTaskFormProjectCard' (#33) from pramod_Task#69NavigateDailyTaskFormProjectCard into Feature_Task_Management Vikas Nale 2025-04-19 05:29:34 +00:00
  • ef87bd4d64 implement url and add route at /activities/records and enpty Pramod Mahajan 2025-04-19 01:49:45 +05:30
  • 28437c3a9e this component read projectId from the URL using useSearchParams. Pramod Mahajan 2025-04-19 01:46:55 +05:30
  • 0fc7f6e404 added activity url with perticular project Pramod Mahajan 2025-04-19 01:43:11 +05:30
  • a38d811603 Merge branch 'pramod_Bug#29InputLimmit' into Feature_Task_Management Vikas Nale 2025-04-19 10:58:10 +05:30
  • c5d092802b Merge pull request 'pramod_Bug#87DailyTask' (#31) from pramod_Bug#87DailyTask into Feature_Task_Management Vikas Nale 2025-04-19 04:54:44 +00:00
  • b4802ff3c1 updated cache format for one project about Pramod Mahajan 2025-04-18 19:47:38 +05:30
  • fb774f45d1 modified cache for immiedtky reflacted on screen. Pramod Mahajan 2025-04-18 19:46:33 +05:30
  • b458ac4780 added new util fun that genearte new unique color for each item. Pramod Mahajan 2025-04-18 19:44:05 +05:30
  • f7ffd171a4 Merge pull request 'Vaibhav_Task-#89' (#29) from Vaibhav_Task-#89 into Feature_Task_Management Vikas Nale 2025-04-19 04:52:04 +00:00
  • 77a4154ec9 implement url and add route at /activities/records and enpty Pramod Mahajan 2025-04-19 01:49:45 +05:30
  • c412bf6e98 this component read projectId from the URL using useSearchParams. Pramod Mahajan 2025-04-19 01:46:55 +05:30
  • 9c977086ca added activity url with perticular project Pramod Mahajan 2025-04-19 01:43:11 +05:30
  • 62887548cf added validation for address, user can't add more than 500 characters. Pramod Mahajan 2025-04-18 23:48:09 +05:30
  • 8715d8e94e added validation for mobile no , address and panCard no, user can't add more than 12 no. and any special or letter character and can't add more than 500 character for address Pramod Mahajan 2025-04-18 23:26:50 +05:30
  • 868f5038b0 added validation for character limit, user can't add more than 200 character for description Pramod Mahajan 2025-04-18 23:23:10 +05:30
  • cb0d7949ba updated cache format for one project about Pramod Mahajan 2025-04-18 19:47:38 +05:30
  • 79e690c4f5 modified cache for immiedtky reflacted on screen. Pramod Mahajan 2025-04-18 19:46:33 +05:30
  • e5b8ec03df added new util fun that genearte new unique color for each item. Pramod Mahajan 2025-04-18 19:44:05 +05:30
  • 0019128daf Create form to request demo of application ashutosh.nehete 2025-04-18 18:18:20 +05:30
  • 0cfe9cb917 Update character count messages to use "characters left" for clarity Vaibhav Surve 2025-04-18 17:44:59 +05:30
  • 48d589d92c Add character length tracking for project address and description fields Vaibhav Surve 2025-04-18 17:41:03 +05:30
  • 4a16e27a1e Add character length tracking for address and description fields in employee management forms Vaibhav Surve 2025-04-18 17:40:47 +05:30
  • 7308bd8d03 Merge pull request 'Header_UI_Enhancement' (#28) from Header_UI_Enhancement into Feature_Task_Management Vikas Nale 2025-04-18 11:38:57 +00:00
  • 23e220b7bc spell correction Vikas Nale 2025-04-18 17:07:41 +05:30
  • 920692d5aa Modify UX and font size, menu vertical spacing with new sneat css v3.0.1 Vikas Nale 2025-04-18 17:03:07 +05:30
  • cdc9cf7376 Minor ui changes Vikas Nale 2025-04-17 18:20:56 +05:30
  • bd3e37428d add UI enhancements - Add shortcut cart icon in header - add notification icon in header Update new core.css Vikas Nale 2025-04-17 13:34:18 +05:30
  • 8b332d4e95 spell correction Vikas Nale 2025-04-18 17:07:41 +05:30
  • 29ae5c5353 Modify UX and font size, menu vertical spacing with new sneat css v3.0.1 Vikas Nale 2025-04-18 17:03:07 +05:30
  • 2c58dedde6 Merge pull request 'Add Legal Information page and update routing for legal info access' (#27) from Vaibhav_Task-#66 into Feature_Task_Management Vikas Nale 2025-04-18 11:23:39 +00:00
  • 55873269da Add Legal Information page and update routing for legal info access Vaibhav Surve 2025-04-18 16:28:24 +05:30
  • c5bfacda3b Merge pull request 'upadated application cache key in createrole' (#26) from pramod_bug#91 into Feature_Task_Management pramod.mahajan 2025-04-18 07:55:17 +00:00
  • 1a1c94667c upadated application cache key in createrole Pramod Mahajan 2025-04-18 13:21:33 +05:30
  • e0500d1e76 revert 21e6b10ad11210a999d9ab82c5b110e408563ac7 vaibhav.surve 2025-04-18 07:14:37 +00:00
  • 564b1d52c2 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#91ApplicationRole Pramod Mahajan 2025-04-18 12:20:35 +05:30
  • 21e6b10ad1 updated Application role key in cache when when creating new role Pramod Mahajan 2025-04-18 12:19:50 +05:30
  • 7324a7a6bc Merge pull request 'Vaibhav_Task-#90' (#24) from Vaibhav_Task-#90 into Feature_Task_Management vaibhav.surve 2025-04-18 06:49:01 +00:00
  • f6b5b78d2d Add export functionality for employee data in various formats Vaibhav Surve 2025-04-18 12:13:47 +05:30
  • 95ddc91f5f Add PDF and Excel export functionality to tableExportUtils Vaibhav Surve 2025-04-18 12:13:39 +05:30
  • 12e379c6f2 Minor ui changes Vikas Nale 2025-04-17 18:20:56 +05:30
  • a23e87105a Merge branch 'Header_UI_Enhancement' of https://git.marcoaiot.com/admin/marco.pms.web into Header_UI_Enhancement Vikas Nale 2025-04-17 17:54:47 +05:30
  • fdc20d948d add UI enhancements - Add shortcut cart icon in header - add notification icon in header Update new core.css Vikas Nale 2025-04-17 13:34:18 +05:30
  • b963f6bad9 Fix loading error. Hide existing content and then show loading Vikas Nale 2025-04-17 17:52:09 +05:30
  • 1418f84976 Remove warnings Vikas Nale 2025-04-17 17:29:18 +05:30
  • 83b6c2a307 Merge branch 'pramod_Enhancement#86_plannedDisplayInReport' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#86_plannedDisplayInReport Vikas Nale 2025-04-17 16:27:07 +05:30
  • 35c54fb48a removed unnecessary code Pramod Mahajan 2025-04-17 13:25:29 +05:30
  • 05d36a920b added one more field plannedTask inside Task Report Pramod Mahajan 2025-04-17 12:06:00 +05:30
  • 2a221ecf91 refactor(EmployeeNav): update class names for nav links and correct label for account Vaibhav Surve 2025-04-16 11:11:47 +05:30
  • d6b31c3c81 Merge pull request 'modified master name Role -> Application Role. inside ManageRole component.' (#21) from pramod_Bug#83_ManageRole into Feature_Task_Management Vikas Nale 2025-04-17 10:46:29 +00:00
  • fb7c2cd1f4 removed console Pramod Mahajan 2025-04-17 10:38:54 +05:30
  • 9753e0f85a Merge pull request 'pramod_Task#68_projectListInAscending' (#20) from pramod_Task#68_projectListInAscending into Feature_Task_Management Vikas Nale 2025-04-17 10:42:24 +00:00
  • d2648d83f0 added sorting by - group by status and name Pramod Mahajan 2025-04-17 01:23:19 +05:30
  • 0e7c54e09f Adding missed change during merge conflict Vikas Nale 2025-04-17 16:08:32 +05:30
  • ea93f62faf Merge branch 'pramod_Enhancement#76_ImproveEmpl_ListView' into Feature_Task_Management Vikas Nale 2025-04-17 16:05:46 +05:30
  • a243119396 Merge pull request 'added checklist in Activity master' (#18) from pramod_Tas#53_Activity into Feature_Task_Management Vikas Nale 2025-04-17 10:28:07 +00:00
  • 23d676c96a added sorting in ascending order Pramod Mahajan 2025-04-16 23:18:54 +05:30
  • fe936671b9 add UI enhancements - Add shortcut cart icon in header - add notification icon in header Update new core.css Vikas Nale 2025-04-17 13:34:18 +05:30
  • c1b972a759 removed unnecessary code Pramod Mahajan 2025-04-17 13:25:29 +05:30
  • 3c993221f3 added one more field plannedTask inside Task Report Pramod Mahajan 2025-04-17 12:06:00 +05:30
  • abe53bab7f added vlidation for Emergency ContactPerson field. this field accept only letter. Pramod Mahajan 2025-04-17 11:24:20 +05:30
  • 15b1979485 manageRole - application role display properly. Pramod Mahajan 2025-04-17 10:08:08 +05:30
  • 6698187133 Create an empty object of checklist for passing it to API ashutosh.nehete 2025-04-16 10:59:38 +05:30
  • 1ff1acf97a Created a dummy checklist object in report task page for sending it to API ashutosh.nehete 2025-04-15 18:10:50 +05:30
  • b9e3c3b4f8 Include reverted changes during merge Vikas Nale 2025-04-16 16:16:06 +05:30
  • 66324132e1 refactor: clean up Header component for improved readability Vaibhav Surve 2025-04-16 15:55:53 +05:30