|
|
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 |
|
|
|
d42bb413e8
|
Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main
Reviewed-on: #270
|
2025-07-24 09:41:19 +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 |
|
