72 Commits

Author SHA1 Message Date
bc047a84fc Adding processpending in ExpenseStatus. 2025-10-08 18:49:24 +05:30
f0f579beae fixed dashbord card size 2025-10-04 15:47:07 +05:30
b53e6284b9 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 2025-10-04 14:13:43 +05:30
b1c23aab4d added expens group fied Name 2025-10-04 14:13:09 +05:30
87d13d0f77 Changes in Monthly Expense weidget. 2025-10-04 12:20:59 +05:30
997971629f addd Expense By project 2025-10-04 11:08:19 +05:30
18ac8e11bd added expense filte at api url level 2025-10-04 10:50:14 +05:30
78808ecac0 added Expensebstatus widget, fixed small bugs 2025-10-03 19:07:44 +05:30
aca96c60ae removed console and comment 2025-10-02 13:24:36 +05:30
25f4f1e7a7 added expense analysis card inisde dashboard 2025-10-02 13:10:14 +05:30
2531d91209 fixed dashboard graph 2025-10-01 16:21:08 +05:30
49b597c833 fixed expense date, added project name at check in checkout modal 2025-10-01 15:34:19 +05:30
ae772d925a remove project permissions 2025-10-01 10:13:52 +05:30
c1e5ff4043 remove dashboard 2025-09-30 23:39:41 +05:30
4e48478fbc update attendnace and expense 2025-09-30 19:31:24 +05:30
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
a86c815ca2 Asthetic Changes
- Margin on all sides for grid
- Margin for card content
2025-09-16 18:33:48 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
e62663af69 Change the icons on AttendanceChart.jsx 2025-08-18 10:20:08 +05:30
f52b68dc46 ui improvements - dashbord attendance report toggle icons change 2025-08-12 16:24:59 +05:30
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
4a49bbd68d In table remove all Capitals letters and show small letters. 2025-07-16 13:08:25 +00:00
78909e2275 Adding Color at the time of tables where value is greater then 0 and all the table times to left align. 2025-07-16 13:08:25 +00:00
c1fb50c667 Creating a new weidget Attendance Overview and accroding to project selection data will seen. 2025-07-16 13:08:25 +00:00
47e458fe7c added choose all project option at dashboard 2025-07-15 17:06:47 +05:30
0ef60621fb Add an "All Projects" selection option in the global project dropdown. 2025-07-15 09:41:07 +00:00
5bb27b6106 Modify project landing page 2025-07-02 15:11:31 +05:30
Pramod Mahajan
f932a4c5a4 added condition for directory, for hide project dropdown 2025-06-27 11:45:29 +05:30
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
6accbb3500 Add the weekday name (e.g., Monday) when hovering over a data point in the Project. 2025-06-20 15:55:17 +05:30
9e4c67984c Implemented signalR in project wiget in dashboard 2025-06-18 12:26:05 +05:30
90a77d357f Implemented attendance funcationality in attendance module 2025-06-17 17:07:53 +05:30
41f3628d45 For project progress widget set default selection 15W 2025-06-13 09:39:27 +05:30
edf092e85e Creating a toggle button in Project Progress. 2025-06-12 23:56:43 +05:30
Pramod Mahajan
558b663f6b hide project selection at local level at - project progress widget 2025-06-10 16:31:35 +05:30
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
f72c309c0c Comment code in Dashboard. 2025-05-31 15:35:36 +05:30
ccbe89f407 Cosmatic changes for Attendance Widget 2025-05-31 15:30:41 +05:30
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
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
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
d16675bf71 Adding New Weidge in Dashboard Name is "Activity". 2025-05-30 16:19:20 +05:30
627d4f898e Adding new Weidget in Dashboadr name is "Pending Attendance". 2025-05-28 13:06:03 +05:30
4445ef18ab Dashboard Component View. 2025-05-26 11:19:59 +05:30
aa50aeff98 Merge branch 'Kartik_Enhancement#335' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:27:20 +05:30
78d7b9b521 Merge branch 'Kartik_Enhancement#336' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:26:01 +05:30
7afa4f4449 Merge branch 'Kartik_Enhancement#337' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:24:28 +05:30
9e57e21b8c Merge branch 'Kartik_Enhancement#338' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:22:08 +05:30
38607ab482 Move all the Teams-related code from the Dashboard component into a new component named 'Teams' 2025-05-23 14:38:28 +05:30