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

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

@ -114,7 +114,7 @@
style="height: 20px" style="height: 20px"
> >
<span class="text-bold-600">{{ <span class="text-bold-600">{{
dataCompAct?.est_cost dataCompAct?.real_cost
}}</span> }}</span>
</div> </div>
</div> </div>
@ -124,8 +124,8 @@
<ngb-progressbar <ngb-progressbar
height="35px" height="35px"
type="danger" type="danger"
[value]="dataCompAct?.real_cost" [value]="dataCompAct?.est_cost"
[max]="dataCompAct?.real_cost" [max]="dataCompAct?.est_cost"
></ngb-progressbar> ></ngb-progressbar>
</div> </div>
<div <div
@ -133,7 +133,7 @@
style="height: 20px" style="height: 20px"
> >
<span class="text-bold-600">{{ <span class="text-bold-600">{{
dataCompAct?.real_cost dataCompAct?.est_cost
}}</span> }}</span>
</div> </div>
</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 this.costService
.getRealCostByBuildingId(4, this.dateSelected) .getRealCostByBuildingId(4, this.dateSelected)
.subscribe((data) => { .subscribe((data) => {
console.log(data.data[0]); // console.log(data.data[0]);
// this.costTerm = data.data[0].est_cost // this.costTerm = data.data[0].est_cost
}); });
setTimeout(() => { setTimeout(() => {

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

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