895 Commits

Author SHA1 Message Date
478b0ddad0 Merge pull request 'Dashboard Component View.' (#146) from Kartik_Development#26 into Issue_May_4W
Reviewed-on: #146
2025-05-26 05:52:13 +00:00
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
ff56245119 Merge pull request 'pramod_Task#351: Contact Tag Delete and Update' (#141) from pramod_Task#351 into Feature_Directory
Reviewed-on: #141
2025-05-24 12:22:59 +00:00
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
Pramod Mahajan
695369cbf8 modified url endpoint 2025-05-24 17:26:20 +05:30
Pramod Mahajan
dcaa9ae7ec Add support for deleting contact categories 2025-05-24 16:27:11 +05:30
4c73060b82 Merge pull request 'Error message work Properly.' (#140) from Kartik_Enhancement#279 into Issue_May_4W
Reviewed-on: #140
2025-05-24 10:52:41 +00:00
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
Pramod Mahajan
79e38f6cd5 modified url for delete and update contact tag 2025-05-24 16:02:46 +05:30
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
9d90f05f1c Merge pull request 'Adding Switch button in attendence component.' (#129) from Kartik_Enhancement#274 into Issue_May_4W
Reviewed-on: #129
2025-05-24 10:17:20 +00:00
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
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
9b26924eba Merge pull request 'Correction in Assign Task popup.' (#137) from Kartik_Enhancement#352 into Issue_May_4W
Reviewed-on: #137
2025-05-24 10:12:32 +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
889b5ab069 Merge pull request 'pramod_Enhancement-#333' (#136) from pramod_Enhancement-#333 into Feature_Directory
Reviewed-on: #136
2025-05-24 04:39:57 +00:00
Pramod Mahajan
bcc09851d3 no more need 2025-05-23 18:25:25 +05:30
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
52ec9408d2 added on more params - active 2025-05-23 18:20:09 +05:30
Pramod Mahajan
64973029cc modified display active as well as inactives contact 2025-05-23 16:59:14 +05:30
Pramod Mahajan
7e4f4c8973 modified GetContact method of taking parma active or inactive 2025-05-23 16:58:03 +05:30
Pramod Mahajan
6943f4e9ca modified enable option only active contact 2025-05-23 16:56:52 +05:30
Pramod Mahajan
af996196a1 modified hook, for taking active or incative params 2025-05-23 16:55:42 +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
b4d3e6453f Merge pull request 'Implemented delete functionality for contacts' (#130) from pramod_Task-#321 into Feature_Directory
Reviewed-on: #130
2025-05-22 13:12:14 +00:00
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
Pramod Mahajan
55f17daf0f modified filter functionality- added apply call function button 2025-05-22 17:10:43 +05:30
Pramod Mahajan
a69dd50425 changed filter name 2025-05-22 15:08:27 +05:30