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

2249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
57cf750d62 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 18:22:14 +05:30
Pramod Mahajan
d56ba89a4a fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server 2025-04-08 18:21:59 +05:30
Gitea Admin
999ebe1623 Merge pull request 'Enhance email validation and fix spelling errors in address fields' (#6) from vaibhav_Bug-#26 into Feature_Task_Management 
Reviewed-on: #6
 2025-04-08 12:33:30 +00:00
Vaibhav Surve
9d9569460a Enhance email validation and fix spelling errors in address fields 2025-04-08 12:33:30 +00:00
Gitea Admin
079dfb8861 Merge pull request 'Refactor project status options and remove "Suspended" status' (#5) from vaibhav_bug_Issue-#50 into Feature_Task_Management 
Reviewed-on: #5
 2025-04-08 12:32:56 +00:00
Vaibhav Surve
d9e1c91a6b Refactor project status options and remove "Suspended" status 2025-04-08 16:10:42 +05:30
Pramod Mahajan
9c0f98dbaf Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 16:00:11 +05:30
Gitea Admin
5559970a05 Merge pull request 'Ashutosh_Daily_Task_Planning_Issues' (#4) from Ashutosh_Daily_Task_Planning_Issues into Feature_Task_Management 
Reviewed-on: #4
 2025-04-08 09:54:02 +00:00
ashutosh.nehete
a78c4b90db Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
ashutosh.nehete
f9c6d1b7f8 Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
Gitea Admin
147342bfc1 Merge pull request 'Refactor employee action dropdown for better accessibility and code clarity' (#3) from vaibhav_bug_Issue-#49 into Feature_Task_Management 
Reviewed-on: #3
 2025-04-08 07:53:22 +00:00
Vaibhav Surve
c989f23106 Refactor employee action dropdown for better accessibility and code clarity 2025-04-08 07:53:22 +00:00
Gitea Admin
14ca1eb54c Merge pull request 'Vaibhav_Resolved_Issues' (#2) from Vaibhav_Resolved_Issues into Feature_Task_Management 
Reviewed-on: #2
 2025-04-08 07:53:03 +00:00
Vaibhav Surve
085176c593 update "Not Data Found" message to "No Data Found" with improved styling 2025-04-08 07:53:03 +00:00
Vaibhav Surve
cee8f23fd9 enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components 2025-04-08 07:53:03 +00:00
Pramod Mahajan
df989605b9 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 13:03:12 +05:30
Vikas Nale
5995c74ae6 change class= to className= 2025-04-08 09:37:38 +05:30
Vikas Nale
984efe207b Reduce font size on menu and project infra 2025-04-07 22:11:38 +05:30
Vikas Nale
8888f9d2d8 Merge pull request 'Vaibhav_Resolved_Issues' (#1) from Vaibhav_Resolved_Issues into Feature_Task_Management 
Reviewed-on: #1
 2025-04-07 16:25:50 +00:00
Vaibhav Surve
66c4e44ded updated Connect, Documentation, and Support pages with "Coming Soon!" message and illustration 2025-04-07 16:25:12 +00:00
Vaibhav Surve
f2a77b0685 added "Coming Soon!" message and illustration to multiple components 2025-04-07 16:25:12 +00:00
Vaibhav Surve
c595930640 refactor: streamline modal handling and improve floor management functionality 2025-04-07 16:25:12 +00:00
Vaibhav Surve
6c0b92606a updated links for Daily Expenses and Application Users in menuData.json 2025-04-07 16:25:12 +00:00
Pramod Mahajan
9e17b74ba4 changed font size and removed console. 2025-04-07 18:44:19 +05:30
Pramod Mahajan
a28d290feb hide or visible password 2025-04-07 17:17:21 +05:30
Pramod Mahajan
8bce23d9b6 added hid and visible functionality for password field. 2025-04-07 17:16:18 +05:30
Pramod Mahajan
2081b13d64 removed space between check and view button 2025-04-07 17:15:17 +05:30
Pramod Mahajan
93c95e007a integrated create Task api and handling data caching updated for task. 2025-04-07 17:14:07 +05:30
Pramod Mahajan
10d6f96ea7 added taskreport, commentTask feature 2025-04-06 18:03:10 +05:30
Pramod Mahajan
ddfbed1020 updated project infra components and added assigntask 2025-04-05 13:10:24 +05:30
Pramod Mahajan
1451c1aff7 added login and forgot form validation and changed server response format 2025-04-03 17:51:59 +05:30
Pramod Mahajan
e6a687c8e2 added validation for aadhar, pan Number, email, phone number and address length. 2025-04-03 00:22:24 +05:30
Pramod Mahajan
21ca99455b added character limitation for description field-255 2025-04-02 22:45:47 +05:30
Pramod Mahajan
73ffbe9bf4 Newly Checked-In Employees and log Displaying in Descending Order 2025-04-02 18:57:14 +05:30
Pramod Mahajan
f7f1f8d083 added user rights for regularize 2025-04-02 18:17:05 +05:30
Pramod Mahajan
f4af7ccf1c added ascending order list , user-rights, 2025-04-02 17:24:43 +05:30
Pramod Mahajan
79a1a08620 added back button,master-header 2025-04-02 13:42:17 +05:30
Pramod Mahajan
fba9a8fc06 removed "Select Master" option in master dropdown 2025-04-01 20:41:10 +05:30
Pramod Mahajan
5a7ca02952 added use-rights functionality according to users 2025-04-01 17:17:35 +05:30
Vaibhav Surve
959e4dd7dd removed unwanted handeling on login page 2025-03-29 16:45:19 +05:30
Vaibhav Surve
899dac5afd replased env url 2025-03-29 16:22:50 +05:30
Vaibhav Surve
0cfd60dbe4 Resolved toast issue occured on the login page, added flag for axios 2025-03-29 16:13:34 +05:30
PramodMahajan14
850b2e6998 update enviroment variable 2025-03-29 14:36:57 +05:30
PramodMahajan14
66bfcd80c1 add env config. 2025-03-28 16:46:41 +05:30
PramodMahajan14
ba38e0c289 added env vairables and update ts config for building container 2025-03-28 13:27:42 +05:30
PramodMahajan14
8e455e96b4 updated projectList comp. immediately update rights 2025-03-26 13:02:49 +05:30
PramodMahajan14
a3ab1ad105 remove API_URL string inside deleteMaster page, 2025-03-25 17:54:59 +05:30
Vikas Nale
ba302898b8 Add UserRights branch from github changeset: 10a346901a9018735d9fd70a1a79a737595177ab 2025-03-25 17:22:23 +05:30
Vikas Nale
11241696b3 Add first version in main branch 2025-03-25 17:14:14 +05:30