c2c00fa175
Merge pull request 'Change name daily task to Daily Progress Report' ( #113 ) from Kartik_Enhancement#277 into Issue_May_3W
...
Reviewed-on: #113
2025-05-16 09:57:17 +00:00
4e74d8fce5
Change name daily task to Daily Progress Report
2025-05-16 09:57:17 +00:00
7d3bffe0cd
Merge pull request 'pramod_Bug-#271' ( #106 ) from pramod_Bug-#271 into Issue_May_3W
...
Reviewed-on: #106
2025-05-15 05:46:40 +00:00
Pramod Mahajan
7d07002555
visible assign task button in mobile view
2025-05-15 05:46:40 +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
Pramod Mahajan
ce4b517ce5
Add condition to move entries to 'approved' if checkOut and date are in the past.
2025-05-15 05:46:40 +00:00
1e57e6fc03
Merge pull request 'Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission' ( #105 ) from Ashutosh_Frature_Permission into Issue_May_3W
...
Reviewed-on: #105
2025-05-14 09:59:08 +00:00
ca9f744d01
Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission
2025-05-14 15:00:39 +05:30
197abedfe2
Merge pull request 'Implemented Pushover to display permission descriptions when editing or creating application role' ( #104 ) from Kartik_permission_description into Issue_May_3W
...
Reviewed-on: #104
2025-05-14 08:04:12 +00:00
aa0bdb7a57
Implemented Pushover to display permission descriptions when editing or creating application role
2025-05-13 18:48:40 +05:30
c8ad72a2da
added Assign_view progress task permission.
2025-05-13 12:40:10 +05:30
f94e8a1f88
Merge branch 'pramod_Bug#221' into Issue_May_2W
...
# Conflicts:
# src/components/Project/Infrastructure/WorkItem.jsx
2025-05-13 12:31:09 +05:30
Pramod Mahajan
31286eff0a
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#221
2025-05-13 12:14:50 +05:30
Pramod Mahajan
0ca7acb140
added Assign_view progress task permission.
2025-05-13 12:14:36 +05:30
Pramod Mahajan
ba6b15a12e
custimize accordation css
2025-05-13 11:33:25 +05:30
Pramod Mahajan
d398a6cb39
added dropdwon for action view
2025-05-13 11:32:09 +05:30
Pramod Mahajan
4fb337533e
added bootstrap accordation
2025-05-13 11:30:43 +05:30
Pramod Mahajan
db098f9fdc
manage floor header size for collap
2025-05-13 11:29:56 +05:30
Pramod Mahajan
aa2ca6565b
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154
2025-05-12 16:36:55 +05:30
Pramod Mahajan
bf797503f5
added accordionn for floor
2025-05-12 16:34:44 +05:30
663269770a
Merge pull request 'Added a popup to allow editing of employee information directly in the Employee Profile.' ( #101 ) from Ashutosh_Emplyee_Profile_Edit_Popup into Issue_May_2W
...
Reviewed-on: #101
2025-05-12 10:20:26 +00:00
bf097bc884
Added a popup to allow editing of employee information directly in the Employee Profile.
2025-05-12 15:45:17 +05:30
a3608a49bd
remove sneat lables from application
2025-05-12 15:37:31 +05:30
a7aa815691
Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W
2025-05-12 14:49:33 +05:30
bea3661ce2
Merge pull request 'pramod_Task#213' ( #100 ) from pramod_Task#213 into Issue_May_2W
...
Reviewed-on: #100
2025-05-12 09:18:29 +00:00
Pramod Mahajan
926168bb07
Modified report comments section.
2025-05-12 09:18:29 +00:00
Pramod Mahajan
f51ed3a380
added custome font size class
2025-05-12 09:18:29 +00:00
9b2c27b903
Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown
2025-05-12 14:44:59 +05:30
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
634dc12e5b
Merge pull request 'Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions.' ( #98 ) from Ashutosh_Bug#216_Create_Employee_Popup_Typo into Issue_May_2W
...
Reviewed-on: #98
2025-05-12 07:58:33 +00:00
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
49f725b62d
Merge pull request 'pramod_Task#207 Sync activity updates and deletions in Daily Task Planning view without page refresh' ( #96 ) from pramod_Task#207 into Issue_May_2W
...
Reviewed-on: #96
2025-05-12 07:58:04 +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
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
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
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
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
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
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
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
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
