fuzi_fauzia
/
hemat_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing cost management

This commit is contained in:
Fuzi_fauzia 2024-06-14 13:27:32 +07:00
parent 2180311f4e
commit 6b962028db
5 changed files with 949 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/_layout/header/vertical/vertical.component.html
View File

@ -111,7 +111,7 @@
<span class="badge badge-pill badge-danger badge-up badge-glow">5</span>
</a> -->
<a class="nav-link nav-link-label">
<i class="ficon feather ft-bell" style="color: #bef264"></i>
<i class="ficon la la-bell" style="color: #bef264"></i>
<!-- <span class="badge badge-pill badge-danger badge-up badge-glow">5</span> -->
</a>
<ul class="dropdown-menu-media dropdown-menu-right" ngbDropdownMenu>

255
src/app/_layout/settings/menu-settings.config.ts
View File

@ -7,7 +7,7 @@ export interface MenuItem {
isExternalLink?: boolean;
issupportExternalLink?: boolean;
isStarterkitExternalLink?: boolean;
badge: { type: string, value: string };
badge: { type: string; value: string };
submenu: {
items: Partial<MenuItem>[];
};
@ -16,10 +16,10 @@ export interface MenuItem {
export interface MenuConfig {
horizontal_menu: {
items: Partial<MenuItem>[]
items: Partial<MenuItem>[];
};
vertical_menu: {
items: Partial<MenuItem>[]
items: Partial<MenuItem>[];
};
}
@ -27,9 +27,9 @@ export const MenuSettingsConfig: MenuConfig = {
horizontal_menu: {
items: [
{
title: 'Monitoring',
icon: 'feather ft-monitor',
page: '/monitoring',
title: "Monitoring",
icon: "feather ft-monitor",
page: "/monitoring",
// submenu: {
// items: [
// {
@ -44,73 +44,73 @@ export const MenuSettingsConfig: MenuConfig = {
// }
},
{
title: 'Device',
icon: 'feather ft-life-buoy',
page: '/device'
title: "Device",
icon: "feather ft-life-buoy",
page: "/device",
},
{
title: 'Cost Management',
icon: 'feather ft-bar-chart-2',
page: '/cost-management'
title: "Cost Management",
icon: "feather ft-bar-chart-2",
page: "/cost-management",
},
{
title: 'User Access',
icon: 'feather ft-user-check',
page: '/user-access'
title: "User Access",
icon: "feather ft-user-check",
page: "/user-access",
},
{
title: 'Monitoring List',
icon: 'icon-notebook',
page: '/list-monitoring'
title: "Monitoring List",
icon: "icon-notebook",
page: "/list-monitoring",
},
{
title: 'Master',
icon: 'feather ft-server',
page: 'null',
title: "Master",
icon: "feather ft-server",
page: "null",
submenu: {
items: [
{
title: 'Master Category',
page: '/master/master-category'
title: "Master Category",
page: "/master/master-category",
},
{
title: 'Master Voltage',
page: '/master/master-voltage'
title: "Master Voltage",
page: "/master/master-voltage",
},
{
title: 'Master Floor',
page: '/master/master-floor'
title: "Master Floor",
page: "/master/master-floor",
},
{
title: 'Master Type',
page: '/master/master-type'
title: "Master Type",
page: "/master/master-type",
},
{
title: 'Master Status',
page: '/master/master-status'
title: "Master Status",
page: "/master/master-status",
},
{
title: 'Master Duration Use',
page: '/master/master-duration-use'
title: "Master Duration Use",
page: "/master/master-duration-use",
},
{
title: 'Master User',
page: '/master/master-user'
title: "Master User",
page: "/master/master-user",
},
{
title: 'Master Role',
page: '/master/master-role'
title: "Master Role",
page: "/master/master-role",
},
{
title: 'Master Room',
page: '/master/master-room'
title: "Master Room",
page: "/master/master-room",
},
{
title: 'Master Building',
page: '/master/master-building'
}
]
}
title: "Master Building",
page: "/master/master-building",
},
],
},
},
// {
@ -139,21 +139,21 @@ export const MenuSettingsConfig: MenuConfig = {
// }
// },
{
title: 'Templates',
icon: 'la-television',
page: 'null',
title: "Templates",
icon: "la-television",
page: "null",
submenu: {
items: [
{
title: 'Horizontal',
page: 'null'
title: "Horizontal",
page: "null",
},
{
title: 'Vertical',
page: 'null'
title: "Vertical",
page: "null",
},
],
},
]
}
},
// {
// title: 'APPS',
@ -936,32 +936,32 @@ export const MenuSettingsConfig: MenuConfig = {
// ]
// }
// }
]
],
},
vertical_menu: {
items: [
// { section: 'Hemat', icon: 'la-ellipsis-h' },
{
title: 'Dashboard',
icon: 'la-home',
page: 'null',
title: "Dashboard",
icon: "la-home",
page: "null",
submenu: {
items: [
{
title: 'Enegry Monitoring',
page: '/monitoring'
title: "Enegry Monitoring",
page: "/monitoring",
},
{
title: 'Surveillance',
page: '/monitoring/surveillance'
title: "Surveillance",
page: "/monitoring/surveillance",
},
{
title: 'Water Consumption',
page: '/monitoring/water-monitoring'
}
]
}
title: "Water Consumption",
page: "/monitoring/water-monitoring",
},
],
},
},
// {
// title: 'Device',
@ -969,102 +969,101 @@ export const MenuSettingsConfig: MenuConfig = {
// page: '/device'
// },
{
title: 'Device',
icon: 'feather ft-life-buoy',
page: 'null',
title: "Device",
icon: "feather ft-life-buoy",
page: "null",
submenu: {
items: [
{
title: 'List Device',
page: '/device'
title: "List Device",
page: "/device",
},
{
title: 'Control Device',
page: '/device/control-device'
}
]
}
title: "Control Device",
page: "/device/control-device",
},
],
},
},
{
title: 'Cost Management',
icon: 'feather ft-bar-chart-2',
page: '/cost-management'
title: "Cost Management",
icon: "feather ft-bar-chart-2",
page: "/cost-management",
},
{
title: 'Carbon Calculator',
icon: 'la-calculator',
page: 'null',
title: "Carbon Calculator",
icon: "la-calculator",
page: "null",
submenu: {
items: [
{
title: 'Calcutaion',
page: '/calculator/calculation'
title: "Calcutaion",
page: "/calculator/calculation",
},
{
title: 'Reduction Target',
page: '/calculator/reduction'
}
]
}
title: "Reduction Target",
page: "/calculator/reduction",
},
],
},
},
{
title: 'User Access',
icon: 'feather ft-user-check',
page: '/user-access'
title: "User Access",
icon: "feather ft-user-check",
page: "/user-access",
},
{
title: 'Monitoring List',
icon: 'icon-notebook',
page: '/list-monitoring'
},
{
title: 'Setup Menu',
icon: 'feather ft-server',
page: 'null',
title: "Setup Menu",
icon: "feather ft-server",
page: "null",
submenu: {
items: [
{
title: 'Master Category',
page: '/master/master-category'
title: "Monitoring List",
page: "/list-monitoring",
},
{
title: 'Master Voltage',
page: '/master/master-voltage'
title: "Master Category",
page: "/master/master-category",
},
{
title: 'Master Floor',
page: '/master/master-floor'
title: "Master Voltage",
page: "/master/master-voltage",
},
{
title: 'Master Type',
page: '/master/master-type'
title: "Master Floor",
page: "/master/master-floor",
},
{
title: 'Master Status',
page: '/master/master-status'
title: "Master Type",
page: "/master/master-type",
},
{
title: 'Master Duration Use',
page: '/master/master-duration-use'
title: "Master Status",
page: "/master/master-status",
},
{
title: 'Master User',
page: '/master/master-user'
title: "Master Duration Use",
page: "/master/master-duration-use",
},
{
title: 'Master Role',
page: '/master/master-role'
title: "Master User",
page: "/master/master-user",
},
{
title: 'Master Room',
page: '/master/master-room'
title: "Master Role",
page: "/master/master-role",
},
{
title: 'Master Building',
page: '/master/master-building'
}
]
}
title: "Master Room",
page: "/master/master-room",
},
{
title: "Master Building",
page: "/master/master-building",
},
],
},
},
// { section: 'APPS', icon: 'la-ellipsis-h' },
@ -1822,12 +1821,6 @@ export const MenuSettingsConfig: MenuConfig = {
// page: 'https://modern-admin-docs.web.app/html/ltr/documentation/index.html',
// isExternalLink: true,
// }
]
}
],
},
};

8
src/app/content/hemat-app/cost-management/cost-management.component.html
View File

@ -114,7 +114,7 @@
style="height: 20px"
>
<span class="text-bold-600">{{
dataCompAct?.est_cost
dataCompAct?.real_cost
}}</span>
</div>
</div>
@ -124,8 +124,8 @@
<ngb-progressbar
height="35px"
type="danger"
[value]="dataCompAct?.real_cost"
[max]="dataCompAct?.real_cost"
[value]="dataCompAct?.est_cost"
[max]="dataCompAct?.est_cost"
></ngb-progressbar>
</div>
<div
@ -133,7 +133,7 @@
style="height: 20px"
>
<span class="text-bold-600">{{
dataCompAct?.real_cost
dataCompAct?.est_cost
}}</span>
</div>
</div>

2
src/app/content/hemat-app/cost-management/cost-management.component.ts
View File

@ -232,7 +232,7 @@ export class CostManagementComponent implements OnInit {
this.costService
.getRealCostByBuildingId(4, this.dateSelected)
.subscribe((data) => {
console.log(data.data[0]);
// console.log(data.data[0]);
// this.costTerm = data.data[0].est_cost
});
setTimeout(() => {

2
src/app/content/hemat-app/device/device.component.html
View File

@ -19,7 +19,7 @@
Total Device
</h6>
<h3 style="color: #ffffff !important">
{{ filteredRows.length }}
{{ filteredRows?.length }}
</h3>
</div>
<div class="align-self-center">