admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
1,577 Commits 233 Branches 0 Tags
Commit Graph

383 Commits

Author SHA1 Message Date
Pramod Mahajan
bb6aaeee18 updated state for reflacte immediately update in rendered UI 2025-06-09 13:10:58 +05:30
Pramod Mahajan
bef8a28db2 added category filter and search 2025-06-09 13:10:58 +05:30
Pramod Mahajan
15967ce2fc prevent to reset form before calling api. 2025-06-09 13:10:58 +05:30
Pramod Mahajan
d10cbdd4bd added update contact modal 2025-06-09 13:10:57 +05:30
Pramod Mahajan
02492b0405 called submit function inside Directory component from manageDirectory 2025-06-09 13:10:56 +05:30
Pramod Mahajan
8c15cacc04 display contact in list view 2025-06-09 13:10:54 +05:30
Pramod Mahajan
77fb787d46 removed console.log 2025-06-09 12:41:57 +05:30
Vikas Nale
9e03e6ae19 Handle conditon to hide unwanted OR label 2025-06-09 11:49:34 +05:30
Vikas Nale
945d79a250 Merge branch 'pramod_Task#482' into Issue_Jun_1W_2 
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
 2025-06-09 11:47:03 +05:30
Vikas Nale
d37068b8d9 Modify typo 2025-06-09 11:46:00 +05:30
Umesh Desai
ef47bbf8a4 When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate. 2025-06-09 06:00:26 +00:00
Umesh Desai
26191bccfe Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. 2025-06-09 05:39:43 +00:00
Pramod Mahajan
ab6316ef56 Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482 2025-06-07 17:42:16 +05:30
Pramod Mahajan
def6524566 created new component for verify OTP 2025-06-07 17:40:03 +05:30
Pramod Mahajan
194087c0a3 added login with otp feature, added send otp api 2025-06-07 17:39:37 +05:30
Vikas Nale
40f4f2f254 Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2 2025-06-06 18:37:40 +05:30
Umesh Desai
96ed0428c4 Changes in Reset Password Page and adding field in Dialog box is " Change Password" 2025-06-05 18:06:58 +05:30
Umesh Desai
f3b16a9fc0 Creating a Change Password Page and adding Change Password field in Dialog box. 2025-06-05 17:57:53 +05:30
Umesh Desai
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
Umesh Desai
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
kartik.sharma
7e05cfbd61 In Employee selection double Date is shown in Front. 2025-06-02 17:31:07 +05:30
kartik.sharma
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
Vikas Nale
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
kartik.sharma
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
kartik.sharma
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +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
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
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
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
ashutosh.nehete
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
ashutosh.nehete
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
636076ed56 passed reset and loading method inside handleSubmitForm function. 2025-05-10 10:42:37 +00:00
Pramod Mahajan
31e5a63fb7 added midleName for search in employee list 2025-05-09 17:57:19 +05:30
Pramod Mahajan
8ba025ca43 added confrim modal, it will take permission first. 2025-05-09 11:53:40 +00:00
ashutosh.nehete
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
ashutosh.nehete
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
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
a9cd2097d6 added isSystem property in hiddenColumns because this field will broken table. 2025-05-08 18:25:18 +05:30
Vikas Nale
0fc43bb55b minor gui changes 2025-05-08 16:45:33 +05:30
ashutosh.nehete
ba763f986d Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees 2025-05-08 10:15:33 +00:00
Pramod Mahajan
9ac15d3cf7 restrict employee search to first and last name fields only 2025-05-08 10:15:07 +00:00
Pramod Mahajan
7fa502f44c project list or card will display 10 per page. 2025-05-08 10:14:02 +00:00
Pramod Mahajan
6c9fd4d20a status filter dropdown available for both view card and list 2025-05-08 05:38:44 +00:00
ashutosh.nehete
a3867dfb2f Added a toggle switch in the Employee List module to view active and inactive employees separately. 2025-05-08 05:38:27 +00:00
Vikas Nale
ef2fdf899c Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W 
# Conflicts:
#	src/data/menuData.json
 2025-05-07 17:31:50 +05:30
Vikas Nale
e61ba5b53a remove unused menus 2025-05-07 17:29:58 +05:30
Pramod Mahajan
5427fda41e Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity 2025-05-07 17:01:31 +05:30
Vikas Nale
3607bdc77d increase page size 2025-05-07 16:43:21 +05:30