568 Commits

Author SHA1 Message Date
1a7e77c814 structured code 2025-09-10 19:09:55 +05:30
f20c3a64f6 added proper modal size for Master Modal - Application Role 2025-09-10 19:00:07 +05:30
45b21d3e73 restric open modal when came at admisitrator page 2025-09-10 11:33:44 +05:30
3db6cc2100 added modal, that was missing during merged 2025-09-10 11:29:01 +05:30
b934527cf5 added manually changed 2025-09-10 10:41:26 +05:30
5ec5218dd6 Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
#	src/pages/Activities/DailyTask.jsx
#	src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30
c9ccd46385 Meaningful Message Required When No Reports Found in Selected Date Range 2025-09-10 04:45:29 +00:00
614d61e6e9 Invalid Date Displayed Instead of "NA" in Employee List 2025-09-10 04:43:23 +00:00
20077a137f Master Page - Grid alignment 2025-09-10 04:42:46 +00:00
da8d63ce62 changed msg whenenver emp not found- "No team members assigned yet" 2025-09-08 15:06:24 +05:30
63a5f7b902 normalize projectId from localStorage to avoid "null" string 2025-09-08 14:22:23 +05:30
ace507232a changed dashboard route "/" to "/dashboard" 2025-09-08 12:48:19 +05:30
f9876c6d52 spell correction 2025-09-08 12:40:14 +05:30
6d86362e9e Merge branch 'Landing_pages' into Document_Manag
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
#	src/pages/employee/EmployeeList.jsx
#	src/router/AppRoutes.jsx
2025-09-08 12:34:18 +05:30
698c1b7b16 add new images
replase class= with className=
2025-09-08 12:32:16 +05:30
0194c4427a Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:57:30 +05:30
768f810465 All symbols will be same in all components. 2025-09-05 17:17:15 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
dcb2f59f5b Filter icon should not be displayed when no records are found in Daily Progress Report 2025-09-05 12:26:57 +05:30
e39355c6fd Changes in UI for Masters component. 2025-09-05 12:00:26 +05:30
87221965de Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-05 11:52:50 +05:30
cabb1b01c9 don't changed project when move to one page to another page 2025-09-05 11:14:02 +05:30
4369705a2d Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W 2025-09-05 10:53:35 +05:30
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +05:30
2b5fc9aaac added project level feature 2025-09-04 18:06:58 +05:30
e66ce11cd5 changes tage reponse and changed confirm modal format 2025-09-03 16:40:20 +05:30
a52cf0bc39 allow to delete document category and type and edit type 2025-09-03 15:16:37 +05:30
ef00f83c44 document can inside open in browser 2025-09-02 19:34:42 +05:30
2ee9c8ecbd prevent to stay outside if have logged 2025-09-02 16:40:51 +05:30
e81a97cd52 Notes in Project Directory showing global notes instead of project-specific contact notes. 2025-09-01 09:29:07 +00:00
79e23fef24 The bottom border of the Master dropdown is not visible. 2025-09-01 09:23:29 +00:00
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
b70d03af8a Search , Refresh featured added and initial setup for filter 2025-08-29 20:34:37 +05:30
b93eaf6b95 initial setuo new document 2025-08-28 20:22:17 +05:30
d42790628c successfully master fetched of documentType and documentCategor 2025-08-28 15:19:15 +05:30
d4804e4c3f updated Master modal 2025-08-28 06:48:43 +00:00
386b61d978 fixed overridding of backgound color of app 2025-08-28 12:01:47 +05:30
65b90bc9ac initial setup document page 2025-08-28 11:17:54 +05:30
7268971275 after form submit or failed form will be reset 2025-08-26 12:26:40 +05:30
1ad9b782a4 added lodering status when making request for demo 2025-08-26 12:24:56 +05:30
5dfaa6d44c render properly after login 2025-08-26 12:07:56 +05:30
4b988109f9 set image path at deployed state 2025-08-26 11:59:45 +05:30
83c2f7fb0c set legal-info page css 2025-08-26 11:41:07 +05:30
8b2529013f fixed layout of registration page 2025-08-26 09:51:57 +05:30
bbd137a334 fixed login , forgot page 2025-08-25 20:31:53 +05:30
8b11bd952d Merge branch 'Landing_pages' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages 2025-08-25 20:20:21 +05:30
585199a2a1 fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages 2025-08-25 20:15:51 +05:30
ac0d17ca6d implement landing page UI 2025-08-25 20:15:26 +05:30
61fb797db4 change label 2025-08-25 20:14:48 +05:30
86187eaf8a changes in otp page. 2025-08-25 20:13:56 +05:30