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

43 Commits

Author SHA1 Message Date
Pramod Mahajan
80083aa5db updated some queries and mutation for prevent to duplicates calls 2025-07-02 19:42:43 +05:30
Pramod Mahajan
0c8ff7b28c partially integrated react-query in project infra 2025-07-02 01:57:02 +05:30
Pramod Mahajan
891cbc9620 give relveant name for modal props 2025-06-23 16:13:25 +05:30
Pramod Mahajan
f58aa8cb18 added new modal for create sub task 2025-06-17 20:46:46 +05:30
ashutosh.nehete
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30
kartik.sharma
48f013edd5 On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'. 2025-05-17 10:57:50 +00:00
Pramod Mahajan
7d07002555 visible assign task button in mobile view 2025-05-15 05:46:40 +00:00
Vikas Nale
c8ad72a2da added Assign_view progress task permission. 2025-05-13 12:40:10 +05:30
Pramod Mahajan
d398a6cb39 added dropdwon for action view 2025-05-13 11:32:09 +05:30
ashutosh.nehete
e8ac267d46 Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views. 2025-05-12 14:40:13 +05:30
Pramod Mahajan
6bb1f98ae7 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207, 2025-05-10 19:06:34 +05:30
Pramod Mahajan
1dbd8ba317 can't update completed is greather than zero 2025-05-10 12:54:10 +05:30
Pramod Mahajan
067f7306d4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W 2025-05-09 17:45:50 +05:30
Pramod Mahajan
6b06c888e5 removed debugger 2025-05-09 17:45:14 +05:30
Pramod Mahajan
11adad64d5 Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state. 
Ensures modal appears with a dark overlay when active and is hidden otherwise.
 2025-05-09 11:52:57 +00:00
Pramod Mahajan
1598842436 modified delete modal msg 2025-05-07 17:19:41 +05:30
Pramod Mahajan
e5f6ac23ef removed console and unused code 2025-05-07 16:38:01 +05:30
Pramod Mahajan
9e3101ebf4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity 2025-05-07 13:00:09 +05:30
Pramod Mahajan
3677b80cfa added edit task modal, and changed compeletd work and plannedwork 2025-05-05 17:32:05 +05:30
Pramod Mahajan
4b3f8cc50f Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 2025-05-05 09:51:35 +05:30
Vikas Nale
d06cfd97a7 icon issue 2025-05-04 23:12:40 +05:30
Vikas Nale
311c2afb98 handle infra icon issue 2025-05-04 23:05:46 +05:30
Pramod Mahajan
04a25d58f4 added condition for manageInfr for edit and delete activity 2025-05-04 19:41:59 +05:30
Pramod Mahajan
8607dbb49b replaced isModalOpen with modalopen for modal visibility control 2025-05-04 19:25:11 +05:30
Vikas Nale
2e2a5438d8 Hide infra manage buttons if not allowed 2025-05-04 13:12:34 +05:30
ashutosh.nehete
9f3e526c26 removed unused ModalContext 2025-05-04 12:33:23 +05:30
Vikas Nale
542748f12c Avoid calling UserRoles and Employess api multiple times from Infra page 2025-05-04 12:18:27 +05:30
Pramod Mahajan
4bd574772f filtering projects according to logged user at data layer 2025-05-04 12:00:10 +05:30
Pramod Mahajan
6496fd7eb2 sorted all dropdown list 2025-05-03 04:40:13 +00:00
Pramod Mahajan
655967746f handle modal visibility with React state instead of Bootstrap 2025-04-30 11:25:39 +00:00
Pramod Mahajan
b15f5df8e7 added assign task button for mobile view 2025-04-22 10:33:58 +00:00
Pramod Mahajan
18729e960c removed condiational vaiable and added tooltip for edit and delet icon. 2025-04-20 08:46:48 +00:00
Vikas Nale
64904c3cee - Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed 
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
 2025-04-16 16:00:48 +05:30
Vikas Nale
88a60a7c48 - Modify Font sizes to suit the theme 
- Change gay color of grid to match the theme
- realign floor and workarea lebel for visual clearity
- remove background color with the message "No floor added to the building, please add new floor to start working'
 2025-04-16 15:31:38 +05:30
Pramod Mahajan
c45130b611 updated project-infra-each modelForm able to taking recently added item 2025-04-10 02:07:47 +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
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
Pramod Mahajan
9e17b74ba4 changed font size and removed console. 2025-04-07 18:44:19 +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