80 Commits

Author SHA1 Message Date
3305c0b0d9 Add cosmatic changes to quill editor on contact notes page 2025-06-12 18:12:25 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
ff8fca72fa Add cosmatc changes for font sizes 2025-06-10 13:16:44 +05:30
Pramod Mahajan
117ac31d12 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory 2025-06-10 09:47:56 +05:30
Pramod Mahajan
b71ca1c7fb resolve React key duplication warning in Breadcrumb component 2025-06-09 13:18:34 +05:30
Pramod Mahajan
0026de943b fixed width 100 % for editor 2025-06-09 13:16:24 +05:30
Pramod Mahajan
3e61a9959e it able t taking tag from any device 2025-06-09 13:16:24 +05:30
Pramod Mahajan
e739a380f7 chnaged badge type 2025-06-09 13:14:05 +05:30
Pramod Mahajan
0082a60e02 fixed console warning 2025-06-09 13:14:04 +05:30
Pramod Mahajan
6d02511847 Support tag creation on spacebar key 2025-06-09 13:14:04 +05:30
Pramod Mahajan
3c75222dd7 added classAvatar for other classes 2025-06-09 13:14:02 +05:30
Pramod Mahajan
5ef8bed2b8 created new float button component 2025-06-09 13:14:00 +05:30
Pramod Mahajan
47ecbcdafd increased padding for suggestion menu 2025-06-09 13:13:59 +05:30
Pramod Mahajan
1b399c1ebf added marign for select item 2025-06-09 13:13:59 +05:30
Pramod Mahajan
360bfc5650 added mirgin form bottom for select badge 2025-06-09 13:13:59 +05:30
Pramod Mahajan
1d1f82feb6 created new component for organization sugger field 2025-06-09 13:13:59 +05:30
Pramod Mahajan
df1838dbba added background color, backdrop 2025-06-09 13:13:58 +05:30
Pramod Mahajan
4f70d8cb17 changed toolbar position bottom to top 2025-06-09 13:12:59 +05:30
Pramod Mahajan
24d8688069 unneeded margin removed 2025-06-09 13:12:59 +05:30
Pramod Mahajan
2688c95f47 installed react-quill package and customize using new component Editor 2025-06-09 13:12:58 +05:30
Pramod Mahajan
7d489d177d repaced class to className 2025-06-09 13:12:58 +05:30
Pramod Mahajan
96d1fd648f created separated editor component for customize react-quill 2025-06-09 13:12:57 +05:30
Pramod Mahajan
0fc460b38f set up props variable close button display or not 2025-06-09 13:12:57 +05:30
Pramod Mahajan
597fa279ea chnaged checkbox color 2025-06-09 13:12:56 +05:30
Pramod Mahajan
f8f43b62c6 restore page scroll after modal is closed 2025-06-09 13:10:59 +05:30
Pramod Mahajan
f62129e3ac modfified TagInput for prevent multiple rendering 2025-06-09 13:10:57 +05:30
Pramod Mahajan
cdec17735f created new component SelectMultiple items 2025-06-09 13:10:56 +05:30
Pramod Mahajan
8ece56da52 created style file SelectMultiple component 2025-06-09 13:10:56 +05:30
Pramod Mahajan
354c653240 modified TagInput, for array an object 2025-06-09 13:10:56 +05:30
Pramod Mahajan
33f6220622 removed backdrop 2025-06-09 13:10:55 +05:30
945d79a250 Merge branch 'pramod_Task#482' into Issue_Jun_1W_2
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
2025-06-09 11:47:03 +05:30
26191bccfe Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. 2025-06-09 05:39:43 +00:00
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
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
d16675bf71 Adding New Weidge in Dashboard Name is "Activity". 2025-05-30 16:19:20 +05:30
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
4c9ea7add8 Attendence component date customize 2025-05-21 07:42:42 +00:00
3d3dcb4f69 In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday. 2025-05-20 12:56:05 +05:30
Pramod Mahajan
ea0c3b5ca7 handled correct time slots 2025-05-10 10:41:59 +00:00
Pramod Mahajan
71a47f320c added data props in confrima modal 2025-05-09 11:53:40 +00:00
Pramod Mahajan
f76b524ded changed padding of modal-body and and button postion 2025-05-08 18:22:03 +05:30
Pramod Mahajan
71bb1c25dd changed position of header 2025-05-07 17:18:57 +05:30
Pramod Mahajan
9682de0854 customize confirm modal 2025-05-07 16:23:35 +05:30
Pramod Mahajan
9e3101ebf4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity 2025-05-07 13:00:09 +05:30
a14e5c88b4 Dynamic date range for DateRange Picker in task allocation log 2025-05-04 12:50:53 +05:30
f1e22e944e added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day. 2025-05-04 12:24:27 +05:30
d5cbe67d3e update TimePicker slot logic based on check-in and check-out time conditions 2025-05-04 12:20:16 +05:30
e53635f910 time slot should display according activity 2025-05-04 12:09:05 +05:30