115 Commits

Author SHA1 Message Date
Pramod Mahajan
fb7c2cd1f4 removed console 2025-04-17 10:46:29 +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
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
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
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
9306c12296 refactor(EmployeeNav): update class names for nav links and correct label for account 2025-04-16 10:35:47 +00:00
e93c39f22f remove redundant type attribute from button in Dashboard component 2025-04-16 10:35:47 +00:00
64904c3cee - 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-16 16:00:48 +05:30
88a60a7c48 - 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-16 15:31:38 +05:30
Pramod Mahajan
9708a9184c added new suspend model inside employee list 2025-04-16 09:34:40 +00:00
Pramod Mahajan
ff0595b021 customize avatar size 2025-04-16 09:34:40 +00:00
Pramod Mahajan
22a8fe580a added new suspend model inside employee list 2025-04-16 11:01:56 +05:30
Pramod Mahajan
86b58a7e41 customize avatar size 2025-04-16 11:01:02 +05:30
Pramod Mahajan
bcb273d663 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-16 00:19:30 +05:30
Pramod Mahajan
b73a7fc5ab added validation for end Date, end date should be greater than start date 2025-04-16 00:16:53 +05:30
8b8a518b12 replased nav naming and removed duplicate data 2025-04-15 18:10:17 +05:30
47bbb38683 refactor: clean up AboutProject component by removing unused contact fields 2025-04-15 18:07:47 +05:30
Pramod Mahajan
7ebd8dcc00 after assigned employee and submit, model will close 2025-04-15 17:26:16 +05:30
89df1fd9c0 update icon for Activities and rename User Management to Administration; add Inventory menu item 2025-04-15 17:20:39 +05:30
4e654444a8 add: enable legend display with reduced font size in HorizontalBarChart 2025-04-15 16:49:05 +05:30
c05f3aa0a1 fix: update card subtitle to better reflect project completion status 2025-04-15 16:43:45 +05:30
dd697b47b5 add line chart date formatting based on sorted dashboard data 2025-04-15 16:38:26 +05:30
9a5bf23712 refactor: remove unnecessary class from time range buttons in Dashboard 2025-04-15 16:29:22 +05:30
b57b46440d add font size adjustment for chart labels in HorizontalBarChart 2025-04-15 16:29:11 +05:30
19df5a55ff dynamically adjust chart height and bar height based on data points in HorizontalBarChart 2025-04-15 15:36:52 +05:30
Pramod Mahajan
30a9908499 changed Task Report UI 2025-04-15 02:58:01 +05:30
Pramod Mahajan
d1c36dfd97 Changed 'Role' to 'Application Role' 2025-04-15 01:08:59 +05:30
Pramod Mahajan
57272eb894 chanaged activityName validation msg 2025-04-15 01:02:15 +05:30
Pramod Mahajan
5f094aa2e6 added CreateActivity and EditActivity components. 2025-04-15 00:36:20 +05:30
Pramod Mahajan
6df20de749 it will take default range date, initially whenever component mount 2025-04-14 22:53:38 +05:30
Pramod Mahajan
23223661f0 removed console 2025-04-14 20:14:25 +05:30
Pramod Mahajan
409c80471a removed href-# 2025-04-14 20:07:59 +05:30
Pramod Mahajan
a100194508 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-14 20:05:40 +05:30
Pramod Mahajan
d421355451 added to tooltip in projectCard view more button 2025-04-14 20:05:16 +05:30
87c110a6af Add UI changes for dashboard.
- Reduce dropdown font
- sort project list
2025-04-14 17:59:43 +05:30
Pramod Mahajan
777b8d8d0b set up deafult dates 2025-04-14 17:30:29 +05:30
Pramod Mahajan
2a873f5d30 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-14 16:49:41 +05:30
Pramod Mahajan
e9d3a746aa updated address character length 150 to 500 2025-04-14 16:49:14 +05:30
9c47b05d64 update HorizontalBarChart styles: change data label position to top and add border radius 2025-04-14 11:59:51 +05:30
aa70c5d1da enhance LineChart options and improve Dashboard date handling 2025-04-14 11:59:36 +05:30
Pramod Mahajan
4c2fbf7bc6 made sepearte dataPickers 2025-04-13 17:26:36 +05:30
Pramod Mahajan
1151c81c99 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-11 17:55:16 +05:30
Pramod Mahajan
40843489d3 changed model size 2025-04-11 17:54:46 +05:30
Pramod Mahajan
ff5a772067 api integrated 2025-04-11 17:39:02 +05:30