97 Commits

Author SHA1 Message Date
5ec982778d added view team memeber and all employee 2025-07-15 10:21:17 +05:30
59190cf086 Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging. 2025-07-14 12:27:53 +05:30
Pramod Mahajan
01591c429e added generic modal for edit profile 2025-07-09 16:37:09 +05:30
Pramod Mahajan
fca3f03a44 fixed searching for employee 2025-07-09 14:33:21 +05:30
Pramod Mahajan
8676ff24a5 handle to prevent unwanted api calling 2025-07-06 15:51:46 +05:30
Pramod Mahajan
9961b4aba7 removed unused code 2025-07-04 10:49:35 +05:30
Pramod Mahajan
52c5e3d2d2 integrated reactquery for project infra 2025-07-02 13:20:17 +05:30
Pramod Mahajan
2f110b7ead Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-02 09:49:20 +05:30
bb9c351189 Changes in Search text. 2025-06-30 18:29:03 +05:30
Pramod Mahajan
cfa1c6366d added props type of emp for call api purpose 2025-06-27 15:56:23 +05:30
Pramod Mahajan
fa32913e34 Replaced normal hooks to react-query Hook - Employee 2025-06-26 12:28:02 +05:30
Pramod Mahajan
237fea186b Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-24 16:45:05 +05:30
Pramod Mahajan
22c6072c32 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-24 16:31:54 +05:30
Pramod Mahajan
928a50432d fixed restore selected project when toggling off "Show All Employees" 2025-06-23 21:30:36 +05:30
d8269cfbe8 Changes in search employee when double error message is shown. 2025-06-23 12:30:16 +00:00
589ba569f6 Correction in search function in Employees. 2025-06-23 12:30:16 +00:00
9f6d7580e3 Ensured all table headers and cells are left-aligned for consistent layout and better readability. 2025-06-23 12:30:16 +00:00
Pramod Mahajan
5c492fc932 changed modal , added global model 2025-06-23 17:40:30 +05:30
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
41af98e340 The current behavior is that when the "All Employees" filter is off, the system should display employees only for the globally selected project, not all employees. 2025-06-20 15:55:16 +05:30
c4c3e8d885 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 15:55:16 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30
Pramod Mahajan
00902fff9f fixed togger for active and inactive employee 2025-06-13 13:27:34 +05:30
70ac3e0344 Changes in Employee form allow searching form all the fields. 2025-06-13 00:22:23 +05:30
edf092e85e Creating a toggle button in Project Progress. 2025-06-12 23:56:43 +05:30
32fdc39e5c Changes in Manage Buckets popup and Employess component Checkbox add. 2025-06-12 17:03:35 +05:30
Pramod Mahajan
573d7828ae handle pagination - hide if record have less than 20 2025-06-11 19:02:20 +05:30
Pramod Mahajan
23bd307a37 imported missing components 2025-06-11 18:08:04 +05:30
Pramod Mahajan
ce1bdc3df7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject 2025-06-11 14:15:42 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
9b40317eb2 show change password button to self only 2025-06-10 14:40:21 +00:00
a480c3b111 Adding Change Password button on Employee Profile Page. 2025-06-10 14:40:21 +00:00
Pramod Mahajan
488a92e5d1 handled local project selection independently to avoid mutating global state 2025-06-10 16:08:30 +05:30
Pramod Mahajan
117ac31d12 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory 2025-06-10 09:47:56 +05:30
Pramod Mahajan
c7b93006d8 changed class to className 2025-06-09 13:18:34 +05:30
Pramod Mahajan
1d43470783 changed icon 2025-06-09 13:18:33 +05:30
Pramod Mahajan
33f5bb3517 Updated to make sure the client sends the correct request. Unnecessary requests are no longer sent. 2025-06-09 13:18:33 +05:30
Pramod Mahajan
71631fa68d added update assign project api 2025-06-09 13:18:33 +05:30
Pramod Mahajan
376ead7967 added modal for AssignToProject 2025-06-09 13:18:33 +05:30
Pramod Mahajan
51c02c7156 created component for assign and unassign projects for employee 2025-06-09 13:18:33 +05:30
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
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
bf097bc884 Added a popup to allow editing of employee information directly in the Employee Profile. 2025-05-12 15:45:17 +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
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