admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
724 Commits 234 Branches 0 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
Umesh Desai
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
kartik.sharma
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
Vikas Nale
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
kartik.sharma
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
kartik.sharma
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +00:00
kartik.sharma
9e6cfdb659 Changes in Attendance tab. 
1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab.
 2025-05-17 10:58:14 +00:00
Pramod Mahajan
2ebd1a074f show 'No Reports Found' message when task list is empty and loading is complete 2025-05-15 05:46:40 +00:00
ashutosh.nehete
f26b708564 Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null. 2025-05-10 13:38:05 +00:00
Pramod Mahajan
5427fda41e Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity 2025-05-07 17:01:31 +05:30
Pramod Mahajan
f3bedf5826 handled console error 2025-05-07 16:41:25 +05:30
ashutosh.nehete
e795881c79 Implemented date-wise grouping of the Attendance Log based on the selected date range. 2025-05-07 16:04:38 +05:30
Vikas Nale
130fffcc16 remove minor error while code review 2025-05-07 13:16:02 +05:30
Vikas Nale
a60cd6b1a9 Added row background color and also changed message on report submit 2025-05-07 06:33:11 +00:00
ashutosh.nehete
25127659c8 Added fuctionality to Displayed Date-Wise Based on Selected Date Range 2025-05-07 06:33:11 +00:00
Pramod Mahajan
174b3f3bee removed console 2025-05-06 12:45:19 +00:00
Pramod Mahajan
1a651ac5bc after refresh attednace page, now it able get employee default selectedproject. 2025-05-06 12:45:19 +00:00
Pramod Mahajan
8483114f4d set selectedProject on page refresh in DailyTask.jsx 
- added fallback logic to select first project if selectedProject is undefined or 1
- used initialized flag to prevent multiple dispatches
 2025-05-06 11:00:13 +05:30
Vikas Nale
029254e548 Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity 2025-05-05 18:20:24 +05:30
Vikas Nale
a14e5c88b4 Dynamic date range for DateRange Picker in task allocation log 2025-05-04 12:50:53 +05:30
Pramod Mahajan
4bd574772f filtering projects according to logged user at data layer 2025-05-04 12:00:10 +05:30
ashutosh.nehete
bb23d10996 Fixed bug of not getting data of correct project when going to attendance page 2025-05-04 09:32:12 +05:30
ashutosh.nehete
1bbc8fd422 Conver Int to Guid 2025-05-03 21:43:15 +05:30
Pramod Mahajan
8b9206ec74 remove accordion functionality from DailyTask component 2025-05-02 04:51:46 +00:00
Pramod Mahajan
fec6de8a54 removed console 2025-04-29 23:54:59 +05:30
Pramod Mahajan
6b241b14de Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active 2025-04-29 00:47:32 +05:30
Pramod Mahajan
a92a041333 Prevent multiple API calls and display correct data for selected project 2025-04-25 11:00:43 +00:00
Pramod Mahajan
461ffeb83d fixed correct projectId is used when navigating to DailyTask 2025-04-22 10:33:04 +00:00
Pramod Mahajan
6c2a6ca7f9 employee assign perfectly with job role. 2025-04-21 15:41:37 +05:30
ashutosh.nehete
2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page 2025-04-21 07:03:59 +00:00
Pramod Mahajan
28437c3a9e this component read projectId from the URL using useSearchParams. 2025-04-19 05:29:34 +00:00
Pramod Mahajan
b4802ff3c1 updated cache format for one project about 2025-04-19 04:54:44 +00:00
Vikas Nale
1418f84976 Remove warnings 2025-04-17 17:29:18 +05:30
Pramod Mahajan
35c54fb48a removed unnecessary code 2025-04-17 16:25:22 +05:30
Pramod Mahajan
ee2762fb4a removed console 2025-04-14 22:51:58 +05:30
Pramod Mahajan
c83161d5ab Breadcrumb changed 2025-04-14 17:23:36 +05:30
Pramod Mahajan
dd40f55b0a report button wil hide after reported 2025-04-14 17:14:29 +05:30
Pramod Mahajan
63b02db9b3 added FromData to endDate filter in Task list 2025-04-13 17:27:51 +05:30
Pramod Mahajan
c45130b611 updated project-infra-each modelForm able to taking recently added item 2025-04-10 02:07:47 +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
faf68cac25 fixed attendance logs, attendanance rolename and removed import-userProfile. 2025-04-09 11:23:34 +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
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
ashutosh.nehete
f9c6d1b7f8 Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
Pramod Mahajan
df989605b9 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 13:03:12 +05:30
Vikas Nale
5995c74ae6 change class= to className= 2025-04-08 09:37:38 +05:30
Pramod Mahajan
10d6f96ea7 added taskreport, commentTask feature 2025-04-06 18:03:10 +05:30
Pramod Mahajan
ddfbed1020 updated project infra components and added assigntask 2025-04-05 13:10:24 +05:30
Pramod Mahajan
1451c1aff7 added login and forgot form validation and changed server response format 2025-04-03 17:51:59 +05:30
Pramod Mahajan
e6a687c8e2 added validation for aadhar, pan Number, email, phone number and address length. 2025-04-03 00:22:24 +05:30