|
|
910565e003
|
Merge branch 'Organization_Hierarchy' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy
|
2025-11-13 10:07:48 +05:30 |
|
|
|
a40f96fe72
|
removed unneeded border and replace toggle for activtive - inactie
|
2025-11-13 10:07:40 +05:30 |
|
|
|
559d6cdaac
|
Adding Employee details at mange Reporting popup.
|
2025-11-13 09:54:54 +05:30 |
|
|
|
3500adc1eb
|
Change the icon in Employee List manage Reporting button.
|
2025-11-13 09:45:41 +05:30 |
|
|
|
867ee92151
|
Adding popup in employees for ManageReporting.
|
2025-11-11 11:11:13 +05:30 |
|
|
|
1c64fac499
|
Adding Spinners in all files.
|
2025-10-31 15:06:11 +05:30 |
|
|
|
dc4e48ad3b
|
Changes in Employee list at pagination and at mobile view then scrollbar is shown.
|
2025-10-15 12:37:16 +00:00 |
|
|
|
f0c6aea55d
|
Create a seprate file for export functionality in employee.
|
2025-10-15 12:33:55 +00:00 |
|
|
|
278a5651fe
|
Changes in excel import.
|
2025-10-15 12:33:55 +00:00 |
|
|
|
6fc3e674e5
|
Export to PDF button not functioning
|
2025-10-15 12:33:55 +00:00 |
|
|
|
b8891d403f
|
Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams
|
2025-10-13 09:33:09 +00:00 |
|
|
|
80a974e3be
|
“NA” Should Be Displayed When Employee Has No Email Instead of “–”
|
2025-10-13 09:32:51 +00:00 |
|
|
|
edce5ef614
|
added newhook that return only organization employee for employee list (Active or Inactive)
|
2025-10-10 16:48:22 +05:30 |
|
|
|
9886fac03e
|
employee attendance display sorted by date,
|
2025-10-06 17:20:36 +05:30 |
|
|
|
482f8a9bcb
|
added organization api in repo. and removed unuse files
|
2025-09-27 23:54:44 +05:30 |
|
|
|
4afe43d116
|
handle one tenant have , directly move to dashboard once logged
|
2025-09-22 00:09:34 +05:30 |
|
|
|
d3218eb77a
|
handle project set null at employee details page
|
2025-09-17 15:50:44 +05:30 |
|
|
|
a86c815ca2
|
Asthetic Changes
- Margin on all sides for grid
- Margin for card content
|
2025-09-16 18:33:48 +05:30 |
|
|
|
9af7a5ceb2
|
Employee Profile Page Not Updating without refresh page ,After Edit
|
2025-09-15 15:19:40 +05:30 |
|
|
|
75ca3d1504
|
Display Only "Re-activate" Button for Inactive Employees in Action Column
|
2025-09-13 10:11:25 +00:00 |
|
|
|
c83de16466
|
added missed outed confirm modal inside employee for suspend emp
|
2025-09-11 11:09:46 +05:30 |
|
|
|
5ec5218dd6
|
Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
# src/pages/Activities/DailyTask.jsx
# src/pages/master/MasterPage.jsx
|
2025-09-10 10:37:38 +05:30 |
|
|
|
614d61e6e9
|
Invalid Date Displayed Instead of "NA" in Employee List
|
2025-09-10 04:43:23 +00:00 |
|
|
|
da8d63ce62
|
changed msg whenenver emp not found- "No team members assigned yet"
|
2025-09-08 15:06:24 +05:30 |
|
|
|
63a5f7b902
|
normalize projectId from localStorage to avoid "null" string
|
2025-09-08 14:22:23 +05:30 |
|
|
|
f9876c6d52
|
spell correction
|
2025-09-08 12:40:14 +05:30 |
|
|
|
34654aae0a
|
: rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject
|
2025-09-05 10:53:05 +05:30 |
|
|
|
61fb797db4
|
change label
|
2025-08-25 20:14:48 +05:30 |
|
|
|
57eb2ab405
|
Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
|
2025-08-23 12:55:35 +05:30 |
|
|
|
f1bc6bd57d
|
Updation in Employee Suspend and Reactivate employee.
|
2025-08-23 04:37:20 +00:00 |
|
|
|
00b73b3d34
|
Display Only "Re-activate" Button for Inactive Employees in Action Column
|
2025-08-23 04:37:20 +00:00 |
|
|
|
967d176a09
|
change table header Official Designation to Designation
|
2025-08-18 10:22:32 +05:30 |
|
|
|
8117e60bff
|
optimized EmpDashBoard , EmployeeNav and EmployeeProfile
|
2025-08-12 16:27:26 +05:30 |
|
|
|
beefe6396c
|
- Add date format hook
- add Ui for Activities
|
2025-08-12 16:27:25 +05:30 |
|
|
|
f52b68dc46
|
ui improvements - dashbord attendance report toggle icons change
|
2025-08-12 16:24:59 +05:30 |
|
|
|
1c0a6d8a89
|
Created new layout for employee profile page
|
2025-08-12 16:24:59 +05:30 |
|
|
|
195af8317a
|
set padding horizontically for Emp table
|
2025-08-06 11:33:19 +05:30 |
|
|
|
1d9de3dbca
|
UI changes in Employee Profile and Project Profile.
|
2025-07-26 12:04:18 +05:30 |
|
|
|
587029a766
|
Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation".
|
2025-07-26 12:03:38 +05:30 |
|
|
|
0c95882e7f
|
changed employeeAttendance record modal
|
2025-07-18 00:09:45 +05:30 |
|
|
|
6e5e206bc8
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2
|
2025-07-17 17:30:16 +05:30 |
|
|
|
59196b3cf0
|
added query hook for fetching and posting data
|
2025-07-17 09:52:14 +05:30 |
|
|
|
d2f761bd48
|
Changes in EmployeePage.
|
2025-07-16 13:08:25 +00:00 |
|
|
|
2425387d8e
|
display correctly activie,incative and all employee according user action
|
2025-07-16 18:30:06 +05:30 |
|
|
|
47e458fe7c
|
added choose all project option at dashboard
|
2025-07-15 17:06:47 +05:30 |
|
|
|
5ec982778d
|
added view team memeber and all employee
|
2025-07-15 10:21:17 +05:30 |
|
|
|
59190cf086
|
Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.
|
2025-07-14 12:27:53 +05:30 |
|
Pramod Mahajan
|
01591c429e
|
added generic modal for edit profile
|
2025-07-09 16:37:09 +05:30 |
|
Pramod Mahajan
|
fca3f03a44
|
fixed searching for employee
|
2025-07-09 14:33:21 +05:30 |
|
Pramod Mahajan
|
8676ff24a5
|
handle to prevent unwanted api calling
|
2025-07-06 15:51:46 +05:30 |
|
