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

627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod.mahajan
9a0482071a Merge pull request 'pramod_Task#294' (#112) from pramod_Task#294 into Feature_Directory 
Reviewed-on: #112
 2025-05-15 17:33:16 +00:00
Pramod Mahajan
2922cca22d integrated Contact Tag list API and display in master table 2025-05-15 22:58:50 +05:30
Pramod Mahajan
a3d21ba098 updated incorrect API endpoint 2025-05-15 22:58:02 +05:30
pramod.mahajan
cdc52ae947 Merge pull request 'Task#225 : integrate Get Contact List API in useMaster hook' (#111) from pramod_Task#225 into Feature_Directory 
Reviewed-on: #111
 2025-05-15 17:03:45 +00:00
Pramod Mahajan
04297346fa feat: integrate Get Contact List API in useMaster hook 2025-05-15 22:21:20 +05:30
pramod.mahajan
70cfa36ba8 Merge pull request 'pramod_Task-#293' (#110) from pramod_Task-#293 into Feature_Directory 
Reviewed-on: #110
 2025-05-15 16:23:13 +00:00
Pramod Mahajan
d8df891370 added createContactTg component inside MasterModal 2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768 created new createContactMaster component 2025-05-15 21:47:51 +05:30
Pramod Mahajan
413dba4f5c added Tag master inside masterList 2025-05-15 21:47:20 +05:30
Gitea Admin
9a4c5df14f Merge pull request 'pramod_Task#224 : Created New Master - Contact Category' (#108) from pramod_Task#224 into Feature_Directory 
Reviewed-on: #108
 2025-05-15 12:28:37 +00:00
Pramod Mahajan
cd21bc14ff created new repo for tag and contact category mastes 2025-05-15 12:28:37 +00:00
Pramod Mahajan
40df12de86 added CreateContactCategory in master modal 2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f created new constact category master 2025-05-15 12:28:37 +00:00
Pramod Mahajan
784eebafea added one more master in masterList - Contact Category 2025-05-15 12:28:37 +00:00
Gitea Admin
88d23fc765 Merge pull request 'pramod_Task-#280 - Fetched & Display Contact List in Directory' (#107) from pramod_Task-#280 into Feature_Directory 
Reviewed-on: #107
 2025-05-15 12:27:59 +00:00
Pramod Mahajan
50ef045479 display contact in list view 2025-05-15 12:20:55 +05:30
Pramod Mahajan
cc98f34b44 displaye contacts in List View 2025-05-15 12:19:57 +05:30
Pramod Mahajan
5415210d70 created new hook for get a contacts 2025-05-15 12:19:30 +05:30
Pramod Mahajan
3670409977 created new repo for get contact list 2025-05-15 12:18:05 +05:30
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
ashutosh.nehete
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
ashutosh.nehete
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
Vikas Nale
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
ashutosh.nehete
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
Vikas Nale
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
pramod.mahajan
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
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