1970 Commits

Author SHA1 Message Date
a537da6eff Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-16 10:12:47 +05:30
241217e7cc changed folder name for Tenant 2025-08-16 10:11:19 +05:30
4af5ba8a6d added upgraded subscription functionality 2025-08-16 09:43:11 +05:30
6e300389e3 added table for history plans 2025-08-14 18:34:06 +05:30
0acd733710 handle upgrad plan 2025-08-14 17:45:01 +05:30
b9bd4e7e18 removed extra validation errors 2025-08-14 17:40:29 +05:30
31f152db65 added updated functionality 2025-08-13 17:09:18 +05:30
1772a2fcd1 Merge pull request 'profile_page : Modify Employee Profile Page' (#335) from profile_page into main
Reviewed-on: #335
merged
2025-08-13 04:44:31 +00:00
af544861d2 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-13 10:13:25 +05:30
f387a56d7b optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-13 10:13:15 +05:30
8e12528e3a Add api to fetch employee project allocation 2025-08-13 10:03:44 +05:30
874f123d4c Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 17:48:47 +05:30
926594c0a5 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 17:48:36 +05:30
fb2dcf073c Add api to fetch employee project allocation 2025-08-12 17:44:04 +05:30
f946c38aae Created new layout for employee profile page 2025-08-12 17:39:09 +05:30
c211f407e8 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 16:27:58 +05:30
8117e60bff optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:27:26 +05:30
80ede060cb fixed column size base dvice size 2025-08-12 16:27:26 +05:30
e39a69ab8b handle error due to data loading 2025-08-12 16:27:25 +05:30
fa3ff291c8 display employee tasks in emp profile 2025-08-12 16:27:25 +05:30
beefe6396c - Add date format hook
- add Ui for Activities
2025-08-12 16:27:25 +05:30
210d16c765 Handle null variable 2025-08-12 16:24:59 +05:30
cb23a5b051 Add api to fetch employee project allocation 2025-08-12 16:24:59 +05:30
f52b68dc46 ui improvements - dashbord attendance report toggle icons change 2025-08-12 16:24:59 +05:30
ab013c29f0 change favicon 2025-08-12 16:24:59 +05:30
c350574171 - Add project list on emplyee profile
- Add image as per gender
2025-08-12 16:24:59 +05:30
90d8b82c69 - Remove consoe log
- Handle projects dropdown hidden on profile page
2025-08-12 16:24:59 +05:30
1c0a6d8a89 Created new layout for employee profile page 2025-08-12 16:24:59 +05:30
16f70067e7 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:22:34 +05:30
f581b0e311 resolved filter issues 2025-08-12 14:53:48 +05:30
56b5633c51 handle error if features missing 2025-08-12 12:13:04 +05:30
e466fd27be prevent to display description if data not have 2025-08-12 11:13:16 +05:30
d25cc3531e added Tenant Profile 2025-08-11 20:24:04 +05:30
2d7adbac14 initial setup for tenant profile 2025-08-09 17:36:14 +05:30
25f5ff27b1 added skeleton and refresh button 2025-08-09 13:01:32 +05:30
4bff065153 added pagination and partially added filter 2025-08-09 10:30:06 +05:30
fb3b55c694 added spinkit loader and integrated inside projectDeatils and InfraPlanning 2025-08-08 14:11:22 +05:30
412c2118c9 Merge branch 'Tenant_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-08 11:27:20 +05:30
4ff01d0e60 success fully created tenant with subscription 2025-08-08 11:26:17 +05:30
fbc53e9ea1 integrated tenant creation and addsubscription 2025-08-08 11:26:16 +05:30
34b429c28c tenant and subscript form full setup 2025-08-08 11:25:18 +05:30
1dc038c965 tenant creating layout setup properly 2025-08-08 11:21:46 +05:30
12cbf576e1 create new tenant app 2025-08-08 11:21:46 +05:30
5e28f9e372 initially setup tenant manag. setup wizard-form and properly manage data. handle two sperate form with on wizard 2025-08-08 11:21:46 +05:30
f093b5f532 fixed column size base dvice size 2025-08-08 10:40:09 +05:30
edf1bb9601 handle error due to data loading 2025-08-08 10:39:00 +05:30
f9e9e2b326 Merge pull request 'Expense_Manangement_Feature' (#328) from Expense_Manangement_Feature into main
Reviewed-on: #328
2025-08-07 12:31:37 +00:00
6113bc66c6 Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:57:55 +05:30
acfa254718 correct date picker 2025-08-07 17:57:46 +05:30
6a3f9e57d9 added proper date 2025-08-07 17:57:22 +05:30