1245 Commits

Author SHA1 Message Date
164f3cc02f Implemented signalR for create and update project 2025-06-12 19:39:56 +05:30
f8ee3d3a86 Changed some functionallity in attendance 2025-06-12 11:05:10 +05:30
792529776c Implemented attendance funcationality in attendance module 2025-06-11 23:23:14 +05:30
369343f1d5 Added lognpolling in signalR request 2025-06-11 15:05:27 +05:30
4cf3b391db Added base url in signalrServies 2025-06-11 12:23:39 +05:30
8682edb1d7 Change ../services/signalRService from ../services/SignalRService 2025-06-11 12:05:09 +05:30
72f0266462 Avoided API calls 2025-06-11 10:59:23 +05:30
9c8575a653 Implmeneted signalR in today's attendance 2025-06-11 10:20:53 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
93d807cca8 Merge pull request 'Adding Change Password button on Employee Profile Page.' (#198) from Kartik_Task#491 into main
Reviewed-on: #198
2025-06-10 14:40:21 +00:00
a77f7cecbb change password label change 2025-06-10 14:40:21 +00:00
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
c2c9fd01fc Merge pull request 'Updation In Daily Progress Report filter icon.' (#197) from Kartik_Task#486 into main
Reviewed-on: #197
2025-06-10 14:26:57 +00:00
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
7eff9d8c3a Merge pull request 'Adds the shortName field to be displayed in:' (#200) from Ashutosh_Enhancement#496_ShortName into main
Reviewed-on: #200
2025-06-10 14:19:14 +00:00
ad1ad667b1 Adds the shortName field to be displayed in:
- Project Card Component
- Project List Component
- Project Profile Component
2025-06-10 16:31:49 +05:30
435fa730b6 conmatic changes in avatar header menu drop down
- add link for settings
- remove billing
2025-06-10 13:45:30 +05:30
ff8fca72fa Add cosmatc changes for font sizes 2025-06-10 13:16:44 +05:30
c3a52c46eb Add cosmatic changes 2025-06-10 12:46:53 +05:30
Pramod Mahajan
9573daa8b0 changed toggle nutton position for well UI 2025-06-10 11:19:59 +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
bab312b9ee Merge pull request 'Incorrect Old Password Shows Improper Error Message on Change Password Screen' (#196) from Kartik_Bug#490 into Issue_Jun_1W_2
Reviewed-on: #196
2025-06-09 12:31:31 +00:00
e079be39db Incorrect Old Password Shows Improper Error Message on Change Password Screen 2025-06-09 17:53:17 +05:30
69a907860b Merge pull request 'Employee Details Page Showing "NA" for All Fields.' (#195) from Kartik_Bug#485 into Issue_Jun_1W_2
Reviewed-on: #195
2025-06-09 11:56:48 +00:00
63980db512 Employee Details Page Showing "NA" for All Fields. 2025-06-09 11:56:48 +00:00
1390c655b4 Merge pull request 'Implement a spinner in the Daily Progress Report to indicate when data is being loaded.' (#194) from Kartik_Bug#487 into Issue_Jun_1W_2
Reviewed-on: #194
2025-06-09 11:54:49 +00:00
19f58345d9 add cosmati changes 2025-06-09 11:54:49 +00:00
e2f3814934 Implement a spinner in the Daily Progress Report to indicate when data is being loaded. 2025-06-09 11:54:49 +00:00
9da151ca9a Merge pull request 'Creating a Change Password popup.' (#189) from Kartik_Task#460 into Issue_Jun_1W_2
Reviewed-on: #189
2025-06-09 11:38:35 +00:00
3857fec32e add cosmatic changes 2025-06-09 11:38:35 +00:00
3a45f80f36 Changes in Change Password Popup improve its layout and functionality. 2025-06-09 11:38:35 +00:00
b4b64c4c91 Creating a Change Password page. 2025-06-09 11:38:35 +00:00
Pramod Mahajan
7dea047536 Cancel button disabled is on when processing form 2025-06-09 15:33:21 +05:30
Pramod Mahajan
3256a68d1c added getcontacts api 2025-06-09 15:27:56 +05:30
Pramod Mahajan
d4f0662f57 resolved conflict 2025-06-09 15:06:04 +05:30
Pramod Mahajan
93c1fb1844 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-06-09 13:21:03 +05:30
Pramod Mahajan
0886990f9d if have't any bucket user can't create contacts 2025-06-09 13:18:34 +05:30
Pramod Mahajan
c7b93006d8 changed class to className 2025-06-09 13:18:34 +05:30
Pramod Mahajan
b71ca1c7fb resolve React key duplication warning in Breadcrumb component 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
e3731cab5f added refetch function for recall after takng any assign or unassign project for update 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
0b99238fa8 added api's for fetching projects by employee and update project assigning for employee 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
Pramod Mahajan
977397d31f added new hook for fetching projects associated by perticular employee 2025-06-09 13:18:32 +05:30
Pramod Mahajan
b77389284c enhance UX for loading and empty states in contact table 2025-06-09 13:18:32 +05:30
Pramod Mahajan
29ef1e4016 enhance UX for loading and empty states in contact table 2025-06-09 13:18:32 +05:30