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

637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
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
kartik.sharma
e659b9bb04 Checking all the popups and adding header on it. 2025-05-19 11:59:34 +05:30
Vikas Nale
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
Vikas Nale
2a5e716615 Merge branch 'kartik_Enhancement#222' into Issue_May_3W 2025-05-17 17:38:35 +05:30
kartik.sharma
6477c30bbc All Changes in Assign Role popup from project list. 2025-05-17 17:29:48 +05:30
Gitea Admin
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
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
kartik.sharma
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
Gitea Admin
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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
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
Gitea Admin
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
kartik.sharma
33efad9b06 Info-icon add 2025-05-17 10:57:31 +00:00
kartik.sharma
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
kartik.sharma
d20b54a71c Modified assign task popup from Daily task planning component. 2025-05-17 10:57:31 +00:00
kartik.sharma
5535ff21fa Modified popup of Assign Task. 2025-05-17 10:57:31 +00:00
Gitea Admin
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
kartik.sharma
ad3533a567 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 10:54:45 +00:00
kartik.sharma
f6cbc3acc9 Info-icon add 2025-05-17 16:10:11 +05:30
kartik.sharma
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
kartik.sharma
115b49ac44 Modified assign task popup from Daily task planning component. 2025-05-16 16:53:51 +05:30
Gitea Admin
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
kartik.sharma
4e74d8fce5 Change name daily task to Daily Progress Report 2025-05-16 09:57:17 +00:00
kartik.sharma
0a1f76afb6 Modified popup of Assign Task. 2025-05-15 19:40:09 +05:30
Gitea Admin
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
Gitea Admin
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
ashutosh.nehete
ca9f744d01 Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission 2025-05-14 15:00:39 +05:30
Gitea Admin
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
kartik.sharma
aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role 2025-05-13 18:48:40 +05:30
Vikas Nale
c8ad72a2da added Assign_view progress task permission. 2025-05-13 12:40:10 +05:30
Vikas Nale
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
Vikas Nale
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
ashutosh.nehete
bf097bc884 Added a popup to allow editing of employee information directly in the Employee Profile. 2025-05-12 15:45:17 +05:30
Vikas Nale
a3608a49bd remove sneat lables from application 2025-05-12 15:37:31 +05:30
Vikas Nale
a7aa815691 Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W 2025-05-12 14:49:33 +05:30
Vikas Nale
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