|
d8a861bb08
|
feat(HorizontalBarChart): add loading state and improve label positioning
|
2025-04-11 17:22:45 +05:30 |
|
|
2b24351316
|
Merge pull request 'vaibhav_dashboard_feature' (#7) from vaibhav_dashboard_feature into Feature_Task_Management
Reviewed-on: #7
|
2025-04-11 10:39:13 +00:00 |
|
|
895e3da219
|
refactor(Dashboard): enhance project data handling and improve chart integration
|
2025-04-11 15:45:08 +05:30 |
|
|
02b0c4ccab
|
fix(LineChart): enable x-axis labels visibility and adjust styling
|
2025-04-11 15:45:02 +05:30 |
|
|
12aa5c1491
|
refactor HorizontalBarChart: streamline data handling and improve label visibility
|
2025-04-11 15:44:56 +05:30 |
|
|
51190b0d53
|
add dashboard data hooks and global repository for API interactions
|
2025-04-11 15:44:51 +05:30 |
|
Pramod Mahajan
|
f4a09c7f53
|
removed max validation for completedTask
|
2025-04-11 15:34:46 +05:30 |
|
Pramod Mahajan
|
ec80121621
|
increased length of address field - 250
|
2025-04-11 15:33:11 +05:30 |
|
Pramod Mahajan
|
c2b91b9737
|
uncomment api
|
2025-04-11 15:30:15 +05:30 |
|
Pramod Mahajan
|
a7421eb6dc
|
removed fetchActivity function , activity was needed for projectInfra, that can pass their child component TaskModel. instead of getting activity from ProjectInfra, Now TaskModel can directly calling to useMaster-Activity
|
2025-04-11 15:26:50 +05:30 |
|
Pramod Mahajan
|
8608043fb2
|
added unmount function that can be false loading flag
|
2025-04-11 15:21:01 +05:30 |
|
Pramod Mahajan
|
55b9420b6c
|
Activity master component made and is reday for api integration.
|
2025-04-11 15:13:08 +05:30 |
|
Pramod Mahajan
|
2428f15f35
|
integrated activity api and fetch in master seaction.
|
2025-04-10 03:03:38 +05:30 |
|
Pramod Mahajan
|
4a5d9c05e6
|
set checkin-out button side right
|
2025-04-10 02:50:33 +05:30 |
|
Pramod Mahajan
|
60232cf121
|
added refetch fun
|
2025-04-10 02:49:05 +05:30 |
|
Pramod Mahajan
|
9e32986969
|
remove debugger
|
2025-04-10 02:47:51 +05:30 |
|
Pramod Mahajan
|
aa6ddd7fe9
|
remove regularization request after approve or reject.
|
2025-04-10 02:46:54 +05:30 |
|
Pramod Mahajan
|
c45130b611
|
updated project-infra-each modelForm able to taking recently added item
|
2025-04-10 02:07:47 +05:30 |
|
|
67a3648227
|
Update Dashboard component: change label from "In Role" to "In Today"
|
2025-04-09 18:07:30 +05:30 |
|
|
cb3abe4831
|
Update chart components: adjust bar height in HorizontalBarChart and set stroke width in LineChart; enhance Dashboard card layout with icons and format numbers
|
2025-04-09 17:56:52 +05:30 |
|
|
c0477285e3
|
Refactor Dashboard component: replace old implementation with new charts and project overview cards
|
2025-04-09 17:37:40 +05:30 |
|
|
d0ab36799f
|
Add HorizontalBarChart and LineChart components; update package dependencies
|
2025-04-09 17:37:27 +05:30 |
|
Pramod Mahajan
|
d4452ae19a
|
fixed refresh-token error and changed forgot password text position.
|
2025-04-09 16:22:03 +05:30 |
|
|
29caa20250
|
Card changes to show days left for project
|
2025-04-09 14:44:57 +05:30 |
|
|
19abc42fc6
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-09 14:33:39 +05:30 |
|
|
bc516b58b6
|
Changed coming soon font size
|
2025-04-09 14:33:32 +05:30 |
|
Pramod Mahajan
|
308ac5af48
|
updated a project status in numbers on projectCard.
|
2025-04-09 13:57:08 +05:30 |
|
Pramod Mahajan
|
05a3b13a0e
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-09 13:44:40 +05:30 |
|
Pramod Mahajan
|
85c2401514
|
fixed progress bar and team size on project Card
|
2025-04-09 13:43:34 +05:30 |
|
|
43673cfd37
|
Fixed project modify error in project card
|
2025-04-09 13:33:54 +05:30 |
|
|
b1fd691f37
|
Add email in employee list
|
2025-04-09 13:15:11 +05:30 |
|
|
1019e9a32f
|
add ComingSoonPage component and integrate it into EmployeeProfile for placeholder content
|
2025-04-09 12:03:16 +05:30 |
|
Pramod Mahajan
|
0e7088b4d4
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-09 12:01:07 +05:30 |
|
Pramod Mahajan
|
797ff9b5bc
|
removed MISC and changed login page logo url
|
2025-04-09 12:00:50 +05:30 |
|
|
68442bdc7c
|
comment out unused functions and dropdown in Sidebar component
|
2025-04-09 11:50:44 +05:30 |
|
|
95f4443338
|
refactor ProjectCard component to improve state management and error handling
|
2025-04-09 11:50:29 +05:30 |
|
Pramod Mahajan
|
6a6f0356bc
|
remove regularization method and created new component
|
2025-04-09 11:36:49 +05:30 |
|
Pramod Mahajan
|
1483cab13f
|
fixed attendance logs and role name
|
2025-04-09 11:35:53 +05:30 |
|
Pramod Mahajan
|
453c53940f
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-09 11:28:20 +05:30 |
|
Pramod Mahajan
|
faf68cac25
|
fixed attendance logs, attendanance rolename and removed import-userProfile.
|
2025-04-09 11:23:34 +05:30 |
|
|
1f5d4688bb
|
Fixed error of api call before submiting create form
|
2025-04-09 11:08:39 +05:30 |
|
Pramod Mahajan
|
e8aa2ae718
|
added close fun for addFloor model
|
2025-04-08 18:32:28 +05:30 |
|
Pramod Mahajan
|
57cf750d62
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-08 18:22:14 +05:30 |
|
Pramod Mahajan
|
d56ba89a4a
|
fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server
|
2025-04-08 18:21:59 +05:30 |
|
|
999ebe1623
|
Merge pull request 'Enhance email validation and fix spelling errors in address fields' (#6) from vaibhav_Bug-#26 into Feature_Task_Management
Reviewed-on: #6
|
2025-04-08 12:33:30 +00:00 |
|
|
9d9569460a
|
Enhance email validation and fix spelling errors in address fields
|
2025-04-08 12:33:30 +00:00 |
|
|
079dfb8861
|
Merge pull request 'Refactor project status options and remove "Suspended" status' (#5) from vaibhav_bug_Issue-#50 into Feature_Task_Management
Reviewed-on: #5
|
2025-04-08 12:32:56 +00:00 |
|
|
d9e1c91a6b
|
Refactor project status options and remove "Suspended" status
|
2025-04-08 16:10:42 +05:30 |
|
Pramod Mahajan
|
9c0f98dbaf
|
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
|
2025-04-08 16:00:11 +05:30 |
|
|
5559970a05
|
Merge pull request 'Ashutosh_Daily_Task_Planning_Issues' (#4) from Ashutosh_Daily_Task_Planning_Issues into Feature_Task_Management
Reviewed-on: #4
|
2025-04-08 09:54:02 +00:00 |
|