|
|
141bb866d2
|
Adding Switch button in attendence component.
|
2025-05-22 16:39:42 +05:30 |
|
|
|
396706dcf5
|
Merge pull request 'Adding Date Box in Check-in and Check-out popup from Attendence component.' (#126) from Kartik_Enhancement#319 into Issue_May_4W
Reviewed-on: #126
|
2025-05-22 06:12:24 +00:00 |
|
|
|
af4a40bf81
|
Adding Date Box in Check-in and Check-out popup from Attendence component.
|
2025-05-22 06:12:24 +00:00 |
|
|
|
d5ba7eaac1
|
Merge pull request 'Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.' (#125) from Bug#318_Kartik into Issue_May_4W
Reviewed-on: #125
|
2025-05-22 06:11:23 +00:00 |
|
|
|
5cb1e55292
|
Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.
|
2025-05-22 06:11:23 +00:00 |
|
|
|
28e0d615a0
|
Merge pull request 'Attendence component date customize' (#123) from Kartik_Enhancement#273 into Issue_May_4W
Reviewed-on: #123
|
2025-05-21 07:42:42 +00:00 |
|
|
|
4c9ea7add8
|
Attendence component date customize
|
2025-05-21 07:42:42 +00:00 |
|
|
|
7a57f47318
|
Merge pull request 'In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday.' (#122) from Kartik_Enhancement#273 into Issue_May_4W
Reviewed-on: #122
|
2025-05-20 07:32:12 +00:00 |
|
|
|
3d3dcb4f69
|
In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday.
|
2025-05-20 12:56:05 +05:30 |
|
|
|
0587351cdb
|
Merge pull request 'Checking all the popups and adding header on it.' (#120) from Kartik_Enhancement#308 into Issue_May_3W
Reviewed-on: #120
|
2025-05-19 07:15:50 +00:00 |
|
|
|
e659b9bb04
|
Checking all the popups and adding header on it.
|
2025-05-19 11:59:34 +05:30 |
|
|
|
d117c0d09b
|
Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W
# Conflicts:
# src/components/Project/AssignRole.jsx
|
2025-05-17 17:39:36 +05:30 |
|
|
|
2a5e716615
|
Merge branch 'kartik_Enhancement#222' into Issue_May_3W
|
2025-05-17 17:38:35 +05:30 |
|
|
|
6477c30bbc
|
All Changes in Assign Role popup from project list.
|
2025-05-17 17:29:48 +05:30 |
|
|
|
6753bf7287
|
Merge pull request '"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected s…' (#115) from Kartik_bug#278 into Issue_May_3W
Reviewed-on: #115
|
2025-05-17 10:58:14 +00:00 |
|
|
|
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 |
|
|
|
6e2d640542
|
"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected string, received null' to appear initially."
|
2025-05-17 10:58:14 +00:00 |
|
|
|
e252c909db
|
Merge pull request 'Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.' (#114) from Kartik_Enhancement#276 into Issue_May_3W
Reviewed-on: #114
|
2025-05-17 10:57:50 +00:00 |
|
|
|
48f013edd5
|
On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'.
|
2025-05-17 10:57:50 +00:00 |
|
|
|
21b2feb13f
|
Update the Project List component column names:
1.Change 'Planned' to 'Completed/Planned'
2.Change 'Completed' to 'Today's Planned
|
2025-05-17 10:57:50 +00:00 |
|
|
|
27cf6f2703
|
Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.
|
2025-05-17 10:57:50 +00:00 |
|
|
|
818725fba4
|
Merge pull request 'Modified popup of Assign Task.' (#109) from kartik_Enhancement#222 into Issue_May_3W
Reviewed-on: #109
|
2025-05-17 10:57:31 +00:00 |
|
|
|
33efad9b06
|
Info-icon add
|
2025-05-17 10:57:31 +00:00 |
|
|
|
01b43ecc13
|
modified assign task popup from daily task planning.
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
|
2025-05-17 10:57:31 +00:00 |
|
|
|
d20b54a71c
|
Modified assign task popup from Daily task planning component.
|
2025-05-17 10:57:31 +00:00 |
|
|
|
5535ff21fa
|
Modified popup of Assign Task.
|
2025-05-17 10:57:31 +00:00 |
|
|
|
b2cdd7c02e
|
Merge pull request 'Removing extra gap in Assign employee popup from project list >Team.' (#117) from Kartik_Bug#301 into Issue_May_3W
Reviewed-on: #117
|
2025-05-17 10:54:45 +00:00 |
|
|
|
ad3533a567
|
Removing extra gap in Assign employee popup from project list >Team.
|
2025-05-17 10:54:45 +00:00 |
|
|
|
f6cbc3acc9
|
Info-icon add
|
2025-05-17 16:10:11 +05:30 |
|
|
|
1b92c30d33
|
modified assign task popup from daily task planning.
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
|
2025-05-17 13:14:17 +05:30 |
|
|
|
115b49ac44
|
Modified assign task popup from Daily task planning component.
|
2025-05-16 16:53:51 +05:30 |
|
|
|
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 |
|
|
|
0a1f76afb6
|
Modified popup of Assign Task.
|
2025-05-15 19:40:09 +05:30 |
|
|
|
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 |
|
