|
|
2c0800f0e3
|
Unnecessary Blank Space Appears Below Employees in Regularization Tab.
|
2025-07-01 12:21:49 +05:30 |
|
|
|
e09413b23a
|
401 Unauthorized Error on Attendance Menu.
|
2025-07-01 12:19:25 +05:30 |
|
Pramod Mahajan
|
22c6072c32
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
|
2025-06-24 16:31:54 +05:30 |
|
Pramod Mahajan
|
928a50432d
|
fixed restore selected project when toggling off "Show All Employees"
|
2025-06-23 21:30:36 +05:30 |
|
Pramod Mahajan
|
8e3a6bf1d1
|
handled default choosed activity and disabled
|
2025-06-23 17:15:37 +05:30 |
|
Pramod Mahajan
|
cd5e9291ae
|
replace old modal to GlobalModal
|
2025-06-23 16:39:35 +05:30 |
|
|
|
882e3dd414
|
Project Address Text Overflow.
|
2025-06-20 15:55:16 +05:30 |
|
Pramod Mahajan
|
0fad5a0276
|
missing assign task api integration during updation, It Added.
|
2025-06-20 12:36:49 +05:30 |
|
Pramod Mahajan
|
52a578972e
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505
|
2025-06-19 16:48:47 +05:30 |
|
Pramod Mahajan
|
4cda7fdcfd
|
added approve task feature
|
2025-06-19 16:44:41 +05:30 |
|
|
|
200ef5ae0a
|
Implemented signalR in Employee module
|
2025-06-18 11:57:55 +05:30 |
|
Pramod Mahajan
|
6a337ec808
|
created new comp. for create sub task
|
2025-06-17 20:43:56 +05:30 |
|
Pramod Mahajan
|
5ac9022be0
|
added new condition for audit base calling api
|
2025-06-17 20:42:19 +05:30 |
|
|
|
8431e856aa
|
Added signalR functionality in Project Infrastructure
|
2025-06-17 17:18:59 +05:30 |
|
|
|
8217308db9
|
Implemented signalr for action assigning employee to project
|
2025-06-17 17:07:54 +05:30 |
|
|
|
a0e4b1c5ed
|
Changed some functionallity in attendance
|
2025-06-17 17:07:53 +05:30 |
|
|
|
90a77d357f
|
Implemented attendance funcationality in attendance module
|
2025-06-17 17:07:53 +05:30 |
|
Pramod Mahajan
|
b18e0e4dd7
|
approve condition handle
|
2025-06-17 12:12:27 +05:30 |
|
Pramod Mahajan
|
407680fa9b
|
added logic for audit activity as well as comment
|
2025-06-16 19:41:35 +05:30 |
|
Pramod Mahajan
|
6f88980986
|
Fix DOM nesting warning by replacing <p> with <div> in comment note section
|
2025-06-14 11:11:07 +05:30 |
|
Pramod Mahajan
|
7c9607cb78
|
resolved localCompare error
|
2025-06-13 18:06:09 +05:30 |
|
Pramod Mahajan
|
cbf376d5b6
|
added pending filter for attendaces using toggle buttons
|
2025-06-13 17:52:22 +05:30 |
|
Pramod Mahajan
|
1f0255bc55
|
Merge branch 'activity_image' of https://git.marcoaiot.com/admin/marco.pms.web into activity_image
|
2025-06-12 23:57:59 +05:30 |
|
Pramod Mahajan
|
9043cfd49e
|
prevent to set first project from project-list at component mount
|
2025-06-12 23:56:36 +05:30 |
|
|
|
da440060e8
|
- Some cosmatic changes on Activity Details popup
- Header Global project filter hite set to ax 300px a
- header global project list sorted by name
|
2025-06-12 23:06:51 +05:30 |
|
Pramod Mahajan
|
3ed5999f29
|
added attachment views
|
2025-06-12 22:54:08 +05:30 |
|
Pramod Mahajan
|
ce1bdc3df7
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject
|
2025-06-11 14:15:42 +05:30 |
|
Pramod Mahajan
|
28c995bbc0
|
hide select at local level - Task planning
|
2025-06-10 15:34:05 +05:30 |
|
Pramod Mahajan
|
117ac31d12
|
Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory
|
2025-06-10 09:47:56 +05:30 |
|
|
|
c4288fe35a
|
Comments popup submit button issue.
|
2025-06-09 13:16:24 +05:30 |
|
|
|
f6634eb527
|
Correction in Comment popup from Daily Progress Report.
|
2025-06-09 13:16:24 +05:30 |
|
Pramod Mahajan
|
a9a5206062
|
use ITEM_PER_PAGE constant to standardize pagination
|
2025-06-09 13:12:56 +05:30 |
|
|
|
945d79a250
|
Merge branch 'pramod_Task#482' into Issue_Jun_1W_2
# Conflicts:
# src/pages/authentication/LoginPage.jsx
|
2025-06-09 11:47:03 +05:30 |
|
|
|
b6330502cb
|
Hide Page Number on Website Until Data Exceeds Records Limit.
|
2025-06-09 05:46:12 +00:00 |
|
|
|
26191bccfe
|
Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.
|
2025-06-09 05:39:43 +00:00 |
|
|
|
101baa2b78
|
Todays date is not visible in Daily Progress Report.
|
2025-06-05 05:26:06 +00:00 |
|
|
|
b697943787
|
In Report popup when we take value = 0 then giv error but now it is resolved.
|
2025-06-03 11:11:00 +05:30 |
|
Pramod Mahajan
|
c91682a871
|
fixed attendance status & logs logic with proper activity handling
|
2025-05-31 23:34:55 +05:30 |
|
Pramod Mahajan
|
cd9a02430e
|
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#215
|
2025-05-31 19:45:08 +05:30 |
|
|
|
0880540560
|
Comments popup submit button issue.
|
2025-05-28 12:03:36 +05:30 |
|
|
|
94c9430406
|
Changes in Comment popup
|
2025-05-27 11:56:52 +00:00 |
|
|
|
cd3983dd19
|
Correction in Comment popup from Daily Progress Report.
|
2025-05-27 11:56:52 +00:00 |
|
|
|
50d5c69db1
|
Convert all date to DD-MM-YYYY accross all component.
|
2025-05-27 07:53:31 +00:00 |
|
|
|
9763c45592
|
In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.
|
2025-05-26 12:54:24 +05:30 |
|
|
|
a60d7f7a25
|
Changes in Attendance Switch on-off button.
|
2025-05-24 10:17:20 +00:00 |
|
|
|
3157a30948
|
Adding Switch button in attendence component.
|
2025-05-24 10:17:20 +00:00 |
|
|
|
7970bce60d
|
Merge branch 'Kartik_Enhancement#319' into Issue_May_4W
# Conflicts:
# src/components/Activities/CheckCheckOutForm.jsx
|
2025-05-23 10:45:20 +05:30 |
|
|
|
279f2403d2
|
Correction in date box in checkin checkout popup from Attendence component.
|
2025-05-22 14:20:51 +05:30 |
|
|
|
af4a40bf81
|
Adding Date Box in Check-in and Check-out popup from Attendence component.
|
2025-05-22 06:12:24 +00:00 |
|
|
|
f01a6235e7
|
Adding Date Box in Check-in and Check-out popup from Attendence component.
|
2025-05-21 16:27:45 +05:30 |
|
