Commit Graph

  • a3428fed85 added CreateContactCategory in master modal Pramod Mahajan 2025-05-15 15:08:55 +05:30
  • bf0af60c47 created new constact category master Pramod Mahajan 2025-05-15 15:07:37 +05:30
  • cecff08ba2 added one more master in masterList - Contact Category Pramod Mahajan 2025-05-15 15:04:58 +05:30
  • 8c15cacc04 display contact in list view Pramod Mahajan 2025-05-15 12:20:55 +05:30
  • 3393eaf48d displaye contacts in List View Pramod Mahajan 2025-05-15 12:19:57 +05:30
  • c672e44c76 created new hook for get a contacts Pramod Mahajan 2025-05-15 12:19:30 +05:30
  • a1e75bf7dd created new repo for get contact list Pramod Mahajan 2025-05-15 12:18:05 +05:30
  • 77fb787d46 removed console.log Pramod Mahajan 2025-06-09 12:41:57 +05:30
  • 00e61988a8 Merge branch 'Issue_Jun_1W_2' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2 Pramod Mahajan 2025-06-09 12:37:14 +05:30
  • 379d9ecb8b if have't any bucket user can't create contacts Pramod Mahajan 2025-06-09 12:21:45 +05:30
  • 9e03e6ae19 Handle conditon to hide unwanted OR label Vikas Nale 2025-06-09 11:49:34 +05:30
  • 945d79a250 Merge branch 'pramod_Task#482' into Issue_Jun_1W_2 Vikas Nale 2025-06-09 11:47:03 +05:30
  • d37068b8d9 Modify typo pramod_Task#482 Vikas Nale 2025-06-09 11:46:00 +05:30
  • 9ba8a1501b Merge pull request 'When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate.' (#192) from Kartik_bug#379 into Issue_Jun_1W_2 Vikas Nale 2025-06-09 06:00:26 +00:00
  • ef47bbf8a4 When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate. Umesh Desai 2025-06-09 10:23:52 +05:30
  • 061c110524 Merge pull request 'Changes in Reset Password Page and adding field in Dialog box is " Change Password"' (#186) from Kartik_Task#470 into Issue_Jun_1W_2 Vikas Nale 2025-06-09 05:48:47 +00:00
  • 6cdb5a42dd Merge branch 'Kartik_Task#470' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#470 Kartik_Task#470 Vikas Nale 2025-06-09 11:17:56 +05:30
  • d5158a2151 Merge pull request 'Hide Page Number on Website Until Data Exceeds Records Limit.' (#188) from Kartik_Bug#475 into Issue_Jun_1W_2 Vikas Nale 2025-06-09 05:46:12 +00:00
  • b6330502cb Hide Page Number on Website Until Data Exceeds Records Limit. Umesh Desai 2025-06-06 16:51:40 +05:30
  • c999307a5f Merge pull request 'Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.' (#187) from Kartik_Task#472 into Issue_Jun_1W_2 Vikas Nale 2025-06-09 05:39:43 +00:00
  • 26191bccfe Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. Umesh Desai 2025-06-06 16:37:44 +05:30
  • 662d464271 changed class to className Pramod Mahajan 2025-06-09 11:08:06 +05:30
  • 99863442a6 resolve React key duplication warning in Breadcrumb component Pramod Mahajan 2025-06-09 10:58:41 +05:30
  • 2386bd0e74 Merge pull request 'pramod_Task-#444 : Add "Assign Project" Feature in Employee Action Menu' (#191) from pramod_Task-#444 into Feature_Directory pramod.mahajan 2025-06-09 05:18:39 +00:00
  • cdef6dc9c8 When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate. Umesh Desai 2025-06-09 10:23:52 +05:30
  • b1253bed88 changed icon Pramod Mahajan 2025-06-09 10:10:06 +05:30
  • f129645386 Updated to make sure the client sends the correct request. Unnecessary requests are no longer sent. Pramod Mahajan 2025-06-09 10:03:32 +05:30
  • 0b46dc0f1f added refetch function for recall after takng any assign or unassign project for update Pramod Mahajan 2025-06-09 10:01:58 +05:30
  • fe87e0dbd4 added update assign project api Pramod Mahajan 2025-06-08 18:40:40 +05:30
  • fa4f784b6b Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2 Pramod Mahajan 2025-06-07 23:42:15 +05:30
  • ab6316ef56 Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482 Pramod Mahajan 2025-06-07 17:42:16 +05:30
  • d345977fdc set constant time for expire time for OTP Pramod Mahajan 2025-06-07 17:41:24 +05:30
  • 8640a96901 set new route login through OTP Pramod Mahajan 2025-06-07 17:40:49 +05:30
  • beeba834e2 added send and verify OTP api Pramod Mahajan 2025-06-07 17:40:24 +05:30
  • def6524566 created new component for verify OTP Pramod Mahajan 2025-06-07 17:40:03 +05:30
  • 194087c0a3 added login with otp feature, added send otp api Pramod Mahajan 2025-06-07 17:39:37 +05:30
  • c54ad8f097 Creating a Change Password page. Umesh Desai 2025-06-07 16:55:08 +05:30
  • 74a5c05481 added api's for fetching projects by employee and update project assigning for employee Pramod Mahajan 2025-06-07 00:10:36 +05:30
  • 7baffac11a added modal for AssignToProject Pramod Mahajan 2025-06-07 00:09:23 +05:30
  • a3dcd9bee3 created component for assign and unassign projects for employee Pramod Mahajan 2025-06-07 00:08:25 +05:30
  • d19652a98e added new hook for fetching projects associated by perticular employee Pramod Mahajan 2025-06-07 00:07:42 +05:30
  • 40f4f2f254 Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2 Vikas Nale 2025-06-06 18:37:40 +05:30
  • 0053dbaf56 Changes in Reset Password Page and adding field in Dialog box is " Change Password" Umesh Desai 2025-06-05 18:06:58 +05:30
  • b00fe50bae Merge pull request 'Creating a Change Password Page and adding Change Password field in Dialog box.' (#185) from Kartik_Task#467 into Issue_Jun_1W_2 Vikas Nale 2025-06-06 13:05:17 +00:00
  • 24aca175f4 Hide Page Number on Website Until Data Exceeds Records Limit. Umesh Desai 2025-06-06 16:51:40 +05:30
  • 1d6db6089f Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. Umesh Desai 2025-06-06 16:37:44 +05:30
  • 96ed0428c4 Changes in Reset Password Page and adding field in Dialog box is " Change Password" Umesh Desai 2025-06-05 18:06:58 +05:30
  • f3b16a9fc0 Creating a Change Password Page and adding Change Password field in Dialog box. Umesh Desai 2025-06-05 17:57:53 +05:30
  • 43270c6bf3 Merge pull request 'Todays date is not visible in Daily Progress Report.' (#183) from Kartik_Bug#449 into Issue_Jun_1W Vikas Nale 2025-06-05 05:26:06 +00:00
  • 101baa2b78 Todays date is not visible in Daily Progress Report. Umesh Desai 2025-06-04 11:53:23 +05:30
  • c553b36e25 Merge pull request 'In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.' (#184) from Kartik_Bug#457 into Issue_Jun_1W Vikas Nale 2025-06-05 05:24:28 +00:00
  • 4345c55247 In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come. Umesh Desai 2025-06-04 17:11:55 +05:30
  • a15ef8fef5 Todays date is not visible in Daily Progress Report. Umesh Desai 2025-06-04 11:53:23 +05:30
  • 655db6ac74 Merge pull request 'Added Column Today's Planned to Project Infrastructure' (#182) from Ashutosh_Enhancement#276_TodaysPlanned into Issue_Jun_1W Vikas Nale 2025-06-03 11:59:46 +00:00
  • 176535f53f Added Column Today's Planned to Project Infrastructure ashutosh.nehete 2025-06-03 15:55:18 +05:30
  • cfd5486fe2 Merge pull request 'In Teams Tab when we Assign a project then this dropdown not change its state .' (#181) from Kartik_Bug#442 into Issue_Jun_1W Vikas Nale 2025-06-03 11:56:04 +00:00
  • 3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . Umesh Desai 2025-06-03 15:23:16 +05:30
  • 412125e422 Merge pull request 'Adding a error message on InActive selection on Teams tab on Projects.' (#180) from Kartik_Bug#441 into Issue_Jun_1W Vikas Nale 2025-06-03 11:54:33 +00:00
  • cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. Umesh Desai 2025-06-03 11:41:24 +05:30
  • 18d848b697 Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W Vikas Nale 2025-06-03 11:53:32 +00:00
  • 78bc8802d7 Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W Vikas Nale 2025-06-03 11:52:53 +00:00
  • 5df397488a In Employee Management when we select Project then this toggle button will be disabled. Umesh Desai 2025-06-03 10:32:10 +05:30
  • 2b015947ef Merge pull request 'pramod_Bug-#433 :Show "No Contact Found" Message When Directory Is Empty' (#177) from pramod_Bug-#433 into Feature_Directory Vikas Nale 2025-06-03 11:50:29 +00:00
  • fed6711ece Merge pull request 'pramod_Bug-#391 : Click on Contact Name this Not Navigating to Details Page in Directory' (#176) from pramod_Bug-#391 into Feature_Directory Vikas Nale 2025-06-03 11:49:41 +00:00
  • 6b5aa5fb1a enable contact name click to open contact profile Pramod Mahajan 2025-06-02 23:38:20 +05:30
  • 1ca50afc74 Merge pull request 'pramod_Task-#439 : Edit and Delete Contact Tag' (#175) from pramod_Task-#439 into Feature_Directory Vikas Nale 2025-06-03 11:48:39 +00:00
  • e83eafddd2 added editcontact tag form inside master modal Pramod Mahajan 2025-06-02 20:05:35 +05:30
  • 1bd050f919 correct delete contact tag url Pramod Mahajan 2025-06-02 20:04:57 +05:30
  • 4d1d3f8cca Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W Vikas Nale 2025-06-03 11:47:18 +00:00
  • 493689fb1a Add progress bar for work area on Infra Page Vikas Nale 2025-06-03 17:15:11 +05:30
  • 80d3434bbf Display completion percentage for each Work Area header Pramod Mahajan 2025-06-02 19:18:05 +05:30
  • 6f6bebf05a Add progress bar for work area on Infra Page Vikas Nale 2025-06-03 17:15:11 +05:30
  • 291949c8e8 Merge branch 'Ashutosh_Enhancement#276_TodaysPlanned' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#276_TodaysPlanned ashutosh.nehete 2025-06-03 16:18:43 +05:30
  • b9062f11a8 Added Column Today's Planned to Project Infrastructure ashutosh.nehete 2025-06-03 15:55:18 +05:30
  • 346e7b1d1d Merge pull request 'In Employee selection double Date is shown in Front.' (#173) from Kartik_Bug#345 into Issue_Jun_1W Vikas Nale 2025-06-03 10:44:27 +00:00
  • 26184889e3 Added Column Today's Planned to Project Infrastructure ashutosh.nehete 2025-06-03 15:55:18 +05:30
  • be92a81e51 In Teams Tab when we Assign a project then this dropdown not change its state . Umesh Desai 2025-06-03 15:23:16 +05:30
  • 99b64a9bf0 Adding a error message on InActive selection on Teams tab on Projects. Umesh Desai 2025-06-03 11:41:24 +05:30
  • b697943787 In Report popup when we take value = 0 then giv error but now it is resolved. Umesh Desai 2025-06-03 11:11:00 +05:30
  • 61ff8956b5 In Employee Management when we select Project then this toggle button will be disabled. Umesh Desai 2025-06-03 10:32:10 +05:30
  • 1298994f58 enhance UX for loading and empty states in contact table Pramod Mahajan 2025-06-03 00:12:39 +05:30
  • f92ef4e52a enhance UX for loading and empty states in contact table Pramod Mahajan 2025-06-03 00:09:33 +05:30
  • 7aa5c12347 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#391 Pramod Mahajan 2025-06-02 23:44:57 +05:30
  • 34c04f31ec Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory Pramod Mahajan 2025-06-02 23:42:00 +05:30
  • c020a7e0fa enable contact name click to open contact profile Pramod Mahajan 2025-06-02 23:38:20 +05:30
  • 2b3558174e Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#391 Pramod Mahajan 2025-06-02 23:29:52 +05:30
  • 6b800858e9 added editcontact tag form inside master modal Pramod Mahajan 2025-06-02 20:05:35 +05:30
  • e3c017ee9d correct delete contact tag url Pramod Mahajan 2025-06-02 20:04:57 +05:30
  • a5dfb69ea4 Display completion percentage for each Work Area header Pramod Mahajan 2025-06-02 19:18:05 +05:30
  • 7e05cfbd61 In Employee selection double Date is shown in Front. kartik.sharma 2025-06-02 17:31:07 +05:30
  • 0d649fbc78 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory Pramod Mahajan 2025-06-02 17:13:01 +05:30
  • cf2ec55d4e Creating the Weidgets in Dashboard name Pending Attendance, Attendance, Activities. Kartik_Task#425 kartik.sharma 2025-06-02 14:17:30 +05:30
  • 6217941b0a Merge pull request 'Pramod_Bug#384 : show "NA" for missing email in contact list view' (#171) from pramod_Bug-#384 into Feature_Directory Vikas Nale 2025-06-02 07:55:32 +00:00
  • 0843123505 handled error , if does'nt have category Pramod Mahajan 2025-06-02 13:19:13 +05:30
  • 9c46bffc4b show "NA" for missing email in contact list view Pramod Mahajan 2025-06-02 11:37:19 +05:30
  • da6b56ac8c Merge pull request 'show "NA" in phone number columns when contact is created without a phone number' (#170) from pramod_Bug-#385 into Feature_Directory Vikas Nale 2025-06-02 07:54:57 +00:00
  • 7f45dbab2a Merge pull request 'pramod_Bug#422 : Incorrect Contact Count in Manage Bucket Screen' (#169) from pramod_Bug#422 into Feature_Directory Vikas Nale 2025-06-02 07:54:23 +00:00
  • 8c3b10f1cb Merge pull request 'pramod_Bug-#215 : Fixed : Display correct icon for approved check-out regularization requests in employee attendance profile' (#168) from pramod_Bug-#215 into Issue_Jun_1W Vikas Nale 2025-06-02 07:53:58 +00:00
  • 75ff06e1e4 handled error , if does'nt have category Pramod Mahajan 2025-06-02 13:19:13 +05:30
  • 4b5c3cd737 show "NA" for missing email in contact list view Pramod Mahajan 2025-06-02 11:37:19 +05:30