Commit Graph

  • c3643683c8 added filter action while apply filter Pramod Mahajan 2025-05-27 12:31:48 +05:30
  • 1e7a8e81b9 revert 4acf0caf7be07b758276fdfaa89707e0547884ee pramod.mahajan 2025-05-27 06:51:49 +00:00
  • 4acf0caf7b removed unused code Pramod Mahajan 2025-05-27 12:17:31 +05:30
  • c4d647f361 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task-#355 Pramod Mahajan 2025-05-27 12:10:47 +05:30
  • d8de4ebc11 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task-#355 Pramod Mahajan 2025-05-27 11:59:10 +05:30
  • 33151c2c16 Convert all date to DD-MM-YYYY accross all component. kartik.sharma 2025-05-27 11:53:56 +05:30
  • b479325816 Merge pull request 'In Assign Role popup double loading is visible.' (#148) from Kartik_Bug#367 into Issue_May_5W Vikas Nale 2025-05-27 06:20:13 +00:00
  • ad145db3c7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory Pramod Mahajan 2025-05-27 10:15:06 +05:30
  • 96008d0159 removed fixed height Pramod Mahajan 2025-05-27 10:00:15 +05:30
  • 7b3a9568f3 changed font size and added icon for category Pramod Mahajan 2025-05-27 09:59:45 +05:30
  • 2c7b17af40 added filter action movement Pramod Mahajan 2025-05-27 09:58:51 +05:30
  • 126ed3809f In Assign Role popup double loading is visible. kartik.sharma 2025-05-27 09:58:20 +05:30
  • d393f276d0 removed project validation, not required Pramod Mahajan 2025-05-26 16:15:38 +05:30
  • c27c33bee2 removed overflow property for labels Pramod Mahajan 2025-05-26 16:10:25 +05:30
  • e15a7b887d Merge pull request 'In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.' (#147) from Kartik_Enhancement#362 into Issue_May_5W Vikas Nale 2025-05-26 09:36:49 +00:00
  • 2224b10842 Merge pull request 'pramod_Task-#355 : implemented Manage Buckets modal with bucket creation and listing' (#145) from pramod_Task-#355 into Feature_Directory Vikas Nale 2025-05-26 09:36:34 +00:00
  • 8abb8a3aa5 added API methods for creating and updating directory buckets Pramod Mahajan 2025-05-25 00:26:01 +05:30
  • 51c3857675 splited Directory component into smaller components Pramod Mahajan 2025-05-25 00:24:56 +05:30
  • 8f94cf6e2d added new modal for bucket management and splited code Pramod Mahajan 2025-05-25 00:23:10 +05:30
  • 199cf4867f created new component for bucket managment Pramod Mahajan 2025-05-25 00:22:12 +05:30
  • 06c0c5ebb3 added schema for bucket form validation Pramod Mahajan 2025-05-25 00:21:33 +05:30
  • 16f40f7566 Merge branch 'pramod_Task-#358' into Feature_Directory Vikas Nale 2025-05-26 15:00:25 +05:30
  • d11174984d Merge branch 'pramod_Task-#227' into Feature_Directory Vikas Nale 2025-05-26 14:58:56 +05:30
  • 35ca496166 added support for creating tags with space or enter keys Pramod Mahajan 2025-05-26 13:33:18 +05:30
  • 9763c45592 In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box. kartik.sharma 2025-05-26 12:54:24 +05:30
  • 7ff4280b4d added backdrop Pramod Mahajan 2025-05-26 12:52:41 +05:30
  • 3bae9f20d1 Inceased manage bucket modal size md to lg Pramod Mahajan 2025-05-26 12:52:17 +05:30
  • 478b0ddad0 Merge pull request 'Dashboard Component View.' (#146) from Kartik_Development#26 into Issue_May_4W Vikas Nale 2025-05-26 05:52:13 +00:00
  • 4445ef18ab Dashboard Component View. kartik.sharma 2025-05-26 11:19:59 +05:30
  • fb1edd46db added API methods for creating and updating directory buckets Pramod Mahajan 2025-05-25 00:26:01 +05:30
  • b8ba3b835e splited Directory component into smaller components Pramod Mahajan 2025-05-25 00:24:56 +05:30
  • 89eaca4189 added new modal for bucket management and splited code Pramod Mahajan 2025-05-25 00:23:10 +05:30
  • 98c6e9edbe created new component for bucket managment Pramod Mahajan 2025-05-25 00:22:12 +05:30
  • 0bc56c82cf added schema for bucket form validation Pramod Mahajan 2025-05-25 00:21:33 +05:30
  • 7a1a55f52f Merge branch 'Kartik_Bug#301' into Issue_May_4W Vikas Nale 2025-05-24 20:48:37 +05:30
  • ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. kartik.sharma 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 Vikas Nale 2025-05-24 12:22:59 +00:00
  • 1cdaefbec4 added EditcontactCatgorry component in modal for update Pramod Mahajan 2025-05-24 17:27:47 +05:30
  • 36b09747b0 created new component for update contact category Pramod Mahajan 2025-05-24 17:27:03 +05:30
  • 695369cbf8 modified url endpoint Pramod Mahajan 2025-05-24 17:26:20 +05:30
  • dcaa9ae7ec Add support for deleting contact categories Pramod Mahajan 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 Vikas Nale 2025-05-24 10:52:41 +00:00
  • decc388bf1 Error message work Properly. kartik.sharma 2025-05-24 16:05:16 +05:30
  • c9c970834d Error message work Properly. kartik.sharma 2025-05-24 16:05:16 +05:30
  • 79e38f6cd5 modified url for delete and update contact tag Pramod Mahajan 2025-05-24 16:02:46 +05:30
  • 3593e7d46c added new modal for edit contact tag and delete contact tag Pramod Mahajan 2025-05-24 16:02:16 +05:30
  • d931eca2fd Merge branch 'Kartik_Enhancement#274' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Enhancement#274 kartik.sharma 2025-05-24 16:01:44 +05:30
  • 20e04ecab5 Error Message is now work properly. kartik.sharma 2025-05-24 16:00:58 +05:30
  • 144817aef6 added new component for Edit contact Tag Pramod Mahajan 2025-05-24 16:00:23 +05:30
  • 7804e44b85 Error message in Manage floor popup in Infrastructure. kartik.sharma 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 Vikas Nale 2025-05-24 10:17:20 +00:00
  • 8d8a5edb19 Change label from "Pending" to "Pending Actions" Vikas Nale 2025-05-24 15:46:51 +05:30
  • a60d7f7a25 Changes in Attendance Switch on-off button. kartik.sharma 2025-05-24 13:30:40 +05:30
  • 3157a30948 Adding Switch button in attendence component. kartik.sharma 2025-05-22 16:39:42 +05:30
  • 79c5a79803 Change label from "Pending" to "Pending Actions" Vikas Nale 2025-05-24 15:46:51 +05:30
  • 9b26924eba Merge pull request 'Correction in Assign Task popup.' (#137) from Kartik_Enhancement#352 into Issue_May_4W Vikas Nale 2025-05-24 10:12:32 +00:00
  • a6c6a73899 Correction in Assign Task popup. kartik.sharma 2025-05-24 14:45:29 +05:30
  • 2b18f80b56 Changes in Attendance Switch on-off button. kartik.sharma 2025-05-24 13:30:40 +05:30
  • aa50aeff98 Merge branch 'Kartik_Enhancement#335' into Issue_May_4W Vikas Nale 2025-05-24 10:27:20 +05:30
  • 78d7b9b521 Merge branch 'Kartik_Enhancement#336' into Issue_May_4W Vikas Nale 2025-05-24 10:26:01 +05:30
  • 7afa4f4449 Merge branch 'Kartik_Enhancement#337' into Issue_May_4W Vikas Nale 2025-05-24 10:24:28 +05:30
  • 9e57e21b8c Merge branch 'Kartik_Enhancement#338' into Issue_May_4W Vikas Nale 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 Vikas Nale 2025-05-24 04:49:05 +00:00
  • 889b5ab069 Merge pull request 'pramod_Enhancement-#333' (#136) from pramod_Enhancement-#333 into Feature_Directory Vikas Nale 2025-05-24 04:39:57 +00:00
  • bcc09851d3 no more need Pramod Mahajan 2025-05-23 18:25:25 +05:30
  • 45cd17c808 added feature active and inactive not displays Pramod Mahajan 2025-05-23 18:24:19 +05:30
  • d9ce90e20e modified table column, if inactive contacts hide action column Pramod Mahajan 2025-05-23 18:23:27 +05:30
  • 385f08e752 added in List view active or inactive contacts Pramod Mahajan 2025-05-23 18:22:01 +05:30
  • 52ec9408d2 added on more params - active Pramod Mahajan 2025-05-23 18:20:09 +05:30
  • 64973029cc modified display active as well as inactives contact Pramod Mahajan 2025-05-23 16:59:14 +05:30
  • 7e4f4c8973 modified GetContact method of taking parma active or inactive Pramod Mahajan 2025-05-23 16:58:03 +05:30
  • 6943f4e9ca modified enable option only active contact Pramod Mahajan 2025-05-23 16:56:52 +05:30
  • af996196a1 modified hook, for taking active or incative params Pramod Mahajan 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' kartik.sharma 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'. kartik.sharma 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'. kartik.sharma 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'. kartik.sharma 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'. kartik.sharma 2025-05-23 11:18:58 +05:30
  • 7970bce60d Merge branch 'Kartik_Enhancement#319' into Issue_May_4W Vikas Nale 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 pramod.mahajan 2025-05-22 13:12:14 +00:00
  • ab47a44c60 display not found msg if data is empty Pramod Mahajan 2025-05-22 18:20:34 +05:30
  • 10e38353aa correct note added time Pramod Mahajan 2025-05-22 18:19:38 +05:30
  • e372405ac0 split common use fun in util file Pramod Mahajan 2025-05-22 18:18:34 +05:30
  • 0cefb98ac1 created separet util. fun file for directory components Pramod Mahajan 2025-05-22 18:17:51 +05:30
  • c78f94b17f pin bucket name on card Pramod Mahajan 2025-05-22 18:17:01 +05:30
  • 55f17daf0f modified filter functionality- added apply call function button Pramod Mahajan 2025-05-22 17:10:43 +05:30
  • 141bb866d2 Adding Switch button in attendence component. kartik.sharma 2025-05-22 16:39:42 +05:30
  • a69dd50425 changed filter name Pramod Mahajan 2025-05-22 15:08:27 +05:30
  • 279f2403d2 Correction in date box in checkin checkout popup from Attendence component. kartik.sharma 2025-05-22 14:20:51 +05:30
  • 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 Vikas Nale 2025-05-22 06:12:24 +00:00
  • af4a40bf81 Adding Date Box in Check-in and Check-out popup from Attendence component. kartik.sharma 2025-05-21 16:27:45 +05:30
  • 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 Vikas Nale 2025-05-22 06:11:23 +00:00
  • 5cb1e55292 Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list. kartik.sharma 2025-05-21 11:53:57 +05:30
  • 3b82653f23 implement contact deletion with confirmation and toast feedback Pramod Mahajan 2025-05-21 22:39:07 +05:30
  • 7147116d8e added delete contact api Pramod Mahajan 2025-05-21 22:37:00 +05:30
  • 2643f1b2d5 Merge pull request 'pramod_Task-#320' (#127) from pramod_Task-#320 into Feature_Directory pramod.mahajan 2025-05-21 12:55:34 +00:00
  • 228c178acf add side-by-side filtering UI for Buckets and Categories with flex layout Pramod Mahajan 2025-05-21 18:18:49 +05:30
  • cb5cacaee0 added filtering by category and buckets Pramod Mahajan 2025-05-21 17:44:17 +05:30
  • 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 pramod.mahajan 2025-05-21 11:00:03 +00:00
  • ad0be79943 updated cache Pramod Mahajan 2025-05-21 16:28:44 +05:30