admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
2,595 Commits 240 Branches 0 Tags
Commit Graph

2595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kartik Sharma
9bbe479153 Removing unnessary gap in Documents.jsx file. 2025-10-15 12:45:38 +05:30
Kartik Sharma
ce976a6d5c Changes Directory Notes and Contact filter panel at time of chips remover. 2025-10-15 12:25:33 +05:30
Kartik Sharma
d1af4f402d Changes when we select a Expense Status in ExpenseFilter Panel. 2025-10-15 12:18:27 +05:30
Kartik Sharma
f61c7a4a35 Removing Unessary gaps. 2025-10-15 11:50:26 +05:30
Kartik Sharma
a2177dc2af UI changes in attendance, listview Directory, ExpenseList, Project Page at mobile view. 2025-10-14 15:53:37 +05:30
Kartik Sharma
a9d1ba08dd UI updation in Attendance Toady's and Regularization tab. 2025-10-14 15:44:36 +05:30
pramod.mahajan
765b4356a6 Merge pull request 'Adding Chips in Directory Contact and Notes Page.' (#473) from Kartik_Task#1465 into OnFieldWork_V1 
Reviewed-on: #473
Merged
 2025-10-11 08:41:19 +00:00
Kartik Sharma
6125130cff Adding Chips in Directory Contact and Notes Page. 2025-10-11 08:41:19 +00:00
pramod.mahajan
006ca21e1d imported PreviwDocument compoent that was missing 2025-10-11 10:52:02 +05:30
pramod.mahajan
bb2d7b8923 added pading in check-in check-out form 2025-10-10 19:54:20 +05:30
pramod.mahajan
c921dbff09 fixed u 2025-10-10 17:49:14 +05:30
pramod.mahajan
e84da2dcb0 Merge pull request 'Kartik_Task_1459 :- Adding Export Excel and PDF in Directory.' (#469) from Kartik_Task_1459 into OnFieldWork_V1 
Reviewed-on: #469
Merged
 2025-10-10 11:24:30 +00:00
Kartik Sharma
4ba7c72e78 Removing ExportUtils.js file. 2025-10-10 11:24:30 +00:00
Kartik Sharma
9939973d8d Adding Excel and PDF export in Directory. 2025-10-10 11:24:30 +00:00
pramod.mahajan
e17c2064ac Merge pull request 'UI updation in Expense Breakdown' (#471) from Kartik_Bug#1463 into OnFieldWork_V1 
Reviewed-on: #471
Merged
 2025-10-10 11:24:02 +00:00
Kartik Sharma
9580c9234c UI updation in Expense Breakdown 2025-10-10 11:24:02 +00:00
Kartik Sharma
44b3f842f2 Correction in Date Ranger in Attendance Logs. 2025-10-10 16:36:39 +05:30
Kartik Sharma
9de0b1a0df Project List view UI implementation. 2025-10-10 16:00:52 +05:30
Kartik Sharma
fbb68a4488 Correction in DataRangePicker for date range box and Calender. 2025-10-10 15:24:34 +05:30
pramod.mahajan
c1a8b87a2c Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 2025-10-10 12:48:42 +05:30
pramod.mahajan
24501b3c76 persist date 2025-10-10 12:48:37 +05:30
Kartik Sharma
ef00516256 Changes in Dashboard weidget Attendance and Monthly weidget when no data show. 2025-10-10 12:11:12 +05:30
pramod.mahajan
f867a692ed fixed : whenever open modal that not come exiten data 2025-10-09 18:49:14 +05:30
pramod.mahajan
85b4b830d3 Merge pull request 'Kartik_Enhancement#1448 : Document filters chips' (#468) from Kartik_Enhancement#1448 into OnFieldWork_V1 
Reviewed-on: #468
Merged
 2025-10-09 12:57:36 +00:00
pramod.mahajan
c1c333008f added document filter chips 2025-10-09 12:57:36 +00:00
Kartik Sharma
5370d0eb9d Adding Chips in Document. 2025-10-09 12:57:36 +00:00
Kartik Sharma
5cbd6c427a Adding Chips in Document. 2025-10-09 12:57:36 +00:00
pramod.mahajan
5057738d8b Merge pull request 'Directory tab inside Project Profile page not displayed properly (tab within tab issue)' (#464) from Kartik_Bug#1408 into OnFieldWork_V1 
Reviewed-on: #464
 2025-10-09 12:56:40 +00:00
Kartik Sharma
063bbee681 Changes directory View. 2025-10-09 12:56:40 +00:00
Kartik Sharma
3dc667db73 Directory tab inside Project Profile page not displayed properly (tab within tab issue) 2025-10-09 12:56:40 +00:00
pramod.mahajan
2f2c31db9f Merge pull request 'Added 3-dots menu in the Employee Module with ‘Show Inactive Employees’ and Export functionalities inside the menu.' (#466) from Kartik_Enhancement#1433 into OnFieldWork_V1 
Reviewed-on: #466
merged
 2025-10-09 12:55:56 +00:00
Kartik Sharma
0dc540eec2 Added 3-dots menu in the Employee Module with ‘Show Inactive Employees’ and Export functionalities inside the menu. 2025-10-09 12:55:56 +00:00
pramod.mahajan
fc7c33ee54 added right status variable name 2025-10-09 17:51:27 +05:30
Kartik Sharma
eeb886ec36 Removing consol.log in regularize 2025-10-09 14:58:11 +05:30
Kartik Sharma
210b01513e Removing Project name column in Attendance Logs and Regularize. 2025-10-09 14:56:00 +05:30
Kartik Sharma
2fe297c6b6 Adding 2 columns in Regularize column Request at and Requested by 2025-10-09 10:27:13 +05:30
pramod.mahajan
ffd7f15488 Merge pull request 'Attendance Tab Should Display All Records for Each Employee' (#465) from Kartik_Bug#1425 into OnFieldWork_V1 
Reviewed-on: #465
Merged
 2025-10-08 13:38:09 +00:00
Kartik Sharma
7f33d5e6bd Attendance Tab Should Display All Records for Each Employee 2025-10-08 13:38:09 +00:00
pramod.mahajan
108ca1cc96 Merge pull request 'Adding NA and updation in Excel,PDF and Print functionality in Employee list.' (#463) from Kartik_Bug#1436 into OnFieldWork_V1 
Reviewed-on: #463
Merged
 2025-10-08 13:37:48 +00:00
Kartik Sharma
0b1a276898 Adding NA and updation in Excel,PDF and Print functionality in Employee list. 2025-10-08 13:37:48 +00:00
pramod.mahajan
6246dbd23f Merge pull request 'Missing title in View popup' (#462) from Kartik#Enhancement#1444 into OnFieldWork_V1 
Reviewed-on: #462
Merged
 2025-10-08 13:37:18 +00:00
Kartik Sharma
af3bf11beb Missing title in View popup 2025-10-08 13:37:18 +00:00
pramod.mahajan
2e5951d9d1 Merge pull request 'Expense Type label to be renamed to Expense Category.' (#461) from Kartik_Enhancement#1446 into OnFieldWork_V1 
Reviewed-on: #461
Merged
 2025-10-08 13:37:02 +00:00
Kartik Sharma
cdc5e32554 Expense Type label to be renamed to Expense Category. 2025-10-08 13:37:02 +00:00
Kartik Sharma
bc047a84fc Adding processpending in ExpenseStatus. 2025-10-08 18:49:24 +05:30
Kartik Sharma
0511ed6d82 Changes in Attendance module for all projects. 2025-10-08 13:52:06 +05:30
Kartik Sharma
bc933f4c64 Adding Search box in Expense Paid by dropdown. 2025-10-08 11:29:51 +05:30
Kartik Sharma
bd3645aae6 In Modify project add project.id on UseProjectDetails 2025-10-08 10:58:31 +05:30
pramod.mahajan
2f2215ab8a Merge pull request 'OnField_Issues_Oct_2W' (#455) from OnField_Issues_Oct_2W into OnFieldWork_V1 
Reviewed-on: #455
Merged
 2025-10-07 04:10:40 +00:00
Kartik Sharma
071f862743 Incorrect navigation when viewing project details 2025-10-07 04:10:40 +00:00