Skip to content

Commit 3c93c1e

Browse files
rmrootrmroot
authored
Merge pull request #2272 from ORNL-AMO/issue-2263-other-impacts
fixup: hide additional content areas
2 parents 32cf58b + f20f232 commit 3c93c1e

File tree

8 files changed

+93
-73
lines changed

8 files changed

+93
-73
lines changed

‎src/app/data-evaluation/help-panel/account-help/account-custom-data-help/account-custom-data-help.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ <h5>Custom Data</h5>
44
data entries.
55
</p>
66
<hr>
7+
@if(account.displayEmissions){
78
<p>
89
Add emissions subregions that can be used to calculate electrical emissions.
910
</p>
1011
<hr>
1112
<p>
1213
Once added, these emissions factors will be available in the emissions dropdowns under the settings tab.
1314
</p>
14-
<hr>
15+
<hr>
16+
}

‎src/app/data-evaluation/help-panel/account-help/account-custom-data-help/account-custom-data-help.component.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { Component } from '@angular/core';
2+
import { AccountdbService } from 'src/app/indexedDB/account-db.service';
3+
import { IdbAccount } from 'src/app/models/idbModels/account';
24

35
@Component({
46
selector: 'app-account-custom-data-help',
@@ -8,4 +10,11 @@ import { Component } from '@angular/core';
810
})
911
export class AccountCustomDataHelpComponent {
1012

13+
account: IdbAccount;
14+
15+
constructor(private accountDbService: AccountdbService) { }
16+
17+
ngOnInit(): void {
18+
this.account = this.accountDbService.selectedAccount.getValue();
19+
}
1120
}

‎src/app/routing/account.routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const AccountRoutes: Route = {
114114
path: 'custom-data',
115115
component: CustomDatabaseComponent,
116116
children: [
117-
{ path: '', pathMatch: 'full', redirectTo: 'emissions' },
117+
{ path: '', pathMatch: 'full', redirectTo: 'fuels' },
118118
{
119119
path: 'emissions',
120120
component: RegionalEmissionsDataComponent,

‎src/app/shared/custom-database/custom-database.component.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<div class="utility banner sticky-top d-flex justify-content-between banner-border"
22
[ngClass]="{'modal-open': modalOpen}">
33
<ul class="nav nav-tabs">
4-
@if(account.displayEmissions){
54
<li class="nav-item">
6-
<a class="nav-link" routerLink="emissions" [routerLinkActive]="['active']">
5+
<a class="nav-link" routerLink="fuels" [routerLinkActive]="['active']">
76
<i class="fa fa-file-pen"></i>
8-
Custom Grid Factors
7+
Custom Fuels
98
</a>
109
</li>
11-
}
10+
@if(account.displayEmissions){
1211
<li class="nav-item">
13-
<a class="nav-link" routerLink="fuels" [routerLinkActive]="['active']">
12+
<a class="nav-link" routerLink="emissions" [routerLinkActive]="['active']">
1413
<i class="fa fa-file-pen"></i>
15-
Custom Fuels
14+
Custom Grid Factors
1615
</a>
1716
</li>
18-
@if(account.displayEmissions){
1917
<li class="nav-item">
2018
<a class="nav-link" routerLink="gwp" [routerLinkActive]="['active']">
2119
<i class="fa fa-file-pen"></i>

‎src/app/shared/shared-help-content/account-settings-help/account-settings-help.component.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ <h5>Account Settings</h5>
1212
The Default Units only set the unit a new meter starts with. This can be set for each meter during meter setup. The
1313
Volume and Mass units are only used for setting the physical units of meters.
1414
</p>
15+
@if(account.displayEmissions){
1516
<hr>
1617
<p>
1718
Your zip code is used to set the "Electricity Global Warming Potential", unless otherwise specified. This value is
@@ -26,6 +27,7 @@ <h5>Account Settings</h5>
2627
GHG Protocol Global Warming Potential Values
2728
</a> for more information.
2829
</p>
30+
}
2931
<hr>
3032
<p>
3133
Use the financial reporting if your account does not use a calendar year. The application will adjust to

‎src/app/shared/shared-help-content/account-settings-help/account-settings-help.component.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { Component } from '@angular/core';
2+
import { AccountdbService } from 'src/app/indexedDB/account-db.service';
3+
import { IdbAccount } from 'src/app/models/idbModels/account';
24

35
@Component({
46
selector: 'app-account-settings-help',
@@ -8,4 +10,11 @@ import { Component } from '@angular/core';
810
})
911
export class AccountSettingsHelpComponent {
1012

13+
account: IdbAccount;
14+
15+
constructor(private accountDbService: AccountdbService) { }
16+
17+
ngOnInit(): void {
18+
this.account = this.accountDbService.selectedAccount.getValue();
19+
}
1120
}

‎src/app/shared/shared-help-content/facility-utility-help/energy-consumption-help/edit-bill-help/edit-bill-help.component.html‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
@if (isEdit) {
2-
<h4>Edit Bill</h4>
3-
<p>
4-
Use this page to edit an existing meter reading.
5-
</p>
6-
<hr>
7-
<p>
8-
Once reading data has been filled out click "Save" to submit changes and go back to the table.
9-
</p>
10-
}
11-
@if (!isEdit) {
12-
<h4>New Bill</h4>
13-
<p>
14-
Use this page add a new meter reading.
15-
</p>
16-
<hr>
17-
<p>
18-
Once reading data has been filled out click "Save + Quit" to submit and go back to the table. Otherwise click "Save + Add Another" to add
19-
another reading. The month will be incremented forward one month.
20-
</p>
21-
}
22-
<hr>
23-
<p>
24-
Hover over the "<span class="fa fa-circle-question"></span>" icons for details about the corresponding input fields.
25-
</p>
26-
<hr>
27-
<p>
28-
Use the "Choose Columns" dropdown to add or remove details to be tracked with electricity meters in this facility.
29-
</p>
30-
<hr>
2+
<h4>Edit Bill</h4>
3+
<p>
4+
Use this page to edit an existing meter reading.
5+
</p>
6+
<hr>
7+
<p>
8+
Once reading data has been filled out click "Save" to submit changes and go back to the table.
9+
</p>
10+
}
11+
@if (!isEdit) {
12+
<h4>New Bill</h4>
13+
<p>
14+
Use this page add a new meter reading.
15+
</p>
16+
<hr>
17+
<p>
18+
Once reading data has been filled out click "Save + Quit" to submit and go back to the table. Otherwise click "Save +
19+
Add Another" to add
20+
another reading. The month will be incremented forward one month.
21+
</p>
22+
}
23+
<hr>
24+
<p>
25+
Hover over the "<span class="fa fa-circle-question"></span>" icons for details about the corresponding input fields.
26+
</p>
27+
<hr>
28+
<p>
29+
Use the "Choose Columns" dropdown to add or remove details to be tracked with electricity meters in this facility.
30+
</p>
31+
<hr>

‎src/app/shared/shared-help-content/facility-utility-help/energy-consumption-help/edit-meter-help/edit-meter-help.component.html‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
@if (isEdit) {
2-
<h5>Edit Meter</h5>
3-
<p>
4-
Use this screen to edit the properties of a meter.
5-
</p>
2+
<h5>Edit Meter</h5>
3+
<p>
4+
Use this screen to edit the properties of a meter.
5+
</p>
66
}
77
@if (!isEdit) {
8-
<h5>Add Meter</h5>
9-
<p>
10-
Use this screen to fill out the properties of the new meter.
11-
</p>
8+
<h5>Add Meter</h5>
9+
<p>
10+
Use this screen to fill out the properties of the new meter.
11+
</p>
1212
}
1313
<hr>
14-
<p>
15-
For energy meters “Site to Source” is also required. For grid purchased electricity, this value is usually 3, for
16-
fuels and on-site generated renewable electricity (wind or solar), the value is 1. For other cases, more
17-
information can be found in the <a
18-
href="https://www.osti.gov/biblio/1649123">Better Plants
19-
Energy Intensity Baselining and Tracking Guidance</a>
14+
<p>
15+
For energy meters “Site to Source” is also required. For grid purchased electricity, this value is usually 3, for
16+
fuels and on-site generated renewable electricity (wind or solar), the value is 1. For other cases, more
17+
information can be found in the <a href="https://www.osti.gov/biblio/1649123">Better Plants
18+
Energy Intensity Baselining and Tracking Guidance</a>
2019
</p>
2120

2221
<hr>
23-
<p>
24-
Hover over the "<span class="fa fa-circle-question"></span>" icons for details about the corresponding input fields.
25-
</p>
26-
<hr>
27-
@if (!isEdit) {
28-
<p>
29-
Once all the details of the meter are correct, click the "Add Meter" button to submit the new meter.
30-
</p>
31-
<hr>
32-
<p>
33-
Once the meter has been added it will show up as a new tab. Meter bills can then be added under that tab.
34-
</p>
35-
<hr>
36-
}
37-
@if (isEdit) {
38-
<p>
39-
Once all the details of the meter are correct, click the "Save Changes" button to submit the changes to the
40-
meter.
41-
</p>
42-
<hr>
43-
}
22+
<p>
23+
Hover over the "<span class="fa fa-circle-question"></span>" icons for details about the corresponding input fields.
24+
</p>
25+
<hr>
26+
@if (!isEdit) {
27+
<p>
28+
Once all the details of the meter are correct, click the "Add Meter" button to submit the new meter.
29+
</p>
30+
<hr>
31+
<p>
32+
Once the meter has been added it will show up as a new tab. Meter bills can then be added under that tab.
33+
</p>
34+
<hr>
35+
}
36+
@if (isEdit) {
37+
<p>
38+
Once all the details of the meter are correct, click the "Save Changes" button to submit the changes to the
39+
meter.
40+
</p>
41+
<hr>
42+
}

0 commit comments

Comments
 (0)