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

2063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
43270c6bf3 Merge pull request 'Todays date is not visible in Daily Progress Report.' (#183) from Kartik_Bug#449 into Issue_Jun_1W 
Reviewed-on: #183
 2025-06-05 05:26:06 +00:00
Umesh Desai
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
Vikas Nale
c553b36e25 Merge pull request 'In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.' (#184) from Kartik_Bug#457 into Issue_Jun_1W 
Reviewed-on: #184
 2025-06-05 05:24:28 +00:00
Umesh Desai
4345c55247 In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come. 2025-06-04 17:11:55 +05:30
Vikas Nale
655db6ac74 Merge pull request 'Added Column Today's Planned to Project Infrastructure' (#182) from Ashutosh_Enhancement#276_TodaysPlanned into Issue_Jun_1W 
Reviewed-on: #182
 2025-06-03 11:59:46 +00:00
ashutosh.nehete
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
Vikas Nale
cfd5486fe2 Merge pull request 'In Teams Tab when we Assign a project then this dropdown not change its state .' (#181) from Kartik_Bug#442 into Issue_Jun_1W 
Reviewed-on: #181
 2025-06-03 11:56:04 +00:00
Umesh Desai
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
Vikas Nale
412125e422 Merge pull request 'Adding a error message on InActive selection on Teams tab on Projects.' (#180) from Kartik_Bug#441 into Issue_Jun_1W 
Reviewed-on: #180
 2025-06-03 11:54:33 +00:00
Umesh Desai
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
Vikas Nale
18d848b697 Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W 
Reviewed-on: #179
 2025-06-03 11:53:32 +00:00
Vikas Nale
78bc8802d7 Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W 
Reviewed-on: #178
 2025-06-03 11:52:53 +00:00
Umesh Desai
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
Vikas Nale
2b015947ef Merge pull request 'pramod_Bug-#433 :Show "No Contact Found" Message When Directory Is Empty' (#177) from pramod_Bug-#433 into Feature_Directory 
Reviewed-on: #177
 2025-06-03 11:50:29 +00:00
Vikas Nale
fed6711ece Merge pull request 'pramod_Bug-#391 : Click on Contact Name this Not Navigating to Details Page in Directory' (#176) from pramod_Bug-#391 into Feature_Directory 
Reviewed-on: #176
 2025-06-03 11:49:41 +00:00
Pramod Mahajan
6b5aa5fb1a enable contact name click to open contact profile 2025-06-03 11:49:41 +00:00
Vikas Nale
1ca50afc74 Merge pull request 'pramod_Task-#439 : Edit and Delete Contact Tag' (#175) from pramod_Task-#439 into Feature_Directory 
Reviewed-on: #175
 2025-06-03 11:48:39 +00:00
Pramod Mahajan
e83eafddd2 added editcontact tag form inside master modal 2025-06-03 11:48:39 +00:00
Pramod Mahajan
1bd050f919 correct delete contact tag url 2025-06-03 11:48:39 +00:00
Vikas Nale
4d1d3f8cca Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W 
Reviewed-on: #174
 2025-06-03 11:47:18 +00:00
Vikas Nale
493689fb1a Add progress bar for work area on Infra Page 2025-06-03 11:47:18 +00:00
Pramod Mahajan
80d3434bbf Display completion percentage for each Work Area header 2025-06-03 11:47:18 +00:00
Vikas Nale
346e7b1d1d Merge pull request 'In Employee selection double Date is shown in Front.' (#173) from Kartik_Bug#345 into Issue_Jun_1W 
Reviewed-on: #173
 2025-06-03 10:44:27 +00:00
Umesh Desai
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
1298994f58 enhance UX for loading and empty states in contact table 2025-06-03 00:12:39 +05:30
Pramod Mahajan
f92ef4e52a enhance UX for loading and empty states in contact table 2025-06-03 00:09:33 +05:30
Pramod Mahajan
34c04f31ec Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-06-02 23:42:00 +05:30
kartik.sharma
7e05cfbd61 In Employee selection double Date is shown in Front. 2025-06-02 17:31:07 +05:30
Pramod Mahajan
0d649fbc78 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-06-02 17:13:01 +05:30
Vikas Nale
6217941b0a Merge pull request 'Pramod_Bug#384 : show "NA" for missing email in contact list view' (#171) from pramod_Bug-#384 into Feature_Directory 
Reviewed-on: #171
 2025-06-02 07:55:32 +00:00
Pramod Mahajan
0843123505 handled error , if does'nt have category 2025-06-02 07:55:32 +00:00
Pramod Mahajan
9c46bffc4b show "NA" for missing email in contact list view 2025-06-02 07:55:32 +00:00
Vikas Nale
da6b56ac8c Merge pull request 'show "NA" in phone number columns when contact is created without a phone number' (#170) from pramod_Bug-#385 into Feature_Directory 
Reviewed-on: #170
 2025-06-02 07:54:57 +00:00
Vikas Nale
7f45dbab2a Merge pull request 'pramod_Bug#422 : Incorrect Contact Count in Manage Bucket Screen' (#169) from pramod_Bug#422 into Feature_Directory 
Reviewed-on: #169
 2025-06-02 07:54:23 +00:00
Vikas Nale
8c3b10f1cb Merge pull request 'pramod_Bug-#215 : Fixed : Display correct icon for approved check-out regularization requests in employee attendance profile' (#168) from pramod_Bug-#215 into Issue_Jun_1W 
Reviewed-on: #168
 2025-06-02 07:53:58 +00:00
Pramod Mahajan
426a885629 show "NA" in phone number columns when contact is created without a phone number 2025-06-02 11:28:34 +05:30
Pramod Mahajan
e03d1b4e99 recall usebucket hook after delete and create contact. 2025-06-02 10:29:42 +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
Vikas Nale
fe933ff983 Merge pull request 'pramod_Bug#361 : conditionally render Actions column based on permissions and project status' (#167) from pramod_Bug-#361 into Issue_Jun_1W 
Reviewed-on: #167
 2025-05-31 12:28:18 +00:00
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30
Vikas Nale
edf88a1d57 Merge pull request 'pramod_Bug#160 :Unnecessary Multiple profile API Requests call on Page Load' (#166) from pramod_Bug#160 into Issue_May_5W 
Reviewed-on: #166
 2025-05-31 10:17:48 +00:00
Pramod Mahajan
936636c29b optimized custom hook usage 2025-05-31 10:17:48 +00:00
Pramod Mahajan
d10d47e642 added title name for assign employee modal 2025-05-31 10:17:48 +00:00
Pramod Mahajan
14b851b87e added modal name- Assign Employee 2025-05-31 10:17:48 +00:00
kartik.sharma
bf9f09d5b4 Merge branch 'Issue_May_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_5W 2025-05-31 15:37:05 +05:30
kartik.sharma
f72c309c0c Comment code in Dashboard. 2025-05-31 15:35:36 +05:30
Vikas Nale
ccbe89f407 Cosmatic changes for Attendance Widget 2025-05-31 15:30:41 +05:30
Vikas Nale
383162c4c3 Merge branch 'Kartik_Task#414' into Issue_May_5W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx
#	src/repositories/GlobalRepository.jsx
 2025-05-31 13:49:01 +05:30
Vikas Nale
084454112a Merge branch 'Kartik_Task#400' into Issue_May_5W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx
 2025-05-31 13:41:15 +05:30