780 Commits

Author SHA1 Message Date
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30
Pramod Mahajan
936636c29b optimized custom hook usage 2025-05-31 10:17:48 +00:00
Pramod Mahajan
d10d47e642 added title name for assign employee modal 2025-05-31 10:17:48 +00:00
Pramod Mahajan
14b851b87e added modal name- Assign Employee 2025-05-31 10:17:48 +00:00
bf9f09d5b4 Merge branch 'Issue_May_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_5W 2025-05-31 15:37:05 +05:30
f72c309c0c Comment code in Dashboard. 2025-05-31 15:35:36 +05:30
ccbe89f407 Cosmatic changes for Attendance Widget 2025-05-31 15:30:41 +05:30
383162c4c3 Merge branch 'Kartik_Task#414' into Issue_May_5W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx
#	src/repositories/GlobalRepository.jsx
2025-05-31 13:49:01 +05:30
084454112a Merge branch 'Kartik_Task#400' into Issue_May_5W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx
2025-05-31 13:41:15 +05:30
d80082bc9b Status code 400 showing on Logs tab and Daily Progress Report datepicker issue. 2025-05-31 08:09:07 +00:00
f511292f5a Merge pull request 'Adding new Weidget in Dashboadr name is "Pending Attendance".' (#156) from Kartik_Task#342 into Issue_May_5W
Reviewed-on: #156
2025-05-31 08:08:50 +00:00
Pramod Mahajan
dbf7178db0 Replaced inline styles with Bootstrap utility classes 2025-05-31 12:08:47 +05:30
Pramod Mahajan
d826acbb45 fixed width 100 % for editor 2025-05-31 12:07:31 +05:30
Pramod Mahajan
4799e8e91c it able t taking tag from any device 2025-05-31 12:06:40 +05:30
dbc9bbffa2 Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it. 2025-05-31 11:39:15 +05:30
Pramod Mahajan
07809d6635 Fixed conditional rendering logic for Directory project nav item 2025-05-31 09:42:54 +05:30
d16675bf71 Adding New Weidge in Dashboard Name is "Activity". 2025-05-30 16:19:20 +05:30
30ce981a24 Comments popup submit button issue. 2025-05-30 07:15:03 +00:00
f20a7cf4bc Changes in Comment popup 2025-05-30 07:15:03 +00:00
9c3bcaea9e Correction in Comment popup from Daily Progress Report. 2025-05-30 07:15:03 +00:00
252bf0904e In Create New Project form is not empty when we click on cancel button or cross. 2025-05-30 07:15:03 +00:00
4b64e7450e Convert all date to DD-MM-YYYY accross all component. 2025-05-30 07:15:03 +00:00
5572b80f4a In Assign Role popup double loading is visible. 2025-05-30 07:15:03 +00:00
0674fcf5bb In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box. 2025-05-30 07:15:03 +00:00
Pramod Mahajan
05f4a9da4d added restrict access to Project > Directory tab to authorized users only 2025-05-30 11:55:56 +05:30
Pramod Mahajan
445a5e0064 loader, not found text moved in centered area 2025-05-30 11:39:18 +05:30
Pramod Mahajan
5666616b6b changed restore icon 2025-05-30 11:38:43 +05:30
Pramod Mahajan
15d313baf1 chnaged badge type 2025-05-30 11:38:02 +05:30
Pramod Mahajan
9ff79b5854 display contact profile data 2025-05-29 17:49:54 +00:00
Pramod Mahajan
a88a8d3df9 Add restore feature for deleted notes 2025-05-29 17:49:54 +00:00
Pramod Mahajan
36e7755b7d aded validation for tags and rename label to bucket 2025-05-29 17:49:54 +00:00
Pramod Mahajan
41cbf69550 changed table column email to role 2025-05-29 17:49:54 +00:00
Pramod Mahajan
8b5f7e69ab added restore feature for contacts 2025-05-29 17:49:54 +00:00
Pramod Mahajan
85a957c204 fixed console warning 2025-05-29 17:49:54 +00:00
Pramod Mahajan
b5d3b0fd08 Support tag creation on spacebar key 2025-05-29 17:49:54 +00:00
Pramod Mahajan
767d8abd19 changed font size 2025-05-29 17:49:54 +00:00
Pramod Mahajan
4628dea561 Fixed case mismatch in error rendering (BucketIds ➝ bucketIds) 2025-05-29 17:49:54 +00:00
Pramod Mahajan
8c66a9a083 Prevent error by safely accessing bucket creator with optional chaining 2025-05-29 00:46:58 +05:30
Pramod Mahajan
80a213595d added manager permission for directory 2025-05-29 00:33:01 +05:30
Pramod Mahajan
0f323a7594 removed eaxtra gap between avatra and name 2025-05-29 00:32:05 +05:30
Pramod Mahajan
6b5bc8c729 modified not url 2025-05-28 19:06:51 +05:30
Pramod Mahajan
ba5b07b608 user can update and assign bucket to emp 2025-05-28 18:51:48 +05:30
Pramod Mahajan
875656dbf5 modified table layout 2025-05-28 18:50:14 +05:30
Pramod Mahajan
e22ab1ae05 removed console 2025-05-28 18:49:44 +05:30
Pramod Mahajan
416f8e6621 added classAvatar for other classes 2025-05-28 18:13:10 +05:30
Pramod Mahajan
51f7e473f4 add auto suggestion field for orgnaization 2025-05-28 17:22:00 +05:30
Pramod Mahajan
e6cdff1ed6 modifled column size 2025-05-28 17:21:32 +05:30
Pramod Mahajan
b02c599130 buckets can assign employee 2025-05-28 16:40:54 +05:30
627d4f898e Adding new Weidget in Dashboadr name is "Pending Attendance". 2025-05-28 13:06:03 +05:30
Pramod Mahajan
c6e9d3fcbe added bucket fdisplay field in contact profile 2025-05-28 12:24:11 +05:30