diff --git a/src/app/core-components/navbar/navbar.component.html b/src/app/core-components/navbar/navbar.component.html index 7aaec5e0..944724e0 100644 --- a/src/app/core-components/navbar/navbar.component.html +++ b/src/app/core-components/navbar/navbar.component.html @@ -7,24 +7,24 @@ JUSTIFI - v{{version}} + v{{version}}
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html index 634805a7..6bc0c7f8 100644 --- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html +++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html @@ -1,4 +1,4 @@ -
+

Energy Efficiency Opportunities

diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.html index 38fc9dae..0e4e78a3 100644 --- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.html +++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.html @@ -1,4 +1,4 @@ -
+
Assessment Non-Energy Benefits diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.html index 8ef280f7..f7e1ffa5 100644 --- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.html +++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.html @@ -1,4 +1,4 @@ -
+
\ No newline at end of file diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css index a1b5750e..ed46499d 100644 --- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css +++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css @@ -1,18 +1,12 @@ -.add-neb-btn{ - background-color: #186A3B; -} -.add-opportunity-btn{ - background-color: #D35400; +.badge.small{ + font-size: small; } -.top-nav{ - border-bottom: solid; - margin-bottom: .25rem -} -.nav-underline .nav-item .nav-link.active{ - font-weight: normal; +.nav-link{ + padding: .25rem; } -.badge.small{ - font-size: small; +.navbar{ + padding-bottom: 0px; + border-bottom: 1px #0079c2 solid; } \ No newline at end of file diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html index bf2d4c3c..58739859 100644 --- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html +++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html @@ -2,33 +2,37 @@
-
+
- {{assessment.name}} {{assessment.assessmentType}} + {{assessment.name}}
-
    +
    + {{assessment.assessmentType}} +
    +
+
+
  • - Details + Details
  • - Energy Efficiency Opportunities
  • - NEBs + NEBs
  • - Results + Results
- +
+ +
diff --git a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.css b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.css index 4907a9a0..3112486f 100644 --- a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.css +++ b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.css @@ -1,65 +1,39 @@ -.navbar{ - width: 20rem; - background-color: #ffffff; - overflow-y: auto; - /* height: 100%; */ - /* max-height: 100%; */ - flex-wrap: nowrap; -} - .navbar.collapsed{ width: auto; } -.nav-item{ - width: 100%; - font-size: large; -} - -.nav-item.section-header{ +.toggle-collapse{ font-size: x-large; } -.nav-link{ - padding-left: .5rem; -} - -.nav-link.secondary-nav{ - padding-left: 1.5rem; -} - -.nav-link.third-nav{ - padding-left: 3rem; +.toggle-collapse:hover{ + cursor: pointer; + border: so; } -.nav-link.active{ - background-color: #0079c2; - color: white; +.help-container { + container-type: inline-size; + background-color: white; + overflow-y: auto; } -.nav-link:hover{ - background-color: #8DABBE; - color: black; +.help-content { + display: block; } - -/* .text-start{ - text-align: right; -} */ - -.toggle-collapse{ - font-size: x-large; +@container (max-width: 45px) { + .help-content, .panel-label { + display: none; + } } -.toggle-collapse:hover{ - cursor: pointer; - border: so; -} -.btn.text-left{ - text-align: left; +.panel-label{ + display: inline-block; + line-height: normal; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 100%; + font-size: large; } - -.nav-link:hover{ - cursor: pointer; -} \ No newline at end of file diff --git a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.html b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.html index a6c077a5..25166124 100644 --- a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.html +++ b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.html @@ -1,19 +1,19 @@ -
+
-
-
{{helpLabel}}
+
+ {{helpLabel}}
-
+
-
+
diff --git a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.spec.ts b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.spec.ts index d8f516b0..94a2ea3c 100644 --- a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.spec.ts +++ b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.spec.ts @@ -2,23 +2,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SetupWizardHelpPanelComponent } from './setup-wizard-help-panel.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { LocalStorageService } from 'ngx-webstorage'; +import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub'; describe('SetupWizardHelpPanelComponent', () => { let component: SetupWizardHelpPanelComponent; let fixture: ComponentFixture; - let localStorageService: Partial = { - retrieve: () => { return undefined }, - store: () => { return undefined }, - }; beforeEach(async () => { await TestBed.configureTestingModule({ imports: [FontAwesomeModule], declarations: [SetupWizardHelpPanelComponent], - providers: [ - { provide: LocalStorageService, useValue: localStorageService } - ] + providers: stubServiceProviders }) .compileComponents(); diff --git a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts index 4cf1167d..25c3b873 100644 --- a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts +++ b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { faCircleQuestion, IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { HelpContext } from './HelpContext'; -import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service'; import { Subscription } from 'rxjs'; +import { SetupWizardService } from '../setup-wizard.service'; @Component({ selector: 'app-setup-wizard-help-panel', @@ -11,15 +11,20 @@ import { Subscription } from 'rxjs'; styleUrl: './setup-wizard-help-panel.component.css' }) export class SetupWizardHelpPanelComponent { + @Output('emitToggleCollapse') + emitToggleCollapse: EventEmitter = new EventEmitter(false); - - collapseHelpPanel: boolean = false; faCircleQuestion: IconDefinition = faCircleQuestion; helpContext: HelpContext; helpLabel: string; routerSub: Subscription; - constructor(private router: Router, private localStorageDataService: LocalStorageDataService) { + helpPanelOpenSub: Subscription; + helpPanelOpen: boolean; + + constructor(private router: Router, + private setupWizardService: SetupWizardService + ) { } @@ -29,21 +34,23 @@ export class SetupWizardHelpPanelComponent { this.setHelpContext(event.urlAfterRedirects); } }); - this.collapseHelpPanel = this.localStorageDataService.setupHelpPanelCollapsed; + this.helpPanelOpenSub = this.setupWizardService.helpPanelOpen.subscribe(val => { + this.helpPanelOpen = val; + //needed to resize charts + setTimeout(() => { + window.dispatchEvent(new Event("resize")); + }, 100) + }); this.setHelpContext(this.router.url); } ngOnDestroy(){ this.routerSub.unsubscribe(); + this.helpPanelOpenSub.unsubscribe(); } toggleCollapseHelpPanel() { - this.collapseHelpPanel = !this.collapseHelpPanel; - this.localStorageDataService.setSetupPanelCollapsed(this.collapseHelpPanel); - //needed to resize charts - setTimeout(() => { - window.dispatchEvent(new Event("resize")); - }, 100) + this.emitToggleCollapse.emit(!this.helpPanelOpen); } setHelpContext(url: string) { diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css index ea0f755b..7cc785df 100644 --- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css +++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css @@ -1,65 +1,102 @@ -.navbar{ - width: 20rem; +.navbar { background-color: #ffffff; overflow-y: auto; - /* height: 100%; */ - /* max-height: 100%; */ flex-wrap: nowrap; } -.navbar.collapsed{ +.navbar.collapsed { width: auto; } -.nav-item{ +a.nav-link, .btn.btn-dark, .link-section-heading{ + display: inline-block; + line-height: normal; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; width: 100%; - font-size: large; } -.nav-item.section-header{ - font-size: x-large; + +.sidebar-container { + container-type: inline-size; } -.nav-link{ +.sidebar-content { + display: block; +} + +@container (max-width: 45px) { + .sidebar-content { + display: none; + } +} + +.nav-item .d-inline-block{ + line-height: normal; +} + + +/* Small devices (landscape phones, 576px and up) */ +@media (min-width: 576px) { + .nav-item { + font-size: small; + } +} + +/* Medium devices (tablets, 768px and up) */ +@media (min-width: 768px) { + .nav-item { + font-size: medium; + } +} +/* Large devices (tablets, 992px and up) */ +@media (min-width: 992px) { + .nav-item { + font-size: large; + } +} + + +.nav-link { padding-left: .5rem; } -.nav-link.secondary-nav{ +.nav-link.secondary-nav { padding-left: 1.5rem; } -.nav-link.third-nav{ - padding-left: 3rem; +.nav-link.third-nav { + padding-left: 2rem; } -.nav-link.active{ +.nav-link.active { background-color: var(--portfolio-nav-color); color: white; } -.nav-link:hover{ +.nav-link:hover { background-color: #8DABBE; color: black; } - -.text-end{ +.text-end { text-align: right; } -.toggle-collapse{ +.toggle-collapse { font-size: x-large; } -.toggle-collapse:hover{ +.toggle-collapse:hover { cursor: pointer; border: so; } -.btn.text-left{ +.btn.text-left { text-align: left; } -.nav-link:hover{ +.nav-link:hover { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.html b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.html index ab62342f..5349c1aa 100644 --- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.html +++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.html @@ -1,4 +1,4 @@ -
@@ -10,14 +10,14 @@
-
+
-
+
Company Setup
@@ -46,7 +46,7 @@
-
+
Facility Setup
@@ -81,11 +81,11 @@
-
+
-
+
-
+
-
- - - Return to Portfolio +
+
+ + + Return to Portfolio +
-
Go to Portfolio diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts index acebebff..018bb6a0 100644 --- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts +++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts @@ -20,7 +20,8 @@ describe('SetupWizardSidebarComponent', () => { let fixture: ComponentFixture; let setupWizardService: Partial = { - sidebarOpen: new BehaviorSubject(false) + sidebarOpen: new BehaviorSubject(true), + helpPanelOpen: new BehaviorSubject(true) }; let onSiteVisitIdbService: Partial = { selectedVisit: new BehaviorSubject(getNewIdbOnSiteVisit('', '', '')) diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts index a8483f5a..af88583f 100644 --- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts +++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { IconDefinition, faChevronDown, faChevronUp, faFolderOpen, faCircleExclamation, faChevronCircleRight, faChevronCircleLeft } from '@fortawesome/free-solid-svg-icons'; import { SetupWizardService } from '../setup-wizard.service'; @@ -11,7 +11,6 @@ import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service'; import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service'; import { IdbCompany } from 'src/app/models/company'; import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator'; -import { FormControl } from '@angular/forms'; @Component({ selector: 'app-setup-wizard-sidebar', @@ -19,6 +18,8 @@ import { FormControl } from '@angular/forms'; styleUrl: './setup-wizard-sidebar.component.css' }) export class SetupWizardSidebarComponent implements OnInit, OnDestroy { + @Output('emitToggleCollapse') + emitToggleCollapse: EventEmitter = new EventEmitter(); faFolderOpen: IconDefinition = faFolderOpen; faCircleExclamation: IconDefinition = faCircleExclamation; @@ -48,6 +49,7 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy { collapseDataEvaluation: boolean = true; routerSub: Subscription; + constructor(private router: Router, private setupWizardService: SetupWizardService, private onSiteVisitIdbService: OnSiteVisitIdbService, private assessmentIdbService: AssessmentIdbService, @@ -114,11 +116,11 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy { } confirmStartOver() { - this.router.navigateByUrl('/user/home'); + this.router.navigateByUrl('/portfolio'); } toggleSidebar() { - this.setupWizardService.sidebarOpen.next(!this.sidebarOpen); + this.emitToggleCollapse.emit(!this.sidebarOpen); } toggleCollapsePrevisit() { @@ -159,4 +161,5 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy { } } } + } diff --git a/src/app/setup-wizard/setup-wizard.component.css b/src/app/setup-wizard/setup-wizard.component.css index e69de29b..e0bb4911 100644 --- a/src/app/setup-wizard/setup-wizard.component.css +++ b/src/app/setup-wizard/setup-wizard.component.css @@ -0,0 +1,34 @@ + + +.resize-handle { + height: 100%; + + background-color: white; + /* width: 3px; */ + + /* position: absolute; + top: 0; + right: 0; */ + + cursor: ew-resize; + + /* these prevent text selection while dragging */ + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + transition: background-color 0.2s ease-out, width 0.2s ease-out; + + &:hover { + /* width: 3px; */ + background-color: rgb(93, 159, 235); + } + } + + + .main-content{ + overflow-y: auto; + } \ No newline at end of file diff --git a/src/app/setup-wizard/setup-wizard.component.html b/src/app/setup-wizard/setup-wizard.component.html index 4c3ee648..610fca29 100644 --- a/src/app/setup-wizard/setup-wizard.component.html +++ b/src/app/setup-wizard/setup-wizard.component.html @@ -1,13 +1,37 @@ -
- -
+
+
+
+ +
+
+
+
+ +
+
+
+
+
- +
+
+
+
+ +
+
+
+
+ +
+
\ No newline at end of file + [selectedContact]="displayContactModal.viewContact" + [companyGuid]="displayContactModal.companyId"> \ No newline at end of file diff --git a/src/app/setup-wizard/setup-wizard.component.ts b/src/app/setup-wizard/setup-wizard.component.ts index 79b02630..36cf0995 100644 --- a/src/app/setup-wizard/setup-wizard.component.ts +++ b/src/app/setup-wizard/setup-wizard.component.ts @@ -1,7 +1,9 @@ -import { Component } from '@angular/core'; +import { Component, ElementRef, HostListener, ViewChild } from '@angular/core'; import { SharedDataService } from '../shared/shared-services/shared-data.service'; import { Subscription } from 'rxjs'; import { ContactContext, IdbContact } from '../models/contact'; +import { SetupWizardService } from './setup-wizard.service'; +import { faGripLinesVertical, IconDefinition } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-setup-wizard', @@ -10,24 +12,116 @@ import { ContactContext, IdbContact } from '../models/contact'; }) export class SetupWizardComponent { + @ViewChild('pageContent', { static: false }) pageContent: ElementRef; + + faGripVertical: IconDefinition = faGripLinesVertical; displayContactModal: { context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string }; displayContactModalSub: Subscription; - constructor(private sharedDataService: SharedDataService) { + + sidebarWidth: number = 200; + helpWidth: number = 200; + contentWidth: number; + startingCursorX: number; + isDraggingSidebar: boolean = false; + isDraggingHelp: boolean = false; + sidebarCollapsed: boolean = false; + constructor(private sharedDataService: SharedDataService, + private setupWizardService: SetupWizardService + ) { } ngOnInit() { + this.sidebarWidth = this.setupWizardService.sidebarWidth; + this.helpWidth = this.setupWizardService.helpWidth; this.displayContactModalSub = this.sharedDataService.displayContactModal.subscribe(_displayContactModal => { this.displayContactModal = _displayContactModal; }); + this.setContentWidth(); } ngOnDestroy() { this.displayContactModalSub.unsubscribe(); + this.setupWizardService.sidebarWidth = this.sidebarWidth; + this.setupWizardService.helpWidth = this.helpWidth; } closeContactModal() { this.sharedDataService.displayContactModal.next(undefined); } + + startResizingSidebar(event: MouseEvent): void { + this.startingCursorX = event.clientX; + this.isDraggingSidebar = true; + } + + startResizingHelp(event: MouseEvent): void { + this.startingCursorX = event.clientX; + this.isDraggingHelp = true; + } + + stopResizing($event: MouseEvent) { + this.isDraggingSidebar = false; + this.isDraggingHelp = false; + } + + drag(event: MouseEvent) { + if (this.isDraggingSidebar) { + if (event.clientX > 50) { + this.sidebarWidth = event.clientX; + this.setupWizardService.sidebarOpen.next(true); + } else { + this.sidebarWidth = 50; + this.setupWizardService.sidebarOpen.next(false); + } + this.setContentWidth(); + } + if (this.isDraggingHelp) { + let helpWidth: number = (window.innerWidth - event.clientX) + if (helpWidth > 50) { + this.helpWidth = helpWidth; + this.setupWizardService.helpPanelOpen.next(true); + } else { + this.helpWidth = 50; + this.setupWizardService.helpPanelOpen.next(false); + } + this.setContentWidth(); + } + } + + + toggleCollapseSidebar(sidebarOpen: boolean) { + this.setupWizardService.sidebarOpen.next(sidebarOpen); + if (sidebarOpen) { + this.sidebarWidth = 200; + } else { + this.sidebarWidth = 50; + } + this.setContentWidth(); + } + + toggleCollapseHelp(helpPanelOpen: boolean) { + this.setupWizardService.helpPanelOpen.next(helpPanelOpen); + if (helpPanelOpen) { + this.helpWidth = 200; + } else { + this.helpWidth = 50; + } + this.setContentWidth(); + } + + setContentWidth() { + let contentWidth: number = (window.innerWidth - this.helpWidth - this.sidebarWidth); + if(contentWidth < 600){ + this.contentWidth = 600; + }else{ + this.contentWidth = contentWidth; + } + } + + @HostListener('window:resize', ['$event']) + onResize() { + this.setContentWidth(); + } } diff --git a/src/app/setup-wizard/setup-wizard.service.ts b/src/app/setup-wizard/setup-wizard.service.ts index 3fec30a6..0d302535 100644 --- a/src/app/setup-wizard/setup-wizard.service.ts +++ b/src/app/setup-wizard/setup-wizard.service.ts @@ -7,7 +7,11 @@ import { BehaviorSubject } from 'rxjs'; export class SetupWizardService { sidebarOpen: BehaviorSubject; + helpPanelOpen: BehaviorSubject; + helpWidth: number = 200; + sidebarWidth: number = 200; constructor( ) { this.sidebarOpen = new BehaviorSubject(true); + this.helpPanelOpen = new BehaviorSubject(true); } } \ No newline at end of file diff --git a/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.html b/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.html index e0d4eac7..91ceb28c 100644 --- a/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.html +++ b/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.html @@ -1,5 +1,5 @@
-
+
@@ -9,7 +9,7 @@
-
+
\ No newline at end of file diff --git a/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.ts b/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.ts index 61a45f00..955effcf 100644 --- a/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.ts +++ b/src/app/shared/reports/assessment-report/assessment-savings-chart/assessment-savings-chart.component.ts @@ -106,9 +106,11 @@ export class AssessmentSavingsChartComponent { } } - trace.values.push(this.assessmentReport.assessment.costSavings); - trace.labels.push('Assessment (Energy Cost) Savings'); - trace.marker.line.width.push(2) + if (this.assessmentReport.assessment.costSavings) { + trace.values.push(this.assessmentReport.assessment.costSavings); + trace.labels.push('Assessment (Energy Cost) Savings'); + trace.marker.line.width.push(2) + } this.assessmentReport.energyOpportunityReports.forEach(report => { if (report.totalEnergyCostSavings) { @@ -118,17 +120,21 @@ export class AssessmentSavingsChartComponent { } report.nebReports.forEach(nebReport => { - trace.labels.push(nebReport.nonEnergyBenefit.name) - trace.values.push(nebReport.totalCostSavings) - trace.marker.line.width.push(2) + if (nebReport.totalCostSavings) { + trace.labels.push(nebReport.nonEnergyBenefit.name) + trace.values.push(nebReport.totalCostSavings) + trace.marker.line.width.push(2) + } }) }) this.assessmentReport.assessmentNebReports.forEach(nebReport => { - trace.labels.push(nebReport.nonEnergyBenefit.name) - trace.values.push(nebReport.totalCostSavings) - trace.marker.line.width.push(2) + if (nebReport.totalCostSavings) { + trace.labels.push(nebReport.nonEnergyBenefit.name) + trace.values.push(nebReport.totalCostSavings) + trace.marker.line.width.push(2) + } }) var data = [trace]; diff --git a/src/app/shared/reports/assessment-report/assessment-savings-table/assessment-savings-table.component.css b/src/app/shared/reports/assessment-report/assessment-savings-table/assessment-savings-table.component.css index d9882b17..80ad94e2 100644 --- a/src/app/shared/reports/assessment-report/assessment-savings-table/assessment-savings-table.component.css +++ b/src/app/shared/reports/assessment-report/assessment-savings-table/assessment-savings-table.component.css @@ -1,3 +1,8 @@ .section-border{ border-top: solid 5px; +} + +.table td, .table th{ + padding: .25rem; + font-size: 14px; } \ No newline at end of file diff --git a/src/app/shared/reports/assessment-report/payback-table/payback-table.component.css b/src/app/shared/reports/assessment-report/payback-table/payback-table.component.css index 87ab978b..0a7f3ddc 100644 --- a/src/app/shared/reports/assessment-report/payback-table/payback-table.component.css +++ b/src/app/shared/reports/assessment-report/payback-table/payback-table.component.css @@ -1,4 +1,9 @@ th:not(:first-of-type), td:not(:first-of-type){ /* width: 25%; */ text-align: right; +} + +.table td, .table th{ + padding: .25rem; + font-size: 14px; } \ No newline at end of file diff --git a/src/app/shared/reports/on-site-visit-report/on-site-visit-payback-table/on-site-visit-payback-table.component.css b/src/app/shared/reports/on-site-visit-report/on-site-visit-payback-table/on-site-visit-payback-table.component.css index 87ab978b..0a7f3ddc 100644 --- a/src/app/shared/reports/on-site-visit-report/on-site-visit-payback-table/on-site-visit-payback-table.component.css +++ b/src/app/shared/reports/on-site-visit-report/on-site-visit-payback-table/on-site-visit-payback-table.component.css @@ -1,4 +1,9 @@ th:not(:first-of-type), td:not(:first-of-type){ /* width: 25%; */ text-align: right; +} + +.table td, .table th{ + padding: .25rem; + font-size: 14px; } \ No newline at end of file diff --git a/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.html b/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.html index dae7b076..20e9f457 100644 --- a/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.html +++ b/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.html @@ -1,6 +1,6 @@
-
+
Energy Opportunity Non-Energy Benefits
+
Energy Opportunity Non-Energy Benefits

The below are Non-Energy Benefits () that are associated with a specific energy efficiency opportunity within this diff --git a/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html index cdb1502b..5ebd4a7d 100644 --- a/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html +++ b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html @@ -2,9 +2,9 @@

- -
+
- -
+
- -
+ +
-
-
+
Invalid phone number: for US xxx-xxx-xxxx / for international +xxx xxxxxxxxxx @@ -40,8 +40,8 @@
- -
+ +
- -
+ +
@@ -64,8 +64,8 @@
- -
+ +
@@ -74,8 +74,8 @@
- -
+ +
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css index 7ac0aba9..71eb867a 100644 --- a/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css +++ b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css @@ -3,4 +3,18 @@ } hr{ margin: .25rem 0; +} + +.indicator-container { + container-type: inline-size; +} + +.badge-display { + display: block; +} + +@container (max-width: 350px) { + .badge-display { + display: none; + } } \ No newline at end of file diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html index a428a45b..bd64aa84 100644 --- a/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html +++ b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html @@ -27,7 +27,7 @@
-
@@ -35,7 +35,7 @@
-
+
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css index 00d71012..fc60f109 100644 --- a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css +++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css @@ -1,21 +1,35 @@ -.list-item{ +.list-item { /* border: solid 1px; padding: 2px; */ } -.click-link-danger{ +.click-link-danger { color: red; } -.click-link-danger:hover{ +.click-link-danger:hover { cursor: pointer; } -hr{ +hr { margin: .25rem 0; } -.click-link{ +.click-link { text-decoration: none; +} + +.indicator-container { + container-type: inline-size; +} + +.badge-display { + display: block; +} + +@container (max-width: 350px) { + .badge-display { + display: none; + } } \ No newline at end of file diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html index bda2b278..10f8b74a 100644 --- a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html +++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html @@ -17,7 +17,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
diff --git a/src/app/shared/shared-settings-forms/location-form/location-form.component.html b/src/app/shared/shared-settings-forms/location-form/location-form.component.html index c0e4f63a..deefcaa7 100644 --- a/src/app/shared/shared-settings-forms/location-form/location-form.component.html +++ b/src/app/shared/shared-settings-forms/location-form/location-form.component.html @@ -6,7 +6,7 @@ maxlength="60" id="address" name="address">
-
+
-
+
@@ -26,12 +26,12 @@
-
+
-
+
diff --git a/src/app/spec-helpers/spec-test-service-stub.ts b/src/app/spec-helpers/spec-test-service-stub.ts index 24619775..c8299bc6 100644 --- a/src/app/spec-helpers/spec-test-service-stub.ts +++ b/src/app/spec-helpers/spec-test-service-stub.ts @@ -31,6 +31,7 @@ import { KeyPerformanceIndicatorOption } from "../shared/constants/keyPerformanc import { SharedDataService } from "../shared/shared-services/shared-data.service"; import { CompanyContactsFormService } from "../shared/shared-company-forms/company-contacts-form/company-contacts-form.service"; import { FormControl, FormGroup } from "@angular/forms"; +import { LocalStorageService } from "ngx-webstorage"; let stubCompany: IdbCompany = getNewIdbCompany('123'); stubCompany.guid = '123'; @@ -97,7 +98,8 @@ let onSiteVisitIdbService: Partial = { }; let setupWizardService: Partial = { - sidebarOpen: new BehaviorSubject(true) + sidebarOpen: new BehaviorSubject(true), + helpPanelOpen: new BehaviorSubject(true) }; let option: KeyPerformanceIndicatorOption = @@ -159,6 +161,11 @@ let companyContactsFormService: Partial = { } } +let localStorageService: Partial = { + retrieve: () => { return undefined }, + store: () => { return undefined }, +}; + export const stubServiceProviders: Array<{ provide: any, useValue: any }> = [ { provide: CompanyIdbService, useValue: companyIdbService }, { provide: FacilityIdbService, useValue: facilityIdbService }, @@ -173,7 +180,7 @@ export const stubServiceProviders: Array<{ provide: any, useValue: any }> = [ { provide: EnergyEquipmentIdbService, useValue: energyEquipmentIdbService }, { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService }, { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactIdbService }, - { provide: LocalStorageDataService, useValue: {} }, + { provide: LocalStorageDataService, useValue: localStorageService }, { provide: SharedDataService, useValue: sharedDataService }, { provide: CompanyContactsFormService, useValue: companyContactsFormService }, { diff --git a/src/assets/styles/report.css b/src/assets/styles/report.css index 7d6bb28e..2d15a40a 100644 --- a/src/assets/styles/report.css +++ b/src/assets/styles/report.css @@ -15,4 +15,4 @@ table.ordered .ordered-th { table.ordered th:hover { cursor: pointer; -} \ No newline at end of file +}