161 Commits

Author SHA1 Message Date
c438b51ef1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-24 13:04:39 +05:30
e5b01e9e0f added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-24 06:41:58 +00:00
43ecdadfa9 added paymentadjustment head crud operation 2025-10-24 06:41:58 +00:00
9527427f47 added provideAll is flag inside basic projctname api 2025-10-24 06:41:58 +00:00
10fc88c022 added mark as completd api operation 2025-10-24 06:41:58 +00:00
3b0097f46b integrated editcollection and vew douments 2025-10-24 06:41:58 +00:00
ecd726bbb1 integrated comment api added comment and payments history inside view collection 2025-10-24 06:41:58 +00:00
edae70f8af integrated collection details api 2025-10-24 06:41:58 +00:00
a7f1ba97c3 Creating new weidgets in Dashboard in main. 2025-10-14 17:14:06 +05:30
9288ac1fbc successfuuly fetch data and create collection 2025-10-14 10:24:45 +05:30
376a2a397f intergrated get list and create collection 2025-10-14 00:21:19 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
91ffc5a0e0 added filter for DailyTask Report 2025-10-09 17:23:04 +05:30
ad1bef4f7b added gallery and gallery filter 2025-10-07 07:12:49 +00:00
638c033705 fixed employee name show whenever update expense - for paid by 2025-10-05 00:14:39 +05:30
6928bbd309 Changes in ProjectRepository api for getProjectInfraByProject 2025-10-04 17:50:54 +05:30
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
397020ccb4 Merge pull request 'Creating a Services in Master Compoenents.' (#408) from Master_Services into Organization_Management
Reviewed-on: #408
2025-09-22 05:00:06 +00:00
71932ea6dc Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419) from Kartik_Task_Infra#1265 into Organization_Management
Reviewed-on: #419
2025-09-22 04:07:58 +00:00
693cabf63d Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management
Reviewed-on: #420
2025-09-22 04:07:09 +00:00
b9b3788dda configured tenant level login 2025-09-21 18:59:34 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
aee510f527 revert pramod changed - (tenant login mistake 2025-09-21 16:58:29 +05:30
7e6020e3db Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-21 16:42:26 +05:30
afcd1934f9 Integrate the API for Work Area and fetch data filtered by serviceId. 2025-09-21 15:10:31 +05:30
Pramod
070fa93fca initially setup login 2025-09-21 10:06:38 +05:30
a0f7e5c57b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259 2025-09-20 19:32:41 +05:30
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
7dafd4a45f fetched assigned organozation to project 2025-09-20 13:59:20 +05:30
f6d864d42e assign to project and Tenant flow is integrated with api 2025-09-20 12:14:34 +05:30
005fdb3490 added assigned org to project 2025-09-19 23:46:06 +05:30
133024bc5c setup assigned org to project and integrated projectservice 2025-09-19 15:25:58 +05:30
08194dd8ef Creating a Services in Master Compoenents. 2025-09-19 14:18:56 +05:30
1452e77bc5 initially setup service provider form 2025-09-18 19:23:24 +05:30
0d9ef7f248 integrated fetch organization list api and display with search filter 2025-09-18 15:23:48 +05:30
a48fc1d989 fixed Modal provider component and setup organization creation 2025-09-18 15:18:04 +05:30
0a489be675 added proper global and project level permission 2025-09-16 16:08:47 +05:30
7e5b6952f5 Apply functionality for Both Notes and Contact filter 2025-09-12 17:09:48 +05:30
81e5456e1d Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-10 20:36:54 +05:30
4741025dcb set Directory page for project 2025-09-10 20:35:48 +05:30
ebab03dc9f updated method for update contact category 2025-09-10 18:52:09 +05:30