418 Commits

Author SHA1 Message Date
8fc49ab4a7 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-03 12:14:41 +05:30
36f5edf4f5 UI updation in all popups. 2025-12-03 11:42:44 +05:30
3e3ff189c9 changed class to className 2025-12-03 10:10:36 +05:30
711dfb8f00 Correction in Project Statistics. 2025-11-26 12:19:44 +00:00
c669eb90c3 Correction in List view alignment. 2025-11-24 11:16:57 +00:00
4d2e37f52e Adding Message for Card and list view in Services and Infra 2025-11-24 11:16:57 +00:00
e7fddd41c2 added branch for projects 2025-11-19 21:28:01 +05:30
9e47f10440 updated padding of multi- select tag 2025-11-18 17:56:17 +05:30
a61e621ce2 Merge pull request 'Kartik_Bug#1737 :- UI Implementation in Expense Weidget.' (#507) from Kartik_Bug#1737 into Service_Project_Managment
Reviewed-on: #507
2025-11-17 13:01:33 +00:00
767475c7e5 Adding Create Service Project and Create Infra project project at ManageProject. 2025-11-17 17:53:01 +05:30
d95ba4c800 added changes status fun 2025-11-17 17:06:05 +05:30
64d96d46d0 Correction in UI in Dashboard weidget. 2025-11-14 12:58:47 +05:30
b13034a995 Expense widget - Layout change 2025-11-13 15:14:07 +05:30
d7f00898a0 added delete service project 2025-11-12 19:38:04 +05:30
1bba9ab68a added created, fetch and edit operration 2025-11-12 18:12:37 +05:30
5c1b14bd38 added create service project and separated service project and orgnaization project 2025-11-12 14:18:43 +05:30
1c64fac499 Adding Spinners in all files. 2025-10-31 15:06:11 +05:30
0b02531909 Adding Table-respnsive in projectNav. 2025-10-15 11:33:09 +05:30
b80af5467c Changes in Infrastructure. 2025-10-14 15:07:07 +05:30
b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams 2025-10-13 09:33:09 +00:00
12b632f087 added new api for list of org 2025-10-11 18:06:51 +05:30
6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. 2025-10-11 17:48:25 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
8fd4e7f3f1 added space between first and last name 2025-10-11 16:30:27 +05:30
a2067e150d fixed service list show 2025-10-10 17:51:12 +05:30
edce5ef614 added newhook that return only organization employee for employee list (Active or Inactive) 2025-10-10 16:48:22 +05:30
3cc4f0b416 mismatch service api fixed 2025-10-10 14:15:30 +05:30
f8095ac9bf upgraded progress 2025-10-10 10:55:51 +05:30
aecaee7116 addded project when project goin to update state 2025-10-09 15:38:59 +05:30
470421b730 added two date and service-name column inside ProjectAssignedOrgslist and fixed inactive fn in project team 2025-10-06 10:58:07 +05:30
9c6450496e added closed fun after create project and changed label name 2025-09-30 14:22:01 +05:30
764b145ad9 empty select activity, planne work fields after successfully created task 2025-09-29 18:31:56 +05:30
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
fdbd81c5e7 removed console 2025-09-29 15:13:36 +05:30
28d5ef653d added optional chain for manage project to prevent run time error 2025-09-29 15:10:49 +05:30
550b142d74 fixed run time date error 2025-09-29 15:03:52 +05:30
375c482b61 renamed Inactive to Includes Inactive 2025-09-29 12:04:33 +05:30
198e31290c updated project files 2025-09-28 22:15:07 +05:30
7455d8a221 Add extra spacing in Infra Work details. 2025-09-27 09:38:34 +00:00
112e0ff798 Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure) 2025-09-27 09:35:27 +00:00
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
265c74f079 added filter and sorted employee list - Team 2025-09-27 09:29:59 +00:00
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
3233043cf2 initial setup for assign emp 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
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
1fb8eb9ef1 Create Task popup will open at all the time while submitting. 2025-09-26 16:21:37 +05:30
53fa013c39 split projectList component 2025-09-26 11:47:03 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
38bd8d36c0 Correction of Delete Employee Popup Texts 2025-09-25 09:21:54 +00:00