1699 Commits

Author SHA1 Message Date
e26fafeba3 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:29:27 +05:30
e2eaced0ea Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:29:27 +05:30
386c98bdc3 Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-14 12:29:27 +05:30
b659dbd9ea Sizing for the projects directory has been corrected. 2025-07-14 12:29:27 +05:30
117dae81e4 UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects. 2025-07-14 12:28:21 +05:30
63c6d74434 On Change Password popup cross button is now working on click on it. 2025-07-14 12:28:21 +05:30
f0ab6efb36 Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:28:21 +05:30
fc8a3ce109 There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost." 2025-07-14 12:28:21 +05:30
bb32c3925d Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-14 12:28:21 +05:30
f7ea1aa60a Saved Username and Password Not Visible on Login Page Load 2025-07-14 12:27:53 +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
09e7ba3695 Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery. 2025-07-14 12:27:53 +05:30
9aa49989de Project List - update project plannedWork and completedWork based on task changes 2025-07-14 00:51:32 +05:30
c12efe3061 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-11 17:47:19 +05:30
58fe364821 Merge pull request 'React Query Integration for Server State Sync in Clinet' (#245) from react-query into main
Reviewed-on: #245
2025-07-11 11:32:18 +00:00
a14f2b0738 Merge pull request 'In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.' (#250) from Kartik_Bug#730 into Issues_July_2W
Reviewed-on: #250
Merged
2025-07-11 11:06:53 +00:00
a73ac284bd In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled. 2025-07-11 16:25:03 +05:30
6dc6ee6f3c Merge pull request 'Creating a custom hook for ImageGallery to call an API.' (#249) from Kartik_Task#728 into Issues_July_2W
Reviewed-on: #249
Merged
2025-07-11 07:46:07 +00:00
f8fb095896 Creating a custom hook for ImageGallery to call an API. 2025-07-11 13:13:44 +05:30
b389839b94 Merge pull request 'Implementing a paste functionality in OTP login where the user can directly paste the OTP.' (#248) from Kartik_Bug#727 into Issues_July_2W
Reviewed-on: #248
Merged
2025-07-11 07:20:12 +00:00
a288f5f9de Implementing a paste functionality in OTP login where the user can directly paste the OTP. 2025-07-11 07:20:12 +00:00
9a9ff4460f Merge pull request 'In filter DatePicker should not display dates in Image Gallery.' (#238) from Kartik_Bug#679 into Issues_July_2W
Reviewed-on: #238
Merged
2025-07-11 07:13:52 +00:00
f5c6382952 Changes in Date picker . 2025-07-11 07:13:52 +00:00
b36986d1c2 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-11 07:13:52 +00:00
788a096f00 In filter DatePicker should not display dates in Image Gallery. 2025-07-11 07:13:52 +00:00
0a0f0046cc Merge pull request 'In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.' (#247) from Kartik_Bug#725 into Issues_July_2W
Reviewed-on: #247
Merged
2025-07-11 05:36:37 +00:00
Pramod Mahajan
5f54f5e29a added project status label that was missing, during changed structure of project details 2025-07-10 18:12:45 +05:30
722b85752a In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-10 16:58:25 +05:30
Pramod Mahajan
c018ffa455 if assigned employee to project, that employees should display instantly inside Assigned task view and employee list 2025-07-10 13:18:04 +05:30
200888ff99 Merge pull request 'Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.' (#237) from Kartik_Bug#650 into Issues_July_2W
Reviewed-on: #237
2025-07-10 05:22:26 +00:00
ab75fcf20c Merge pull request 'Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.' (#244) from Kartik_Bug#640 into Issues_July_2W
Reviewed-on: #244
2025-07-10 05:20:53 +00:00
fc8f6375c1 Merge pull request 'UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.' (#236) from Kartik_bug#649 into Issues_July_2W
Reviewed-on: #236
2025-07-10 05:18:09 +00:00
Pramod Mahajan
fe4426af9e fixed project updation in project about 2025-07-09 16:59:36 +05:30
Pramod Mahajan
01591c429e added generic modal for edit profile 2025-07-09 16:37:09 +05:30
Pramod Mahajan
bba4315a8e clear button class changed primary to secondary in manage employee form 2025-07-09 16:28:14 +05:30
Pramod Mahajan
2d33eede45 changed class to clasName 2025-07-09 16:26:40 +05:30
bae48be2b5 Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-09 16:06:30 +05:30
Pramod Mahajan
710af87db1 removed custome hook for loading state, becuase react-hook provide own state 2025-07-09 16:04:39 +05:30
588104a9dd Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-09 15:15:53 +05:30
Pramod Mahajan
fca3f03a44 fixed searching for employee 2025-07-09 14:33:21 +05:30
7bab8b7551 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-09 13:32:12 +05:30
f53b88f946 Merge pull request 'On Change Password popup cross button is now working on click on it.' (#243) from Kartik_Bug#713 into Issues_July_2W
Reviewed-on: #243
2025-07-09 07:32:11 +00:00
9b99be6c0d Merge pull request 'Increase the size of Tabs text in Attendance and Projects.' (#242) from Kartik_Bug#712 into Issues_July_2W
Reviewed-on: #242
2025-07-09 07:32:02 +00:00
3f43f56020 Merge pull request 'There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."' (#241) from Kartik_Bug#681 into Issues_July_2W
Reviewed-on: #241
2025-07-09 07:27:48 +00:00
cbfaf3cf35 Merge pull request 'Assigned Task Should Be Visible to Normal User Without Showing Assign Button.' (#240) from Kartik_Bug#648 into Issues_July_2W
Reviewed-on: #240
2025-07-09 07:18:15 +00:00
2e66372f54 Merge pull request 'Saved Username and Password Not Visible on Login Page Load' (#239) from Kartik_Bug#678 into Issues_July_2W
Reviewed-on: #239
2025-07-09 07:16:12 +00:00
235106b9db Merge pull request 'Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.' (#235) from kartik_Bug#540 into Issues_July_2W
Reviewed-on: #235
2025-07-09 07:08:57 +00:00
31e5b48a4b Merge pull request 'Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.' (#233) from Kartik_Bug#667 into Issues_July_2W
Reviewed-on: #233
2025-07-09 07:06:18 +00:00
f8192ae1ca Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-09 12:18:41 +05:30
Pramod Mahajan
d818ea9265 vissible data after updated inside projecr details page 2025-07-09 11:48:42 +05:30