admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
1,859 Commits 236 Branches 0 Tags
Commit Graph

1859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
4bb4f8fc17 added icon for select project 2025-06-11 17:31:28 +05:30
ashutosh.nehete
369343f1d5 Added lognpolling in signalR request 2025-06-11 15:05:27 +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
Pramod Mahajan
cf75f3c1fb handle server error 2025-06-11 13:01:15 +05:30
Pramod Mahajan
195ebd4f9b handled option chain error 2025-06-11 12:54:35 +05:30
Pramod Mahajan
ad0dfdda55 handle set default project initially 2025-06-11 12:53:42 +05:30
ashutosh.nehete
4cf3b391db Added base url in signalrServies 2025-06-11 12:23:39 +05:30
ashutosh.nehete
8682edb1d7 Change ../services/signalRService from ../services/SignalRService 2025-06-11 12:05:09 +05:30
ashutosh.nehete
72f0266462 Avoided API calls 2025-06-11 10:59:23 +05:30
ashutosh.nehete
9c8575a653 Implmeneted signalR in today's attendance 2025-06-11 10:20:53 +05:30
Pramod Mahajan
def2a9b6f3 changed font size of select button 2025-06-10 23:38:16 +05:30
Vikas Nale
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
Vikas Nale
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
Vikas Nale
a77f7cecbb change password label change 2025-06-10 14:40:21 +00:00
Vikas Nale
9b40317eb2 show change password button to self only 2025-06-10 14:40:21 +00:00
Umesh Desai
a480c3b111 Adding Change Password button on Employee Profile Page. 2025-06-10 14:40:21 +00:00
Vikas Nale
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
Umesh Desai
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
Vikas Nale
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
Pramod Mahajan
18d6916fb8 first building expanded by default 2025-06-10 18:20:15 +05:30
Pramod Mahajan
78894918c0 first building by default expanded 2025-06-10 18:11:36 +05:30
Pramod Mahajan
49f15f574c handled globale select project 2025-06-10 17:55:22 +05:30
ashutosh.nehete
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
Pramod Mahajan
558b663f6b hide project selection at local level at - project progress widget 2025-06-10 16:31:35 +05:30
Pramod Mahajan
1e51fabaa1 initialized projectId with empty string to avoid undefined state 2025-06-10 16:10:24 +05:30
Pramod Mahajan
488a92e5d1 handled local project selection independently to avoid mutating global state 2025-06-10 16:08:30 +05:30
Pramod Mahajan
c1da916ca7 hide select at local level - AttendancePage 2025-06-10 15:35:30 +05:30
Pramod Mahajan
28c995bbc0 hide select at local level - Task planning 2025-06-10 15:34:05 +05:30
Pramod Mahajan
2b8764b402 hide select at local level - DailyTask 2025-06-10 15:31:43 +05:30
Pramod Mahajan
7f1ce2b863 removed unwannted code 2025-06-10 15:29:53 +05:30
Pramod Mahajan
4df293488e added select at Global level 2025-06-10 15:29:09 +05:30
Vikas Nale
435fa730b6 conmatic changes in avatar header menu drop down 
- add link for settings
- remove billing
 2025-06-10 13:45:30 +05:30
Vikas Nale
ff8fca72fa Add cosmatc changes for font sizes 2025-06-10 13:16:44 +05:30
Vikas Nale
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
ashutosh.nehete
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
Umesh Desai
e079be39db Incorrect Old Password Shows Improper Error Message on Change Password Screen 2025-06-09 17:53:17 +05:30
Vikas Nale
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
Umesh Desai
63980db512 Employee Details Page Showing "NA" for All Fields. 2025-06-09 11:56:48 +00:00
Vikas Nale
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
Vikas Nale
19f58345d9 add cosmati changes 2025-06-09 11:54:49 +00:00
Umesh Desai
e2f3814934 Implement a spinner in the Daily Progress Report to indicate when data is being loaded. 2025-06-09 11:54:49 +00:00
Vikas Nale
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
Vikas Nale
3857fec32e add cosmatic changes 2025-06-09 11:38:35 +00:00
Umesh Desai
3a45f80f36 Changes in Change Password Popup improve its layout and functionality. 2025-06-09 11:38:35 +00:00
Umesh Desai
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