Merge pull request #4302 from cisagov/feature/CSET-2929

Fixed answer labels on CMMC reports.
cisagov · Dec 18, 2024 · ae84b73 · ae84b73
2 parents 9f4e19f + 2976141
commit ae84b73
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 22 deletions.
diff --git a/CSETWebApi/CSETWebCore.AutoResponder/CSETWebCore.AutoResponder.csproj b/CSETWebApi/CSETWebCore.AutoResponder/CSETWebCore.AutoResponder.csproj
@@ -43,7 +43,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1001" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
   </ItemGroup>
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/CSETWebCore.Business.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/CSETWebCore.Business.csproj
@@ -128,7 +128,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.1" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/CSETWebCore.DatabaseManager.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/CSETWebCore.DatabaseManager.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="MartinCostello.SqlLocalDb" Version="3.4.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
   </ItemGroup>
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore.Helpers.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore.Helpers.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
   </ItemGroup>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.2" />
     <PackageReference Include="NLog.Database" Version="5.3.4" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
     <PackageReference Include="NodaTime" Version="3.2.0" />
     <PackageReference Include="Snickler.EFCore" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs
@@ -63,7 +63,7 @@ public IActionResult TestLogging([FromQuery] string text)
             var logToFile = LogManager.GetLogger("DBManager");
             logToFile.Info(text);
 
-            return Ok();
+            return Ok($"Complete at {DateTime.UtcNow} UTC");
         }
     }
 }
diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.html b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.html
@@ -43,9 +43,9 @@
     </div>
 
     <div class="d-block mb-2">
-      <h2>{{ pageTitle }}</h2>
+      <h3>{{ pageTitle }}</h3>
 
-      <h3>{{ groupingTitle }}</h3>
+      <h4>{{ groupingTitle }}</h4>
 
       <div class="mb-2" *ngIf="showTargetLevel">
         The target maturity level for this assessment is set to

diff --git a/CSETWebNg/src/app/assessment/results/crr/crr-results-page/crr-results-page.component.html b/CSETWebNg/src/app/assessment/results/crr/crr-results-page/crr-results-page.component.html
@@ -22,7 +22,7 @@
 -------------------------->
 <div class="assess-component d-flex flex-column justify-content-start flex-11a">
     <div class="white-panel d-flex flex-column justify-content-start flex-11a">
-        <h1 class="pageHeader">{{domain?.title}}</h1>
+        <h3>{{domain?.title}}</h3>
 
         <app-crr-heatmap [domainAbbrev]="domainAbbrev"></app-crr-heatmap>
 

diff --git a/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss b/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss
@@ -2315,7 +2315,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
@@ -2341,7 +2341,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss
@@ -2348,7 +2348,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss
@@ -2344,7 +2344,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
@@ -2349,7 +2349,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
@@ -2344,7 +2344,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
@@ -2099,7 +2099,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/styles-base.scss b/CSETWebNg/src/app/layout/styles-base.scss
@@ -2101,7 +2101,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
@@ -2296,7 +2296,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/reports/cmmc2/cmmc2-comments-marked/cmmc2-comments-marked.component.html b/CSETWebNg/src/app/reports/cmmc2/cmmc2-comments-marked/cmmc2-comments-marked.component.html
@@ -20,7 +20,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 -------------------------->
-<div class="container-fluid text-center max-w-75in" style="padding-top: 75px;">
+<div class="container-fluid text-center max-w-75in" style="padding-top: 75px;" *transloco="let t">
 
   <div class="navbar navbar-expand-lg fixed-top navbar-dark bg-dark border-bottom box-shadow mb-3">
     <div class="d-sm-inline-flex" style="margin-left: 15px; scroll-margin-top: 60px;">
@@ -101,7 +101,7 @@ <h3 *ngIf="matAnswer.mat.parent_Question_Id == null" class="small d-inline">Prac
               </div>
               <div class="col-2 text-start">
                 <p *ngIf="!matAnswer.isParentWithChildren">
-                  {{ getFullAnswerText(matAnswer.answer.answer_Text) }}
+                  {{t('answer-options.labels.' + matAnswer.answer.answer_Text.toLowerCase() + '-cmmc')}}
                 </p>
               </div>
               <div *ngIf="matAnswer.answer.mark_For_Review === true" class="col text-end">
@@ -172,7 +172,7 @@ <h3 *ngIf="matAnswer.mat.parent_Question_Id == null" class="small d-inline">Prac
               </div>
               <div class="col-2 text-start">
                 <p *ngIf="!matAnswer.isParentWithChildren">
-                  {{ getFullAnswerText(matAnswer.answer.answer_Text) }}
+                  {{t('answer-options.labels.' + matAnswer.answer.answer_Text.toLowerCase() + '-cmmc')}}
                 </p>
               </div>
               <div *ngIf="matAnswer.answer.mark_For_Review === true" class="col text-end">

diff --git a/CSETWebNg/src/sass/styles.scss b/CSETWebNg/src/sass/styles.scss
@@ -1842,7 +1842,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 1.8rem;
+  font-size: 1.5rem;
 }
 
 // Dashboard