Skip to content

Commit

Permalink
Merge branch 'develop' into issue-328
Browse files Browse the repository at this point in the history
  • Loading branch information
RLiNREL committed Dec 2, 2024
2 parents 38c5136 + ee02464 commit bddd8f9
Show file tree
Hide file tree
Showing 47 changed files with 962 additions and 748 deletions.
26 changes: 26 additions & 0 deletions src/app/core-components/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,31 @@ <h4>
DE-AC05-00OR22725.
</p>
</div>
<div class="ps-3 pt-2 pe-3 pb-2">

<h4>
<fa-icon [icon]="faCircleInfo" class="pe-1"></fa-icon>
User Data
</h4>
<p>
You are running the Software in a web browser on your device.
All application data is saved locally within this browser to your device and/or browser.
NREL, ORNL, and the DOE do not have access to data you input into the Software and/or outputs
based on your data provided by the Software.
Should the Software, your browser, and/or your device crash, fail, or otherwise have an error,
data you entered into the Software and the outputs based on that data may be lost.
It is encouraged that you download backup files of your data frequently.
Backups can be imported back into the Software if needed to restore lost or corrupted data.
</p>
<p>
You may voluntarily provide a backup file of your data to NREL and ORNL for use in improving the Software.
By providing such data you are agreeing that NREL and ORNL may use such data without restriction and without
compensation or obligation to you.
To the extent any license would be required to utilize such data, you automatically grant NREL and ORNL,
when submitting such data, a worldwide, royalty-free, perpetual, irrevocable, non-exclusive,
transferrable, and sublicensable license under any rights necessary for such use or implementation.

</p>
</div>
</div>
</div>
19 changes: 13 additions & 6 deletions src/app/core-components/feedback-page/feedback-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,20 @@ <h4>
</h4>
<p>
We'd love to hear from you! The JUSTIFI application is in active development and your feedback
is invaluable in shaping the user experience, new features and general content within the tool.
To provide feedback, please email <a href="mailto:armstrongko@ornl.gov">Kristina
Armstrong</a> (armstrongko&#64;ornl.gov) with the subject line
<span class="bold">“JUSTIFI Feedback - A Summary”</span>.
is invaluable in shaping the user experience, new features and general content within the tool.
To provide feedback, please email <a href="mailto:armstrongko@ornl.gov">Kristina
Armstrong</a> (armstrongko&#64;ornl.gov) with the subject line
<span class="bold">“JUSTIFI Feedback - A Summary”</span>.
This will allow the team to follow up with any
clarification questions in a timely manner and update you on progress towards implementing your ideas!
</p>
<p>
If you would prefer to provide feedback via a survey, we have provided one: <a
href="https://forms.office.com/g/mBL1Rvp9cP" target="_blank">Alpha Feedback Survey</a>. This survey
will be available during the alpha phase of JUSTIFI so that test users can provide their input on
initial impressions of JUSTIFI and give guidance as it is developed into a well thought out and easy to
use tool!
</p>
<hr>
<h4>
<fa-icon [icon]="faBug"></fa-icon> Bug Reporting
Expand All @@ -24,10 +31,10 @@ <h4>
Armstrong</a> (armstrongko&#64;ornl.gov) as well
using the subject <span class="bold">“JUSTIFI Bug Reporting - A Summary”</span>.
Kristina will work with you to resolve the issue and
make sure the bug is fixed to prevent future occurrences.
make sure the bug is fixed to prevent future occurrences.
</p>
<p>
To help us address the bug efficiently,
To help us address the bug efficiently,
some suggested details to include in the bug report are:
</p>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,22 @@ export class ToastNotificationsService {
showWebDisclaimer() {
if (!this.localStorageDataService.disableDataDisclaimer) {
let title: string = "JUSTIFI Web";
let body: string = `You are running JUSTIFI in a web browser. All application data is saved locally
within this browser (The DOE does not have access to your data).
It is encouraged that you download backup files of your data frequently.
Backups can be imported back to the tool to restore lost or corrupted data.
Additionally, sharing backups with the development team can assist in improving this tool. <br> <hr>
You can download data backups using the "Download Data" button in the upper right hand corner of your screen.`
let body: string = `You are running the Software in a web browser on your device.
All application data is saved locally within this browser to your device and/or browser.
NREL, ORNL, and DOE do not have access to data you input into the Software and/or outputs
based on your data provided by the Software.
Should the Software, your browser, and/or your device crash, fail, or otherwise have an error,
data you entered into the Software and the outputs based on that data may be lost.
It is encouraged that you download backup files of your data frequently.
Backups can be imported back into the Software if needed to restore lost or corrupted data.
<br>
<br>
You may voluntarily provide a backup file of your data to NREL and ORNL for use in improving the Software.
By providing such data you are agreeing that NREL and ORNL may use such data without restriction and without
compensation or obligation to you.
To the extent any license would be required to utilize such data, you automatically grant NREL and ORNL,
when submitting such data, a worldwide, royalty-free, perpetual, irrevocable, non-exclusive,
transferrable, and sublicensable license under any rights necessary for such use or implementation.`
this.showToast(title, body, "bg-info", false, true);
let initDisable: boolean = true;
this.disableNotificaitonSub = this.disableNotification.subscribe(val => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@

.metric-column{
padding-left: 24px;
}

tr:hover{
cursor: pointer;
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,43 @@

<ng-container *ngIf="neb.selected" class="no-hover">
<div class="metric-column">
Select KPMs impacted by this NEB.
<div class="d-flex ps-2 flex-column">
<ng-container *ngFor="let metric of neb.KPM">
<div class="form-check">
<input class="form-check-input" type="checkbox" value=""
id="{{'check_'+metric+neb.optionValue}}" (change)="setChecked(neb, metric)"
[checked]="neb.selectedKPM.includes(metric)">
<label class="form-check-label" for="{{'check_'+metric+neb.optionValue}}">
<div class="d-flex">
<ng-template [ngIf]="companyTrackedKpms.includes(metric)">
<div class="pe-1">
&ast;
</div>
</ng-template>
<ng-template [ngIf]="inAddModal" [ngIfElse]="nonModalBlock">
Select KPMs impacted by this NEB.
<div class="d-flex ps-2 flex-column">
<ng-container *ngFor="let metric of neb.KPM">
<div class="form-check">
<input class="form-check-input" type="checkbox" value=""
id="{{'check_'+metric+neb.optionValue}}"
(change)="setChecked(neb, metric)"
[checked]="neb.selectedKPM.includes(metric)">
<label class="form-check-label" for="{{'check_'+metric+neb.optionValue}}">
<div class="d-flex">
<ng-template [ngIf]="companyTrackedKpms.includes(metric)">
<div class="pe-1">
&ast;
</div>
</ng-template>
<span
[innerHTML]="metric | kpmLabel: allKpmOptions: 'metricValue'"></span>
</div>
</label>
</div>
</ng-container>
</div>
</ng-template>
<ng-template #nonModalBlock>
<div class="fw-light">
KPMs impacted by this NEB
<ng-container>
<ul class="mb-0">
<li *ngFor="let metric of neb.KPM">
<span
[innerHTML]="metric | kpmLabel: allKpmOptions: 'metricValue'"></span>
</div>
</label>
</div>
</ng-container>
</div>
</li>
</ul>
</ng-container>
</div>
</ng-template>
</div>
</ng-container>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ <h5 class="bold w-100 text-center">
<fa-icon [icon]="faBuilding" class="me-2"></fa-icon> {{company.generalInformation.name}}
</h5>

<table class="table table-bordered table-hover">
<table class="table table-bordered table-hover table-sm">
<tbody>
<tr>
<td class="w-25">
Address
</td>
<td>
<!--TODO: add address format-->
&mdash;
@let address = company.generalInformation | addressDisplay;
<ng-template [ngIf]="address" [ngIfElse]="addressMdash">
{{address}}
</ng-template>
<ng-template #addressMdash>
&mdash;
</ng-template>
</td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,81 @@
<h5 class="bold w-100 text-center">
<fa-icon [icon]="faChartBar" class="me-2"></fa-icon> Key Performance Indicators
</h5>
<div class="row">
<div class="col-lg-6 col-md-12 pb-2" *ngFor="let kpi of (company.guid | companyKpiList:keyPerformanceIndicators)">
<div class="card">
<div class="card-header">
<fa-icon [icon]="faBullseye" class="pe-1"></fa-icon>
<span [innerHTML]="kpi.htmlLabel"></span>
</div>
<div class="card-body">

<table class="table table-sm">
<tbody>
<tr>
<td class="w-50">
KPI Category
</td>
<td>
<app-primary-kpi-badge [kpiOption]="kpi"></app-primary-kpi-badge>
</td>
</tr>
</tbody>
</table>
<table class="table table-bordered savings-table table-hover table-sm">
<thead>
<tr>
<th>
<!-- KPM -->
</th>
<th>
Units
</th>
<th>
Cost<br> Per Unit
</th>
<th>
Baseline<br> Amount
</th>
<th>
Baseline Cost<br> (&dollar;/yr)
</th>
</tr>
</thead>
<tbody>
<ng-container *ngFor="let kpi of keyPerformanceIndicators">
<tr>
<th colspan="5">
<span [innerHTML]="kpi.htmlLabel"></span>
</th>
</tr>
<tr *ngFor="let keyPerformanceMetric of kpi.performanceMetrics">
<td class="ps-3">
<span [innerHTML]="keyPerformanceMetric.htmlLabel"></span>
</td>
<ng-template [ngIf]="keyPerformanceMetric.isQuantitative" [ngIfElse]="qualitativeBlock">

</div>
</div>
</div>
</div>
<td>
<ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
[ngIfElse]="unitMdash">
<app-single-cell-item [strValue]="keyPerformanceMetric.totalUnit"
[isCurrency]="false"></app-single-cell-item>
</ng-template>
<ng-template #unitMdash>
&mdash;
</ng-template>
</td>
<td>
<ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
[ngIfElse]="costPerMdash">
<app-single-cell-item [numValue]="keyPerformanceMetric.costPerValue"
[isCurrency]="true"></app-single-cell-item>
</ng-template>
<ng-template #costPerMdash>
&mdash;
</ng-template>
</td>
<td>
<ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
[ngIfElse]="baselineValueMdash">
<app-single-cell-item [numValue]="keyPerformanceMetric.baselineValue"
[isCurrency]="false"></app-single-cell-item>
</ng-template>
<ng-template #baselineValueMdash>
&mdash;
</ng-template>
</td>
<td>
<app-single-cell-item [numValue]="keyPerformanceMetric.baselineCost"
[isCurrency]="true"></app-single-cell-item>
</td>
</ng-template>
<ng-template #qualitativeBlock>
<td colspan="4">
Qualitative Metric
</td>
</ng-template>
</tr>
</ng-container>
</tbody>
</table>
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export class CompanyKpisSummaryComponent {

ngOnInit(){
this.company = this.companyIdbService.selectedCompany.getValue();
this.keyPerformanceIndicators = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue();
this.keyPerformanceIndicators = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue().filter(kpi => {
return kpi.companyId == this.company.guid;
});
this.contacts = this.contactsIdbService.contacts.getValue();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ <h5 class="bold w-100 text-center">
<fa-icon [icon]="faIndustry" class="me-2"></fa-icon> {{facility.generalInformation.name}}
</h5>

<table class="table table-bordered table-hover">
<table class="table table-bordered table-hover table-sm">
<tbody>
<tr>
<td class="w-25">
Address
</td>
<td>
<!--TODO: add address format-->
&mdash;
@let address = facility.generalInformation | addressDisplay;
<ng-template [ngIf]="address" [ngIfElse]="addressMdash">
{{address}}
</ng-template>
<ng-template #addressMdash>
&mdash;
</ng-template>
</td>
</tr>
<tr>
Expand Down
Loading

0 comments on commit bddd8f9

Please sign in to comment.