|
e0f130e6a6
|
user can not select reimburseDate before transaction date
|
2025-08-01 18:39:03 +05:30 |
|
|
28fb1c9387
|
correct draft id
|
2025-08-01 16:56:35 +05:30 |
|
|
82a5df36a0
|
handle action when expense rejected
|
2025-08-01 16:30:08 +05:30 |
|
|
5d8a56401d
|
removed search text
|
2025-08-01 16:29:46 +05:30 |
|
|
daab418873
|
if expense rejected , created user can edit and submit
|
2025-08-01 16:29:05 +05:30 |
|
|
ebfb1ab195
|
handle filter error during network or any
|
2025-08-01 16:28:25 +05:30 |
|
|
e89177339b
|
chnaged lable name for supplier
|
2025-08-01 11:26:57 +05:30 |
|
|
b7c4c841e6
|
removed fuature validation for date, because added flatepick that not allow to select feature date
|
2025-08-01 10:26:39 +05:30 |
|
|
35f221038d
|
added expenses Reimburse
|
2025-08-01 00:42:51 +05:30 |
|
|
b30940c2aa
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses
|
2025-07-31 17:35:17 +05:30 |
|
|
e31bb7c487
|
added search filter and group by
|
2025-07-31 16:02:15 +05:30 |
|
|
74f532799a
|
Merge pull request 'Issues_July_4W' (#316) from Issues_July_4W into main
Reviewed-on: #316
THis branch is deployed on prodution
|
2025-07-31 05:53:28 +00:00 |
|
|
b864ed0529
|
added flatepicker for dates
|
2025-07-31 08:46:40 +05:30 |
|
|
6fbc0411db
|
dynamically set group by filed
|
2025-07-30 19:59:17 +05:30 |
|
|
81712a0695
|
Expense List display group by selected filed
|
2025-07-30 19:33:01 +05:30 |
|
|
34373b6256
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses
|
2025-07-30 18:36:22 +05:30 |
|
|
506e6ac381
|
Merge pull request 'fixed : feature date not allow' (#315) from Expense_Bug#828 into Feature_Expense
Reviewed-on: #315
Merged
|
2025-07-30 12:58:55 +00:00 |
|
|
a40d0b7e58
|
fixed : feature date not allow
|
2025-07-30 18:26:01 +05:30 |
|
|
b0e359e428
|
Change in Team and InfraStructure component when select a project.
|
2025-07-30 17:32:49 +05:30 |
|
|
b410ec71cc
|
All Projects is shown on Unknown Projects Place.
|
2025-07-30 16:36:30 +05:30 |
|
|
c3835a3856
|
Some changes in Header and aboutproject component.
|
2025-07-30 15:34:04 +05:30 |
|
|
811392448d
|
Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W
Reviewed-on: #313
merged
|
2025-07-30 09:26:35 +00:00 |
|
|
5399fa1f17
|
When a project is selected, the last selected project will be displayed.
|
2025-07-30 14:39:43 +05:30 |
|
|
4512c11a60
|
Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W
Reviewed-on: #309
Merged
|
2025-07-30 09:04:05 +00:00 |
|
|
14be5aadda
|
UI Changes in Aboutproject.jsx.
|
2025-07-30 09:04:05 +00:00 |
|
|
fa3ccd28fa
|
Responsive grid changes in Create Role and EditRole.
|
2025-07-30 09:04:05 +00:00 |
|
|
4d4037ed71
|
Changes in Application Role popup.
|
2025-07-30 09:04:05 +00:00 |
|
|
91fabf929c
|
Modify Application role popup to look better
|
2025-07-30 09:04:05 +00:00 |
|
|
d6ead0fd4c
|
added label for filter fields
|
2025-07-30 14:21:32 +05:30 |
|
|
8fa27b8d06
|
removed unused code
|
2025-07-30 14:17:27 +05:30 |
|
|
57b9f70f39
|
removed debugger
|
2025-07-30 14:16:38 +05:30 |
|
|
b3c7406d0a
|
removed extra padding
|
2025-07-30 14:16:10 +05:30 |
|
|
95bfacf5f1
|
Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W
Reviewed-on: #306
Merged
|
2025-07-30 07:54:06 +00:00 |
|
|
76e290fe79
|
Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.
|
2025-07-30 07:54:06 +00:00 |
|
|
28e73ca4fb
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses
|
2025-07-30 12:23:28 +05:30 |
|
|
cc2710abdc
|
Merge pull request 'filter_offcanvas : Added Offcanvas Filter Support for All Pages' (#310) from filter_offcanvas into Feature_Expense
Reviewed-on: #310
Merged
|
2025-07-30 06:48:56 +00:00 |
|
|
2cf7db394d
|
arrange Expense Details columns
|
2025-07-30 12:07:29 +05:30 |
|
|
1e6603cc7c
|
added one more column for createdAt date
|
2025-07-30 12:02:11 +05:30 |
|
|
a3313f6c0a
|
fixed action button visibilities
|
2025-07-30 11:12:56 +05:30 |
|
|
a1682c8a62
|
Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W
Reviewed-on: #307
Merged
|
2025-07-29 13:44:47 +00:00 |
|
|
ac8815d674
|
In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.
|
2025-07-29 13:44:47 +00:00 |
|
|
697c9acfa6
|
Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W
Reviewed-on: #308
Merged
|
2025-07-29 13:33:08 +00:00 |
|
|
a763ec4412
|
Date Format Not Consistent – Should Always Display DD‑MM‑YYYY
|
2025-07-29 13:33:08 +00:00 |
|
|
78640e68f9
|
centralize offcanvas panel handling and make it dynamically configurable per page
|
2025-07-29 17:32:38 +05:30 |
|
|
9e311ef73c
|
removed unused code
|
2025-07-29 17:01:58 +05:30 |
|
|
6b6ec37da4
|
removed parent node,
|
2025-07-29 16:57:52 +05:30 |
|
|
cc05dbad20
|
In Contact profile popup Include Delete functionality add.
|
2025-07-29 16:23:19 +05:30 |
|
|
3464b63588
|
added edit and delete who can perform action
|
2025-07-28 14:12:06 +05:30 |
|
|
528d02a703
|
Changes in Directory card view design.
|
2025-07-28 13:21:20 +05:30 |
|
|
66f2d4bff6
|
In Project List page change Filter icon.
|
2025-07-28 13:10:55 +05:30 |
|
|
e2d45e54a0
|
hide page if have any permission for Expense
|
2025-07-28 13:10:18 +05:30 |
|
|
aa14203357
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-28 12:52:36 +05:30 |
|
|
89c6f9c7fc
|
added pDf view
|
2025-07-28 12:51:09 +05:30 |
|
|
9daecf7cfb
|
Merge pull request 'Feature#813_FeaturePermission : Added Permission at Expense Management' (#305) from Feature#813_FeaturePermission into Feature_Expense
Reviewed-on: #305
merged
|
2025-07-28 07:16:00 +00:00 |
|
|
71d230be32
|
added viewer for pdf type document
|
2025-07-28 12:42:48 +05:30 |
|
|
991e1a263a
|
implement feature permission checks for expense status actions
|
2025-07-28 12:25:44 +05:30 |
|
|
ffb1bd742a
|
Merge pull request 'Project List Dropdown will be remove in Projects.' (#302) from Kartik_ProjectList#628 into Issues_July_4W
Reviewed-on: #302
Merged
|
2025-07-28 06:02:02 +00:00 |
|
|
f28a1a9d4e
|
Project List Dropdown will be remove in Projects.
|
2025-07-28 06:02:02 +00:00 |
|
|
8b2aef8a52
|
All the changes of Search functionality in Attendance page.
|
2025-07-28 11:21:37 +05:30 |
|
|
254aaf1977
|
Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W
|
2025-07-26 16:55:11 +05:30 |
|
|
bb224ea3e7
|
Change all filter icon in Directory ,imageGallery and Project List.
|
2025-07-26 16:50:24 +05:30 |
|
|
536f4d4e3a
|
Directory Implementation in Contact profile popup.
|
2025-07-26 16:50:24 +05:30 |
|
|
d7986e4af4
|
Changes in during a merge
|
2025-07-26 16:50:24 +05:30 |
|
|
527e052786
|
changes
|
2025-07-26 16:43:51 +05:30 |
|
|
52ef65cce0
|
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 16:43:28 +05:30 |
|
|
32434da93f
|
Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 16:42:26 +05:30 |
|
|
276a2ca9f4
|
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 16:39:42 +05:30 |
|
|
aa43dd4540
|
Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
|
2025-07-26 16:39:16 +05:30 |
|
|
a001875a56
|
UI changes in Employee Profile and Project Profile.
|
2025-07-26 16:39:16 +05:30 |
|
|
f565e83413
|
Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
|
2025-07-26 16:38:38 +05:30 |
|
|
55625246ce
|
Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
|
2025-07-26 16:38:38 +05:30 |
|
|
9f1b8f7090
|
revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 16:38:38 +05:30 |
|
|
c35b7954fc
|
When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 16:38:38 +05:30 |
|
|
3848130cde
|
Chnages in Header.js wihile user is assigned to single project.
|
2025-07-26 16:38:38 +05:30 |
|
|
74c2906527
|
Removing Console.log.
|
2025-07-26 16:38:38 +05:30 |
|
|
7535028b44
|
Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
|
2025-07-26 16:38:37 +05:30 |
|
|
3925926084
|
Adding In-built scrollbar in Select Teams dropdown and Employees.
|
2025-07-26 16:37:52 +05:30 |
|
|
3709346d42
|
Enhancement implemented in the Attendance component to include search functionality.
|
2025-07-26 16:35:43 +05:30 |
|
|
91a29af342
|
Merge pull request 'add create, edit, delete functionality with validation and UI integration' (#303) from Feature-#809_ExpenseStatsuMang into Feature_Expense
Reviewed-on: #303
Merged
|
2025-07-26 10:23:46 +00:00 |
|
|
6ffebfc596
|
add create, edit, delete functionality with validation and UI integration
|
2025-07-26 15:52:23 +05:30 |
|
|
eec208db89
|
Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301) from Kartik_Filter_Changes#800 into Issues_July_4W
Reviewed-on: #301
merged
|
2025-07-26 09:37:03 +00:00 |
|
|
0357596ea3
|
Change all filter icon in Directory ,imageGallery and Project List.
|
2025-07-26 09:37:03 +00:00 |
|
|
53628f0bf0
|
Merge pull request 'Directory Implementation in Contact profile popup.' (#300) from Kartik_Directory_Changes#805 into Issues_July_4W
Reviewed-on: #300
Merged
|
2025-07-26 09:24:29 +00:00 |
|
|
3be282d99d
|
Directory Implementation in Contact profile popup.
|
2025-07-26 14:50:55 +05:30 |
|
|
699c349ba5
|
Changes in during a merge
|
2025-07-26 13:28:47 +05:30 |
|
|
aa5998bc11
|
changes
|
2025-07-26 12:59:12 +05:30 |
|
|
7e5f5807f6
|
Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W
|
2025-07-26 12:56:54 +05:30 |
|
|
75d4ca176d
|
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:56:09 +05:30 |
|
|
1f3438e3a9
|
Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 12:55:14 +05:30 |
|
|
30b567d020
|
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-26 12:54:09 +05:30 |
|
|
1df2d50aba
|
Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
|
2025-07-26 12:51:44 +05:30 |
|
|
92d3f91950
|
UI changes in Employee Profile and Project Profile.
|
2025-07-26 12:51:44 +05:30 |
|
|
ad6937b02e
|
Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
|
2025-07-26 12:51:25 +05:30 |
|
|
ac101e1e81
|
Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
|
2025-07-26 12:50:42 +05:30 |
|
|
f040528821
|
revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 12:45:15 +05:30 |
|
|
72c9472643
|
When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-26 12:45:15 +05:30 |
|
|
248f14b8d2
|
Chnages in Header.js wihile user is assigned to single project.
|
2025-07-26 12:45:15 +05:30 |
|
|
9b7d808f58
|
Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
|
2025-07-26 12:44:53 +05:30 |
|
|
23e484774d
|
Adding In-built scrollbar in Select Teams dropdown and Employees.
|
2025-07-26 12:43:30 +05:30 |
|
|
ae973bf1a1
|
Enhancement implemented in the Attendance component to include search functionality.
|
2025-07-26 12:41:42 +05:30 |
|
|
5956e64492
|
Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W
|
2025-07-26 12:05:42 +05:30 |
|
|
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 |
|
|
0944a8d78c
|
progress in expense update
|
2025-07-25 18:27:12 +05:30 |
|
|
22ef95d6b7
|
completed full updation for expnse feature
|
2025-07-25 18:18:50 +05:30 |
|
|
6b830c5063
|
progress in expense update
|
2025-07-25 18:18:50 +05:30 |
|
|
ca2ed451d8
|
renamed status of expse list - name to displayName
|
2025-07-25 18:18:50 +05:30 |
|
|
d78f90f700
|
added utils fun that has code convert into bootstrap color like priamery.
|
2025-07-25 18:18:50 +05:30 |
|
|
182ae887d8
|
initiated forn edit and created with one component
|
2025-07-25 18:18:50 +05:30 |
|
|
24d7bd52d2
|
view expense with document (image), not yet PDF
|
2025-07-25 18:18:49 +05:30 |
|
|
2122d7e959
|
updated global modal for size customize
|
2025-07-25 18:18:49 +05:30 |
|
|
e388906b80
|
changed added expense button
|
2025-07-25 18:18:49 +05:30 |
|
|
e1f5bb8baf
|
color, displayName - of Expense status columns names added insinde hidden column
|
2025-07-25 18:18:49 +05:30 |
|
|
9df4b20ff0
|
Added taking action on expense, like Review, Approve ...
|
2025-07-25 18:18:49 +05:30 |
|
|
bd1dabdd68
|
made new hook for make action on give employee
|
2025-07-25 18:18:49 +05:30 |
|
|
945d5b1546
|
partially implemented Expense Details modal with full view
|
2025-07-25 18:18:48 +05:30 |
|
|
ce66c137aa
|
created and display expenses list
|
2025-07-25 18:18:48 +05:30 |
|
|
fca24d4081
|
making a expense page layout
|
2025-07-25 18:18:48 +05:30 |
|
|
977ab05e61
|
created list view interface
|
2025-07-25 18:18:48 +05:30 |
|
|
bc6e66b25c
|
api integrated for get list of expense-status in master
|
2025-07-25 18:18:48 +05:30 |
|
|
e5d97e3105
|
refactored code for optimze
|
2025-07-25 18:18:48 +05:30 |
|
|
b1586a8cfb
|
added Payment Mode master with API integration and table config for get list
|
2025-07-25 18:18:48 +05:30 |
|
|
de7ca102fd
|
add Expense Type master with API integration and table config
|
2025-07-25 18:18:47 +05:30 |
|
|
2f3fd2dacf
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-25 18:18:14 +05:30 |
|
|
f209b7cb86
|
Merge pull request '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.' (#291) from Kartik_Task#808 into Issues_July_4W
Reviewed-on: #291
|
2025-07-25 09:45:43 +00:00 |
|
|
c2fe727bec
|
Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288) from Kartik_Bug#757 into Issues_July_4W
Reviewed-on: #288
|
2025-07-25 09:39:48 +00:00 |
|
|
0cb661687a
|
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-25 11:52:30 +05:30 |
|
|
85bdc270ac
|
Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-24 17:40:03 +05:30 |
|
|
678e6bccf6
|
Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757
|
2025-07-24 17:10:25 +05:30 |
|
|
4f64a23089
|
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-24 17:10:22 +05:30 |
|
|
da434ff649
|
Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287) from Kartik_Bug#542 into Issues_July_4W
Reviewed-on: #287
|
2025-07-24 10:41:55 +00:00 |
|
|
3de7ce30c4
|
Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W
Reviewed-on: #285
|
2025-07-24 10:38:48 +00:00 |
|
|
1e509501da
|
Merge branch 'Kartik_Bug#799' into Issues_July_4W
# Conflicts:
# src/components/Project/AssignTask.jsx
|
2025-07-24 16:04:30 +05:30 |
|
|
ba1864a9ff
|
Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281) from Kartik_Bug#792 into Issues_July_4W
Reviewed-on: #281
|
2025-07-24 10:29:29 +00:00 |
|
|
92f5566fce
|
removed double assigned class
|
2025-07-24 15:55:52 +05:30 |
|
|
f404320179
|
Merge pull request 'Feature#802_DeleteExpense : Implemented Delete Expense' (#290) from Feature#802_DeleteExpense into Feature_Expense
Reviewed-on: #290
merged
|
2025-07-24 10:22:05 +00:00 |
|
|
a11edec002
|
prevent unwanted rendering
|
2025-07-24 10:22:05 +00:00 |
|
|
bd308a57dd
|
implement delete functionality for Draft expenses only
|
2025-07-24 10:22:05 +00:00 |
|
|
95dde88d7a
|
Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W
Reviewed-on: #278
|
2025-07-24 10:14:09 +00:00 |
|
|
2c3c4087c8
|
Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W
Reviewed-on: #277
|
2025-07-24 10:10:56 +00:00 |
|
|
8a237eb4bf
|
rmoved unusd code
|
2025-07-24 15:38:25 +05:30 |
|
|
bc18cf9cc3
|
Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W
Reviewed-on: #263
|
2025-07-24 10:05:41 +00:00 |
|
|
f44bba5083
|
Merge pull request 'Feature#794_ActionExpense : completed action on expense' (#289) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #289
Merged
|
2025-07-24 08:52:56 +00:00 |
|
|
034099c23a
|
set up action properly
|
2025-07-24 14:20:38 +05:30 |
|
|
c14fdae4f7
|
correctly set isActive flag from document data
|
2025-07-24 14:19:54 +05:30 |
|
|
9a1fba347a
|
added optinal chain for color , for prevent error
|
2025-07-24 12:51:30 +05:30 |
|
|
eaf49b513d
|
Merge pull request 'Feature#796_EditExpense : Edit Expense Request' (#282) from Feature#796_EditExpense into Feature_Expense
Reviewed-on: #282
mwrged
|
2025-07-24 07:18:29 +00:00 |
|
|
719c916af3
|
Merge branch 'Feature#796_EditExpense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense
|
2025-07-24 12:45:57 +05:30 |
|
|
23ee4a83d1
|
completed full updation for expnse feature
|
2025-07-24 12:45:21 +05:30 |
|
|
cf719205d9
|
progress in expense update
|
2025-07-24 12:45:21 +05:30 |
|
|
195a88c1e4
|
renamed status of expse list - name to displayName
|
2025-07-24 12:43:09 +05:30 |
|
|
f4f8a61445
|
added utils fun that has code convert into bootstrap color like priamery.
|
2025-07-24 12:43:08 +05:30 |
|
|
7b2a4ea834
|
initiated forn edit and created with one component
|
2025-07-24 12:41:56 +05:30 |
|
|
de689b0af8
|
completed full updation for expnse feature
|
2025-07-24 12:35:12 +05:30 |
|
|
a6f5c131a3
|
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
|
2025-07-24 12:03:38 +05:30 |
|
|
0a890bf88a
|
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-24 10:59:13 +05:30 |
|
|
289a732600
|
progress in expense update
|
2025-07-24 02:55:39 +05:30 |
|
|
89674dd771
|
Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
|
2025-07-23 18:22:13 +05:30 |
|
|
5e93798d01
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense
|
2025-07-23 18:03:52 +05:30 |
|
|
209e1341de
|
Merge pull request 'Feature#791_ViewExpense : View Expense Detailas from calling expense details api' (#286) from Feature#791_ViewExpense into Feature_Expense
Reviewed-on: #286
merged
|
2025-07-23 12:11:18 +00:00 |
|
|
ab737a80d4
|
view expense with document (image), not yet PDF
|
2025-07-23 17:36:54 +05:30 |
|
|
f30430c254
|
updated global modal for size customize
|
2025-07-23 17:27:47 +05:30 |
|
|
d4c4454eb1
|
UI changes in Employee Profile and Project Profile.
|
2025-07-23 17:08:50 +05:30 |
|
|
8fd8f395c9
|
Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
|
2025-07-23 15:47:41 +05:30 |
|
|
e485066bd1
|
Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
|
2025-07-23 15:45:02 +05:30 |
|
|
f6e18e0482
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense
|
2025-07-23 14:17:34 +05:30 |
|
|
fa9736b620
|
changed added expense button
|
2025-07-23 14:15:16 +05:30 |
|
|
a23ca8a412
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense
|
2025-07-23 14:07:09 +05:30 |
|
|
00b3a3420e
|
renamed status of expse list - name to displayName
|
2025-07-23 11:59:02 +05:30 |
|
|
d3822c3590
|
revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-23 06:21:27 +00:00 |
|
|
f6d3c6b2ab
|
When user is Assign to single project then dropdown and All Projects is not seen.
|
2025-07-23 11:47:11 +05:30 |
|
|
6c276a3c8d
|
added utils fun that has code convert into bootstrap color like priamery.
|
2025-07-23 11:44:59 +05:30 |
|
|
df15367397
|
Chnages in Header.js wihile user is assigned to single project.
|
2025-07-23 11:10:34 +05:30 |
|
|
2f2acb7df3
|
Removing Console.log.
|
2025-07-23 10:55:30 +05:30 |
|
|
9dbec1e137
|
Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
|
2025-07-23 10:52:30 +05:30 |
|
|
5209b78df7
|
color, displayName - of Expense status columns names added insinde hidden column
|
2025-07-23 10:48:18 +05:30 |
|
|
5f6a00f9f2
|
initiated forn edit and created with one component
|
2025-07-22 18:53:17 +05:30 |
|
|
9bbd2dd014
|
Merge pull request 'Feature#794_ActionExpense : Partially Implemented Expense Action' (#279) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #279
Merged
|
2025-07-22 12:07:15 +00:00 |
|
|
280715d62f
|
Added taking action on expense, like Review, Approve ...
|
2025-07-22 17:20:08 +05:30 |
|
|
a021a7b7b2
|
Adding In-built scrollbar in Select Teams dropdown and Employees.
|
2025-07-22 17:13:45 +05:30 |
|
|
e96187cfa1
|
Enhancement implemented in the Attendance component to include search functionality.
|
2025-07-22 16:47:26 +05:30 |
|
|
820f80562f
|
Merge pull request 'Kartik_Bug#785' (#274) from Kartik_Bug#785 into Issues_July_4W
Reviewed-on: #274
Merged
|
2025-07-22 09:29:12 +00:00 |
|
|
b5cf52ba49
|
Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation".
|
2025-07-22 09:29:12 +00:00 |
|
|
633e60d141
|
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-22 09:29:12 +00:00 |
|
|
59c36d099b
|
Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275) from Kartik_Bug#789 into Issues_July_4W
Reviewed-on: #275
Merged
|
2025-07-22 09:27:01 +00:00 |
|
|
2ab2a1d8bd
|
made new hook for make action on give employee
|
2025-07-22 14:39:49 +05:30 |
|
|
dbdb7a1299
|
Merge pull request 'Feature#791_ViewExpense : Partially implemented Expense Details modal with full view' (#276) from Feature#791_ViewExpense into Feature_Expense
Reviewed-on: #276
merged
|
2025-07-22 08:42:00 +00:00 |
|
|
a4f3a6f0ed
|
partially implemented Expense Details modal with full view
|
2025-07-22 14:08:52 +05:30 |
|
|
e207310f0e
|
Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.
|
2025-07-22 12:53:54 +05:30 |
|
|
e5f528547c
|
Merge pull request 'Feature_Create&DisplayList' (#271) from Feature_Create&DisplayList into Feature_Expense
Reviewed-on: #271
|
2025-07-22 06:02:58 +00:00 |
|
|
5c4a5c0620
|
created and display expenses list
|
2025-07-22 06:02:58 +00:00 |
|
|
364d67647f
|
making a expense page layout
|
2025-07-22 06:02:58 +00:00 |
|
|
8b0c62ff70
|
created list view interface
|
2025-07-22 06:02:58 +00:00 |
|
|
2a3a4b91fe
|
Merge pull request 'Feature-#784 : api integrated for get list of expense-status in master' (#269) from Feature-#784 into Feature_Expense
Reviewed-on: #269
Merged
|
2025-07-21 05:17:00 +00:00 |
|
|
e49145914f
|
api integrated for get list of expense-status in master
|
2025-07-21 10:44:26 +05:30 |
|
|
e379f0e348
|
refactored code for optimze
|
2025-07-21 10:43:09 +05:30 |
|
|
7024413710
|
Merge pull request 'added Payment Mode master with API integration and table config for get list' (#268) from Feature-#782-GetPaymentMode into Feature_Expense
Reviewed-on: #268
Merged
|
2025-07-19 18:09:46 +00:00 |
|
|
4427d71980
|
added Payment Mode master with API integration and table config for get list
|
2025-07-19 23:37:09 +05:30 |
|
|
295e63ec7f
|
Merge pull request 'Add Expense Type Master: API Integration, Table Display, and Hook Support : Get List' (#267) from Feature-#781-GetExpenseType into Feature_Expense
Reviewed-on: #267
Merged
|
2025-07-19 17:49:50 +00:00 |
|
|
037359cdfc
|
add Expense Type master with API integration and table config
|
2025-07-19 23:03:43 +05:30 |
|
|
fb1dec6c93
|
Added new field in contact create and update form
|
2025-07-02 15:06:01 +05:30 |
|