364 Commits

Author SHA1 Message Date
Pramod Mahajan
b2e1fbcf95 it send properly existen phone and email id if existen data 2025-05-19 11:24:27 +05:30
Pramod Mahajan
b296dec542 removed header - icon 2025-05-19 11:23:15 +05:30
Pramod Mahajan
3efeea55e0 added avatar 2025-05-19 11:22:45 +05:30
Pramod Mahajan
126a84b5cc modified phone no validation, accept upto min 6 and max 13 2025-05-19 11:22:30 +05:30
Pramod Mahajan
7613f36624 added avatar for name 2025-05-19 11:21:37 +05:30
Pramod Mahajan
b65be72809 increased width of name coulmn 2025-05-18 23:16:04 +05:30
Pramod Mahajan
e9903ee2f6 added new component for card View directory-contacts 2025-05-18 23:14:45 +05:30
Pramod Mahajan
28e409ff99 Uncommented reset logic on component unmount for cleanup 2025-05-18 17:13:58 +05:30
Pramod Mahajan
b6a0fb54ac Re-enabled submit and reset logic, removed console log 2025-05-18 17:13:15 +05:30
Pramod Mahajan
5f33826e61 created new component for update contact 2025-05-18 02:18:53 +05:30
Pramod Mahajan
8e06991bd3 modified as per required changes. 2025-05-18 02:18:13 +05:30
Pramod Mahajan
79ad15d572 added new props, for triggering for open modal 2025-05-18 02:16:58 +05:30
Pramod Mahajan
4d6171e1ed created new file for directory form schema 2025-05-18 02:15:30 +05:30
Pramod Mahajan
28a4f63d10 modfified TagInput for prevent multiple rendering 2025-05-18 02:14:40 +05:30
Pramod Mahajan
c2ead3cd0f created new component SelectMultiple items 2025-05-18 02:13:38 +05:30
Pramod Mahajan
b33fad1b17 created style file SelectMultiple component 2025-05-18 02:12:12 +05:30
Pramod Mahajan
c7b5a0ba7d created new contact form 2025-05-16 19:14:34 +05:30
Pramod Mahajan
085f45210e changed coulmn 2025-05-16 19:09:24 +05:30
Pramod Mahajan
7cfe04de2e modified TagInput, for array an object 2025-05-16 19:08:41 +05:30
Pramod Mahajan
1c1a1da8a0 removed backdrop 2025-05-16 19:07:15 +05:30
Pramod Mahajan
d8df891370 added createContactTg component inside MasterModal 2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768 created new createContactMaster component 2025-05-15 21:47:51 +05:30
Pramod Mahajan
40df12de86 added CreateContactCategory in master modal 2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f created new constact category master 2025-05-15 12:28:37 +00:00
Pramod Mahajan
cc98f34b44 displaye contacts in List View 2025-05-15 12:19:57 +05:30
aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role 2025-05-13 18:48:40 +05:30
c8ad72a2da added Assign_view progress task permission. 2025-05-13 12:40:10 +05:30
Pramod Mahajan
d398a6cb39 added dropdwon for action view 2025-05-13 11:32:09 +05:30
Pramod Mahajan
4fb337533e added bootstrap accordation 2025-05-13 11:30:43 +05:30
Pramod Mahajan
db098f9fdc manage floor header size for collap 2025-05-13 11:29:56 +05:30
Pramod Mahajan
aa2ca6565b Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154 2025-05-12 16:36:55 +05:30
Pramod Mahajan
bf797503f5 added accordionn for floor 2025-05-12 16:34:44 +05:30
bf097bc884 Added a popup to allow editing of employee information directly in the Employee Profile. 2025-05-12 15:45:17 +05:30
a3608a49bd remove sneat lables from application 2025-05-12 15:37:31 +05:30
a7aa815691 Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W 2025-05-12 14:49:33 +05:30
Pramod Mahajan
926168bb07 Modified report comments section. 2025-05-12 09:18:29 +00:00
e8ac267d46 Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views. 2025-05-12 14:40:13 +05:30
cf204f376d Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions. 2025-05-12 07:58:33 +00:00
8db6a16e15 revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1
revert updated regularization logic based on 48-hour checkout threshold


- This update was mistakenly implemented in the wrong branch. Moving it here to align with the correct workflow.-  pramod_Bug#-27
2025-05-12 07:58:04 +00:00
Pramod Mahajan
2188f109cb disable Edit button and show "Please wait" message during activity update API call 2025-05-12 07:58:04 +00:00
Pramod Mahajan
292c920941 added loader during submitting form data. 2025-05-12 07:58:04 +00:00
Pramod Mahajan
af6a6faa46 ensure activity updates reflect in Daily Task Planning without page refresh 2025-05-12 07:58:04 +00:00
Pramod Mahajan
216e9b0db0 updated regularization logic based on 48-hour checkout threshold for attendanceLogs. 2025-05-12 07:57:40 +00:00
658c2776f1 Merge branch 'pramod_Task#207' into Issue_May_2W 2025-05-10 19:23:23 +05:30
f26b708564 Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null. 2025-05-10 13:38:05 +00:00
Pramod Mahajan
6bb1f98ae7 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207, 2025-05-10 19:06:34 +05:30
96963527df Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality. 2025-05-10 17:56:35 +05:30
Pramod Mahajan
16fd31eef7 added reset and setloader false once request completed 2025-05-10 10:42:37 +00:00
Pramod Mahajan
636076ed56 passed reset and loading method inside handleSubmitForm function. 2025-05-10 10:42:37 +00:00
Pramod Mahajan
c4a221807f changed class too className 2025-05-10 10:41:59 +00:00