admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 2922cca22d integrated Contact Tag list API and display in master table Pramod Mahajan 2025-05-15 22:58:50 +05:30
  • a3d21ba098 updated incorrect API endpoint Pramod Mahajan 2025-05-15 22:58:02 +05:30
  • cdc52ae947 Merge pull request 'Task#225 : integrate Get Contact List API in useMaster hook' (#111) from pramod_Task#225 into Feature_Directory pramod.mahajan 2025-05-15 17:03:45 +00:00
  • 04297346fa feat: integrate Get Contact List API in useMaster hook Pramod Mahajan 2025-05-15 22:21:20 +05:30
  • 70cfa36ba8 Merge pull request 'pramod_Task-#293' (#110) from pramod_Task-#293 into Feature_Directory pramod.mahajan 2025-05-15 16:23:13 +00:00
  • d8df891370 added createContactTg component inside MasterModal Pramod Mahajan 2025-05-15 21:48:44 +05:30
  • dcc611b768 created new createContactMaster component Pramod Mahajan 2025-05-15 21:47:51 +05:30
  • 413dba4f5c added Tag master inside masterList Pramod Mahajan 2025-05-15 21:47:20 +05:30
  • 0a1f76afb6 Modified popup of Assign Task. kartik.sharma 2025-05-15 19:40:09 +05:30
  • 9a4c5df14f Merge pull request 'pramod_Task#224 : Created New Master - Contact Category' (#108) from pramod_Task#224 into Feature_Directory Gitea Admin 2025-05-15 12:28:37 +00:00
  • cd21bc14ff created new repo for tag and contact category mastes Pramod Mahajan 2025-05-15 15:09:57 +05:30
  • 40df12de86 added CreateContactCategory in master modal Pramod Mahajan 2025-05-15 15:08:55 +05:30
  • 74ed8d3c4f created new constact category master Pramod Mahajan 2025-05-15 15:07:37 +05:30
  • 784eebafea added one more master in masterList - Contact Category Pramod Mahajan 2025-05-15 15:04:58 +05:30
  • 88d23fc765 Merge pull request 'pramod_Task-#280 - Fetched & Display Contact List in Directory' (#107) from pramod_Task-#280 into Feature_Directory Gitea Admin 2025-05-15 12:27:59 +00:00
  • 1f8f3f0cc9 created new repo for tag and contact category mastes Pramod Mahajan 2025-05-15 15:09:57 +05:30
  • 398c149276 added CreateContactCategory in master modal Pramod Mahajan 2025-05-15 15:08:55 +05:30
  • 2b4bb4c750 created new constact category master Pramod Mahajan 2025-05-15 15:07:37 +05:30
  • 2ef90b8f8d added one more master in masterList - Contact Category Pramod Mahajan 2025-05-15 15:04:58 +05:30
  • 50ef045479 display contact in list view Pramod Mahajan 2025-05-15 12:20:55 +05:30
  • cc98f34b44 displaye contacts in List View Pramod Mahajan 2025-05-15 12:19:57 +05:30
  • 5415210d70 created new hook for get a contacts Pramod Mahajan 2025-05-15 12:19:30 +05:30
  • 3670409977 created new repo for get contact list Pramod Mahajan 2025-05-15 12:18:05 +05:30
  • 7d3bffe0cd Merge pull request 'pramod_Bug-#271' (#106) from pramod_Bug-#271 into Issue_May_3W Gitea Admin 2025-05-15 05:46:40 +00:00
  • 7d07002555 visible assign task button in mobile view Pramod Mahajan 2025-05-14 22:36:44 +05:30
  • 2ebd1a074f show 'No Reports Found' message when task list is empty and loading is complete Pramod Mahajan 2025-05-14 15:35:55 +05:30
  • ce4b517ce5 Add condition to move entries to 'approved' if checkOut and date are in the past. Pramod Mahajan 2025-05-14 15:34:40 +05:30
  • eb9ae735ba visible assign task button in mobile view Pramod Mahajan 2025-05-14 22:36:44 +05:30
  • f8eed8dd50 Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#271 Pramod Mahajan 2025-05-14 15:36:27 +05:30
  • 1bfbaf7b1f show 'No Reports Found' message when task list is empty and loading is complete Pramod Mahajan 2025-05-14 15:35:55 +05:30
  • f0d7153e76 Add condition to move entries to 'approved' if checkOut and date are in the past. Pramod Mahajan 2025-05-14 15:34:40 +05:30
  • 1e57e6fc03 Merge pull request 'Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission' (#105) from Ashutosh_Frature_Permission into Issue_May_3W Gitea Admin 2025-05-14 09:59:08 +00:00
  • ca9f744d01 Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission ashutosh.nehete 2025-05-14 15:00:39 +05:30
  • 197abedfe2 Merge pull request 'Implemented Pushover to display permission descriptions when editing or creating application role' (#104) from Kartik_permission_description into Issue_May_3W Gitea Admin 2025-05-14 08:04:12 +00:00
  • aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role kartik.sharma 2025-05-13 18:48:40 +05:30
  • c8ad72a2da added Assign_view progress task permission. Vikas Nale 2025-05-13 12:40:10 +05:30
  • f94e8a1f88 Merge branch 'pramod_Bug#221' into Issue_May_2W Vikas Nale 2025-05-13 12:31:09 +05:30
  • 31286eff0a Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#221 Pramod Mahajan 2025-05-13 12:14:50 +05:30
  • 0ca7acb140 added Assign_view progress task permission. Pramod Mahajan 2025-05-13 12:14:36 +05:30
  • ba6b15a12e custimize accordation css Pramod Mahajan 2025-05-13 11:33:25 +05:30
  • d398a6cb39 added dropdwon for action view Pramod Mahajan 2025-05-13 11:32:09 +05:30
  • 4fb337533e added bootstrap accordation Pramod Mahajan 2025-05-13 11:30:43 +05:30
  • db098f9fdc manage floor header size for collap Pramod Mahajan 2025-05-13 11:29:56 +05:30
  • 7572ad0777 modified attend log, icons, correct for regualarize and check-out pramod_Task#207 Pramod Mahajan 2025-05-12 17:00:01 +05:30
  • 6b8a314c25 Merge branch 'pramod_Task#207' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207 Pramod Mahajan 2025-05-12 16:40:16 +05:30
  • d5d4cd0dc4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207 Pramod Mahajan 2025-05-12 16:39:40 +05:30
  • aa2ca6565b Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154 Pramod Mahajan 2025-05-12 16:36:55 +05:30
  • bf797503f5 added accordionn for floor Pramod Mahajan 2025-05-12 16:34:44 +05:30
  • 663269770a Merge pull request 'Added a popup to allow editing of employee information directly in the Employee Profile.' (#101) from Ashutosh_Emplyee_Profile_Edit_Popup into Issue_May_2W Vikas Nale 2025-05-12 10:20:26 +00:00
  • bf097bc884 Added a popup to allow editing of employee information directly in the Employee Profile. ashutosh.nehete 2025-05-12 15:45:17 +05:30
  • a3608a49bd remove sneat lables from application Vikas Nale 2025-05-12 15:37:31 +05:30
  • a7aa815691 Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W Vikas Nale 2025-05-12 14:49:33 +05:30
  • bea3661ce2 Merge pull request 'pramod_Task#213' (#100) from pramod_Task#213 into Issue_May_2W Vikas Nale 2025-05-12 09:18:29 +00:00
  • 926168bb07 Modified report comments section. Pramod Mahajan 2025-05-12 14:33:34 +05:30
  • f51ed3a380 added custome font size class Pramod Mahajan 2025-05-12 14:32:48 +05:30
  • 9b2c27b903 Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown ashutosh.nehete 2025-05-12 14:44:59 +05:30
  • e8ac267d46 Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views. ashutosh.nehete 2025-05-12 13:11:29 +05:30
  • 95f7b36481 Modified report comments section. Pramod Mahajan 2025-05-12 14:33:34 +05:30
  • fab0060bb8 added custome font size class Pramod Mahajan 2025-05-12 14:32:48 +05:30
  • 634dc12e5b Merge pull request 'Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions.' (#98) from Ashutosh_Bug#216_Create_Employee_Popup_Typo into Issue_May_2W Vikas Nale 2025-05-12 07:58:33 +00:00
  • cf204f376d Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions. ashutosh.nehete 2025-05-12 12:21:29 +05:30
  • 49f725b62d Merge pull request 'pramod_Task#207 Sync activity updates and deletions in Daily Task Planning view without page refresh' (#96) from pramod_Task#207 into Issue_May_2W Vikas Nale 2025-05-12 07:58:04 +00:00
  • 8db6a16e15 revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1 pramod.mahajan 2025-05-12 06:15:04 +00:00
  • 2188f109cb disable Edit button and show "Please wait" message during activity update API call Pramod Mahajan 2025-05-11 01:26:57 +05:30
  • 292c920941 added loader during submitting form data. Pramod Mahajan 2025-05-11 01:12:08 +05:30
  • af6a6faa46 ensure activity updates reflect in Daily Task Planning without page refresh Pramod Mahajan 2025-05-11 01:04:40 +05:30
  • 73152dbf0a Merge pull request 'Bug#215 updated regularization logic based on 48-hour checkout threshold for attendanceLogs.' (#97) from pramod_Bug-#215 into Issue_May_2W Vikas Nale 2025-05-12 07:57:40 +00:00
  • 216e9b0db0 updated regularization logic based on 48-hour checkout threshold for attendanceLogs. Pramod Mahajan 2025-05-12 11:33:04 +05:30
  • b39effe4b0 Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views. ashutosh.nehete 2025-05-12 13:11:29 +05:30
  • 2fca3167b0 Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions. ashutosh.nehete 2025-05-12 12:21:29 +05:30
  • c481cd958a revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1 pramod.mahajan 2025-05-12 06:15:04 +00:00
  • 7bfd1728c0 updated regularization logic based on 48-hour checkout threshold for attendanceLogs. Pramod Mahajan 2025-05-12 11:33:04 +05:30
  • 1827757f19 updated regularization logic based on 48-hour checkout threshold Pramod Mahajan 2025-05-12 11:22:34 +05:30
  • c0ac2295d0 Remove warnings ref: https://reactrouter.com/6.30.0/upgrading/future#v7_starttransition Vikas Nale 2025-05-12 10:35:23 +05:30
  • 03165f5eab disable Edit button and show "Please wait" message during activity update API call Pramod Mahajan 2025-05-11 01:26:57 +05:30
  • 3904c165c9 added loader during submitting form data. Pramod Mahajan 2025-05-11 01:12:08 +05:30
  • 7a7d612f0b ensure activity updates reflect in Daily Task Planning without page refresh Pramod Mahajan 2025-05-11 01:04:40 +05:30
  • 658c2776f1 Merge branch 'pramod_Task#207' into Issue_May_2W Vikas Nale 2025-05-10 19:23:23 +05:30
  • 7cf8e49429 Merge pull request 'Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null.' (#95) from Ashutosh_Enhancement_#214_Report_Task_At_Zero into Issue_May_2W Vikas Nale 2025-05-10 13:38:05 +00:00
  • f26b708564 Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null. ashutosh.nehete 2025-05-10 18:20:57 +05:30
  • f6ab824529 Merge pull request 'Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality.' (#94) from Ashutosh_Feature#208_WorkCategory_Master into Issue_May_2W Vikas Nale 2025-05-10 13:36:51 +00:00
  • 6bb1f98ae7 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207, Pramod Mahajan 2025-05-10 19:06:34 +05:30
  • 4ae42c4756 Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null. ashutosh.nehete 2025-05-10 18:20:57 +05:30
  • 96963527df Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality. ashutosh.nehete 2025-05-10 17:56:35 +05:30
  • 2892b803d5 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207 Pramod Mahajan 2025-05-10 17:07:30 +05:30
  • 5d5e33f308 Merge pull request 'Bug#209 - Issue Resolved: Form Retains Old Data on "Create New Project"' (#93) from pramod_Bug-#209 into Issue_May_2W Vikas Nale 2025-05-10 10:42:37 +00:00
  • 16fd31eef7 added reset and setloader false once request completed Pramod Mahajan 2025-05-10 15:17:46 +05:30
  • 636076ed56 passed reset and loading method inside handleSubmitForm function. Pramod Mahajan 2025-05-10 13:38:53 +05:30
  • ada53e3fce Merge pull request 'pramod_Task#207 Assign button hide and completedWork not editable if , > 0' (#92) from pramod_Task#207 into Issue_May_2W Vikas Nale 2025-05-10 10:41:59 +00:00
  • c4a221807f changed class too className Pramod Mahajan 2025-05-10 12:59:33 +05:30
  • 4b6d1d4658 can't update completed is greather than zero Pramod Mahajan 2025-05-10 12:54:10 +05:30
  • 72558e7725 action position changed center to end Pramod Mahajan 2025-05-10 12:53:11 +05:30
  • 186b18bb6e completedWork can't not update if it grather than zero Pramod Mahajan 2025-05-10 12:33:21 +05:30
  • 26c1492300 handled attendance error object in readble format Pramod Mahajan 2025-05-10 12:32:26 +05:30
  • ea0c3b5ca7 handled correct time slots Pramod Mahajan 2025-05-10 12:31:25 +05:30
  • 2fbd7462d5 time slot display correct slots and if check-In so must display grather than check-in Pramod Mahajan 2025-05-10 12:30:17 +05:30
  • 2e04794047 handled properly checkInTime for timeElapsed Pramod Mahajan 2025-05-10 11:54:23 +05:30
  • 68475f4742 Merge pull request 'pramod_Bug-#203 -preserve selected employees when filtering by role in Daily Task Planning' (#91) from pramod_Bug-#203 into Issue_May_2W Vikas Nale 2025-05-10 10:41:25 +00:00
  • 48321331ea added reset and setloader false once request completed Pramod Mahajan 2025-05-10 15:17:46 +05:30
  • 2ae3d2907b passed reset and loading method inside handleSubmitForm function. Pramod Mahajan 2025-05-10 13:38:53 +05:30