diff --git a/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.html b/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.html index 0a6c653cd4..53237656b7 100644 --- a/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.html +++ b/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.html @@ -69,31 +69,31 @@

- + - + - + - + - + - + - +
Assessment Name:{{ 'assessment name' | transloco }}: {{response?.information?.assessment_Name}}
Assessment Date:{{ 'assessment date' | transloco }}: {{response?.information?.assessment_Date | date:'dd-MMM-yyyy'}}
Credit Union:{{ 'acet.credit union' | transloco }}: {{response?.information?.credit_Union_Name}}
City or Site Name:{{ 'city or site name' | transloco }}: {{response?.information?.city_Or_Site_Name}}
State, Province or Region:{{ 'state, province, or region' | transloco }}: {{response?.information?.state_Province_Or_Region}}
Charter:{{ 'acet.charter' | transloco }}: {{response?.information?.charter}}
Assets:{{ 'acet.assets' | transloco }}: {{response?.information?.assets | currency}}
@@ -101,7 +101,7 @@

- Maturity Detail + {{ 'maturity detail' | transloco }}

@@ -112,7 +112,7 @@

{{domain.domainName}}

- {{ domain.levelDisplay }}
+ {{ 'level.' + domain.levelDisplay.toLowerCase() | transloco }}
@@ -125,7 +125,7 @@

{{factor.assessmentFactor}}

- {{ factor.levelDisplay }}
+ {{ 'level.' + factor.levelDisplay.toLowerCase() | transloco }}
@@ -139,7 +139,7 @@

{{comp.name}}

- {{ comp.levelDisplay }}
+ {{ 'level.' + comp.levelDisplay.toLowerCase() | transloco }}
@@ -160,27 +160,27 @@

{{comp.name}}

- Inherent Risk Profile + {{ 'irp.inherent risk profile' | transloco }}

- Cybersecurity Maturity + {{ 'irp.cybersecurity maturity' | transloco }}

-

Domain +

{{ 'domain' | transloco }}

-

Maturity - Level

+

{{ 'maturity level' | transloco }} +

-

Target Percentage Achieved

+

{{ 'acet.target percentage achieved' | transloco }}

@@ -188,12 +188,12 @@

- Domain {{i+1}}: {{domainData.domainName}}

+ {{ 'domain' | transloco }} {{i+1}}: {{domainData.domainName}}

-

{{domainData.domainMaturity}}

+

{{ 'level.'+domainData.domainMaturity.toLowerCase() | transloco }}

diff --git a/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.ts b/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.ts index f1b1c2a485..b7f8576e89 100644 --- a/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.ts +++ b/CSETWebNg/src/app/reports/acet-executive/acet-executive.component.ts @@ -70,7 +70,15 @@ export class AcetExecutiveComponent implements OnInit { ngOnInit(): void { this.titleService.setTitle("Executive Report - ACET"); - // this.titleService.setTitle(this.tSvc.translate('reports.acet.executive summary.executive summary')); + if (this.tSvc.getActiveLang() == "es") { + this.sortDomainListKey = ["Gestión y Supervisión del Riesgo Cibernético", + "Inteligencia de Amenazas y Colaboración", + "Controles de Ciberseguridad", + "Gestión de Dependencia Externa", + "Gestión de Incidentes Cibernéticos y Resiliencia" + ]; + } + //this.titleService.setTitle(this.tSvc.translate('reports.acet.executive summary.page tab title')); this.getMatRange(); @@ -141,7 +149,6 @@ export class AcetExecutiveComponent implements OnInit { }) }) this.domainDataList = this.sortedDomainList; - }, error => { console.log('Error getting all documents: ' + (error).name + (error).message); @@ -152,6 +159,19 @@ export class AcetExecutiveComponent implements OnInit { (data: AcetDashboard) => { this.acetDashboard = data; + // Subtracts ISE irp answers from the ACET irp results so they don't mess things up. + let lastHeader = this.acetDashboard.irps.length - 1; + let iseRisk = this.acetDashboard.irps[lastHeader].riskCount; + let acetRisk = this.acetDashboard.sumRisk; + let result = acetRisk.map((item, index) => item - iseRisk[index]); + this.acetDashboard.sumRisk = result; + + let highest = Math.max(...this.acetDashboard.sumRisk); + let index = this.acetDashboard.sumRisk.indexOf(highest); + this.acetDashboard.sumRiskLevel = (index + 1); + + // Remove the ISE irp from ACET IRP's results table. + this.acetDashboard.irps.pop(); for (let i = 0; i < this.acetDashboard.irps.length; i++) { this.acetDashboard.irps[i].comment = this.acetSvc.interpretRiskLevel(this.acetDashboard.irps[i].riskLevel); } diff --git a/CSETWebNg/src/app/reports/irp/irp.component.html b/CSETWebNg/src/app/reports/irp/irp.component.html index 5d427ef8e0..983883fc43 100644 --- a/CSETWebNg/src/app/reports/irp/irp.component.html +++ b/CSETWebNg/src/app/reports/irp/irp.component.html @@ -20,21 +20,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------> -
+
-
Overall Risk Level is - {{ acetSvc.interpretRiskLevel(acetDashboard?.sumRiskLevel) }} +
{{ t('overall risk level is') }} + {{ acetSvc.interpretRiskLevel(acetDashboard?.sumRiskLevel).substring(0, 4) + + t(acetSvc.interpretRiskLevel(acetDashboard?.sumRiskLevel).substring(4).toLowerCase()) }}
- Overall Risk Level has not been overridden + {{ t('overall risk level has not been overridden') }}
- Overall Risk Level has been overriden to {{ - acetSvc.interpretRiskLevel(acetDashboard?.override) }} -
Override Reason: + {{ t('overall risk level has been overriden to') }} {{ + acetSvc.interpretRiskLevel(acetDashboard?.override).substring(0, 4) + + t(acetSvc.interpretRiskLevel(acetDashboard?.override).substring(4).toLowerCase()) }} +
{{ t('override reason') }}: {{ acetDashboard?.overrideReason }} diff --git a/CSETWebNg/src/assets/i18n/en.json b/CSETWebNg/src/assets/i18n/en.json index fba786da14..9d9272204d 100644 --- a/CSETWebNg/src/assets/i18n/en.json +++ b/CSETWebNg/src/assets/i18n/en.json @@ -20,6 +20,7 @@ "facility name": "Facility Name", "city or site name": "City or Site Name", "state province region": "State/Province/Region", + "state, province, or region": "State, Province, or Region", "assessment type": "Assessment Type", "demographics": "Demographics", "critical service name": "Critical Service Name", @@ -28,6 +29,7 @@ "requires review": "Requires Review", "domain": "Domain", "maturity level": "Maturity Level", + "maturity detail": "Maturity Detail", "no search results": "No items were found matching the search request.", "auto load guidance": "Auto-load Guidance", @@ -117,6 +119,7 @@ "assets": "Assets", "auto populate": "Auto-populated based on data provided", "target maturity range": "Target Maturity Range", + "target percentage achieved": "Target Percentage Achieved", "maturity results": "ACET Maturity Results", "actual level": "Actual Level", "assessment factor": "Assessment Factor", @@ -208,6 +211,8 @@ "totals": "Totals", "risk levels": "Risk Levels", "overall risk level is": "Overall Risk Level is", + "overall risk level has not been overridden": "Overall Risk Level has not been overridden", + "overall risk level has been overriden to": "Overall Risk Level has been overriden to", "override risk level": "Override Risk Level", "override risk level is": "Override Risk Level is", "override reason": "Override Reason", @@ -247,6 +252,7 @@ "acet reports": "ACET Reports", "executive summary": { "executive summary": "ACET Executive Summary", + "page tab title": "Executive Report - ACET", "executive summary title 1": "EXECUTIVE", "executive summary title 2": "SUMMARY", "site information": "Site Information" diff --git a/CSETWebNg/src/assets/i18n/es.json b/CSETWebNg/src/assets/i18n/es.json index cbf27db40b..ef87086f0d 100644 --- a/CSETWebNg/src/assets/i18n/es.json +++ b/CSETWebNg/src/assets/i18n/es.json @@ -18,12 +18,14 @@ "facility name": "Nombre de facilidad", "city or site name": "Nombre de ciudad o sitio", "state province region": "Estado/provincia/región", + "state, province, or region": "Estado, provincia, o región", "assessment type": "Tipo de evaluación", "demographics": "Demografía", "critical service name": "Nombre del servicio critíco", "critical service description": "Descripción del servicio critíco", "domain": "Dominio", "maturity level": "Nivel de madurez", + "maturity detail": "[ES] Maturity Detail", "no search results": "No se encontraron artículos que coincidan con la solicitud de búsqueda.", "auto load guidance": "Carga automática de guía", @@ -59,6 +61,7 @@ "assets": "Activos", "auto populate": "Auto-generado basado en los datos proporcionados.", "target maturity range": "Rango de madurez objetivo", + "target percentage achieved": "[ES] Target Percentage Achieved", "maturity results": "Resultados de madurez de ACET", "actual level": "Nivel actual", "assessment factor": "Factor de evaluación", @@ -200,6 +203,8 @@ "totals": "Totales", "risk levels": "Niveles de iesgo", "overall risk level is": "El nivel de riesgo general es", + "overall risk level has not been overridden": "[ES] Overall Risk Level has not been overridden", + "overall risk level has been overriden to": "[ES] Overall Risk Level has been overriden to", "override risk level": "Anular el nivel de riesgo", "override risk level is": "Anular el nivel de riesgo es", "override reason": "Anular el motivo", @@ -239,7 +244,11 @@ "acet": { "acet reports": "Los informes de ACET", "executive summary": { - "executive summary": "Resumen ejecutivo de ACET" + "executive summary": "Resumen ejecutivo de ACET", + "page tab title": "Executive Summary - ACET", + "executive summary title 1": "RESUMEN", + "executive summary title 2": "EJECUTIVO", + "site information": "[ES] Site Information" }, "gap report": { "gap report": "Informe de brechas de ACET",