618 Commits

Author SHA1 Message Date
Pramod Mahajan
def2a9b6f3 changed font size of select button 2025-06-10 23:38:16 +05:30
Pramod Mahajan
18d6916fb8 first building expanded by default 2025-06-10 18:20:15 +05:30
Pramod Mahajan
78894918c0 first building by default expanded 2025-06-10 18:11:36 +05:30
Pramod Mahajan
49f15f574c handled globale select project 2025-06-10 17:55:22 +05:30
Pramod Mahajan
558b663f6b hide project selection at local level at - project progress widget 2025-06-10 16:31:35 +05:30
Pramod Mahajan
1e51fabaa1 initialized projectId with empty string to avoid undefined state 2025-06-10 16:10:24 +05:30
Pramod Mahajan
488a92e5d1 handled local project selection independently to avoid mutating global state 2025-06-10 16:08:30 +05:30
Pramod Mahajan
c1da916ca7 hide select at local level - AttendancePage 2025-06-10 15:35:30 +05:30
Pramod Mahajan
28c995bbc0 hide select at local level - Task planning 2025-06-10 15:34:05 +05:30
Pramod Mahajan
2b8764b402 hide select at local level - DailyTask 2025-06-10 15:31:43 +05:30
Pramod Mahajan
7f1ce2b863 removed unwannted code 2025-06-10 15:29:53 +05:30
Pramod Mahajan
4df293488e added select at Global level 2025-06-10 15:29:09 +05:30
435fa730b6 conmatic changes in avatar header menu drop down
- add link for settings
- remove billing
2025-06-10 13:45:30 +05:30
e079be39db Incorrect Old Password Shows Improper Error Message on Change Password Screen 2025-06-09 17:53:17 +05:30
63980db512 Employee Details Page Showing "NA" for All Fields. 2025-06-09 11:56:48 +00:00
19f58345d9 add cosmati changes 2025-06-09 11:54:49 +00:00
e2f3814934 Implement a spinner in the Daily Progress Report to indicate when data is being loaded. 2025-06-09 11:54:49 +00:00
3857fec32e add cosmatic changes 2025-06-09 11:38:35 +00:00
3a45f80f36 Changes in Change Password Popup improve its layout and functionality. 2025-06-09 11:38:35 +00:00
b4b64c4c91 Creating a Change Password page. 2025-06-09 11:38:35 +00:00
Pramod Mahajan
77fb787d46 removed console.log 2025-06-09 12:41:57 +05:30
9e03e6ae19 Handle conditon to hide unwanted OR label 2025-06-09 11:49:34 +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
d37068b8d9 Modify typo 2025-06-09 11:46:00 +05:30
ef47bbf8a4 When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate. 2025-06-09 06:00:26 +00:00
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
Pramod Mahajan
ab6316ef56 Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482 2025-06-07 17:42:16 +05:30
Pramod Mahajan
d345977fdc set constant time for expire time for OTP 2025-06-07 17:41:24 +05:30
Pramod Mahajan
8640a96901 set new route login through OTP 2025-06-07 17:40:49 +05:30
Pramod Mahajan
beeba834e2 added send and verify OTP api 2025-06-07 17:40:24 +05:30
Pramod Mahajan
def6524566 created new component for verify OTP 2025-06-07 17:40:03 +05:30
Pramod Mahajan
194087c0a3 added login with otp feature, added send otp api 2025-06-07 17:39:37 +05:30
40f4f2f254 Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2 2025-06-06 18:37:40 +05:30
96ed0428c4 Changes in Reset Password Page and adding field in Dialog box is " Change Password" 2025-06-05 18:06:58 +05:30
f3b16a9fc0 Creating a Change Password Page and adding Change Password field in Dialog box. 2025-06-05 17:57:53 +05:30
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
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
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
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
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
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
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
7e05cfbd61 In Employee selection double Date is shown in Front. 2025-06-02 17:31:07 +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
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30