This website requires JavaScript.
b4be5a38ab
refactor(Dashboard): rename loading state variable for clarity in progression data hook
Vaibhav Surve
2025-04-11 17:23:06 +05:30
99a4cb0553
feat(Dashboard): integrate loading state for line chart and fix data mapping
Vaibhav Surve
2025-04-11 17:22:56 +05:30
a30350916e
feat(LineChart): add loading state to display spinner while loading data
Vaibhav Surve
2025-04-11 17:22:51 +05:30
d8a861bb08
feat(HorizontalBarChart): add loading state and improve label positioning
Vaibhav Surve
2025-04-11 17:22:45 +05:30
2b24351316
Merge pull request 'vaibhav_dashboard_feature' (#7 ) from vaibhav_dashboard_feature into Feature_Task_Management
Vikas Nale
2025-04-11 10:39:13 +00:00
895e3da219
refactor(Dashboard): enhance project data handling and improve chart integration
Vaibhav Surve
2025-04-11 15:45:08 +05:30
02b0c4ccab
fix(LineChart): enable x-axis labels visibility and adjust styling
Vaibhav Surve
2025-04-11 15:45:02 +05:30
12aa5c1491
refactor HorizontalBarChart: streamline data handling and improve label visibility
Vaibhav Surve
2025-04-11 15:44:56 +05:30
51190b0d53
add dashboard data hooks and global repository for API interactions
Vaibhav Surve
2025-04-11 15:44:51 +05:30
f4a09c7f53
removed max validation for completedTask
Pramod Mahajan
2025-04-11 15:34:46 +05:30
ec80121621
increased length of address field - 250
Pramod Mahajan
2025-04-11 15:33:11 +05:30
c2b91b9737
uncomment api
Pramod Mahajan
2025-04-11 15:30:15 +05:30
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
Pramod Mahajan
2025-04-11 15:26:50 +05:30
8608043fb2
added unmount function that can be false loading flag
Pramod Mahajan
2025-04-11 15:21:01 +05:30
55b9420b6c
Activity master component made and is reday for api integration.
Pramod Mahajan
2025-04-11 15:13:08 +05:30
2428f15f35
integrated activity api and fetch in master seaction.
Pramod Mahajan
2025-04-10 03:03:38 +05:30
4a5d9c05e6
set checkin-out button side right
Pramod Mahajan
2025-04-10 02:50:33 +05:30
60232cf121
added refetch fun
Pramod Mahajan
2025-04-10 02:49:05 +05:30
9e32986969
remove debugger
Pramod Mahajan
2025-04-10 02:47:51 +05:30
aa6ddd7fe9
remove regularization request after approve or reject.
Pramod Mahajan
2025-04-10 02:46:54 +05:30
c45130b611
updated project-infra-each modelForm able to taking recently added item
Pramod Mahajan
2025-04-10 02:07:47 +05:30
67a3648227
Update Dashboard component: change label from "In Role" to "In Today"
Vaibhav Surve
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
Vaibhav Surve
2025-04-09 17:56:52 +05:30
c0477285e3
Refactor Dashboard component: replace old implementation with new charts and project overview cards
Vaibhav Surve
2025-04-09 17:37:40 +05:30
d0ab36799f
Add HorizontalBarChart and LineChart components; update package dependencies
Vaibhav Surve
2025-04-09 17:37:27 +05:30
d4452ae19a
fixed refresh-token error and changed forgot password text position.
Pramod Mahajan
2025-04-09 16:22:03 +05:30
29caa20250
Card changes to show days left for project
Vikas Nale
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
ashutosh.nehete
2025-04-09 14:33:39 +05:30
bc516b58b6
Changed coming soon font size
ashutosh.nehete
2025-04-09 14:33:32 +05:30
308ac5af48
updated a project status in numbers on projectCard.
Pramod Mahajan
2025-04-09 13:57:08 +05:30
05a3b13a0e
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
2025-04-09 13:44:40 +05:30
85c2401514
fixed progress bar and team size on project Card
Pramod Mahajan
2025-04-09 13:43:34 +05:30
43673cfd37
Fixed project modify error in project card
ashutosh.nehete
2025-04-09 13:33:54 +05:30
b1fd691f37
Add email in employee list
Vikas Nale
2025-04-09 13:15:11 +05:30
1019e9a32f
add ComingSoonPage component and integrate it into EmployeeProfile for placeholder content
Vaibhav Surve
2025-04-09 12:03:16 +05:30
0e7088b4d4
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
2025-04-09 12:01:07 +05:30
797ff9b5bc
removed MISC and changed login page logo url
Pramod Mahajan
2025-04-09 12:00:50 +05:30
68442bdc7c
comment out unused functions and dropdown in Sidebar component
Vaibhav Surve
2025-04-09 11:50:44 +05:30
95f4443338
refactor ProjectCard component to improve state management and error handling
Vaibhav Surve
2025-04-09 11:50:29 +05:30
6a6f0356bc
remove regularization method and created new component
Pramod Mahajan
2025-04-09 11:36:49 +05:30
1483cab13f
fixed attendance logs and role name
Pramod Mahajan
2025-04-09 11:35:53 +05:30
453c53940f
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
2025-04-09 11:28:20 +05:30
faf68cac25
fixed attendance logs, attendanance rolename and removed import-userProfile.
Pramod Mahajan
2025-04-09 11:23:34 +05:30
1f5d4688bb
Fixed error of api call before submiting create form
ashutosh.nehete
2025-04-09 11:08:39 +05:30
e8aa2ae718
added close fun for addFloor model
Pramod Mahajan
2025-04-08 18:32:28 +05:30
57cf750d62
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
2025-04-08 18:22:14 +05:30
d56ba89a4a
fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server
Pramod Mahajan
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
Gitea Admin
2025-04-08 12:33:30 +00:00
9d9569460a
Enhance email validation and fix spelling errors in address fields
Vaibhav Surve
2025-04-08 17:33:26 +05:30
079dfb8861
Merge pull request 'Refactor project status options and remove "Suspended" status' (#5 ) from vaibhav_bug_Issue-#50 into Feature_Task_Management
Gitea Admin
2025-04-08 12:32:56 +00:00
22bd8d4130
Enhance email validation and fix spelling errors in address fields
Vaibhav Surve
2025-04-08 17:33:26 +05:30
d9e1c91a6b
Refactor project status options and remove "Suspended" status
Vaibhav Surve
2025-04-08 16:10:42 +05:30
9c0f98dbaf
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
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
Gitea Admin
2025-04-08 09:54:02 +00:00
a78c4b90db
Fixed the error "project not found" in daily task planning
ashutosh.nehete
2025-04-08 14:58:00 +05:30
f9c6d1b7f8
Fixed the error "project not found" in daily task planning
ashutosh.nehete
2025-04-08 14:57:16 +05:30
23486cbec6
Fixed the error "project not found" in daily task planning
ashutosh.nehete
2025-04-08 14:58:00 +05:30
ce40105ae5
Fixed the error "project not found" in daily task planning
ashutosh.nehete
2025-04-08 14:57:16 +05:30
147342bfc1
Merge pull request 'Refactor employee action dropdown for better accessibility and code clarity' (#3 ) from vaibhav_bug_Issue-#49 into Feature_Task_Management
Gitea Admin
2025-04-08 07:53:22 +00:00
c989f23106
Refactor employee action dropdown for better accessibility and code clarity
Vaibhav Surve
2025-04-08 13:17:44 +05:30
14ca1eb54c
Merge pull request 'Vaibhav_Resolved_Issues' (#2 ) from Vaibhav_Resolved_Issues into Feature_Task_Management
Gitea Admin
2025-04-08 07:53:03 +00:00
085176c593
update "Not Data Found" message to "No Data Found" with improved styling
Vaibhav Surve
2025-04-08 11:50:41 +05:30
cee8f23fd9
enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components
Vaibhav Surve
2025-04-08 11:16:29 +05:30
e424314127
Refactor employee action dropdown for better accessibility and code clarity
Vaibhav Surve
2025-04-08 13:17:44 +05:30
df989605b9
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
Pramod Mahajan
2025-04-08 13:03:12 +05:30
d3263a9d65
update "Not Data Found" message to "No Data Found" with improved styling
Vaibhav Surve
2025-04-08 11:50:41 +05:30
d35f6e1c89
enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components
Vaibhav Surve
2025-04-08 11:16:29 +05:30
5995c74ae6
change class= to className=
Vikas Nale
2025-04-08 09:37:38 +05:30
984efe207b
Reduce font size on menu and project infra
Vikas Nale
2025-04-07 22:11:38 +05:30
8888f9d2d8
Merge pull request 'Vaibhav_Resolved_Issues' (#1 ) from Vaibhav_Resolved_Issues into Feature_Task_Management
Vikas Nale
2025-04-07 16:25:50 +00:00
66c4e44ded
updated Connect, Documentation, and Support pages with "Coming Soon!" message and illustration
Vaibhav Surve
2025-04-07 18:30:01 +05:30
f2a77b0685
added "Coming Soon!" message and illustration to multiple components
Vaibhav Surve
2025-04-07 18:29:22 +05:30
c595930640
refactor: streamline modal handling and improve floor management functionality
Vaibhav Surve
2025-04-07 17:02:15 +05:30
6c0b92606a
updated links for Daily Expenses and Application Users in menuData.json
Vaibhav Surve
2025-04-07 17:01:08 +05:30
9e17b74ba4
changed font size and removed console.
Pramod Mahajan
2025-04-07 18:44:19 +05:30
a28d290feb
hide or visible password
Pramod Mahajan
2025-04-07 17:17:21 +05:30
8bce23d9b6
added hid and visible functionality for password field.
Pramod Mahajan
2025-04-07 17:16:18 +05:30
2081b13d64
removed space between check and view button
Pramod Mahajan
2025-04-07 17:15:17 +05:30
93c95e007a
integrated create Task api and handling data caching updated for task.
Pramod Mahajan
2025-04-07 17:14:07 +05:30
10d6f96ea7
added taskreport, commentTask feature
Pramod Mahajan
2025-04-06 18:03:10 +05:30
ddfbed1020
updated project infra components and added assigntask
Pramod Mahajan
2025-04-05 13:10:24 +05:30
1451c1aff7
added login and forgot form validation and changed server response format
Pramod Mahajan
2025-04-03 17:51:59 +05:30
e6a687c8e2
added validation for aadhar, pan Number, email, phone number and address length.
Pramod Mahajan
2025-04-03 00:22:24 +05:30
21ca99455b
added character limitation for description field-255
Pramod Mahajan
2025-04-02 22:45:47 +05:30
73ffbe9bf4
Newly Checked-In Employees and log Displaying in Descending Order
Pramod Mahajan
2025-04-02 18:57:14 +05:30
f7f1f8d083
added user rights for regularize
Pramod Mahajan
2025-04-02 18:17:05 +05:30
f4af7ccf1c
added ascending order list , user-rights,
Pramod Mahajan
2025-04-02 17:24:43 +05:30
79a1a08620
added back button,master-header
Pramod Mahajan
2025-04-02 13:42:17 +05:30
fba9a8fc06
removed "Select Master" option in master dropdown
Pramod Mahajan
2025-04-01 20:41:10 +05:30
5a7ca02952
added use-rights functionality according to users
Pramod Mahajan
2025-04-01 17:17:35 +05:30
8ff2167088
remove image path
vikas_deploy
Vikas Nale
2025-03-31 16:59:44 +05:30
281527ef69
Changes fo environment variable for docker container
Vikas Nale
2025-03-31 16:56:04 +05:30
8fc9cc2d2d
chnages for background env variables
vikas_16_dockerdeployment
Vikas Nale
2025-03-31 13:06:54 +05:30
0ad38baa99
Modify docker file to setup enviroment variables using emtrypoint.sh
Vikas Nale
2025-03-30 12:31:53 +05:30
959e4dd7dd
removed unwanted handeling on login page
Vaibhav Surve
2025-03-29 16:45:19 +05:30
899dac5afd
replased env url
Vaibhav Surve
2025-03-29 16:22:50 +05:30
0cfd60dbe4
Resolved toast issue occured on the login page, added flag for axios
Vaibhav Surve
2025-03-29 16:13:34 +05:30
850b2e6998
update enviroment variable
PramodMahajan14
2025-03-29 14:36:57 +05:30
66bfcd80c1
add env config.
PramodMahajan14
2025-03-28 16:46:41 +05:30
ba38e0c289
added env vairables and update ts config for building container
PramodMahajan14
2025-03-28 13:27:42 +05:30