|
f68f589a5e
|
Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.
|
2025-07-26 12:04:36 +05:30 |
|
|
1e8c836e4d
|
Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 12:04:18 +05:30 |
|
|
9afee2934a
|
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 12:04:18 +05:30 |
|
|
aa550ed030
|
In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.
|
2025-07-26 12:04:18 +05:30 |
|
|
774f287615
|
Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
|
2025-07-26 12:04:18 +05:30 |
|
|
1d9de3dbca
|
UI changes in Employee Profile and Project Profile.
|
2025-07-26 12:04:18 +05:30 |
|
|
bccd8a7bdd
|
Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
|
2025-07-26 12:04:17 +05:30 |
|
|
7b0cc6cdbe
|
Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
|
2025-07-26 12:04:17 +05:30 |
|
|
464c32c3ba
|
revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 12:04:17 +05:30 |
|
|
18fb3a0f09
|
When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 12:04:17 +05:30 |
|
|
2bc0939d64
|
Chnages in Header.js wihile user is assigned to single project.
|
2025-07-26 12:04:17 +05:30 |
|
|
a23220fb66
|
Removing Console.log.
|
2025-07-26 12:04:17 +05:30 |
|
|
6ce2860457
|
Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
|
2025-07-26 12:04:17 +05:30 |
|
|
3bd2a17c97
|
Adding In-built scrollbar in Select Teams dropdown and Employees.
|
2025-07-26 12:04:17 +05:30 |
|
|
cdcc9b90e4
|
Enhancement implemented in the Attendance component to include search functionality.
|
2025-07-26 12:04:16 +05:30 |
|
|
d8f892e9f4
|
Added new field in contact create and update form
|
2025-07-26 12:03:38 +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 |
|
|
2d1cddb2e0
|
At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time".
|
2025-07-26 12:03:38 +05:30 |
|
|
a02c72859f
|
Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.
|
2025-07-26 12:02:32 +05:30 |
|
|
080587a46a
|
Merge pull request 'Feature#778_DeletePaymentMode : added delete functionality using id' (#299) from Feature#778_DeletePaymentMode into Feature_Expense
Reviewed-on: #299
Merged
|
2025-07-25 19:24:42 +00:00 |
|
|
786072777e
|
added delete functionality using id
|
2025-07-26 00:52:45 +05:30 |
|
|
e69ea6462a
|
Merge pull request 'Feature#777_EditPaymentMode : added update functionality with fields (id, name, description) in ManagePaymentMode' (#298) from Feature#777_EditPaymentMode into Feature_Expense
Reviewed-on: #298
Merged
|
2025-07-25 19:15:34 +00:00 |
|
|
cba91f0025
|
added update functionality with fields (id, name, description) in ManagePaymentMode
|
2025-07-26 00:44:07 +05:30 |
|
|
7480f9c1d8
|
Merge pull request 'Feature #776NewPaymentMode : add create functionality in ManagePaymentMode' (#297) from Feature-#776NewPaymentMode into Feature_Expense
Reviewed-on: #297
Merged
|
2025-07-25 18:59:47 +00:00 |
|
|
8a3a0dc483
|
add create functionality in ManagePaymentMode
|
2025-07-26 00:27:14 +05:30 |
|
|
ede1b85c1c
|
Merge pull request 'Feature#774_DeleteExpenseType : dded delete functionality for Expense Type using ID' (#296) from Feature#774_DeleteExpenseType into Feature_Expense
Reviewed-on: #296
merged
|
2025-07-25 18:38:42 +00:00 |
|
|
a0e063ac9a
|
dded delete functionality for Expense Type using ID
|
2025-07-26 00:06:47 +05:30 |
|
|
f1b652ace1
|
Merge pull request 'Feature#773_EditExpenseType : Edit Expense Type Master' (#295) from Feature#773_EditExpenseType into Feature_Expense
Reviewed-on: #295
Merged
|
2025-07-25 18:24:42 +00:00 |
|
|
5988089b49
|
forgot close fun inside cancel btn
|
2025-07-25 23:51:47 +05:30 |
|
|
5a2eb1894d
|
added edit functionality, merged create/edit into a common form
|
2025-07-25 23:49:25 +05:30 |
|
|
fb4384b58d
|
Merge pull request 'Feature#772_NEWExpenseType_Master : added create new Expense master form with api integrated' (#294) from Feature#772_NEWExpenseType_Master into Feature_Expense
Reviewed-on: #294
Merged
|
2025-07-25 17:53:37 +00:00 |
|
|
e5d0fcb8df
|
added create new Expense master form with api integrated
|
2025-07-25 23:20:44 +05:30 |
|
|
1d93ee104f
|
updated expense skeleton according expense list
|
2025-07-25 22:21:56 +05:30 |
|
|
0a1d2e8459
|
setdefault value for data range
|
2025-07-25 22:15:56 +05:30 |
|
|
eb08519c6d
|
added permission keys
|
2025-07-25 19:59:24 +05:30 |
|
|
41d3230325
|
added msg if data not exist
|
2025-07-25 19:59:03 +05:30 |
|
|
4123a5ca1e
|
Merge pull request 'Feature#804_ExpnseFilter : Added server side filter' (#293) from Feature#804_ExpnseFilter into Feature_Expense
Reviewed-on: #293
Merged
|
2025-07-25 13:59:48 +00:00 |
|
|
678fd50768
|
added filter for expense list
|
2025-07-25 13:59:48 +00:00 |
|
|
ee6c8069d0
|
group wise row of expenses list
|
2025-07-25 13:59:48 +00:00 |
|
|
7b39ee59f4
|
handle proper error
|
2025-07-25 19:26:51 +05:30 |
|
|
3d847444bb
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-25 18:45:18 +05:30 |
|
|
303420409c
|
merged
|
2025-07-25 18:43:22 +05:30 |
|
|
00d91ad8dd
|
removed double assigned class
|
2025-07-25 18:28:12 +05:30 |
|
|
fb865cbe4f
|
prevent unwanted rendering
|
2025-07-25 18:28:12 +05:30 |
|
|
d34fadfc6d
|
implement delete functionality for Draft expenses only
|
2025-07-25 18:28:12 +05:30 |
|
|
3424c79594
|
rmoved unusd code
|
2025-07-25 18:27:13 +05:30 |
|
|
dce477f6cd
|
set up action properly
|
2025-07-25 18:27:12 +05:30 |
|
|
b1fa01e2c9
|
correctly set isActive flag from document data
|
2025-07-25 18:27:12 +05:30 |
|
|
007b08f335
|
added optinal chain for color , for prevent error
|
2025-07-25 18:27:12 +05:30 |
|
|
9bc5f84c83
|
completed full updation for expnse feature
|
2025-07-25 18:27:12 +05:30 |
|