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

202 Commits

Author SHA1 Message Date
Pramod Mahajan
c91682a871 fixed attendance status & logs logic with proper activity handling 2025-05-31 23:34:55 +05:30
Pramod Mahajan
936636c29b optimized custom hook usage 2025-05-31 10:17:48 +00:00
kartik.sharma
dbc9bbffa2 Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it. 2025-05-31 11:39:15 +05:30
Pramod Mahajan
ce4b517ce5 Add condition to move entries to 'approved' if checkOut and date are in the past. 2025-05-15 05:46:40 +00:00
ashutosh.nehete
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. 2025-05-12 14:40:13 +05:30
ashutosh.nehete
cf204f376d Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions. 2025-05-12 07:58:33 +00:00
ashutosh.nehete
96963527df Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality. 2025-05-10 17:56:35 +05:30
ashutosh.nehete
a90aa77cf6 Provided proper parameter to employee list api for ont to include inactive employees 2025-05-09 10:20:54 +05:30
ashutosh.nehete
a3867dfb2f Added a toggle switch in the Employee List module to view active and inactive employees separately. 2025-05-08 05:38:27 +00:00
Pramod Mahajan
f45febb82c show correct message after all employees are assigned to a project 
- fixed issue where loader spinner stayed active after API call
- added setLoading(false) in useAllEmployee hook after API call
- now message All employee assigned to Project." shows properly
 2025-05-06 12:47:27 +00:00
Pramod Mahajan
477cc5ab73 resolved merged conflict 2025-05-05 17:30:09 +05:30
Pramod Mahajan
4a326fb1ea Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 2025-05-05 15:37:26 +05:30
Vikas Nale
1bd858ca73 Display middle name for employee on Teams and Employees page 2025-05-05 13:30:09 +05:30
Pramod Mahajan
098aa9749f resolved merge conflict 2025-05-05 11:34:12 +05:30
Pramod Mahajan
a96fa8efc7 show loading... initially instead of "No projects found" message at ui 2025-05-04 18:53:34 +05:30
Vikas Nale
cd2e563e1d Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 2025-05-04 12:30:52 +05:30
Vikas Nale
5af745958e Handle project list loading issue 2025-05-04 12:30:46 +05:30
ashutosh.nehete
213ca4067e added one more codition if emp checkIn and checkOut and checkout day is current , so ee can able to checkIn otherwise their attendance approved of that day 2025-05-04 12:23:04 +05:30
Pramod Mahajan
0c8f201d0c Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 2025-05-04 12:00:29 +05:30
Pramod Mahajan
4bd574772f filtering projects according to logged user at data layer 2025-05-04 12:00:10 +05:30
ashutosh.nehete
8718aede85 removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster 2025-05-04 11:54:08 +05:30
ashutosh.nehete
bb23d10996 Fixed bug of not getting data of correct project when going to attendance page 2025-05-04 09:32:12 +05:30
ashutosh.nehete
1bbc8fd422 Conver Int to Guid 2025-05-03 21:43:15 +05:30
Pramod Mahajan
ee2d44b5fc fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await 2025-04-30 00:03:08 +05:30
Pramod Mahajan
fec6de8a54 removed console 2025-04-29 23:54:59 +05:30
Pramod Mahajan
f42b2d2724 clean up unused code 2025-04-29 00:48:58 +05:30
Pramod Mahajan
d2d1c3cc86 default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions. 2025-04-25 11:00:43 +00:00
Pramod Mahajan
a096f3d743 Set default project to the first one associated with the logged-in user. 2025-04-22 13:00:32 +05:30
ashutosh.nehete
2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page 2025-04-21 07:03:59 +00:00
Pramod Mahajan
4182cd9077 modified response format 2025-04-20 08:32:14 +00:00
Pramod Mahajan
35c54fb48a removed unnecessary code 2025-04-17 16:25:22 +05:30
Pramod Mahajan
d1c36dfd97 Changed 'Role' to 'Application Role' 2025-04-15 01:08:59 +05:30
ashutosh.nehete
87c110a6af Add UI changes for dashboard. 
- Reduce dropdown font
- sort project list
 2025-04-14 17:59:43 +05:30
ashutosh.nehete
4f67d58923 removed cache handling. 2025-04-14 17:57:00 +05:30
Pramod Mahajan
63b02db9b3 added FromData to endDate filter in Task list 2025-04-13 17:27:51 +05:30
Vaibhav Surve
b4be5a38ab refactor(Dashboard): rename loading state variable for clarity in progression data hook 2025-04-11 17:23:06 +05:30
Vaibhav Surve
51190b0d53 add dashboard data hooks and global repository for API interactions 2025-04-11 15:44:51 +05:30
Pramod Mahajan
2428f15f35 integrated activity api and fetch in master seaction. 2025-04-10 03:03:38 +05:30
Pramod Mahajan
60232cf121 added refetch fun 2025-04-10 02:49:05 +05:30
Pramod Mahajan
c45130b611 updated project-infra-each modelForm able to taking recently added item 2025-04-10 02:07:47 +05:30
Pramod Mahajan
453c53940f Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-09 11:28:20 +05:30
Pramod Mahajan
faf68cac25 fixed attendance logs, attendanance rolename and removed import-userProfile. 2025-04-09 11:23:34 +05:30
ashutosh.nehete
1f5d4688bb Fixed error of api call before submiting create form 2025-04-09 11:08:39 +05:30
Pramod Mahajan
d56ba89a4a fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server 2025-04-08 18:21:59 +05:30
ashutosh.nehete
f9c6d1b7f8 Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
Pramod Mahajan
10d6f96ea7 added taskreport, commentTask feature 2025-04-06 18:03:10 +05:30
Pramod Mahajan
ddfbed1020 updated project infra components and added assigntask 2025-04-05 13:10:24 +05:30
Pramod Mahajan
1451c1aff7 added login and forgot form validation and changed server response format 2025-04-03 17:51:59 +05:30
Pramod Mahajan
5a7ca02952 added use-rights functionality according to users 2025-04-01 17:17:35 +05:30
PramodMahajan14
8e455e96b4 updated projectList comp. immediately update rights 2025-03-26 13:02:49 +05:30