166 Commits

Author SHA1 Message Date
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
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
7e05cfbd61 In Employee selection double Date is shown in Front. 2025-06-02 17:31:07 +05:30
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +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
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
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
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
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
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
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
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
0fc43bb55b minor gui changes 2025-05-08 16:45:33 +05:30
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
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
ef2fdf899c Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W
# Conflicts:
#	src/data/menuData.json
2025-05-07 17:31:50 +05:30
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
3607bdc77d increase page size 2025-05-07 16:43:21 +05:30
Pramod Mahajan
7c7b5a9be7 changed class to className 2025-05-07 16:42:19 +05:30
Pramod Mahajan
f3bedf5826 handled console error 2025-05-07 16:41:25 +05:30
e795881c79 Implemented date-wise grouping of the Attendance Log based on the selected date range. 2025-05-07 16:04:38 +05:30
50f48d27f2 Handle menu navigation from shortcut so that smoot navigation happens and page does not reload 2025-05-07 15:53:03 +05:30
130fffcc16 remove minor error while code review 2025-05-07 13:16:02 +05:30
Pramod Mahajan
9c41788a6c increased modal md to lg 2025-05-07 12:49:04 +05:30
a60cd6b1a9 Added row background color and also changed message on report submit 2025-05-07 06:33:11 +00:00
25127659c8 Added fuctionality to Displayed Date-Wise Based on Selected Date Range 2025-05-07 06:33:11 +00:00
b885c9a8b9 Merge branch 'pramod_Task#185' into Issue_May_2W 2025-05-07 11:54:38 +05:30
Pramod Mahajan
679f9bec26 Add fallback error message handling with server response support 2025-05-07 06:21:25 +00:00
Pramod Mahajan
a00ab0f13d Tiggeer Toast with valide message 2025-05-07 06:21:25 +00:00
Pramod Mahajan
7ef148ac32 only display pagination if have data greather than 5 2025-05-06 22:58:27 +05:30
Pramod Mahajan
8696070249 pagination only display if have records greather than 20 2025-05-06 22:53:53 +05:30
Pramod Mahajan
099a3bcc36 handled proper loading, pagination only display if record have greather than 5 and added refresh button 2025-05-06 22:52:59 +05:30
Pramod Mahajan
6f81b99dcd Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#185 2025-05-06 22:31:42 +05:30
Pramod Mahajan
174b3f3bee removed console 2025-05-06 12:45:19 +00:00
Pramod Mahajan
1a651ac5bc after refresh attednace page, now it able get employee default selectedproject. 2025-05-06 12:45:19 +00:00