|
|
d1ff7321e9
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag
|
2025-08-23 17:25:50 +05:30 |
|
|
|
380effd2f0
|
changed project source
|
2025-08-23 14:58:22 +05:30 |
|
|
|
f1bc6bd57d
|
Updation in Employee Suspend and Reactivate employee.
|
2025-08-23 04:37:20 +00:00 |
|
|
|
4ab33fd5fd
|
added self Tenant Profile
|
2025-08-22 15:16:51 +05:30 |
|
|
|
7283140a3a
|
Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W
|
2025-08-18 10:23:03 +05:30 |
|
|
|
0722f52619
|
Deleted Employee Still Visible Until Manual Refresh.
|
2025-08-18 10:22:31 +05:30 |
|
|
|
1305ac855d
|
Merge branch 'Kartik_Bug#798' into Issues_Aug_1W
# Conflicts:
# src/hooks/useEmployees.js
|
2025-08-16 12:27:21 +05:30 |
|
|
|
9366a131e6
|
handle subscription tab according to tenant existent
|
2025-08-16 12:23:10 +05:30 |
|
|
|
a537da6eff
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag
|
2025-08-16 10:12:47 +05:30 |
|
|
|
4af5ba8a6d
|
added upgraded subscription functionality
|
2025-08-16 09:43:11 +05:30 |
|
|
|
0acd733710
|
handle upgrad plan
|
2025-08-14 17:45:01 +05:30 |
|
|
|
31f152db65
|
added updated functionality
|
2025-08-13 17:09:18 +05:30 |
|
|
|
fa3ff291c8
|
display employee tasks in emp profile
|
2025-08-12 16:27:25 +05:30 |
|
|
|
beefe6396c
|
- Add date format hook
- add Ui for Activities
|
2025-08-12 16:27:25 +05:30 |
|
|
|
cb23a5b051
|
Add api to fetch employee project allocation
|
2025-08-12 16:24:59 +05:30 |
|
|
|
c350574171
|
- Add project list on emplyee profile
- Add image as per gender
|
2025-08-12 16:24:59 +05:30 |
|
|
|
e466fd27be
|
prevent to display description if data not have
|
2025-08-12 11:13:16 +05:30 |
|
|
|
d25cc3531e
|
added Tenant Profile
|
2025-08-11 20:24:04 +05:30 |
|
|
|
4bff065153
|
added pagination and partially added filter
|
2025-08-09 10:30:06 +05:30 |
|
|
|
4ff01d0e60
|
success fully created tenant with subscription
|
2025-08-08 11:26:17 +05:30 |
|
|
|
fbc53e9ea1
|
integrated tenant creation and addsubscription
|
2025-08-08 11:26:16 +05:30 |
|
|
|
1dc038c965
|
tenant creating layout setup properly
|
2025-08-08 11:21:46 +05:30 |
|
|
|
12cbf576e1
|
create new tenant app
|
2025-08-08 11:21:46 +05:30 |
|
|
|
5e28f9e372
|
initially setup tenant manag. setup wizard-form and properly manage data. handle two sperate form with on wizard
|
2025-08-08 11:21:46 +05:30 |
|
|
|
7d7549e902
|
resolved taking incorrect date range
|
2025-08-07 17:18:15 +05:30 |
|
|
|
eb17ec208c
|
mis out remove expense id from action function
|
2025-08-07 17:18:14 +05:30 |
|
|
|
bc3b543015
|
Resloved the delay in expense action.
|
2025-08-06 14:39:36 +05:30 |
|
|
|
4d32d1de16
|
copy expense feature from Refactore_Expense
|
2025-08-06 00:04:26 +05:30 |
|
|
|
d580ca0a15
|
added expense releated master - Expense Type, status and paymentModa
|
2025-08-05 23:58:31 +05:30 |
|
|
|
99418e4870
|
prevent to open windo altert when geolocation not allow
|
2025-08-02 19:04:14 +05:30 |
|
|
|
43ed77cfc6
|
Deleted Employee Still Visible Until Manual Refresh.
|
2025-07-30 16:56:27 +05:30 |
|
|
|
8b2aef8a52
|
All the changes of Search functionality in Attendance page.
|
2025-07-28 11:21:37 +05:30 |
|
|
|
d8f892e9f4
|
Added new field in contact create and update form
|
2025-07-26 12:03:38 +05:30 |
|
|
|
425c32750c
|
integrated query in gallary
|
2025-07-18 14:56:40 +05:30 |
|
|
|
92568039eb
|
sync data within regularize request and appove or reject between
|
2025-07-18 00:01:16 +05:30 |
|
|
|
07885d3ed4
|
intergrated react-query
|
2025-07-17 20:41:57 +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 |
|
|
|
b9c240261c
|
selectProject was missing to defined in - useSuspendEmployee - therefor getting this - selected Project is not defined but actually employee is suspended properly, but show just extrap error msg
|
2025-07-17 13:07:36 +05:30 |
|
|
|
59196b3cf0
|
added query hook for fetching and posting data
|
2025-07-17 09:52:14 +05:30 |
|
|
|
c1fb50c667
|
Creating a new weidget Attendance Overview and accroding to project selection data will seen.
|
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 |
|
|
|
1978460169
|
added query fetching techniq in attendances
|
2025-07-16 16:17:49 +05:30 |
|
|
|
e9fb15697a
|
changes employee list api
|
2025-07-15 18:14:41 +05:30 |
|
|
|
d7d759732b
|
dynamically update planned and completed work in ProjectInfra and project list card on Task reported
|
2025-07-15 07:32:29 +00:00 |
|
|
|
4fc6a5c9f3
|
dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete
|
2025-07-15 07:32:29 +00:00 |
|
|
|
4350a1f1aa
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
fc8a3ce109
|
There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."
|
2025-07-14 12:28:21 +05:30 |
|
Pramod Mahajan
|
c018ffa455
|
if assigned employee to project, that employees should display instantly inside Assigned task view and employee list
|
2025-07-10 13:18:04 +05:30 |
|
Pramod Mahajan
|
fe4426af9e
|
fixed project updation in project about
|
2025-07-09 16:59:36 +05:30 |
|
Pramod Mahajan
|
fca3f03a44
|
fixed searching for employee
|
2025-07-09 14:33:21 +05:30 |
|
