admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
871 Commits 240 Branches 0 Tags
Commit Graph

871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
9e57e21b8c Merge branch 'Kartik_Enhancement#338' into Issue_May_4W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
 2025-05-24 10:22:08 +05:30
Vikas Nale
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
Vikas Nale
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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
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
Vikas Nale
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
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
kartik.sharma
279f2403d2 Correction in date box in checkin checkout popup from Attendence component. 2025-05-22 14:20:51 +05:30
Vikas Nale
396706dcf5 Merge pull request 'Adding Date Box in Check-in and Check-out popup from Attendence component.' (#126) from Kartik_Enhancement#319 into Issue_May_4W 
Reviewed-on: #126
 2025-05-22 06:12:24 +00:00
kartik.sharma
af4a40bf81 Adding Date Box in Check-in and Check-out popup from Attendence component. 2025-05-22 06:12:24 +00:00
Vikas Nale
d5ba7eaac1 Merge pull request 'Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.' (#125) from Bug#318_Kartik into Issue_May_4W 
Reviewed-on: #125
 2025-05-22 06:11:23 +00:00
kartik.sharma
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
Pramod Mahajan
7147116d8e added delete contact api 2025-05-21 22:37:00 +05:30
pramod.mahajan
2643f1b2d5 Merge pull request 'pramod_Task-#320' (#127) from pramod_Task-#320 into Feature_Directory 
Reviewed-on: #127
 2025-05-21 12:55:34 +00:00
Pramod Mahajan
228c178acf add side-by-side filtering UI for Buckets and Categories with flex layout 2025-05-21 18:18:49 +05:30
Pramod Mahajan
cb5cacaee0 added filtering by category and buckets 2025-05-21 17:44:17 +05:30
pramod.mahajan
1d90c631ef Merge pull request 'pramod_Task-#251: A "Notes" section appears in the contact view modal, allowing users to add a note for the selected contact.' (#124) from pramod_Task-#251 into Feature_Directory 
Reviewed-on: #124
 2025-05-21 11:00:03 +00:00
Pramod Mahajan
ad0be79943 updated cache 2025-05-21 16:28:44 +05:30
Pramod Mahajan
a076f1810f removed tab 2025-05-21 16:28:11 +05:30
Pramod Mahajan
c60409e108 changed toolbar position bottom to top 2025-05-21 16:27:51 +05:30
kartik.sharma
f01a6235e7 Adding Date Box in Check-in and Check-out popup from Attendence component. 2025-05-21 16:27:45 +05:30
Pramod Mahajan
b4df17b7e0 unneeded margin removed 2025-05-21 16:27:17 +05:30
Pramod Mahajan
eb41a66a79 added delete not method inside driectoryrepository 2025-05-21 16:05:37 +05:30
Vikas Nale
28e0d615a0 Merge pull request 'Attendence component date customize' (#123) from Kartik_Enhancement#273 into Issue_May_4W 
Reviewed-on: #123
 2025-05-21 07:42:42 +00:00
kartik.sharma
4c9ea7add8 Attendence component date customize 2025-05-21 07:42:42 +00:00
Pramod Mahajan
83ec0ec5dd adjust modal close button appearance and position 2025-05-21 00:26:25 +05:30
Pramod Mahajan
e331208b3e edit, delete option to dropdown icon size changed -sm 2025-05-20 23:57:54 +05:30
Pramod Mahajan
5b155a3329 apply loading for card view 2025-05-20 22:44:14 +05:30
Pramod Mahajan
89221dec38 set text-primary color for add email icon 2025-05-20 22:43:32 +05:30
Pramod Mahajan
7f8784bf6a removed phone and emaill required validation 2025-05-20 22:42:11 +05:30