admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity
2,232 Commits 250 Branches 0 Tags
Commit Graph

2232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
2188f109cb disable Edit button and show "Please wait" message during activity update API call 2025-05-12 07:58:04 +00:00
Pramod Mahajan
292c920941 added loader during submitting form data. 2025-05-12 07:58:04 +00:00
Pramod Mahajan
af6a6faa46 ensure activity updates reflect in Daily Task Planning without page refresh 2025-05-12 07:58:04 +00:00
Vikas Nale
73152dbf0a Merge pull request 'Bug#215 updated regularization logic based on 48-hour checkout threshold for attendanceLogs.' (#97) from pramod_Bug-#215 into Issue_May_2W 
Reviewed-on: #97
 2025-05-12 07:57:40 +00:00
Pramod Mahajan
216e9b0db0 updated regularization logic based on 48-hour checkout threshold for attendanceLogs. 2025-05-12 07:57:40 +00:00
ashutosh.nehete
b39effe4b0 Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views. 2025-05-12 13:11:29 +05:30
Pramod Mahajan
7bfd1728c0 updated regularization logic based on 48-hour checkout threshold for attendanceLogs. 2025-05-12 11:33:04 +05:30
Vikas Nale
c0ac2295d0 Remove warnings 
ref: https://reactrouter.com/6.30.0/upgrading/future#v7_starttransition
 2025-05-12 10:35:23 +05:30
Vikas Nale
658c2776f1 Merge branch 'pramod_Task#207' into Issue_May_2W 2025-05-10 19:23:23 +05:30
Vikas Nale
7cf8e49429 Merge pull request 'Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null.' (#95) from Ashutosh_Enhancement_#214_Report_Task_At_Zero into Issue_May_2W 
Reviewed-on: #95
 2025-05-10 13:38:05 +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
Vikas Nale
f6ab824529 Merge pull request 'Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality.' (#94) from Ashutosh_Feature#208_WorkCategory_Master into Issue_May_2W 
Reviewed-on: #94
 2025-05-10 13:36:51 +00:00
Pramod Mahajan
6bb1f98ae7 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207, 2025-05-10 19:06:34 +05:30
ashutosh.nehete
96963527df Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality. 2025-05-10 17:56:35 +05:30
Pramod Mahajan
2892b803d5 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207 2025-05-10 17:07:30 +05:30
Vikas Nale
5d5e33f308 Merge pull request 'Bug#209 - Issue Resolved: Form Retains Old Data on "Create New Project"' (#93) from pramod_Bug-#209 into Issue_May_2W 
Reviewed-on: #93
 2025-05-10 10:42:37 +00:00
Pramod Mahajan
16fd31eef7 added reset and setloader false once request completed 2025-05-10 10:42:37 +00:00
Pramod Mahajan
636076ed56 passed reset and loading method inside handleSubmitForm function. 2025-05-10 10:42:37 +00:00
Vikas Nale
ada53e3fce Merge pull request 'pramod_Task#207 Assign button hide and completedWork not editable if , > 0' (#92) from pramod_Task#207 into Issue_May_2W 
Reviewed-on: #92
 2025-05-10 10:41:59 +00:00
Pramod Mahajan
c4a221807f changed class too className 2025-05-10 10:41:59 +00:00
Pramod Mahajan
4b6d1d4658 can't update completed is greather than zero 2025-05-10 10:41:59 +00:00
Pramod Mahajan
72558e7725 action position changed center to end 2025-05-10 10:41:59 +00:00
Pramod Mahajan
186b18bb6e completedWork can't not update if it grather than zero 2025-05-10 10:41:59 +00:00
Pramod Mahajan
26c1492300 handled attendance error object in readble format 2025-05-10 10:41:59 +00:00
Pramod Mahajan
ea0c3b5ca7 handled correct time slots 2025-05-10 10:41:59 +00:00
Pramod Mahajan
2fbd7462d5 time slot display correct slots and if check-In so must display grather than check-in 2025-05-10 10:41:59 +00:00
Pramod Mahajan
2e04794047 handled properly checkInTime for timeElapsed 2025-05-10 10:41:59 +00:00
Vikas Nale
68475f4742 Merge pull request 'pramod_Bug-#203 -preserve selected employees when filtering by role in Daily Task Planning' (#91) from pramod_Bug-#203 into Issue_May_2W 
Reviewed-on: #91
 2025-05-10 10:41:25 +00:00
Pramod Mahajan
ebb5a57b70 changed class too className 2025-05-10 12:59:33 +05:30
Pramod Mahajan
1dbd8ba317 can't update completed is greather than zero 2025-05-10 12:54:10 +05:30
Pramod Mahajan
c728b162e8 action position changed center to end 2025-05-10 12:53:11 +05:30
Pramod Mahajan
c860a63ad6 completedWork can't not update if it grather than zero 2025-05-10 12:33:21 +05:30
Pramod Mahajan
3a84d2f4c9 handled attendance error object in readble format 2025-05-10 12:32:26 +05:30
Pramod Mahajan
349d2a62ff handled correct time slots 2025-05-10 12:31:25 +05:30
Pramod Mahajan
19e4962ef8 time slot display correct slots and if check-In so must display grather than check-in 2025-05-10 12:30:17 +05:30
Pramod Mahajan
18b328743a handled properly checkInTime for timeElapsed 2025-05-10 11:54:23 +05:30
Pramod Mahajan
b639acc7e6 added loader for loading display during api calling 2025-05-09 22:21:34 +05:30
Pramod Mahajan
abd430ccb6 preserve selected employees when applying designation filter 2025-05-09 19:23:13 +05:30
Pramod Mahajan
31e5a63fb7 added midleName for search in employee list 2025-05-09 17:57:19 +05:30
Pramod Mahajan
067f7306d4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W 2025-05-09 17:45:50 +05:30
Pramod Mahajan
6b06c888e5 removed debugger 2025-05-09 17:45:14 +05:30
Pramod Mahajan
ae33594691 mobile fied accept first digit 0 to 9 2025-05-09 17:44:55 +05:30
Vikas Nale
2ccc895bef Merge pull request 'pramod_Enhancement#202' (#90) from pramod_Enhancement#202 into Issue_May_2W 
Reviewed-on: #90
 2025-05-09 11:53:40 +00:00
Pramod Mahajan
8ba025ca43 added confrim modal, it will take permission first. 2025-05-09 11:53:40 +00:00
Pramod Mahajan
c78200f80f removed console 2025-05-09 11:53:40 +00:00
Pramod Mahajan
71a47f320c added data props in confrima modal 2025-05-09 11:53:40 +00:00
Pramod Mahajan
1d9bf0a4dd added confirmation modal inside team, wherevener delete employee confirm modal appear. 2025-05-09 11:53:40 +00:00
Vikas Nale
c09e7426ca Merge pull request 'Changed header alignment to left-aligned in Project list view, employee list view and master view' (#89) from Ashutosh_Enhancement#201_Left_Aligned_Header into Issue_May_2W 
Reviewed-on: #89
 2025-05-09 11:53:22 +00:00
ashutosh.nehete
21e4af4e33 Changed header alignment to left-aligned in Project list view, employee list view and master view 2025-05-09 11:53:22 +00:00
Vikas Nale
85a846ed54 Merge pull request 'pramod_Bug-#120deleteConfirmModal - Added delete Activity confirmation Modal.' (#88) from pramod_Bug-#120deleteConfirmModal into Issue_May_2W 
Reviewed-on: #88
 2025-05-09 11:52:57 +00:00