464 Commits

Author SHA1 Message Date
Pramod Mahajan
3f7456e5e7 replaced standard input with custom InputSuggestions component for organization field 2025-05-27 15:04:55 +05:30
Pramod Mahajan
478aedf2ae added marign for select item 2025-05-27 15:03:21 +05:30
Pramod Mahajan
866049e385 added mirgin form bottom for select badge 2025-05-27 15:02:42 +05:30
Pramod Mahajan
8786f01b40 created new component for organization sugger field 2025-05-27 15:01:34 +05:30
Pramod Mahajan
d3f7c44922 removed table header icons 2025-05-27 12:53:58 +05:30
Pramod Mahajan
a17a32a7cf added background color, backdrop 2025-05-27 12:46:36 +05:30
Pramod Mahajan
991a833dbf removed fix height 2025-05-27 12:39:54 +05:30
Pramod Mahajan
5287b40cd0 changed font size 2025-05-27 12:37:02 +05:30
Pramod Mahajan
dd35de14a7 removed project select validation, it no longer required 2025-05-27 12:35:23 +05:30
Pramod Mahajan
8fba237173 changed font-size 2025-05-27 12:33:25 +05:30
Pramod Mahajan
ad145db3c7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-05-27 10:15:06 +05:30
Pramod Mahajan
199cf4867f created new component for bucket managment 2025-05-26 09:36:34 +00:00
Pramod Mahajan
06c0c5ebb3 added schema for bucket form validation 2025-05-26 09:36:34 +00:00
16f40f7566 Merge branch 'pramod_Task-#358' into Feature_Directory
# Conflicts:
#	src/components/master/MasterModal.jsx
2025-05-26 15:00:25 +05:30
4445ef18ab Dashboard Component View. 2025-05-26 11:19:59 +05:30
7a1a55f52f Merge branch 'Kartik_Bug#301' into Issue_May_4W
# Conflicts:
#	src/components/Project/Infrastructure/FloorModel.jsx
2025-05-24 20:48:37 +05:30
ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. 2025-05-24 18:52:56 +05:30
Pramod Mahajan
1cdaefbec4 added EditcontactCatgorry component in modal for update 2025-05-24 17:27:47 +05:30
Pramod Mahajan
36b09747b0 created new component for update contact category 2025-05-24 17:27:03 +05:30
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
Pramod Mahajan
3593e7d46c added new modal for edit contact tag and delete contact tag 2025-05-24 16:02:16 +05:30
Pramod Mahajan
144817aef6 added new component for Edit contact Tag 2025-05-24 16:00:23 +05:30
7804e44b85 Error message in Manage floor popup in Infrastructure. 2025-05-24 15:54:31 +05:30
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +00:00
a6c6a73899 Correction in Assign Task popup. 2025-05-24 14:45:29 +05:30
aa50aeff98 Merge branch 'Kartik_Enhancement#335' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:27:20 +05:30
78d7b9b521 Merge branch 'Kartik_Enhancement#336' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:26:01 +05:30
7afa4f4449 Merge branch 'Kartik_Enhancement#337' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:24:28 +05:30
9e57e21b8c Merge branch 'Kartik_Enhancement#338' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:22:08 +05:30
9a60cebc42 Merge pull request 'Move all the project-related code from the Dashboard component into a new component named 'Projects'.' (#131) from Kartik_Enhancement#334 into Issue_May_4W
Reviewed-on: #131
2025-05-24 04:49:05 +00:00
Pramod Mahajan
45cd17c808 added feature active and inactive not displays 2025-05-23 18:24:19 +05:30
Pramod Mahajan
d9ce90e20e modified table column, if inactive contacts hide action column 2025-05-23 18:23:27 +05:30
Pramod Mahajan
385f08e752 added in List view active or inactive contacts 2025-05-23 18:22:01 +05:30
Pramod Mahajan
6943f4e9ca modified enable option only active contact 2025-05-23 16:56:52 +05:30
38607ab482 Move all the Teams-related code from the Dashboard component into a new component named 'Teams' 2025-05-23 14:38:28 +05:30
377c024e33 Move all the Tasks-related code from the Dashboard component into a new component named 'Tasks'. 2025-05-23 14:25:04 +05:30
5e462a88f7 Move all the Projects Completion Status-related code from the Dashboard component into a new component named 'Projects Completion Status'. 2025-05-23 14:18:53 +05:30
cf11e995de Move all the project-related code from the Dashboard component into a new component named 'Progress Overview by Project'. 2025-05-23 13:56:50 +05:30
7cc9181fb9 Move all the project-related code from the Dashboard component into a new component named 'Projects'. 2025-05-23 11:18:58 +05:30
7970bce60d Merge branch 'Kartik_Enhancement#319' into Issue_May_4W
# Conflicts:
#	src/components/Activities/CheckCheckOutForm.jsx
2025-05-23 10:45:20 +05:30
Pramod Mahajan
ab47a44c60 display not found msg if data is empty 2025-05-22 18:20:34 +05:30
Pramod Mahajan
10e38353aa correct note added time 2025-05-22 18:19:38 +05:30
Pramod Mahajan
e372405ac0 split common use fun in util file 2025-05-22 18:18:34 +05:30
Pramod Mahajan
0cefb98ac1 created separet util. fun file for directory components 2025-05-22 18:17:51 +05:30
Pramod Mahajan
c78f94b17f pin bucket name on card 2025-05-22 18:17:01 +05:30
279f2403d2 Correction in date box in checkin checkout popup from Attendence component. 2025-05-22 14:20:51 +05:30
af4a40bf81 Adding Date Box in Check-in and Check-out popup from Attendence component. 2025-05-22 06:12:24 +00:00
5cb1e55292 Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list. 2025-05-22 06:11:23 +00:00
Pramod Mahajan
3b82653f23 implement contact deletion with confirmation and toast feedback 2025-05-21 22:39:07 +05:30