Commit Graph

  • c53aa1ec92 Add activity column to logs for clearer action tracking Pramod Mahajan 2025-04-29 00:56:01 +05:30
  • 4f1cf7c0a5 Update logs to reflect check-in/check-out operations immediately Pramod Mahajan 2025-04-29 00:54:31 +05:30
  • 054ef8fd17 Updated TimePicker to disable future times and allow only current or past selections Pramod Mahajan 2025-04-29 00:51:31 +05:30
  • 5b88c86df5 added Spinning Animation for refresh button Pramod Mahajan 2025-04-29 00:49:52 +05:30
  • f42b2d2724 clean up unused code Pramod Mahajan 2025-04-29 00:48:58 +05:30
  • 6b241b14de Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active Pramod Mahajan 2025-04-29 00:47:32 +05:30
  • 6dc30f8e2a modified project/team api, it can fromdate to todate Pramod Mahajan 2025-04-29 00:43:10 +05:30
  • bf7adc2cc6 immediately update log attendances after marking attendance Pramod Mahajan 2025-04-29 00:41:16 +05:30
  • 9b742a2f7f removed console Pramod Mahajan 2025-04-28 12:04:33 +05:30
  • 4a2dcd82d4 comment default option -select a Job role. Pramod Mahajan 2025-04-28 12:02:40 +05:30
  • d88fd3180f modified request for manage role. Pramod Mahajan 2025-04-28 11:36:34 +05:30
  • a84cb355c8 changed image and directory icons Pramod Mahajan 2025-04-28 09:27:49 +05:30
  • fbc9ba7ae4 updated master activity api url Pramod Mahajan 2025-04-28 09:27:05 +05:30
  • b595fe6a0f added id in roles obj request Pramod Mahajan 2025-04-26 22:56:59 +05:30
  • 66703de72e changed btn size. to sm Pramod Mahajan 2025-04-26 18:43:06 +05:30
  • 1ca337067a fixed previous role feature to current user role. Pramod Mahajan 2025-04-26 18:31:20 +05:30
  • 3777d4b7c5 set default view is cards Pramod Mahajan 2025-04-26 18:25:02 +05:30
  • c0a766e7e1 Email field will be empty once response is received. Pramod Mahajan 2025-04-26 18:17:56 +05:30
  • c900dc80a9 hide uneccessary msg or fixed loading condition for create new employee Pramod Mahajan 2025-04-26 18:15:49 +05:30
  • 162c91c1aa Merge pull request 'pramod_Task#105' (#52) from pramod_Task#105 into Issues_April_4W Gitea Admin 2025-04-25 11:02:03 +00:00
  • dbd84def0d remove unnecessary stuff Pramod Mahajan 2025-04-25 12:36:59 +05:30
  • 8c96edea17 added new directory page for conatct -list page Pramod Mahajan 2025-04-25 12:32:51 +05:30
  • 98a327fbb6 added new one route -directory Pramod Mahajan 2025-04-25 12:32:04 +05:30
  • c3e75f3f48 changed Status-filter icon size Pramod Mahajan 2025-04-25 12:31:25 +05:30
  • d08b64dc3b added new directory tab Pramod Mahajan 2025-04-25 12:30:02 +05:30
  • a1a3da61db new directory components Pramod Mahajan 2025-04-25 12:29:36 +05:30
  • 786a5a689e made custome TagInput. Pramod Mahajan 2025-04-25 12:28:56 +05:30
  • 3160da69d2 added one more css property radius Pramod Mahajan 2025-04-25 12:28:30 +05:30
  • a7e9605ae3 added css for scroll bar modified Pramod Mahajan 2025-04-25 12:26:56 +05:30
  • a2f6d77dcd Merge pull request 'pramod_Feature#51ProjectLisFilter' (#51) from pramod_Feature#51ProjectLisFilter into Issues_April_4W Gitea Admin 2025-04-25 11:00:43 +00:00
  • a92a041333 Prevent multiple API calls and display correct data for selected project Pramod Mahajan 2025-04-24 11:54:00 +05:30
  • d2d1c3cc86 default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions. Pramod Mahajan 2025-04-24 10:31:40 +05:30
  • f2f7898970 joining date will no wrap Pramod Mahajan 2025-04-24 10:26:31 +05:30
  • b53286672a remove unnecessary stuff Pramod Mahajan 2025-04-25 12:36:59 +05:30
  • de231145d4 added new directory page for conatct -list page Pramod Mahajan 2025-04-25 12:32:51 +05:30
  • 8eab23bb36 added new one route -directory Pramod Mahajan 2025-04-25 12:32:04 +05:30
  • 0a200f5aa3 changed Status-filter icon size Pramod Mahajan 2025-04-25 12:31:25 +05:30
  • 3bda6b5ceb added new directory tab Pramod Mahajan 2025-04-25 12:30:02 +05:30
  • a08089d1b9 new directory components Pramod Mahajan 2025-04-25 12:29:36 +05:30
  • 15aa726857 made custome TagInput. Pramod Mahajan 2025-04-25 12:28:56 +05:30
  • 3563c0a857 added one more css property radius Pramod Mahajan 2025-04-25 12:28:30 +05:30
  • 77b7faa875 added css for scroll bar modified Pramod Mahajan 2025-04-25 12:26:56 +05:30
  • dbfd536ba3 Prevent multiple API calls and display correct data for selected project Pramod Mahajan 2025-04-24 11:54:00 +05:30
  • 2dd324e725 Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter Pramod Mahajan 2025-04-24 11:09:02 +05:30
  • e102abb117 default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions. Pramod Mahajan 2025-04-24 10:31:40 +05:30
  • fd9a02aa4f joining date will no wrap Pramod Mahajan 2025-04-24 10:26:31 +05:30
  • b30f3b8d98 Merge pull request 'pramod_Feature#51ProjectLisFilter' (#50) from pramod_Feature#51ProjectLisFilter into Issues_April_4W Gitea Admin 2025-04-23 09:05:08 +00:00
  • 3ee5a71cc9 added status and search filter filter Pramod Mahajan 2025-04-23 12:16:40 +05:30
  • c61cb3bb63 added userPermissions Pramod Mahajan 2025-04-23 12:14:30 +05:30
  • 38fbc6dc84 reafactor code for reuasability Pramod Mahajan 2025-04-23 11:08:02 +05:30
  • c38a92b8b7 added list view component Pramod Mahajan 2025-04-23 11:01:14 +05:30
  • d9f4bc47f6 added new functions ,getProjectStatusName and getProjectStatusColor Pramod Mahajan 2025-04-23 11:00:10 +05:30
  • 099098d39a changed getProjectStatusName getProjectStatusColor location. added these fun in Utils folder Pramod Mahajan 2025-04-23 10:52:55 +05:30
  • c76045d39e chanaged getProjectStatusName Pramod Mahajan 2025-04-23 10:49:31 +05:30
  • 3c9e68f91b created new progressBar component Pramod Mahajan 2025-04-23 10:48:47 +05:30
  • 3e71511d8e Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter Pramod Mahajan 2025-04-22 16:23:38 +05:30
  • 148058d1d2 Merge branch 'pramod_Bug#99ProjectsDisplays' into Issues_April_4W Vikas Nale 2025-04-22 16:07:46 +05:30
  • 4354d0f611 Merge pull request 'modified projectBanner padding and fontsize.' (#48) from pramod_Task#73ResizeProjectNameFontSize into Issues_April_4W Vikas Nale 2025-04-22 10:35:58 +00:00
  • 7f7f05277a modified projectBanner padding and fontsize. Pramod Mahajan 2025-04-22 11:03:23 +05:30
  • a3a827ed78 Merge pull request 'pramod_Enhancement#98' (#47) from pramod_Enhancement#98 into Issues_April_4W Vikas Nale 2025-04-22 10:33:58 +00:00
  • fc2f69f429 selected employee list will empty after submission and close model perfectly Pramod Mahajan 2025-04-22 10:15:41 +05:30
  • b15f5df8e7 added assign task button for mobile view Pramod Mahajan 2025-04-22 10:00:49 +05:30
  • a5d74a0b34 updated a employee list and selected employe list Pramod Mahajan 2025-04-22 09:54:27 +05:30
  • 450c8143ff removed extra padding. Pramod Mahajan 2025-04-22 09:53:04 +05:30
  • d64b6c6134 Merge pull request 'fixed correct projectId is used when navigating to DailyTask' (#46) from pramod_Bug#97 into Issues_April_4W Vikas Nale 2025-04-22 10:33:04 +00:00
  • 461ffeb83d fixed correct projectId is used when navigating to DailyTask Pramod Mahajan 2025-04-21 22:32:42 +05:30
  • b53686ddd5 Merge pull request 'Fixes error where it was showing multiple error in login and forget page' (#45) from Ashutosh_Bug#63_Multiple_Error_Toast into Issues_April_4W Vikas Nale 2025-04-22 10:31:41 +00:00
  • 1caeeb890d added filter, only display logged user associated projects Pramod Mahajan 2025-04-22 13:01:31 +05:30
  • a096f3d743 Set default project to the first one associated with the logged-in user. Pramod Mahajan 2025-04-22 13:00:32 +05:30
  • 7e99a04a25 modified projectBanner padding and fontsize. Pramod Mahajan 2025-04-22 11:03:23 +05:30
  • b4d2fd86f7 imported projectLisComponent Pramod Mahajan 2025-04-22 10:45:03 +05:30
  • 1cdfb47c39 created new projectListView component Pramod Mahajan 2025-04-22 10:44:41 +05:30
  • 5bbd251924 selected employee list will empty after submission and close model perfectly Pramod Mahajan 2025-04-22 10:15:41 +05:30
  • 6db263b204 added assign task button for mobile view Pramod Mahajan 2025-04-22 10:00:49 +05:30
  • c0afce5c44 updated a employee list and selected employe list Pramod Mahajan 2025-04-22 09:54:27 +05:30
  • 0e4febdede removed extra padding. Pramod Mahajan 2025-04-22 09:53:04 +05:30
  • b5b55a7962 fixed correct projectId is used when navigating to DailyTask Pramod Mahajan 2025-04-21 22:32:42 +05:30
  • bb6c48300c Fixes error where it was showing multiple error in login and forget page ashutosh.nehete 2025-04-21 17:35:42 +05:30
  • d4fed67912 Merge pull request 'pramod_Bug#23EmplAssignToProject' (#44) from pramod_Bug#23EmplAssignToProject into Issues_April_4W Vikas Nale 2025-04-21 11:12:42 +00:00
  • 977dfcefe8 handled employee not avaible for project. employee list is empty Pramod Mahajan 2025-04-21 16:00:22 +05:30
  • 6c2a6ca7f9 employee assign perfectly with job role. Pramod Mahajan 2025-04-21 15:41:37 +05:30
  • a4285388f8 model open on single click. Pramod Mahajan 2025-04-21 15:40:36 +05:30
  • b81c3c9eab removed this file, not needed Pramod Mahajan 2025-04-21 15:38:37 +05:30
  • c63b261734 Merge pull request 'Fixed the bug where it passes projectId 1 to APIs when we refreshes the page' (#43) from Ashutosh_Bug#96_Passing_Incorrect_ProjectId into Issues_April_4W Vikas Nale 2025-04-21 07:03:59 +00:00
  • 2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page ashutosh.nehete 2025-04-21 11:36:49 +05:30
  • e90cbc4912 Merge pull request 'changed Activity Title Name- > Activity, description-> Unit' (#42) from pramod_Enhancement#53Activity-TitleChanged into Issues_April_4W Vikas Nale 2025-04-21 07:02:18 +00:00
  • 10824df9c4 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page ashutosh.nehete 2025-04-21 11:36:49 +05:30
  • 048d9bb118 changed Activity Title Name- > Activity, description-> Unit Pramod Mahajan 2025-04-20 23:18:15 +05:30
  • bbc8d010c8 Merge pull request 'pramod_Bug#65EyeIconShowHide' (#41) from pramod_Bug#65EyeIconShowHide into Issues_April_4W Vikas Nale 2025-04-20 14:09:04 +00:00
  • e97bbdeee6 removed unnecessary code Pramod Mahajan 2025-04-20 16:04:04 +05:30
  • dc21e578de Replaced the btn class with input-group-text because broken click even in classt input-group Pramod Mahajan 2025-04-20 15:54:39 +05:30
  • e46a94dd1a modified model size for application role Pramod Mahajan 2025-04-20 15:51:17 +05:30
  • 4ffab89aac added tooltip Pramod Mahajan 2025-04-20 15:50:30 +05:30
  • 9170d35652 Added tooltip Pramod Mahajan 2025-04-20 15:50:19 +05:30
  • 83e835056b Merge pull request 'pramod_Bug#62CreateActivity' (#40) from pramod_Bug#62CreateActivity into Issues_April_4W Vikas Nale 2025-04-20 08:46:48 +00:00
  • 18729e960c removed condiational vaiable and added tooltip for edit and delet icon. Pramod Mahajan 2025-04-20 13:49:05 +05:30
  • ebc03cb9eb Fetched workItem from cache instead of props to resolve state inconsistency issue. Pramod Mahajan 2025-04-20 13:47:30 +05:30
  • df7303b724 Fixed state sync issue by clearing cache and re-fetching project data after task creation. Pramod Mahajan 2025-04-20 13:44:47 +05:30
  • d47c9fb68e Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#62CreateActivity Pramod Mahajan 2025-04-20 14:05:58 +05:30
  • cacbedeabd Merge pull request 'added limitation for phone no' (#39) from pramod_Bug#27 into Issues_April_4W Vikas Nale 2025-04-20 08:33:59 +00:00