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
Pramod Mahajan
05d36a920b
added one more field plannedTask inside Task Report
2025-04-17 16:25:21 +05:30
2a221ecf91
refactor(EmployeeNav): update class names for nav links and correct label for account
2025-04-17 16:25:21 +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
...
Reviewed-on: #21
2025-04-17 10:46:29 +00:00
Pramod Mahajan
fb7c2cd1f4
removed console
2025-04-17 10:46:29 +00:00
9753e0f85a
Merge pull request 'pramod_Task#68_projectListInAscending' ( #20 ) from pramod_Task#68_projectListInAscending into Feature_Task_Management
...
Reviewed-on: #20
2025-04-17 10:42:24 +00:00
Pramod Mahajan
d2648d83f0
added sorting by - group by status and name
2025-04-17 10:42:24 +00:00
0e7c54e09f
Adding missed change during merge conflict
2025-04-17 16:08:32 +05:30
ea93f62faf
Merge branch 'pramod_Enhancement#76_ImproveEmpl_ListView' into Feature_Task_Management
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
...
Reviewed-on: #18
2025-04-17 10:28:07 +00:00
Pramod Mahajan
23d676c96a
added sorting in ascending order
2025-04-17 10:28:07 +00:00
Pramod Mahajan
c1b972a759
removed unnecessary code
2025-04-17 13:25:29 +05:30
Pramod Mahajan
3c993221f3
added one more field plannedTask inside Task Report
2025-04-17 12:06:00 +05:30
Pramod Mahajan
abe53bab7f
added vlidation for Emergency ContactPerson field. this field accept only letter.
2025-04-17 12:04:37 +05:30
Pramod Mahajan
15b1979485
manageRole - application role display properly.
2025-04-17 12:04:37 +05:30
6698187133
Create an empty object of checklist for passing it to API
2025-04-17 12:04:36 +05:30
1ff1acf97a
Created a dummy checklist object in report task page for sending it to API
2025-04-17 12:04:36 +05:30
b9e3c3b4f8
Include reverted changes during merge
2025-04-17 12:04:36 +05:30
66324132e1
refactor: clean up Header component for improved readability
2025-04-17 12:04:36 +05:30
6ab45d10e4
refactor: optimize Avatar component for better performance and readability
2025-04-17 12:04:36 +05:30
78a7b261c3
refactor: update EmployeeProfile component layout and add employee details table
2025-04-17 12:04:36 +05:30
c897443dd7
refactor(EmployeeProfile): integrate Avatar component for user display and enhance contact information layout
2025-04-17 12:04:36 +05:30
876e2de755
refactor(EmployeeNav): update class names for nav links and correct label for account
2025-04-17 12:04:36 +05:30
753545aa8a
remove redundant type attribute from button in Dashboard component
2025-04-17 12:04:17 +05:30
Pramod Mahajan
4c491c071d
changed export dropdown option and add new model for suspend employee
2025-04-17 12:04:17 +05:30
Pramod Mahajan
915d68aa91
added new suspend model inside employee list
2025-04-17 12:04:17 +05:30
Pramod Mahajan
a63765566b
customize avatar size
2025-04-17 12:04:17 +05:30
c93919602e
- Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
...
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-17 12:04:17 +05:30
aeedfe23da
- Modify Font sizes to suit the theme
...
- Change gay color of grid to match the theme
- realign floor and workarea lebel for visual clearity
- remove background color with the message "No floor added to the building, please add new floor to start working'
2025-04-17 12:04:17 +05:30
Pramod Mahajan
b400acf23f
added vlidation for Emergency ContactPerson field. this field accept only letter.
2025-04-17 11:24:20 +05:30
Pramod Mahajan
eb3f2a70af
manageRole - application role display properly.
2025-04-17 10:08:08 +05:30
Pramod Mahajan
a8357872f0
added sorting by name(firstName +lastName)
2025-04-17 00:00:36 +05:30
191b9026a8
Merge pull request 'Created an empty object of checklist in report task component' ( #14 ) from Ashutosh_ReportTask_DummyObject into Feature_Task_Management
...
Reviewed-on: #14
2025-04-16 11:44:38 +00:00
07b14cc0d2
Create an empty object of checklist for passing it to API
2025-04-16 11:44:38 +00:00
0101f694fc
Created a dummy checklist object in report task page for sending it to API
2025-04-16 11:44:38 +00:00
e60be01d97
Include reverted changes during merge
2025-04-16 16:16:06 +05:30
0c48ae70b8
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
2025-04-16 16:13:12 +05:30
51ac6cf65f
Merge branch 'vikas_78_infra_ui_enhancement' into Feature_Task_Management
2025-04-16 16:11:55 +05:30
d1011fd5ec
Merge pull request 'Vaibhav_Task#77' ( #16 ) from Vaibhav_Task#77 into Feature_Task_Management
...
Reviewed-on: #16
2025-04-16 10:35:47 +00:00
dcc6b80f12
refactor: clean up Header component for improved readability
2025-04-16 10:35:47 +00:00
6bf8fcf9a2
refactor: optimize Avatar component for better performance and readability
2025-04-16 10:35:47 +00:00
