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

2534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vikas Nale
471be2edd8 Merge pull request 'Status code 400 showing on Logs tab and Daily Progress Report datepicker issue.' (#157) from Kartik_Bug#392 into Issue_May_5W 
Reviewed-on: #157
 2025-05-31 08:09:07 +00:00
kartik.sharma
d80082bc9b Status code 400 showing on Logs tab and Daily Progress Report datepicker issue. 2025-05-31 08:09:07 +00:00
Vikas Nale
f511292f5a Merge pull request 'Adding new Weidget in Dashboadr name is "Pending Attendance".' (#156) from Kartik_Task#342 into Issue_May_5W 
Reviewed-on: #156
 2025-05-31 08:08:50 +00:00
pramod.mahajan
1c8461e72a Merge pull request 'pramod_Enhancement-#420 : Minor UI Enhancements – Modal Size & Responsive Adjustments' (#165) from pramod_Enhancement-#420 into Feature_Directory 
Reviewed-on: #165
 2025-05-31 06:52:09 +00:00
Pramod Mahajan
6819bfbb52 Update modal size from lg to xl for improved layout on larger screens 2025-05-31 12:09:46 +05:30
Pramod Mahajan
dbf7178db0 Replaced inline styles with Bootstrap utility classes 2025-05-31 12:08:47 +05:30
Pramod Mahajan
d826acbb45 fixed width 100 % for editor 2025-05-31 12:07:31 +05:30
Pramod Mahajan
4799e8e91c it able t taking tag from any device 2025-05-31 12:06:40 +05:30
kartik.sharma
dbc9bbffa2 Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it. 2025-05-31 11:39:15 +05:30
Pramod Mahajan
07809d6635 Fixed conditional rendering logic for Directory project nav item 2025-05-31 09:42:54 +05:30
kartik.sharma
d16675bf71 Adding New Weidge in Dashboard Name is "Activity". 2025-05-30 16:19:20 +05:30
pramod.mahajan
99d8be1e4b Merge pull request 'pramod_Task#410 : Display Directory Feature at Project Section' (#162) from pramod_Task#410 into Feature_Directory 
Reviewed-on: #162
 2025-05-30 07:15:03 +00:00
kartik.sharma
30ce981a24 Comments popup submit button issue. 2025-05-30 07:15:03 +00:00
kartik.sharma
f20a7cf4bc Changes in Comment popup 2025-05-30 07:15:03 +00:00
kartik.sharma
9c3bcaea9e Correction in Comment popup from Daily Progress Report. 2025-05-30 07:15:03 +00:00
kartik.sharma
252bf0904e In Create New Project form is not empty when we click on cancel button or cross. 2025-05-30 07:15:03 +00:00
kartik.sharma
4b64e7450e Convert all date to DD-MM-YYYY accross all component. 2025-05-30 07:15:03 +00:00
kartik.sharma
5572b80f4a In Assign Role popup double loading is visible. 2025-05-30 07:15:03 +00:00
kartik.sharma
0674fcf5bb In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box. 2025-05-30 07:15:03 +00:00
Pramod Mahajan
05f4a9da4d added restrict access to Project > Directory tab to authorized users only 2025-05-30 11:55:56 +05:30
Pramod Mahajan
e5bcf7111b added directory feature 2025-05-30 11:42:59 +05:30
Pramod Mahajan
6774957558 Added props to hide component based on role; identifies if it's a page or component 2025-05-30 11:42:27 +05:30
Pramod Mahajan
3594b78253 added more option for sorting contact list - projectId 2025-05-30 11:40:47 +05:30
Pramod Mahajan
e93062bdf4 changed directory menu icon 2025-05-30 11:39:44 +05:30
Pramod Mahajan
445a5e0064 loader, not found text moved in centered area 2025-05-30 11:39:18 +05:30
Pramod Mahajan
5666616b6b changed restore icon 2025-05-30 11:38:43 +05:30
Pramod Mahajan
15d313baf1 chnaged badge type 2025-05-30 11:38:02 +05:30
pramod.mahajan
d74854b847 Merge pull request 'pramod_Task-#399 : Added Access Permission For 'Directory User' Role' (#160) from pramod_Task-#399 into Feature_Directory 
Reviewed-on: #160
 2025-05-29 17:49:54 +00:00
Pramod Mahajan
eb678585fa removed unused props 2025-05-29 17:49:54 +00:00