a7aa815691
Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W
2025-05-12 14:49:33 +05:30
Pramod Mahajan
926168bb07
Modified report comments section.
2025-05-12 09:18:29 +00:00
e8ac267d46
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 14:40:13 +05:30
cf204f376d
Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions.
2025-05-12 07:58:33 +00:00
8db6a16e15
revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1
...
revert updated regularization logic based on 48-hour checkout threshold
- This update was mistakenly implemented in the wrong branch. Moving it here to align with the correct workflow.- pramod_Bug#-27
2025-05-12 07:58:04 +00:00
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
Pramod Mahajan
216e9b0db0
updated regularization logic based on 48-hour checkout threshold for attendanceLogs.
2025-05-12 07:57:40 +00:00
c0ac2295d0
Remove warnings
...
ref: https://reactrouter.com/6.30.0/upgrading/future#v7_starttransition
2025-05-12 10:35:23 +05:30
658c2776f1
Merge branch 'pramod_Task#207' into Issue_May_2W
2025-05-10 19:23:23 +05:30
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
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
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
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
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
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
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
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
Pramod Mahajan
11adad64d5
Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state.
...
Ensures modal appears with a dark overlay when active and is hidden otherwise.
2025-05-09 11:52:57 +00:00
a896a722f1
revert 20f5dee5344e05c402e012daeebdf2404cbff39d
...
revert revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error.
2025-05-09 11:31:14 +00:00
20f5dee534
revert 77b94e89bd9297e00aa76b7c433628fee221d259
...
revert handled zero length of array error.
2025-05-09 11:25:34 +00:00
Pramod Mahajan
77b94e89bd
handled zero length of array error.
2025-05-09 16:48:06 +05:30
Pramod Mahajan
8dddb38278
mismatch approved and reject icons. replaced them
2025-05-09 16:47:16 +05:30
Pramod Mahajan
2182e764bf
added "request " entry in filterwise
2025-05-09 16:46:31 +05:30
8af759bb45
Deleted unnecessary components to clean up and optimize the codebase.
2025-05-09 06:36:26 +00:00
1887ccf2c0
Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.
2025-05-09 06:36:26 +00:00
8251d875e3
Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.
2025-05-09 06:34:57 +00:00
Pramod Mahajan
6e600e899c
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
2025-05-09 10:52:40 +05:30
a90aa77cf6
Provided proper parameter to employee list api for ont to include inactive employees
2025-05-09 10:20:54 +05:30
Pramod Mahajan
ff7f61b338
added one more property in avoid column
2025-05-09 10:04:50 +05:30
Pramod Mahajan
0ac2dc36ff
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
2025-05-08 18:27:53 +05:30
Pramod Mahajan
9f2dfadcfd
added delete repository for Job Role, Activity and Application Role
2025-05-08 18:27:43 +05:30
Pramod Mahajan
a9cd2097d6
added isSystem property in hiddenColumns because this field will broken table.
2025-05-08 18:25:18 +05:30
