Issues_Jun_3W #226

Merged
ashutosh.nehete merged 82 commits from Issues_Jun_3W into main 2025-07-01 10:24:38 +00:00

82 Commits

Author SHA1 Message Date
73b693f826 Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W
Reviewed-on: #225
2025-07-01 09:36:03 +00:00
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
520a0e679e Merge pull request 'Correction in Login Password text box design.' (#223) from Kartik_Bug#627 into Issues_Jun_3W
Reviewed-on: #223
2025-07-01 09:33:32 +00:00
85d8434c5f Merge pull request '401 Unauthorized Error on Attendance Menu.' (#222) from KartikBug#623 into Issues_Jun_3W
Reviewed-on: #222
2025-07-01 09:32:19 +00:00
2226d54f24 Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task 2025-07-01 12:37:22 +05:30
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
2c0800f0e3 Unnecessary Blank Space Appears Below Employees in Regularization Tab. 2025-07-01 12:21:49 +05:30
e09413b23a 401 Unauthorized Error on Attendance Menu. 2025-07-01 12:19:25 +05:30
bb9c351189 Changes in Search text. 2025-06-30 18:29:03 +05:30
fb4275fb05 Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:12:28 +05:30
be0577e6d8 Changing link of ProjectNames to Projects. 2025-06-30 17:12:05 +05:30
5861288a9d Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:03:56 +05:30
7615bb9c24 Added line after each module 2025-06-30 17:03:52 +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
84563812b7 Adding cross button in Employee popup. 2025-06-30 16:42:58 +05:30
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +05:30
9c2b2d0b0e Merge pull request 'Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.' (#220) from Kartik_Enhancement#624 into Issues_Jun_3W
Reviewed-on: #220
2025-06-30 10:49:47 +00:00
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
a96d3696bb Changed the Ids of view infra and manage infra 2025-06-30 13:15:30 +05:30
d86c8a2c0b Merge pull request '"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"' (#218) from Kartik_Bug#611 into Issues_Jun_3W
Reviewed-on: #218
2025-06-30 06:43:00 +00:00
111325968d "Adding margin-bottom to the pagination section in Directory Notes." 2025-06-30 06:41:44 +00:00
baf6a4cf54 "Pagination overlaps on '+' (Add) button in Directory – bottom right corner" 2025-06-30 06:41:44 +00:00
a1b45c341a Merge pull request '"Directory filter popup closes on 'Clear' button click – it should remain open"' (#219) from Kartik_Bug#613 into Issues_Jun_3W
Reviewed-on: #219
2025-06-30 06:38:51 +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
4700ba38cd Merge pull request '"Search field height mismatch in Directory – should match Card and List view height"' (#217) from Kartik_Bug#608 into Issues_Jun_3W
Reviewed-on: #217
2025-06-30 05:18:47 +00:00
67b694c697 "Search field height mismatch in Directory – should match Card and List view height" 2025-06-28 15:06:54 +05:30
2bdaed1d83 Merge pull request 'Enhanced the Directory module by adding Notes and Contacts tabs, with view-specific controls, export options, and search functionality for Notes.' (#215) from Kartik_Task#513 into Issues_Jun_3W
Reviewed-on: #215
2025-06-27 11:43:30 +00:00
af22b95316 Merge branch 'Kartik_Task#513' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#513 2025-06-27 17:13:06 +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
a2761bdd4c Chnages in Directory for fetching data. 2025-06-27 17:13:02 +05:30
2df8187ade Changes in Directory. 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
b39aa2302d remove divider line. 2025-06-27 16:59:24 +05:30
45dadc88a2 upadating directory filter in design. 2025-06-27 16:57:57 +05:30
77cd8357cd Clear button is working at filter. 2025-06-27 16:04:15 +05:30
deb7100899 In Directory changing filter logic and adding popup. 2025-06-27 15:47:36 +05:30
Pramod Mahajan
f932a4c5a4 added condition for directory, for hide project dropdown 2025-06-27 11:45:29 +05:30
Pramod Mahajan
d1250739f9 fixed vertical scrolling layout 2025-06-27 10:59:41 +05:30
abc8bd8629 In Directory Inhance Filter in Notes add Clear button and space between checkbox and name. 2025-06-26 17:11:54 +05:30
d6d0fd9d14 Chnages in Directory for fetching data. 2025-06-26 11:30:07 +05:30
0a6d5746ed Changes in Directory. 2025-06-26 10:32:43 +05:30
7898d1ad81 Some Changes in Directory in Search functionality and Filter by Names. 2025-06-26 10:09:24 +05:30
8916e25940 Adding filteration according to names. 2025-06-25 17:58:11 +05:30
5e9e4a7bbf In directory Creating a tab view and add notes view. 2025-06-25 12:28:58 +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
8f919436aa Merge pull request 'Ensured all table headers and cells are left-aligned for consistent layout and better readability.' (#214) from Kartik_Enhancement#517 into Issues_Jun_3W
Reviewed-on: #214
2025-06-23 12:30:16 +00:00
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
a682f20f81 Merge pull request 'Adding Export button in Directory.' (#213) from Kartik_Task#512_Exportbutton into Issues_Jun_3W
Reviewed-on: #213
2025-06-23 12:28:45 +00:00
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
089bfecfd3 Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-20 16:01:19 +05:30
6accbb3500 Add the weekday name (e.g., Monday) when hovering over a data point in the Project. 2025-06-20 15:55:17 +05:30
290b2d37d1 Remove the border from the 'Category' column in the list view of the directory. 2025-06-20 15:55:16 +05:30
882e3dd414 Project Address Text Overflow. 2025-06-20 15:55:16 +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
246784c18a Merge pull request 'Add the weekday name (e.g., Monday) when hovering over a data point in the Project.' (#211) from Kartik_Task#511 into Issues_Jun_3W
Reviewed-on: #211
2025-06-20 09:13:07 +00:00
a6d3d2656b Add the weekday name (e.g., Monday) when hovering over a data point in the Project. 2025-06-20 09:13:07 +00:00
cffa683b20 Merge pull request 'Remove the border from the 'Category' column in the list view of the directory.' (#210) from Kartik_Bug#510 into Issues_Jun_3W
Reviewed-on: #210
2025-06-20 09:11:25 +00:00
4c1934518d Remove the border from the 'Category' column in the list view of the directory. 2025-06-20 09:11:25 +00:00
33b14208ec Merge pull request 'Project Address Text Overflow in the project card.' (#209) from Kartik_Bug#509 into Issues_Jun_3W
Reviewed-on: #209
2025-06-20 09:10:37 +00:00
a5161756c3 Project Address Text Overflow. 2025-06-20 09:10:37 +00:00
0131dfaa29 Merge pull request 'The search functionality in the Employees section does not work correctly after applying a filter.' (#208) from Kartik_Bug#508 into Issues_Jun_3W
Reviewed-on: #208
2025-06-20 09:09:18 +00:00
a2a8e90350 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 09:09:18 +00:00
33c3bb1282 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 09:09:18 +00:00
8e3ac744c0 Merge pull request 'pramod_Bug#494 : update axios client and auth repository for public/private route handling' (#207) from pramod_Bug#494 into Issues_Jun_3W
Reviewed-on: #207
2025-06-20 09:08:07 +00:00
Pramod Mahajan
39ee2d58ce refactor: update axios client and auth repository for public/private route handling 2025-06-20 09:08:07 +00:00
8ac9c64bf4 Add cards in project list and diectory list views 2025-06-20 14:33:51 +05:30