324 Commits

Author SHA1 Message Date
a6169c106f Changes in Filter drower increase its size. 2025-07-04 11:31:35 +05:30
09906420a6 Adding Date Range picker in filter dropdown. 2025-07-04 10:18:18 +05:30
a94facb062 Changes in Directory filter adding clear and apply button and calling api at the time apply filter. 2025-07-03 14:49:18 +05:30
99601095b5 To show ImageGallery in our project. 2025-07-02 18:28:08 +05:30
50f941aef6 Merge pull request '"OTP Sent Successfully" Message Displayed After Sending OTP' (#224) from Kartik_Bug#625 into Issues_Jun_3W
Reviewed-on: #224
2025-07-01 09:34:14 +00:00
5d99f11297 "OTP Sent Successfully" Message Displayed After Sending OTP 2025-07-01 12:33:57 +05:30
390a0b2b67 Correction in Login Password text box design. 2025-07-01 12:29:39 +05:30
bb9c351189 Changes in Search text. 2025-06-30 18:29:03 +05:30
7dffae8957 Merge pull request 'Changes in the employee popup size.' (#221) from Kartik_Bug#524 into Issues_Jun_3W
Reviewed-on: #221
2025-06-30 11:16:51 +00:00
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +05:30
0b54e0b5f1 Changes in Directory Notes Filter. 2025-06-30 10:49:47 +00:00
9554caf25f Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor. 2025-06-30 10:49:47 +00:00
da69ae6fec "In the Directory Notes, applying a filter changes the Clear button's state and color." 2025-06-30 06:38:51 +00:00
48d1592b8c "Directory filter popup closes on 'Clear' button click – it should remain open" 2025-06-30 06:38:51 +00:00
67b694c697 "Search field height mismatch in Directory – should match Card and List view height" 2025-06-28 15:06:54 +05:30
58c17ffe37 remove divider line. 2025-06-27 17:13:02 +05:30
c7cd96f509 upadating directory filter in design. 2025-06-27 17:13:02 +05:30
92ad8485f6 Clear button is working at filter. 2025-06-27 17:13:02 +05:30
9396caea57 In Directory changing filter logic and adding popup. 2025-06-27 17:13:02 +05:30
d646711637 In Directory Inhance Filter in Notes add Clear button and space between checkbox and name. 2025-06-27 17:13:02 +05:30
35d5310cee Some Changes in Directory in Search functionality and Filter by Names. 2025-06-27 17:13:02 +05:30
52b796700d Adding filteration according to names. 2025-06-27 17:13:01 +05:30
3e0b4edf4a In directory Creating a tab view and add notes view. 2025-06-27 17:12:06 +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
e0047378d1 updated reported btn after reported once. 2025-06-24 12:21:25 +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
c8707fe7b1 changed input size 2025-06-23 17:43:11 +05:30
Pramod Mahajan
5c492fc932 changed modal , added global model 2025-06-23 17:40:30 +05:30
Pramod Mahajan
cd5e9291ae replace old modal to GlobalModal 2025-06-23 16:39:35 +05:30
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
056bd63869 Adding Export button in Directory. 2025-06-20 17:12:50 +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
Pramod Mahajan
5a13313bbd refactor: update axios client and auth repository for public/private route handling 2025-06-20 15:55:16 +05:30
38374caab3 Add cards in project list and diectory list views 2025-06-20 15:53:30 +05:30
Pramod Mahajan
52a578972e Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505 2025-06-19 16:48:47 +05:30
Pramod Mahajan
4cda7fdcfd added approve task feature 2025-06-19 16:44:41 +05:30
ade3401d02 Persist project changes on multiple create/update operations.Ensures that project information changes (creation or updates) are correctly persisted when performed consecutively in the project list 2025-06-19 10:42:43 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +05:30
Pramod Mahajan
f58aa8cb18 added new modal for create sub task 2025-06-17 20:46:46 +05:30
6f247fb0e9 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.web into SingalR_Integration 2025-06-17 17:19:02 +05:30
fdff7f7b41 Fixed rebase conflicts 2025-06-17 17:18:59 +05:30
24dc481169 Implemented signalR for create and update project 2025-06-17 17:18:28 +05:30
351e5a2b0d Implemented attendance funcationality in attendance module 2025-06-17 17:14:25 +05:30
b767641643 Avoided API calls 2025-06-17 17:11:30 +05:30
b24edba8f7 Implmeneted signalR in today's attendance 2025-06-17 17:11:29 +05:30