ebb20b0612
Merge pull request 'Refactor token validation and refresh logic in ProtectedRoute component' ( #37 ) from Vaibhav_Bug-#95 into Issues_April_4W
...
Reviewed-on: #37
2025-04-20 08:27:33 +00:00
c6b11b8979
Refresh Token Condition changes
2025-04-20 08:27:33 +00:00
9dc53d1dba
Refactor token validation and refresh logic in ProtectedRoute component
2025-04-20 08:27:33 +00:00
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
...
Reviewed-on: #36
2025-04-20 06:44:08 +00:00
5ceb7eebaf
Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components
2025-04-20 06:44:08 +00:00
4f2dc1c6a0
Merge pull request 'added task compeleted and planned work data' ( #35 ) from pramod_Bug#93ProjectOverview into Issues_April_4W
...
Reviewed-on: #35
2025-04-20 06:42:55 +00:00
Pramod Mahajan
aada35e6ea
added task compeleted and planned work data
2025-04-20 06:42:55 +00:00
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
...
Reviewed-on: #34
2025-04-20 06:38:21 +00:00
68b23c8d5e
Fixed the bug of mismatch dates where dates showing one day earlier than expected
2025-04-19 16:36:21 +05:30
8d4c9e4f39
Adjust font style for floor in infra grid if no workarea defined
2025-04-19 15:59:26 +05:30
7627b13cc8
spell mistake
2025-04-19 12:51:19 +05:30
2f09c947a0
Move request demo api to separate market controller
2025-04-19 12:38:29 +05:30
ad449d6e5c
Modified css ad adjust padding for popup after adding new css
2025-04-19 11:35:02 +05:30
e236e4f5bf
Merge branch 'Ashutosh_Task#67_Request_Demo' into Feature_Task_Management
2025-04-19 11:06:14 +05:30
49cf2db206
Merge pull request 'pramod_Task#69NavigateDailyTaskFormProjectCard' ( #33 ) from pramod_Task#69NavigateDailyTaskFormProjectCard into Feature_Task_Management
...
Reviewed-on: #33
2025-04-19 05:29:34 +00:00
Pramod Mahajan
ef87bd4d64
implement url and add route at /activities/records and enpty
2025-04-19 05:29:34 +00:00
Pramod Mahajan
28437c3a9e
this component read projectId from the URL using useSearchParams.
2025-04-19 05:29:34 +00:00
Pramod Mahajan
0fc7f6e404
added activity url with perticular project
2025-04-19 05:29:34 +00:00
a38d811603
Merge branch 'pramod_Bug#29InputLimmit' into Feature_Task_Management
2025-04-19 10:58:10 +05:30
c5d092802b
Merge pull request 'pramod_Bug#87DailyTask' ( #31 ) from pramod_Bug#87DailyTask into Feature_Task_Management
...
Reviewed-on: #31
2025-04-19 04:54:44 +00:00
Pramod Mahajan
b4802ff3c1
updated cache format for one project about
2025-04-19 04:54:44 +00:00
Pramod Mahajan
fb774f45d1
modified cache for immiedtky reflacted on screen.
2025-04-19 04:54:44 +00:00
Pramod Mahajan
b458ac4780
added new util fun that genearte new unique color for each item.
2025-04-19 04:54:44 +00:00
f7ffd171a4
Merge pull request 'Vaibhav_Task-#89' ( #29 ) from Vaibhav_Task-#89 into Feature_Task_Management
...
Reviewed-on: #29
2025-04-19 04:52:04 +00:00
Pramod Mahajan
62887548cf
added validation for address, user can't add more than 500 characters.
2025-04-18 23:48:09 +05:30
Pramod Mahajan
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
2025-04-18 23:26:50 +05:30
Pramod Mahajan
868f5038b0
added validation for character limit, user can't add more than 200 character for description
2025-04-18 23:23:10 +05:30
0019128daf
Create form to request demo of application
2025-04-18 18:18:20 +05:30
0cfe9cb917
Update character count messages to use "characters left" for clarity
2025-04-18 17:44:59 +05:30
48d589d92c
Add character length tracking for project address and description fields
2025-04-18 17:41:03 +05:30
4a16e27a1e
Add character length tracking for address and description fields in employee management forms
2025-04-18 17:40:47 +05:30
7308bd8d03
Merge pull request 'Header_UI_Enhancement' ( #28 ) from Header_UI_Enhancement into Feature_Task_Management
...
Reviewed-on: #28
2025-04-18 11:38:57 +00:00
23e220b7bc
spell correction
2025-04-18 11:38:57 +00:00
920692d5aa
Modify UX and font size, menu vertical spacing with new sneat css v3.0.1
2025-04-18 11:38:57 +00:00
cdc9cf7376
Minor ui changes
2025-04-18 11:38:57 +00:00
bd3e37428d
add UI enhancements
...
- Add shortcut cart icon in header
- add notification icon in header
Update new core.css
2025-04-18 11:38:57 +00:00
2c58dedde6
Merge pull request 'Add Legal Information page and update routing for legal info access' ( #27 ) from Vaibhav_Task-#66 into Feature_Task_Management
...
Reviewed-on: #27
2025-04-18 11:23:39 +00:00
55873269da
Add Legal Information page and update routing for legal info access
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
...
Reviewed-on: #26
2025-04-18 07:55:17 +00:00
Pramod Mahajan
1a1c94667c
upadated application cache key in createrole
2025-04-18 13:21:33 +05:30
e0500d1e76
revert 21e6b10ad11210a999d9ab82c5b110e408563ac7
...
Revert updated Application role key in cache when creating new role, as mistakenly, from Pramo,d the changes are pushed directly to the Feature_Task_Management
2025-04-18 07:14:37 +00:00
Pramod Mahajan
564b1d52c2
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#91ApplicationRole
2025-04-18 12:20:35 +05:30
Pramod Mahajan
21e6b10ad1
updated Application role key in cache when when creating new role
2025-04-18 12:19:50 +05:30
7324a7a6bc
Merge pull request 'Vaibhav_Task-#90' ( #24 ) from Vaibhav_Task-#90 into Feature_Task_Management
...
Reviewed-on: #24
2025-04-18 06:49:01 +00:00
f6b5b78d2d
Add export functionality for employee data in various formats
2025-04-18 12:13:47 +05:30
95ddc91f5f
Add PDF and Excel export functionality to tableExportUtils
2025-04-18 12:13:39 +05:30
b963f6bad9
Fix loading error. Hide existing content and then show loading
2025-04-17 17:52:09 +05:30
1418f84976
Remove warnings
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
2025-04-17 16:27:07 +05:30
Pramod Mahajan
35c54fb48a
removed unnecessary code
2025-04-17 16:25:22 +05:30
