|
|
198e31290c
|
updated project files
|
2025-09-28 22:15:07 +05:30 |
|
|
|
482f8a9bcb
|
added organization api in repo. and removed unuse files
|
2025-09-27 23:54:44 +05:30 |
|
|
|
3233043cf2
|
initial setup for assign emp to project
|
2025-09-27 09:29:59 +00:00 |
|
|
|
4fd6e5cc1a
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-27 10:33:40 +05:30 |
|
|
|
db815ba038
|
Rmoving Refresh icon and Label in Tenant.
|
2025-09-26 11:51:55 +05:30 |
|
|
|
53fa013c39
|
split projectList component
|
2025-09-26 11:47:03 +05:30 |
|
|
|
91dcd7c132
|
The images on the Forgot page and Request Demo page should be centered after the update.
|
2025-09-26 10:53:31 +05:30 |
|
|
|
7d18edfa9b
|
added tenant selection path within otp sign in way
|
2025-09-26 10:01:09 +05:30 |
|
|
|
fb08e48edd
|
added iniial state of daly progress filte panel
|
2025-09-25 19:30:55 +05:30 |
|
|
|
978a497f28
|
Inconsistent search bar height in Tenant module
|
2025-09-25 09:19:07 +00:00 |
|
|
|
84f9cb2e29
|
Change all create button UI.
|
2025-09-25 09:17:56 +00:00 |
|
|
|
92b1531b75
|
daily task planning filtering according to service
|
2025-09-25 14:11:04 +05:30 |
|
|
|
57edd92dce
|
fixed blocking of dailyprogress by using pagination
|
2025-09-25 12:36:55 +05:30 |
|
|
|
521e6690cb
|
uncommit important stuff
|
2025-09-24 15:09:34 +05:30 |
|
|
|
1286184e1f
|
Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default
|
2025-09-24 07:20:45 +00:00 |
|
|
|
4e315aafcf
|
added small ui changed like table b-padding, button size and fixd delete activity and group
|
2025-09-24 12:49:00 +05:30 |
|
|
|
52e12426af
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-23 17:49:01 +05:30 |
|
|
|
d975664023
|
integrated service group wise activity operation delete,edit and create
|
2025-09-23 17:48:56 +05:30 |
|
|
|
4683eff749
|
In the ProjectList view, when we select 'View Details', the project is automatically set to 'marcosecure' instead of the selected project.
|
2025-09-23 11:06:16 +05:30 |
|
|
|
772a3e2829
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 18:44:13 +05:30 |
|
|
|
ca7b0cda13
|
initially setup of service management
|
2025-09-22 18:44:05 +05:30 |
|
|
|
c609387924
|
Changes in Organization popup
|
2025-09-22 16:00:24 +05:30 |
|
|
|
69cc3b9383
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 13:13:22 +05:30 |
|
|
|
6ebbc853bc
|
optimized logout fun and intergrated inside Tenant selection page
|
2025-09-22 13:13:13 +05:30 |
|
|
|
71dd35adc2
|
Changes in Services Dropdown.
|
2025-09-22 12:40:00 +05:30 |
|
|
|
533b40d1bf
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 10:31:06 +05:30 |
|
|
|
42a80bbd68
|
removed unused code
|
2025-09-22 10:30:57 +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 |
|
|
|
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 |
|
|
|
4afe43d116
|
handle one tenant have , directly move to dashboard once logged
|
2025-09-22 00:09:34 +05:30 |
|
|
|
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 |
|
Pramod
|
3e5afe0bc6
|
revertlogin initial steup in organization_management brnach
|
2025-09-21 10:13:12 +05:30 |
|
Pramod
|
070fa93fca
|
initially setup login
|
2025-09-21 10:06:38 +05:30 |
|
Pramod
|
e610cc08c1
|
changed Uii for org. or project assigned
|
2025-09-20 18:47:09 +05:30 |
|
|
|
2e3e3aa6ca
|
Merge pull request 'Adding Filter Icon in Attendance tab and add functionality in all Attendance component.' (#416) from Kartik_Task_AttFilter#1235 into Organization_Management
Reviewed-on: #416
|
2025-09-20 06:45:11 +00:00 |
|
|
|
158c934a9f
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-20 12:14:40 +05:30 |
|
|
|
f6d864d42e
|
assign to project and Tenant flow is integrated with api
|
2025-09-20 12:14:34 +05:30 |
|
|
|
90b96864be
|
Changes in Attendance filter
|
2025-09-20 12:13:49 +05:30 |
|
|
|
5a048f7066
|
Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413) from Kartik_Task_DailyProgress#1232 into Organization_Management
Reviewed-on: #413
|
2025-09-20 06:22:43 +00:00 |
|
|
|
731d2dbed7
|
Changes in Infrastructure.
|
2025-09-20 11:51:32 +05:30 |
|
|
|
25de45b31b
|
Merge pull request 'Adding Dropdown in Daily Task Planning and call api.' (#412) from Kartik_Task_DailyTask#1231 into Organization_Management
Reviewed-on: #412
|
2025-09-20 06:09:58 +00:00 |
|
|
|
58b5da1793
|
Changes in Daily Task planning
|
2025-09-20 11:39:14 +05:30 |
|
|
|
9bdcc74486
|
Adding Filter Icon in Attendance tab and add functionality in all Attendance component.
|
2025-09-20 10:28:18 +05:30 |
|
|
|
005fdb3490
|
added assigned org to project
|
2025-09-19 23:46:06 +05:30 |
|
|
|
9223f7a176
|
Adding Card in Daily Progress Report.
|
2025-09-19 20:03:36 +05:30 |
|
|
|
27b62c858d
|
Change the position of Datepicker and Dropdown box.
|
2025-09-19 19:50:50 +05:30 |
|
|
|
e9d8b6daea
|
Adding Dropdown and API call in Daily Progress Report.
|
2025-09-19 16:43:44 +05:30 |
|
|
|
9b37288901
|
Adding Dropdown in Daily Task Planning and call api.
|
2025-09-19 16:32:34 +05:30 |
|
