diff --git a/CSETWebApi/CSETWebCore.AutoResponder/App_Data/assessmentFollowUpTemplate_CF.html b/CSETWebApi/CSETWebCore.AutoResponder/App_Data/assessmentFollowUpTemplate_CF.html index 6e29b16bde..511b249efa 100644 --- a/CSETWebApi/CSETWebCore.AutoResponder/App_Data/assessmentFollowUpTemplate_CF.html +++ b/CSETWebApi/CSETWebCore.AutoResponder/App_Data/assessmentFollowUpTemplate_CF.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -46,9 +49,15 @@

{{name}}

- Hello, thank you for participating in CyberSecureFlorida! We noticed that you have not yet completed your assessment and wanted to see if you were having technical difficulties, had a question, or needed assistance to complete your submission. If so, please contact us at secureflorida@cyberflorida.org, and a team member will respond. Note: this message is automated, and your information remains anonymous and secure. + Hello, thank you for participating in CyberSecureFlorida! We noticed that + you have not yet completed your assessment and wanted to see if you were + having technical difficulties, had a question, or needed assistance to + complete your submission. If so, please contact us at + secureflorida@cyberflorida.org, and a team member will respond. Note: this + message is automated, and your information remains anonymous and secure.

-

Click here to login to view your CSET assessment

+

Click here to login to view your + CSET assessment

Thanks,
The CSET Team @@ -57,7 +66,7 @@

- + {{email-footer-CF}} @@ -66,4 +75,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWebCore.AutoResponder/App_Data/weeklyTemplate_CF.html b/CSETWebApi/CSETWebCore.AutoResponder/App_Data/weeklyTemplate_CF.html index 05b54a9bbf..4242275221 100644 --- a/CSETWebApi/CSETWebCore.AutoResponder/App_Data/weeklyTemplate_CF.html +++ b/CSETWebApi/CSETWebCore.AutoResponder/App_Data/weeklyTemplate_CF.html @@ -1,7 +1,8 @@ - + + @@ -29,11 +31,12 @@ {{inline-stylesheet}} + - +
- +
- + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ACETDashboard/ACETDashboardBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ACETDashboard/ACETDashboardBusiness.cs index 5d8ca4a91e..3f60b8555e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ACETDashboard/ACETDashboardBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ACETDashboard/ACETDashboardBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -113,8 +113,8 @@ public int GetOverallIrpNumber(int assessmentId) public Model.Acet.ACETDashboard GetIrpCalculation(int assessmentId) { Model.Acet.ACETDashboard result = new Model.Acet.ACETDashboard(); - - + + // now just properties on an Assessment ASSESSMENTS assessment = _context.ASSESSMENTS.FirstOrDefault(a => a.Assessment_Id == assessmentId); if (assessment == null) { return null; } @@ -192,7 +192,7 @@ public Model.Acet.ACETDashboard GetIrpCalculation(int assessmentId) { _maturity.PersistMaturityLevel(assessmentId, result.SumRiskLevel); } - else + else { _maturity.PersistMaturityLevel(assessmentId, result.Override); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs index fde7df357a..37ef00cfce 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Acet/AcetBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -102,7 +102,7 @@ public int GetOverallIrpNumber(int assessmentId) public Model.Acet.ACETDashboard GetIrpCalculation(int assessmentId) { Model.Acet.ACETDashboard result = new Model.Acet.ACETDashboard(); - + // now just properties on an Assessment ASSESSMENTS assessment = _context.ASSESSMENTS.FirstOrDefault(a => a.Assessment_Id == assessmentId); if (assessment == null) { return null; } @@ -223,10 +223,10 @@ public static Dictionary buildQuestionDictionary() String defaultPath = "App_Data\\ACET Spanish Question Mapping.xlsx"; MemoryStream memStream = new MemoryStream(); - if(Path.Exists("..\\CSETWebCore.Business\\App_Data\\ACET Spanish Question Mapping.xlsx")) + if (Path.Exists("..\\CSETWebCore.Business\\App_Data\\ACET Spanish Question Mapping.xlsx")) { defaultPath = "..\\CSETWebCore.Business\\App_Data\\ACET Spanish Question Mapping.xlsx"; - } + } else if (!Path.Exists(defaultPath)) { return new Dictionary(); @@ -304,7 +304,7 @@ public static Dictionary buildGroupingDictionary() public static Dictionary buildResultsGroupingDictionary() { - + String defaultPath = "App_Data\\Spanish ACET Groupings.xlsx"; MemoryStream memStream = new MemoryStream(); if (Path.Exists("..\\CSETWebCore.Business\\App_Data\\Spanish ACET Groupings.xlsx")) @@ -410,7 +410,7 @@ public static Dictionary buildIRPHeaderDictionary() var rowCount = myExcelObjects.Count; var dict = new Dictionary(); - + foreach (RowInfo item in myExcelObjects) { try diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AdminTab/AdminTabBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AdminTab/AdminTabBusiness.cs index 0353a57858..8ecf241aef 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AdminTab/AdminTabBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AdminTab/AdminTabBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationBusiness.cs index 244964b923..fd66d5a798 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -68,7 +68,7 @@ public AggregationBusiness(CSETContext context) myAllowedAggregIDs.Add(agg.AggregationID); } - return l.OrderBy(x => x.AggregationDate).ToList(); + return l.OrderBy(x => x.AggregationDate).ToList(); } @@ -169,9 +169,9 @@ public int SaveAggregationInformation(int aggregationId, CSETWebCore.Model.Aggre /// public void DeleteAggregation(int aggregationId) { - _context.AGGREGATION_ASSESSMENT.RemoveRange( - _context.AGGREGATION_ASSESSMENT.Where(x => x.Aggregation_Id == aggregationId) - ); + _context.AGGREGATION_ASSESSMENT.RemoveRange( + _context.AGGREGATION_ASSESSMENT.Where(x => x.Aggregation_Id == aggregationId) + ); _context.AGGREGATION_INFORMATION.RemoveRange( _context.AGGREGATION_INFORMATION.Where(x => x.AggregationID == aggregationId) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationMaturityBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationMaturityBusiness.cs index a11b838797..c23d55e0fd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationMaturityBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Aggregation/AggregationMaturityBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -135,7 +135,7 @@ public List GetMaturityModels(int aggId) } // Restructure the data into chart.js format - + foreach (var m in modelList) { var c = new BarChartX(); @@ -145,7 +145,8 @@ public List GetMaturityModels(int aggId) c.Labels = m.Categories.Select(x => x.CategoryTitle).ToList(); // sort assessment datasets by alias - assessments.OrderBy(x => x.Alias).ToList().ForEach(a => { + assessments.OrderBy(x => x.Alias).ToList().ForEach(a => + { if (datasetDict.ContainsKey($"{m.ModelName} {a.Assessment_Id}")) { c.Datasets.Add(datasetDict[$"{m.ModelName} {a.Assessment_Id}"]); @@ -260,5 +261,5 @@ public class Assessment - + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Analytics/AnalyticsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Analytics/AnalyticsBusiness.cs index b4b95c7349..4507e54adb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Analytics/AnalyticsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Analytics/AnalyticsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -16,7 +16,7 @@ namespace CSETWebCore.Business.Analytics { - public class AnalyticsBusiness: IAnalyticsBusiness + public class AnalyticsBusiness : IAnalyticsBusiness { private CSETContext _context; @@ -25,28 +25,28 @@ public AnalyticsBusiness(CSETContext context) _context = context; } - - + + public List getMaturityDashboardData(int maturity_model_id, int? sectorId, int? industryId) { - // var minMax = _context.analytics_Compute_MaturityAll(maturity_model_id,sectorId,industryId).ToList(); + // var minMax = _context.analytics_Compute_MaturityAll(maturity_model_id,sectorId,industryId).ToList(); // var median = _context.analytics_Compute_MaturityAll_Median(maturity_model_id).ToList(); // var rvalue = from a in minMax join b in median on a.Title equals b.Title // select new DataRowsAnalytics() { title=a.Title, avg=(int)a.avg,max=(int)a.max,min=(int)a.min,median=b.median}; // return rvalue.ToList(); - return _context.analytics_Compute_MaturityAll(maturity_model_id,sectorId,industryId).ToList(); + return _context.analytics_Compute_MaturityAll(maturity_model_id, sectorId, industryId).ToList(); } public List GetMaturityGroupsForAssessment(int assessmentId, int maturity_model_id) { - return _context.analytics_compute_single_averages_maturity(assessmentId,maturity_model_id).ToList(); + return _context.analytics_compute_single_averages_maturity(assessmentId, maturity_model_id).ToList(); } public List GetStandardSingleAvg(int assessmentId, string set_name) { - return _context.analytics_compute_single_averages_standard(assessmentId,set_name).ToList(); + return _context.analytics_compute_single_averages_standard(assessmentId, set_name).ToList(); } - - public List GetStandardList(int assessmentId) + + public List GetStandardList(int assessmentId) { // var resultsList = from standards in _context.AVAILABLE_STANDARDS // join sets in _context.SETS @@ -59,7 +59,7 @@ public List GetStandardList(int assessmentId) public List GetStandardMinMaxAvg(int assessmentId, string setname, int? sectorId, int? industryId) { - var minmaxavg = _context.analytics_Compute_standard_all(assessmentId,setname, sectorId, industryId); + var minmaxavg = _context.analytics_Compute_standard_all(assessmentId, setname, sectorId, industryId); return minmaxavg.ToList(); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_ACET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_ACET.html index 7e6fcc181e..6229e91485 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_ACET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_ACET.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -47,11 +50,13 @@

{{name}}

You have been invited to participate in a CSET assessment. -

- {{body}} -
+
+ {{body}} +

-

Click here to view your ACET assessment

+

Click here to view + your ACET assessment

Thanks,
The ACET Team @@ -69,4 +74,5 @@

- + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CF.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CF.html index 60ea63a349..4eb3356ab7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CF.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CF.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -47,11 +50,13 @@

{{name}}

You have been invited to participate in a CSET assessment. -

- {{body}} -
+
+ {{body}} +

-

Click here to view your CSET assessment

+

Click here to view + your CSET assessment

Thanks,
The CSET Team @@ -60,7 +65,7 @@

- + {{email-footer-CF}} @@ -69,4 +74,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CSET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CSET.html index a9b4e3de3a..33042d28ec 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CSET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_CSET.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -47,9 +50,9 @@

{{name}}

You have been invited to participate in a CSET assessment. -

- {{body}} -
+
+ {{body}} +

@@ -71,4 +74,5 @@

- + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_RRA.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_RRA.html index df4f6a9c2c..7ff6627c81 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_RRA.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_RRA.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -47,11 +50,13 @@

{{name}}

You have been invited to participate in a CSET assessment. -

- {{body}} -
+
+ {{body}} +

-

Click here to view your Ransomware Readiness Assessment

+

Click here to view + your Ransomware Readiness Assessment

Thanks,
The RRA Team @@ -60,7 +65,7 @@

- + {{email-footer}} @@ -69,4 +74,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_TSA.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_TSA.html index 1ef14373e2..6fa16ed2fe 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_TSA.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/assessmentInviteTemplate_TSA.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + @@ -47,9 +50,9 @@

{{name}}

You have been invited to participate in a CSET-TSA assessment. -

- {{body}} -
+
+ {{body}} +

@@ -71,4 +74,5 @@

- + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_ACET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_ACET.html index 35da803d67..54922a7c9c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_ACET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_ACET.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -51,7 +54,8 @@

You were recently invited to participate in a ACET assessment. Use the temporary one-time password below to login and reset your password. - This temporary password is only valid for the next 24 hours. + This temporary password is only valid for the next 24 + hours.

@@ -70,8 +74,11 @@
-

If you are having trouble with the password above, please contact support or retry to reset your password from the ACET website.

-

Click here to login

+

If you are having trouble with the password above, + please contact support or retry to reset your password from the + ACET website.

+

Click here + to login
@@ -88,4 +95,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CF.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CF.html index fccb7e0125..629de07fc3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CF.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CF.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -51,7 +54,8 @@

You were recently invited to participate in a CSET assessment. Use the temporary one-time password below to login and reset your password. - This temporary password is only valid for the next 24 hours. + This temporary password is only valid for the next 24 + hours.

@@ -70,8 +74,11 @@
-

If you are having trouble with the password above, please contact support or retry to reset your password from the CSET website.

-

Click here to login

+

If you are having trouble with the password above, + please contact support or retry to reset your password from the + CSET website.

+

Click here + to login
@@ -88,4 +95,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CSET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CSET.html index 3f00f09f82..b4ad02913b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CSET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_CSET.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -51,7 +54,8 @@

You were recently invited to participate in a CSET assessment. Use the temporary one-time password below to login and reset your password. - This temporary password is only valid for the next 24 hours. + This temporary password is only valid for the next 24 + hours.

@@ -70,8 +74,11 @@
-

If you are having trouble with the password above, please contact support or retry to reset your password from the CSET website.

-

Click here to login

+

If you are having trouble with the password above, + please contact support or retry to reset your password from the + CSET website.

+

Click here + to login
@@ -88,4 +95,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_RRA.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_RRA.html index 4bda6b1d4d..e21aeeb8d1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_RRA.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_RRA.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -49,9 +52,11 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_TSA.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_TSA.html index d86aeb5d24..f76fe24f91 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_TSA.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/invitedPasswordCreationTemplate_TSA.html @@ -1,7 +1,8 @@ - + + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -51,7 +54,8 @@

You were recently invited to participate in a CSET-TSA assessment. Use the temporary one-time password below to login and reset your password. - This temporary password is only valid for the next 24 hours. + This temporary password is only valid for the next 24 + hours.

@@ -70,8 +74,11 @@
-

If you are having trouble with the password above, please contact support or retry to reset your password from the CSET-TSA website.

-

Click here to login

+

If you are having trouble with the password above, + please contact support or retry to reset your password from the + CSET-TSA website.

+

Click here + to login
@@ -88,4 +95,5 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordCreationTemplate_ACET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordCreationTemplate_ACET.html index e40887e089..d7c8a275cb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordCreationTemplate_ACET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordCreationTemplate_ACET.html @@ -1,7 +1,8 @@ - + +--------------------------> + @@ -29,6 +31,7 @@ {{inline-stylesheet}} + Use this temporary password to login. @@ -36,7 +39,7 @@ - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_ACET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_ACET.html index b50c85fa30..42534b746a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_ACET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_ACET.html @@ -1,7 +1,8 @@ - + +--------------------------> + Set up a new password for ACET - + {{inline-stylesheet}} + - Use this temporary password to login and reset your password. The link is only valid for 24 hours. + Use this temporary password to login and reset your password. The link is only valid for 24 + hours. - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CF.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CF.html index 98472f5d89..378bac0cdb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CF.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CF.html @@ -1,7 +1,8 @@ - + + @@ -29,8 +31,10 @@ {{inline-stylesheet}} + - Use this temporary password to login and reset your password. The link is only valid for 24 hours. + Use this temporary password to login and reset your password. The link is only valid for 24 + hours. - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CSET.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CSET.html index 93bfaacce7..f248d0c7b7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CSET.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_CSET.html @@ -1,7 +1,8 @@ - + + @@ -29,8 +31,10 @@ {{inline-stylesheet}} + - Use this temporary password to login and reset your password. The link is only valid for 24 hours. + Use this temporary password to login and reset your password. The link is only valid for 24 + hours. - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_TSA.html b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_TSA.html index 9d6224f4ff..797cd75b4c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_TSA.html +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/App_Data/passwordResetTemplate_TSA.html @@ -1,7 +1,8 @@ - + + @@ -29,8 +31,10 @@ {{inline-stylesheet}} + - Use this temporary password to login and reset your password. The link is only valid for 24 hours. + Use this temporary password to login and reset your password. The link is only valid for 24 + hours. - + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs index f5a09f06c4..6f4d31dcc2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/ACETAssessmentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -95,7 +95,7 @@ public ACETAssessmentBusiness(IHttpContextAccessor httpContext, ITokenManager au detail.AssessmentName = "ACET 00000 " + DateTime.Now.ToString("MMddyy"); base.SaveAssessmentDetail(detail.Id, detail); - if(UsesIRP(config.Model.ModelName)) + if (UsesIRP(config.Model.ModelName)) { CreateIrpHeaders(detail.Id); } @@ -126,7 +126,7 @@ public void CreateIrpHeaders(int assessmentId) foreach (IRP_HEADER header in _context.IRP_HEADER) { IRPSummary summary = new IRPSummary(); - summary.HeaderText = header.Header; + summary.HeaderText = header.Header; summary.RiskLevel = 0; ASSESSMENT_IRP_HEADER headerInfo = new ASSESSMENT_IRP_HEADER() @@ -134,7 +134,7 @@ public void CreateIrpHeaders(int assessmentId) RISK_LEVEL = 0, IRP_HEADER = header }; - headerInfo.ASSESSMENT_ID = assessmentId; + headerInfo.ASSESSMENT_ID = assessmentId; if (_context.ASSESSMENT_IRP_HEADER.Count() == 0) { headerInfo.HEADER_RISK_LEVEL_ID = header.IRP_Header_Id; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs index 4b05d82bbc..d50f38624b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -335,11 +335,11 @@ public AnalyticsAssessment GetAnalyticsAssessmentDetail(int assessmentId) /// /// /// - public AssessmentDetail GetAssessmentDetail(Guid assessmentGuid) - { + public AssessmentDetail GetAssessmentDetail(Guid assessmentGuid) + { var assessment = _context.ASSESSMENTS.FirstOrDefault(assessment => assessment.Assessment_GUID == assessmentGuid); - - if (assessment == null) + + if (assessment == null) { return null; } @@ -617,7 +617,7 @@ public int SaveAssessmentDetail(int assessmentId, AssessmentDetail assessment) dbAssessment.UseMaturity = assessment.UseMaturity; dbAssessment.UseStandard = assessment.UseStandard; - dbAssessment.Charter = "00000"; + dbAssessment.Charter = "00000"; dbAssessment.Assets = assessment.Assets.ToString(); dbAssessment.Diagram_Markup = assessment.DiagramMarkup; dbAssessment.Diagram_Image = assessment.DiagramImage; @@ -673,8 +673,8 @@ public int SaveAssessmentDetail(int assessmentId, AssessmentDetail assessment) } // No user is null here if accesskey login is used - if (user != null) - { + if (user != null) + { AssessmentNaming.ProcessName(_context, user.UserId, assessmentId); } _assessmentUtil.TouchAssessment(assessmentId); @@ -683,7 +683,7 @@ public int SaveAssessmentDetail(int assessmentId, AssessmentDetail assessment) } - + /// /// Get all organization types @@ -891,7 +891,7 @@ public void SaveOtherRemarks(int assessmentId, string remark) public void clearFirstTime(int userid, int assessment_id) { var us = _context.USERS.Where(x => x.UserId == userid).FirstOrDefault(); - if(us != null) + if (us != null) { us.IsFirstLogin = false; _context.SaveChanges(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentMode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentMode.cs index 85b6d44032..ccfbe0e8cc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentMode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentMode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -55,7 +55,7 @@ public AssessmentMode(CSETContext context, ITokenManager tokenManager) - + public bool IsRequirement { get { return (standard.Application_Mode.Equals(REQUIREMENTS_BASED_APPLICATION_MODE)); } } public bool IsQuestion { get { return (standard.Application_Mode.Equals(QUESTIONS_BASED_APPLICATION_MODE)); } } public bool IsFramework { get { return (standard.Application_Mode.Equals(NIST_FRAMEWORK_MODE)); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/StandardsResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/StandardsResponse.cs index 83d92d621d..8c832a8a43 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/StandardsResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/StandardsResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs index 48d3ea6576..f22dac3597 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -44,7 +44,7 @@ public AssessmentExportManager(CSETContext context) private void SetupBindings() { - + TinyMapper.Bind(); TinyMapper.Bind(); TinyMapper.Bind(); @@ -116,8 +116,8 @@ private UploadAssessmentModel CopyForExport(int assessmentId) var model = new UploadAssessmentModel(); foreach (var item in _context.ANSWER_PROFILE.Where(x => x.Asessment_Id == assessmentId)) { - model.jANSWER_PROFILE.Add(TinyMapper.Map(item)); - + model.jANSWER_PROFILE.Add(TinyMapper.Map(item)); + } foreach (var item in _context.CIS_CSI_ORGANIZATION_DEMOGRAPHICS.Where(x => x.Assessment_Id == assessmentId)) @@ -161,7 +161,7 @@ private UploadAssessmentModel CopyForExport(int assessmentId) model.jDEMOGRAPHIC_ANSWERS.Add(TinyMapper.Map(item)); } - foreach (var item in _context.DETAILS_DEMOGRAPHICS.Where(x => x.Assessment_Id == assessmentId)) + foreach (var item in _context.DETAILS_DEMOGRAPHICS.Where(x => x.Assessment_Id == assessmentId)) { model.jDETAILS_DEMOGRAPHICS.Add(TinyMapper.Map(item)); } @@ -187,7 +187,7 @@ private UploadAssessmentModel CopyForExport(int assessmentId) { model.jREPORT_OPTIONS_SELECTION.Add(TinyMapper.Map(item)); } - + foreach (var item in _context.ASSESSMENTS.Where(x => x.Assessment_Id == assessmentId)) { model.jASSESSMENTS.Add(TinyMapper.Map(item)); @@ -197,7 +197,7 @@ private UploadAssessmentModel CopyForExport(int assessmentId) foreach (var item in _context.ASSESSMENT_CONTACTS.Where(x => x.Assessment_Id == assessmentId)) { - model.jASSESSMENT_CONTACTS.Add(TinyMapper.Map(item)); + model.jASSESSMENT_CONTACTS.Add(TinyMapper.Map(item)); } foreach (var accessKey in _context.ACCESS_KEY_ASSESSMENT.Where(x => x.Assessment_Id == assessmentId)) { @@ -210,13 +210,13 @@ private UploadAssessmentModel CopyForExport(int assessmentId) .Include(x => x.HYDRO_DATA_ACTIONS) .Where(x => x.Assessment_Id == assessmentId)) { - model.jANSWER.Add(TinyMapper.Map(item)); + model.jANSWER.Add(TinyMapper.Map(item)); if (item.HYDRO_DATA_ACTIONS != null) { model.jHYDRO_DATA_ACTIONS.Add(TinyMapper.Map(item.HYDRO_DATA_ACTIONS)); } - + foreach (var f in item.FINDING) { var obs = TinyMapper.Map(f); @@ -224,7 +224,7 @@ private UploadAssessmentModel CopyForExport(int assessmentId) foreach (var fc in f.FINDING_CONTACT) { - model.jFINDING_CONTACT.Add(TinyMapper.Map(fc)); + model.jFINDING_CONTACT.Add(TinyMapper.Map(fc)); } foreach (var action in f.ISE_ACTIONS_FINDINGS) @@ -239,47 +239,47 @@ private UploadAssessmentModel CopyForExport(int assessmentId) foreach (var item in _context.ASSESSMENT_SELECTED_LEVELS.Where(x => x.Assessment_Id == assessmentId)) { - model.jASSESSMENT_SELECTED_LEVELS.Add(TinyMapper.Map(item)); + model.jASSESSMENT_SELECTED_LEVELS.Add(TinyMapper.Map(item)); } foreach (var item in _context.AVAILABLE_STANDARDS.Where(x => x.Assessment_Id == assessmentId)) { - model.jAVAILABLE_STANDARDS.Add(TinyMapper.Map(item)); + model.jAVAILABLE_STANDARDS.Add(TinyMapper.Map(item)); } foreach (var item in _context.CNSS_CIA_JUSTIFICATIONS.Where(x => x.Assessment_Id == assessmentId)) { - model.jCNSS_CIA_JUSTIFICATIONS.Add(TinyMapper.Map(item)); + model.jCNSS_CIA_JUSTIFICATIONS.Add(TinyMapper.Map(item)); } foreach (var item in _context.CSET_VERSION) { - model.jCSET_VERSION.Add(TinyMapper.Map(item)); + model.jCSET_VERSION.Add(TinyMapper.Map(item)); } - + foreach (var item in _context.CUSTOM_BASE_STANDARDS) { - model.jCUSTOM_BASE_STANDARDS.Add(TinyMapper.Map(item)); + model.jCUSTOM_BASE_STANDARDS.Add(TinyMapper.Map(item)); } foreach (var item in _context.CUSTOM_QUESTIONAIRES) { - model.jCUSTOM_QUESTIONAIRES.Add(TinyMapper.Map(item)); + model.jCUSTOM_QUESTIONAIRES.Add(TinyMapper.Map(item)); } foreach (var item in _context.CUSTOM_QUESTIONAIRE_QUESTIONS) { - model.jCUSTOM_QUESTIONAIRE_QUESTIONS.Add(TinyMapper.Map(item)); + model.jCUSTOM_QUESTIONAIRE_QUESTIONS.Add(TinyMapper.Map(item)); } foreach (var item in _context.DEMOGRAPHICS.Where(x => x.Assessment_Id == assessmentId)) { - model.jDEMOGRAPHICS.Add(TinyMapper.Map(item)); + model.jDEMOGRAPHICS.Add(TinyMapper.Map(item)); } foreach (var item in _context.DOCUMENT_FILE.Include(x => x.DOCUMENT_ANSWERS).ThenInclude(x => x.Answer).Where(x => x.Assessment_Id == assessmentId)) { - model.jDOCUMENT_FILE.Add(TinyMapper.Map(item)); + model.jDOCUMENT_FILE.Add(TinyMapper.Map(item)); foreach (var a in item.ANSWERs(_context)) { model.jDOCUMENT_ANSWERS.Add(new jDOCUMENT_ANSWERS() @@ -292,12 +292,12 @@ private UploadAssessmentModel CopyForExport(int assessmentId) foreach (var item in _context.FRAMEWORK_TIER_TYPE_ANSWER.Where(x => x.Assessment_Id == assessmentId)) { - model.jFRAMEWORK_TIER_TYPE_ANSWER.Add(TinyMapper.Map(item)); + model.jFRAMEWORK_TIER_TYPE_ANSWER.Add(TinyMapper.Map(item)); } foreach (var item in _context.INFORMATION.Where(x => x.Id == assessmentId)) { - var oInfo = TinyMapper.Map(item); + var oInfo = TinyMapper.Map(item); oInfo.Assessment_Date = assessmentDate; oInfo.Baseline_Assessment_Id = null; oInfo.Submitted_Date = item.Submitted_Date; @@ -307,12 +307,12 @@ private UploadAssessmentModel CopyForExport(int assessmentId) foreach (var item in _context.NIST_SAL_INFO_TYPES.Where(x => x.Selected == true && x.Assessment_Id == assessmentId)) { - model.jNIST_SAL_INFO_TYPES.Add(TinyMapper.Map(item)); + model.jNIST_SAL_INFO_TYPES.Add(TinyMapper.Map(item)); } foreach (var item in _context.NIST_SAL_QUESTION_ANSWERS.Where(x => x.Assessment_Id == assessmentId)) { - model.jNIST_SAL_QUESTION_ANSWERS.Add(TinyMapper.Map(item)); + model.jNIST_SAL_QUESTION_ANSWERS.Add(TinyMapper.Map(item)); } var parameterslist = from a in _context.ASSESSMENTS @@ -322,68 +322,68 @@ join p in _context.PARAMETER_VALUES on an.Answer_Id equals p.Answer_Id select p; foreach (var item in parameterslist.Where(x => x.Parameter_Is_Default == false)) { - model.jPARAMETER_VALUES.Add(TinyMapper.Map(item)); + model.jPARAMETER_VALUES.Add(TinyMapper.Map(item)); } foreach (var item in _context.PARAMETER_ASSESSMENT.Where(x => x.Assessment_ID == assessmentId)) { - model.jPARAMETER_ASSESSMENTs.Add(TinyMapper.Map(item)); + model.jPARAMETER_ASSESSMENTs.Add(TinyMapper.Map(item)); } foreach (var item in _context.STANDARD_SELECTION.Where(x => x.Assessment_Id == assessmentId)) { - model.jSTANDARD_SELECTION.Add(TinyMapper.Map(item)); + model.jSTANDARD_SELECTION.Add(TinyMapper.Map(item)); } foreach (var item in _context.GENERAL_SAL.Where(x => x.Assessment_Id == assessmentId)) { - model.jGENERAL_SAL.Add(TinyMapper.Map(item)); + model.jGENERAL_SAL.Add(TinyMapper.Map(item)); } foreach (var item in _context.SUB_CATEGORY_ANSWERS.Where(x => x.Assessement_Id == assessmentId)) { - model.jSUB_CATEGORY_ANSWERS.Add(TinyMapper.Map(item)); + model.jSUB_CATEGORY_ANSWERS.Add(TinyMapper.Map(item)); } // NCUA data foreach (var item in _context.FINANCIAL_HOURS.Where(x => x.Assessment_Id == assessmentId)) { - model.jFINANCIAL_HOURS.Add(TinyMapper.Map(item)); + model.jFINANCIAL_HOURS.Add(TinyMapper.Map(item)); } foreach (var item in _context.FINANCIAL_ASSESSMENT_VALUES.Where(x => x.Assessment_Id == assessmentId)) { - model.jFINANCIAL_ASSESSMENT_VALUES.Add(TinyMapper.Map(item)); + model.jFINANCIAL_ASSESSMENT_VALUES.Add(TinyMapper.Map(item)); } foreach (var item in _context.ASSESSMENTS_REQUIRED_DOCUMENTATION.Where(x => x.Assessment_Id == assessmentId)) { - model.jASSESSMENTS_REQUIRED_DOCUMENTATION.Add(TinyMapper.Map(item)); + model.jASSESSMENTS_REQUIRED_DOCUMENTATION.Add(TinyMapper.Map(item)); } foreach (var item in _context.ASSESSMENT_IRP_HEADER.Where(x => x.ASSESSMENT_ID == assessmentId)) { - model.jASSESSMENT_IRP_HEADER.Add(TinyMapper.Map(item)); + model.jASSESSMENT_IRP_HEADER.Add(TinyMapper.Map(item)); } foreach (var item in _context.ASSESSMENT_IRP.Where(x => x.Assessment_Id == assessmentId)) { - model.jASSESSMENT_IRP.Add(TinyMapper.Map(item)); + model.jASSESSMENT_IRP.Add(TinyMapper.Map(item)); } foreach (var item in _context.ASSESSMENT_DIAGRAM_COMPONENTS.Where(x => x.Assessment_Id == assessmentId)) { - model.jASSESSMENT_DIAGRAM_COMPONENTS.Add(TinyMapper.Map(item)); + model.jASSESSMENT_DIAGRAM_COMPONENTS.Add(TinyMapper.Map(item)); } foreach (var item in _context.DIAGRAM_CONTAINER.Where(x => x.Assessment_Id == assessmentId)) { - model.jDIAGRAM_CONTAINER.Add(TinyMapper.Map(item)); + model.jDIAGRAM_CONTAINER.Add(TinyMapper.Map(item)); } foreach (var item in _context.AVAILABLE_MATURITY_MODELS.Where(x => x.Assessment_Id == assessmentId)) { - model.jAVAILABLE_MATURITY_MODELS.Add(TinyMapper.Map(item)); + model.jAVAILABLE_MATURITY_MODELS.Add(TinyMapper.Map(item)); } return model; } @@ -506,7 +506,7 @@ join nqs in _context.NEW_QUESTION_SETS on nq.Question_Id equals nqs.Question_Id /// If not empty, this password will be required to import the assessment /// An optional password hint /// An AssessmentExportFile object containing the file name and the file contents - public AssessmentExportFile ExportAssessment(int assessmentId, string fileExtension, string password = "", string passwordHint = "") + public AssessmentExportFile ExportAssessment(int assessmentId, string fileExtension, string password = "", string passwordHint = "") { // determine file name var fileName = $"{assessmentId}{fileExtension}"; @@ -527,7 +527,7 @@ public AssessmentExportFile ExportAssessment(int assessmentId, string fileExtens /// Array of assessment guids to export /// The extension of the export files /// - public MemoryStream BulkExportAssessmentsbyGuid(Guid[] guids, string fileExtension) + public MemoryStream BulkExportAssessmentsbyGuid(Guid[] guids, string fileExtension) { var archiveStream = new MemoryStream(); @@ -535,13 +535,13 @@ public MemoryStream BulkExportAssessmentsbyGuid(Guid[] guids, string fileExtensi var exportAssessments = _context.ASSESSMENTS.Where(a => guids.Contains(a.Assessment_GUID)).ToList(); // Assessments with provided guids do not exist. - if (exportAssessments.IsNullOrEmpty()) + if (exportAssessments.IsNullOrEmpty()) { return null; } // Zip all the assessments into one archive. - using (var archive = new ZipFile()) + using (var archive = new ZipFile()) { // export the assessments foreach (ASSESSMENTS a in exportAssessments) @@ -550,13 +550,13 @@ public MemoryStream BulkExportAssessmentsbyGuid(Guid[] guids, string fileExtensi int duplicateCounter = 1; // Handle collision cases where assessments have the same name, zip entries must be different. - while (archive.ContainsEntry(exportFile.FileName)) + while (archive.ContainsEntry(exportFile.FileName)) { if (duplicateCounter == 1) { exportFile.FileName = exportFile.FileName.Insert(exportFile.FileName.IndexOf(fileExtension), $" ({duplicateCounter})"); } - else + else { exportFile.FileName = exportFile.FileName.Replace($"({duplicateCounter - 1}){fileExtension}", $"({duplicateCounter}){fileExtension}"); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/AwwaSheetConfig.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/AwwaSheetConfig.cs index 8d22c11977..3a3cb7fbb9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/AwwaSheetConfig.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/AwwaSheetConfig.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -94,8 +94,8 @@ private void GetSheetConfig(SpreadsheetDocument doc) private static Regex controlParse = new Regex("([A-Z]{2,3}-[0-9]{1,2})(.+)"); - - + + /// /// /// @@ -109,7 +109,7 @@ internal String GetControlId(string controltmpId) if (this.MustParse) { Match m = controlParse.Match(controltmpId); - if(m.Success) + if (m.Success) return m.Groups[1].Value; return null; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/BulkSqlUpload.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/BulkSqlUpload.cs index d8504627b3..ee73f9b223 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/BulkSqlUpload.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/BulkSqlUpload.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_0_to_09_0_1_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_0_to_09_0_1_Upgrade.cs index d47c608453..dbbc64908e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_0_to_09_0_1_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_0_to_09_0_1_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_1_to_09_2_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_1_to_09_2_Upgrade.cs index bb6395f475..bd4d8a62d7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_1_to_09_2_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_0_1_to_09_2_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,7 +8,7 @@ using Newtonsoft.Json.Linq; namespace CSETWebCore.Business.AssessmentIO.Import -{ +{ internal class CSET_09_0_1_to_09_2_Upgrade : ICSETJSONFileUpgrade { /// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_0_to_09_2_1_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_0_to_09_2_1_Upgrade.cs index 9b0dbcbad6..b100e895fb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_0_to_09_2_1_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_0_to_09_2_1_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_1_to_09_2_2_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_1_to_09_2_2_Upgrade.cs index 99e38d8bc7..c61e26a2cd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_1_to_09_2_2_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_1_to_09_2_2_Upgrade.cs @@ -1,12 +1,12 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// namespace CSETWebCore.Business.AssessmentIO.Import -{ +{ internal class CSET_09_2_1_to_09_2_2_Upgrade : ICSETJSONFileUpgrade { /// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_2_to_09_2_3_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_2_to_09_2_3_Upgrade.cs index f4f6ee0c87..bebf36cd4a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_2_to_09_2_3_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_2_to_09_2_3_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_3_to_10_0_0_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_3_to_10_0_0_Upgrade.cs index fe928e64ab..4cbefcb8c9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_3_to_10_0_0_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_09_2_3_to_10_0_0_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_0_to_10_0_1_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_0_to_10_0_1_Upgrade.cs index e9563fe4bf..63a7d4e1fd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_0_to_10_0_1_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_0_to_10_0_1_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_1_to_10_1_0_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_1_to_10_1_0_Upgrade.cs index 2c11293ebf..04a5ae040b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_1_to_10_1_0_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_0_1_to_10_1_0_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_0_to_10_1_1_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_0_to_10_1_1_Upgrade.cs index 296888faf2..920d96913d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_0_to_10_1_1_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_0_to_10_1_1_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_1_to_10_2_0_Upgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_1_to_10_2_0_Upgrade.cs index 21adc9b71f..e2f854cd3c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_1_to_10_2_0_Upgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/CSET_10_1_1_to_10_2_0_Upgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/GenericImporter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/GenericImporter.cs index 8294193542..3a8ec17556 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/GenericImporter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/GenericImporter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -242,7 +242,7 @@ private Tuple UpdateDatabaseRow(JToken jRow, XmlElement xTable) if (ruleIgnoreIfExists != null) { bool columnValueExists = CheckColumnValueExistence(colName, tableName, jRow, dbio); - if (columnValueExists) + if (columnValueExists) { continue; } @@ -333,8 +333,8 @@ private bool CheckColumnValueExistence(string colName, string tableName, JToken " where {0} = '{2}'"; DataTable dt = dbio.Select(string.Format(query, colName, tableName, jObj[colName]), null); - if (dt.Rows.Count > 0) - { + if (dt.Rows.Count > 0) + { return true; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ICSETJSONFileUpgrade.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ICSETJSONFileUpgrade.cs index af410579cc..ad60fb1750 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ICSETJSONFileUpgrade.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ICSETJSONFileUpgrade.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -16,6 +16,6 @@ interface ICSETJSONFileUpgrade { string ExecuteUpgrade(string json); - System.Version GetVersion(); + System.Version GetVersion(); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManager.cs index f284f5ac13..768d66f5e0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -67,11 +67,12 @@ public async Task ProcessCSETAssessmentImport(byte[] zipFileFromDatabase, int? c if (password == "" || password == null) { e.Extract(ms); - } else + } + else { e.ExtractWithPassword(ms, password); } - + ms.Position = 0; StreamReader sr = new StreamReader(ms); string jsonObject = sr.ReadToEnd(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerACET.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerACET.cs index 86a1fcc501..5e0ab6dd5b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerACET.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerACET.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs index 6f283eaf40..c4b6127fd6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportUpgradeManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportUpgradeManager.cs index fbbfbfa774..856618e1ef 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportUpgradeManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportUpgradeManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs index b428a17a67..e5f205424e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -100,9 +100,9 @@ public int RunImportManualPortion(bool overwriteAssessment) { detail = _assessmentBiz.GetAssessmentDetail(_model.jASSESSMENTS.FirstOrDefault().Assessment_GUID); } - + if (detail == null) - { + { detail = _assessmentBiz.CreateNewAssessmentForImport(_currentUserId, _accessKey); } @@ -113,7 +113,7 @@ public int RunImportManualPortion(bool overwriteAssessment) Dictionary oldUserNewUser = _context.USERS.ToDictionary(x => x.PrimaryEmail, y => y.UserId); - foreach(var a in _model.jASSESSMENTS) + foreach (var a in _model.jASSESSMENTS) { var item = _context.ASSESSMENTS.Where(x => x.Assessment_Id == assessmentId).FirstOrDefault(); if (item != null) @@ -155,12 +155,12 @@ public int RunImportManualPortion(bool overwriteAssessment) dictAC.Add(a.Assessment_Contact_Id, newPrimaryContact.Assessment_Contact_Id); continue; } - + var item = TinyMapper.Map(a); item.Assessment_Id = assessmentId; item.PrimaryEmail = a.PrimaryEmail; - - if (a?.PrimaryEmail != null + + if (a?.PrimaryEmail != null && oldUserNewUser.TryGetValue(a.PrimaryEmail, out int userid)) { item.UserId = userid; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/IImportAssessmentRule.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/IImportAssessmentRule.cs index 736d24c2b7..1bb6da0680 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/IImportAssessmentRule.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/IImportAssessmentRule.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/SubCategoryLookupRule.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/SubCategoryLookupRule.cs index 3d7e56af8a..0ddeadcbbc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/SubCategoryLookupRule.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/customRules/SubCategoryLookupRule.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -34,7 +34,7 @@ private string DataExceptions(string value) string newValue; if (String.IsNullOrWhiteSpace(value)) return value; - if(oldToNewValues.TryGetValue(value, out newValue)) + if (oldToNewValues.TryGetValue(value, out newValue)) { return newValue; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/AllGeneralJsonModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/AllGeneralJsonModels.cs index dd139425aa..b3c749429c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/AllGeneralJsonModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/AllGeneralJsonModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -692,7 +692,7 @@ public class jDEMOGRAPHICS public string CriticalService { get; set; } } - public class jDETAILS_DEMOGRAPHICS + public class jDETAILS_DEMOGRAPHICS { [Required] public Int32 Assessment_Id { get; set; } @@ -1028,7 +1028,7 @@ public class jCOUNTY_ANSWERS [Required] public int Assessment_Id { get; set; } [Required] - public string County_FIPS{ get; set;} + public string County_FIPS { get; set; } } public class jCSAF_FILE @@ -1073,7 +1073,7 @@ public class jNETWORK_WARNINGS public int Assessment_Id { get; set; } [Required] public int Id { get; set; } - + public string WarningText { get; set; } } public class jREGION_ANSWERS diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/UploadAssessmentModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/UploadAssessmentModel.cs index c7b15a5e2b..f316c663ba 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/UploadAssessmentModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_10.1/UploadAssessmentModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -47,9 +47,9 @@ public class UploadAssessmentModel public List jDETAILS_DEMOGRAPHICS { get; set; } public List jPARAMETER_VALUES { get; set; } public List jPARAMETER_ASSESSMENTs { get; set; } - + public List jFINDING_CONTACT { get; set; } - public List jUSER_DETAIL_INFORMATION {get;set;} + public List jUSER_DETAIL_INFORMATION { get; set; } public List jFINANCIAL_HOURS { get; set; } public List jFINANCIAL_ASSESSMENT_VALUES { get; set; } @@ -133,7 +133,7 @@ public UploadAssessmentModel() this.jPARAMETER_ASSESSMENTs = new List(); this.jSTANDARD_SELECTION = new List(); this.jSUB_CATEGORY_ANSWERS = new List(); - this.jUSER_DETAIL_INFORMATION = new List(); + this.jUSER_DETAIL_INFORMATION = new List(); this.CustomStandardDocs = new List(); this.CustomStandards = new List(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/AllGeneralJsonModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/AllGeneralJsonModels.cs index e2d39427dd..0dc3527f6e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/AllGeneralJsonModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/AllGeneralJsonModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/UploadAssessmentModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/UploadAssessmentModel.cs index 40bec490bb..3a71591c0f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/UploadAssessmentModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0.1/UploadAssessmentModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -29,7 +29,7 @@ public class UploadAssessmentModel public List jFRAMEWORK_TIER_TYPE_ANSWER { get; set; } public List jSUB_CATEGORY_ANSWERS { get; set; } public List jASSESSMENT_CONTACTS { get; set; } - + public List jFINDING { get; set; } public List jANSWER { get; set; } public List jNIST_SAL_INFO_TYPES { get; set; } @@ -40,9 +40,9 @@ public class UploadAssessmentModel public List jDEMOGRAPHICS { get; set; } public List jPARAMETER_VALUES { get; set; } public List jPARAMETER_ASSESSMENTs { get; set; } - + public List jFINDING_CONTACT { get; set; } - public List jUSER_DETAIL_INFORMATION {get;set;} + public List jUSER_DETAIL_INFORMATION { get; set; } public List jFINANCIAL_HOURS { get; set; } public List jFINANCIAL_ASSESSMENT_VALUES { get; set; } @@ -86,7 +86,7 @@ public UploadAssessmentModel() this.jPARAMETER_ASSESSMENTs = new List(); this.jSTANDARD_SELECTION = new List(); this.jSUB_CATEGORY_ANSWERS = new List(); - this.jUSER_DETAIL_INFORMATION = new List(); + this.jUSER_DETAIL_INFORMATION = new List(); this.CustomStandardDocs = new List(); this.CustomStandards = new List(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/AllGeneralJsonModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/AllGeneralJsonModels.cs index 16aeb74d2a..c160c54cc5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/AllGeneralJsonModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/AllGeneralJsonModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/UploadAssessmentModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/UploadAssessmentModel.cs index 7303e57843..e6fc020ec7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/UploadAssessmentModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.0/UploadAssessmentModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -33,7 +33,7 @@ public class UploadAssessmentModel public List jFRAMEWORK_TIER_TYPE_ANSWER { get; set; } public List jSUB_CATEGORY_ANSWERS { get; set; } public List jASSESSMENT_CONTACTS { get; set; } - + public List jFINDING { get; set; } public List jANSWER { get; set; } public List jNIST_SAL_INFO_TYPES { get; set; } @@ -44,9 +44,9 @@ public class UploadAssessmentModel public List jDEMOGRAPHICS { get; set; } public List jPARAMETER_VALUES { get; set; } public List jPARAMETER_ASSESSMENTs { get; set; } - + public List jFINDING_CONTACT { get; set; } - public List jUSER_DETAIL_INFORMATION {get;set;} + public List jUSER_DETAIL_INFORMATION { get; set; } public List CustomStandards { get; set; } public List CustomStandardDocs { get; set; } public UploadAssessmentModel() @@ -54,7 +54,7 @@ public UploadAssessmentModel() this.jADDRESS = new List(); this.jANSWER = new List(); this.jASSESSMENTS = new List(); - this.jASSESSMENT_CONTACTS = new List(); + this.jASSESSMENT_CONTACTS = new List(); this.jASSESSMENT_SELECTED_LEVELS = new List(); this.jAVAILABLE_STANDARDS = new List(); this.jCNSS_CIA_JUSTIFICATIONS = new List(); @@ -77,7 +77,7 @@ public UploadAssessmentModel() this.jPARAMETER_ASSESSMENTs = new List(); this.jSTANDARD_SELECTION = new List(); this.jSUB_CATEGORY_ANSWERS = new List(); - this.jUSER_DETAIL_INFORMATION = new List(); + this.jUSER_DETAIL_INFORMATION = new List(); this.CustomStandardDocs = new List(); this.CustomStandards = new List(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/AllGeneralJsonModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/AllGeneralJsonModels.cs index b45982e78b..55c6e366df 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/AllGeneralJsonModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/AllGeneralJsonModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/UploadAssessmentModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/UploadAssessmentModel.cs index 095f288a79..012f99c054 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/UploadAssessmentModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Models/Version_9.2/UploadAssessmentModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -31,7 +31,7 @@ public class UploadAssessmentModel public List jFRAMEWORK_TIER_TYPE_ANSWER { get; set; } public List jSUB_CATEGORY_ANSWERS { get; set; } public List jASSESSMENT_CONTACTS { get; set; } - + public List jFINDING { get; set; } public List jANSWER { get; set; } public List jNIST_SAL_INFO_TYPES { get; set; } @@ -42,9 +42,9 @@ public class UploadAssessmentModel public List jDEMOGRAPHICS { get; set; } public List jPARAMETER_VALUES { get; set; } public List jPARAMETER_ASSESSMENTs { get; set; } - + public List jFINDING_CONTACT { get; set; } - public List jUSER_DETAIL_INFORMATION {get;set;} + public List jUSER_DETAIL_INFORMATION { get; set; } public List jFINANCIAL_HOURS { get; set; } public List jFINANCIAL_ASSESSMENT_VALUES { get; set; } @@ -92,7 +92,7 @@ public UploadAssessmentModel() this.jPARAMETER_ASSESSMENTs = new List(); this.jSTANDARD_SELECTION = new List(); this.jSUB_CATEGORY_ANSWERS = new List(); - this.jUSER_DETAIL_INFORMATION = new List(); + this.jUSER_DETAIL_INFORMATION = new List(); this.CustomStandardDocs = new List(); this.CustomStandards = new List(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/ApiKeyAuthorize.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/ApiKeyAuthorize.cs index da9a6cd2f8..759c3cd7af 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/ApiKeyAuthorize.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/ApiKeyAuthorize.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -26,8 +26,8 @@ public void OnAuthorization(AuthorizationFilterContext context) return; } - if (!apiKeyManager.IsValidApiKey(apiKey)) - { + if (!apiKeyManager.IsValidApiKey(apiKey)) + { context.Result = new UnauthorizedResult(); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/CsetAuthorize.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/CsetAuthorize.cs index 305c3898e2..9456c5085c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/CsetAuthorize.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Authorization/CsetAuthorize.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -22,7 +22,7 @@ public class CsetAuthorize : Attribute, IAuthorizationFilter { public void OnAuthorization(AuthorizationFilterContext context) { - if (SkipAuthorization(context)) + if (SkipAuthorization(context)) { return; } @@ -49,7 +49,7 @@ public void OnAuthorization(AuthorizationFilterContext context) { tokenString = authHeaderValue[0]; } - + if (string.IsNullOrEmpty(tokenString) || !token.IsTokenValid(tokenString)) { context.Result = new UnauthorizedResult(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Common/HtmlFromXamlConverter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Common/HtmlFromXamlConverter.cs index 8570090d08..99f9ab0a1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Common/HtmlFromXamlConverter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Common/HtmlFromXamlConverter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -46,7 +46,7 @@ public string ConvertXamlToHtml(string xamlString) return htmlString; } - + /// /// Processes a root level element of XAML (normally it's FlowDocument element). /// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Contact/ContactBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Contact/ContactBusiness.cs index 6be742e774..411d85a987 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Contact/ContactBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Contact/ContactBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Conversion/ConversionBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Conversion/ConversionBusiness.cs index 025194ae3d..c30988353b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Conversion/ConversionBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Conversion/ConversionBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -75,7 +75,7 @@ public void ConvertCF(int assessmentId) { // Delete the "CF RRA" submodel record. This will have the effect of looking // at the entire RRA model. - var cfRraRecord = _context.DETAILS_DEMOGRAPHICS.FirstOrDefault(x => + var cfRraRecord = _context.DETAILS_DEMOGRAPHICS.FirstOrDefault(x => x.Assessment_Id == assessmentId && x.DataItemName == "MATURITY-SUBMODEL" && x.StringValue == "RRA CF"); if (cfRraRecord != null) { @@ -92,11 +92,11 @@ public void ConvertCF(int assessmentId) _context.AVAILABLE_STANDARDS.Remove(availStandard); - var newAvailStandard = new AVAILABLE_STANDARDS() + var newAvailStandard = new AVAILABLE_STANDARDS() { Assessment_Id = assessmentId, Selected = true, - Set_Name = CF_SetName + Set_Name = CF_SetName }; _context.AVAILABLE_STANDARDS.Add(newAvailStandard); @@ -110,6 +110,6 @@ public void ConvertCF(int assessmentId) _context.SaveChanges(); _assessmentUtil.TouchAssessment(assessmentId); - } + } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Dashboard/DashboardBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Dashboard/DashboardBusiness.cs index e913380c86..b3af83af94 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Dashboard/DashboardBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Dashboard/DashboardBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -29,7 +29,7 @@ public class DashboardBusiness : IDashboardBusiness private const string IndustryAverageName = "Industry Average"; private const string SectorAverageName = "Sector Average"; private const string MyAssesmentAverageName = "Assessment Average"; - public int sectorId; + public int sectorId; private readonly CSETContext _context; public DashboardBusiness(CSETContext context) @@ -40,20 +40,20 @@ public DashboardBusiness(CSETContext context) public List getMaturityDashboardData(int maturity_model_id, int? sectorId, int? industryId) { var minMax = _context.analytics_Compute_MaturityAll(maturity_model_id, sectorId, industryId); - var median = from a in minMax - join b in _context.analytics_Compute_MaturityAll_Median(maturity_model_id) - on a.Question_Group_Heading equals b.Question_Group_Heading - select new AnalyticsMinMaxAvgMedianByGroup() { min=a.min, max=a.max, avg=a.avg,median=b.median, Question_Group_Heading=a.Question_Group_Heading }; - return median.ToList(); - - + var median = from a in minMax + join b in _context.analytics_Compute_MaturityAll_Median(maturity_model_id) + on a.Question_Group_Heading equals b.Question_Group_Heading + select new AnalyticsMinMaxAvgMedianByGroup() { min = a.min, max = a.max, avg = a.avg, median = b.median, Question_Group_Heading = a.Question_Group_Heading }; + return median.ToList(); + + } - + private Series GetSectorAnalytics(int sector_id) { var assessments = (from a in _context.ASSESSMENTS.AsQueryable() - join dd in _context.DEMOGRAPHICS.AsQueryable() on a.Assessment_Id equals dd.Assessment_Id + join dd in _context.DEMOGRAPHICS.AsQueryable() on a.Assessment_Id equals dd.Assessment_Id where dd.SectorId == sector_id select a).ToList(); var query = (from a in assessments.AsQueryable() @@ -187,14 +187,14 @@ into g public async Task> GetSectors() { - + var List = new List(); var result = await _context.SECTOR.ToListAsync(); //var query = from sector in _context.SECTOR // select sector; - foreach(var sector in result) + foreach (var sector in result) { var sectorindustryList = new SectorIndustryVM(); //this.sectorId = sector.SectorId; @@ -208,16 +208,16 @@ public async Task> GetSectors() } List.Add(sectorindustryList); } - + return List; } - + public void GetSelectedIndustryList(ref SectorIndustryVM sectorindustryList) { var id = sectorindustryList.SectorId; - var industryList = _context.SECTOR_INDUSTRY.Where(x => x.SectorId == id).ToList(); - + var industryList = _context.SECTOR_INDUSTRY.Where(x => x.SectorId == id).ToList(); + foreach (var s in industryList) { sectorindustryList.Industries.Add(s.IndustryName); @@ -248,7 +248,7 @@ orderby an.Question_Group_Heading public DashboardGraphData GetDashboardData(string selectedSector) { var getMedian = _context.analytics_getMedianOverall().ToList(); - var sectorIndustryMinMax = _context.analytics_getMinMaxAverageForSectorIndustryGroup(15,67); + var sectorIndustryMinMax = _context.analytics_getMinMaxAverageForSectorIndustryGroup(15, 67); var rawdata = _context.usp_GetRawCountsForEachAssessment_Standards().ToList(); //var myAssessmentsdata = rawdata.Find(x => x.Assessment_Id == int.Parse(assessmentId)); var sectorIndustry = selectedSector.Split('|'); @@ -260,7 +260,7 @@ public DashboardGraphData GetDashboardData(string selectedSector) graphData.Min = new List(); graphData.Max = new List(); graphData.Median = new List(); - + foreach (var a in rawdata) { @@ -269,25 +269,25 @@ public DashboardGraphData GetDashboardData(string selectedSector) statistics.Add(new CategoryStatistics { AssessmentId = a.Assessment_Id.ToString(), - CategoryName =a.Question_Group_Heading, - AnsweredYes=a.Answer_Count, - NormalizedYes= a.Percentage, - Total= categoryList.Count() - }) ; + CategoryName = a.Question_Group_Heading, + AnsweredYes = a.Answer_Count, + NormalizedYes = a.Percentage, + Total = categoryList.Count() + }); graphData.BarData.Values.Add(a.Percentage); graphData.Max.Add(new ScatterPlot { x = 100, y = a.ToString() }); graphData.Min.Add(new ScatterPlot { x = 0, y = a.Answer_Text.ToString() }); //graphData.BarData.Labels.Add(a.Question_Group_Heading); } - + var organizelist = categoryList.Distinct(); graphData.sampleSize = assessments.Distinct().Count(); foreach (var c in organizelist) { graphData.BarData.Labels.Add(c); - + //var statByCat = statistics.Where(x => x.CategoryName == c).ToList(); //var min = statByCat.MinBy(x => x.NormalizedYes).Take(1); ////graphData.Min.Add(new ScatterPlot { x = min.NormalizedYes, y = c }); @@ -295,13 +295,13 @@ public DashboardGraphData GetDashboardData(string selectedSector) //{ x = Math.Round(GetMedian(statByCat.Select(x => x.NormalizedYes).ToList()), 1), y = c }); } - foreach(var m in getMedian) + foreach (var m in getMedian) { - graphData.Median.Add(new MedianScatterPlot { x= m.Median , y=m.Percentage.ToString()}); - + graphData.Median.Add(new MedianScatterPlot { x = m.Median, y = m.Percentage.ToString() }); + //graphData.BarData.Values.Add(new MedianScatterPlot { x = m.Mediam, y = m.Percentage.ToString() }); } - + return graphData; } @@ -318,7 +318,7 @@ public double GetMedian(List answers) return median; } - + } internal class QuickSum diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/CisDemographicBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/CisDemographicBusiness.cs index e22f30b344..396de6e383 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/CisDemographicBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/CisDemographicBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -112,9 +112,9 @@ public int SaveServiceDemographics(CisServiceDemographics serviceDemographics, i _context.CIS_CSI_SERVICE_DEMOGRAPHICS.Update(dbServiceDemographics); _context.SaveChanges(); serviceDemographics.AssessmentId = dbServiceDemographics.Assessment_Id; - AssessmentNaming.ProcessName(_context, userid , serviceDemographics.AssessmentId); + AssessmentNaming.ProcessName(_context, userid, serviceDemographics.AssessmentId); _assessmentUtil.TouchAssessment(dbServiceDemographics.Assessment_Id); - + return serviceDemographics.AssessmentId; } @@ -149,7 +149,7 @@ public int SaveServiceComposition(CisServiceComposition serviceComposition) // Removing un selected secondary defining systems foreach (var item in currentSecondaryDefiningSystems) { - if (!serviceComposition.SecondaryDefiningSystems.Contains(item.Defining_System_Id)) + if (!serviceComposition.SecondaryDefiningSystems.Contains(item.Defining_System_Id)) { _context.CIS_CSI_SERVICE_COMPOSITION_SECONDARY_DEFINING_SYSTEMS.Remove(currentSecondaryDefiningSystems.Find(x => x.Defining_System_Id == item.Defining_System_Id)); } @@ -158,7 +158,7 @@ public int SaveServiceComposition(CisServiceComposition serviceComposition) // Adding newly selected secondary defining systems foreach (var systemId in serviceComposition.SecondaryDefiningSystems) { - if (!currentSecondaryDefiningSystems.Exists(x => x.Defining_System_Id == systemId)) + if (!currentSecondaryDefiningSystems.Exists(x => x.Defining_System_Id == systemId)) { _context.CIS_CSI_SERVICE_COMPOSITION_SECONDARY_DEFINING_SYSTEMS.Add( new CIS_CSI_SERVICE_COMPOSITION_SECONDARY_DEFINING_SYSTEMS @@ -168,7 +168,7 @@ public int SaveServiceComposition(CisServiceComposition serviceComposition) }); } } - + _context.CIS_CSI_SERVICE_COMPOSITION.Update(dbServiceComposition); _context.SaveChanges(); serviceComposition.AssessmentId = dbServiceComposition.Assessment_Id; @@ -254,7 +254,7 @@ public CisServiceComposition GetServiceComposition(int assessmentId) var dbServiceComposition = _context.CIS_CSI_SERVICE_COMPOSITION.Where(x => x.Assessment_Id == assessmentId).FirstOrDefault(); var dbSecondaryDefiningSystems = _context.CIS_CSI_SERVICE_COMPOSITION_SECONDARY_DEFINING_SYSTEMS.Where(x => x.Assessment_Id == assessmentId).ToList(); - if (dbServiceComposition != null) + if (dbServiceComposition != null) { serviceComposition.NetworksDescription = dbServiceComposition.Networks_Description; serviceComposition.ServicesDescription = dbServiceComposition.Services_Description; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs index 82a8d19114..1d4d1d6915 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -225,7 +225,7 @@ public int SaveDemographics(Model.Demographic.ExtendedDemographic demographics) { dbDemog = new DEMOGRAPHIC_ANSWERS() { - Assessment_Id = demographics.AssessmentId + Assessment_Id = demographics.AssessmentId }; _context.DEMOGRAPHIC_ANSWERS.Add(dbDemog); _context.SaveChanges(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/Diagram.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/Diagram.cs index 5b37291044..fa2d8f83d8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/Diagram.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/Diagram.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -14,7 +14,7 @@ namespace CSETWebCore.Business.Diagram public class Diagram { public Dictionary NetworkComponents { get; set; } - + public Dictionary Layers { get; private set; } public Dictionary Zones { get; private set; } public Dictionary OldParentIds { get; internal set; } @@ -23,14 +23,14 @@ public class Diagram public Diagram() { - NetworkComponents = new Dictionary(); + NetworkComponents = new Dictionary(); Layers = new Dictionary(); Zones = new Dictionary(); } internal IEnumerable getParentChanges() - { - return NetworkComponents.Values.Where(x => x.ParentChanged); + { + return NetworkComponents.Values.Where(x => x.ParentChanged); } internal IEnumerable getParentChangesZones() diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferenceManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferenceManager.cs index 06cfb312b4..762176d4e2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferenceManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferenceManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -193,7 +193,7 @@ public void SaveDifferences(int assessment_id, bool refreshQuestions) z.Universal_Sal_Level = zone.Value.SAL; z.Name = zone.Value.ComponentName; } - } + } context.SaveChanges(); LayerManager layers = new LayerManager(context, assessment_id); @@ -225,7 +225,7 @@ public void SaveDifferences(int assessment_id, bool refreshQuestions) Zone_Id = null }; context.ASSESSMENT_DIAGRAM_COMPONENTS.Add(adc); - } + } } context.SaveChanges(); @@ -234,10 +234,11 @@ public void SaveDifferences(int assessment_id, bool refreshQuestions) //save all containers, layers, and nodes //then go find and assign zone and layer var updateList = from a in context.ASSESSMENT_DIAGRAM_COMPONENTS select a; - //join b in newDiagram.NetworkComponents on a.Component_Guid equals b.Key - //select new { a, b }; + //join b in newDiagram.NetworkComponents on a.Component_Guid equals b.Key + //select new { a, b }; var updateListPair = from a in updateList.ToList() - join b in newDiagram.NetworkComponents on a.Component_Guid equals b.Key select new { a, b }; + join b in newDiagram.NetworkComponents on a.Component_Guid equals b.Key + select new { a, b }; foreach (var pair in updateListPair.ToList()) { pair.a.Component_Symbol_Id = pair.b.Value.Component_Symbol_Id; @@ -415,7 +416,7 @@ private Dictionary ProcessNodes(XmlNodeList cells) throw new Exception("Unrecognized component: " + cell.OuterXml); } NetworkComponent tmp; - if(nodesList.TryGetValue(cn.ComponentGuid, out tmp)) + if (nodesList.TryGetValue(cn.ComponentGuid, out tmp)) { if (cn.Equals(tmp)) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferences.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferences.cs index e28383a728..8cf6cb8e06 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferences.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramDifferences.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,16 +12,16 @@ namespace CSETWebCore.Business.Diagram { public class DiagramDifferences { - public Dictionary AddedNodes { get; set; } - public Dictionary DeletedNodes { get; set; } - public Dictionary AddedContainers { get; set; } + public Dictionary AddedNodes { get; set; } + public Dictionary DeletedNodes { get; set; } + public Dictionary AddedContainers { get; set; } public Dictionary DeletedLayers { get; set; } public Dictionary DeletedZones { get; set; } public DiagramDifferences() { - AddedNodes = new Dictionary(); - DeletedNodes = new Dictionary(); + AddedNodes = new Dictionary(); + DeletedNodes = new Dictionary(); } /// @@ -31,11 +31,11 @@ public DiagramDifferences() /// public void processComparison(Diagram newDiagram, Diagram oldDiagram) { - + this.AddedNodes = lookupValue(newDiagram.NetworkComponents, oldDiagram.NetworkComponents); this.DeletedNodes = lookupValue(oldDiagram.NetworkComponents, newDiagram.NetworkComponents); - this.AddedContainers = processLayers(newDiagram.Layers,oldDiagram.Layers); - this.DeletedLayers = processLayers(oldDiagram.Layers, newDiagram.Layers); + this.AddedContainers = processLayers(newDiagram.Layers, oldDiagram.Layers); + this.DeletedLayers = processLayers(oldDiagram.Layers, newDiagram.Layers); this.DeletedZones = processZones(oldDiagram.Zones, newDiagram.Zones); } @@ -67,10 +67,10 @@ private Dictionary processLayers(Dictionary lookupValue(Dictionary sourcedictionary, Dictionary destinationDictionary) + private Dictionary lookupValue(Dictionary sourcedictionary, Dictionary destinationDictionary) { Dictionary differences = new Dictionary(); - foreach (KeyValuePair g in sourcedictionary) + foreach (KeyValuePair g in sourcedictionary) { NetworkComponent ignoreme = null; if (!destinationDictionary.TryGetValue(g.Key, out ignoreme)) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramManager.cs index 3b87dd20cf..d3a151e328 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/DiagramManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -59,7 +59,7 @@ public void SaveDiagram(int assessmentID, XmlDocument xDoc, DiagramRequest req, var cellCount = xDoc.SelectNodes("//root/mxCell").Count; var objectCount = xDoc.SelectNodes("//root/UserObject").Count; - + if (cellCount == 2 && objectCount == 0) { // Update 29-Aug-2019 RKW - we are no longer getting the save calls on open. @@ -336,7 +336,7 @@ public List GetAllComponentSymbols() public StringReader GetDiagramXml(int assessmentId) { var diagram = _context.ASSESSMENTS.FirstOrDefault(a => a.Assessment_Id == assessmentId)?.Diagram_Markup; - + if (diagram != null) { // updates the previous version's 'object' to 'UserObject' if needed (Draw.IO v21.0.2 uses 'UserObject' instead) @@ -403,7 +403,7 @@ public List ProcessDiagramVertices(StringReader stream, } //} */ - + var addLayerVisible = (mxGraphModelRootObject)item; //var addLayerVisible = (mxGraphModelRootMxCell)item; @@ -418,7 +418,7 @@ public List ProcessDiagramVertices(StringReader stream, vertices.Add(addLayerVisible); } - + } } } @@ -498,7 +498,7 @@ public List ProcessDiagramEdges(StringReader stream, int return edges; } - + /// /// /// @@ -1233,7 +1233,7 @@ public void CreateMalcolmDiagram(int assessmentId, List processedDa // Create an empty Network diagram XmlElement root = xml.CreateElement("root", null); - + XmlElement parentOfMainLayer = xml.CreateElement("mxCell"); parentOfMainLayer.SetAttribute("id", "0"); @@ -1261,7 +1261,7 @@ public void CreateMalcolmDiagram(int assessmentId, List processedDa SaveDiagram(assessmentId, xml, new DiagramRequest(), true); } - public void WalkDownTree (TempNode node, string parentId) + public void WalkDownTree(TempNode node, string parentId) { // Get a unique Guid for each node string guid = Guid.NewGuid().ToString(); @@ -1292,7 +1292,7 @@ public void WalkDownTree (TempNode node, string parentId) symbol = _context.COMPONENT_SYMBOLS.Where(x => x.Symbol_Name == "Unknown").FirstOrDefault(); label = "UN-" + node.Key; } - } + } else { label = symbol.Symbol_Name; @@ -1454,7 +1454,7 @@ public bool AreCoordinatesOverlapping(Geometry newCoords) return true; } } - + return false; } @@ -1516,7 +1516,7 @@ public Geometry CircleAroundParent(Geometry geo, int i, int revolution) parent.x += changeAmount; parent.y -= changeAmount; return parent; - default: + default: return parent; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/TranslateCsetdToDrawio.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/TranslateCsetdToDrawio.cs index 40ccc74cce..67611ca9dd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/TranslateCsetdToDrawio.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/TranslateCsetdToDrawio.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysis.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysis.cs index cc66b9aecd..e72324c912 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysis.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysis.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -75,7 +75,7 @@ private List AnalyzeNetwork(SimplifiedNetwork netwo var oldWarnings = _context.NETWORK_WARNINGS.Where(x => x.Assessment_Id == assessment_id).ToList(); _context.NETWORK_WARNINGS.RemoveRange(oldWarnings); _context.SaveChanges(); - + int n = 0; msgs.ForEach(m => { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisBaseMessage.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisBaseMessage.cs index f2a92829df..132d12b50b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisBaseMessage.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisBaseMessage.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,7 +11,7 @@ namespace CSETWebCore.Business.Diagram.Analysis { public abstract class DiagramAnalysisBaseMessage { - + public HashSet SetMessages { get; set; } public DiagramAnalysisBaseMessage() @@ -20,8 +20,8 @@ public DiagramAnalysisBaseMessage() } public void AddMessage(String message) - { - SetMessages.Add( message); + { + SetMessages.Add(message); } public String GetMessage() diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisLineMessage.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisLineMessage.cs index 8e5215617f..581d23b5f3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisLineMessage.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisLineMessage.cs @@ -1,14 +1,14 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// namespace CSETWebCore.Business.Diagram.Analysis { - public class DiagramAnalysisLineMessage:DiagramAnalysisBaseMessage - { - + public class DiagramAnalysisLineMessage : DiagramAnalysisBaseMessage + { + } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisNodeMessage.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisNodeMessage.cs index a6569f9d16..828e435065 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisNodeMessage.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/DiagramAnalysisNodeMessage.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -22,12 +22,12 @@ public class DiagramAnalysisNodeMessage : IDiagramAnalysisNodeMessage public string id { get; set; } public string layerId { get; set; } public string value { get; set; } - + public string edgeId { get; set; } public string vertex { get; set; } public string parent { get; set; } - + public HashSet SetMessages { get; set; } public int MessageIdentifier { get; set; } public int Rule_Violated { get; set; } @@ -40,7 +40,7 @@ public DiagramAnalysisNodeMessage() label = ""; id = Guid.NewGuid().ToString(); layerId = "0"; - value = Number.ToString(); + value = Number.ToString(); vertex = "1"; parent = "0"; } @@ -56,7 +56,7 @@ public String Message { return String.Join("\n\n", SetMessages); } - set {Message = value; } + set { Message = value; } } public string NodeId1 { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/FullNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/FullNode.cs index 97ef763afa..80a62323da 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/FullNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/FullNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysis.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysis.cs index 8a6be5df97..8932bc2dfc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysis.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysis.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysisNodeMessage.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysisNodeMessage.cs index a25f2b6e04..fdbb72c1d5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysisNodeMessage.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/IDiagramAnalysisNodeMessage.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkAnalysisNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkAnalysisNode.cs index 5fde63a170..df361a142d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkAnalysisNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkAnalysisNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -13,9 +13,9 @@ public class NetworkAnalysisNode : NodeViewModelBase public String NetworkText { get; set; } - public NetworkAnalysisNode() + public NetworkAnalysisNode() { - + } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkComponent.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkComponent.cs index b49a92113d..c4b1ae32d5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkComponent.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkComponent.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -13,9 +13,10 @@ namespace CSETWebCore.Business { public class NetworkComponent : NetworkNode { - public List Connections { get; set; } + public List Connections { get; set; } public List FullyConnectedConnections { get; set; } - public bool IsUnidirectional { + public bool IsUnidirectional + { get { return this.Component_Symbol_Id == Constants.Constants.UNIDIRECTIONAL_DEVICE;// = 29; @@ -23,14 +24,17 @@ public bool IsUnidirectional { } public NetworkZone Zone { get; internal set; } - public bool IsFirewall { get + public bool IsFirewall + { + get { return this.Component_Symbol_Id == Constants.Constants.FIREWALL;// = 29; //return string.Equals(this.ComponentType, "Firewall", StringComparison.OrdinalIgnoreCase); } } - public bool IsIDSOrIPS { + public bool IsIDSOrIPS + { get { return this.Component_Symbol_Id == Constants.Constants.IDS_TYPE || this.Component_Symbol_Id == Constants.Constants.IPS_TYPE; @@ -46,14 +50,16 @@ public bool IsIPS } } - public bool IsFirewallUnidirectional { + public bool IsFirewallUnidirectional + { get { return IsFirewall || IsUnidirectional; } } - public bool IsLinkConnector { + public bool IsLinkConnector + { get { return this.Component_Symbol_Id == Constants.Constants.CONNECTOR_TYPE; @@ -68,7 +74,8 @@ public bool IsVLAN } } - public bool IsPartnerVendorOrWeb { + public bool IsPartnerVendorOrWeb + { get { return this.Component_Symbol_Id == Constants.Constants.PARTNER_TYPE @@ -78,7 +85,7 @@ public bool IsPartnerVendorOrWeb { } //public int Component_Symbol_Id { get; internal set; } public bool isMultipleConnections { get; internal set; } - + public NetworkComponent() { Connections = new List(); @@ -96,7 +103,7 @@ internal void AddEdge(NetworkComponent target, NetworkLink link) Source = this.ComponentGuid, Target = target.ComponentGuid }; - + Connections.Add(target); FullyConnectedConnections.Add(new FullNode() { Source = this, Target = target, Link = link }); } @@ -118,7 +125,7 @@ internal bool IsInSameZone(NetworkComponent tailComponent) break; case "id": this.ID = value; - break; + break; case "zone": this.Component_Symbol_Id = Constants.Constants.ZONE;// 121; break; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkGeometry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkGeometry.cs index f0ab0971fc..366d4be753 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkGeometry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkGeometry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,7 +11,7 @@ namespace CSETWebCore.Business.Diagram.Analysis { public class NetworkGeometry { - + public Point point { get; private set; } public int Width { get; private set; } public int Height { get; private set; } @@ -25,14 +25,14 @@ public NetworkGeometry(XmlNode node) } int x = 0; - int y = 0; + int y = 0; int.TryParse(node.Attributes["x"]?.Value, out x); int.TryParse(node.Attributes["y"]?.Value, out y); - point = new Point(x,y); + point = new Point(x, y); int width, height; - if(int.TryParse(node.Attributes["width"]?.Value, out width)) + if (int.TryParse(node.Attributes["width"]?.Value, out width)) { Width = width; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLayer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLayer.cs index 1477547f89..b8014b3cc3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLayer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLayer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLink.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLink.cs index f0dc8489f8..aef78fac2a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLink.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkLink.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,10 +8,10 @@ namespace CSETWebCore.Business.Diagram.Analysis { - public class NetworkLink:NetworkNode + public class NetworkLink : NetworkNode { public NetworkComponent TargetComponent { get; internal set; } - public NetworkComponent SourceComponent { get; internal set; } + public NetworkComponent SourceComponent { get; internal set; } public string Security { get; internal set; } public new void SetValue(string name, string value) @@ -21,8 +21,8 @@ public class NetworkLink:NetworkNode { case "Security": this.Security = value; - break; + break; } - } + } } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkNode.cs index bef0d43e83..750f00295e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -38,7 +38,7 @@ public void SetValue(string name, string value) break; case "id": this.ID = value; - break; + break; case "zone": this.Component_Symbol_Id = Constants.Constants.ZONE;// 121; break; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkZone.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkZone.cs index 1c5dad7f89..693ca71919 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkZone.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NetworkZone.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs index 0f3bf5736c..92bda4fca0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeViewModelBase.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeViewModelBase.cs index 48a24c0045..df0b65ea95 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeViewModelBase.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeViewModelBase.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/SimplifiedNetwork.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/SimplifiedNetwork.cs index d915d27dad..00ba70e555 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/SimplifiedNetwork.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/SimplifiedNetwork.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -13,7 +13,7 @@ namespace CSETWebCore.Business.BusinessManagers.Diagram.analysis { - + /// /// this class is responsible for parsing the diagram xml /// and building the simplified network structure for the rules. @@ -33,9 +33,10 @@ public Dictionary Nodes { get { - return nodes; + return nodes; } - private set { + private set + { } } @@ -44,7 +45,7 @@ public List Edges get { return Links; } } - + public SimplifiedNetwork(Dictionary imageToTypePath, string defaultSAL) @@ -72,13 +73,13 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) //for the XmlNodeLists, use the '/object' ones for diagram-orig, and '/UserObject' for the WIP diagram XmlNodeList objectNodes = xDoc.SelectNodes("/mxGraphModel/root/object[not(@redDot)]"); - if (objectNodes.Count == 0 ) + if (objectNodes.Count == 0) { objectNodes = xDoc.SelectNodes("/mxGraphModel/root/UserObject[not(@redDot)]"); } XmlNodeList zoneNodes = xDoc.SelectNodes("//*[@zone=\"1\"]"); - + XmlNodeList mxCellLinkObjects = xDoc.SelectNodes("/mxGraphModel/root/object[mxCell/@edge='1']"); if (mxCellLinkObjects.Count == 0) { @@ -86,7 +87,7 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) } XmlNodeList mxCellLinks = xDoc.SelectNodes("//*[@edge=\"1\"]"); - + XmlNodeList mxCellLayers = xDoc.SelectNodes("//*[@parent=\"0\" and @id]"); foreach (XmlNode layer in mxCellLayers) { @@ -202,7 +203,7 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) Parent_id = layername, Geometry = geometry }; - + NetworkZone myzone; if (zones.TryGetValue(layername, out myzone)) { @@ -229,7 +230,7 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) link.SetValue(a.Name, a.Value); } Links.Add(link); - var childnode = ((XmlElement)xNode.FirstChild); + var childnode = ((XmlElement)xNode.FirstChild); //find each node //add them to each other if (childnode.HasAttribute("source") && childnode.HasAttribute("target")) @@ -239,14 +240,14 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) //map any other attributes link.SourceComponent = start; link.TargetComponent = target; - start?.AddEdge(target,link); - target?.AddEdge(start,link); + start?.AddEdge(target, link); + target?.AddEdge(start, link); } } foreach (XmlNode node in mxCellLinks) { XmlElement xNode = (XmlElement)node; - if (((XmlElement) xNode.ParentNode).Name=="object") + if (((XmlElement)xNode.ParentNode).Name == "object") { continue;//skip it } @@ -258,15 +259,15 @@ public void ExtractNetworkFromXml(XmlDocument xDoc) NetworkComponent target = findNode(node.Attributes["target"].Value); //map any other attributes var link = new NetworkLink(); - link.ID = xNode.Attributes["id"].Value; + link.ID = xNode.Attributes["id"].Value; link.SourceComponent = start; - link.TargetComponent = target; + link.TargetComponent = target; Links.Add(link); - start?.AddEdge(target,link); + start?.AddEdge(target, link); target?.AddEdge(start, link); } } - this.nodes = PostProcessConnectors.RemoveConnectors(nodes); + this.nodes = PostProcessConnectors.RemoveConnectors(nodes); } private NetworkComponent findNode(string id) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/DrawIOParsingHelps.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/DrawIOParsingHelps.cs index b8bc498638..b689ffcbee 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/DrawIOParsingHelps.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/DrawIOParsingHelps.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/ExtractLeafSpanningTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/ExtractLeafSpanningTree.cs index 06394dd0c7..401056fa29 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/ExtractLeafSpanningTree.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/ExtractLeafSpanningTree.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -24,7 +24,7 @@ public List FinalList private void AllConnections(List connectors) { - + foreach (var connector in connectors) { if (connector.IsLinkConnector) @@ -44,7 +44,7 @@ private void AllConnections(List connectors) } public ExtractLeafSpanningTree(NetworkComponent nc) - { + { AllConnections(nc.Connections); ProcessedAlreadyConnections.Add(nc); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/NetworkWalk.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/NetworkWalk.cs index 2a08e6c299..3a285c5c53 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/NetworkWalk.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/NetworkWalk.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,7 +28,7 @@ public void printGraph(List nodes) private void printNode(NetworkComponent top, int indent) { Trace.Write(new String('\t', indent)); - Trace.WriteLine("-->" + top.ID + ":"+ top.ComponentName); + Trace.WriteLine("-->" + top.ID + ":" + top.ComponentName); int nextIndent = indent + 1; alreadySeenNodes.Add(top); foreach (FullNode f in top.FullyConnectedConnections) @@ -63,7 +63,7 @@ private void printNodeSimple(NetworkComponent top, int indent) internal NetworkLink FindNodeEdge(NetworkNode component1, NetworkNode component2) { - + //printNode((NetworkComponent)component1, 0); alreadySeenNodes.Clear(); return findNode((NetworkComponent)component1, (NetworkComponent)component2); @@ -83,7 +83,7 @@ private NetworkLink findNode(NetworkComponent top, NetworkComponent target) var node = findNode(f.Target, target); if (node != null) return node; - } + } } return null; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PermutationsGenerator.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PermutationsGenerator.cs index 7386f3b1a2..cefa74e8c6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PermutationsGenerator.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PermutationsGenerator.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,7 +12,7 @@ namespace CSETWebCore.Business.Diagram.analysis.helpers { public class CombinationsGenerator { - + /// /// Generating combinations is exponentially horrific do not /// REPEAT do not do this for a large number (ie greater than 10) @@ -38,5 +38,5 @@ public List> GetAllCombos(List list) } } - + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PostProcessConnectors.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PostProcessConnectors.cs index 5bb4eafa67..4619d2668b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PostProcessConnectors.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/helpers/PostProcessConnectors.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,10 +28,10 @@ private PostProcessConnectors(Dictionary nodes) } private Dictionary nodes { get; set; } - + private void SetIsMultiHomed() { - foreach(NetworkComponent nc in nodes.Values) + foreach (NetworkComponent nc in nodes.Values) { nc.isMultipleConnections = (nc.Connections.Count > 1); } @@ -59,7 +59,7 @@ private void ProcessConnectors() if (!ProcessedAlreadyConnections.Contains(nc)) { ExtractLeafSpanningTree treeConnections = new ExtractLeafSpanningTree(nc); - foreach(NetworkComponent already in treeConnections.ProcessedAlreadyConnections) + foreach (NetworkComponent already in treeConnections.ProcessedAlreadyConnections) { ProcessedAlreadyConnections.Add(already); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/AbstractRule.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/AbstractRule.cs index 0c8128ce74..008954bcb2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/AbstractRule.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/AbstractRule.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -63,7 +63,7 @@ public void SetLineMessage(NetworkNode component1, NetworkNode component2, strin Component = (NetworkComponent)component1, NodeId1 = component1.ID, - NodeId2 = component2.ID, + NodeId2 = component2.ID, edgeId = appropriateEdgeId, SetMessages = new HashSet(), Rule_Violated = ruleViolated diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/ComponentPairing.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/ComponentPairing.cs index f63433e611..ec55919f7e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/ComponentPairing.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/ComponentPairing.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,7 +10,7 @@ namespace CSETWebCore.Business.Diagram.analysis.rules { - public class ComponentPairing: IEquatable + public class ComponentPairing : IEquatable { public Guid Source { get; set; } public Guid Target { get; set; } @@ -51,12 +51,12 @@ public bool Equals(ComponentPairing other) { return true; } - - + + return ((this.Source == other.Source) && (this.Target == other.Target)) || ((this.Source == other.Target) && (this.Target == other.Source)); - - + + } public override bool Equals(object obj) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/IRuleEvaluate.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/IRuleEvaluate.cs index 7fe8dfff34..9f2b9bcb88 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/IRuleEvaluate.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/IRuleEvaluate.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule1.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule1.cs index 1c2c185f2f..5157ffc764 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule1.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule1.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,7 +20,7 @@ internal class Rule1 : AbstractRule, IRuleEvaluate private List ListAnalysisNodes = new List(); private Dictionary layers = new Dictionary(); //drawio id to zone lookup - private Dictionary zones = new Dictionary(); + private Dictionary zones = new Dictionary(); private List NetworkWarnings = new List(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule2.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule2.cs index 564ee29888..b685e8b014 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule2.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule2.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -87,7 +87,7 @@ private void CheckRule2(NetworkComponent firewall) private bool RecurseDownConnections(NetworkComponent itemToCheck, NetworkComponent firewall) { foreach (NetworkComponent child in itemToCheck.Connections) - { + { if (Visited.Add(child.ID)) { //Trace.WriteLine("->" + child.ComponentName + ":" + firewall.ComponentName); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule3.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule3.cs index 9ebcb1bee7..07f8d79a27 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule3.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule3.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,7 +19,7 @@ namespace CSETWeb_Api.BusinessLogic.BusinessManagers.Diagram.analysis.rules { class Rule3and4 : AbstractRule, IRuleEvaluate { - + public Rule3and4(SimplifiedNetwork simplifiedNetwork) { this.network = simplifiedNetwork; @@ -52,8 +52,8 @@ public List Evaluate() /// /// private void CheckRule34(NetworkComponent component) - { - List list = GetNodeEdges(component, + { + List list = GetNodeEdges(component, new HashSet() { Constants.FIREWALL, Constants.UNIDIRECTIONAL_DEVICE, diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule5.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule5.cs index 1b9679116d..b897280d9b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule5.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule5.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -33,7 +33,7 @@ public Rule5(SimplifiedNetwork simplifiedNetwork) public List Evaluate() { var partenerVendorWeb = network.Nodes.Values.Where(x => x.IsPartnerVendorOrWeb).ToList(); - foreach(var pvw in partenerVendorWeb) + foreach (var pvw in partenerVendorWeb) { CheckRule5(pvw); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule6.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule6.cs index bda1da31ed..4f2e210f10 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule6.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule6.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -15,7 +15,7 @@ namespace CSETWeb_Api.BusinessLogic.BusinessManagers.Diagram.analysis.rules { class Rule6 : AbstractRule, IRuleEvaluate - { + { private SimplifiedNetwork network; public Rule6(SimplifiedNetwork simplifiedNetwork) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule7.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule7.cs index 775d930a87..408f9ad528 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule7.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/rules/Rule7.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -26,7 +26,7 @@ class Rule7 : AbstractRule, IRuleEvaluate static Rule7() { - // sals = context.UNIVERSAL_SAL_LEVEL.ToDictionary(x => x.Full_Name_Sal.ToLower(), x => x); + // sals = context.UNIVERSAL_SAL_LEVEL.ToDictionary(x => x.Full_Name_Sal.ToLower(), x => x); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/layers/LayerManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/layers/LayerManager.cs index 9bf3c4e8d6..b7d6f07a14 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/layers/LayerManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/layers/LayerManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -16,32 +16,32 @@ class LayerManager { private CSETContext db; private int assessment_id; - + public LayerManager(CSETContext db, int assessment_id) { this.db = db; this.assessment_id = assessment_id; - + } public LayerVisibility GetLastLayer(string drawIoId) { - - return (from node in db.ASSESSMENT_DIAGRAM_COMPONENTS - join parent in db.DIAGRAM_CONTAINER on node.Layer_Id equals parent.Container_Id - where node.Assessment_Id == assessment_id - select new LayerVisibility() - { - Container_Id = parent.Container_Id, - layerName = parent.Name, - DrawIo_id = node.DrawIO_id, - Parent_DrawIo_id = parent.DrawIO_id, - visible = (parent.Visible??true)?"true":"false" - - }).FirstOrDefault(); - + + return (from node in db.ASSESSMENT_DIAGRAM_COMPONENTS + join parent in db.DIAGRAM_CONTAINER on node.Layer_Id equals parent.Container_Id + where node.Assessment_Id == assessment_id + select new LayerVisibility() + { + Container_Id = parent.Container_Id, + layerName = parent.Name, + DrawIo_id = node.DrawIO_id, + Parent_DrawIo_id = parent.DrawIO_id, + visible = (parent.Visible ?? true) ? "true" : "false" + + }).FirstOrDefault(); + /* return (from node in db.ASSESSMENT_DIAGRAM_COMPONENTS join parent in db.DIAGRAM_CONTAINER on node.Zone_Id equals parent.Container_Id @@ -69,7 +69,7 @@ internal void UpdateAllLayersAndZones() select a); foreach (var item in list1) { - allValues[item.DrawIO_id] = new IDToParent() + allValues[item.DrawIO_id] = new IDToParent() { DrawIO_Id = item.DrawIO_id, Parent_DrawIO_Id = item.Parent_DrawIO_Id, @@ -88,7 +88,7 @@ internal void UpdateAllLayersAndZones() container = item }; } - foreach (IDToParent item in allValues.Values.Where(x=> x.component!=null).ToList()) + foreach (IDToParent item in allValues.Values.Where(x => x.component != null).ToList()) { string drawIoId = item.Parent_DrawIO_Id; IDToParent lastItem = null; @@ -99,8 +99,8 @@ internal void UpdateAllLayersAndZones() //else the last one must be the layer if (layer.container != null && !zoneFound) { - if(layer.container.ContainerType == "Zone") - { + if (layer.container.ContainerType == "Zone") + { item.component.Zone_Id = layer.container.Container_Id; zoneFound = true; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Document/DocumentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Document/DocumentBusiness.cs index d520c6e7b5..bbe478ab54 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Document/DocumentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Document/DocumentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/FileRepository/FileRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/FileRepository/FileRepository.cs index 1702c98dc8..dd9e84deba 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/FileRepository/FileRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/FileRepository/FileRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/FrameworkBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/FrameworkBusiness.cs index d1c3fb127e..b593b4ab3c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/FrameworkBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/FrameworkBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -33,7 +33,7 @@ public FrameworkResponse GetFrameworks(int assessmentId) { FrameworkResponse resp = new FrameworkResponse(); - + // get any existing answers for this assessment var answers = _context.FRAMEWORK_TIER_TYPE_ANSWER.Where(ans => ans.Assessment_Id == assessmentId); foreach (FRAMEWORK_TIER_TYPE ftt in _context.FRAMEWORK_TIER_TYPE.ToList()) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/RankingManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/RankingManager.cs index def6a2bfd0..de8f18aaeb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/RankingManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Framework/RankingManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryBoardData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryBoardData.cs index 51c76a2f30..a37acde43e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryBoardData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryBoardData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,7 +17,7 @@ public GalleryBoardData() Rows = new List(); } public string Layout_Name { get; set; } - public List Rows { get; set; } + public List Rows { get; set; } } public class GalleryGroup @@ -27,7 +27,7 @@ public GalleryGroup() GalleryItems = new List(); } public string Group_Title { get; set; } - public List GalleryItems { get; set; } + public List GalleryItems { get; set; } public int Group_Id { get; internal set; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryEditor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryEditor.cs index 8fdd907118..08dd10f3d3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryEditor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryEditor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -124,29 +124,31 @@ public void CloneGalleryGroup(int group_to_clone, string layout) //plus max column number +1 TinyMapper.Bind( - config => { - config.Ignore(source => source.Group_Id); + config => + { + config.Ignore(source => source.Group_Id); } ); TinyMapper.Bind( - config => { + config => + { config.Ignore(source => source.Group_Id); config.Ignore(source => source.Group_Detail_Id); } ); //clone the group and the details - var oldGroup = _context.GALLERY_GROUP.Where(x => x.Group_Id == group_to_clone).FirstOrDefault(); + var oldGroup = _context.GALLERY_GROUP.Where(x => x.Group_Id == group_to_clone).FirstOrDefault(); var newGroup = TinyMapper.Map(oldGroup); _context.GALLERY_GROUP.Add(newGroup); _context.SaveChanges(); - var nextRow = _context.GALLERY_ROWS.Where(x => x.Layout_Name == layout).Max(x => x.Row_Index); - _context.GALLERY_ROWS.Add(new GALLERY_ROWS() {Group_Id = newGroup.Group_Id,Layout_Name=layout, Group = newGroup, Row_Index = (++nextRow) }); + var nextRow = _context.GALLERY_ROWS.Where(x => x.Layout_Name == layout).Max(x => x.Row_Index); + _context.GALLERY_ROWS.Add(new GALLERY_ROWS() { Group_Id = newGroup.Group_Id, Layout_Name = layout, Group = newGroup, Row_Index = (++nextRow) }); - foreach(var item in _context.GALLERY_GROUP_DETAILS.Where(x=>x.Group_Id == oldGroup.Group_Id)) + foreach (var item in _context.GALLERY_GROUP_DETAILS.Where(x => x.Group_Id == oldGroup.Group_Id)) { //make a copy and add it to the new group - var newItem = new GALLERY_GROUP_DETAILS() { Group_Id = newGroup.Group_Id, Column_Index = item.Column_Index, Gallery_Item_Guid = item.Gallery_Item_Guid }; + var newItem = new GALLERY_GROUP_DETAILS() { Group_Id = newGroup.Group_Id, Column_Index = item.Column_Index, Gallery_Item_Guid = item.Gallery_Item_Guid }; newGroup.GALLERY_GROUP_DETAILS.Add(newItem); } _context.SaveChanges(); @@ -242,7 +244,7 @@ public int AddCustomGalleryGroup(string group, string layout) var newGroupId = newGroup.Group_Id; var newRowIndex = 0; - + GALLERY_ROWS newRow = new GALLERY_ROWS() { @@ -259,7 +261,7 @@ public int AddCustomGalleryGroup(string group, string layout) } _context.SaveChanges(); _context.GALLERY_ROWS.Add(newRow); - + _context.SaveChanges(); return newGroupId; @@ -411,37 +413,53 @@ join d in _context.GALLERY_GROUP_DETAILS on i.Gallery_Item_Guid equals d.Gallery join g in _context.GALLERY_GROUP on d.Group_Id equals g.Group_Id join r in _context.GALLERY_ROWS on g.Group_Id equals r.Group_Id where r.Layout_Name == layout_Name - select new GalleryItem() { + select new GalleryItem() + { Gallery_Item_Guid = i.Gallery_Item_Guid - , Title = i.Title - , Description = i.Description - , Configuration_Setup = i.Configuration_Setup - , Configuration_Setup_Client = i.Configuration_Setup_Client - , Icon_File_Name_Large = i.Icon_File_Name_Large - , Icon_File_Name_Small = i.Icon_File_Name_Small - , Is_Visible = i.Is_Visible + , + Title = i.Title + , + Description = i.Description + , + Configuration_Setup = i.Configuration_Setup + , + Configuration_Setup_Client = i.Configuration_Setup_Client + , + Icon_File_Name_Large = i.Icon_File_Name_Large + , + Icon_File_Name_Small = i.Icon_File_Name_Small + , + Is_Visible = i.Is_Visible }).Distinct().ToList(); var query = (from i in _context.GALLERY_ITEM - select new GalleryItem() { + select new GalleryItem() + { Gallery_Item_Guid = i.Gallery_Item_Guid - , Title = i.Title - , Description = i.Description - , Configuration_Setup = i.Configuration_Setup - , Configuration_Setup_Client = i.Configuration_Setup_Client - , Icon_File_Name_Large = i.Icon_File_Name_Large - , Icon_File_Name_Small = i.Icon_File_Name_Small - , Is_Visible = i.Is_Visible + , + Title = i.Title + , + Description = i.Description + , + Configuration_Setup = i.Configuration_Setup + , + Configuration_Setup_Client = i.Configuration_Setup_Client + , + Icon_File_Name_Large = i.Icon_File_Name_Large + , + Icon_File_Name_Small = i.Icon_File_Name_Small + , + Is_Visible = i.Is_Visible }).ToList(); - - + + return query.Except(queryExcept.ToList(), new GalleryItemComparer()).ToArray(); } public List GetLayouts() { List layouts = new List(); - foreach(var g in _context.GALLERY_LAYOUT) + foreach (var g in _context.GALLERY_LAYOUT) { layouts.Add(new GalleryLayout() { LayoutName = g.Layout_Name }); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryItemStateParser.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryItemStateParser.cs index 261f0b5077..81dd100444 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryItemStateParser.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryItemStateParser.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryLayout.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryLayout.cs index b54f9b706d..77e09e2083 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryLayout.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/GalleryLayout.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryEditor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryEditor.cs index fa0707194d..94435f3370 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryEditor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryEditor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryStateParser.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryStateParser.cs index 99e83d1225..5fd7437e14 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryStateParser.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/GalleryParser/IGalleryStateParser.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,6 +11,6 @@ namespace CSETWebCore.Business.GalleryParser public interface IGalleryState { GalleryBoardData GetGalleryBoard(string layout_name); - + } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/IRP/IRPBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/IRP/IRPBusiness.cs index 8581db77b9..51af85e47f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/IRP/IRPBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/IRP/IRPBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -35,7 +35,7 @@ public IRPResponse GetIRPList(int assessmentId, bool spanishFlag = false) IRPResponse response = new IRPResponse(); Dictionary dictionary = new Dictionary(); Dictionary dictionaryHeaders = new Dictionary(); - if (spanishFlag) + if (spanishFlag) { dictionary = AcetBusiness.buildIRPDictionary(); dictionaryHeaders = AcetBusiness.buildIRPHeaderDictionary(); @@ -117,7 +117,7 @@ public IRPResponse GetIRPList(int assessmentId, bool spanishFlag = false) _assessmentUtil.TouchAssessment(assessmentId); } - + return response; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/AnswerDistribDomain.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/AnswerDistribDomain.cs index e1a0132fcf..e05333f4a6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/AnswerDistribDomain.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/AnswerDistribDomain.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,7 +20,7 @@ public class AnswerDistribDomain public class Series - { + { public string Name { get; set; } public double Value { get; set; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/C2M2Business.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/C2M2Business.cs index cbb9337b9d..4e4060ecc3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/C2M2Business.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/C2M2Business.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -311,5 +311,5 @@ private List TabularizeManagementActivities(MaturityStructu - + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisNavStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisNavStructure.cs index 99926c9a14..50ebc68a21 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisNavStructure.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisNavStructure.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisQuestionsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisQuestionsBusiness.cs index e18052a480..c46f01723f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisQuestionsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisQuestionsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -407,7 +407,7 @@ public void ImportCisAnswers(int destAssessId, int sourceAssessId) /// Get all of the integrity check options. /// /// The list of all options applicable to an integrity check - public List GetIntegrityCheckOptions() + public List GetIntegrityCheckOptions() { List integrityCheckOptions = new List(); @@ -415,7 +415,7 @@ public List GetIntegrityCheckOptions() var myAnswers = _context.ANSWER.Where(a => a.Assessment_Id == _assessmentId).ToList(); var cisQuestions = _context.MATURITY_QUESTIONS.Where(q => q.Maturity_Model_Id == _cisModelId).ToList(); - foreach (var pair in integrityCheckDbPairs) + foreach (var pair in integrityCheckDbPairs) { // Add the first integrity check option of the pair. ProcessIntegrityCheckOption(pair.Mat_Option_Id_1, integrityCheckOptions, integrityCheckDbPairs, myAnswers, cisQuestions); @@ -427,8 +427,8 @@ public List GetIntegrityCheckOptions() return integrityCheckOptions; } - private void ProcessIntegrityCheckOption(int pairOptionId, List integrityCheckOptions, - List integrityCheckDbPairs, List myAnswers, List cisQuestions) + private void ProcessIntegrityCheckOption(int pairOptionId, List integrityCheckOptions, + List integrityCheckDbPairs, List myAnswers, List cisQuestions) { var query = from mq in _context.MATURITY_QUESTIONS @@ -437,7 +437,7 @@ join ma in _context.MATURITY_ANSWER_OPTIONS on mq.Mat_Question_Id equals ma.Mat_ if (!integrityCheckOptions.Exists(opt => opt.OptionId == pairOptionId)) { - IntegrityCheckOption newOption = new IntegrityCheckOption { OptionId = pairOptionId}; + IntegrityCheckOption newOption = new IntegrityCheckOption { OptionId = pairOptionId }; newOption.Selected = myAnswers.Find(a => a.Mat_Option_Id == newOption.OptionId)?.Answer_Text == "S"; foreach (var p in integrityCheckDbPairs) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoring.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoring.cs index 1dc948f2f6..2c06f25fc3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoring.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoring.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -107,23 +107,23 @@ public Score CalculateGroupingScore() // achieved weight points var qAchieved = from g in grouped - select new RollupOptions() - { - Type = g.OptionQuestions.FirstOrDefault().Type, - Weight = g.OptionQuestions.FirstOrDefault().Type != "radio" - ? g.OptionQuestions.Where(s => s.Selected).Sum(x => x.Weight) - : g.OptionQuestions.FirstOrDefault(s => s.Selected)?.Weight - }; + select new RollupOptions() + { + Type = g.OptionQuestions.FirstOrDefault().Type, + Weight = g.OptionQuestions.FirstOrDefault().Type != "radio" + ? g.OptionQuestions.Where(s => s.Selected).Sum(x => x.Weight) + : g.OptionQuestions.FirstOrDefault(s => s.Selected)?.Weight + }; var achievedWeights = qAchieved.ToList(); // possible weight points var qPossible = from g in grouped - select new RollupOptions - { - Type = g.OptionQuestions.FirstOrDefault().Type, - Weight = g.OptionQuestions.FirstOrDefault().Type != "radio" - ? g.OptionQuestions.Sum(x => x.Weight) : g.OptionQuestions.MaxBy(x => x.Weight)?.Weight - }; + select new RollupOptions + { + Type = g.OptionQuestions.FirstOrDefault().Type, + Weight = g.OptionQuestions.FirstOrDefault().Type != "radio" + ? g.OptionQuestions.Sum(x => x.Weight) : g.OptionQuestions.MaxBy(x => x.Weight)?.Weight + }; var possibleWeights = qPossible.ToList(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoringStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoringStructure.cs index 4c9f9a1b9d..61c8a3243a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoringStructure.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisScoringStructure.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -128,7 +128,7 @@ private void GetSubgroups(object oParent, int? parentId) // Score the grouping AddScoring(grouping); - + GetSubgroups(grouping, sg.Grouping_Id); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisStructure.cs index dedaa7488d..c368024679 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisStructure.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisStructure.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -62,7 +62,7 @@ public NestedStructure(int assessmentId, int sectionId, CSETContext context) this._assessmentId = assessmentId; this._addSup = new AdditionalSupplemental(context); - + // Get the baseline assessment if one is assigned var info = _context.INFORMATION.Where(x => x.Id == assessmentId).FirstOrDefault(); @@ -201,7 +201,7 @@ private void GetSubgroups(object oParent, int? parentId, int? filterId = null) foreach (var myQ in myQuestions.OrderBy(s => s.Sequence)) { List answers = allAnswers.Where(x => x.Question_Or_Requirement_Id == myQ.Mat_Question_Id).ToList(); - ConsolidateAnswers(answers, out ANSWER answer); + ConsolidateAnswers(answers, out ANSWER answer); var question = new Model.Nested.Question() { @@ -454,22 +454,22 @@ private List GetDocumentIds(int? answerId) /// /// /// - private void ConsolidateAnswers(List answers, out ANSWER answer) + private void ConsolidateAnswers(List answers, out ANSWER answer) { - if (answers.Count == 0) - { + if (answers.Count == 0) + { answer = null; return; } answer = answers[0]; - if (answers.Count == 1) + if (answers.Count == 1) { return; } - foreach (ANSWER a in answers) + foreach (ANSWER a in answers) { // Want the selection status //if (a.Answer_Text == "S" || a.Answer_Text == "") @@ -493,7 +493,7 @@ private void ConsolidateAnswers(List answers, out ANSWER answer) answer.FeedBack = a.FeedBack; } - if (a.Mark_For_Review != null) + if (a.Mark_For_Review != null) { answer.Mark_For_Review = a.Mark_For_Review; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/EdmNistCsfMapping.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/EdmNistCsfMapping.cs index 80de558679..681c39bd3c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/EdmNistCsfMapping.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/EdmNistCsfMapping.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -18,14 +18,14 @@ public class EdmNistCsfMapping { private CSETContext _context; - // private readonly IAssessmentUtil _assessmentUtil; + // private readonly IAssessmentUtil _assessmentUtil; //private readonly IAdminTabBusiness _adminTabBusiness; public EdmNistCsfMapping(CSETContext context) { _context = context; // _assessmentUtil = assessmentUtil; - // _adminTabBusiness = adminTabBusiness; + // _adminTabBusiness = adminTabBusiness; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/GroupScores.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/GroupScores.cs index 72d1ef7932..fc94a0c91d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/GroupScores.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/GroupScores.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,8 +8,8 @@ namespace CSETWebCore.Business.Maturity { public class GroupScores { - public int Group_Id { get; set; } - public int Maturity_Level_Id { get; set; } + public int Group_Id { get; set; } + public int Maturity_Level_Id { get; set; } public string Maturity_Level_Name { get; set; } } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs index 01eb78263f..3b8e932c8d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -68,7 +68,7 @@ from mm in _context.MATURITY_MODELS from a in _context.ASSESSMENTS join gii in _context.GALLERY_ITEM on a.GalleryItemGuid equals gii.Gallery_Item_Guid into gig from gi in gig.DefaultIfEmpty() - where amm.model_id == mm.Maturity_Model_Id + where amm.model_id == mm.Maturity_Model_Id && amm.Assessment_Id == assessmentId && a.Assessment_Id == assessmentId @@ -603,14 +603,15 @@ public void PersistMaturityLevel(int assessmentId, int level) // is more complex to allow for the different types of SALs // as well as the user's selection(s). - lock (myLock) { + lock (myLock) + { var result = _context.ASSESSMENT_SELECTED_LEVELS .Where(x => x.Assessment_Id == assessmentId && x.Level_Name == Constants.Constants.MaturityLevel); if (result.Any()) { _context.ASSESSMENT_SELECTED_LEVELS.RemoveRange(result); _context.SaveChanges(); - } + } _context.ASSESSMENT_SELECTED_LEVELS.Add(new ASSESSMENT_SELECTED_LEVELS() { Assessment_Id = assessmentId, @@ -900,7 +901,8 @@ public MaturityResponse GetMaturityQuestions(int assessmentId, int? userId, stri { Dictionary dictionary = AcetBusiness.buildQuestionDictionary(); questions.ForEach( - question => { + question => + { var output = new SpanishQuestionRow(); var temp = new SpanishQuestionRow(); // test if not finding a match will safely skip @@ -931,7 +933,8 @@ from b in _context.VIEW_QUESTIONS_STATUS.Where(x => x.Answer_Id == a.Answer_Id). { Dictionary dictionary = AcetBusiness.buildGroupingDictionary(); allGroupings.ForEach( - group => { + group => + { var output = new GroupingSpanishRow(); var temp = new GroupingSpanishRow(); if (dictionary.TryGetValue(group.Grouping_Id, out output)) @@ -1296,7 +1299,7 @@ public List CalculateComponentValues(List x.FinComponent == c.FinComponent).Complete, @@ -1318,7 +1321,7 @@ public List CalculateComponentValues(List CalculateComponentValues(List CalculateComponentValues(List CalculateComponentValues(List CalculateComponentValues(List { + assessment => + { var output = new GroupingSpanishRow(); // test if not finding a match will safely skip if (dictionary.TryGetValue(assessment.AssessmentFactor, out output)) @@ -1475,7 +1479,8 @@ public List CalculateComponentValues(List { + component => + { var output = new GroupingSpanishRow(); // test if not finding a match will safely skip if (dictionary.TryGetValue(component.ComponentName, out output)) @@ -2233,7 +2238,7 @@ public void SetDefaultTargetLevels(int assessmentId, string modelName) _context.SaveChanges(); _assessmentUtil.TouchAssessment(assessmentId); } - } + } /// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/QuestionTreeXml.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/QuestionTreeXml.cs index 22a31e9652..0395fedb02 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/QuestionTreeXml.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/QuestionTreeXml.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/IJSONFileExport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/IJSONFileExport.cs index 7abdde5819..5bfc3063c2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/IJSONFileExport.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/IJSONFileExport.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs index 38967fe04c..80f9d3a45b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -32,7 +32,7 @@ public class MeritFileExport } - public class JSONFileExport:IJSONFileExport + public class JSONFileExport : IJSONFileExport { public const string MeritExportPathName = "NCUAMeritExportPath"; public void SendFileToMerit(string filename, string data, string uncPath) @@ -56,7 +56,7 @@ public void SendFileToMerit(string filename, string data, string uncPath) } public bool DoesDirectoryExist(string uncPath) - { + { return Directory.Exists(uncPath); } @@ -85,7 +85,7 @@ public void SetNewAssessmentGuid(int assessId, Guid newGuid, CSETContext context public string GetUncPath(CSETContext context) { GLOBAL_PROPERTIES uncPath = context.GLOBAL_PROPERTIES.Where(x => x.Property == JSONFileExport.MeritExportPathName).FirstOrDefault(); - if(uncPath == null) + if (uncPath == null) { uncPath = new GLOBAL_PROPERTIES() { @@ -93,11 +93,11 @@ public string GetUncPath(CSETContext context) Property_Value = "\\\\hqwinfs1\\global\\Field_Staff\\ISE" // default path for client }; context.GLOBAL_PROPERTIES.Add(uncPath); - + } if (!DoesDirectoryExist(uncPath.Property_Value)) { - var excp = new MERITApplicationException("Directory does not exist or is unavailable."); + var excp = new MERITApplicationException("Directory does not exist or is unavailable."); excp.Path = uncPath.Property_Value; throw excp; } @@ -113,7 +113,7 @@ public void SaveUncPath(string uncPath, CSETContext context) throw excp; } var currentUncPath = context.GLOBAL_PROPERTIES.Where(x => x.Property == JSONFileExport.MeritExportPathName).FirstOrDefault(); - if(currentUncPath == null) + if (currentUncPath == null) { context.GLOBAL_PROPERTIES.Add(new GLOBAL_PROPERTIES() { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/MERITApplicationException.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/MERITApplicationException.cs index f1d335cfb5..425d02d462 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/MERITApplicationException.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/MERITApplicationException.cs @@ -1,14 +1,14 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// using System; namespace CSETWebCore.Business.Merit -{ - internal class MERITApplicationException:ApplicationException +{ + internal class MERITApplicationException : ApplicationException { public MERITApplicationException(string message) : base(message) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleBuilder/ModuleBuilderBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleBuilder/ModuleBuilderBusiness.cs index a97ef370fc..cdb3d50460 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleBuilder/ModuleBuilderBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleBuilder/ModuleBuilderBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -76,7 +76,7 @@ public List GetCustomSetList(bool includeNonCustom = false) SetCategory = set.Set_Category_Id != null ? (int)set.Set_Category_Id : 0, IsCustom = set.Is_Custom, IsDisplayed = set.Is_Displayed ?? false, - + Clonable = true, Deletable = true }; @@ -91,7 +91,7 @@ public List GetCustomSetList(bool includeNonCustom = false) /// /// Gets the full list of sets that are being used in an assessment. /// - public List GetSetsInUseList() + public List GetSetsInUseList() { List selectedStandards = _context.AVAILABLE_STANDARDS.Where(x => x.Selected).ToList(); @@ -216,7 +216,7 @@ public void AddCopyToSet(string sourceSetName, string destinationSetName) { _context.usp_CopyIntoSet(sourceSetName, destinationSetName); - + } public void DeleteCopyToSet(string setName) @@ -333,7 +333,7 @@ join rs in _context.REQUIREMENT_SETS on req.Requirement_Id equals rs.Requirement _context.GALLERY_ITEM.Remove(cardInfo); } - _context.SaveChanges(); + _context.SaveChanges(); return resp; } @@ -386,8 +386,8 @@ public string SaveSetDetail(SetDetail set) if (custom != null) { var colIndexList = _context.GALLERY_GROUP_DETAILS.Where(x => x.Group_Id.Equals(custom.Group_Id)).ToList(); - - if(colIndexList != null) + + if (colIndexList != null) { colIndex = colIndexList.Count; } @@ -1077,35 +1077,35 @@ public void SetRequirementSalLevel(SalParms salParms) public void SetQuestionSalLevel(SalParms salParms) { - NEW_QUESTION_SETS nqs = _context.NEW_QUESTION_SETS.Where(x => x.Question_Id == salParms.QuestionID && x.Set_Name == salParms.SetName).FirstOrDefault(); + NEW_QUESTION_SETS nqs = _context.NEW_QUESTION_SETS.Where(x => x.Question_Id == salParms.QuestionID && x.Set_Name == salParms.SetName).FirstOrDefault(); - NEW_QUESTION_LEVELS nql = _context.NEW_QUESTION_LEVELS.Where(x => - x.New_Question_Set_Id == nqs.New_Question_Set_Id - && x.Universal_Sal_Level == salParms.Level).FirstOrDefault(); + NEW_QUESTION_LEVELS nql = _context.NEW_QUESTION_LEVELS.Where(x => + x.New_Question_Set_Id == nqs.New_Question_Set_Id + && x.Universal_Sal_Level == salParms.Level).FirstOrDefault(); - if (salParms.State) + if (salParms.State) + { + // add the level if it doesn't exist + if (nql == null) { - // add the level if it doesn't exist - if (nql == null) + nql = new NEW_QUESTION_LEVELS() { - nql = new NEW_QUESTION_LEVELS() - { - New_Question_Set_Id = nqs.New_Question_Set_Id, - Universal_Sal_Level = salParms.Level - }; - _context.NEW_QUESTION_LEVELS.Add(nql); - _context.SaveChanges(); - } + New_Question_Set_Id = nqs.New_Question_Set_Id, + Universal_Sal_Level = salParms.Level + }; + _context.NEW_QUESTION_LEVELS.Add(nql); + _context.SaveChanges(); } - else + } + else + { + // remove the level + if (nql != null) { - // remove the level - if (nql != null) - { - _context.NEW_QUESTION_LEVELS.Remove(nql); - _context.SaveChanges(); - } + _context.NEW_QUESTION_LEVELS.Remove(nql); + _context.SaveChanges(); } + } } @@ -1192,16 +1192,16 @@ public bool IsQuestionInUse(int questionID) /// public void UpdateHeadingText(int pairID, string text) { - var usch = _context.UNIVERSAL_SUB_CATEGORY_HEADINGS.Where(x => x.Heading_Pair_Id == pairID).FirstOrDefault(); + var usch = _context.UNIVERSAL_SUB_CATEGORY_HEADINGS.Where(x => x.Heading_Pair_Id == pairID).FirstOrDefault(); - if (usch == null) - { - return; - } + if (usch == null) + { + return; + } - usch.Sub_Heading_Question_Description = string.IsNullOrEmpty(text) ? null : text; - _context.UNIVERSAL_SUB_CATEGORY_HEADINGS.Update(usch); - _context.SaveChanges(); + usch.Sub_Heading_Question_Description = string.IsNullOrEmpty(text) ? null : text; + _context.UNIVERSAL_SUB_CATEGORY_HEADINGS.Update(usch); + _context.SaveChanges(); } @@ -1234,13 +1234,13 @@ public ModuleResponse GetModuleStructure(string setName) var set = _context.SETS.Where(x => x.Set_Name == setName).FirstOrDefault(); response.SetFullName = set.Full_Name; - response.SetShortName = set.Short_Name; + response.SetShortName = set.Short_Name; response.SetDescription = set.Standard_ToolTip; var q = from rs in _context.REQUIREMENT_SETS from s in _context.SETS.Where(x => x.Set_Name == rs.Set_Name) - from r in _context.NEW_REQUIREMENT.Where(x => x.Requirement_Id == rs.Requirement_Id) + from r in _context.NEW_REQUIREMENT.Where(x => x.Requirement_Id == rs.Requirement_Id) where rs.Set_Name == setName select new { r, rs, s }; var results = q.Distinct() @@ -1724,25 +1724,25 @@ public ReferenceDoc GetReferenceDocDetail(int id) /// public void UpdateReferenceDocDetail(ReferenceDoc doc) { - var dbDoc = _context.GEN_FILE.Where(x => x.Gen_File_Id == doc.ID).FirstOrDefault(); - if (dbDoc == null) - { - return; - } + var dbDoc = _context.GEN_FILE.Where(x => x.Gen_File_Id == doc.ID).FirstOrDefault(); + if (dbDoc == null) + { + return; + } - dbDoc.Title = string.IsNullOrEmpty(doc.Title) ? "(no title)" : doc.Title; - dbDoc.Name = string.IsNullOrEmpty(doc.Name) ? "(no name)" : doc.Name; - dbDoc.Short_Name = doc.ShortName; - dbDoc.Doc_Num = doc.DocumentNumber; - dbDoc.Publish_Date = doc.PublishDate; - dbDoc.Doc_Version = doc.DocumentVersion; - // dbDoc.Source_Type = doc.sourcetype - dbDoc.Summary = doc.Summary; - dbDoc.Description = doc.Description; - dbDoc.Comments = doc.Comments; - - _context.GEN_FILE.Update(dbDoc); - _context.SaveChanges(); + dbDoc.Title = string.IsNullOrEmpty(doc.Title) ? "(no title)" : doc.Title; + dbDoc.Name = string.IsNullOrEmpty(doc.Name) ? "(no name)" : doc.Name; + dbDoc.Short_Name = doc.ShortName; + dbDoc.Doc_Num = doc.DocumentNumber; + dbDoc.Publish_Date = doc.PublishDate; + dbDoc.Doc_Version = doc.DocumentVersion; + // dbDoc.Source_Type = doc.sourcetype + dbDoc.Summary = doc.Summary; + dbDoc.Description = doc.Description; + dbDoc.Comments = doc.Comments; + + _context.GEN_FILE.Update(dbDoc); + _context.SaveChanges(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleIO/ModuleImporter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleIO/ModuleImporter.cs index a6f97f29d5..360413357a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleIO/ModuleImporter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ModuleIO/ModuleImporter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -103,7 +103,7 @@ public void ProcessStandard(ExternalStandard externalStandard) { set.Standard_ToolTip = $"{category.Set_Category_Name} - {set.Standard_ToolTip}"; } - else + else { set.Standard_ToolTip = $"{category.Set_Category_Name}"; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs index 3e7621c3cc..aeef720486 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Notification/NotificationBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -108,7 +108,7 @@ public void InviteToAssessment(ContactCreateParameters contact) if (_localInstallationHelper.IsLocalInstallation()) { RemoveCsetAppLink(ref bodyHtml); - } + } MailMessage message = new MailMessage(); @@ -333,7 +333,8 @@ private void RemoveCsetAppLink(ref string html) { var doc = NSoup.Parse.Parser.Parse(html, ""); var appLinks = doc.Select(".cset-app-link").ToList(); - appLinks.ForEach(l => { + appLinks.ForEach(l => + { l.Parent.RemoveChild(l); }); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemText.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemText.cs index b9eb1c23cf..4c09d81311 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemText.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemText.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -18,5 +18,5 @@ public class ActionItemTextUpdate { public List actionTextItems { get; set; } public int observation_Id { get; set; } -} + } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemsForReport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemsForReport.cs index 398d6dba6e..2b55927a24 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemsForReport.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ActionItemsForReport.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationData.cs index da2284cc51..f196d3b6fd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationsManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationsManager.cs index c4eada5a7f..20ddf578f6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationsManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Observations/ObservationsManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -132,7 +132,7 @@ public Observation GetObservation(int observationId, int answerId = 0) obs.Observation_Contacts.Add(webContact); } - return obs; + return obs; } @@ -215,7 +215,7 @@ public async Task> GetActionItemsReport /// public void UpdateIssues(ActionItemTextUpdate items) { - foreach(var item in items.actionTextItems) + foreach (var item in items.actionTextItems) { var save = _context.ISE_ACTIONS_FINDINGS.Where(x => x.Finding_Id == items.observation_Id && x.Mat_Question_Id == item.Mat_Question_Id).FirstOrDefault(); if (save == null) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs index efb4da89e7..b73d8a98ad 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -42,7 +42,7 @@ public class ComponentQuestionBusiness /// Constructor. /// /// - public ComponentQuestionBusiness(CSETContext context, IAssessmentUtil assessmentUtil, ITokenManager tokenManager, IQuestionRequirementManager questionRequirement) + public ComponentQuestionBusiness(CSETContext context, IAssessmentUtil assessmentUtil, ITokenManager tokenManager, IQuestionRequirementManager questionRequirement) { _context = context; _assessmentUtil = assessmentUtil; @@ -189,7 +189,7 @@ private void AddResponseComponentOverride(QuestionResponse resp, List lis GroupHeadingId = dbQ.GroupHeadingId, SubCategoryId = dbQ.SubCategoryId, SubCategoryHeadingText = dbQ.Universal_Sub_Category, - HeaderQuestionText = dbQ.Sub_Heading_Question_Description??string.Empty, + HeaderQuestionText = dbQ.Sub_Heading_Question_Description ?? string.Empty, SubCategoryAnswer = this.SubCatAnswers?.Where(x => x.HeadingId == dbQ.heading_pair_id).FirstOrDefault()?.AnswerText }; @@ -314,30 +314,30 @@ public List GetOverrideQuestions(int assessm { List rlist = new List(); - List questionlist = null; + List questionlist = null; - _context.LoadStoredProc("[usp_getExplodedComponent]") - .WithSqlParam("assessment_id", assessmentId) - .ExecuteStoredProc((handler) => - { - questionlist = handler.ReadToList().Where(c => c.Question_Id == question_id - && c.Component_Symbol_Id == Component_Symbol_Id).ToList(); - }); + _context.LoadStoredProc("[usp_getExplodedComponent]") + .WithSqlParam("assessment_id", assessmentId) + .ExecuteStoredProc((handler) => + { + questionlist = handler.ReadToList().Where(c => c.Question_Id == question_id + && c.Component_Symbol_Id == Component_Symbol_Id).ToList(); + }); - IQueryable answeredQuestionList = _context.Answer_Components.Where(a => - a.Assessment_Id == assessmentId && a.Question_Or_Requirement_Id == question_id); + IQueryable answeredQuestionList = _context.Answer_Components.Where(a => + a.Assessment_Id == assessmentId && a.Question_Or_Requirement_Id == question_id); - foreach (var question in questionlist.ToList()) - { - Answer_Components_Exploded_ForJSON tmp = null; - TinyMapper.Bind(); - tmp = TinyMapper.Map(question); - tmp.Component_GUID = question.Component_GUID.ToString(); - rlist.Add(tmp); - } + foreach (var question in questionlist.ToList()) + { + Answer_Components_Exploded_ForJSON tmp = null; + TinyMapper.Bind(); + tmp = TinyMapper.Map(question); + tmp.Component_GUID = question.Component_GUID.ToString(); + rlist.Add(tmp); + } - return rlist; + return rlist; } @@ -401,7 +401,7 @@ public int StoreAnswer(Answer answer) dbAnswer.Assessment_Id = assessmentId; dbAnswer.Answer_Text = "U"; dbAnswer.Question_Type = "Component"; - + _context.ANSWER.Add(dbAnswer); _context.SaveChanges(); answerId = dbAnswer.Answer_Id; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionInfoData.cs index 42611ffa55..e0414aaeea 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentTypeSalData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentTypeSalData.cs index dcdef6018d..4c1d08a6c6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentTypeSalData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentTypeSalData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/IQuestionBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/IQuestionBusiness.cs index 9bd2f5a3ec..091e86a287 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/IQuestionBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/IQuestionBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/InformationTabBuilder.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/InformationTabBuilder.cs index f80804341c..8f53f7a00e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/InformationTabBuilder.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/InformationTabBuilder.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterContainer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterContainer.cs index aab625111c..9dee1de8db 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterContainer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterContainer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterTextBuilder.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterTextBuilder.cs index 8c39bf5ba4..f9e9827996 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterTextBuilder.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ParameterTextBuilder.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileCategory.cs index 7266761d2b..8ffa7f4813 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileFunction.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileFunction.cs index 8ad220a128..7669f9f576 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileFunction.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileFunction.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileImportQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileImportQuestion.cs index ba7f31ba27..c859189e37 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileImportQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileImportQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileQuestion.cs index 1619c59136..6083cba19a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ProfileQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionBusiness.cs index dc0f555172..8c515f31db 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -550,21 +550,21 @@ public List AllQuestionsInSubGroup(int modelId, int groupLeve List distinctParentGroupingIdList = parentGroupingIdList.Distinct().ToList(); var ansResults = from q in _context.MATURITY_QUESTIONS.Where(g => g.Maturity_Model_Id == modelId && groupingIdList.Contains((int)g.Grouping_Id)) - join a in _context.ANSWER on q.Mat_Question_Id equals a.Question_Or_Requirement_Id - where a.Assessment_Id == assessmentId + join a in _context.ANSWER on q.Mat_Question_Id equals a.Question_Or_Requirement_Id + where a.Assessment_Id == assessmentId select new { a }; - List < MATURITY_QUESTIONS > questionList = _context.MATURITY_QUESTIONS.Where(g => g.Maturity_Model_Id == modelId && groupingIdList.Contains((int)g.Grouping_Id)).ToList(); + List questionList = _context.MATURITY_QUESTIONS.Where(g => g.Maturity_Model_Id == modelId && groupingIdList.Contains((int)g.Grouping_Id)).ToList(); List info = new List(); - for (int i = 0; i < groupingIdList.Count; i++) + for (int i = 0; i < groupingIdList.Count; i++) { List questionsInGroup = questionList.FindAll(q => q.Grouping_Id == groupingIdList[i]); List questionWithAnswers = new List(); - foreach(MATURITY_QUESTIONS question in questionsInGroup) + foreach (MATURITY_QUESTIONS question in questionsInGroup) { QuestionWithAnswers questionAnswers = new QuestionWithAnswers(); List answerListPerQuestion = _context.ANSWER.Where(a => a.Question_Or_Requirement_Id == question.Mat_Question_Id && a.Answer_Text == "S" && a.Assessment_Id == assessmentId).ToList(); @@ -604,7 +604,7 @@ public int SaveHydroComment(ANSWER answer, int answerId, int progressId, string Progress_Id = progressId, Comment = comment }); - } + } catch (Exception) { //TODO: It is a big pet peeve of mine to have empty try catches diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetails.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetails.cs index 8e76f73117..e4efbbf7f4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetails.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetails.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -30,10 +30,10 @@ public class QuestionDetails private bool isDetailAndInfo { get; set; } - + public bool IsNoQuestion { get; set; } - + private int selectedTabIndex { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsBusiness.cs index f8e08d0121..5ebee9e387 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -67,7 +67,7 @@ public QuestionDetailsBusiness( /// public QuestionDetails GetQuestionDetails(int? questionId, int assessmentId, string questionType) { - if (_context.MATURITY_QUESTION_TYPES.ToList().Exists(x => x.Mat_Question_Type.Equals(questionType, StringComparison.OrdinalIgnoreCase))) + if (_context.MATURITY_QUESTION_TYPES.ToList().Exists(x => x.Mat_Question_Type.Equals(questionType, StringComparison.OrdinalIgnoreCase))) { questionType = "Maturity"; } @@ -233,7 +233,7 @@ join l in _context.UNIVERSAL_SAL_LEVEL on a.SAL equals l.Full_Name_Sal foreach (var item in stuff.ToList()) { ComponentTypeSalData salData; - + if (dictionaryComponentTypes.TryGetValue(item.Component_Symbol_Id, out salData)) { salData.SALLevels.Add(item.Sal_Level_Order); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsContentViewModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsContentViewModel.cs index 4dbdea609d..73f21d384a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsContentViewModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionDetailsContentViewModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionInformationTabData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionInformationTabData.cs index 264bd55d9d..dadcda2179 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionInformationTabData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionInformationTabData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -457,7 +457,7 @@ public void BuildComponentInfoTab(ComponentQuestionInfoData info) var refBuilder = new Helpers.ReferencesBuilder(_context); - refBuilder.BuildReferenceDocuments(reqid, + refBuilder.BuildReferenceDocuments(reqid, out List sourceDocList, out List additionalDocList); SourceDocumentsList = sourceDocList; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionPoco.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionPoco.cs index 6b2a0602a7..4edbd641b4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionPoco.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionPoco.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs index 93d568cdf7..bdaa21e65d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/RequirementBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/RequirementBusiness.cs index d87f9ee9c5..274456e844 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/RequirementBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/RequirementBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -167,7 +167,7 @@ public QuestionResponse BuildResponse(List requirements, StandardShortName = req.SetShortName }; - response.Categories.Add(category); + response.Categories.Add(category); } @@ -219,7 +219,7 @@ public QuestionResponse BuildResponse(List requirements, var translatedReq = overlay.GetReq(dbR.Requirement_Id, lang); if (translatedReq != null) { - qa.QuestionText = translatedReq.RequirementText; + qa.QuestionText = translatedReq.RequirementText; } if (string.IsNullOrEmpty(qa.QuestionType)) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ReportEngine/DataHandling.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ReportEngine/DataHandling.cs index 271658e618..87a899100c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ReportEngine/DataHandling.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/ReportEngine/DataHandling.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ModuleContentReport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ModuleContentReport.cs index 01e18725d0..74a39f27f2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ModuleContentReport.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ModuleContentReport.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -67,11 +67,11 @@ public ModuleResponse GetResponse(string set) private void IncludeSourceFiles(ModuleResponse module, string set) { var q = from nr in _context.NEW_REQUIREMENT - join rsf in _context.REQUIREMENT_SOURCE_FILES on nr.Requirement_Id equals rsf.Requirement_Id - join rqs in _context.REQUIREMENT_QUESTIONS_SETS on nr.Requirement_Id equals rqs.Requirement_Id - join gf in _context.GEN_FILE on rsf.Gen_File_Id equals gf.Gen_File_Id - where rqs.Set_Name == set - select new { rsf, gf }; + join rsf in _context.REQUIREMENT_SOURCE_FILES on nr.Requirement_Id equals rsf.Requirement_Id + join rqs in _context.REQUIREMENT_QUESTIONS_SETS on nr.Requirement_Id equals rqs.Requirement_Id + join gf in _context.GEN_FILE on rsf.Gen_File_Id equals gf.Gen_File_Id + where rqs.Set_Name == set + select new { rsf, gf }; var gggg = q.Distinct().ToList(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/MvraSummary.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/MvraSummary.cs index 55a5a5aff6..a8f9206236 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/MvraSummary.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/MvraSummary.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs index 8822cb1bc0..b744243283 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -144,7 +144,7 @@ on a.Question_Or_Requirement_Id equals m.Mat_Question_Id // RRA should be always be defaulted to its maximum available level (3) // since the user can't configure it - if (myModel.model_id == 5) + if (myModel.model_id == 5) { selectedLevel = 3; } @@ -314,7 +314,8 @@ from b in _context.VIEW_QUESTIONS_STATUS.Where(x => x.Answer_Id == a.Answer_Id). if (user?.Lang == "es" || ak?.Lang == "es") { allGroupings.ForEach( - group => { + group => + { var output = new GroupingSpanishRow(); var temp = new GroupingSpanishRow(); if (dictionaryGrouping.TryGetValue(group.Grouping_Id, out output)) @@ -789,7 +790,7 @@ public void BuildSubGroupings(MaturityGrouping g, int? parentID, string level = _questionRequirement.StandardLevel == null ? "L" : _questionRequirement.StandardLevel; List controlRows = new List(); - + if (applicationMode == CSETWebCore.Business.Assessment.AssessmentMode.QUESTIONS_BASED_APPLICATION_MODE) { var qQ = (from rs in _context.REQUIREMENT_SETS @@ -807,7 +808,8 @@ join a in _context.Answer_Questions_No_Components on qu.Question_Id equals a.Que foreach (var q in qQ) { - controlRows.Add(new ControlRow() { + controlRows.Add(new ControlRow() + { Requirement_Id = q.r.Requirement_Id, Requirement_Text = q.r.Requirement_Text, Answer_Text = q.a.Answer_Text, @@ -1436,18 +1438,18 @@ public BasicReportData.INFORMATION GetInformation() public List GetObservationIndividuals() { var observations = (from a in _context.FINDING_CONTACT - join b in _context.FINDING on a.Finding_Id equals b.Finding_Id - join c in _context.ANSWER on b.Answer_Id equals c.Answer_Id - join mq in _context.MATURITY_QUESTIONS on c.Question_Or_Requirement_Id equals mq.Mat_Question_Id into mq1 - from mq in mq1.DefaultIfEmpty() - join r in _context.NEW_REQUIREMENT on c.Question_Or_Requirement_Id equals r.Requirement_Id into r1 - from r in r1.DefaultIfEmpty() - join d in _context.ASSESSMENT_CONTACTS on a.Assessment_Contact_Id equals d.Assessment_Contact_Id - join i in _context.IMPORTANCE on b.Importance_Id equals i.Importance_Id into i1 - from i in i1.DefaultIfEmpty() - where c.Assessment_Id == _assessmentId - orderby a.Assessment_Contact_Id, b.Answer_Id, b.Finding_Id - select new { a, b, c, mq, r, d, i.Value }).ToList(); + join b in _context.FINDING on a.Finding_Id equals b.Finding_Id + join c in _context.ANSWER on b.Answer_Id equals c.Answer_Id + join mq in _context.MATURITY_QUESTIONS on c.Question_Or_Requirement_Id equals mq.Mat_Question_Id into mq1 + from mq in mq1.DefaultIfEmpty() + join r in _context.NEW_REQUIREMENT on c.Question_Or_Requirement_Id equals r.Requirement_Id into r1 + from r in r1.DefaultIfEmpty() + join d in _context.ASSESSMENT_CONTACTS on a.Assessment_Contact_Id equals d.Assessment_Contact_Id + join i in _context.IMPORTANCE on b.Importance_Id equals i.Importance_Id into i1 + from i in i1.DefaultIfEmpty() + where c.Assessment_Id == _assessmentId + orderby a.Assessment_Contact_Id, b.Answer_Id, b.Finding_Id + select new { a, b, c, mq, r, d, i.Value }).ToList(); // Get any associated questions to get their display reference @@ -1603,7 +1605,7 @@ public MaturityReportData.MaturityModel GetBasicMaturityModel() { var query = ( from amm in _context.AVAILABLE_MATURITY_MODELS - join mm in _context.MATURITY_MODELS on amm.model_id equals mm.Maturity_Model_Id + join mm in _context.MATURITY_MODELS on amm.model_id equals mm.Maturity_Model_Id where amm.Assessment_Id == _assessmentId select new { amm, mm } ).FirstOrDefault(); @@ -1731,7 +1733,7 @@ public IEnumerable GetConfidentialTypes() return _context.CONFIDENTIAL_TYPE.OrderBy(x => x.ConfidentialTypeOrder); } - private void NullOutNavigationPropeties(List list) + private void NullOutNavigationPropeties(List list) { // null out a few navigation properties to avoid circular references that blow up the JSON stringifier foreach (MatRelevantAnswers a in list) @@ -1741,14 +1743,14 @@ private void NullOutNavigationPropeties(List list) a.Mat.InverseParent_Question = null; a.Mat.Parent_Question = null; - if (a.Mat.Grouping != null) - { + if (a.Mat.Grouping != null) + { a.Mat.Grouping.Maturity_Model = null; a.Mat.Grouping.MATURITY_QUESTIONS = null; a.Mat.Grouping.Type = null; } - if (a.Mat.Maturity_Level != null) + if (a.Mat.Maturity_Level != null) { a.Mat.Maturity_Level.MATURITY_QUESTIONS = null; a.Mat.Maturity_Level.Maturity_Model = null; @@ -1760,13 +1762,13 @@ public List GetIseSourceFiles() { var data = (from g in _context.GEN_FILE - join a in _context.MATURITY_SOURCE_FILES - on g.Gen_File_Id equals a.Gen_File_Id - join q in _context.MATURITY_QUESTIONS - on a.Mat_Question_Id equals q.Mat_Question_Id - - where q.Maturity_Model_Id == 10 - select new { a, q, g }).ToList(); + join a in _context.MATURITY_SOURCE_FILES + on g.Gen_File_Id equals a.Gen_File_Id + join q in _context.MATURITY_QUESTIONS + on a.Mat_Question_Id equals q.Mat_Question_Id + + where q.Maturity_Model_Id == 10 + select new { a, q, g }).ToList(); List result = new List(); SourceFiles file = new SourceFiles(); @@ -1777,13 +1779,13 @@ on a.Mat_Question_Id equals q.Mat_Question_Id file.Mat_Question_Id = item.q.Mat_Question_Id; file.Gen_File_Id = item.g.Gen_File_Id; file.Title = item.g.Title; - } - catch - { - + } + catch + { + } result.Add(file); - + } return result; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/RraSummary.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/RraSummary.cs index cc06628c68..8a8892d701 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/RraSummary.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/RraSummary.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/VADRReports.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/VADRReports.cs index f48acb8781..6b60567b14 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/VADRReports.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/VADRReports.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CSETGlobalProperties.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CSETGlobalProperties.cs index c847e0471f..3199b8d060 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CSETGlobalProperties.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CSETGlobalProperties.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CatalogRecommendationsTopicNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CatalogRecommendationsTopicNode.cs index 1d4ce309bf..8a61d0e006 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CatalogRecommendationsTopicNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/CatalogRecommendationsTopicNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FieldNames.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FieldNames.cs index a0bc81a332..ecdeb125c1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FieldNames.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FieldNames.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FlowDocManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FlowDocManager.cs index bf7dd65101..c7e1094f42 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FlowDocManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/FlowDocManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -37,7 +37,7 @@ public string GetFlowDoc(string type, int id) { flowDoc = _context.PROCUREMENT_LANGUAGE_DATA.FirstOrDefault(d => d.Procurement_Id == id).Flow_Document; } - + if (flowDoc == null) { return "None"; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ICSETGlobalProperties.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ICSETGlobalProperties.cs index 7bed8466fa..aad2d23167 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ICSETGlobalProperties.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ICSETGlobalProperties.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/IResourceLibraryRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/IResourceLibraryRepository.cs index c64932d2ec..812135931a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/IResourceLibraryRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/IResourceLibraryRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/NoneNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/NoneNode.cs index eef791d032..c3449bfd97 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/NoneNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/NoneNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/PDFNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/PDFNode.cs index 4217096b4c..f2500f1f50 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/PDFNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/PDFNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ProcurementLanguageTopicNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ProcurementLanguageTopicNode.cs index 568b2bee96..c78d104fd6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ProcurementLanguageTopicNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ProcurementLanguageTopicNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs index 4c9a2bd4ea..fb2743b13c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceLibraryRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceNode.cs index 83008a9ea6..899fab492d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/ResourceNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/SearchDocs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/SearchDocs.cs index d0ca46068b..aba2300157 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/SearchDocs.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/SearchDocs.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -120,7 +120,7 @@ public List Search(string term, bool isResourceDocs, bool isProcur listResourceDocuments.Add(resDoc); } } - + return listResourceDocuments.OrderBy(x => x.HeadingTitle).OrderByDescending(x => x.DatePublished).OrderByDescending(x => x.Score).ToList(); } catch (Exception exc) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/TopicNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/TopicNode.cs index 00ae499c81..c0ded11ddf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/TopicNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/TopicNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XLSXNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XLSXNode.cs index f43b279958..c6f0816329 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XLSXNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XLSXNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XPSNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XPSNode.cs index e7141515aa..1d39b971a4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XPSNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/RepositoryLibrary/XPSNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/GeneralSalBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/GeneralSalBusiness.cs index c02237a570..483e67e23f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/GeneralSalBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/GeneralSalBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -82,7 +82,7 @@ private double GetOverallSALWeight(List weights) //currently selected items can be retrieved from the database double weight = 0; foreach (GEN_SAL_WEIGHTS mapping in weights) - { + { weight += (double)mapping.Weight; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistProcessingLogic.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistProcessingLogic.cs index 5f1f4d067f..3ba92ebe4a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistProcessingLogic.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistProcessingLogic.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistQuestionPoco.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistQuestionPoco.cs index 97950601e8..e8408249a0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistQuestionPoco.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistQuestionPoco.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSalBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSalBusiness.cs index 4cabb7fe55..42bb3344fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSalBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSalBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSpecialFactor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSpecialFactor.cs index df32eb9275..9719e95bfd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSpecialFactor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/NistSpecialFactor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/SalBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/SalBusiness.cs index deff3c2240..11ce26b2c3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/SalBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Sal/SalBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,6 +12,9 @@ using CSETWebCore.Model.Sal; using CSETWebCore.DataLayer.Model; using Nelibur.ObjectMapper; +using CSETWebCore.Business.Standards; +using CSETWebCore.Helpers; +using CSETWebCore.Interfaces.Standards; namespace CSETWebCore.Business.Sal { @@ -19,6 +22,9 @@ public class SalBusiness : ISalBusiness { private CSETContext _context; private readonly IAssessmentModeData _assessmentModeData; + private readonly IAssessmentUtil _assessmentUtil; + private readonly IStandardsBusiness _standard; + private readonly IStandardSpecficLevelRepository _standardRepo; /// /// TSA's default level @@ -31,10 +37,62 @@ public class SalBusiness : ISalBusiness /// /// /// - public SalBusiness(CSETContext context, IAssessmentModeData assessmentModeData) + public SalBusiness(CSETContext context, IAssessmentModeData assessmentModeData, IAssessmentUtil assessmentUtil, + IStandardsBusiness standard, IStandardSpecficLevelRepository standardRepo) { _context = context; _assessmentModeData = assessmentModeData; + _assessmentUtil = assessmentUtil; + _standard = standard; + _standardRepo = standardRepo; + } + + + /// + /// Returns the currently-selected SAL answers. + /// + /// + public Sals GetSals(int assessmentId) + { + TinyMapper.Bind(); + TinyMapper.Bind(); + + STANDARD_SELECTION dbStandardSelection = _context.STANDARD_SELECTION.Find(assessmentId); + + Sals rsal; + if (dbStandardSelection == null) + { + rsal = new Sals() + { + Selected_Sal_Level = "Low", + Methodology = "Simple", + CLevel = "Low", + ALevel = "Low", + ILevel = "Low" + }; + dbStandardSelection = TinyMapper.Map(rsal); + dbStandardSelection.Last_Sal_Determination_Type = rsal.Methodology; + dbStandardSelection.Assessment_Id = assessmentId; + dbStandardSelection.Application_Mode = _assessmentModeData.DetermineDefaultApplicationMode(); + _context.STANDARD_SELECTION.Add(dbStandardSelection); + _context.SaveChanges(); + } + else + { + rsal = TinyMapper.Map(dbStandardSelection); + rsal.Methodology = dbStandardSelection.Last_Sal_Determination_Type; + } + + LevelManager lm = new LevelManager(assessmentId, _context); + lm.RetrieveOtherLevels(rsal); + + StandardRepository sr = new StandardRepository(_standard, _assessmentModeData, _context, _assessmentUtil, _standardRepo); + sr.InitializeStandardRepository(assessmentId); + sr.Confidence_Level = rsal.CLevel; + sr.Integrity_Level = rsal.ILevel; + sr.Availability_Level = rsal.ALevel; + + return rsal; } @@ -73,17 +131,18 @@ public void SetDefault(int assessmentId, string level = "Low") TinyMapper.Bind(); TinyMapper.Bind(); - STANDARD_SELECTION standardSelection = _context.STANDARD_SELECTION.Find(assessmentId); + //STANDARD_SELECTION standardSelection = _context.STANDARD_SELECTION.Find(assessmentId); Sals sals = new Sals() { Selected_Sal_Level = level, - Last_Sal_Determination_Type = "Simple", + Methodology = "Simple", CLevel = level, ALevel = level, ILevel = level }; + STANDARD_SELECTION standardSelection; standardSelection = TinyMapper.Map(sals); standardSelection.Assessment_Id = assessmentId; standardSelection.Application_Mode = _assessmentModeData.DetermineDefaultApplicationMode(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardRepository.cs index b5b73b15b7..df5686d189 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -324,7 +324,7 @@ public StandardModeEnum StandardMode get { return standardMode; } set { standardMode = value; } } - + private LevelManager levelManager; private STANDARD_SELECTION standard = null; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardSpecficLevelRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardSpecficLevelRepository.cs index 2b7797f530..2b8a4d69b0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardSpecficLevelRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardSpecficLevelRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardsBusiness.cs index ce0f4a6e26..a5b562a629 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Standards/StandardsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/User/UserBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/User/UserBusiness.cs index c39dfc4585..56679241f6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/User/UserBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/User/UserBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs index 41d347b902..ed3138756f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryEditorTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -46,7 +46,7 @@ public void GetUnusedTest() null, null, null); - foreach(var i in gallery.GetUnused("CF")) + foreach (var i in gallery.GetUnused("CF")) { Console.WriteLine(i.Gallery_Item_Guid); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryItemStateParserTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryItemStateParserTests.cs index 097717d28f..5d4a8b88f1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryItemStateParserTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/GalleryParser/GalleryItemStateParserTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Maturity/MaturityBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Maturity/MaturityBusinessTests.cs index 33b205b17f..af545dcfca 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Maturity/MaturityBusinessTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Maturity/MaturityBusinessTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Reports/ReportsDataBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Reports/ReportsDataBusinessTests.cs index e9751fa02b..b6aa07c5db 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Reports/ReportsDataBusinessTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Reports/ReportsDataBusinessTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -29,7 +29,7 @@ public void SendFileToMeritTest() } //private String GetProperty(String name) //{ - + // var query = _context.GLOBAL_PROPERTIES.Where(x => x.Property == name); // if (query.ToList().Count > 0) // { @@ -39,8 +39,8 @@ public void SendFileToMeritTest() // } - - + + //} } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/Constants.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/Constants.cs index ecf1ef8538..7cfd5fd16a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/Constants.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/Constants.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/StandardConstants.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/StandardConstants.cs index 748498e24c..7904a65b8b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/StandardConstants.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Constants/StandardConstants.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ByteBuffer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ByteBuffer.cs index f6856222f4..9050991452 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ByteBuffer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ByteBuffer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ColumnSetEncryption.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ColumnSetEncryption.cs index 78fa2e18c7..8b9cb68a2b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ColumnSetEncryption.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/ColumnSetEncryption.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/CryptoCommon.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/CryptoCommon.cs index 17c0beaeea..64a05f7a60 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/CryptoCommon.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/CryptoCommon.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,8 +10,8 @@ namespace CSETWebCore.CryptoBuffer { - public static class CryptoCommon - { + public static class CryptoCommon + { public static SymmetricAlgorithm GetSymmetricAlgorithm(SymmetricCryptoAlgorithm cryptoAlg) { SymmetricAlgorithm symmetricAlg; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/DecryptionBuffer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/DecryptionBuffer.cs index 74b088c7f7..77782af970 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/DecryptionBuffer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/DecryptionBuffer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,8 +9,8 @@ namespace CSETWebCore.CryptoBuffer { - public class DecryptionBuffer - { + public class DecryptionBuffer + { private readonly ByteBuffer _outBuffer = new ByteBuffer(); private readonly ByteBuffer _restBuffer = new ByteBuffer(); private ICryptoTransform _ic; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/EncryptionBuffer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/EncryptionBuffer.cs index b4f9de3c1e..b0bc64eb9f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/EncryptionBuffer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/EncryptionBuffer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/Id_StringPair.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/Id_StringPair.cs index 414fdbb995..3e0dc12a8a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/Id_StringPair.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.CryptoBuffer/Id_StringPair.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleSingletonAttribute.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleSingletonAttribute.cs index 456175e7a5..6c7c459dae 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleSingletonAttribute.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleSingletonAttribute.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleTransientAttribute.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleTransientAttribute.cs index a7b5740fca..383fc6f443 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleTransientAttribute.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Attributes/LifecycleTransientAttribute.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/AcetAnswerDistribution_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/AcetAnswerDistribution_Result.cs index 25c1bd7a8a..322904c13b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/AcetAnswerDistribution_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/AcetAnswerDistribution_Result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Components.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Components.cs index d4357a363d..1dba1e7ff3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Components.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Components.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -21,7 +21,7 @@ public partial class Answer_ComponentsXXX public string Comment { get; set; } public string Alternate_Justification { get; set; } public bool Is_Requirement { get; set; } - public int Question_Or_Requirement_Id { get; set; } + public int Question_Or_Requirement_Id { get; set; } public Nullable Question_Number { get; set; } public string Answer_Text { get; set; } public Guid Component_Guid { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions.cs index cefb44ad13..5bc6218ca3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,7 +20,7 @@ public partial class Answer_QuestionsXXX public string Comment { get; set; } public string Alternate_Justification { get; set; } public bool Is_Requirement { get; set; } - public int Question_Or_Requirement_Id { get; set; } + public int Question_Or_Requirement_Id { get; set; } public Nullable Question_Number { get; set; } public string Answer_Text { get; set; } public string Component_Guid { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions_No_Components.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions_No_Components.cs index 7c8826f412..5f40cfa884 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions_No_Components.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Questions_No_Components.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,7 +20,7 @@ public partial class Answer_Questions_No_ComponentsXXX public string Comment { get; set; } public string Alternate_Justification { get; set; } public bool Is_Requirement { get; set; } - public int Question_Or_Requirement_Id { get; set; } + public int Question_Or_Requirement_Id { get; set; } public Nullable Question_Number { get; set; } public string Answer_Text { get; set; } public Guid Component_Guid { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Requirements.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Requirements.cs index 5cbecea943..7d22925542 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Requirements.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/Answer_Requirements.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -21,7 +21,7 @@ public partial class Answer_RequirementsXXX public string Comment { get; set; } public string Alternate_Justification { get; set; } public bool Is_Requirement { get; set; } - public int Question_Or_Requirement_Id { get; set; } + public int Question_Or_Requirement_Id { get; set; } public Nullable Question_Number { get; set; } public string Answer_Text { get; set; } public string Component_Guid { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/CSETContext.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/CSETContext.cs index 5d82cb4118..d14e14d606 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/CSETContext.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/CSETContext.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,8 +17,8 @@ namespace CSETWebCore.DataLayer.Model { public class CSETContext : CsetwebContext { - private string _connectionString=null; - + private string _connectionString = null; + public CSETContext() { @@ -48,7 +48,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.Assessment_Id, e.model_id }); + entity.HasKey(e => new { e.Assessment_Id, e.model_id }); entity.HasOne(d => d.Assessment) .WithMany(p => p.AVAILABLE_MATURITY_MODELS) .HasForeignKey(d => d.Assessment_Id) @@ -156,7 +156,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) //modelBuilder.Query().ToView("Answer_Questions_No_Components").Property(v => v.Answer_Id).HasColumnName("Answer_Id"); } - + public virtual IList usp_GetSPRSScore(Nullable assessment_id) { @@ -177,7 +177,7 @@ public virtual IList usp_GetSPRSScore(Nullable assessment_id) public string ConnectionString { get { return this._connectionString; } } - + //NOTE When rebuilding this line must be added to the on @@ -197,20 +197,20 @@ public virtual IList usp_GetSPRSScore(Nullable assessment_id) //public virtual DbSet Answer_Components_Default { get; set; } public virtual IList usp_Answer_Components_Default(Nullable assessment_id) { - - if (!assessment_id.HasValue) - throw new ApplicationException("parameters may not be null"); - IList myrval = null; - this.LoadStoredProc("usp_Answer_Components_Default") - .WithSqlParam("assessment_id", assessment_id) + if (!assessment_id.HasValue) + throw new ApplicationException("parameters may not be null"); + + IList myrval = null; + this.LoadStoredProc("usp_Answer_Components_Default") + .WithSqlParam("assessment_id", assessment_id) + + .ExecuteStoredProc((handler) => + { + myrval = handler.ReadToList(); + }); + return myrval; - .ExecuteStoredProc((handler) => - { - myrval = handler.ReadToList(); - }); - return myrval; - } //public virtual DbSet Answer_Components_Overrides { get; set; } @@ -339,7 +339,7 @@ public int ChangeEmail(string originalEmail, string newEmail) public virtual IList usp_GetRawCountsForEachAssessment_Standards() { IList myrval = null; - this.LoadStoredProc("usp_GetRawCountsForEachAssessment_Standards") + this.LoadStoredProc("usp_GetRawCountsForEachAssessment_Standards") .ExecuteStoredProc((handler) => { myrval = handler.ReadToList(); @@ -351,8 +351,8 @@ public virtual IList analytics_compute_single_average { IList myrval = null; this.LoadStoredProc("analytics_compute_single_averages_maturity") - .WithSqlParam("assessment_id",assessmentId) - .WithSqlParam("maturity_model_id",maturity_model_id) + .WithSqlParam("assessment_id", assessmentId) + .WithSqlParam("maturity_model_id", maturity_model_id) .ExecuteStoredProc((handler) => { myrval = handler.ReadToList(); @@ -363,14 +363,14 @@ public virtual IList analytics_selectedStandardList(int assessmentI { IList myrval = null; this.LoadStoredProc("analytics_selectedStandardList") - .WithSqlParam("standard_assessment_id",assessmentId) + .WithSqlParam("standard_assessment_id", assessmentId) .ExecuteStoredProc((handler) => { myrval = handler.ReadToList(); }); return myrval; } - + public virtual IList analytics_getMedianOverall() { @@ -387,23 +387,23 @@ public virtual IList analytics_get IList myrval = null; this.LoadStoredProc("analytics_getMinMaxAverageForSectorIndustryGroup") .WithSqlParam("sector_id", sectorId) - .WithSqlParam("industry_id",industryId) + .WithSqlParam("industry_id", industryId) .ExecuteStoredProc((handler) => { myrval = handler.ReadToList(); }); return myrval; } - public virtual IList analytics_Compute_standard_all(int assessmentId, string setname, int? sectorId, + public virtual IList analytics_Compute_standard_all(int assessmentId, string setname, int? sectorId, int? industryId) { - + IList myrval = null; this.LoadStoredProc("analytics_Compute_standard_all") .WithSqlParam("assessment_id", assessmentId) .WithSqlParam("set_name", setname) - .WithSqlParam("sector_id", sectorId ==null?DBNull.Value:sectorId ) - .WithSqlParam("industry_id", industryId ==null?DBNull.Value:industryId) + .WithSqlParam("sector_id", sectorId == null ? DBNull.Value : sectorId) + .WithSqlParam("industry_id", industryId == null ? DBNull.Value : industryId) // .WithSqlParam("industry_id",industryId ==null?DBNull.Value:industryId) .ExecuteStoredProc((handler) => { @@ -411,9 +411,9 @@ public virtual IList analytics_Compute_standard_all( }); return myrval; } - public virtual IList analytics_compute_single_averages_standard(int assessmentId, string setname) + public virtual IList analytics_compute_single_averages_standard(int assessmentId, string setname) { - + IList myrval = null; this.LoadStoredProc("analytics_compute_single_averages_standard") .WithSqlParam("assessment_id", assessmentId) @@ -424,14 +424,14 @@ public virtual IList analytics_compute_single }); return myrval; } - - public virtual IList analytics_Compute_MaturityAll(int model_id, int? sectorId,int? industryId ) + + public virtual IList analytics_Compute_MaturityAll(int model_id, int? sectorId, int? industryId) { IList myrval = null; this.LoadStoredProc("analytics_Compute_MaturityAll") .WithSqlParam("maturity_model_id", model_id) - .WithSqlParam("sector_id", sectorId ==null?DBNull.Value:sectorId ) - .WithSqlParam("industry_id", industryId ==null?DBNull.Value:industryId) + .WithSqlParam("sector_id", sectorId == null ? DBNull.Value : sectorId) + .WithSqlParam("industry_id", industryId == null ? DBNull.Value : industryId) .ExecuteStoredProc((handler) => { myrval = handler.ReadToList(); @@ -452,24 +452,24 @@ public virtual IList analytics_Compute_Maturity public virtual void usp_CopyIntoSet(string sourcesetName, string destinationSetName) - { + { this.LoadStoredProc("usp_CopyIntoSet") .WithSqlParam("SourceSetName", sourcesetName) - .WithSqlParam("DestinationSetName",destinationSetName) + .WithSqlParam("DestinationSetName", destinationSetName) .ExecuteStoredProc((handler) => { - + }); } public virtual void usp_CopyIntoSet_Delete(string setName) { - this.LoadStoredProc("usp_CopyIntoSet_Delete") + this.LoadStoredProc("usp_CopyIntoSet_Delete") .WithSqlParam("DestinationSetName", setName) .ExecuteStoredProc((handler) => { - + }); } @@ -828,7 +828,7 @@ public virtual IList usp_GetTop5Areas(Nullable agg /// /// /// - public virtual IList InScopeQuestions (Nullable assessment_id) + public virtual IList InScopeQuestions(Nullable assessment_id) { if (!assessment_id.HasValue) throw new ApplicationException("parameters may not be null"); @@ -894,7 +894,8 @@ public virtual IList Get_Merge_Conflicts(NullableGet_Assess_Detail_Filters(string model) { + public virtual IList Get_Assess_Detail_Filters(string model) + { IList myrval = null; this.LoadStoredProc("Get_Assess_Detail_Filter_Data") .WithSqlParam("@model", model) @@ -905,7 +906,8 @@ public virtual IListGet_Assess_Detail_Filte return myrval.OrderBy(x => x.Detail_Id).ToList(); } - public virtual IListGet_Children_Answers(int parentId, int assessId) { + public virtual IList Get_Children_Answers(int parentId, int assessId) + { IList myrval = null; this.LoadStoredProc("GetChildrenAnswers") .WithSqlParam("@Parent_Id", parentId) @@ -914,7 +916,7 @@ public virtual IListGet_Children_Answers(int parentId, { myrval = handler.ReadToList(); }); - + return myrval; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/GetMaturityDetailsCalculations_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/GetMaturityDetailsCalculations_Result.cs index 2b052f1302..fb28dd1865 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/GetMaturityDetailsCalculations_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/GetMaturityDetailsCalculations_Result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/ID_result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/ID_result.cs index 613d3f4771..40d2fa2921 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/ID_result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/ID_result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/RawCountsForEachAssessment_Standards.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/RawCountsForEachAssessment_Standards.cs index 7bc6d1e598..c1b677656b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/RawCountsForEachAssessment_Standards.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/RawCountsForEachAssessment_Standards.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/SPRSScore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/SPRSScore.cs index 83f7d54054..8f1acb7271 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/SPRSScore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/SPRSScore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_GetOverallRankedCategoriesPage_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_GetOverallRankedCategoriesPage_Result.cs index 0c950cd70d..77df9da7b3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_GetOverallRankedCategoriesPage_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_GetOverallRankedCategoriesPage_Result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,7 +8,7 @@ namespace CSETWebCore.DataLayer.Model { using System; - + public partial class usp_GetOverallRankedCategoriesPage_Result { public string Question_Group_Heading { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_MaturityDetailsCalculations_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_MaturityDetailsCalculations_Result.cs index 5fdc8aed8b..eabe540d0e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_MaturityDetailsCalculations_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_MaturityDetailsCalculations_Result.cs @@ -1,12 +1,12 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// namespace CSETWebCore.DataLayer.Model -{ +{ public class usp_MaturityDetailsCalculations_Result { public int grouporder { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewedTabTotals_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewedTabTotals_Result.cs index fdf962da1d..4b8b1f3b3e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewedTabTotals_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewedTabTotals_Result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewed_Result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewed_Result.cs index a4e8095c49..a6a8c51a11 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewed_Result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_StatementsReviewed_Result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_countsForLevelsByGroupMaturityModelResults.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_countsForLevelsByGroupMaturityModelResults.cs index 53b2bdf45e..99b7b96134 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_countsForLevelsByGroupMaturityModelResults.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_countsForLevelsByGroupMaturityModelResults.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_financial_attributes_result.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_financial_attributes_result.cs index 5bc494c232..0fe910249e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_financial_attributes_result.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/usp_financial_attributes_result.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vParameter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vParameter.cs index d1eb04323a..c468b49cf0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vParameter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vParameter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vQUESTION_HEADINGS.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vQUESTION_HEADINGS.cs index 2f63aeb07f..6606040d0a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vQUESTION_HEADINGS.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Manual/vQUESTION_HEADINGS.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescription.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescription.cs index d20bcb2714..9f19ee347d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescription.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescription.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescriptionShort.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescriptionShort.cs index 8af091b22b..d0d2f22e41 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescriptionShort.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileDescriptionShort.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileResult.cs index a9bc95ea7a..151943f048 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/ModelDataAccess/FileResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DatabaseSetupException.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DatabaseSetupException.cs index fbe3a1e78b..05bec182fd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DatabaseSetupException.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DatabaseSetupException.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,16 +10,16 @@ namespace CSETWebCore.DatabaseManager { public class DatabaseSetupException : Exception { - public DatabaseSetupException() - { + public DatabaseSetupException() + { } - public DatabaseSetupException(string message) : base(message) - { + public DatabaseSetupException(string message) : base(message) + { } public DatabaseSetupException(string message, Exception inner) : base(message, inner) - { + { } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DbManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DbManager.cs index 8763b37572..3b9aee2bca 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DbManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/DbManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -61,7 +61,7 @@ public void SetupDb() if (LocalDb2022Installed) { - using (SqlLocalDbApi localDb = new SqlLocalDbApi()) + using (SqlLocalDbApi localDb = new SqlLocalDbApi()) { // Create and start our custom localdb instance @@ -72,7 +72,7 @@ public void SetupDb() { manager.Start(); } - } + } InitialDbInfo localDb2022Info = new InitialDbInfo(LocalDb2022ConnectionString, DatabaseCode); InitialDbInfo localDb2019Info = new InitialDbInfo(LocalDb2019ConnectionString, DatabaseCode); @@ -234,7 +234,7 @@ private void VerifyApplicationDatabaseFunctioning(InitialDbInfo targetLocalDbInf } } - private void DisplayOldLocalDbInstalledNotification(InitialDbInfo localdbInfo) + private void DisplayOldLocalDbInstalledNotification(InitialDbInfo localdbInfo) { if (!ApplicationCode.Equals("ACET")) { @@ -526,7 +526,7 @@ public string DatabaseCode { return ApplicationCode + "Web"; } - else if (ApplicationCode.Equals("CSET Renewables")) + else if (ApplicationCode.Equals("CSET Renewables")) { return "RENEWWeb"; } @@ -545,7 +545,7 @@ public string LocalDb2022ConnectionString // "INLLocalDb2022" is our custom localdb 2022 instance name, so we need to build it "custom". get { return @$"data source=(LocalDB)\{LOCALDB_2022_CUSTOM_INSTANCE_NAME};initial catalog={DatabaseCode};integrated security=SSPI;connect timeout=10;MultipleActiveResultSets=True;"; } } - + public string LocalDb2019ConnectionString { // "MSSQLLocalDB" is the default instance name for localdb2019 @@ -557,7 +557,7 @@ public string LocalDb2012ConnectionString // "v11.0" is the default instance name for localdb2012 get { return @$"data source=(LocalDB)\{LOCALDB_2012_DEFAULT_INSTANCE_NAME};initial catalog={DatabaseCode};integrated security=SSPI;connect timeout=5;MultipleActiveResultSets=True;"; } } - + public string DatabaseFileName { get { return $"{DatabaseCode}{DB_EXTENSION}"; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/InitialDbInfo.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/InitialDbInfo.cs index cdec4080b2..a14e6867c0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/InitialDbInfo.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/InitialDbInfo.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -33,7 +33,7 @@ public InitialDbInfo(string connectionString, string databaseCode) { conn.Open(); SqlCommand cmd = conn.CreateCommand(); - cmd.CommandText = "SELECT type_desc AS FileType, Physical_Name AS Location FROM sys.master_files mf INNER JOIN sys.databases db ON db.database_id = mf.database_id where db.name = '" + DatabaseCode+"'"; + cmd.CommandText = "SELECT type_desc AS FileType, Physical_Name AS Location FROM sys.master_files mf INNER JOIN sys.databases db ON db.database_id = mf.database_id where db.name = '" + DatabaseCode + "'"; SqlDataReader reader = cmd.ExecuteReader(); while (reader.Read()) @@ -54,11 +54,11 @@ public InitialDbInfo(string connectionString, string databaseCode) reader.Close(); if (MDF == null || LDF == null) - { + { Exists = false; - } + } else if (!File.Exists(MDF) || !File.Exists(LDF)) - { + { cmd.CommandText = "EXEC sp_detach_db '" + DatabaseCode + "', 'true'"; cmd.ExecuteNonQuery(); Exists = false; @@ -110,11 +110,11 @@ public Version GetInstalledDBVersion() return v; } } - catch + catch { return null; } - + } private Version GetDBVersion(SqlConnection conn) @@ -128,7 +128,7 @@ private Version GetDBVersion(SqlConnection conn) } public string MDF { get; } - public string LDF { get; } + public string LDF { get; } public string MasterConnectionString { get; } public string ConnectionString { get; } public string DatabaseCode { get; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs index ee02f845e5..364c570053 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,10 +27,10 @@ public class DbManagerTests { [TestMethod()] public void CopyDBAcrossServersTest() - { + { string clientCode = "DHS"; string appCode = "CSET"; - DbManager manager = new DbManager(new Version("12.1.2.1"),clientCode, appCode); + DbManager manager = new DbManager(new Version("12.1.2.1"), clientCode, appCode); //TODO finish this. //manager.CopyDBAcrossServers(); } @@ -46,7 +46,7 @@ public void CopyDBFromInstallationSource() //run the same test twice and make sure that the number increment works string mdf = $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\CSETWebTest.mdf"; string ldf = $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\CSETWebTest_log.ldf"; - manager.CopyDBFromInstallationSource(mdf,ldf); + manager.CopyDBFromInstallationSource(mdf, ldf); manager.CopyDBFromInstallationSource(mdf, ldf); manager.CopyDBFromInstallationSource(mdf, ldf); manager.CopyDBFromInstallationSource(mdf, ldf); @@ -59,8 +59,8 @@ public void TestUpgrade() //detach the csetweb database what evers it string testdb = Path.Combine(DbManager.GetExecutingDirectory().FullName, "data", "TestWeb.mdf"); string testlog = Path.Combine(DbManager.GetExecutingDirectory().FullName, "data", "TestWeb_log.ldf"); - File.Copy("data\\CSETWeb90.mdf", Path.Combine("data", testdb),true); - File.Copy("data\\CSETWeb90_log.ldf", Path.Combine("data", testlog),true); + File.Copy("data\\CSETWeb90.mdf", Path.Combine("data", testdb), true); + File.Copy("data\\CSETWeb90_log.ldf", Path.Combine("data", testlog), true); //C:\src\repos\cset\CSETWebApi\CSETWeb_Api\CSETWebCore.DatabaseManagerTests1\bin\Debug\net7.0\Data\TestWeb.mdf @@ -82,8 +82,8 @@ public void TestUpgrade() manager.SetupDb(); upgrader.UpgradeOnly(new Version("12.1.2.1"), "data source=(localdb)\\inllocaldb2022;initial catalog=TestWeb;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True"); - - + + } @@ -111,13 +111,13 @@ public void CopyDBFromInstallationSourceTest2() string conString = "Server=(localdb)\\inllocaldb2022;Integrated Security=true;AttachDbFileName=" + mdf; using (SqlConnection conn = new SqlConnection(conString)) { - conn.Open(); - SqlCommand cmd = conn.CreateCommand(); + conn.Open(); + SqlCommand cmd = conn.CreateCommand(); cmd.CommandText = "select * from CSET_Version;"; - SqlDataReader reader = cmd.ExecuteReader(); + SqlDataReader reader = cmd.ExecuteReader(); while (reader.NextResult()) - { - Assert.IsNotNull(reader.GetString(2)); + { + Assert.IsNotNull(reader.GetString(2)); } manager.CopyDBFromInstallationSource(mdf, ldf); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/ImportExportTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/ImportExportTests.cs index 4ba891ebdd..3fc1479969 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/ImportExportTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/ImportExportTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -63,15 +63,15 @@ public void Initialize() localHelper = provider.GetRequiredService(); passwordHash = provider.GetRequiredService(); config = configuration; - + } [TestMethod()] public void ImportAllAssessmentsTest() - { + { string clientCode = "DHS"; string appCode = "CSET"; - DbManager manager = new DbManager(new Version("12.0.1.3"),clientCode, appCode); + DbManager manager = new DbManager(new Version("12.0.1.3"), clientCode, appCode); } [TestMethod()] @@ -88,7 +88,7 @@ public void ExportAllAssessmentsTest() var assessments = context.ASSESSMENTS.Select(x => x.Assessment_Id).AsEnumerable(); #pragma warning restore CS8602 // Dereference of a possibly null reference. - for ( int i=0; i x.Assessment_Id == _assessmentId && x.Question_Type == "Maturity" && questionIds.Contains(x.Question_Or_Requirement_Id)).ToList(); IEnumerable list = from a in answers - join q in _context.MATURITY_QUESTIONS on a.Question_Or_Requirement_Id equals q.Mat_Question_Id - select new QuestionExport() - { - Question_Id = q.Mat_Question_Id, - Simple_Question = q.Question_Text, - Answer_Text = a.Answer_Text, - Mark_For_Review = a.Mark_For_Review ?? false, - Reviewed = a.Reviewed, - Is_Requirement = a.Is_Requirement ?? false, - Is_Maturity = a.Is_Maturity ?? false, - Is_Component = a.Is_Component ?? false, - Is_Framework = a.Is_Framework ?? false, - Comment = a.Comment, - Alternate_Justification = a.Alternate_Justification, - Answer_Id = a.Answer_Id - }; + join q in _context.MATURITY_QUESTIONS on a.Question_Or_Requirement_Id equals q.Mat_Question_Id + select new QuestionExport() + { + Question_Id = q.Mat_Question_Id, + Simple_Question = q.Question_Text, + Answer_Text = a.Answer_Text, + Mark_For_Review = a.Mark_For_Review ?? false, + Reviewed = a.Reviewed, + Is_Requirement = a.Is_Requirement ?? false, + Is_Maturity = a.Is_Maturity ?? false, + Is_Component = a.Is_Component ?? false, + Is_Framework = a.Is_Framework ?? false, + Comment = a.Comment, + Alternate_Justification = a.Alternate_Justification, + Answer_Id = a.Answer_Id + }; var rows = list.ToList(); rows.ForEach(q => @@ -246,7 +246,7 @@ join h in _context.vQUESTION_HEADINGS on q.Heading_Pair_Id equals h.Heading_Pair Simple_Question = q.Simple_Question, Answer_Text = a.Answer_Text, Mark_For_Review = a.Mark_For_Review ?? false, - Reviewed = a.Reviewed, + Reviewed = a.Reviewed, Is_Requirement = a.Is_Requirement, Is_Component = a.Is_Component, Is_Maturity = false, diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDiagramMappings.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDiagramMappings.cs index 46eb705f27..987ebb3ab6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDiagramMappings.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDiagramMappings.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDocument.cs index 6b8aa8c016..52708f4dbd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelNCUAMappings.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelNCUAMappings.cs index e7b3ae19fa..8d09764d30 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelNCUAMappings.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETtoExcelNCUAMappings.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -252,7 +252,7 @@ private void ProcessIseIRP(int assessmentID, ACETDashboard acetDashboard, ref Si } } - + } @@ -364,12 +364,14 @@ orderby mat_q.Parent_Question_Id if (g.Maturity_Level_Id == 17) { export.d[g.Question_Title] = answerTranslation[g.Answer_Text]; - } else if (g.Maturity_Level_Id == 18) + } + else if (g.Maturity_Level_Id == 18) { var modifiedTitle = g.Question_Title + 'c'; export.d[modifiedTitle] = answerTranslation[g.Answer_Text]; - } else if (g.Maturity_Level_Id == 19) + } + else if (g.Maturity_Level_Id == 19) { var modifiedTitle = g.Question_Title + "c+"; export.d[modifiedTitle] += answerTranslation[g.Answer_Text]; @@ -380,10 +382,10 @@ orderby mat_q.Parent_Question_Id -/// -/// Defines the column names and values in a single NCUA export row. -/// -public class SingleRowExport + /// + /// Defines the column names and values in a single NCUA export row. + /// + public class SingleRowExport { public Dictionary d = new Dictionary(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CreateExcelFile.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CreateExcelFile.cs index e7179e612f..539b312499 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CreateExcelFile.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CreateExcelFile.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/DataMap.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/DataMap.cs index 57ae652c82..15dae3176a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/DataMap.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/DataMap.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/ExcelExporter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/ExcelExporter.cs index 40c6d39286..04c2854f95 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/ExcelExporter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/ExcelExporter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AnswerDistribution.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AnswerDistribution.cs index 7d7dc89251..413e91ec02 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AnswerDistribution.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AnswerDistribution.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentModeData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentModeData.cs index 548a032331..15848db403 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentModeData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentModeData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentUtil.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentUtil.cs index 395ed7ba22..1537cc9876 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentUtil.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/AssessmentUtil.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/BuildNumberHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/BuildNumberHelper.cs index 1cc69a5097..5c2bc295a1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/BuildNumberHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/BuildNumberHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETDataPatches.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETDataPatches.cs index f0bb11b3e4..0d28cdd119 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETDataPatches.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETDataPatches.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore/Helpers/IRPHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore/Helpers/IRPHelper.cs index 842d0d3ed9..0158ae5910 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore/Helpers/IRPHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore/Helpers/IRPHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CmuScoringHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CmuScoringHelper.cs index 3cbde3ce21..16a7b93d8c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CmuScoringHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CmuScoringHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConsoleLogger.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConsoleLogger.cs index d0f7f50d98..65bafb1f64 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConsoleLogger.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConsoleLogger.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConverterResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConverterResult.cs index fd3c92aeb0..5a034b546f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConverterResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ConverterResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CrrScoringHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CrrScoringHelper.cs index f7d37fa79c..10e421e179 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CrrScoringHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CrrScoringHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -137,8 +137,8 @@ public void GetSubgroups(XElement xE, int? parentID, xGrouping.SetAttributeValue("groupingid", sg.Grouping_Id.ToString()); xGrouping.SetAttributeValue("title", sg.Title); xGrouping.SetAttributeValue("description", sg.Description); - if (domainRemark != null) - { + if (domainRemark != null) + { xGrouping.SetAttributeValue("remark", domainRemark.DomainRemarks); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CustomJsonWriter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CustomJsonWriter.cs index 019038c4d4..4f48000866 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CustomJsonWriter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CustomJsonWriter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DBIO.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DBIO.cs index 91bdf9e5c6..dd5336acbb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DBIO.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DBIO.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,7 +11,7 @@ using CSETWebCore.DataLayer.Model; namespace CSETWebCore.Helpers -{ +{ /// /// Database helper class. /// @@ -69,10 +69,11 @@ public void BulkExecute(DataTable dataTable, string tableName) { var connStr = _context.ConnectionString; - using (SqlConnection connection = new SqlConnection(connStr)) { - var transaction = connection.BeginTransaction(); + using (SqlConnection connection = new SqlConnection(connStr)) + { + var transaction = connection.BeginTransaction(); SqlBulkCopy bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.TableLock | SqlBulkCopyOptions.FireTriggers | SqlBulkCopyOptions.UseInternalTransaction - ,transaction); + , transaction); // set the destination table name bulkCopy.DestinationTableName = tableName; @@ -134,7 +135,7 @@ public int Execute(string sql, Dictionary parms) } break; } - + cmd.Parameters.Add(parm); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DocumentImporter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DocumentImporter.cs index c5de05994f..7355f40c69 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DocumentImporter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/DocumentImporter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/EDMScoring.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/EDMScoring.cs index 2ccdd07302..0fea735ed1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/EDMScoring.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/EDMScoring.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -34,7 +34,7 @@ public class EDMScoring private TopLevelScoreNode topNode; private CSETContext _context; - + public EDMScoring(CSETContext context) { _context = context; @@ -46,8 +46,8 @@ public void SetAnswers(int assessment_id) //then load the answers; var result = from a in _context.ANSWER - where a.Assessment_Id == assessment_id && a.Question_Type == "Maturity" - select a; + where a.Assessment_Id == assessment_id && a.Question_Type == "Maturity" + select a; foreach (var a in result.ToList()) { LeafNode leaf; @@ -74,7 +74,7 @@ public TopLevelScoreNode getPartialScore() while (tnode != null) { tnode.CalculatePartialScore(); - tnode = ((TopLevelScoreNode) tnode).TopLevelChild; + tnode = ((TopLevelScoreNode)tnode).TopLevelChild; } return this.topNode; @@ -87,7 +87,7 @@ public TopLevelScoreNode getPartialScore(int inputVal) while (tnode != null) { tnode.CalculatePartialScore(); - tnode = ((TopLevelScoreNode) tnode).TopLevelChild; + tnode = ((TopLevelScoreNode)tnode).TopLevelChild; } return this.topNode; @@ -100,7 +100,7 @@ private TopLevelScoreNode getPercentageScore() while (tnode != null) { tnode.CalculatePercentageScore(); - tnode = ((TopLevelScoreNode) tnode).TopLevelChild; + tnode = ((TopLevelScoreNode)tnode).TopLevelChild; } return this.topNode; @@ -117,9 +117,9 @@ private void localLoadStructure(TopLevelScoreNode topNode) //get the top level nodes //then add in all the children var result = from a in _context.MATURITY_QUESTIONS - join b in _context.MATURITY_GROUPINGS on a.Grouping_Id equals b.Grouping_Id - where a.Maturity_Model_Id == 3 - select new {a, b}; + join b in _context.MATURITY_GROUPINGS on a.Grouping_Id equals b.Grouping_Id + where a.Maturity_Model_Id == 3 + select new { a, b }; Dictionary questionIDtoTitle = new Dictionary(); foreach (var q in result.ToList()) { @@ -207,72 +207,75 @@ private TopLevelScoreNode staticAddMilTerms() private TopLevelScoreNode staticLoadTreeMidStructure() { - TopLevelScoreNode mil1 = new TopLevelScoreNode() {Title_Id = "MIL1", Description = "MIL1 - Performed"}; + TopLevelScoreNode mil1 = new TopLevelScoreNode() { Title_Id = "MIL1", Description = "MIL1 - Performed" }; midNodes.Add(mil1.Title_Id, mil1); - MidlevelScoreNode rf = new MidlevelScoreNode() {Title_Id = "RF", Description = "Relationship Formation"}; + MidlevelScoreNode rf = new MidlevelScoreNode() { Title_Id = "RF", Description = "Relationship Formation" }; mil1.Children.Add(rf); rf.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G1", Description = "Goal 1 - Acquirer service and asset priorities are established."}); + { Title_Id = "RF:G1", Description = "Goal 1 - Acquirer service and asset priorities are established." }); rf.Children.Add(new MidlevelScoreNode() { - Title_Id = "RF:G2", Description = "Goal 2 - Forming relationships with external entities is planned." + Title_Id = "RF:G2", + Description = "Goal 2 - Forming relationships with external entities is planned." }); rf.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G3", Description = "Goal 3 – Risk management includes external dependencies."}); + { Title_Id = "RF:G3", Description = "Goal 3 – Risk management includes external dependencies." }); rf.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G4", Description = "Goal 4 - External entities are evaluated."}); + { Title_Id = "RF:G4", Description = "Goal 4 - External entities are evaluated." }); rf.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G5", Description = "Goal 5 – Formal agreements include resilience requirements."}); + { Title_Id = "RF:G5", Description = "Goal 5 – Formal agreements include resilience requirements." }); rf.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G6", Description = "Goal 6 –Technology asset supply chain risks are managed."}); + { Title_Id = "RF:G6", Description = "Goal 6 –Technology asset supply chain risks are managed." }); MidlevelScoreNode rmg = new MidlevelScoreNode() - {Title_Id = "RMG", Description = "Relationship Management and Governance"}; + { Title_Id = "RMG", Description = "Relationship Management and Governance" }; mil1.Children.Add(rmg); rmg.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G1", Description = "Goal 1 - External dependencies are identified and prioritized."}); + { Title_Id = "RMG:G1", Description = "Goal 1 - External dependencies are identified and prioritized." }); rmg.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G2", Description = "Goal 2 - Supplier risk management is continuous."}); + { Title_Id = "RMG:G2", Description = "Goal 2 - Supplier risk management is continuous." }); rmg.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G3", Description = "Goal 3 – Supplier performance is governed and managed."}); + { Title_Id = "RMG:G3", Description = "Goal 3 – Supplier performance is governed and managed." }); rmg.Children.Add(new MidlevelScoreNode() { Title_Id = "RMG:G4", Description = "Goal 4 – Change and capacity management are applied to external dependencies." }); rmg.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G5", Description = "Goal 5 – Supplier transitions are managed."}); + { Title_Id = "RMG:G5", Description = "Goal 5 – Supplier transitions are managed." }); rmg.Children.Add(new MidlevelScoreNode() { - Title_Id = "RMG:G6", Description = "Goal 6 – Infrastructure and governmental dependencies are managed." + Title_Id = "RMG:G6", + Description = "Goal 6 – Infrastructure and governmental dependencies are managed." }); rmg.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G7", Description = "Goal 7 – External entity access to acquirer assets is managed."}); + { Title_Id = "RMG:G7", Description = "Goal 7 – External entity access to acquirer assets is managed." }); MidlevelScoreNode sps = new MidlevelScoreNode() - {Title_Id = "SPS", Description = "Service Protection and Sustainment"}; + { Title_Id = "SPS", Description = "Service Protection and Sustainment" }; mil1.Children.Add(sps); sps.Children.Add(new MidlevelScoreNode() - {Title_Id = "SPS:G1", Description = "Goal 1 - Disruption planning includes external dependencies."}); + { Title_Id = "SPS:G1", Description = "Goal 1 - Disruption planning includes external dependencies." }); sps.Children.Add(new MidlevelScoreNode() - {Title_Id = "SPS:G2", Description = "Goal 2 - Planning and controls are maintained and updated."}); + { Title_Id = "SPS:G2", Description = "Goal 2 - Planning and controls are maintained and updated." }); sps.Children.Add(new MidlevelScoreNode() { - Title_Id = "SPS:G3", Description = "Goal 3 – Situational awareness extends to external dependencies." + Title_Id = "SPS:G3", + Description = "Goal 3 – Situational awareness extends to external dependencies." }); addChildrenToList(mil1, midNodes); - TopLevelScoreNode mIL2 = new TopLevelScoreNode() {Title_Id = "MIL2", Description = "MIL2 - Planned"}; + TopLevelScoreNode mIL2 = new TopLevelScoreNode() { Title_Id = "MIL2", Description = "MIL2 - Planned" }; mIL2.TopLevelChild = mil1; midNodes.Add(mIL2.Title_Id, mIL2); - TopLevelScoreNode mIL3 = new TopLevelScoreNode() {Title_Id = "MIL3", Description = "MIL3 - Managed"}; + TopLevelScoreNode mIL3 = new TopLevelScoreNode() { Title_Id = "MIL3", Description = "MIL3 - Managed" }; mIL3.TopLevelChild = mIL2; midNodes.Add(mIL3.Title_Id, mIL3); - TopLevelScoreNode mIL4 = new TopLevelScoreNode() {Title_Id = "MIL4", Description = "MIL4 - Measured"}; + TopLevelScoreNode mIL4 = new TopLevelScoreNode() { Title_Id = "MIL4", Description = "MIL4 - Measured" }; mIL4.TopLevelChild = mIL3; midNodes.Add(mIL4.Title_Id, mIL4); - TopLevelScoreNode mIL5 = new TopLevelScoreNode() {Title_Id = "MIL5", Description = "MIL5 - Defined"}; + TopLevelScoreNode mIL5 = new TopLevelScoreNode() { Title_Id = "MIL5", Description = "MIL5 - Defined" }; mIL5.TopLevelChild = mIL4; midNodes.Add(mIL5.Title_Id, mIL5); return mIL5; @@ -302,61 +305,64 @@ private void cleanoutStructure() private TopLevelScoreNode staticLoadTree() { - TopLevelScoreNode mil1 = new TopLevelScoreNode() {Title_Id = "MIL1", Description = "MIL1 - Performed"}; + TopLevelScoreNode mil1 = new TopLevelScoreNode() { Title_Id = "MIL1", Description = "MIL1 - Performed" }; midNodes.Add(mil1.Title_Id, mil1); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G1", Description = "Goal 1 - Acquirer service and asset priorities are established."}); + { Title_Id = "RF:G1", Description = "Goal 1 - Acquirer service and asset priorities are established." }); mil1.Children.Add(new MidlevelScoreNode() { - Title_Id = "RF:G2", Description = "Goal 2 - Forming relationships with external entities is planned." + Title_Id = "RF:G2", + Description = "Goal 2 - Forming relationships with external entities is planned." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G3", Description = "Goal 3 – Risk management includes external dependencies."}); + { Title_Id = "RF:G3", Description = "Goal 3 – Risk management includes external dependencies." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G4", Description = "Goal 4 - External entities are evaluated."}); + { Title_Id = "RF:G4", Description = "Goal 4 - External entities are evaluated." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G5", Description = "Goal 5 – Formal agreements include resilience requirements."}); + { Title_Id = "RF:G5", Description = "Goal 5 – Formal agreements include resilience requirements." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RF:G6", Description = "Goal 6 –Technology asset supply chain risks are managed."}); + { Title_Id = "RF:G6", Description = "Goal 6 –Technology asset supply chain risks are managed." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G1", Description = "Goal 1 - External dependencies are identified and prioritized."}); + { Title_Id = "RMG:G1", Description = "Goal 1 - External dependencies are identified and prioritized." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G2", Description = "Goal 2 - Supplier risk management is continuous."}); + { Title_Id = "RMG:G2", Description = "Goal 2 - Supplier risk management is continuous." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G3", Description = "Goal 3 – Supplier performance is governed and managed."}); + { Title_Id = "RMG:G3", Description = "Goal 3 – Supplier performance is governed and managed." }); mil1.Children.Add(new MidlevelScoreNode() { Title_Id = "RMG:G4", Description = "Goal 4 – Change and capacity management are applied to external dependencies." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G5", Description = "Goal 5 – Supplier transitions are managed."}); + { Title_Id = "RMG:G5", Description = "Goal 5 – Supplier transitions are managed." }); mil1.Children.Add(new MidlevelScoreNode() { - Title_Id = "RMG:G6", Description = "Goal 6 – Infrastructure and governmental dependencies are managed." + Title_Id = "RMG:G6", + Description = "Goal 6 – Infrastructure and governmental dependencies are managed." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "RMG:G7", Description = "Goal 7 – External entity access to acquirer assets is managed."}); + { Title_Id = "RMG:G7", Description = "Goal 7 – External entity access to acquirer assets is managed." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "SPS:G1", Description = "Goal 1 - Disruption planning includes external dependencies."}); + { Title_Id = "SPS:G1", Description = "Goal 1 - Disruption planning includes external dependencies." }); mil1.Children.Add(new MidlevelScoreNode() - {Title_Id = "SPS:G2", Description = "Goal 2 - Planning and controls are maintained and updated."}); + { Title_Id = "SPS:G2", Description = "Goal 2 - Planning and controls are maintained and updated." }); mil1.Children.Add(new MidlevelScoreNode() { - Title_Id = "SPS:G3", Description = "Goal 3 – Situational awareness extends to external dependencies." + Title_Id = "SPS:G3", + Description = "Goal 3 – Situational awareness extends to external dependencies." }); foreach (ScoringNode s in mil1.Children) midNodes.Add(s.Title_Id, s); - TopLevelScoreNode mIL2 = new TopLevelScoreNode() {Title_Id = "MIL2", Description = "MIL2 - Planned"}; + TopLevelScoreNode mIL2 = new TopLevelScoreNode() { Title_Id = "MIL2", Description = "MIL2 - Planned" }; mIL2.TopLevelChild = mil1; midNodes.Add(mIL2.Title_Id, mIL2); - TopLevelScoreNode mIL3 = new TopLevelScoreNode() {Title_Id = "MIL3", Description = "MIL3 - Managed"}; + TopLevelScoreNode mIL3 = new TopLevelScoreNode() { Title_Id = "MIL3", Description = "MIL3 - Managed" }; mIL3.TopLevelChild = mIL2; midNodes.Add(mIL3.Title_Id, mIL3); - TopLevelScoreNode mIL4 = new TopLevelScoreNode() {Title_Id = "MIL4", Description = "MIL4 - Measured"}; + TopLevelScoreNode mIL4 = new TopLevelScoreNode() { Title_Id = "MIL4", Description = "MIL4 - Measured" }; mIL4.TopLevelChild = mIL3; midNodes.Add(mIL4.Title_Id, mIL4); - TopLevelScoreNode mIL5 = new TopLevelScoreNode() {Title_Id = "MIL5", Description = "MIL5 - Defined"}; + TopLevelScoreNode mIL5 = new TopLevelScoreNode() { Title_Id = "MIL5", Description = "MIL5 - Defined" }; mIL5.TopLevelChild = mIL4; midNodes.Add(mIL5.Title_Id, mIL5); return mIL5; @@ -504,7 +510,7 @@ public override ScoreStatus CalculateScoreStatus(List scores) } this.ColorStatus = score; - scores.Add(new EDMscore() {Title_Id = this.Title_Id, Color = this.ColorStatus.ToString()}); + scores.Add(new EDMscore() { Title_Id = this.Title_Id, Color = this.ColorStatus.ToString() }); return score; } } @@ -534,7 +540,7 @@ public override int CalculatePercentageScore() } this.PercentageCountRight = totalRight; - this.PercentageScore = (double) totalRight / (double) this.PercentageTotalCount; + this.PercentageScore = (double)totalRight / (double)this.PercentageTotalCount; return this.PercentageCountRight; } @@ -548,7 +554,7 @@ public override ScoreStatus CalculateScoreStatus(List scores) //green if they are all green ScoreStatus score = basicScore(scores); this.ColorStatus = score; - scores.Add(new EDMscore() {Title_Id = this.Title_Id, Color = this.ColorStatus.ToString()}); + scores.Add(new EDMscore() { Title_Id = this.Title_Id, Color = this.ColorStatus.ToString() }); return score; } } @@ -580,7 +586,7 @@ public override int CalculatePercentageScore() } this.PercentageCountRight = totalRight; - this.PercentageScore = (double) totalRight / (double) this.PercentageTotalCount; + this.PercentageScore = (double)totalRight / (double)this.PercentageTotalCount; return this.PercentageCountRight; } @@ -611,7 +617,7 @@ public override ScoreStatus CalculateScoreStatus(List scores) this.ColorStatus = ok ? ScoreStatus.Green : ScoreStatus.Red; } - scores.Add(new EDMscore() {Title_Id = this.Title_Id, Color = this.ColorStatus.ToString()}); + scores.Add(new EDMscore() { Title_Id = this.Title_Id, Color = this.ColorStatus.ToString() }); return this.ColorStatus; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/FileStreamingHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/FileStreamingHelper.cs index 5240a6e25f..d609e29bb9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/FileStreamingHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/FileStreamingHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -18,7 +18,7 @@ namespace CSETWebCore.Helpers { - public static class FileStreamingHelper + public static class FileStreamingHelper { private static readonly FormOptions _defaultFormOptions = new FormOptions(); @@ -100,12 +100,12 @@ private static Encoding GetEncoding(MultipartSection section) { MediaTypeHeaderValue mediaType; var hasMediaTypeHeader = MediaTypeHeaderValue.TryParse(section.ContentType, out mediaType); - // UTF-7 is insecure and should not be honored. UTF-8 will succeed in - // most cases. + // UTF-7 is insecure and should not be honored. UTF-8 will succeed in + // most cases. #pragma warning disable SYSLIB0001 // Type or member is obsolete - if (!hasMediaTypeHeader || Encoding.UTF7.Equals(mediaType.Encoding)) + if (!hasMediaTypeHeader || Encoding.UTF7.Equals(mediaType.Encoding)) #pragma warning restore SYSLIB0001 // Type or member is obsolete - { + { return Encoding.UTF8; } return mediaType.Encoding; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/IOHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/IOHelper.cs index 5abf6d7fbc..a0cd7081fe 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/IOHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/IOHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LevelManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LevelManager.cs index cdfa88b8a9..d30cb001dd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LevelManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LevelManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LocalInstallationHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LocalInstallationHelper.cs index 2ae5b4c7c3..256446c360 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LocalInstallationHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/LocalInstallationHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructure.cs index e52c0cabe9..4120815dc7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructure.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructure.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -179,8 +179,8 @@ private void GetSubgroups(List domainList, var question = new Model.Maturity.CPG.Question(); question.QuestionId = myQ.Mat_Question_Id; - question.ParentQuestionId = myQ.Parent_Question_Id; - question.Sequence = myQ.Sequence; + question.ParentQuestionId = myQ.Parent_Question_Id; + question.Sequence = myQ.Sequence; question.DisplayNumber = myQ.Question_Title; question.Answer = answer?.a.Answer_Text ?? ""; question.Comment = answer?.a.Comment ?? ""; @@ -199,8 +199,8 @@ private void GetSubgroups(List domainList, question.Practice = cpgPractice.FirstOrDefault()?.Html(); - question.Supplemental = myQ.Supplemental_Info; - + question.Supplemental = myQ.Supplemental_Info; + question.Scope = myQ.Scope; question.RecommendedAction = myQ.Recommend_Action; question.Services = myQ.Services; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureAsXml.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureAsXml.cs index 525c2bf3d6..fc27a850ef 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureAsXml.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureAsXml.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -161,7 +161,7 @@ private void GetSubgroupsAsXml(XElement xE, int? parentID, var remark = remarks.FirstOrDefault(r => r.Grouping_ID == sg.Grouping_Id); xGrouping.SetAttributeValue("remarks", remark != null ? remark.DomainRemarks : ""); - + // are there any questions that belong to this grouping? @@ -213,7 +213,7 @@ private void GetSubgroupsAsXml(XElement xE, int? parentID, xQuestion.SetAttributeValue("referencetext", - myQ.MATURITY_REFERENCE_TEXT.FirstOrDefault()?.Reference_Text); + myQ.MATURITY_REFERENCE_TEXT.FirstOrDefault()?.Reference_Text); } foreach (var prop in myQ.MATURITY_QUESTION_PROPS) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs index 60ed66b6df..a3e09c1c63 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -150,7 +150,7 @@ private void GetSubgroups(object oParent, int? parentID) // are there any questions that belong to this grouping? - var myQuestions = allQuestions.Where(x => x.Grouping_Id == sg.Grouping_Id + var myQuestions = allQuestions.Where(x => x.Grouping_Id == sg.Grouping_Id && x.Parent_Question_Id == null && x.Parent_Option_Id == null).ToList(); foreach (var myQ in myQuestions.OrderBy(s => s.Sequence)) @@ -308,7 +308,7 @@ private List diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/QuestionsHeatMap.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/QuestionsHeatMap.cs index 90870375e5..c4f320af97 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/QuestionsHeatMap.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/QuestionsHeatMap.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreBarChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreBarChart.cs index 93da008b30..e86e1af646 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreBarChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreBarChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -56,7 +56,7 @@ public ScoreBarChart(BarChartInput d) xSvg.Add(xRect); double pct = (double)d.AnswerCounts[i] / (double)maxAnswerCount; - double barHeight = barSectionHeight * pct; + double barHeight = barSectionHeight * pct; // don't render a zero-height bar; provide some minimal color if (barHeight < 1 || !double.IsFinite(barHeight)) { @@ -108,7 +108,7 @@ public ScoreBarChart(BarChartInput d) var percentage = ((double)d.AnswerCounts[0] / (double)d.AnswerCounts.Sum()) * 100; var value = (percentage >= 99 && percentage < 100 ? 99 : Math.Round(percentage, 0, MidpointRounding.AwayFromZero)); - if (!double.IsFinite(value)) + if (!double.IsFinite(value)) { value = 0; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreStackedBarChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreStackedBarChart.cs index 90114feb36..b62179568a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreStackedBarChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/ScoreStackedBarChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -39,7 +39,7 @@ public ScoreStackedBarChart(BarChartInput d) xSvg.SetAttributeValue("width", "100%"); xSvg.SetAttributeValue("height", d.Height.ToString()); - if (d.AnswerCounts.All(x => x == 0)) + if (d.AnswerCounts.All(x => x == 0)) { _isNA = true; @@ -110,6 +110,6 @@ public override string ToString() return ""; } return xDoc.ToString(); - } + } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/SprsScoreGauge.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/SprsScoreGauge.cs index c3d171ea22..b5a708bfd7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/SprsScoreGauge.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/SprsScoreGauge.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/WidgetResources.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/WidgetResources.cs index 0fe6153440..8a9cfcbfbe 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/WidgetResources.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ReportWidgets/WidgetResources.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/RequirementConverter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/RequirementConverter.cs index 8d5c2e93e0..29fe457c5a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/RequirementConverter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/RequirementConverter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ResourceHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ResourceHelper.cs index b8faa67097..85b2758d75 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ResourceHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/ResourceHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/SalCompare.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/SalCompare.cs index b01df7e28f..4065bf0057 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/SalCompare.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/SalCompare.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StandardConverter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StandardConverter.cs index ea922001e0..3f5e23005b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StandardConverter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StandardConverter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StatUtils.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StatUtils.cs index 5ca80e4bae..1dff086c42 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StatUtils.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StatUtils.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringExt.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringExt.cs index 93063a4f88..33aae57649 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringExt.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringExt.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringNumericComparer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringNumericComparer.cs index 985fe9b9b1..b5910f9f49 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringNumericComparer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/StringNumericComparer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TokenManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TokenManager.cs index 5c1d643de3..17e748fa93 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TokenManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TokenManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -303,7 +303,7 @@ public bool IsTokenValid(string tokenString) return false; } - + // see if the token has expired (we aren't really concerned with expiration on local installations) diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TransactionSecurity.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TransactionSecurity.cs index d3bd704f07..761da3dd14 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TransactionSecurity.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TransactionSecurity.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TrendDataProcessor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TrendDataProcessor.cs index 66cab21487..ec208aeeaa 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TrendDataProcessor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/TrendDataProcessor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UniqueIdGenerator.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UniqueIdGenerator.cs index c8e191a228..9e176d24f8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UniqueIdGenerator.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UniqueIdGenerator.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAccountSecurityManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAccountSecurityManager.cs index 0ff7b70275..4639355c5a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAccountSecurityManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAccountSecurityManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs index 48d240a6c6..a517759391 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/UserAuthentication.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/Utilities.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/Utilities.cs index 370cfb5ada..d2df715f99 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/Utilities.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/Utilities.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -93,7 +93,7 @@ public string GetClientHost() return string.Empty; } - var h = new Uri(referrer, UriKind.RelativeOrAbsolute); + var h = new Uri(referrer, UriKind.RelativeOrAbsolute); return h.GetLeftPart(UriPartial.Authority); } @@ -126,7 +126,7 @@ public void MoveActionItemsFrom_IseActions_To_HydroData(CSETContext context) } } */ - + } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CrrScoringHelperTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CrrScoringHelperTests.cs index 9260cd6670..d4cf79471c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CrrScoringHelperTests.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CrrScoringHelperTests.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -157,7 +157,7 @@ public void Test04_Mil1Yes() // Answer AM MIL-1 all YES var amMil1Questions = context.MATURITY_QUESTIONS .Where(q => q.Question_Title.StartsWith("AM:G")).Select(x => x.Mat_Question_Id).ToList(); - myAnswers = context.ANSWER.Where(a => a.Assessment_Id == assessmentId + myAnswers = context.ANSWER.Where(a => a.Assessment_Id == assessmentId && amMil1Questions.Contains(a.Question_Or_Requirement_Id)).ToList(); foreach (var ans in myAnswers) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ACETDashboard/IACETDashboardBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ACETDashboard/IACETDashboardBusiness.cs index 654976df62..68ee66d6d3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ACETDashboard/IACETDashboardBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ACETDashboard/IACETDashboardBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AdminTab/IAdminTabBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AdminTab/IAdminTabBusiness.cs index fda97b5f37..a0b6e90dfd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AdminTab/IAdminTabBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AdminTab/IAdminTabBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Aggregation/IAggregationBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Aggregation/IAggregationBusiness.cs index 849edafda7..6af3cc6e51 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Aggregation/IAggregationBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Aggregation/IAggregationBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Analytics/IAnalyticsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Analytics/IAnalyticsBusiness.cs index 91e803ba41..baea898f77 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Analytics/IAnalyticsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Analytics/IAnalyticsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,7 +12,7 @@ namespace CSETWebCore.Interfaces.Analytics { public interface IAnalyticsBusiness { - List getMaturityDashboardData(int maturity_model_id,int? sectorId, int? industryId); + List getMaturityDashboardData(int maturity_model_id, int? sectorId, int? industryId); List GetMaturityGroupsForAssessment(int assessmentId, int maturity_model_id); List GetStandardList(int assessmentId); List GetStandardMinMaxAvg(int assessmentId, string setname, int? sectorId, int? industryId); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs index 0cbe59cb9a..6434cf22cb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IACETAssessmentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs index 2f3105f095..5fce18e6d7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -24,7 +24,7 @@ public interface IAssessmentBusiness void GetMaturityModelDetails(ref AssessmentDetail assessment); void GetSelectedStandards(ref AssessmentDetail assessment); void SetFeaturesOnAssessmentRecord(int assessmentId); - + List GetOrganizationTypes(); bool IsCurrentUserOnAssessment(int assessmentId); ASSESSMENTS GetAssessmentById(int assessmentId); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/ICreateAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/ICreateAssessmentBusiness.cs index a1646514c8..ffb1642c40 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/ICreateAssessmentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/ICreateAssessmentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalDocument.cs index 723684040b..4b43eb1ade 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalRequirement.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalRequirement.cs index a49c7bbfe8..34609fc39a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalRequirement.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalRequirement.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalResource.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalResource.cs index addfdc6590..34b50d6694 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalResource.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalResource.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalStandard.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalStandard.cs index 1eb4414bba..c9de2013ac 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalStandard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IExternalStandard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IImportManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IImportManager.cs index 5bfdf0125b..a9fd8cdac9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IImportManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/AssessmentIO/IImportManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Cmu/ICmuScoringHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Cmu/ICmuScoringHelper.cs index 08b6bd774d..07b108ca79 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Cmu/ICmuScoringHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Cmu/ICmuScoringHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,7 +17,7 @@ namespace CSETWebCore.Interfaces.Cmu public interface ICmuScoringHelper { public int AssessmentId { get; set; } - public int ModelId { get;} + public int ModelId { get; } public XDocument XDoc { get; set; } public XDocument XCsf { get; set; } public void InstantiateScoringHelper(int assessmentId); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Common/IHtmlFromXamlConverter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Common/IHtmlFromXamlConverter.cs index 16f52d0cc6..5ff09f8260 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Common/IHtmlFromXamlConverter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Common/IHtmlFromXamlConverter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Contact/IContactBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Contact/IContactBusiness.cs index ad9d8d7ef8..79b90cb9f5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Contact/IContactBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Contact/IContactBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Crr/ICrrScoringHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Crr/ICrrScoringHelper.cs index 7c180096c7..dfc46a5da3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Crr/ICrrScoringHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Crr/ICrrScoringHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,7 +17,7 @@ namespace CSETWebCore.Interfaces.Crr public interface ICrrScoringHelper { public int AssessmentId { get; set; } - public int CrrModelId { get;} + public int CrrModelId { get; } public XDocument XDoc { get; set; } public XDocument XCsf { get; set; } public void InstantiateScoringHelper(int assessmentId); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Dashboard/IDashboardBussiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Dashboard/IDashboardBussiness.cs index 2c7daa3d72..c89f36fc6a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Dashboard/IDashboardBussiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Dashboard/IDashboardBussiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/GetName.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/GetName.cs index 233514fdee..6d704be0fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/GetName.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/GetName.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/ICisDemographicBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/ICisDemographicBusiness.cs index 0ea1f9d4bf..454501be82 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/ICisDemographicBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/ICisDemographicBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/IDemographicBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/IDemographicBusiness.cs index d3bc77ed6b..b3eb1a6096 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/IDemographicBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Demographic/IDemographicBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Diagram/IDiagramManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Diagram/IDiagramManager.cs index 22b4ff081c..c3f7cd072a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Diagram/IDiagramManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Diagram/IDiagramManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Document/IDocumentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Document/IDocumentBusiness.cs index 22ae66ad51..7325bd59a6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Document/IDocumentBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Document/IDocumentBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/FileRepository/IFileRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/FileRepository/IFileRepository.cs index f55638156d..08cf4550cb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/FileRepository/IFileRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/FileRepository/IFileRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Framework/IFrameworkBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Framework/IFrameworkBusiness.cs index 8b949e7e03..f1cdc4e0cc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Framework/IFrameworkBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Framework/IFrameworkBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IApiKeyManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IApiKeyManager.cs index e978d7af69..84551fb486 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IApiKeyManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IApiKeyManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentModeData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentModeData.cs index 5f42d160f3..aea83630e3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentModeData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentModeData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentUtil.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentUtil.cs index 7ee9ded1d7..fa4c845be4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentUtil.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IAssessmentUtil.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ILocalInstallationHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ILocalInstallationHelper.cs index ce7421078b..fe529f7a3b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ILocalInstallationHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ILocalInstallationHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IPasswordHash.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IPasswordHash.cs index b9aaa8f2ff..389d031ec2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IPasswordHash.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IPasswordHash.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IResourceHelper.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IResourceHelper.cs index fc4a029b34..178f5c84e7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IResourceHelper.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IResourceHelper.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITokenManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITokenManager.cs index 62b4da81f4..fe386cc330 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITokenManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITokenManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITrendDataProcessor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITrendDataProcessor.cs index ee004c3f4f..30f73b37e7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITrendDataProcessor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/ITrendDataProcessor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUserAuthentication.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUserAuthentication.cs index ac4fd9f4d9..8b1b5e560f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUserAuthentication.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUserAuthentication.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUtilities.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUtilities.cs index ea64e25e5b..02c1653373 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUtilities.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Helpers/IUtilities.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ILogger.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ILogger.cs index e54251de3b..1c9e248e59 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ILogger.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ILogger.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/IRP/IIRPBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/IRP/IIRPBusiness.cs index 541c2390f3..a2e95f14c1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/IRP/IIRPBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/IRP/IIRPBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs index d2b227d85b..8e700c1174 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/ICisQuestionsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/ICisQuestionsBusiness.cs index e265cdd1e3..848087e0d7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/ICisQuestionsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/ICisQuestionsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/IMaturityBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/IMaturityBusiness.cs index c7335b787e..9f2aae1f3e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/IMaturityBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Maturity/IMaturityBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ModuleBuilder/IModuleBuilderBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ModuleBuilder/IModuleBuilderBusiness.cs index cb3464704a..09dc1a79f4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ModuleBuilder/IModuleBuilderBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ModuleBuilder/IModuleBuilderBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Notification/INotificationBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Notification/INotificationBusiness.cs index f91f282783..56554e43ad 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Notification/INotificationBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Notification/INotificationBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IParameterContainer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IParameterContainer.cs index 5ad9de8328..68cc3278a0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IParameterContainer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IParameterContainer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionPoco.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionPoco.cs index 3e30486b0e..26cd68de4f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionPoco.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionPoco.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionRequirementManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionRequirementManager.cs index 7a986e9dd8..cb4a3b2f50 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionRequirementManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IQuestionRequirementManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IRequirementBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IRequirementBusiness.cs index 4210fcba10..ed786cefd4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IRequirementBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Question/IRequirementBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ReportEngine/IDataHandling.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ReportEngine/IDataHandling.cs index 0bfe74187c..185e3804e6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ReportEngine/IDataHandling.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ReportEngine/IDataHandling.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Reports/IReportsDataBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Reports/IReportsDataBusiness.cs index 77f9ebb8fa..7490d75f4c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Reports/IReportsDataBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Reports/IReportsDataBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ResourceLibrary/IFlowDocManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ResourceLibrary/IFlowDocManager.cs index 44c03aa3fc..b7fff20917 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ResourceLibrary/IFlowDocManager.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/ResourceLibrary/IFlowDocManager.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Sal/ISalBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Sal/ISalBusiness.cs index f0c411d4cb..86e0560e7b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Sal/ISalBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Sal/ISalBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardSpecficLevelRepository.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardSpecficLevelRepository.cs index 649748222e..84a349a4b2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardSpecficLevelRepository.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardSpecficLevelRepository.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardsBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardsBusiness.cs index b2aa904d91..f8156783df 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardsBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Standards/IStandardsBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/User/IUserBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/User/IUserBusiness.cs index 9a5ad3fb91..810dfe24f0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/User/IUserBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/User/IUserBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDashboard.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDashboard.cs index ac44a491f9..96f8ac23c5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDashboard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDashboard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDomain.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDomain.cs index e24fb04cfe..5447242b23 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDomain.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETDomain.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilter.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilter.cs index 3b6a5ad9af..8d5222bbeb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -14,7 +14,7 @@ public class ACETFilter { public String DomainName { get; set; } public int DomainId { get; set; } - + public List Tiers { get; set; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterSetting.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterSetting.cs index e8924e11af..293abb0011 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterSetting.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterSetting.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterValue.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterValue.cs index 2f926343e4..8b2944e719 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterValue.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/ACETFilterValue.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/DashboardDomain.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/DashboardDomain.cs index c00d88c1c6..6be771b54e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/DashboardDomain.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/DashboardDomain.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/GroupingSpanishRow.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/GroupingSpanishRow.cs index 5a6d18bbd2..e8adf85475 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/GroupingSpanishRow.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/GroupingSpanishRow.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPHeader.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPHeader.cs index 38f3123e71..944e143b6e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPHeader.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPHeader.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,8 +17,9 @@ public class IRPHeader /// /// Constructor. /// - public IRPHeader() { - irpList = new List(); + public IRPHeader() + { + irpList = new List(); } } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPModel.cs index dd71b6989f..7071944cef 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPResponse.cs index 89b4b82d00..10b036367e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -16,8 +16,9 @@ public class IRPResponse /// /// Constructor. /// - public IRPResponse() { - headerList = new List(); + public IRPResponse() + { + headerList = new List(); } } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSpanishRow.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSpanishRow.cs index caa151669f..e506427fdd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSpanishRow.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSpanishRow.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSummary.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSummary.cs index 4d1a45ab56..006522beca 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSummary.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Acet/IRPSummary.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveData.cs index bfef6de091..40ba3c1a35 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveResponse.cs index efae119d30..3feeed2cb9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminSaveResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminTabData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminTabData.cs index cce89a421d..6339cf2812 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminTabData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AdminTabData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AttributePair.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AttributePair.cs index 9bbbfe9ce1..7cf8ee1749 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AttributePair.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/AttributePair.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/FINANCIAL_HOURS_OVERRIDE.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/FINANCIAL_HOURS_OVERRIDE.cs index da8f08663f..8b4877d282 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/FINANCIAL_HOURS_OVERRIDE.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/FINANCIAL_HOURS_OVERRIDE.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/ReviewTotals.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/ReviewTotals.cs index 79de7ffd75..21e6c6a39f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/ReviewTotals.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AdminTab/ReviewTotals.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AggregAssessment.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AggregAssessment.cs index 966b89ec66..300d1c3286 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AggregAssessment.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AggregAssessment.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/Aggregation.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/Aggregation.cs index f7e2cbc728..a6f963490f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/Aggregation.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/Aggregation.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AliasSaveRequest.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AliasSaveRequest.cs index edd9b1befc..c4205b767c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AliasSaveRequest.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AliasSaveRequest.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AnswerCounts.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AnswerCounts.cs index 0fc57b5858..3d0e1f5c19 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AnswerCounts.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AnswerCounts.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentListResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentListResponse.cs index fa1c1647ed..da6750d7db 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentListResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentListResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentSelection.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentSelection.cs index b95c938d5f..420ccf330f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentSelection.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentSelection.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentStandardGrid.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentStandardGrid.cs index 391fdc15d1..588099a566 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentStandardGrid.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/AssessmentStandardGrid.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/BestToWorstCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/BestToWorstCategory.cs index a18909a36d..285f348760 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/BestToWorstCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/BestToWorstCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/ChartDataSet.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/ChartDataSet.cs index 1c181db540..bf93e0c8fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/ChartDataSet.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/ChartDataSet.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/GetComparisonBestToWorst.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/GetComparisonBestToWorst.cs index 9389793101..615c958d59 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/GetComparisonBestToWorst.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/GetComparisonBestToWorst.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/HorizBarChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/HorizBarChart.cs index c4916818e7..f18213403a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/HorizBarChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/HorizBarChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/LineChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/LineChart.cs index 3c12cf3861..c8f3c1c214 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/LineChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/LineChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeAnswer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeAnswer.cs index 0f19a4dd08..b5e8938af0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeAnswer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeAnswer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeCategory.cs index e24d16aaf4..152eef734c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeQuestion.cs index b82e90f974..b038dc82e8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeStructure.cs index 9135b231b8..33bc1a2e48 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeStructure.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MergeStructure.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MissedQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MissedQuestion.cs index f27980aae1..93b1922fe3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MissedQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/MissedQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/PieChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/PieChart.cs index 6738bbd16d..1c632fa7ae 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/PieChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/PieChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SalComparison.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SalComparison.cs index 0481d87c1b..1f0c5689e5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SalComparison.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SalComparison.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SelectedStandards.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SelectedStandards.cs index f42c59d0d3..c249764eb4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SelectedStandards.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/SelectedStandards.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getMinMaxAverageForSectorIndustryGroup.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getMinMaxAverageForSectorIndustryGroup.cs index 9493261875..b9e039c186 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getMinMaxAverageForSectorIndustryGroup.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getMinMaxAverageForSectorIndustryGroup.cs @@ -1,17 +1,17 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// using System; namespace CSETWebCore.Model.Aggregation { - public class analytics_getMinMaxAverageForSectorIndustryGroup - { + public class analytics_getMinMaxAverageForSectorIndustryGroup + { public string Question_Group_Heading { get; set; } public int Min { get; set; } - public int Max { get; set; } + public int Max { get; set; } public int Average { get; set; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getStandardsResultsByCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getStandardsResultsByCategory.cs index 78821ef052..af21302c8e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getStandardsResultsByCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/analytics_getStandardsResultsByCategory.cs @@ -1,22 +1,22 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// using System; namespace CSETWebCore.Model.Aggregation { - public class analytics_getStandardsResultsByCategory - { - - public string Short_Name { get; set; } - public string Set_Name { get; set; } - public string Question_Group_Heading { get; set; } - public int yaCount { get; set; } - public int Actualcr { get; set; } - public decimal prc { get; set; } - + public class analytics_getStandardsResultsByCategory + { + + public string Short_Name { get; set; } + public string Set_Name { get; set; } + public string Question_Group_Heading { get; set; } + public int yaCount { get; set; } + public int Actualcr { get; set; } + public decimal prc { get; set; } + } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getComponentsSummmary.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getComponentsSummmary.cs index 8d25a28627..4bf92355b8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getComponentsSummmary.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getComponentsSummmary.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardSummaryOverall.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardSummaryOverall.cs index 820aee4d98..ca7dd20d76 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardSummaryOverall.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardSummaryOverall.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardsResultsByCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardsResultsByCategory.cs index 69078d0742..762632c4ce 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardsResultsByCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Aggregation/usp_getStandardsResultsByCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/ChartData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/ChartData.cs index 4df379e5b9..c225d1e2a1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/ChartData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/ChartData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRows.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRows.cs index aebe0a484a..afe05072ee 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRows.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRows.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRowsPie.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRowsPie.cs index 22a5c99112..221a3d4eb7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRowsPie.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/DataRowsPie.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPage.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPage.cs index eee6f1265f..4f9bc64a16 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPage.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPage.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPageMultiResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPageMultiResult.cs index 326d2ef747..65f4ca69ca 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPageMultiResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/FirstPageMultiResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/GetCombinedOveralls.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/GetCombinedOveralls.cs index 34ed5cfb0e..3cc23a35a8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/GetCombinedOveralls.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/GetCombinedOveralls.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/MultiResultBase.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/MultiResultBase.cs index 7924e3413e..8854d35d5e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/MultiResultBase.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/MultiResultBase.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentTypes.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentTypes.cs index 5ad0ef80a8..60f3891d9d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentTypes.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentTypes.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsRankedCategories.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsRankedCategories.cs index 7fc4cde3d9..2db49d5969 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsRankedCategories.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsRankedCategories.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsResultsByCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsResultsByCategory.cs index 07b025a043..4066ef06d0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsResultsByCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getComponentsResultsByCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getRankedCategories.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getRankedCategories.cs index b3e52ed283..95286aaa55 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getRankedCategories.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getRankedCategories.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getStandardsRankedCategories.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getStandardsRankedCategories.cs index 9809302b2e..92d49a17b5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getStandardsRankedCategories.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analysis/usp_getStandardsRankedCategories.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analytics/Analytics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analytics/Analytics.cs index d526eac411..bc17bec091 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analytics/Analytics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Analytics/Analytics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsAssessment.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsAssessment.cs index 39d4c0293b..ba2a448a1c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsAssessment.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsAssessment.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsDemographic.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsDemographic.cs index 548d13c8cb..1d1ca9d4df 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsDemographic.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AnalyticsDemographic.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AssessmentDetail.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AssessmentDetail.cs index 92daf8cd0d..7c78ca6e72 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AssessmentDetail.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/AssessmentDetail.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -76,6 +76,6 @@ public class AssessmentDetail public string ExecutiveSummary { get; set; } public string TypeTitle { get; set; } public string TypeDescription { get; set; } - public string PciiNumber { get; set; } + public string PciiNumber { get; set; } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisOrganizationDemographics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisOrganizationDemographics.cs index ed02bb6f22..1c93c21b71 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisOrganizationDemographics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisOrganizationDemographics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceComposition.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceComposition.cs index 9ae5f71503..04682d2025 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceComposition.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceComposition.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceDemographics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceDemographics.cs index d1eba5cc7f..8d9b8e4014 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceDemographics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/CisServiceDemographics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs index 6475f14d72..12d0b590df 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/GalleryConfig.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/GalleryConfig.cs index c7edee705b..94dce6864c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/GalleryConfig.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/GalleryConfig.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/StartAssessment.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/StartAssessment.cs index c85536c3da..8ec9e0a7b3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/StartAssessment.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/StartAssessment.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,9 +8,9 @@ namespace CSETWebCore.Model.Assessment { -public class StartAssessment -{ - public string Workflow { get; set; } - public int GalleryId { get; set; } -} + public class StartAssessment + { + public string Workflow { get; set; } + public int GalleryId { get; set; } + } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalDocument.cs index 308f1171ad..2c4ddd9670 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalRequirement.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalRequirement.cs index 1bec3aa3dc..201abf91f1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalRequirement.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalRequirement.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalResource.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalResource.cs index aa6535646d..8cb82106b5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalResource.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalResource.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalStandard.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalStandard.cs index 50663be0ec..0362027bf7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalStandard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/ExternalStandard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/PropertyHelpers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/PropertyHelpers.cs index ad1fbad108..82e7498ed3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/PropertyHelpers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/PropertyHelpers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs index 5347b247e3..21f29182d2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/PasswordResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/PasswordResponse.cs index e77393719e..09484e42d2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/PasswordResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/PasswordResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/TokenResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/TokenResponse.cs index f3ec7c2d8d..ae331e0eb3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/TokenResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Auth/TokenResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/Login.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/Login.cs index fed3454de6..04d1bea154 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/Login.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/Login.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs index db3ace9aa5..218edad152 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Authentication/LoginResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Donuts.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Donuts.cs index 50b37e18e5..ef3bb87bed 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Donuts.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Donuts.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Heatmap.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Heatmap.cs index 1017165ef8..9068a2e3a3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Heatmap.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/C2M2/Heatmap.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Charting/ChartJs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Charting/ChartJs.cs index 154abe93e1..6dbddcc14a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Charting/ChartJs.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Charting/ChartJs.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cis/CisModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cis/CisModels.cs index 4819d633f2..b44428f9c3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cis/CisModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cis/CisModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -67,14 +67,14 @@ public class Question public string QuestionType { get; set; } public int Sequence { get; set; } - public int MaturityLevel { get; set; } + public int MaturityLevel { get; set; } public string MaturityLevelName { get; set; } public string DisplayNumber { get; set; } public string QuestionText { get; set; } public string AnswerText { get; set; } public string AnswerMemo { get; set; } - public string AltAnswerText { get; set; } + public string AltAnswerText { get; set; } public string SupplementalInfo { get; set; } public string ReferenceText { get; set; } @@ -147,7 +147,7 @@ public class Option } - public class IntegrityCheckOption + public class IntegrityCheckOption { public int OptionId { get; set; } public bool Selected { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cmu/CmuResultsModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cmu/CmuResultsModel.cs index 047e347bad..9a70c11923 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cmu/CmuResultsModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cmu/CmuResultsModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -75,7 +75,7 @@ public void GenerateWidthValues() foreach (CrrMaturityDomainModel domain in CrrDomains) { domain.WidthValpx = mil1Width * domain.DomainScore; - + if (domain.DomainScore > 1) { // reset to MIL-1 complete ... diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactAddParameters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactAddParameters.cs index 192eba9d91..c36865a18e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactAddParameters.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactAddParameters.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactCreateParameters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactCreateParameters.cs index 9154db6118..a7a49d16f0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactCreateParameters.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactCreateParameters.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactDetail.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactDetail.cs index 4101c231b2..f0f612508c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactDetail.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactDetail.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,12 +8,12 @@ namespace CSETWebCore.Model.Contact { public class ContactDetail { - public string FirstName{ get; set; } - public string LastName{ get; set; } - public string PrimaryEmail{ get; set; } - public int? UserId{ get; set; } - public string Title{ get; set; } - public string Phone{ get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + public string PrimaryEmail { get; set; } + public int? UserId { get; set; } + public string Title { get; set; } + public string Phone { get; set; } public string CellPhone { get; set; } public string ReportsTo { get; set; } public string EmergencyCommunicationsProtocol { get; set; } @@ -21,9 +21,9 @@ public class ContactDetail public bool IsPrimaryPoc { get; set; } public string OrganizationName { get; set; } public string SiteName { get; set; } - public int AssessmentId{ get; set; } - public int AssessmentRoleId{ get; set; } - public bool Invited{ get; set; } - public int AssessmentContactId{ get; set; } + public int AssessmentId { get; set; } + public int AssessmentRoleId { get; set; } + public bool Invited { get; set; } + public int AssessmentContactId { get; set; } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactInviteParameters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactInviteParameters.cs index 360ce76cb0..1f3d52fd52 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactInviteParameters.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactInviteParameters.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactRemoveParameters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactRemoveParameters.cs index ce4abcae9d..a16512c816 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactRemoveParameters.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactRemoveParameters.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchParameters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchParameters.cs index b8ceef214a..cb3c469bae 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchParameters.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchParameters.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchResult.cs index 7fc755d93c..7322c1665d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactSearchResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactsListResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactsListResponse.cs index dbbd1de015..f1129f5805 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactsListResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Contact/ContactsListResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrReportChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrReportChart.cs index e24042b954..2a9402d743 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrReportChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrReportChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrResultsModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrResultsModel.cs index c0ea078908..67bdc0bd0c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrResultsModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Crr/CrrResultsModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -72,7 +72,7 @@ public void GenerateWidthValues() foreach (CrrMaturityDomainModel domain in CrrDomains) { domain.WidthValpx = mil1Width * domain.DomainScore; - + if (domain.DomainScore > 1) { // reset to MIL-1 complete ... diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/AssessmentData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/AssessmentData.cs index d4b8ac4c56..5c45f88d60 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/AssessmentData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/AssessmentData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/BarChart.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/BarChart.cs index 5ad77936d2..513b40f2bb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/BarChart.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/BarChart.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/CategoryStatistics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/CategoryStatistics.cs index 57ba7de3f4..28ae08a4a5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/CategoryStatistics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/CategoryStatistics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/ChartDataTSA.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/ChartDataTSA.cs index 6a0351402e..58841a6480 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/ChartDataTSA.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/ChartDataTSA.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,8 +10,8 @@ namespace CSETWebCore.Model.Dashboard { - public class ChartDataTSA - { + public class ChartDataTSA + { //this is hokey sorry //but check this list if it is not empty then use this //list otherwise user the rest of the data @@ -28,10 +28,10 @@ public class ChartDataTSA public int ComponentCount { get; set; } public List DataRows { get; set; } public List DataRowsMaturity { get; set; } - public List DataRowsStandard { get; set; } + public List DataRowsStandard { get; set; } //public List DataRowsPie { get; set; } public List Colors { get; set; } - public List StandardList { get; set; } + public List StandardList { get; set; } public ChartDataTSA() { data = new List(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardChartData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardChartData.cs index f147179900..6105c1def3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardChartData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardChartData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardGraphData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardGraphData.cs index 9dc470e211..3896441d22 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardGraphData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardGraphData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,15 +10,15 @@ namespace CSETWebCore.Model.Dashboard { - public class DashboardGraphData - { + public class DashboardGraphData + { - public List Min { get; set; } + public List Min { get; set; } public List Median { get; set; } public List Max { get; set; } public BarChart BarData { get; set; } public int sampleSize { get; set; } } - + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardViewModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardViewModel.cs index 3bc1847d0b..592f9bef5f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardViewModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DashboardViewModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRows.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRows.cs index 343bbf6749..14568755f1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRows.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRows.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRowsAnalytics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRowsAnalytics.cs index 98cb7ea50e..a74003c53d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRowsAnalytics.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/DataRowsAnalytics.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,7 +27,7 @@ public class DataRowsAnalytics public double maximum { get; set; } public double average { get; set; } - + // the following fields are used for component type data display public int? yes { get; set; } public int? no { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/MedianScatterPlot.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/MedianScatterPlot.cs index 880d8f9fb2..e68900d95e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/MedianScatterPlot.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/MedianScatterPlot.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -10,12 +10,12 @@ namespace CSETWebCore.Model.Dashboard { - - public class MedianScatterPlot - { - public double x { get; set; } - public string y { get; set; } - } - + + public class MedianScatterPlot + { + public double x { get; set; } + public string y { get; set; } + } + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/SectorIndustryVM.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/SectorIndustryVM.cs index 93fd30be0f..ae2881d61e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/SectorIndustryVM.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/SectorIndustryVM.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,16 +9,16 @@ namespace CSETWebCore.Model.Dashboard { - public class SectorIndustryVM - { + public class SectorIndustryVM + { public int Id { get; set; } public int SectorId { get; set; } public string SectorName { get; set; } public List Industries { get; set; } - - } - + + } + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/TreeView.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/TreeView.cs index dbe3be3552..0d51ea7c43 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/TreeView.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Dashboard/TreeView.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/AssessmentSize.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/AssessmentSize.cs index e48fd1f1b5..4aad061a76 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/AssessmentSize.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/AssessmentSize.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/DemographicAssetValue.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/DemographicAssetValue.cs index 2f46f98fd0..145d62b12f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/DemographicAssetValue.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/DemographicAssetValue.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/ExtendedDemographic.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/ExtendedDemographic.cs index ee2452f7be..0b92e6f301 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/ExtendedDemographic.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/ExtendedDemographic.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,8 +19,8 @@ public class ExtendedDemographic public int? SectorId { get; set; } public int? SubSectorId { get; set; } - public string Hb7055 { get; set; } - public string Hb7055Party { get; set; } + public string Hb7055 { get; set; } + public string Hb7055Party { get; set; } /// /// Is the primary infrastructure IT or OT? diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Industry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Industry.cs index 0ee804d28a..8861a8806c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Industry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Industry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Sector.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Sector.cs index c1b77016b9..3af8ca1a81 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Sector.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Demographic/Sector.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkObject.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkObject.cs index 598538d5a9..2779b27683 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkObject.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkObject.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,12 +20,12 @@ public class CommonSecurityAdvisoryFrameworkObject public CommonSecurityAdvisoryFrameworkObject() { } - public CommonSecurityAdvisoryFrameworkObject(CommonSecurityAdvisoryFrameworkVendor vendor) + public CommonSecurityAdvisoryFrameworkObject(CommonSecurityAdvisoryFrameworkVendor vendor) { Product_Tree = new ProductTree(); Product_Tree.Branches = new List { new Branch { Name = vendor.Name } }; - foreach (var product in vendor.Products) - { + foreach (var product in vendor.Products) + { Product_Tree.Branches[0].Branches.Add(new Branch { Name = product.Name }); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkProduct.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkProduct.cs index 503e4bfc38..ec3007df4a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkProduct.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkProduct.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -16,19 +16,19 @@ public class CommonSecurityAdvisoryFrameworkProduct { public CommonSecurityAdvisoryFrameworkProduct() { } - public CommonSecurityAdvisoryFrameworkProduct(CommonSecurityAdvisoryFrameworkObject csafObj,CommonSecurityAdvisoryFrameworkObject.Branch branch) - { + public CommonSecurityAdvisoryFrameworkProduct(CommonSecurityAdvisoryFrameworkObject csafObj, CommonSecurityAdvisoryFrameworkObject.Branch branch) + { Name = branch.Name; Vulnerabilities = new List(); AffectedVersions = branch.Branches?[0].Name; AdvisoryUrl = csafObj.Document?.References?.Find(r => r.Category.ToLower() == "self")?.Url ?? csafObj.Document?.References[0]?.Url; - if (csafObj.Vulnerabilities != null) - { - foreach (var vulnerability in csafObj.Vulnerabilities) + if (csafObj.Vulnerabilities != null) + { + foreach (var vulnerability in csafObj.Vulnerabilities) { - if (vulnerability.Product_Status.Known_Affected.Contains(branch.Branches?[0].Product?.Product_Id)) - { + if (vulnerability.Product_Status.Known_Affected.Contains(branch.Branches?[0].Product?.Product_Id)) + { Vulnerabilities.Add(vulnerability); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkVendor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkVendor.cs index 5581ba3a6c..648eb1558d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkVendor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/CommonSecurityAdvisoryFrameworkVendor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -17,7 +17,7 @@ public class CommonSecurityAdvisoryFrameworkVendor { public CommonSecurityAdvisoryFrameworkVendor() { } - public CommonSecurityAdvisoryFrameworkVendor(CommonSecurityAdvisoryFrameworkObject csafObj) + public CommonSecurityAdvisoryFrameworkVendor(CommonSecurityAdvisoryFrameworkObject csafObj) { Name = csafObj.Product_Tree.Branches[0].Name; Products = new List(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentName.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentName.cs index bc76a09b02..a012663280 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentName.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentName.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentNameMap.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentNameMap.cs index 399dd99a49..826c92e844 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentNameMap.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentNameMap.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbol.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbol.cs index 9b73a7185e..be03e9ff1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbol.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbol.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbolGroup.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbolGroup.cs index e3951d49c4..2039330098 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbolGroup.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/ComponentSymbolGroup.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramRequest.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramRequest.cs index 2abb3388f6..1e2b71990d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramRequest.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramRequest.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramResponse.cs index 5b38e7bc3c..5cade059d5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramTemplate.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramTemplate.cs index 348563119c..c7c0428272 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramTemplate.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramTemplate.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramZones.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramZones.cs index 6ec842f8e1..bf9653b519 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramZones.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/DiagramZones.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/LayerVisibility.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/LayerVisibility.cs index 4b19c893f9..f08b72f701 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/LayerVisibility.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/LayerVisibility.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModel.cs index c5f54d4f0c..9d38e1c2cc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRoot.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRoot.cs index 67d58f4a78..de08f2082a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRoot.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRoot.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCell.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCell.cs index 20be08dcb5..e6efe7a325 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCell.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCell.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometry.cs index 20665e44b6..6c83866b96 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometryMxPoint.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometryMxPoint.cs index 7279dd1fda..196be5cf03 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometryMxPoint.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootMxCellMxGeometryMxPoint.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObject.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObject.cs index 006a8647ba..9ebeb71521 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObject.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObject.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -68,7 +68,7 @@ public string zoneLabel private string visibleField { get; set; } private string vendorNameField { get; set; } - + private string productNameField { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCell.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCell.cs index 4085ca892b..9774b07bce 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCell.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCell.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCellMxGeometry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCellMxGeometry.cs index f47f4f42e8..fa8354fcc0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCellMxGeometry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Diagram/mxGraphModelRootObjectMxCellMxGeometry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/Document.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/Document.cs index 2b1f7e2ec4..f27b11ce57 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/Document.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/Document.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadResult.cs index 50fed76dc2..b9cfccf78f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadStreamResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadStreamResult.cs index 31fc310667..4c1d7b1451 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadStreamResult.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Document/FileUploadStreamResult.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EDMscore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EDMscore.cs index 604f480235..69fe943b53 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EDMscore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EDMscore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAggregate.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAggregate.cs index d08387b1ec..23d82766e5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAggregate.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAggregate.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAppendixResults.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAppendixResults.cs index bac327afae..4c1adaaabf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAppendixResults.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmAppendixResults.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmScoreParent.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmScoreParent.cs index 605d2d9fa4..77ed423d6b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmScoreParent.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/EdmScoreParent.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/LeafNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/LeafNode.cs index 5c290acd24..dc90879086 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/LeafNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/LeafNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/MidlevelScoreNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/MidlevelScoreNode.cs index fcf20ba1f9..4812a0e073 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/MidlevelScoreNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/MidlevelScoreNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/ScoringNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/ScoringNode.cs index d176aef6c9..0d3757c7c1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/ScoringNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/ScoringNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/TopLevelScoreNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/TopLevelScoreNode.cs index d315a63e16..7cfc1c75d3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/TopLevelScoreNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Edm/TopLevelScoreNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkResponse.cs index 26f8754f2b..69a539e109 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTier.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTier.cs index c7df9c4331..1ae757106d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTier.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTier.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTierType.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTierType.cs index 2a86be6be0..0ea4bf31f9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTierType.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/FrameworkTierType.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/TierSelection.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/TierSelection.cs index 3d78d83320..cd940ed45e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/TierSelection.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Framework/TierSelection.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Gallery/GalleryItems.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Gallery/GalleryItems.cs index 34fd9dd070..ad73e3f792 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Gallery/GalleryItems.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Gallery/GalleryItems.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -86,5 +86,5 @@ public MaturityAnsweredQuestions() public string Comment { get; set; } } - + } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Hydro/HydroModels.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Hydro/HydroModels.cs index 282e520bc1..fe50ece14c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Hydro/HydroModels.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Hydro/HydroModels.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -46,7 +46,7 @@ public class HydroActionQuestion public HYDRO_DATA_ACTIONS ActionData { get; set; } } - public class HydroGroupingInfo + public class HydroGroupingInfo { public List QuestionsWithAnswers { get; set; } public int GroupingId { get; set; } @@ -111,7 +111,7 @@ public class Question public int QuestionId { get; set; } public string QuestionType { get; set; } public int Sequence { get; set; } - public int MaturityLevel { get; set; } + public int MaturityLevel { get; set; } public string MaturityLevelName { get; set; } public string DisplayNumber { get; set; } public string QuestionText { get; set; } @@ -119,7 +119,7 @@ public class Question public string AnswerText { get; set; } public string AnswerMemo { get; set; } - public string AltAnswerText { get; set; } + public string AltAnswerText { get; set; } public string SupplementalInfo { get; set; } public string ReferenceText { get; set; } @@ -187,7 +187,7 @@ public class Option } - public class IntegrityCheckOption + public class IntegrityCheckOption { public int OptionId { get; set; } public bool Selected { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs index 8e788efee3..8a541d6cc1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerColorDistrib.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerColorDistrib.cs index 45724468b2..a4ba6163ac 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerColorDistrib.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerColorDistrib.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerDistribItem.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerDistribItem.cs index c9968c7286..6d8195b8f7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerDistribItem.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/AnswerDistribItem.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GlossaryEntry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GlossaryEntry.cs index 04c7f497c0..abc59b0127 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GlossaryEntry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GlossaryEntry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GroupingTitle.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GroupingTitle.cs index efe11668fc..f79e685b86 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GroupingTitle.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/GroupingTitle.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs index 4bc48a34b1..3fe6c6845a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MatRelevantAnswers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -82,5 +82,5 @@ public MaturityAnsweredQuestions() public int MatQuestionId { get; set; } } - + } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityAssessment.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityAssessment.cs index efe1c8dc43..6eaaa06355 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityAssessment.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityAssessment.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityComponent.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityComponent.cs index 59534fba46..f3ba91a1d3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityComponent.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityComponent.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomain.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomain.cs index 47ae90cf82..3c8bb39b52 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomain.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomain.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomainRemarks.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomainRemarks.cs index 543de7ef09..950a77597a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomainRemarks.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityDomainRemarks.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityGrouping.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityGrouping.cs index 61b319d94e..3c2ffceade 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityGrouping.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityGrouping.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityLevel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityLevel.cs index 9401c0129b..504118166d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityLevel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityLevel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityMap.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityMap.cs index e9f1ce1258..1cd14d5a40 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityMap.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityMap.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityModel.cs index 6ce35e6d31..1f3fad58c5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs index 2339f6dea4..2bea9f4f41 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/MaturityResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/QuestionReferences.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/QuestionReferences.cs index eaa39ed28a..8a1596a992 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/QuestionReferences.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/QuestionReferences.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/SprsScoreModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/SprsScoreModel.cs index f377c4a396..89ea81b07d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/SprsScoreModel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/SprsScoreModel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,7 +27,7 @@ public SprsScoreModel() } public class SprsDomain - { + { public string DomainName { get; set; } public List Questions { get; set; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Module/EnabledModule.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Module/EnabledModule.cs index 54046b2324..9b37ea4416 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Module/EnabledModule.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Module/EnabledModule.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/CapabilityScore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/CapabilityScore.cs index cb6d161146..ebede9a42b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/CapabilityScore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/CapabilityScore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/DomainScore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/DomainScore.cs index 3d6e8261e7..1d804e5a6d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/DomainScore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/DomainScore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/FunctionScore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/FunctionScore.cs index a315fab7c6..52163e8604 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/FunctionScore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/FunctionScore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/LevelScore.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/LevelScore.cs index 71446cea67..377d8732d2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/LevelScore.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Mvra/LevelScore.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ActionItems.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ActionItems.cs index 9883a1db96..04e89c03d6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ActionItems.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ActionItems.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Importance.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Importance.cs index 1548489eb2..19b09bf2c7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Importance.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Importance.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Observation.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Observation.cs index 3e465606ff..a1d4811aed 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Observation.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/Observation.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ObservationContact.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ObservationContact.cs index c3839e7f98..ee1926bed0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ObservationContact.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Observations/ObservationContact.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Password/Password.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Password/Password.cs index 39b96b10b1..2f135ea3d5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Password/Password.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Password/Password.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/AnalyticsQuestionAnswer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/AnalyticsQuestionAnswer.cs index f3e59b16d3..358903405d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/AnalyticsQuestionAnswer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/AnalyticsQuestionAnswer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Answer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Answer.cs index 1733b17399..7e51152247 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Answer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Answer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/BaseQuestionInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/BaseQuestionInfoData.cs index 8ee99db4ee..02eca2e4d9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/BaseQuestionInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/BaseQuestionInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CategoryContainer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CategoryContainer.cs index e99bde1599..4204921ebf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CategoryContainer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CategoryContainer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ChildQuestionAnswers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ChildQuestionAnswers.cs index 989e53296b..641c05e6d5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ChildQuestionAnswers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ChildQuestionAnswers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ColorsList.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ColorsList.cs index 368f0a4232..a35cf1b5a4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ColorsList.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ColorsList.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CommentData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CommentData.cs index 949928bd66..a2cd606dee 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CommentData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CommentData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ComponentOverrideLinkInfo.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ComponentOverrideLinkInfo.cs index e4c5e9f661..5af0e197c9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ComponentOverrideLinkInfo.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ComponentOverrideLinkInfo.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CustomDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CustomDocument.cs index 8de8291f3e..540a7918c2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CustomDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/CustomDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Domain.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Domain.cs index a4f983ba4b..89836ef5a7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Domain.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/Domain.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/DomainAssessmentFactor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/DomainAssessmentFactor.cs index d31d4e1f2b..84ff500a9c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/DomainAssessmentFactor.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/DomainAssessmentFactor.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FeedbackQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FeedbackQuestion.cs index 0e3993465d..f3ed0441f7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FeedbackQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FeedbackQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkInfoData.cs index 6f65448983..a3a9451f7d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkQuestionItem.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkQuestionItem.cs index fdfd1ab5f2..4bcd55d755 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkQuestionItem.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FrameworkQuestionItem.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FullAnswer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FullAnswer.cs index 9d99ce34ed..5f7f742faa 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FullAnswer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/FullAnswer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/MaturityQuestionInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/MaturityQuestionInfoData.cs index 6c1875ec7d..5fbf7bcf90 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/MaturityQuestionInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/MaturityQuestionInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterAssessment.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterAssessment.cs index e8d85eefe9..ea4a4d4823 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterAssessment.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterAssessment.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterToken.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterToken.cs index ebba21b4d1..e8127f6e8f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterToken.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterToken.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterValues.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterValues.cs index 7b5d5031b4..97f236f309 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterValues.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/ParameterValues.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs index 69df4e58b5..5c477f6a0f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionGroup.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionGroup.cs index e6bd9b19bd..4cc6c63014 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionGroup.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionGroup.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionInfoData.cs index c154eab838..221dfbbb01 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionPlusHeaders.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionPlusHeaders.cs index a51322cd5a..d2c7130aa3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionPlusHeaders.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionPlusHeaders.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionProp.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionProp.cs index 27a4281343..41264685f4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionProp.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionProp.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionRequirementCounts.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionRequirementCounts.cs index 4342985ae1..559ede592d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionRequirementCounts.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionRequirementCounts.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionResponse.cs index 4957cf1030..ddb5b16c48 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionSubCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionSubCategory.cs index 9a65599119..a61ca4a604 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionSubCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionSubCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestion.cs index 260ddcd3d7..51ece8e239 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestionInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestionInfoData.cs index c67f613a16..dae7715949 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestionInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RelatedQuestionInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementInfoData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementInfoData.cs index 43bbc8e0ac..e3c1c95bac 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementInfoData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementInfoData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementLevel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementLevel.cs index 94f55bc683..968a6f4098 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementLevel.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementLevel.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementPlus.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementPlus.cs index 97f9e325b3..cc20553a0c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementPlus.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementPlus.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementTabData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementTabData.cs index c42a8460f5..1e5ca8a1e3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementTabData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementTabData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementsPass.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementsPass.cs index 9441abfeb2..c19827e519 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementsPass.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/RequirementsPass.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswers.cs index d3f29138fe..952b5721cd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswersPlus.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswersPlus.cs index 4192fa2cf7..2e4bbe9baf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswersPlus.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/SubCategoryAnswersPlus.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggInformation.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggInformation.cs index 54546a050b..ad4916442b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggInformation.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggInformation.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggregationReportData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggregationReportData.cs index fb07a62cf2..84345840fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggregationReportData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/AggregationReportData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/BasicReportData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/BasicReportData.cs index b1dbc272ef..833ac41bd7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/BasicReportData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/BasicReportData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -20,7 +20,7 @@ public class BasicReportData public string ApplicationMode { get; set; } public List top5Categories; - public INFORMATION information { get; set; } + public INFORMATION information { get; set; } public OverallSALTable salTable { get; set; } public GenSALTable genSalTable { get; set; } @@ -211,7 +211,7 @@ public class RelevantAnswers public bool Reviewed { get; set; } - + /// /// Constructor @@ -229,14 +229,14 @@ public List GetAnswersForAssessment(int assessmentID, CSETConte { List answers = new List(); - context.LoadStoredProc("[RelevantAnswers]") - .WithSqlParam("assessment_id", assessmentID) - .ExecuteStoredProc((handler) => - { - answers = handler.ReadToList().ToList(); - }); + context.LoadStoredProc("[RelevantAnswers]") + .WithSqlParam("assessment_id", assessmentID) + .ExecuteStoredProc((handler) => + { + answers = handler.ReadToList().ToList(); + }); - return answers; + return answers; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ControlRow.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ControlRow.cs index ba6ac7bb3f..3cacef1351 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ControlRow.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ControlRow.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityBasicReportData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityBasicReportData.cs index 0193c2cb23..48a2733a40 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityBasicReportData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityBasicReportData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportData.cs index 0c2e49d8c5..bc65ee30a7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -294,5 +294,5 @@ public LevelStats ToLevelStats(List questions, string level = return newLevelStats; } } - + } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportDetailData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportDetailData.cs index 2239a0e703..eb957a3011 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportDetailData.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/MaturityReportDetailData.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,14 +11,14 @@ namespace CSETWebCore.Business.Reports { public class MaturityReportDetailData { - public List RRASummaryOverall { get; set; } + public List RRASummaryOverall { get; set; } public List RRASummary { get; set; } public List RRASummaryByGoal { get; set; } public List RRASummaryByGoalOverall { get; set; } - public List VADRSummaryOverall { get; set; } + public List VADRSummaryOverall { get; set; } public List VADRSummary { get; set; } public List VADRSummaryByGoal { get; set; } public List VADRSummaryByGoalOverall { get; set; } - + } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/PdfString.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/PdfString.cs index 6b61a0dc69..4c356b9142 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/PdfString.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/PdfString.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ReportVM.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ReportVM.cs index 8b42699edb..5a416ac00c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ReportVM.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/ReportVM.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/StandardQuestions.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/StandardQuestions.cs index fb24d6410e..6afe78959d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/StandardQuestions.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Reports/StandardQuestions.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SearchRequest.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SearchRequest.cs index 9d11f72d74..b9d93c1d35 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SearchRequest.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SearchRequest.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SimpleNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SimpleNode.cs index 2e2d6a4a9e..96873a25f9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SimpleNode.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/ResourceLibrary/SimpleNode.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalPairs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalPairs.cs index fa660b1994..0e2c925be0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalPairs.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalPairs.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalWeights.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalWeights.cs index 1de38ce455..9e4127e92c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalWeights.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GenSalWeights.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GeneralSalDescriptionsWeights.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GeneralSalDescriptionsWeights.cs index 8f184aaa74..0244730b7d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GeneralSalDescriptionsWeights.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/GeneralSalDescriptionsWeights.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SalAnswers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SalAnswers.cs index c86ec8064a..f91c726095 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SalAnswers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SalAnswers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/Sals.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/Sals.cs index b124af0061..7f0557bced 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/Sals.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/Sals.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -8,12 +8,26 @@ namespace CSETWebCore.Model.Sal { public class Sals { + /// + /// Overall SAL + /// public string Selected_Sal_Level { get; set; } - public string Last_Sal_Determination_Type { get; set; } - public string Sort_Set_Name { get; set; } + + /// + /// User-overridden level + /// + public bool SelectedSALOverride { get; set; } + + /// + /// Methodology + /// + public string Methodology { get; set; } + + //public string Sort_Set_Name { get; set; } + public string CLevel { get; set; } public string ILevel { get; set; } public string ALevel { get; set; } - public bool SelectedSALOverride { get; set; } + } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SaveWeight.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SaveWeight.cs index 15aeba1b5b..b832112b7b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SaveWeight.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Sal/SaveWeight.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/AddQuestionsRequest.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/AddQuestionsRequest.cs index 96d01b79d8..35e222f075 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/AddQuestionsRequest.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/AddQuestionsRequest.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/BasicResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/BasicResponse.cs index 8a87ae5313..0d3231ec50 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/BasicResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/BasicResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoriesSubcategoriesGroupHeadings.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoriesSubcategoriesGroupHeadings.cs index 54c1d75793..abbf6b2cd6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoriesSubcategoriesGroupHeadings.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoriesSubcategoriesGroupHeadings.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoryEntry.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoryEntry.cs index d7925cdab7..e0193713b3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoryEntry.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/CategoryEntry.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/HeadingUpdateParms.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/HeadingUpdateParms.cs index 0d48a49076..3304d122c5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/HeadingUpdateParms.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/HeadingUpdateParms.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ModuleResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ModuleResponse.cs index 10251ef0c1..3078d40e2f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ModuleResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ModuleResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,7 +12,7 @@ public class ModuleResponse { public string SetFullName { get; set; } public string SetShortName { get; set; } - public string SetDescription { get; set; } + public string SetDescription { get; set; } public List Categories { get; set; } = new List(); } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionAdd.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionAdd.cs index 29ee107373..734a8818b5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionAdd.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionAdd.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionDetail.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionDetail.cs index 511e15fdc8..9705698d2f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionDetail.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionDetail.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListCategory.cs index 906d55ebdf..55c983ff0a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListResponse.cs index 1dc1778fd4..25398c0460 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListSubcategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListSubcategory.cs index 2ba6307770..51a26c22cc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListSubcategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionListSubcategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionSearch.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionSearch.cs index 0a5151e9eb..1bdaeaaa08 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionSearch.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionSearch.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionTextUpdateParms.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionTextUpdateParms.cs index 4131811a44..7498202ed5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionTextUpdateParms.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/QuestionTextUpdateParms.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDoc.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDoc.cs index aba5b2bc91..4da27c89b1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDoc.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDoc.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDocLists.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDocLists.cs index d6f87709c8..184680ee6f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDocLists.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/ReferenceDocLists.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Requirement.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Requirement.cs index 387e3bd773..05e32cc1bf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Requirement.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Requirement.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListCategory.cs index 6d27498566..b14e7d5032 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListSubcategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListSubcategory.cs index cec4edb002..8192753c39 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListSubcategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/RequirementListSubcategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SalParms.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SalParms.cs index 00748f59f5..29410ef493 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SalParms.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SalParms.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetCategory.cs index adc43ed290..328e00f879 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetDetail.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetDetail.cs index ae978ca878..b4b5d41c64 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetDetail.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetDetail.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetFileSelection.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetFileSelection.cs index ed06b8ec3a..e7b7b40c0a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetFileSelection.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetFileSelection.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetListResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetListResponse.cs index b0f2186be4..b6a74a5194 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetListResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetListResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetQuestion.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetQuestion.cs index 5b0e079598..b730550356 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetQuestion.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/SetQuestion.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Supplemental.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Supplemental.cs index 8a8758fd73..07da052458 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Supplemental.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Set/Supplemental.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/Standard.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/Standard.cs index 4728d6b839..b114c7667b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/Standard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/Standard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardCategory.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardCategory.cs index 39f093ea4f..7a5efa9358 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardCategory.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardCategory.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardsResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardsResponse.cs index b5bf8bc81c..685bbce3ae 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardsResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Standards/StandardsResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/CreateUser.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/CreateUser.cs index d7c4f8b85a..976902d94a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/CreateUser.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/CreateUser.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserCreateResponse.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserCreateResponse.cs index a51f25b1f7..41259ce5a6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserCreateResponse.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserCreateResponse.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserDetail.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserDetail.cs index a9b9c3d636..7548a659ac 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserDetail.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/User/UserDetail.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionHandler.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionHandler.cs index cbdea5473b..62568cdce2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionHandler.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionHandler.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,8 +27,8 @@ public static Version GetCurrentVersion() public static string GetCurrentVersionString() { Assembly assembly = Assembly.GetExecutingAssembly(); - FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location); - return fileVersionInfo.FileVersion; + FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location); + return fileVersionInfo.FileVersion; } public static System.Version NormalizeVersion(System.Version v) @@ -58,10 +58,10 @@ public static System.Version ConvertFromStringToVersion(String v) } } - + if (int.TryParse(v, out int version)) { - return NormalizeVersion( new System.Version(version, 0)); + return NormalizeVersion(new System.Version(version, 0)); } return NormalizeVersion(new System.Version(v)); } @@ -110,7 +110,7 @@ public string GetFullVersion() return versionText; } - catch + catch { //CSETLogger.Error("Failed to show version.", ex); return ""; diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1000.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1000.cs index d4f6aa4b6e..53896c11fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1000.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1000.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -37,7 +37,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\923_to_1000_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.2.3 file to 10.0.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1001.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1001.cs index 38f8503f21..c973c83cdc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1001.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1001.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,7 +19,7 @@ public class ConvertDatabase1001 : ConvertSqlDatabase /// /// Constructor. /// - public ConvertDatabase1001(string path):base(path) + public ConvertDatabase1001(string path) : base(path) { // Figure out where this program is running myVersion = new Version("10.0.1"); @@ -38,7 +38,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1000_to_1001_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.0.0 file to 10.0.1: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase101.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase101.cs index 33b27ed560..d822082fea 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase101.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase101.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -23,7 +23,7 @@ public ConvertDatabase101(string path) : base(path) { myVersion = new Version("10.1.0"); } - + /// /// Runs the database update script @@ -35,10 +35,10 @@ public override void Execute(SqlConnection conn) { RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1001_to_101.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1001_to_101_data.sql"), conn); - RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1001_to_101_data2.sql"), conn); + RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1001_to_101_data2.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.0.1 file to 10.1.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011.cs index ead3d853d8..3c9ec3f407 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -29,11 +29,11 @@ public override void Execute(SqlConnection conn) { try { - - RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\101_to_1011_data.sql"), conn); + + RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\101_to_1011_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.1.0 file to 10.1.1: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011Stub.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011Stub.cs index 27e7434baa..6c11ec737d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011Stub.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1011Stub.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -32,7 +32,7 @@ public override void Execute(SqlConnection conn) //nothing here just upgrade from non zero to adding zero this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.1.0 file to 10.1.1: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1012.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1012.cs index b3fd5065de..27af7b08fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1012.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1012.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,7 +28,7 @@ public ConvertDatabase1012(string path) : base(path) public override void Execute(SqlConnection conn) { try - { + { RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1011_to_1012_answerTable.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1011_to_1012.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1011_to_1012_data.sql"), conn); @@ -37,7 +37,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1011_to_1012_data3.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.1.1.0 to 10.1.2.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1020.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1020.cs index e48902e88b..891b98da7a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1020.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1020.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,12 +28,12 @@ public ConvertDatabase1020(string path) : base(path) public override void Execute(SqlConnection conn) { try - { + { RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1012_to_1020.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1012_to_1020_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.1.2.0 to 10.2.0.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1021.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1021.cs index 7f4cd31cec..c322459a45 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1021.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1021.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,12 +28,12 @@ public ConvertDatabase1021(string path) : base(path) public override void Execute(SqlConnection conn) { try - { + { RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1020_to_1021.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1020_to_1021_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.1.2.0 to 10.2.0.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1030.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1030.cs index 3775f93375..80fc817e37 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1030.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1030.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1031.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1031.cs index 7c03d9cbb5..dbdd33100b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1031.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase1031.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,13 +27,13 @@ public override void Execute(SqlConnection conn) { try { - + RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1030_to_1031_data.sql"), conn); RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1030_to_1031_data2.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.3.0.0 to 10.3.1.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10311.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10311.cs index 1433764730..b7a528064d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10311.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10311.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -26,12 +26,12 @@ public ConvertDatabase10311(string path) : base(path) public override void Execute(SqlConnection conn) { try - { + { RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\1030_to_1031_data2.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 10.3.1.0 to 10.3.1.1: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10312.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10312.cs index 0cc008517f..abb9cfc89e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10312.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10312.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,7 +11,7 @@ namespace UpgradeLibrary.Upgrade { - internal class ConvertDatabase10312: ConvertSqlDatabase + internal class ConvertDatabase10312 : ConvertSqlDatabase { public ConvertDatabase10312(string path) : base(path) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10313.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10313.cs index 006f8ad143..2538a4ef28 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10313.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10313.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,7 +9,7 @@ using System.IO; namespace UpgradeLibrary.Upgrade { - internal class ConvertDatabase10313: ConvertSqlDatabase + internal class ConvertDatabase10313 : ConvertSqlDatabase { public ConvertDatabase10313(string path) : base(path) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10314.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10314.cs index b661098f68..46be55b56f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10314.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase10314.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,7 +9,7 @@ using System.IO; namespace UpgradeLibrary.Upgrade { - internal class ConvertDatabase10314: ConvertSqlDatabase + internal class ConvertDatabase10314 : ConvertSqlDatabase { public ConvertDatabase10314(string path) : base(path) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11000.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11000.cs index ccd4bb7625..35c5845ca0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11000.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11000.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,7 +9,7 @@ using System.IO; namespace UpgradeLibrary.Upgrade { - internal class ConvertDatabase11000: ConvertSqlDatabase + internal class ConvertDatabase11000 : ConvertSqlDatabase { public ConvertDatabase11000(string path) : base(path) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11010.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11010.cs index e220f145da..0e4308227a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11010.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11010.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -9,7 +9,7 @@ using System.IO; namespace UpgradeLibrary.Upgrade { - internal class ConvertDatabase11010: ConvertSqlDatabase + internal class ConvertDatabase11010 : ConvertSqlDatabase { public ConvertDatabase11010(string path) : base(path) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11012.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11012.cs index aed93ccfe2..e5a669aabf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11012.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11012.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11013.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11013.cs index efcd90f74f..4586466b11 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11013.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11013.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11100.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11100.cs index 6dc1240c29..8ab1e781c7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11100.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11100.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11200.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11200.cs index f986f3e6ca..cdbc380989 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11200.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11200.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11210.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11210.cs index c61efbc052..e3f46445a1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11210.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase11210.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12000.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12000.cs index d7d96b4d1f..1eb587e783 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12000.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12000.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12001.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12001.cs index d3216fe38f..ea705c5b12 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12001.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12001.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -11,7 +11,7 @@ namespace UpgradeLibrary.Upgrade { internal class ConvertDatabase12001 : ConvertSqlDatabase { - private string path; + private string path; public ConvertDatabase12001(string path) : base(path) { myVersion = new Version("12.0.0.1"); diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120010.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120010.cs index d1a771e57e..84947bf029 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120010.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120010.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120011.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120011.cs index 2569ed79cf..e1f37cd166 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120011.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120011.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120012.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120012.cs index 1bb789cc4a..a32ab4ec3a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120012.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120012.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120013.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120013.cs index 5ad8fe9e6a..0cbfe1f412 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120013.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120013.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120014.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120014.cs index 369df4fefc..0cbc96b377 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120014.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120014.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120015.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120015.cs index 6bf9d2fbc6..6309ba8404 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120015.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120015.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120016.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120016.cs index 4adef398a3..0ef2db4636 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120016.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120016.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120017.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120017.cs index 347ef4d72d..cb13e3619d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120017.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120017.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120018.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120018.cs index 36f7eda69c..065ef09236 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120018.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120018.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120019.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120019.cs index 7034139b18..e694df34b2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120019.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase120019.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12002.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12002.cs index 0a93218f9f..72c5aa970b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12002.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12002.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12003.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12003.cs index f7737214e0..ee389bb70f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12003.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12003.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12004.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12004.cs index d0651c29bd..a6f8a4a08e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12004.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12004.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12005.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12005.cs index 58827feb50..c9becf8e25 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12005.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12005.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12006.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12006.cs index f47c335695..ad7b8c5089 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12006.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12006.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12007.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12007.cs index a3d2e7a230..a8823746ad 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12007.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12007.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12008.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12008.cs index 04fbecf8d7..e05cb12427 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12008.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12008.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12009.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12009.cs index 692978237a..569fbd2731 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12009.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12009.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12012.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12012.cs index e5dbaa2c6c..b2582eb26a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12012.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12012.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12013.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12013.cs index 2f6e96c090..58bc72ca00 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12013.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12013.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12014.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12014.cs index e7d0b9c591..5e358fec49 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12014.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12014.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12015.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12015.cs index b24338f633..9659d62238 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12015.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12015.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12016.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12016.cs index 5bca080d6d..154924229c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12016.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12016.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12017.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12017.cs index f0c4752920..c0e69b63db 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12017.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12017.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12018.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12018.cs index 544e7d9a30..4e2883fe02 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12018.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12018.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12019.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12019.cs index 977c8435ea..4a70c45136 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12019.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12019.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12020.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12020.cs index 8c90b767ce..c74193841e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12020.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12020.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12021.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12021.cs index 6b87e93c76..ce19f6664a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12021.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12021.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12022.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12022.cs index 74e73b1d7b..23bb6388e8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12022.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12022.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12023.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12023.cs index f655ac7923..2abf6d2f04 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12023.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12023.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12024.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12024.cs index ab3ac4e81b..a380e5b6cb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12024.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12024.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12025.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12025.cs index 2f7091eabf..d148903ce3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12025.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12025.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12026.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12026.cs index d4a5aaf206..aab8e3e45b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12026.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12026.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12027.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12027.cs index e438e6e64a..5425432852 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12027.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12027.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12028.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12028.cs index 1f4e142f79..c7f96e79f4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12028.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12028.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12029.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12029.cs index 00ac371539..7a83384246 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12029.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12029.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12030.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12030.cs index 41ce6022b8..6a870e1886 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12030.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12030.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12031.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12031.cs index e8b01387c2..ae82e2cbdc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12031.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12031.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12032.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12032.cs index 3f898d353f..e25f87d84e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12032.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12032.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12100.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12100.cs index b5b72047fb..54d437049c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12100.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12100.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12110.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12110.cs index f5fc6e8951..97e76e23ab 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12110.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12110.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12120.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12120.cs index e081efe08c..ca47f6f3fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12120.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12120.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12121.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12121.cs index 5f5c8ad27f..62551adf61 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12121.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12121.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase901.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase901.cs index c649b0589d..1e98cb51f3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase901.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase901.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -23,7 +23,7 @@ public ConvertDatabase901(string path) : base(path) { myVersion = new Version("9.0.1"); } - + /// /// Runs the database update script to take 9.0 to 9.0.1. @@ -39,7 +39,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\90_to_901_data2.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.0 to 9.0.1: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase902.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase902.cs index 10705f4165..405f66bca2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase902.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase902.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -34,10 +34,10 @@ public override void Execute(SqlConnection conn) try { // apply update scripts - RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\901_to_902.sql"), conn); + RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\901_to_902.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.0.1 to 9.0.2: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904.cs index d641160b2a..d0ea7438d8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,7 +19,7 @@ public class ConvertDatabase904 : ConvertSqlDatabase /// /// Constructor. /// - public ConvertDatabase904(string path):base(path) + public ConvertDatabase904(string path) : base(path) { myVersion = new Version("9.0.4"); } @@ -37,7 +37,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\903_to_904Data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.0.3 to 9.0.4: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904NCUA.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904NCUA.cs index 360320f4a9..9b7fbedfc5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904NCUA.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase904NCUA.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,7 +19,7 @@ public class ConvertDatabase904NCUA : ConvertSqlDatabase /// /// Constructor. /// - public ConvertDatabase904NCUA(string path):base(path) + public ConvertDatabase904NCUA(string path) : base(path) { myVersion = new Version("9.2.0"); } @@ -39,7 +39,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\904_to_920_Data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.0.4 to 9.2.0: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase92.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase92.cs index 2be2699038..ca44d2dd7e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase92.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase92.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -38,7 +38,7 @@ public override void Execute(SqlConnection conn) RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\901_to_920_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.0.1 to 9.2: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase921.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase921.cs index 0da2533033..0fa3c61286 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase921.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase921.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase922.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase922.cs index be363462c8..c662fc7832 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase922.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase922.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -36,7 +36,7 @@ public override void Execute(SqlConnection conn) // apply update scripts this.UpgradeToVersionLocalDB(conn, myVersion); } - catch (Exception e) + catch (Exception e) { throw new DatabaseUpgradeException("Error in upgrading database version 9.2.1 file to 9.2.2: " + e.Message); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase923.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase923.cs index 043ed2f6b3..12d341d752 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase923.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase923.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -33,7 +33,7 @@ public override void Execute(SqlConnection conn) { try { - + RunFile(Path.Combine(this.applicationPath, @"VersionUpgrader\SQL\922_to_923_data.sql"), conn); this.UpgradeToVersionLocalDB(conn, myVersion); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertSqlDatabase.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertSqlDatabase.cs index 2667a2670a..6beb883931 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertSqlDatabase.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertSqlDatabase.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -60,7 +60,7 @@ public virtual void Execute(SqlConnection conn) /// public virtual void RunFile(String file, SqlConnection conn) { - String[] splits = new string[] { "\r\nGO","\n\nGO","\nGO\n","\nGO" }; + String[] splits = new string[] { "\r\nGO", "\n\nGO", "\nGO\n", "\nGO" }; String stringCommands = ""; using (StreamReader sr = new StreamReader(file)) { @@ -134,7 +134,7 @@ public decimal CreateVersionId(Version v) decimal major = v.Major; string parseString = "." + v.Minor.ToString("0") + (v.Build != -1 ? v.Build.ToString("0") : "") + (v.Revision != -1 ? v.Revision.ToString("0") : ""); var decimalPortion = decimal.Parse(parseString); - + return major + decimalPortion; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/DatabaseUpgradeException.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/DatabaseUpgradeException.cs index 9ea15b0f7b..897ceddc7f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/DatabaseUpgradeException.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/DatabaseUpgradeException.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ICSETGlobalProperties.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ICSETGlobalProperties.cs index eb1c74f05c..dfb2024616 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ICSETGlobalProperties.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ICSETGlobalProperties.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/IConvertSqlDatabase.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/IConvertSqlDatabase.cs index c0d59eedee..f2af886306 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/IConvertSqlDatabase.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/IConvertSqlDatabase.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs index fe9b37905b..cd0bee051f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -31,15 +31,15 @@ public VersionUpgrader(string path) { ConvertDatabase901 convertDb901 = new ConvertDatabase901(path); converters.Add("9.0.0.0", convertDb901); - converters.Add("9.0.1.0", new ConvertDatabase92(path)); - //internal versions - converters.Add("9.0.2.0", new ConvertDatabase92(path)); - converters.Add("9.0.3.0", new ConvertDatabase904(path)); + converters.Add("9.0.1.0", new ConvertDatabase92(path)); + //internal versions + converters.Add("9.0.2.0", new ConvertDatabase92(path)); + converters.Add("9.0.3.0", new ConvertDatabase904(path)); converters.Add("9.0.4.0", new ConvertDatabase904NCUA(path)); converters.Add("9.2.0.0", new ConvertDatabase921(path)); converters.Add("9.2.1.0", new ConvertDatabase922(path)); converters.Add("9.2.2.0", new ConvertDatabase923(path)); - converters.Add("9.2.3.0", new ConvertDatabase1000(path)); + converters.Add("9.2.3.0", new ConvertDatabase1000(path)); converters.Add("10.0.0.0", new ConvertDatabase1001(path)); converters.Add("10.0.1.0", new ConvertDatabase101(path)); converters.Add("10.1.0.0", new ConvertDatabase1011(path)); @@ -126,7 +126,8 @@ public Version TestVersion(string connectionString) } } - private void upgradeDB(Version currentVersion, string localDBConnectionString) { + private void upgradeDB(Version currentVersion, string localDBConnectionString) + { Version dbVersion; using (SqlConnection conn = new SqlConnection(localDBConnectionString)) { diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ACETFilterController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ACETFilterController.cs index 6b7c4b1eef..66cb27dcf5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ACETFilterController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ACETFilterController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AdminTabController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AdminTabController.cs index 0bd4aac2a3..e00f09dfa9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AdminTabController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AdminTabController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationAnalysisController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationAnalysisController.cs index 718da040fc..f967a17051 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationAnalysisController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationAnalysisController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -37,7 +37,7 @@ public AggregationAnalysisController(ITokenManager tokenManager, ITrendDataProce [Route("api/aggregation/analysis/overallcompliancescore")] public IActionResult OverallComplianceScore([FromBody] AggBody body) { - int aggregationID = body.AggregationID; + int aggregationID = body.AggregationID; var assessmentList = _context.AGGREGATION_ASSESSMENT.Where(x => x.Aggregation_Id == aggregationID) .Include(x => x.Assessment) .Include(x => x.Assessment.STANDARD_SELECTION) diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs index d5970e1c86..7683e02c34 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationMaturityController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationMaturityController.cs index 783a795a4f..db3d24abea 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationMaturityController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AggregationMaturityController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalysisController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalysisController.cs index 25442cde7c..6161167866 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalysisController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalysisController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsController.cs index 4d26320b06..8423b7f619 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -90,7 +90,7 @@ private List GetQuestionsAnswers() { int assessmentId = _token.AssessmentForUser(); string applicationMode = _questionRequirement.GetApplicationMode(assessmentId); - + if (applicationMode.ToLower().StartsWith("questions")) { _question.SetQuestionAssessmentId(assessmentId); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsDashboardController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsDashboardController.cs index fb0d714876..fcb180326d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsDashboardController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AnalyticsDashboardController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -27,7 +27,7 @@ public AnalyticsDashboardController(ITokenManager token, IAnalyticsBusiness anal { _token = token; _analytics = analytics; - + } [HttpGet] diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs index 81844eeffb..f3f22b52b7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AngularConfigController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -40,9 +40,10 @@ public IActionResult GetConfigURLRewrite() try { Console.WriteLine("Reading the path test"); - if(System.IO.File.Exists(Path.Combine(_webHost.ContentRootPath, "WebApp/index.html"))){ + if (System.IO.File.Exists(Path.Combine(_webHost.ContentRootPath, "WebApp/index.html"))) + { Console.WriteLine(Path.Combine(_webHost.ContentRootPath, "WebApp/index.html")); - + //process this as if we are running internally else do what ever used to be the case //in this case they are running together and we can just replace the config document. var jd = processUpdatedJson(HttpContext.Request); @@ -66,7 +67,7 @@ public string ChangeConnectionString([FromBody] string connString) try { string currDirectory = Directory.GetCurrentDirectory(); - string appSettingsPath = currDirectory+ "\\appsettings.json"; + string appSettingsPath = currDirectory + "\\appsettings.json"; if (System.IO.File.Exists(appSettingsPath)) { @@ -78,7 +79,7 @@ public string ChangeConnectionString([FromBody] string connString) document["ConnectionStrings"].Replace(element); System.IO.File.WriteAllText(appSettingsPath, document.ToString()); - + return previousConnString; } else @@ -88,7 +89,7 @@ public string ChangeConnectionString([FromBody] string connString) } catch (Exception ex) { - return "Error: something went wrong with changing the connection string in \"appsettings.json\". "+ex.Message; + return "Error: something went wrong with changing the connection string in \"appsettings.json\". " + ex.Message; } } @@ -127,8 +128,8 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context) if (!webpath.Contains("WebApp")) { webpath = Path.Combine(_webHost.ContentRootPath, "WebApp"); - } - + } + var path = Path.Combine(webpath, "assets", "settings", "config.json"); //if the files are there then assume we are running together //replace and return it. @@ -143,7 +144,7 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context) element["url"] = context.Host.Host; if (String.IsNullOrWhiteSpace(context.Headers["X-Forwarded-Proto"])) - { + { element["protocol"] = context.Scheme; string port = "443"; if ((context.Host.Port == 80) || (context.Host.Port == 443)) @@ -167,7 +168,7 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context) if ((context.Host.Port == 80) || (context.Host.Port == 443)) port = ""; else - port = (context.Host.Port==null)?"":context.Host.Port.ToString(); + port = (context.Host.Port == null) ? "" : context.Host.Port.ToString(); element["port"] = port; } else @@ -182,7 +183,7 @@ Newtonsoft.Json.Linq.JObject processUpdatedJson(HttpRequest context) throw new Exception("Cannot Find config file" + path); } - + private JsonElement processConfig(HostString newBase, string scheme) @@ -192,14 +193,14 @@ private JsonElement processConfig(HostString newBase, string scheme) if (System.IO.File.Exists(path)) { string contents = System.IO.File.ReadAllText(path); - using (MemoryStream memoryStream = new MemoryStream()) + using (MemoryStream memoryStream = new MemoryStream()) { - using (Utf8JsonWriter writer = new Utf8JsonWriter(memoryStream)) + using (Utf8JsonWriter writer = new Utf8JsonWriter(memoryStream)) { using (JsonDocument jDoc = JsonDocument.Parse(contents)) { JsonElement root = jDoc.RootElement.Clone(); - + JsonElement overrideVal; if (root.TryGetProperty("override", out overrideVal) != false) if (overrideVal.ToString().Equals("true", StringComparison.CurrentCultureIgnoreCase)) @@ -237,8 +238,8 @@ private JsonElement processConfig(HostString newBase, string scheme) { element.WriteTo(writer); } - } - writer.WriteEndObject(); + } + writer.WriteEndObject(); } // create new JsonDocument with edited values writer.Flush(); @@ -252,7 +253,7 @@ private JsonElement processConfig(HostString newBase, string scheme) } - private Uri newUri(HostString newBase,string scheme, string oldUri) + private Uri newUri(HostString newBase, string scheme, string oldUri) { //set the hostname and port to the same as the new base return the new uri UriBuilder tmp = new UriBuilder(oldUri); @@ -260,7 +261,7 @@ private Uri newUri(HostString newBase,string scheme, string oldUri) if ((newBase.Port == 80) || (newBase.Port == 443)) tmp.Port = -1; else - tmp.Port = newBase.Port??80; + tmp.Port = newBase.Port ?? 80; tmp.Scheme = scheme; return tmp.Uri; diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs index b28e6524e8..67cb020dd4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -45,7 +45,7 @@ public class AssessmentController : ControllerBase private readonly IGalleryEditor _galleryEditor; public AssessmentController(IAssessmentBusiness assessmentBusiness, - IACETAssessmentBusiness acetAssessmentBusiness, + IACETAssessmentBusiness acetAssessmentBusiness, ITokenManager tokenManager, IDocumentBusiness documentBusiness, CSETContext context, IStandardsBusiness standards, IAssessmentUtil assessmentUtil, IAdminTabBusiness adminTabBusiness, IGalleryEditor galleryEditor) @@ -74,7 +74,7 @@ public AssessmentController(IAssessmentBusiness assessmentBusiness, public IActionResult CreateAssessment([FromQuery] string workflow, [FromQuery] Guid galleryGuid, [FromQuery] string csn = null) { var currentUserId = _tokenManager.GetUserId(); - + // read the 'recipe' for the assessment GalleryConfig config = null; var galleryItem = _context.GALLERY_ITEM.FirstOrDefault(x => x.Gallery_Item_Guid == galleryGuid); @@ -98,12 +98,12 @@ public IActionResult CreateAssessment([FromQuery] string workflow, [FromQuery] G } } - ICreateAssessmentBusiness assessmentBusiness = (ICreateAssessmentBusiness) _assessmentBusiness; + ICreateAssessmentBusiness assessmentBusiness = (ICreateAssessmentBusiness)_assessmentBusiness; switch (config.Model?.ModelName) { case "ACET": case "ISE": - assessmentBusiness = (ICreateAssessmentBusiness) _acsetAssessmentBusiness; + assessmentBusiness = (ICreateAssessmentBusiness)_acsetAssessmentBusiness; break; } @@ -198,7 +198,7 @@ public IActionResult CreateAssessment([FromQuery] string workflow, [FromQuery] G assessment.UseDiagram = true; } - + // Origin if (config.Origin != null) { @@ -348,13 +348,13 @@ public IActionResult GetLastModified() return Ok(dtLocal.ToString("MM/dd/yyyy hh:mm:ss tt zzz")); } - + /// /// /// [HttpGet] [Route("api/getMergeNames")] - public IActionResult GetMergeNames([FromQuery] int id1, [FromQuery] int id2, [FromQuery] int id3, + public IActionResult GetMergeNames([FromQuery] int id1, [FromQuery] int id2, [FromQuery] int id3, [FromQuery] int id4, [FromQuery] int id5, [FromQuery] int id6, [FromQuery] int id7, [FromQuery] int id8, [FromQuery] int id9, [FromQuery] int id10) { @@ -373,13 +373,13 @@ public IActionResult GetPreventEncryptStatus() var ak = _tokenManager.GetAccessKey(); IQueryable query = null; - if (userId != null) + if (userId != null) { query = from u in _context.USERS where u.UserId == userId select u.PreventEncrypt; } - else if (ak != null) + else if (ak != null) { query = from a in _context.ACCESS_KEY where a.AccessKey == ak @@ -387,7 +387,7 @@ public IActionResult GetPreventEncryptStatus() } var result = query.ToList().FirstOrDefault(); - + return Ok(result); } @@ -405,7 +405,7 @@ public IActionResult SavePreventEncryptStatus([FromBody] bool status) user.PreventEncrypt = status; _context.SaveChanges(); } - else if (ak != null) + else if (ak != null) { var accessKey = _context.ACCESS_KEY.Where(x => x.AccessKey == ak).FirstOrDefault(); @@ -461,8 +461,8 @@ public IActionResult UpdateSubmissionStatus() public IActionResult clearFirstTime() { int assessmentId = _tokenManager.AssessmentForUser(); - int userid = _tokenManager.GetCurrentUserId()??0; - this._assessmentBusiness.clearFirstTime(userid,assessmentId); + int userid = _tokenManager.GetCurrentUserId() ?? 0; + this._assessmentBusiness.clearFirstTime(userid, assessmentId); return Ok(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentExportController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentExportController.cs index 0a4559ee51..ed52459b68 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentExportController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentExportController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -39,7 +39,7 @@ public AssessmentExportController(ITokenManager token, CSETContext context, IHtt [HttpGet] [Route("api/assessment/export")] public IActionResult ExportAssessment([FromQuery] string token, [FromQuery] string password = "", [FromQuery] string passwordHint = "") - { + { try { _token.SetToken(token); @@ -58,7 +58,7 @@ public IActionResult ExportAssessment([FromQuery] string token, [FromQuery] stri NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}"); } - return null; + return null; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentImportController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentImportController.cs index 6ddb2aaf5e..9ba2183bd6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentImportController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentImportController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -129,7 +129,7 @@ public async Task ImportAssessment([FromHeader] string pwd) if (e.Message == "Exception of type 'Ionic.Zip.BadPasswordException' was thrown.") { - returnMessage = (hint == null) ? "Bad Password Exception" : "Bad Password Exception - " + hint.FileName; + returnMessage = (hint == null) ? "Bad Password Exception" : "Bad Password Exception - " + hint.FileName; return StatusCode(423, returnMessage); } else if (e.Message == "The password did not match.") @@ -143,7 +143,8 @@ public async Task ImportAssessment([FromHeader] string pwd) } } - var response = new { + var response = new + { Message = "Assessment was successfully imported" }; @@ -175,7 +176,7 @@ public IActionResult ImportAwwaSpreadsheet() if (!file.FileName.EndsWith(".xlsx") && file.FileName.EndsWith(".xls")) { - return Ok(new + return Ok(new { Message = "Only Microsoft Excel spreadsheets can be uploaded." }); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AuthController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AuthController.cs index 655e21ba7d..0a0ea80fc3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AuthController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AuthController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CFBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CFBusiness.cs index 99e1067974..e39e5f6c02 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CFBusiness.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CFBusiness.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -59,7 +59,7 @@ public List getInitialAnswers(int assessmentId) var answerslist = from a in _context.ANSWER where a.Assessment_Id == assessmentId && questionIds.Contains(a.Question_Or_Requirement_Id) && (a.Is_Requirement == true || a.Is_Maturity == true) - select new Answer() { AnswerText = a.Answer_Text, QuestionId = a.Question_Or_Requirement_Id, Is_Maturity = a.Is_Maturity??false, Is_Requirement = a.Is_Requirement??false }; + select new Answer() { AnswerText = a.Answer_Text, QuestionId = a.Question_Or_Requirement_Id, Is_Maturity = a.Is_Maturity ?? false, Is_Requirement = a.Is_Requirement ?? false }; return answerslist.ToList(); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CisCriticalServiceInformationController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CisCriticalServiceInformationController.cs index e81ad0aa4b..07b4071080 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CisCriticalServiceInformationController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/CisCriticalServiceInformationController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -25,7 +25,7 @@ public class CisCriticalServiceInformationController : ControllerBase private CSETContext _context; public CisCriticalServiceInformationController(ITokenManager token, - INotificationBusiness notification, IAssessmentUtil assessmentUtil, + INotificationBusiness notification, IAssessmentUtil assessmentUtil, ICisDemographicBusiness demographic, IUserBusiness user, CSETContext context) { _token = token; @@ -38,7 +38,7 @@ public CisCriticalServiceInformationController(ITokenManager token, [HttpGet] [Route("api/cis/organizationDemographics")] - public IActionResult GetOrganizationDemographics() + public IActionResult GetOrganizationDemographics() { int assessmentId = _token.AssessmentForUser(); return Ok(_cisDemographicBusiness.GetOrgDemographics(assessmentId)); @@ -66,8 +66,8 @@ public IActionResult GetServiceDemographics() public IActionResult SaveServiceDemographics([FromBody] CisServiceDemographics serviceDemographics) { serviceDemographics.AssessmentId = _token.AssessmentForUser(); - int userid = _token.GetUserId()??0; - return Ok(_cisDemographicBusiness.SaveServiceDemographics(serviceDemographics,userid)); + int userid = _token.GetUserId() ?? 0; + return Ok(_cisDemographicBusiness.SaveServiceDemographics(serviceDemographics, userid)); } [HttpGet] diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ContactsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ContactsController.cs index 8cc18f3d49..936b012c67 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ContactsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ContactsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -346,7 +346,7 @@ public IActionResult PostUpdateUser([FromBody] CreateUser userBeingUpdated) LastName = userBeingUpdated.LastName, IsSuperUser = false, PasswordResetRequired = true - }; + }; var uuu = _user.CreateUser(userDetail, _context); userBeingUpdated.UserId = uuu.UserId; @@ -388,7 +388,7 @@ public IActionResult PostUpdateUser([FromBody] CreateUser userBeingUpdated) // If there is already a user with the same email as the newly updated email, use that existing user's id to connect them // to the assessment after editing a contact var existingUser = _context.USERS.Where(x => x.PrimaryEmail == userBeingUpdated.PrimaryEmail).FirstOrDefault(); - if (existingUser != null) + if (existingUser != null) { newUserId = existingUser.UserId; } @@ -543,8 +543,8 @@ public IActionResult GetUserLanguage() _context.SaveChanges(); } - if (ak != null && ak.Lang == null) - { + if (ak != null && ak.Lang == null) + { ak.Lang = "en"; _context.SaveChanges(); } @@ -574,12 +574,12 @@ public IActionResult SaveUserLanguage([FromBody] UserLanguage lang) throw new KeyNotFoundException($"No user found for ID {(currentUserId != null ? currentUserId : currentAccessKey)}"); } - if (user != null) - { + if (user != null) + { user.Lang = lang.Lang; } - if (ak != null) + if (ak != null) { ak.Lang = lang.Lang; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ConversionController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ConversionController.cs index 15add58415..f079bfd3f5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ConversionController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ConversionController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardController.cs index aa82620bc5..3ceaa33d50 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardTsaController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardTsaController.cs index f864d0b845..e3a4700536 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardTsaController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DashboardTsaController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -52,7 +52,7 @@ public DashboardTsaController(IConfiguration config, CSETContext context, IToken _analytics = analytics; _demographic = demographic; } - + // [HttpGet] // [Route("api/TSA/getSectors")] // public async Task GetSectors() @@ -70,28 +70,28 @@ public DashboardTsaController(IConfiguration config, CSETContext context, IToken [HttpGet] [Route("api/TSA/analyticsMaturityDashboard")] - public IActionResult analyticsMaturityDashboard(int maturity_model_id,int? sectorId, int? industryId) + public IActionResult analyticsMaturityDashboard(int maturity_model_id, int? sectorId, int? industryId) { int assessmentId = _tokenManager.AssessmentForUser(); ChartDataTSA chartData = new ChartDataTSA(); - - var data = _analytics.getMaturityDashboardData(maturity_model_id,sectorId, industryId); + + var data = _analytics.getMaturityDashboardData(maturity_model_id, sectorId, industryId); var percentage = _analytics .GetMaturityGroupsForAssessment(assessmentId, maturity_model_id).ToList(); chartData.DataRowsMaturity = data; chartData.data = (from a in percentage - select (double) a.Percentage).ToList(); + select (double)a.Percentage).ToList(); + - chartData.Labels = (from an in data orderby an.Question_Group_Heading select an.Question_Group_Heading).Distinct().ToList(); - foreach(var item in data) + foreach (var item in data) { chartData.data.Add(item.average); } - + return Ok(chartData); } @@ -106,25 +106,25 @@ public IActionResult getStandardList() } [HttpGet] [Route("api/TSA/getSectorIndustryStandardsTSA")] - public IActionResult GetStandardsResultsByCategory1( int? sectorId, int? industryId) + public IActionResult GetStandardsResultsByCategory1(int? sectorId, int? industryId) { - + int assessmentId = _tokenManager.AssessmentForUser(); var standardList = _analytics.GetStandardList(assessmentId); // var standardMinMaxAvg = _analytics.GetStandardMinMaxAvg(assessmentId,"TSA2018", sectorId=null, industryId=null); ChartDataTSA[] chartDatas = new ChartDataTSA[standardList.Count()]; - int i = 0; + int i = 0; foreach (var setname in standardList) { - ChartDataTSA chartData = new ChartDataTSA(); - - var standardMinMaxAvg = _analytics.GetStandardMinMaxAvg(assessmentId,setname.Set_Name, sectorId, industryId); + ChartDataTSA chartData = new ChartDataTSA(); + + var standardMinMaxAvg = _analytics.GetStandardMinMaxAvg(assessmentId, setname.Set_Name, sectorId, industryId); var standardsingleaverage = _analytics.GetStandardSingleAvg(assessmentId, setname.Set_Name); - + chartData.data = (from a in standardsingleaverage - select a.average).ToList(); + select a.average).ToList(); + - chartData.DataRowsStandard = standardMinMaxAvg; chartData.StandardList = standardList; chartData.label = setname.Short_Name; @@ -132,7 +132,7 @@ public IActionResult GetStandardsResultsByCategory1( int? sectorId, int? industr { chartData.Labels.Add(c.QUESTION_GROUP_HEADING); } - + chartDatas[i++] = chartData; } return Ok(chartDatas); @@ -144,7 +144,7 @@ public IActionResult UpdateChart([FromBody] Demographics demographics) demographics.AssessmentId = _tokenManager.AssessmentForUser(); return Ok(_demographic.SaveDemographics(demographics)); } - + } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs index 2a47fef08e..9869ea459a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtController.cs index bfa33d0842..080a65659c 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -77,8 +77,8 @@ public IActionResult PostExtended2([FromBody] DemographicExt demographics) var userid = _token.GetCurrentUserId(); var mgr = new DemographicExtBusiness(_context); - mgr.SaveDemographics(demographics,userid??0); - + mgr.SaveDemographics(demographics, userid ?? 0); + return Ok(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtendedContoller.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtendedContoller.cs index 33435c336d..308288fe08 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtendedContoller.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsExtendedContoller.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -353,11 +353,11 @@ public IActionResult AreExtendedDemographicsAnswered() demo = new DEMOGRAPHIC_ANSWERS(); } - if (demo.SectorId == null + if (demo.SectorId == null || demo.SubSectorId == null || demo.Employees == null || demo.CustomersSupported == null - || demo.CIOExists == null + || demo.CIOExists == null || demo.CISOExists == null || demo.CyberTrainingProgramExists == null || demo.GeographicScope == null) diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs index db34a2c3e4..66919ce3c3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagnosticController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagramController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagramController.cs index d7781edbe0..83aa16ac3a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagramController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DiagramController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -428,7 +428,7 @@ public List GetTexts() public IActionResult UpdateComponentType([FromQuery] string guid, [FromQuery] string type, [FromQuery] string label) { int assessmentId = _token.AssessmentForUser(); - + _diagram.UpdateComponentType(assessmentId, guid, type); if (!label.IsNullOrEmpty()) diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ExcelExportController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ExcelExportController.cs index a570a01400..62ff32394f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ExcelExportController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ExcelExportController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileDownloadController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileDownloadController.cs index d2dcf018e2..bf4a9567e4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileDownloadController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileDownloadController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileUploadController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileUploadController.cs index b5a4219c52..843b766577 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileUploadController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FileUploadController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -92,7 +92,7 @@ public async Task Upload() int answerId; if (!int.TryParse(result.FormNameValues[key_answerId], out answerId)) - { + { var answerObj = new ANSWER(); // if no answerId was provided, try to find an answer for this assessment/question @@ -112,7 +112,7 @@ public async Task Upload() // if (questionType.ToLower() == "maturity") - { + { answerId = _maturityBusiness.StoreAnswer(assessmentId, answer); } else diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FrameworkController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FrameworkController.cs index 20ef8f8258..fe74e720fc 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FrameworkController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/FrameworkController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryEditorController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryEditorController.cs index 16ee13f721..c215eac2c0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryEditorController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryEditorController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -19,8 +19,8 @@ namespace CSETWebCore.Api.Controllers [ApiController] public class GalleryEditorController : ControllerBase { - - private readonly ITokenManager _token; + + private readonly ITokenManager _token; private CSETContext _context; private IGalleryEditor _galleryEditor; @@ -67,7 +67,7 @@ public IActionResult CloneItem(String Item_To_Clone, int Group_Id, bool New_Id) } try { - Guid Item_To_Clone_Guid= Guid.Parse(Item_To_Clone); + Guid Item_To_Clone_Guid = Guid.Parse(Item_To_Clone); _galleryEditor.CloneGalleryItem(Item_To_Clone_Guid, Group_Id, New_Id); return Ok(); } @@ -181,7 +181,7 @@ public IActionResult DeleteItem(string galleryItemGuid, int group_id) return BadRequest(e.Message); } } - + [HttpGet] [Route("api/gallery/getlayouts")] public IActionResult GetLayouts() @@ -192,7 +192,7 @@ public IActionResult GetLayouts() } try { - + return Ok(_galleryEditor.GetLayouts()); } catch (Exception e) @@ -272,7 +272,7 @@ public IActionResult UpdateItem([FromBody] GALLERY_ITEM item) } try { - + var galleryItem = _context.GALLERY_ITEM.Where(x => x.Gallery_Item_Guid == item.Gallery_Item_Guid).FirstOrDefault(); if (galleryItem == null) return BadRequest(); @@ -284,7 +284,7 @@ public IActionResult UpdateItem([FromBody] GALLERY_ITEM item) galleryItem.Is_Visible = item.Is_Visible; _context.SaveChanges(); - + return Ok(); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryStateController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryStateController.cs index 1df40ada4f..e5282a32d1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryStateController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GalleryStateController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -26,13 +26,13 @@ public class GalleryStateController : ControllerBase private IGalleryState _stateManager; public GalleryStateController(CSETContext context, - ITokenManager tokenManager, - IGalleryState parser + ITokenManager tokenManager, + IGalleryState parser ) { _context = context; _tokenManager = tokenManager; - _stateManager = parser; + _stateManager = parser; } @@ -46,7 +46,7 @@ IGalleryState parser public IActionResult GetBoard(string Layout_Name) { try - { + { return Ok(_stateManager.GetGalleryBoard(Layout_Name)); } catch (Exception e) @@ -74,7 +74,7 @@ on g.Gallery_Item_Guid equals i.Gallery_Item_Guid && g.Group_Id == n.Group_Id && g.Gallery_Item_Guid == i.Gallery_Item_Guid orderby g.Group_Id, g.Gallery_Item_Guid ascending - select new GalleryItem(i,n.Group_Id) + select new GalleryItem(i, n.Group_Id) { }; diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GeneralSalController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GeneralSalController.cs index ce25a22989..9b7e585533 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GeneralSalController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GeneralSalController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GuidController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GuidController.cs index cf4359b4c3..409aba9f2f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GuidController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/GuidController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/IRPController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/IRPController.cs index 0b01935fa7..90770376c4 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/IRPController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/IRPController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs index a08dff363b..1a5afc6459 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -28,7 +28,7 @@ public class MalcolmController : ControllerBase { private ITokenManager _token; private CSETContext _context; - private IHttpContextAccessor _http; + private IHttpContextAccessor _http; private IMalcolmBusiness _malcolm; @@ -52,12 +52,12 @@ public IActionResult MapSourceToDestinationData() int assessmentId = (int)_token.PayloadInt(Constants.Constants.Token_AssessmentId); var formFiles = HttpContext.Request.Form.Files; string fileName = ""; - string fileExtension = ""; + string fileExtension = ""; List errors = new List(); List dataList = new List(); foreach (FormFile file in formFiles) - { + { try { using (var stream = new MemoryStream()) @@ -74,13 +74,15 @@ public IActionResult MapSourceToDestinationData() string jsonString = sr.ReadToEnd(); data = JsonConvert.DeserializeObject(jsonString); dataList.Add(data); - } else + } + else { MalcolmUploadError error = new MalcolmUploadError(fileName, 415, "files of type " + fileExtension + " are unsupported."); errors.Add(error); } } - } catch (Exception ex) + } + catch (Exception ex) { MalcolmUploadError error = new MalcolmUploadError(fileName, 400, ex.Message); errors.Add(error); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityC2M2Controller.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityC2M2Controller.cs index 136fc64203..bed0c7c6ac 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityC2M2Controller.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityC2M2Controller.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs index 742f036d47..cea1421a55 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -36,9 +36,9 @@ public class MaturityController : ControllerBase private readonly IAssessmentUtil _assessmentUtil; private readonly IAdminTabBusiness _adminTabBusiness; private readonly IReportsDataBusiness _reports; - private readonly ICrrScoringHelper _crr; + private readonly ICrrScoringHelper _crr; - public MaturityController(ITokenManager tokenManager, CSETContext context, IAssessmentUtil assessmentUtil, + public MaturityController(ITokenManager tokenManager, CSETContext context, IAssessmentUtil assessmentUtil, IAdminTabBusiness adminTabBusiness, IReportsDataBusiness reports, ICrrScoringHelper crr) { _tokenManager = tokenManager; @@ -342,7 +342,7 @@ public IActionResult getProgressText() public IActionResult GetGrouping([FromQuery] int groupingId) { int assessmentId = _tokenManager.AssessmentForUser(); - + var grouping = _context.MATURITY_GROUPINGS.FirstOrDefault(x => x.Grouping_Id == groupingId); if (grouping == null) { @@ -455,7 +455,7 @@ public IActionResult ImportSurvey([FromBody] Model.Nested.CisImportRequest reque /// [HttpGet] [Route("api/maturity/cis/integritycheck")] - public IActionResult GetIntegrityCheckOptions() + public IActionResult GetIntegrityCheckOptions() { var assessmentId = _tokenManager.AssessmentForUser(); @@ -672,17 +672,17 @@ public IActionResult GetDeficiencyListSd() List filteredGroupingsS = new List(); foreach (var b in biz.MyModel.Groupings) - { + { var questionsU = new List(); var questionsS = new List(); foreach (var q in b.Questions) { - + var question = new Question(); if (q.AnswerText == "U") { if (q.Options.Any(x => x.OptionType.ToLower() == "radio")) - { + { question = new Question() { QuestionType = q.QuestionType, @@ -699,7 +699,7 @@ public IActionResult GetDeficiencyListSd() { if (q.Options.Any(x => x.Selected && x.OptionText == "No" && x.OptionType.ToLower() == "radio")) - { + { question = new Question() { QuestionType = q.QuestionType, @@ -712,7 +712,7 @@ public IActionResult GetDeficiencyListSd() } } } - + if (questionsU.Any()) { filteredGroupingsU.Add(new Grouping @@ -733,8 +733,8 @@ public IActionResult GetDeficiencyListSd() questionsU = new List(); questionsS = new List(); } - - return Ok(new {no=filteredGroupingsS, unanswered=filteredGroupingsU}); + + return Ok(new { no = filteredGroupingsS, unanswered = filteredGroupingsU }); } /// @@ -767,10 +767,10 @@ public IActionResult GetCommentsMarked() MarkedForReviewList = _reports.GetMarkedForReviewList(), Information = _reports.GetInformation() }; - - data.Comments.RemoveAll(x => oos.Contains(x.Mat.Mat_Question_Id)); - data.MarkedForReviewList.RemoveAll(x => oos.Contains(x.Mat.Mat_Question_Id)); + + data.Comments.RemoveAll(x => oos.Contains(x.Mat.Mat_Question_Id)); + data.MarkedForReviewList.RemoveAll(x => oos.Contains(x.Mat.Mat_Question_Id)); // null out a few navigation properties to avoid circular references that blow up the JSON stringifier @@ -899,14 +899,14 @@ public IActionResult GetMvraScoring() var scoring = maturity.GetMvraScoring(model); return Ok(scoring); } - + [HttpGet] [Route("api/maturity/mvra/mvraTree")] public IActionResult GetMvraTree([FromQuery] int id) { //int assessemntId = _tokenManager.AssessmentForUser(); //var maturity = new MaturityBusiness(_context, _assessmentUtil, _adminTabBusiness); - + var maturity = new MaturityBusiness(_context, _assessmentUtil, _adminTabBusiness); var model = maturity.GetMaturityStructureForModel(9, id); //var scoring = maturity.GetMvraScoring(model); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityCpgController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityCpgController.cs index f5a9ca699d..150d2cce15 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityCpgController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityCpgController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MeritFileExportController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MeritFileExportController.cs index 4f1ed97d63..208fb1c8bf 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MeritFileExportController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MeritFileExportController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -59,7 +59,8 @@ public IActionResult GetUncPath() }; return Ok(uncCarrier); - }catch(Exception ex) + } + catch (Exception ex) { return BadRequest(ex.Message); } @@ -75,7 +76,8 @@ public IActionResult SaveUncPath([FromBody] MeritFileExport uncPathCarrier) _json.SaveUncPath(uncPathCarrier.data, _context); return Ok(); - }catch (Exception ex) + } + catch (Exception ex) { return BadRequest(ex.Message); } @@ -91,9 +93,10 @@ public IActionResult DoesMeritDirectoryExist() string uncPathString = _json.GetUncPath(_context); return Ok(_json.DoesDirectoryExist(uncPathString)); - }catch(Exception ex) - { - return BadRequest(ex.Message); + } + catch (Exception ex) + { + return BadRequest(ex.Message); } } @@ -143,27 +146,29 @@ public IActionResult NewMeritFile([FromBody] MeritFileExport jsonData) _json.SendFileToMerit(filename, data, uncPathString); return Ok(); - }catch(Exception ex) { + } + catch (Exception ex) + { return BadRequest(ex.Message); } /// check for existance /// /// if doesn't exist: - /// brandNewMerit - /// check for existance (again for safety) - /// if doesn't exist, write to a new file (with the original guid as the file name) - /// + /// brandNewMerit + /// check for existance (again for safety) + /// if doesn't exist, write to a new file (with the original guid as the file name) + /// /// else if does exists: - /// prompt user if they want to duplicateMerit or overwriteMerit (or cancel) - /// duplicateMerit - /// generate a new guid, set the db's AssessmentGUID to the new one, - /// and write to a new file (with the new guid as the file name) - /// return new guid back to client - /// overwriteMerit - /// overwrite file (no need to check for existance) - /// cancel - /// don't do anything + /// prompt user if they want to duplicateMerit or overwriteMerit (or cancel) + /// duplicateMerit + /// generate a new guid, set the db's AssessmentGUID to the new one, + /// and write to a new file (with the new guid as the file name) + /// return new guid back to client + /// overwriteMerit + /// overwrite file (no need to check for existance) + /// cancel + /// don't do anything } @@ -179,7 +184,7 @@ public IActionResult OverrideMeritFile([FromBody] MeritFileExport jsonData) string guid = jsonData.guid; //generate a new guid and change the AssessmentGUID in the db to the new one - if (jsonData.overwrite == false) + if (jsonData.overwrite == false) { Guid oldGuid = _json.GetAssessmentGuid(assessmentId, _context); Guid newGuid = Guid.NewGuid(); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ModuleBuilderController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ModuleBuilderController.cs index 4d122c3c9f..5f21535708 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ModuleBuilderController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ModuleBuilderController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -82,7 +82,7 @@ public IActionResult SetBaseSets(string setName, string[] setNames) [Route("api/builder/GetBaseSets")] public IActionResult GetBaseSets(string setName) { - return Ok(_module.GetBaseSets(setName)); + return Ok(_module.GetBaseSets(setName)); } @@ -137,8 +137,8 @@ public IActionResult CopyBaseToCustom(string SourceSetName, string DestinationSe [Route("api/builder/BaseToCustomDelete")] public IActionResult BaseToCustomDelete(string setName) { - _module.DeleteCopyToSet(setName); - return Ok(); + _module.DeleteCopyToSet(setName); + return Ok(); } /// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/NcuaController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/NcuaController.cs index ab49540bcc..5f49be8a12 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/NcuaController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/NcuaController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -22,7 +22,7 @@ namespace CSETWebCore.Api.Controllers public class NcuaController : ControllerBase { public CSETContext _context; - + public NcuaController(CSETContext context) { _context = context; @@ -35,14 +35,15 @@ public IActionResult isExaminersModule() { string currentDir = Directory.GetCurrentDirectory(); string fileLocation = Path.Combine(currentDir, @"NCUA-EXAMINER-TOOL"); - + return Ok(System.IO.File.Exists(fileLocation)); } [HttpGet] [Route("api/getQuestionText")] - public IActionResult GetQuestionText([FromQuery] int modelId) { + public IActionResult GetQuestionText([FromQuery] int modelId) + { // Query DB for question text from modelId // Return list of question text return Ok(); @@ -53,15 +54,15 @@ public IActionResult GetQuestionText([FromQuery] int modelId) { [Route("api/getMergeData")] public IList GetMergeAnswers([FromQuery] int id1, [FromQuery] int id2, [FromQuery] int id3, [FromQuery] int id4, [FromQuery] int id5, [FromQuery] int id6, [FromQuery] int id7, [FromQuery] int id8, [FromQuery] int id9, [FromQuery] int id10) - { - return _context.Get_Merge_Conflicts(id1, id2, id3, id4, id5, id6, id7, id8, id9, id10); + { + return _context.Get_Merge_Conflicts(id1, id2, id3, id4, id5, id6, id7, id8, id9, id10); } [HttpGet] [Route("api/getCreditUnionData")] - public IList GetCreditUnionData([FromQuery] string model) + public IList GetCreditUnionData([FromQuery] string model) { return _context.Get_Assess_Detail_Filters(model); } - } + } } \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ProtectedFeatureController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ProtectedFeatureController.cs index ece563e86a..c559d55c10 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ProtectedFeatureController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ProtectedFeatureController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -24,13 +24,13 @@ namespace CSETWebCore.Api.Controllers * is enabled within CSET. For now, we are hard coding the Gallery_Item_Guids for the cards that we * want to reveal by setting the Is_Visible column to true. */ - + [CsetAuthorize] [ApiController] public class ProtectedFeatureController : ControllerBase { - + private CSETContext _context; private readonly ITokenManager _tokenManager; @@ -51,13 +51,14 @@ public ProtectedFeatureController(CSETContext context, ITokenManager tokenManage /// public IActionResult GetFeatures() { - var openFaaSets = _context.SETS.Where(s=> s.IsEncryptedModule).ToList(); + var openFaaSets = _context.SETS.Where(s => s.IsEncryptedModule).ToList(); var enabledModules = new List(); foreach (var s in openFaaSets) { - enabledModules.Add(new EnabledModule() { + enabledModules.Add(new EnabledModule() + { ShortName = s.Short_Name, FullName = s.Full_Name, Unlocked = s.IsEncryptedModuleOpen ?? false @@ -78,7 +79,8 @@ public IActionResult EnableFAA(string set_name) { AddNewlyEnabledModules(); - var response = new { + var response = new + { Message = "" }; return Ok(response); @@ -97,11 +99,11 @@ public IActionResult SetCisaAssessorWorkflow([FromBody] bool cisaWorkflowEnabled if (userId != null) { - _context.USERS.Where(u => u.UserId == userId).FirstOrDefault().CisaAssessorWorkflow = cisaWorkflowEnabled; + _context.USERS.Where(u => u.UserId == userId).FirstOrDefault().CisaAssessorWorkflow = cisaWorkflowEnabled; } else if (ak != null) { - _context.ACCESS_KEY.Where(a => a.AccessKey == ak).FirstOrDefault().CisaAssessorWorkflow = cisaWorkflowEnabled; + _context.ACCESS_KEY.Where(a => a.AccessKey == ak).FirstOrDefault().CisaAssessorWorkflow = cisaWorkflowEnabled; } _context.SaveChanges(); @@ -132,9 +134,9 @@ public IActionResult GetCisaAssessorWorkflow() if (userId != null) { var user = _context.USERS.Where(u => u.UserId == userId).FirstOrDefault(); - if (user!=null) + if (user != null) { - cisaWorkflowEnabled =user .CisaAssessorWorkflow; + cisaWorkflowEnabled = user.CisaAssessorWorkflow; } } else if (ak != null) diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs index 1689bdf21d..564202a225 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -149,11 +149,11 @@ public IList GetChildAnswers([FromQuery] int parentId, /// [HttpGet] [Route("api/GetActionItems")] - public IList GetActionItems([FromQuery] int parentId, [FromQuery]int finding_id) + public IList GetActionItems([FromQuery] int parentId, [FromQuery] int finding_id) { int assessId = _token.AssessmentForUser(); ObservationsManager fm = new ObservationsManager(_context, assessId); - return fm.GetActionItems(parentId,finding_id); + return fm.GetActionItems(parentId, finding_id); } /// @@ -336,7 +336,7 @@ public IActionResult StoreAllAnswers([FromBody] List answers) var mb = new MaturityBusiness(_context, _assessmentUtil, _adminTabBusiness); mb.StoreAnswer(assessmentId, answer); } - + return Ok(); } @@ -433,7 +433,7 @@ on question.Grouping_Id equals category.Grouping_Id // the custom order is 'DOR', 'Examiner Finding', 'Supplemental Guidance', 'Non-reportable', and then in order by question number where answer.Assessment_Id == assessmentId - orderby finding.Type.StartsWith("Non"), finding.Type.StartsWith("Supplemental"), + orderby finding.Type.StartsWith("Non"), finding.Type.StartsWith("Supplemental"), finding.Type.StartsWith("Examiner"), finding.Type.StartsWith("DOR"), question.Mat_Question_Id select new { finding, answer, question, category }; @@ -489,7 +489,7 @@ public IActionResult SaveObservation([FromBody] Observation obs, [FromQuery] boo { int assessmentId = _token.AssessmentForUser(); var fm = new ObservationsManager(_context, assessmentId); - + if (obs.IsObservationEmpty(cancel)) { @@ -510,7 +510,7 @@ public IActionResult SaveObservation([FromBody] Observation obs, [FromQuery] boo [Route("api/SaveIssueOverrideText")] public IActionResult SaveOverrideIssueText([FromBody] ActionItemTextUpdate item) { - int assessmentId = _token.AssessmentForUser(); + int assessmentId = _token.AssessmentForUser(); var fm = new ObservationsManager(_context, assessmentId); fm.UpdateIssues(item); return Ok(); @@ -683,7 +683,7 @@ public IActionResult SaveHydroComment([FromBody] HYDRO_DATA_ACTIONS hda) { int assessmentId = _token.AssessmentForUser(); var qb = new QuestionBusiness(_token, _document, _htmlConverter, _questionRequirement, _assessmentUtil, _context); - + return Ok(qb.SaveHydroComment(hda.Answer, hda.Answer_Id, hda.Progress_Id, hda.Comment)); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs index 31e1ed9a21..b85a7fc60b 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportACETWebController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportACETWebController.cs index eca0a107aa..cb11f4076d 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportACETWebController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportACETWebController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -103,7 +103,7 @@ public IActionResult GetIseAllQuestions() return Ok(data); } - + [HttpGet] [Route("api/reports/acet/getIseSourceFiles")] diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmmcController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmmcController.cs index df7210ebe9..c3085f9204 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmmcController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmmcController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -60,7 +60,7 @@ public IActionResult GetMaturityModel() reportData.AlternateList = reportData.AddMissingParentsTo(reportData.AlternateList); var viewModel = new ReportVM(detail, reportData); - + return Ok(viewModel); } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmuController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmuController.cs index 781bc9bdd9..09c7d7e2e1 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmuController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCmuController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -44,6 +44,6 @@ public ReportsCmuController(ITokenManager token, IAssessmentBusiness assessment, _adminTabBusiness = admin; _scoring = cmuScoringHelper; _context = context; - } + } } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsController.cs index 6b07120e77..446ff65bc6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -65,7 +65,7 @@ public IActionResult GetAssessmentInfoForReport() int assessmentId = _token.AssessmentForUser(); _report.SetReportsAssessmentId(assessmentId); BasicReportData.INFORMATION info = _report.GetInformation(); - + return Ok(info); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCrrController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCrrController.cs index 82f32294d6..6e848606de 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCrrController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReportsCrrController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs index cf8f6f96e0..a4e3d07c37 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResetPasswordController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResourceLibraryController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResourceLibraryController.cs index 85bdd4cf47..63250eaf04 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResourceLibraryController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ResourceLibraryController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SalController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SalController.cs index 1a862f8360..3730039c3a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SalController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SalController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -18,6 +18,7 @@ using System.Threading.Tasks; using CSETWebCore.Interfaces.Helpers; using CSETWebCore.Interfaces.Standards; +using SixLabors.ImageSharp.ColorSpaces; namespace CSETWebCore.Api.Controllers { @@ -26,71 +27,42 @@ public class SalController : ControllerBase { private readonly CSETContext _context; private readonly ITokenManager _token; - private readonly IAssessmentModeData _assessment; private readonly IAssessmentUtil _assessmentUtil; private readonly IStandardsBusiness _standard; private readonly IStandardSpecficLevelRepository _standardRepo; + private readonly IAssessmentModeData _assessmentModeData; - public SalController(CSETContext context, ITokenManager token, IAssessmentModeData assessment, - IStandardsBusiness standard, IAssessmentUtil assessmentUtil, IStandardSpecficLevelRepository standardRepo) + + /// + /// CTOR + /// + public SalController(CSETContext context, ITokenManager token, + IStandardsBusiness standard, IAssessmentUtil assessmentUtil, IStandardSpecficLevelRepository standardRepo, + IAssessmentModeData assessmentModeData) { _context = context; _token = token; - _assessment = assessment; _standard = standard; _assessmentUtil = assessmentUtil; _standardRepo = standardRepo; + _assessmentModeData = assessmentModeData; } + /// /// /// /// [HttpGet] [Route("api/SAL")] - public IActionResult GetSTANDARD_SELECTION() + public IActionResult GetSalValues() { try { - int asssessmentId = _token.AssessmentForUser(); - - TinyMapper.Bind(); - TinyMapper.Bind(); - - STANDARD_SELECTION sTANDARD_SELECTION = _context.STANDARD_SELECTION.Find(asssessmentId); - Sals rsal; - if (sTANDARD_SELECTION == null) - { - rsal = new Sals() - { - Selected_Sal_Level = "Low", - Last_Sal_Determination_Type = "Simple", - CLevel = "Low", - ALevel = "Low", - ILevel = "Low" - }; - sTANDARD_SELECTION = TinyMapper.Map(rsal); - sTANDARD_SELECTION.Assessment_Id = asssessmentId; - sTANDARD_SELECTION.Application_Mode = _assessment.DetermineDefaultApplicationMode(); - _context.STANDARD_SELECTION.Add(sTANDARD_SELECTION); - _context.SaveChanges(); - } - else - { - rsal = TinyMapper.Map(sTANDARD_SELECTION); - - } - - LevelManager lm = new LevelManager(asssessmentId, _context); - lm.RetrieveOtherLevels(rsal); - StandardRepository sr = new StandardRepository(_standard,_assessment,_context,_assessmentUtil, _standardRepo); - sr.InitializeStandardRepository(asssessmentId); - sr.Confidence_Level = rsal.CLevel; - sr.Integrity_Level = rsal.ILevel; - sr.Availability_Level = rsal.ALevel; - - return Ok(rsal); + int assessmentId = _token.AssessmentForUser(); + var biz = new SalBusiness(_context, _assessmentModeData, _assessmentUtil, _standard, _standardRepo); + return Ok(biz.GetSals(assessmentId)); } catch (Exception exc) { @@ -98,9 +70,9 @@ public IActionResult GetSTANDARD_SELECTION() return Conflict(); } - } + [HttpGet] [Route("api/SAL/Type")] public async Task GetType(String newType) @@ -160,7 +132,7 @@ public IActionResult PostSAL(Sals tmpsal) { _context.SaveChanges(); - StandardRepository sr = new StandardRepository(_standard, _assessment, _context, _assessmentUtil, _standardRepo); + StandardRepository sr = new StandardRepository(_standard, _assessmentModeData, _context, _assessmentUtil, _standardRepo); sr.InitializeStandardRepository(assessmentId); sr.Confidence_Level = tmpsal.CLevel; sr.Integrity_Level = tmpsal.ILevel; diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs index e0b6ec90d4..3ed159214a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SetsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SetsController.cs index 4145e66857..4e5df6a9a5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SetsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SetsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/StandardsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/StandardsController.cs index f41c093ec3..96baa30a0a 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/StandardsController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/StandardsController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/TsaController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/TsaController.cs index 1e4ffb920a..1087565e72 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/TsaController.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/TsaController.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -201,75 +201,75 @@ public IActionResult PersistSelectedStandards([FromBody] List selectedSt [HttpGet] [Route("api/tsa/getModelsName")] - public List getModelsName() + public List getModelsName() { List allModelsList = new List(); - var allModelsStandard= (from m in _context.MODES_SETS_MATURITY_MODELS - join s in _context.SETS on m.Set_Name equals s.Set_Name - // join maturity in _context.MATURITY_MODELS on m.Model_Name equals maturity.Model_Name - - select new TSAModelNames() - { - App_Code_Id=m.App_Code_Id, - Name=m.Set_Name, - AppCode=m.AppCode, - Set_Name=s.Set_Name, - Full_Name=s.Full_Name, - Model_Description=s.Standard_ToolTip, - Standard_ToolTip= s.Standard_ToolTip, - Is_Included=m.Is_Included - - - - }).ToList(); + var allModelsStandard = (from m in _context.MODES_SETS_MATURITY_MODELS + join s in _context.SETS on m.Set_Name equals s.Set_Name + // join maturity in _context.MATURITY_MODELS on m.Model_Name equals maturity.Model_Name + + select new TSAModelNames() + { + App_Code_Id = m.App_Code_Id, + Name = m.Set_Name, + AppCode = m.AppCode, + Set_Name = s.Set_Name, + Full_Name = s.Full_Name, + Model_Description = s.Standard_ToolTip, + Standard_ToolTip = s.Standard_ToolTip, + Is_Included = m.Is_Included + + + + }).ToList(); var allModelsMaturity = (from m in _context.MODES_SETS_MATURITY_MODELS - join mat in _context.MATURITY_MODELS on m.Model_Name equals mat.Model_Name - where m.AppCode=="TSA" - select new TSAModelNames() - { - App_Code_Id=m.App_Code_Id, - Name=m.Model_Name, - AppCode=m.AppCode, - Model_Name=mat.Model_Name, - Model_Title=mat.Model_Title, - // Leaving description blank for now. Maturity Model Description is being removed in favor of gallery card description. - // getModelsName is legacy CSET functionality that is not presently being used with the new gallery interface. - Model_Description= "",//mat.Model_Description, - Is_Included=m.Is_Included - } + join mat in _context.MATURITY_MODELS on m.Model_Name equals mat.Model_Name + where m.AppCode == "TSA" + select new TSAModelNames() + { + App_Code_Id = m.App_Code_Id, + Name = m.Model_Name, + AppCode = m.AppCode, + Model_Name = mat.Model_Name, + Model_Title = mat.Model_Title, + // Leaving description blank for now. Maturity Model Description is being removed in favor of gallery card description. + // getModelsName is legacy CSET functionality that is not presently being used with the new gallery interface. + Model_Description = "",//mat.Model_Description, + Is_Included = m.Is_Included + } ).ToList(); - foreach (var x in allModelsStandard) - { - TSAModelNames cl = new TSAModelNames(); - cl.App_Code_Id = x.App_Code_Id; - cl.Name = x.Name; - cl.AppCode = x.AppCode; - cl.Set_Name = x.Set_Name; - cl.Full_Name = x.Full_Name; - - // cl.Standard_ToolTip = x.Standard_ToolTip; - //cl.Model_Title = x.Model_Title; - cl.Model_Name =x.Model_Name; - cl.Model_Description = x.Model_Description; - cl.Is_Included = x.Is_Included; - allModelsList.Add(cl); - - } - - foreach (var x in allModelsMaturity) - { - TSAModelNames cl = new TSAModelNames(); - cl.App_Code_Id = x.App_Code_Id; - cl.Name = x.Name; - cl.AppCode = x.AppCode; - cl.Set_Name = x.Set_Name; - cl.Standard_ToolTip = x.Standard_ToolTip; - cl.Model_Name = x.Model_Name; - cl.Full_Name = x.Model_Title; - cl.Model_Description = x.Model_Description; - cl.Is_Included = x.Is_Included; - allModelsList.Add(cl); - } + foreach (var x in allModelsStandard) + { + TSAModelNames cl = new TSAModelNames(); + cl.App_Code_Id = x.App_Code_Id; + cl.Name = x.Name; + cl.AppCode = x.AppCode; + cl.Set_Name = x.Set_Name; + cl.Full_Name = x.Full_Name; + + // cl.Standard_ToolTip = x.Standard_ToolTip; + //cl.Model_Title = x.Model_Title; + cl.Model_Name = x.Model_Name; + cl.Model_Description = x.Model_Description; + cl.Is_Included = x.Is_Included; + allModelsList.Add(cl); + + } + + foreach (var x in allModelsMaturity) + { + TSAModelNames cl = new TSAModelNames(); + cl.App_Code_Id = x.App_Code_Id; + cl.Name = x.Name; + cl.AppCode = x.AppCode; + cl.Set_Name = x.Set_Name; + cl.Standard_ToolTip = x.Standard_ToolTip; + cl.Model_Name = x.Model_Name; + cl.Full_Name = x.Model_Title; + cl.Model_Description = x.Model_Description; + cl.Is_Included = x.Is_Included; + allModelsList.Add(cl); + } return allModelsList; } } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/ApplicationDocuments/FIPS199Language.html b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/ApplicationDocuments/FIPS199Language.html index dcd125aea8..70502f8526 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/ApplicationDocuments/FIPS199Language.html +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/ApplicationDocuments/FIPS199Language.html @@ -1,6 +1,6 @@ +--------------------------> + +

Introduction @@ -159,4 +161,5 @@ best reflect the unique circumstances associated with the subject system.

- + + \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_acet/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_acet/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_acet/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_acet/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cis/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cis/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cis/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cis/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc2/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc2/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc2/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cmmc2/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cpg/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cpg/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cpg/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_cpg/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_crr/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_crr/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_crr/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_crr/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_edm/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_edm/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_edm/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_edm/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_mvra/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_mvra/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_mvra/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_mvra/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_tsa/css/csethelp.css b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_tsa/css/csethelp.css index 58e94d757a..e875f59f1f 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_tsa/css/csethelp.css +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Documents/htmlhelp_tsa/css/csethelp.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -46,9 +46,9 @@ tr.topLinkRow a:visited { border-bottom-color: transparent; } - .m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { - border-bottom-color: #23527c; - } +.m-workZone_seeAlso_itemContent .b-breadCrumbs__link:hover { + border-bottom-color: #23527c; +} @@ -81,10 +81,10 @@ tr.topLinkRow a:visited { box-shadow: none; } - .b-button:hover { - background-color: #45859e; - border-color: #30565f; - } +.b-button:hover { + background-color: #45859e; + border-color: #30565f; +} .no-js .b-button { @@ -134,20 +134,20 @@ tr.topLinkRow a:visited { background-color: #285464; } - .b-article, - .b-article:before, - .b-article__wrapper { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } +.b-article, +.b-article:before, +.b-article__wrapper { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} - .b-article::before { - webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - box-shadow: none; - } +.b-article::before { + webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + box-shadow: none; +} .b-article__wrapper { -webkit-box-shadow: none; @@ -179,9 +179,9 @@ html[dir="rtl"] .m-controlButtons__item__next .b-controlButtons__link_icon:after color: #fff; } - .b-breadCrumbs__item:before { - content: "\a0\203a\a0\a0"; - } +.b-breadCrumbs__item:before { + content: "\a0\203a\a0\a0"; +} html[dir="rtl"] .b-breadCrumbs__item:before { content: "\a0\2039\a0\a0"; @@ -271,7 +271,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { padding-left: 10px; } -.b-tabs__selectorItems, .b-tabs__selectorContent { +.b-tabs__selectorItems, +.b-tabs__selectorContent { height: inherit; } @@ -302,7 +303,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border-top: 2px transparent solid; } -.b-tabs__selectorContent:before, .b-tabs__wrapperItem:before { +.b-tabs__selectorContent:before, +.b-tabs__wrapperItem:before { -webkit-box-shadow: none; -moz-box-shadow: none; -ms-box-shadow: none; @@ -331,8 +333,8 @@ html[dir="rtl"] .m-search__workZone .b-search__inputTextIcon { border: none; } -.m-search__tabs ~ .b-tabs__wrapperItemInner, -.m-search__tabs ~ .b-tabs__wrapperItemInner .b-tree { +.m-search__tabs~.b-tabs__wrapperItemInner, +.m-search__tabs~.b-tabs__wrapperItemInner .b-tree { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -366,7 +368,10 @@ html[dir="rtl"] .b-tabs__selectorItem:after { background-color: #F9CE15; } -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { color: #0A5278; } @@ -399,8 +404,8 @@ h1, h2, h3, h4 { background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } @@ -410,4 +415,4 @@ a.local_link span { .b-article__footerLayout a span { color: #23527c !important; -} +} \ No newline at end of file diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ErrorDetails.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ErrorDetails.cs index 022f37f55c..ab58094f76 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ErrorDetails.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ErrorDetails.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ExceptionMiddlewareExtensions.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ExceptionMiddlewareExtensions.cs index 9190f6b34a..c92cfbd00e 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ExceptionMiddlewareExtensions.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/ExceptionMiddlewareExtensions.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs index 269bd7b4ee..584c2f5ce8 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -12,8 +12,8 @@ namespace CSETWebCore.Api.Error { public class MalcolmUploadError { - public MalcolmUploadError(string file, int statusCodes, string message) - { + public MalcolmUploadError(string file, int statusCodes, string message) + { File = file; StatusCode = statusCodes; Message = message; diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/FileUploadStream.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/FileUploadStream.cs index 5b5ae3dd9d..8f4cbe99fd 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/FileUploadStream.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/FileUploadStream.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -35,31 +35,31 @@ public async Task ProcessUploadStream(HttpContext reques foreach (FormFile ctnt in request.Request.Form.Files) { // You would get hold of the inner memory stream here - - string filename = ctnt.FileName.Trim("\"".ToCharArray()); - var provider = new FileExtensionContentTypeProvider(); - string contentType; - if (!provider.TryGetContentType(filename, out contentType)) - { - contentType = "application/octet-stream"; - } - var target = new MemoryStream(); - ctnt.CopyTo(target); - var bytes = target.ToArray(); - // Hash the file so that we can determine if it is already attached to another question + string filename = ctnt.FileName.Trim("\"".ToCharArray()); + var provider = new FileExtensionContentTypeProvider(); + string contentType; + if (!provider.TryGetContentType(filename, out contentType)) + { + contentType = "application/octet-stream"; + } + var target = new MemoryStream(); + ctnt.CopyTo(target); + + var bytes = target.ToArray(); + // Hash the file so that we can determine if it is already attached to another question - using (var md5 = MD5.Create()) + using (var md5 = MD5.Create()) + { + var hash = md5.ComputeHash(bytes); + result.FileResultList.Add(new FileUploadResult() { - var hash = md5.ComputeHash(bytes); - result.FileResultList.Add(new FileUploadResult() - { - FileHash = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant(), - FileBytes = bytes, - FileName = filename, - ContentType = contentType - }); - } + FileHash = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant(), + FileBytes = bytes, + FileName = filename, + ContentType = contentType + }); + } } List keys = formKeys.Keys.ToList(); @@ -74,7 +74,7 @@ public async Task ProcessUploadStream(HttpContext reques } //if (result.ErrorsList.Count > 0) - //throw new UploadFormException("Could not find required form variables. See errorlist for details."); + //throw new UploadFormException("Could not find required form variables. See errorlist for details."); return result; } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/PropertyHelpers.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/PropertyHelpers.cs index 302fa668b5..2885a06af6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/PropertyHelpers.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/PropertyHelpers.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/ValidateMimeMultipartContentFilter.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/ValidateMimeMultipartContentFilter.cs index c3807e4a14..10dd2284b5 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/ValidateMimeMultipartContentFilter.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Helpers/ValidateMimeMultipartContentFilter.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -15,7 +15,7 @@ public class ValidateMimeMultipartContentFilter : ActionFilterAttribute { public override void OnActionExecuting(ActionExecutingContext actionContext) { - + if (!MultipartRequestHelper.IsMultipartContentType(actionContext.HttpContext.Request.ContentType)) { throw new Exception(HttpStatusCode.UnsupportedMediaType.ToString()); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalDocument.cs index 69bc909ec9..41799e8dd3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalRequirement.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalRequirement.cs index c87c91e754..f18d8bfbe6 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalRequirement.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalRequirement.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalResource.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalResource.cs index 1952fe6a31..1209b86ee0 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalResource.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalResource.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalStandard.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalStandard.cs index 3eacf79253..39f80041aa 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalStandard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/IExternalStandard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/ILogger.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/ILogger.cs index daab25b97f..c419d2fef2 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/ILogger.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Interfaces/ILogger.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CmuVM.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CmuVM.cs index cdcf0f6a49..26271a8675 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CmuVM.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CmuVM.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ConsoleLogger.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ConsoleLogger.cs index e9af0234e7..3dfae38685 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ConsoleLogger.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ConsoleLogger.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CrrVM.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CrrVM.cs index d5c3379fe7..19b08b7081 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CrrVM.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/CrrVM.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalDocument.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalDocument.cs index 57f0fe2980..e7c90c8b61 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalDocument.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalDocument.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalRequirement.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalRequirement.cs index 6fa4e62a43..26e5a953f3 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalRequirement.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalRequirement.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalResource.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalResource.cs index 15b591f32c..28228399c9 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalResource.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalResource.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalStandard.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalStandard.cs index 2b166040a9..e6a29a5420 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalStandard.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Models/ExternalStandard.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Program.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Program.cs index e041489c22..031db14d81 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Program.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Program.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs index 899083cd64..d422980aae 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -123,7 +123,7 @@ public void ConfigureServices(IServiceCollection services) .AddNewtonsoftJson(options => { options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - + }).AddXmlDataContractSerializerFormatters(); services.AddHttpContextAccessor(); services.AddDbContext( @@ -175,7 +175,7 @@ public void ConfigureServices(IServiceCollection services) services.AddTransient(); services.AddTransient(); services.AddScoped(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); @@ -232,19 +232,19 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { var options = new RewriteOptions() .AddIISUrlRewrite(iisUrlRewriteStreamReader); - app.UseRewriter(options); + app.UseRewriter(options); } // Serve up index.html from webapp when root url is hit app.UseRewriter(new RewriteOptions().AddRewrite("^$", "index.html", true)); - + //app.UseHttpsRedirection(); app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider( Path.Combine(env.ContentRootPath, "Diagram")), RequestPath = "/Diagram" - }); + }); app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider( diff --git a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/DBIO.cs b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/DBIO.cs index ef1fa817fa..0cbd7216cf 100644 --- a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/DBIO.cs +++ b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/DBIO.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Program.cs b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Program.cs index 48797551e4..e60e0382fc 100644 --- a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Program.cs +++ b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Program.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Properties/AssemblyInfo.cs b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Properties/AssemblyInfo.cs index 2d5356375b..5ea1a91043 100644 --- a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Properties/AssemblyInfo.cs +++ b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// diff --git a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Serializer.cs b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Serializer.cs index 673c2da48d..e33ca460fb 100644 --- a/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Serializer.cs +++ b/CSETWebApi/CSETWeb_Api/ProcViewSerializer/Serializer.cs @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // //////////////////////////////// @@ -96,7 +96,7 @@ private void SaveToFile(string procName, string objectType) string fileName = Path.Combine(filePath, procName + "." + fileType + ".sql"); Directory.CreateDirectory(filePath); - File.WriteAllLines(fileName, lines); + File.WriteAllLines(fileName, lines); } } } diff --git a/CSETWebNg/License.txt b/CSETWebNg/License.txt index b70421e04d..84750ac933 100644 --- a/CSETWebNg/License.txt +++ b/CSETWebNg/License.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright 2023 Battelle Energy Alliance, LLC +Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/NOTICE.txt b/CSETWebNg/NOTICE.txt index 2eff3fb94a..5d9c2eaaf7 100644 --- a/CSETWebNg/NOTICE.txt +++ b/CSETWebNg/NOTICE.txt @@ -1,6 +1,6 @@ This project contains code generated by Battelle Energy Alliance (BEA) -Copyright 2023 Battelle Energy Alliance, LLC +Copyright 2024 Battelle Energy Alliance, LLC ALL RIGHTS RESERVED These data were produced by Battelle Energy Alliance, LLC. under Contract No. DE-AC07-05ID14517 with the Department of Energy. diff --git a/CSETWebNg/README.md b/CSETWebNg/README.md index 6b72068fd2..a13d634d78 100644 --- a/CSETWebNg/README.md +++ b/CSETWebNg/README.md @@ -14,7 +14,7 @@ This project was generated with [Angular CLI](https://github.com/angular/angular MIT License -Copyright 2023 Battelle Energy Alliance, LLC +Copyright 2024 Battelle Energy Alliance, LLC See License.txt diff --git a/CSETWebNg/e2e/app.e2e-spec.ts b/CSETWebNg/e2e/app.e2e-spec.ts index 0648c7f82d..49faa45e65 100644 --- a/CSETWebNg/e2e/app.e2e-spec.ts +++ b/CSETWebNg/e2e/app.e2e-spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/e2e/app.po.ts b/CSETWebNg/e2e/app.po.ts index bfa4307820..8b0e1e0f40 100644 --- a/CSETWebNg/e2e/app.po.ts +++ b/CSETWebNg/e2e/app.po.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/package-lock.json b/CSETWebNg/package-lock.json index 1dd5dde5b8..d0d8704053 100644 --- a/CSETWebNg/package-lock.json +++ b/CSETWebNg/package-lock.json @@ -14266,9 +14266,9 @@ } }, "node_modules/@angular-builders/custom-webpack/node_modules/acorn-walk": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz", - "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", "dev": true, "engines": { "node": ">=0.4.0" diff --git a/CSETWebNg/src/app/acet/inherent-risk-profile/inherent-risk-profile.component.html b/CSETWebNg/src/app/acet/inherent-risk-profile/inherent-risk-profile.component.html index 5de96efd0a..80dd8274ea 100644 --- a/CSETWebNg/src/app/acet/inherent-risk-profile/inherent-risk-profile.component.html +++ b/CSETWebNg/src/app/acet/inherent-risk-profile/inherent-risk-profile.component.html @@ -1,6 +1,6 @@
-

{{ this.aggregationSvc?.modeDisplay(false) }} Information

+

{{ this.aggregationSvc?.modeDisplay(false) }} Information

-
-
- - +
+
+ + +
-
-
- - +
+ + +
-
-
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/aggregation/aggregation-detail/aggregation-detail.component.ts b/CSETWebNg/src/app/aggregation/aggregation-detail/aggregation-detail.component.ts index 59f35ccc68..758d99e8f1 100644 --- a/CSETWebNg/src/app/aggregation/aggregation-detail/aggregation-detail.component.ts +++ b/CSETWebNg/src/app/aggregation/aggregation-detail/aggregation-detail.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/aggregation/aggregation-home/aggregation-home.component.html b/CSETWebNg/src/app/aggregation/aggregation-home/aggregation-home.component.html index 2b8a827ee3..94b8423878 100644 --- a/CSETWebNg/src/app/aggregation/aggregation-home/aggregation-home.component.html +++ b/CSETWebNg/src/app/aggregation/aggregation-home/aggregation-home.component.html @@ -1,6 +1,6 @@
-

Compare Assessments

+

Compare Assessments

-
- +
+ - + - + - + -
+
-
-
- - - - +
+
+ + + + +
-
-
- - +
+ + +
-
\ No newline at end of file diff --git a/CSETWebNg/src/app/aggregation/compare-analytics/compare-analytics.component.ts b/CSETWebNg/src/app/aggregation/compare-analytics/compare-analytics.component.ts index bcfed70acd..55d6d62839 100644 --- a/CSETWebNg/src/app/aggregation/compare-analytics/compare-analytics.component.ts +++ b/CSETWebNg/src/app/aggregation/compare-analytics/compare-analytics.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -62,7 +62,7 @@ export class CompareAnalyticsComponent implements OnInit { } generateReport(reportType: string) { - const url = '/index.html?returnPath=report/'+reportType; + const url = '/index.html?returnPath=report/' + reportType; window.open(url, "_blank"); } } diff --git a/CSETWebNg/src/app/aggregation/compare-analytics/compare-bestworst/compare-bestworst.component.html b/CSETWebNg/src/app/aggregation/compare-analytics/compare-bestworst/compare-bestworst.component.html index 34478eb8ee..bafb771379 100644 --- a/CSETWebNg/src/app/aggregation/compare-analytics/compare-bestworst/compare-bestworst.component.html +++ b/CSETWebNg/src/app/aggregation/compare-analytics/compare-bestworst/compare-bestworst.component.html @@ -1,6 +1,6 @@
-

Merge Assessments

-
- Select the assessments whose answers you wish to merge into a new assessment. -
+

Merge Assessments

+
+ Select the assessments whose answers you wish to merge into a new assessment. +
-
- -
+
+ +
-
- The selected assessments have conflicting answers. The individual answers from the selected assessments are shown. - The answers from the default assessment have been pre-selected. -
+
+ The selected assessments have conflicting answers. The individual answers from the selected assessments are shown. + The answers from the default assessment have been pre-selected. +
-
+
-
-

Questions

-
-
- {{ cat.category }} -
+
+

Questions

+
+
+ {{ cat.category }} +
-
-
-
+
+
+
+
-
-
- -
+
+ +
-
-
- {{ ans.answerText }} +
+
+ {{ ans.answerText }} +
-
-
-
- - - - +
+
+ + + + +
-
-
-

Component Defaults

-
+
+

Component Defaults

+
-
-

Component Overrides

+
+

Component Overrides

+
-
\ No newline at end of file diff --git a/CSETWebNg/src/app/aggregation/merge/merge.component.ts b/CSETWebNg/src/app/aggregation/merge/merge.component.ts index 19ecadc51f..470b7e3c27 100644 --- a/CSETWebNg/src/app/aggregation/merge/merge.component.ts +++ b/CSETWebNg/src/app/aggregation/merge/merge.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/aggregation/trend-analytics/trend-analytics.component.html b/CSETWebNg/src/app/aggregation/trend-analytics/trend-analytics.component.html index e69decd0ae..f0e7aa4c91 100644 --- a/CSETWebNg/src/app/aggregation/trend-analytics/trend-analytics.component.html +++ b/CSETWebNg/src/app/aggregation/trend-analytics/trend-analytics.component.html @@ -1,6 +1,6 @@
-

Trend Analytics

+

Trend Analytics

-
-
-

- Overall Percent Compliance Score -

-
- \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics-tsa/assessment-demographics-tsa.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics-tsa/assessment-demographics-tsa.component.html index 308f2cb85e..f5675d1ec7 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics-tsa/assessment-demographics-tsa.component.html +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics-tsa/assessment-demographics-tsa.component.html @@ -1,6 +1,6 @@ -

{{t('demographics')}}

-
-
-
- - +

{{t('demographics')}}

+ +
+
+ + +
+
+ + +
-
- - + +
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - -
-
- - -
-
-
- - +
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- -
-
-
-
-
- - +
+ + +
+
+
+ + +
+
+ + +
+
+
+
+
+ + +
-
- + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts index db22d91a26..d8c95abcc7 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -181,7 +181,7 @@ export class AssessmentDemographicsComponent implements OnInit { } changeOrgName(event: any) { - this.demographicData.organizationName = event.target.value; + this.demographicData.organizationName = event.target.value; this.updateDemographics(); } diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-cf/assessment-detail-cf.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-cf/assessment-detail-cf.component.html index e8e44f22ce..bef8d4c65c 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-cf/assessment-detail-cf.component.html +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-cf/assessment-detail-cf.component.html @@ -1,6 +1,6 @@ - -
-
- - -
- {{ t('acet.auto populate') }} +
+ + +
+
+ + +
+ {{ t('acet.auto populate') }} +
+
+
+ + +
-
- - - -
-
-
- - -
-
- - -
-
-
- - +
+ +
-
- - +
+ +
-
-
-
- - +
+
+ + +
+
+ + +
-
- - +
+
+ + +
+
+ + +
+
-
-
- + - - -
-
- - -
-
-
-
- - - + + +
+
+ + +
-
- - - +
+
+ + + +
+
+ + + +
-
-
-
- - - - - - {{ option.charter }} - - - -
-
+
+
+ + + + + + {{ option.charter }} + + + +
+
-
- - (Required) - - - - - {{ option.name }} - - - -
+
+ + (Required) + + + + + {{ option.name }} + + + +
-
-
- - -
-
- - -
-
- - -
-
-
-
- Assets - (Required) - -
-
-
-
- - -
-
- - -
-
-
-
-
-

☐

-

☑

+
+
+ + +
+
+ + +
+
+ + +
-
State-led examination?
-
-
- - - +
+
+ Assets + (Required) + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+

☐

+

☑

+
+
State-led examination?
+
+
+ + + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.scss b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.scss index 5f60762525..7eef927658 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.scss +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.ts index a2a8042807..593db75781 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail-ncua/assessment-detail-ncua.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.html index 53f608e412..49171ff546 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.html +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.html @@ -1,6 +1,6 @@ -

{{t('organization details')}}

-
-
-

{{t('no pii in name')}}

-
- - - -
- Auto-populated based on data provided +

{{t('organization details')}}

+ +
+

{{t('no pii in name')}}

+
+ + + +
+ Auto-populated based on data provided +
+
+
+ + +
-
- - - +
+ +
-
-
- - -
-
-
- - +
+
+ + +
+
+ + +
-
- - + +
+

{{t('assessment type')}}

+
{{ assessment.typeTitle || 'Blank Assessment' }}
+

+ +
+

+ Results from the AWWA Cybersecurity Assessment Tool + can be imported into this assessment. +

+
-
- -
-

{{t('assessment type')}}

-
{{ assessment.typeTitle || 'Blank Assessment' }}
-

-
-

- Results from the AWWA Cybersecurity Assessment Tool - can be imported into this assessment. -

-
- -
- + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts index 9f3db0b842..868c823dfe 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info-ncua/assessment-info-ncua.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info-ncua/assessment-info-ncua.component.html index abb5c0f08f..b9c3f4bfad 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info-ncua/assessment-info-ncua.component.html +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info-ncua/assessment-info-ncua.component.html @@ -1,6 +1,6 @@ - - + + diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info.component.ts index db203e4f31..8d668f6ff2 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.scss b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.scss +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.ts index a575325790..f1722bd4fd 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-info2-tsa/assessment-info2-tsa.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment2-info/assessment2-info.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment2-info/assessment2-info.component.ts index e5ddecf9d5..4e959c0c26 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment2-info/assessment2-info.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment2-info/assessment2-info.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-extended/demographics-extended.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-extended/demographics-extended.component.html index 42ad25e486..26fa3fb6b4 100644 --- a/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-extended/demographics-extended.component.html +++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-extended/demographics-extended.component.html @@ -1,6 +1,6 @@
-
-
Regulation Type 2:
- +
Regulation 2: - +
@@ -415,15 +260,9 @@
Check all that apply.
- + @@ -431,14 +270,8 @@
If other, please list: - +

Commas should be used to separate more than one entry.

@@ -454,36 +287,17 @@
If the name of the barrier is not listed please enter it directly into each box as applicable.
- + - +
- + - + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/csi/csi-organization-demographics/csi-organization-demographics.component.html b/CSETWebNg/src/app/assessment/prepare/csi/csi-organization-demographics/csi-organization-demographics.component.html index 0dc2655254..da8a45901e 100644 --- a/CSETWebNg/src/app/assessment/prepare/csi/csi-organization-demographics/csi-organization-demographics.component.html +++ b/CSETWebNg/src/app/assessment/prepare/csi/csi-organization-demographics/csi-organization-demographics.component.html @@ -1,6 +1,6 @@ +-------------------------->

Cybersecurity Framework

@@ -34,8 +34,8 @@

Cybersecurity Framework

{{ tt.tierType }}

- +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/framework/framework.component.ts b/CSETWebNg/src/app/assessment/prepare/framework/framework.component.ts index 0c8d771722..4abc61f28c 100644 --- a/CSETWebNg/src/app/assessment/prepare/framework/framework.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/framework/framework.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.html b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.html index c1e16af23b..9e9a769daf 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.html +++ b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.html @@ -1,6 +1,6 @@ -
+

Exam Profile Summary

- +
@@ -61,7 +61,7 @@

Exam Profile Summary

- + - -
\ No newline at end of file + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.ts b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.ts index 7dcd43163d..8030a78757 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-ise-summary.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.html b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.html index 24d6fbf898..0b1ed97b94 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.html +++ b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.html @@ -1,6 +1,6 @@
- +

{{ t('inherent risk profile summary') }}

@@ -30,7 +30,7 @@

{{ t('inherent risk profile summary') }}

- {{ t('override risk level is') }} + {{ t('override risk level is') }} "{{ overrideLabel.substring(0, 4) + t(overrideLabel.substring(4).toLowerCase()) }}" @@ -67,7 +67,8 @@

{{ t('inherent risk profile summary') }}

- {{ t('override risk level is') }} "{{ t(overrideLabel).toLowerCase() }}" + {{ t('override risk level is') }} "{{ + t(overrideLabel).toLowerCase() }}"
diff --git a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.ts b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.ts index f8ada27bad..a66d9397d2 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/irp-summary/irp-summary.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/irp/irp-ise.component.html b/CSETWebNg/src/app/assessment/prepare/irp/irp-ise.component.html index be68f80713..0743d7dfd2 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp/irp-ise.component.html +++ b/CSETWebNg/src/app/assessment/prepare/irp/irp-ise.component.html @@ -1,6 +1,6 @@

{{ t('irp.inherent risk profiles') }}

-

{{ t('irp.irp desc start') }} - {{ t('irp.irp desc end') }}

+

{{ t('irp.irp desc start') }} + {{ t('irp.irp desc end') }}

1. {{ t('level.baseline') }} - {{ t('level.baseline-desc') }}
2. {{ t('level.evolving') }} - {{ t('level.evolving-desc') }}
@@ -35,7 +36,7 @@

{{ t('irp.inherent risk profiles') }}

-

{{ iHeader.header }}

+

{{ iHeader.header }}

@@ -89,9 +90,9 @@

5

- + - +
diff --git a/CSETWebNg/src/app/assessment/prepare/irp/irp.component.scss b/CSETWebNg/src/app/assessment/prepare/irp/irp.component.scss index da9d12e2ed..3fcd3ed80c 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp/irp.component.scss +++ b/CSETWebNg/src/app/assessment/prepare/irp/irp.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/irp/irp.component.ts b/CSETWebNg/src/app/assessment/prepare/irp/irp.component.ts index 4458e76763..0c160d3cf6 100644 --- a/CSETWebNg/src/app/assessment/prepare/irp/irp.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/irp/irp.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-a/cmmc-a.component.html b/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-a/cmmc-a.component.html index 7f025c6290..97fad82368 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-a/cmmc-a.component.html +++ b/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-a/cmmc-a.component.html @@ -1,6 +1,6 @@
-

Cyber Infrastructure Survey Tutorial

-
-

The Cyber Infrastructure Survey (CIS) goal is to assess - the foundational and essential cybersecurity practices of an organization's critical service to - identify dependencies, capabilities and emerging effects of the organization's current - cybersecurity posture. CIS focuses on a service-based-view versus a programmatic-view of cybersecurity. - Critical services are assessed against more than 80 cybersecurity controls grouped under five top-level - domains: cybersecurity management, cybersecurity forces, - cybersecurity controls, cyber incident response, and cyber dependencies. A CIS - provides your organization with an effective assessment of cybersecurity controls in-place for critical - services to support cybersecurity planning, resource allocation, and performance evaluation.

- -

- What is a Critical Service?

- -

Critical Service – A set of activities that the - organization carries out, in the production of a product or while providing services to its - customers, that are so important to the success of the organization that disruption to the service - would severely impact the organization's operations or business.  

- -

A basic principle to remember throughout the survey is the - difference between a critical service and a - cyber service. 

- -

A cyber - service is any combination of - equipment and devices (hardware); applications and platforms (software), communications, and data that - is integrated to provide specific cyber services. 

- -

A critical - service (CS) is a service - that the loss thereof would result in physical destruction, safety, and health effects (e.g., a chemical - release or loss of traffic controls), theft of sensitive information that can be exploited, business - interruption (e.g., denial of service), or other economic loss to the organization or its - customers/users.

- -

- Identifying the Scope of the Assessment

- -

Identifying the Scope of the Assessment is important because - answers to the assessment questions must be provided in relation to a specific service. The scope of the - assessment is determined by three factors: 

- -
    -
  1. Critical - service scope: Which service will - be the focus of the assessment? 
    2. -
  2. Organizational - scope: Which parts of the organization deliver the - critical service?
    3. -
  3. Asset - scope: Which assets (people, technology, information, and - facilities) are required for delivery of the service?
    4. -
-

- Starting the CIS Assessment in CSET

- -

Before you begin, please familiarize yourself with - CSET's question layout and icon tray features. 

- -

Image showing CSET information Icon which users click to open the icon tray.

- - -

- The CSET Icon Tray:

- -

Icon + <h3 class=Cyber Infrastructure Survey Tutorial +

+

The Cyber Infrastructure Survey (CIS) goal is to assess + the foundational and essential cybersecurity practices of an organization's critical service to + identify dependencies, capabilities and emerging effects of the organization's current + cybersecurity posture. CIS focuses on a service-based-view versus a programmatic-view of + cybersecurity. + Critical services are assessed against more than 80 cybersecurity controls grouped under five + top-level + domains: cybersecurity management, cybersecurity forces, + cybersecurity controls, cyber incident response, and cyber + dependencies. A CIS + provides your organization with an effective assessment of cybersecurity controls in-place for + critical + services to support cybersecurity planning, resource allocation, and performance evaluation.

+ +

+ What is a Critical Service? +

+ +

Critical Service – A set of activities that the + organization carries out, in the production of a product or while providing + services to its + customers, that are so important to the success of the organization that + disruption to the service + would severely impact the organization's operations or business. +  

+ +

A basic principle to remember throughout the survey is the + difference between a critical + service and a + cyber service. 

+ +

A cyber + service is any combination of + equipment and devices (hardware); applications and platforms (software), communications, + and data that + is integrated to provide specific cyber services. 

+ +

A critical + service (CS) is a service + that the loss thereof would result in physical destruction, safety, and health effects + (e.g., a chemical + release or loss of traffic controls), theft of sensitive information that can be + exploited, business + interruption (e.g., denial of service), or other economic loss to the organization or + its + customers/users.

+ +

+ Identifying the Scope of the Assessment +

+ +

Identifying the Scope of the Assessment is important because + answers to the assessment questions must be provided in relation to a specific service. + The scope of the + assessment is determined by three factors: 

+ +
    +
  1. Critical + service scope: Which + service will + be the focus of the assessment? 
    2. +
  2. Organizational + scope: Which parts of the + organization deliver the + critical service?
    3. +
  3. Asset + scope: Which assets (people, + technology, information, and + facilities) are required for delivery of the service?
    4. +
+

+ Starting the CIS Assessment in CSET +

+ +

Before you begin, please familiarize yourself with + CSET's question layout and icon tray features. 

+ +

Image showing CSET information Icon which users click to open the icon tray. +

+ + +

+ The CSET Icon Tray: +

+ +

Icon Description automatically generated with medium confidence

- - -

A picture containing text, wheel + + + <p><span><img width= Supplemental - Guidance icon. Some questions have supplemental guidance to aid the - user in understanding the content. If a question has guidance associated with it, it will appear - here. 

- -

Icon + style= Supplemental + Guidance icon. Some questions have + supplemental guidance to aid the + user in understanding the content. If a question has guidance associated with it, it + will appear + here. 

+ +

Icon Description automatically generated Comments icon. - You may make question-related comments for a post-assessment review here.  Comments appear in the - "Comments and Marked for Review" report at the end of the assessment. 

- -

Icon + style=Comments icon. + You may make question-related comments for a post-assessment review here.  Comments + appear in the + "Comments and Marked for + Review" report at the end of the + assessment. 

+ +

Icon Description automatically generatedDocuments icon. Attach any artifacts or - evidence to support your response here. You may access your assessment documents for download at a later - time by returning to this assessment and locating your attached documents in the tools - menu.

- -

Icon + style=Documents icon. + Attach any artifacts or + evidence to support your response here. You may access your assessment documents for + download at a later + time by returning to this assessment and locating your attached documents in the tools + menu.

+ +

Icon Description automatically generatedFeedback icon. Feedback is an important to - us. You may leave feedback as to assessment content, errors, suggestions, and any questions you may - have.  

- -

Text, icon + style=Feedback icon. + Feedback is an important to + us. You may leave feedback as to assessment content, errors, suggestions, and any + questions you may + have.  

+ +

Text, icon Description automatically generatedMarked for - Review icon. Questions marked for review will appear in the - "Comments and Marked for Review" report at the end of the assessment. The icon highlights - yellow for each question if selected. 

- - - -

Image shows red dot indicator indicating comments or documents added. + Review</span></strong></span><span + style= icon. Questions marked for review + will appear in the + "Comments and Marked for Review" report at the end of the assessment. The icon + highlights + yellow for each question if selected. 

+ + + +

Image shows red dot indicator indicating comments or documents added.  

- - -

- Tools Menu

-

The CSET Tools Menu is where your assessment's - artifacts and evidence are stored.

- -

Image shows assessment documents storage location in the tools menu.

- -

- CIS Question / Response – Multi-Level Interactive - Text

- -

As you start to answer questions, please take note that the - CIS is an interactive assessment with multiple levels of question content and responses. In an effort to - show the breadth and depth of each question, you'll notice that some material is grayed out. This - is intentional. The assessment content will become active (and no longer grayed out) depending upon your - response.

- -

Please also note that when you choose a particular response, - some question content may no longer be available. The assessment is performing as expected. The - iterative material helps produce a comprehensive and useful scoring mechanism throughout the assessment - and in the CIS results and reports.

- -

For more information on this section and additional CIS - guidance, and to keep a copy of CIS Help open - during your assessment, please click here.

- -
Thank you for reading the CIS Tutorial.
- -

In the next screen, you will be given the option to import a - previous assessment or choose a baseline from which to compare the current assessment against. -

- -

Please click "next" to continue.

-
- - - + + +

+ Tools Menu +

+

The CSET Tools Menu is where your assessment's + artifacts and evidence are stored.

+ +

Image shows assessment documents storage location in the tools menu. +

+ +

+ CIS Question / Response – Multi-Level Interactive + Text +

+ +

As you start to answer questions, please take note that the + CIS is an interactive assessment with multiple levels of question content and responses. + In an effort to + show the breadth and depth of each question, you'll notice that some material is grayed + out. This + is intentional. The assessment content will become active (and no longer grayed out) + depending upon your + response.

+ +

Please also note that when you choose a particular response, + some question content may no longer be available. The assessment is performing as + expected. The + iterative material helps produce a comprehensive and useful scoring mechanism throughout + the assessment + and in the CIS results and reports.

+ +

For more information on this section and additional CIS + guidance, and to keep a copy of CIS + Help open + during your assessment, please click here.

+ +
Thank you for reading the CIS Tutorial.
+ +

In the next screen, you will be given the option to import a + previous assessment or choose a baseline from which to compare the current assessment + against. +

+ +

Please click "next" to continue.

+
+ + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.scss b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.scss index 98a7d53c2d..ca55f69367 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.scss +++ b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.ts b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.ts index bd3a5dd70f..70dbfd11f0 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cis/tutorial-cis.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc/tutorial-cmmc.component.html b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc/tutorial-cmmc.component.html index 3f2905e3f7..030be66f8a 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc/tutorial-cmmc.component.html +++ b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc/tutorial-cmmc.component.html @@ -1,6 +1,6 @@
-

CMMC Tutorial

+

CMMC Tutorial

- - -

1. CMMC 2.0 Tutorial for CSET®

-
 
-
Overview
-
The CMMC framework consists of the security requirements from NIST SP 800-171 Rev 2, Protecting Controlled Unclassified Information in Nonfederal Systems and Organizations, and a subset of the requirements from NIST SP 800-172, Enhanced Security Requirements for Protecting Controlled Unclassified Information: A Supplement to NIST Special Publication 800-171. The model framework organizes these practices into a set of domains, which map directly to the NIST SP 800-171 Rev 2 families.There are three levels within CMMC-Level 1, Level 2, and Level 3-as described in the sections below.
-
 
-
CMMC Levels
-
The CMMC model measures the implementation of cybersecurity requirements at three levels. Each level consists of a set of CMMC practices:
-
•     Level 1: Encompasses the basic safeguarding requirements for FCI specified in FAR Clause 52.204-21.
-
•     Level 2: Encompasses the security requirements for CUI specified in NIST SP 800-171 Rev 2 per DFARS Clause 252.204-7012 [3, 4, 5].
-
•     Level 3: Information on Level 3 will be released at a later date and will contain a subset of the security requirements specified in NIST SP 800-172 [6].
-
The CMMC levels and associated sets of practices across domains are cumulative. More specifically, for an organization to achieve a specific CMMC level, it must also demonstrate achievement of the preceding lower levels. For the case in which an organization does not meet its targeted level, it will be certified at the highest level for which it has achieved all applicable practices.
-
 
-
CMMC 2.0 Overview
-
Figure 1 provides an overview of the CMMC 2.0 Levels.
-
 
-
-
Figure 1. CMMC 1.0 to 2.0 Level Overview
-
 
-
CMMC Level 1
-
Practices: Foundational
-
Level 1 focuses on the protection of FCI and consists of only practices that correspond to the basic safeguarding requirements specified in 48 CFR 52.204-21, commonly referred to as the FAR Clause [3].
-
 
-
CMMC Level 2
-
Practices: Advanced
-
Level 2 focuses on the protection of CUI and encompasses the 110 security requirements specified in NIST SP 800-171 Rev 2 [4].
-
 
-
CMMC Level 3
-
Practices: Expert
-
Level 3 will be based on a subset of NIST SP 800-172 requirements [6]. Details will be released at a later date.
-
 
-
CMMC Domains
-
The CMMC model consists of 14 domains that align with the families specified in NIST SP 800-171. These domains and their abbreviations are as follows:
-
•     Access Control (AC)
-
•     Awareness & Training (AT)
-
•     Audit & Accountability (AU)
-
•     Configuration Management (CM)
-
•     Identification & Authentication (IA)
-
•     Incident Response (IR)
-
•     Maintenance (MA)
-
•     Media Protection (MP)
-
•     Personnel Security (PS)
-
•     Physical Protection (PE)
-
•     Risk Assessment (RA)
-
•     Security Assessment (CA)
-
•     System and Communications Protection (SC)
-
•     System and Information Integrity (SI)
-
 
-
CMMC Practices
-
 
-
Overview
-
The CMMC model measures the implementation of the NIST SP 800-171 Rev 2 [4] security requirements. The practices originate from the safeguarding requirements and security requirements specified in FAR Clause 52.204-21 [3] and DFARS Clause 252.204-7012 [5], respectively.
-
•     Level 1 is equivalent to all of the safeguarding requirements from FAR Clause 52.204-21.
-
•     Level 2 is equivalentto all of the security requirements in NIST SP 800-171 Revision 2.
-
•     Level 3 will be based on a subset of NIST SP 800-172 and more detailed information will be released at a later date.
-
 
-
List of Practices
-
This subsection itemizes the practices for each domain and at each level. Each practice has a practice identification number in the format - DD.L#-REQ- where:
-
 
-
•     DD is the  two-letter domain abbreviation;
-
•     L#isthelevelnumber;and
-
•     REQ is the NIST SP 800-171 Rev 2 or NIST SP 800-172 security requirement number.
-
 
-
Below the identification number, a short name identifier is provided for each practice, meant to be used for quick reference only. Finally, each practice has a complete practice statement.
-
 
-

2. Scoping

-
 
-
Level 1 Self-Assessment Scope
-
Prior to a Level 1 Cybersecurity Maturity Model Certification (CMMC) Self-Assessment, the contractor must specify the CMMC Self-Assessment Scope. The CMMC Self-Assessment Scope informs which assets within the contractor's environment will be assessed and the details of the self-assessment.
-
 
-
FCI Assets
-
Federal Contract Information (FCI) Assets process, store, or transmit FCI as follows:
-
•      Process - FCI can be used by an asset (e.g., accessed, entered, edited, generated, manipulated, or printed).
-
•      Store - FCI is inactive or at rest on an asset (e.g., located on electronic media, in system component memory, or in physical format such as paper documents).
-
•      Transmit - FCI is being transferred from one asset to another asset (e.g., data in transit using physical or digital transport methods).
-
     FCI Assets are part of the CMMC Self-Assessment Scope and are assessed against applicable CMMC practices.
-
 
-
Additional information on CMMC 2.0 Level 1 scope can be found in CMMC Self-Assessment Scope Level 1 Version 2.0 December 2021.
-
 
-
Additional Guidance on Level 1 Scoping Activities
-
To appropriately scope a CMMCLevel 1 self-assessment, the contractor should consider the people, technology, facilities, and external service providers within their environment that process, store, or transmit FCI.
-
 
-
Level 2 Scope
-
Identifying the CMMC Assessment Scope
-
For CMMC 2.0 scope guidance, the CMMC Self-Assessment Scope Level 2 Version 2.0 December 2021 provides information on the categorization of assets that, in turn, inform the specification of assessment scope for a Cybersecurity Maturity Model Certification (CMMC) assessment. The scoping guide discusses CMMC asset categories as well as the associated requirements for Defense Industrial Base (DIB) contractors and CMMC assessments.
-
 
-
CMMC Asset Categories
-
The CMMC Assessment Guide Level 2 Version 2.0 December 2021 maps contractor assets into one of five categories. Table 1 in the Assessment Guide describes each asset category, contractor requirements, and assessment requirements. Additional information about each asset category is provided in the ensuing sections.
-
 
-
Defining the CMMC Assessment Scope
-
After categorizing their assets, the contractor then specifies the CMMC Assessment Scope. See the CMMC Self-Assessment Scope Level 2 Version 2.0 December 2021 for next steps in the scoping process.
-
 
-

3. Navigating the Assessment

-
CMMC Practice Question Layout
-
 
-
Image of the various components of the CSET tool with annotations.
-
Domain and Domain Acronym
-
-
 
-
Practice Identifier
-
-
Each practice has a practice identification number in the format - DD.L#-REQ- where:
-
•       DD is the two-letter domain abbreviation;
-
•       L# is the level number; and
-
REQ is the NIST SP 800-171 Rev 2 or NIST SP 800-172 security requirement number.
-
 
-
 
-
Level Indicator
-
-
Indicates the corresponding level associated with the practice statement. CMMC provides a benchmark against which an organization can evaluate the current level of capability of its processes, practices, and methods and set goals and priorities for improvement.
-
CSET Icons
-
-
In the CSET Icons section below, you will find a breakdown of each of the CSET-specific icons and how they help facilitate a CMMC assessment.
-
Assessment Findings (CSET Answer Key)
-
-
A full breakdown of the CMMC Assessment Findings (CSET Answer Key) is below.
-
Progress Indicator
-
-
The Progress Indicator will turn blue and complete the circle as the questions in each Capability area are completed. When all the questions are complete, the Progress Indicator will show a check mark.
-
 
-
Image of the Yes Icon answer choice. MET is presented as Yes in the CSET Assessment Tool. The contractor successfully meets the practice. For each practice marked MET, the assessor includes statements that indicate the response conforms to the objectives and documents the appropriate evidence to support the response.
-
 
-
For MET (Yes), the assessor can use the Observations field to record applicable observations.
-
 
-
-
 
-
Image of the No Icon answer choice. NOT MET is presented as NO in the CSET Assessment tool. The contractor has not met the practice. For each practice marked NOT MET, the assessor includes statements that explain why and documents the appropriate evidence that the contractor does not conform to the objectives.
-
 
-
For NOT MET (No), the assessor can use the Observations field to record applicable observations.
-
 
-
-
 
-
 
-
  NOT APPLICABLE indicates the practice does not apply to the contractor. For each practice marked NA, the assessor is required to include a statement that explains why the practice does not apply to the contractor. 
-
 
-
Assessor comments may be recorded in the Observations field in the CSET icon tray.
-
 
-
Mark for Review
-
The Mark for Review function allows a user to mark a practice question for further review.
-
 
-
-
 
-
 
-

3.1 CMMC 2.0 Assessment Components in CSET®

-
 
-
Supplemental Guidance
-
Users can refer to the supporting authorities and additional guidance provided under Supplemental Guidance.
-
 
-
NOTE: The "FURTHER GUIDANCE" section below NIST SP 800-171A guidance is derived from previous CMMC 1.02 guidance for informational purposes only. It will be updated when the CMMC 2.0 publications become available.
-
 
-
-
 
-
Comments
-
The comments function allows the assessor to record non-structured comments for each question during the assessment. In contrast, the Observations function (also useful for commenting) is more rigid and contains required fields.
-
 
-
-
 
-
Artifacts/Documents
-
Assessors can use the Artifacts/Documents function to attach relevant evidence to each practice question.
-
 
-
-
 
-
Attached Artifacts/Documents
-
The documents will appear listed by file name beneath the question when attached
.
A red indicator will appear on the icon for each question where evidence has been attached.
-
 
-
-
 
-
Attached Documents Storage
-
Access your attached documents, artifacts, and evidence under the Tools Menu next to the CSET Logo on the upper left side of the screen.
-
 
-
Image shows the Assessment Documents location under the Tools menu.
-
 
-
The Assessment Documents tab will open up a pop-up window showing all documents that are attached to the Assessment. Documents are organized by title.
-
 
-
-
 
-
References
-
Users can click on the References icon to open links to CMMC .pdf documentation. Documents will open in a separate window.  These documents can also be found in the CSET Resource Library.
-
 
-
-
 
-
Observations
-
The Observations Icon opens a pop-up window that allows an assessor to record their observations for each practice question.
-
 
-
-
 
-
Once a user has entered their observations, a red indicator highlights the icon and the observations are listed beneath the practice question in order of entry.
-
 
-
Observations Details Pop-Up Screen:
-
After selecting the Observations Icon, the Observations Details screen appears.
-
 
-
-
 
-
Feedback
-
Users can record Feedback during the assessment for submission to CSET/CISA. Some examples of submitted feedback include commentary on the subject matter of the question, the structure of the question, and how the question and layout can be improved.
-
 
-
-
 
-

3.2 Results

-

Image shows the Results tab selected.

-
CMMC presents the Results of an assessment with the following sidebar navigation options:
-
 
-
-
Figure: Sidebar Navigation showing CMMC 2.0 Results options.
-
 
-
The primary deliverables of the CMMC 2.0 assessment are the Performance by Level, Performance by Domain, and the NIST 800-171A SPRS interpretation based on the 110 requirements in NIST 800-171. To learn more about the CMMC Results and Report functionality, visit the Results and Reports section of the CMMC User Guide. To learn more about the NIST SPRS scoring methodology presented in the Results section, please review - NIST SP 800-171 DoD Assessment Methodology, Version 1.2.1. -
-
 
-
-
Figure: Performance by Level
-
 
-
-
Figure: Performance by Domain
-
 
-
 
-
-
Figure: SPRS Scorecard
-
 
-

3.3 Reports

-
This section includes the Executive Summary Report, Deficiency Report, and Comments/Questions Marked for Review Report specific to CMMC 2.0.
-
 
-
-
 
-

4. Submit Feedback

-
At the end of the assessment, users are prompted to submit their feedback on the CSET Assessment.
-
 
-
 
-
-
 
-
References
-
1.  U.S. Executive Office of the President, Council of Economic Advisers (CEA). The Cost of Malicious Cyber Activity to the U.S. Economy, available online at https://www.whitehouse.gov/wp-content/uploads/2018/02/The-Cost-of-Malicious Cyber-Activity-to-the-U.S.-Economy.pdf, February 2018
-
2.  Center for Strategic and International Studies (CSIS) and McAfee, Economic Impact of Cybercrime - No Slowing Down, February 2018
-
3.  48 Code of Federal Regulations (CFR) 52.204-21, Basic Safeguarding of Covered Contractor Information Systems, Federal Acquisition Regulation (FAR), 1 Oct 2016
-
4.  NIST Special Publication (SP) 800-171 Revision (Rev) 2, Protecting Controlled Unclassified Information in Nonfederal Systems and Organizations, U.S. Department of Commerce National Institute of Standards and Technology (NIST), December 2016 (updated June 2018)
-
5.  DFARS 252.204-7012, Safeguarding Covered Defense Information and Cyber Incident Reporting, October 2016
-
6.  NIST SP 800-172, Enhanced Security Requirements for Protecting Controlled Unclassified Information: ASupplement to NIST Special Publication 800-171, U.S. Department of Commerce National Institute of Standards and Technology (NIST), February 2021
-
 
-
 
- - -
+ +
+
+
+
+

1. CMMC 2.0 Tutorial for CSET®

+
+
+
 
+
+
Overview
+
+
The CMMC framework consists of the security requirements from NIST SP 800-171 Rev 2, Protecting Controlled Unclassified Information in Nonfederal Systems and Organizations, and a subset of + the requirements from NIST SP 800-172, Enhanced Security Requirements for Protecting Controlled Unclassified Information: A Supplement to NIST Special Publication 800-171. The model framework organizes these practices into a set of domains, which map directly to the NIST SP 800-171 Rev 2 + families.There are three levels within CMMC-Level 1, + Level 2, and Level 3-as described in the sections below.
+
 
+
+
CMMC Levels
+
+
The CMMC model measures the implementation of + cybersecurity requirements at + three levels. Each level consists of a set + of CMMC practices:
+
•     Level 1: Encompasses the + basic safeguarding requirements + for FCI specified in FAR + Clause 52.204-21.
+
•     Level 2: Encompasses the + security requirements for CUI specified in + NIST SP 800-171 Rev 2 per DFARS Clause 252.204-7012 [3, 4, 5].
+
•     Level 3: Information on Level 3 will be released at a + later date and will contain a subset of the security requirements specified in NIST + SP 800-172 + [6].
+
The CMMC levels + and associated sets of practices + across domains are cumulative. More + specifically, for an organization to achieve a specific CMMC level, it must also demonstrate achievement of the preceding lower levels. For the case in which an organization does not meet its targeted + level, it will be certified at the highest level for which it has achieved all applicable + practices.
+
 
+
+
CMMC 2.0 Overview
+
+
Figure 1 provides an overview of the CMMC 2.0 Levels.
+
 
+
+
Figure 1. CMMC 1.0 to + 2.0 + Level Overview
+
 
+
+
CMMC Level 1
+
+
Practices: Foundational
+
Level 1 focuses on the + protection of FCI and + consists of only practices that + correspond to the + basic safeguarding requirements specified in 48 CFR 52.204-21, commonly referred + to as the FAR Clause [3].
+
 
+
+
CMMC Level 2
+
+
Practices: Advanced
+
Level 2 focuses on the protection of CUI + and encompasses + the 110 + security requirements specified in NIST SP 800-171 Rev 2 + [4].
+
 
+
+
CMMC Level 3
+
+
Practices: Expert
+
Level 3 + will be based on a subset of NIST SP 800-172 requirements [6]. Details will + be released at a later date.
+
 
+
+
CMMC Domains
+
+
The CMMC model consists of 14 domains that align with the families specified in NIST SP 800-171. These domains and their abbreviations are as follows: +
+
•     Access Control (AC)
+
•     Awareness & Training (AT)
+
•     Audit & Accountability (AU)
+
•     Configuration Management (CM)
+
•     Identification & Authentication (IA)
+
•     Incident Response (IR)
+
•     Maintenance (MA)
+
•     Media Protection (MP)
+
•     Personnel Security (PS)
+
•     Physical Protection (PE)
+
•     Risk Assessment (RA)
+
•     Security Assessment (CA)
+
•     System and Communications Protection + (SC)
+
•     System and Information Integrity (SI)
+
 
+
+
CMMC Practices
+
+
 
+
+
Overview
+
+
The CMMC model + measures the implementation of + the NIST SP 800-171 Rev 2 [4] security + requirements. The practices originate from the safeguarding requirements and security requirements specified in FAR Clause + 52.204-21 [3] and + DFARS Clause 252.204-7012 + [5], + respectively.
+
•     Level 1 is equivalent to all of the safeguarding requirements from FAR Clause 52.204-21.
+
•     Level 2 is equivalentto all of the + security requirements in NIST SP 800-171 + Revision 2.
+
•     Level 3 will be based on a subset of + NIST SP + 800-172 + and more detailed information will be released at a later date.
+
 
+
+
List of Practices
+
+
This subsection itemizes the practices for each domain and at each level. + Each practice has a practice identification number in the format - DD.L#-REQ- where:
+
 
+
•     DD is the  two-letter domain abbreviation;
+
•     L#isthelevelnumber;and
+
•     REQ is the NIST SP 800-171 Rev 2 or + NIST SP 800-172 + security requirement number.
+
 
+
Below the + identification number, a short name + identifier is provided for each practice, meant to be used for quick reference only. Finally, each + practice has a complete practice + statement.
+
 
+
+

2. Scoping

+
+
 
+
+
Level 1 Self-Assessment Scope
+
+
Prior to a Level 1 Cybersecurity Maturity Model Certification (CMMC) Self-Assessment, + the contractor must specify the CMMC Self-Assessment Scope. The CMMC Self-Assessment Scope informs which + assets within the contractor's environment will be assessed and the details of the self-assessment. +
+
 
+
FCI Assets
+
Federal Contract Information (FCI) Assets process, store, or transmit FCI as + follows:
+
•      Process - FCI can be used by an asset (e.g., accessed, entered, + edited, generated, manipulated, or printed).
+
•      Store - FCI is inactive or at rest on an asset (e.g., located on + electronic media, in system component memory, or in physical format such as paper documents).
+
•      Transmit - FCI is being transferred from one asset to another + asset (e.g., data in transit using physical or digital transport methods).
+
     FCI Assets are part of the CMMC Self-Assessment Scope and are + assessed against applicable CMMC practices.
+
 
+
Additional information on CMMC 2.0 Level 1 scope can be found in CMMC Self-Assessment + Scope Level 1 Version 2.0 December 2021.
+
 
+
Additional Guidance on Level 1 Scoping Activities
+
To appropriately scope a CMMCLevel 1 self-assessment, the contractor should consider the + people, technology, facilities, and external service providers within their environment that process, store, + or transmit FCI.
+
 
+
+
Level 2 Scope
+
+
Identifying the CMMC Assessment Scope
+
For CMMC 2.0 scope guidance, the CMMC Self-Assessment + Scope Level 2 Version 2.0 December 2021 provides information on the categorization of + assets that, in turn, inform the specification of assessment scope for a Cybersecurity Maturity + Model Certification (CMMC) assessment. The scoping guide discusses CMMC asset categories as well as the + associated requirements for Defense Industrial Base (DIB) contractors and CMMC assessments.
+
 
+
CMMC Asset Categories
+
The CMMC Assessment Guide Level 2 Version 2.0 December 2021 maps contractor assets into one + of five categories. Table 1 in the Assessment Guide describes each asset category, contractor + requirements, and assessment requirements. Additional information about each asset category is provided in the + ensuing sections.
+
 
+
Defining the CMMC Assessment Scope
+
After categorizing their assets, the contractor then specifies the CMMC Assessment + Scope. See the CMMC + Self-Assessment Scope Level 2 Version 2.0 December 2021 for next steps in the scoping process. +
+
 
+
+

3. Navigating the Assessment

+
+
+
CMMC Practice Question Layout
+
+
 
+
Image of the various components of the CSET tool with annotations.
+
+
Domain and Domain Acronym
+
+
+
 
+
+
Practice Identifier
+
+
+
Each practice has a practice identification number in the format - DD.L#-REQ- + where:
+
•       DD is the two-letter domain abbreviation;
+
•       L# is the level number; and
+
REQ is the NIST SP 800-171 Rev 2 or NIST SP 800-172 security requirement number. +
+
 
+
 
+
+
Level Indicator
+
+
+
Indicates the + corresponding level associated with the practice statement. CMMC provides a benchmark against which an + organization can evaluate the current level of capability of its processes, practices, and + methods and set goals and priorities for improvement.
+
+
CSET Icons
+
+
+
In the CSET + Icons section below, you will find a breakdown of each of the CSET-specific icons and how they help + facilitate a CMMC assessment.
+
+
Assessment Findings (CSET Answer Key)
+
+
+
A full breakdown of + the CMMC Assessment Findings (CSET Answer Key) is below.
+
+
Progress Indicator
+
+
+
The Progress + Indicator will turn blue and complete the circle as the questions in each Capability area are completed. When + all the questions are complete, the Progress Indicator will show a check mark.
+
 
+
Image of the Yes Icon answer choice. MET + is presented as Yes in the CSET Assessment Tool. The contractor successfully meets the practice. For each practice marked MET, the + assessor includes statements that indicate the response conforms to the objectives and documents the + appropriate evidence to support the response.
+
 
+
For MET (Yes), the assessor can use the Observations + field to record applicable observations.
+
 
+
+
 
+
Image of the No Icon answer choice. NOT + MET is presented as NO in the CSET Assessment tool. The contractor has not met the + practice. For each practice marked NOT MET, the assessor includes statements that explain why and documents + the appropriate evidence that the contractor does not conform to the objectives.
+
 
+
For NOT MET (No), the assessor can use the + Observations field to record applicable observations.
+
 
+
+
 
+
 
+
  NOT + APPLICABLE indicates the practice does not apply to the contractor. For each practice marked NA, + the assessor is required to include a statement that explains why the practice does not apply to the + contractor. 
+
 
+
Assessor comments may be recorded in the Observations field in the CSET + icon tray.
+
 
+
+
Mark for Review
+
+
The Mark for Review function allows a user to mark a practice question + for further review.
+
 
+
+
 
+
 
+
+

3.1 CMMC 2.0 Assessment Components in CSET®

+
+
 
+
+
Supplemental Guidance
+
+
Users can refer to the supporting authorities and additional guidance provided under + Supplemental Guidance.
+
 
+
NOTE: The "FURTHER GUIDANCE" section below NIST SP 800-171A guidance + is derived from previous CMMC 1.02 guidance for informational purposes only. It will be updated when the + CMMC 2.0 publications become available.
+
 
+
+
 
+
+
Comments
+
+
The comments function + allows the assessor to record non-structured comments for each question during the assessment. In contrast, the + Observations function (also useful for commenting) is more rigid and contains required fields.
+
 
+
+
+
+
 
+
+
Artifacts/Documents
+
+
Assessors can use the + Artifacts/Documents function to attach relevant evidence to each practice question.
+
 
+
+
+
+
 
+
+
Attached Artifacts/Documents
+
+
The documents will + appear listed by file name beneath the question when attached
.
A red indicator will appear on the icon + for each question where evidence has been attached.
+
 
+
+
+
+
 
+
+
Attached Documents Storage
+
+
Access your attached documents, artifacts, and evidence under the Tools Menu + next to the CSET Logo on the upper left side of the screen.
+
 
+
Image shows the Assessment Documents location under the Tools menu.
+
 
+
The Assessment Documents tab will open up a pop-up window showing all documents that are + attached to the Assessment. Documents are organized by title.
+
 
+
+
 
+
+
References
+
+
Users can click on the References icon to open links to CMMC .pdf + documentation. Documents will open in a separate window.  These documents can also be found in the + CSET Resource Library.
+
 
+
+
 
+
+
Observations
+
+
The Observations Icon + opens a pop-up window that allows an assessor to record their observations for each practice question.
+
 
+
+
+
+
 
+
Once a user has + entered their observations, a red indicator highlights the icon and the observations are listed beneath the + practice question in order of entry.
+
 
+
+
Observations Details Pop-Up Screen:
+
+
After selecting the + Observations Icon, the Observations Details screen appears.
+
 
+
+
+
+
 
+
+
Feedback
+
+
Users can record + Feedback during the assessment for submission to CSET/CISA. Some examples of submitted feedback include + commentary on the subject matter of the question, the structure of the question, and how the question and layout + can be improved.
+
 
+
+
 
+
+

3.2 Results

+
+
+

Image shows the Results tab selected.

+
+
CMMC presents the + Results of an assessment with the following sidebar navigation options:
+
 
+
+
Figure: Sidebar + Navigation showing CMMC 2.0 Results options.
+
 
+
The primary deliverables of the CMMC 2.0 assessment are the Performance by + Level, Performance by Domain, and the NIST 800-171A SPRS + interpretation based on the 110 requirements in NIST 800-171. To learn more about the CMMC Results and Report + functionality, visit the Results and Reports section of the CMMC User Guide. + To learn more about the NIST SPRS scoring methodology presented in the Results section, + please review + NIST SP 800-171 DoD Assessment Methodology, Version 1.2.1. +
+
 
+
+
Figure: Performance by Level
+
 
+
+
Figure: Performance by Domain
+
 
+
 
+
+
Figure: SPRS Scorecard
+
 
+
+

3.3 Reports

+
+
This section includes + the Executive Summary Report, Deficiency Report, and Comments/Questions Marked for Review + Report specific to CMMC 2.0.
+
 
+
+
 
+
+

4. Submit Feedback

+
+
At the end of the + assessment, users are prompted to submit their feedback on the CSET Assessment.
+
 
+
 
+
+
 
+
+
References
+
+
1.  U.S. Executive Office of the President, Council of Economic Advisers (CEA). The + Cost of Malicious Cyber Activity to the U.S. Economy, available online at + https://www.whitehouse.gov/wp-content/uploads/2018/02/The-Cost-of-Malicious Cyber-Activity-to-the-U.S.-Economy.pdf, + February 2018
+
2.  Center for Strategic and International Studies (CSIS) and McAfee, Economic + Impact of Cybercrime - No Slowing Down, February 2018
+
3.  48 Code of Federal Regulations (CFR) 52.204-21, Basic Safeguarding of Covered + Contractor Information Systems, Federal Acquisition Regulation (FAR), 1 Oct 2016
+
4.  NIST Special Publication (SP) 800-171 Revision (Rev) 2, Protecting Controlled + Unclassified Information in Nonfederal Systems and Organizations, U.S. Department of Commerce National + Institute of Standards and Technology (NIST), December 2016 (updated June 2018)
+
5.  DFARS 252.204-7012, Safeguarding Covered Defense Information and Cyber Incident + Reporting, October 2016
+
6.  NIST SP 800-172, Enhanced Security Requirements for Protecting Controlled + Unclassified Information: ASupplement to NIST Special Publication 800-171, U.S. Department of Commerce + National Institute of Standards and Technology (NIST), February 2021
+
 
+
 
+ + + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc2/tutorial-cmmc2.component.ts b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc2/tutorial-cmmc2.component.ts index 8bc69493f6..3fdf78cc53 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc2/tutorial-cmmc2.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cmmc2/tutorial-cmmc2.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ // SOFTWARE. // //////////////////////////////// -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { ConfigService } from '../../../../services/config.service'; import { LayoutService } from '../../../../services/layout.service'; import { ResourceLibraryService } from '../../../../services/resource-library.service'; diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-crr/tutorial-crr.component.html b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-crr/tutorial-crr.component.html index 539e5db493..48bc822126 100644 --- a/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-crr/tutorial-crr.component.html +++ b/CSETWebNg/src/app/assessment/prepare/maturity/tutorial-crr/tutorial-crr.component.html @@ -1,6 +1,6 @@ +-------------------------->
- - + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/prepare.component.ts b/CSETWebNg/src/app/assessment/prepare/prepare.component.ts index 91c287b14c..558e2c6224 100644 --- a/CSETWebNg/src/app/assessment/prepare/prepare.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/prepare.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/required/required.component.html b/CSETWebNg/src/app/assessment/prepare/required/required.component.html index 49c9d8f94e..991118d7ce 100644 --- a/CSETWebNg/src/app/assessment/prepare/required/required.component.html +++ b/CSETWebNg/src/app/assessment/prepare/required/required.component.html @@ -1,6 +1,6 @@ -
-

Overall SAL

-
- - - + +
+

{{t('titles.sal.overall sal')}}

+
+ + + +
+
+ +
+ {{ t('titles.sal.gen sal text1') }}
-
-
- Answer the following questions to help determine the SAL for your assessment by selecting the potential impacts on - people and/or economic factors in the event your system is compromised. -
+
+
+
{{ slider.onSite.postfix | titlecase }}
+ -
-
-
{{ slider.onSite.postfix | titlecase }}
- +
+
{{t('titles.sal.gen sal on site')}} {{slider?.offSite?.values[0]}}
+
{{t('titles.sal.gen sal on site')}} {{slider?.offSite?.values[slider?.offSite?.values?.length - 1]}} +
+ + -
-
On Site {{slider?.offSite?.values[0]}}
-
On Site {{slider?.offSite?.values[slider?.offSite?.values?.length - 1]}}
- +
{{t('titles.sal.gen sal off site')}} {{slider?.onSite?.values[0]}}
+
{{t('titles.sal.gen sal off site')}} {{slider?.onSite?.values[slider?.offSite?.values?.length - 1]}} +
+ - -
Off Site {{slider?.onSite?.values[0]}}
-
Off Site {{slider?.onSite?.values[slider?.offSite?.values?.length - 1]}}
- - +
+
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-gen/sal-gen.component.ts b/CSETWebNg/src/app/assessment/prepare/sals/sal-gen/sal-gen.component.ts index c638ea33f9..2d30f4995c 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-gen/sal-gen.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-gen/sal-gen.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,20 +27,33 @@ import { GeneralSalDescriptionsWeights } from '../../../../models/sal.model'; import { AssessmentService } from '../../../../services/assessment.service'; import { Sal } from '../../../../models/sal.model'; import { SalService } from '../../../../services/sal.service'; +import { TranslocoService } from '@ngneat/transloco'; + @Component({ selector: 'app-sal-gen', templateUrl: './sal-gen.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class SalGenComponent implements OnInit { sliders: GenSalPairs[]; - constructor(private assessSvc: AssessmentService, private route: ActivatedRoute, public salsSvc: SalService) { - } + /** + * + */ + constructor( + private assessSvc: AssessmentService, + private route: ActivatedRoute, + public salsSvc: SalService, + public tSvc: TranslocoService + ) { } + + /** + * + */ ngOnInit() { this.salsSvc.getGenSalDescriptions().subscribe( (data: GenSalPairs[]) => { @@ -58,6 +71,15 @@ export class SalGenComponent implements OnInit { } }; + // translate display text + s.onSite.sal_Description = this.tSvc.translate('titles.sal.gen sal ' + s.onSite.postfix.toLowerCase() + ' desc'); + s.onSite.postfix = this.tSvc.translate('titles.sal.gen sal ' + s.onSite.postfix.toLowerCase()); + s.onSite.prefix = this.tSvc.translate('titles.sal.gen sal ' + s.onSite.prefix.toLowerCase()); + let onsiteNone = s.onSite.values.findIndex(x => x.trim() == 'None'); + if (onsiteNone >= 0) { + s.onSite.values[onsiteNone] = this.tSvc.translate('titles.sal.gen sal none'); + } + s.offSite.options = { floor: s.offSite.min, ceil: s.offSite.max, @@ -68,12 +90,22 @@ export class SalGenComponent implements OnInit { return s.offSite.values[v]; } }; + + // translate display text + s.offSite.sal_Description = this.tSvc.translate('titles.sal.gen sal ' + s.offSite.postfix.toLowerCase() + ' desc'); + s.offSite.postfix = this.tSvc.translate('titles.sal.gen sal ' + s.offSite.postfix.toLowerCase()); + s.offSite.prefix = this.tSvc.translate('titles.sal.gen sal ' + s.offSite.prefix.toLowerCase()); + let offsiteNone = s.offSite.values.findIndex(x => x.trim() == 'None'); + if (offsiteNone >= 0) { + s.offSite.values[offsiteNone] = this.tSvc.translate('titles.sal.gen sal none'); + } + }); }, error => { - console.log('Error Getting gensal descriptions: ' + (error).name + (error).message); - console.log('Error gensal descriptions: ' + (error).stack); + console.log('Error getting gen sal descriptions: ' + (error).name + (error).message); + console.log('Error gen sal descriptions: ' + (error).stack); }); // retrieve the existing sal_selection for this assessment diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/nist-sal.models.ts b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/nist-sal.models.ts index 3dc98ff77e..6576a0ea9e 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/nist-sal.models.ts +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/nist-sal.models.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.html b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.html index 128a5e59d7..6a94ead2f2 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.html +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.html @@ -1,6 +1,6 @@ +--------------------------> -
-
-

Overall SAL

-
- - - -
+
+
+

{{t('titles.sal.overall sal')}}

+
+ + + +
-

Confidentiality

+

{{t('titles.sal.confidentiality')}}

- This value relates to the importance of protecting information from unauthorized access. The more important it - is that unauthorized users do not have access to the information the higher your SAL level. -
-
+ {{t('titles.sal.confidentiality text')}} +
+
-
@@ -58,16 +59,16 @@

Confidentiality

-

Integrity

+

{{t('titles.sal.integrity')}}

- This value relates to the the importance of the accuracy of information. The more important it is that - information is kept consistent, accurate, and only changed by those authorized the higher your SAL level. -
-
+ {{t('titles.sal.integrity text')}} +
+
-
@@ -76,16 +77,16 @@

Integrity

-

Availability

+

{{t('titles.sal.availability')}}

- This value relates to the importance of information being readily available. The more important it is to have - your information available for use the higher your SAL level. -
-
+ {{t('titles.sal.availability text')}} +
+
-
@@ -94,10 +95,13 @@

Availability

-

The FIPS 199 guide below will help you learn how to determine the overall security categorization of the system under - assessment. If you are unfamiliar with the FIPS 199 SAL Determination screen, please read the guide before proceeding.

+

The FIPS 199 guide below will help you learn how to determine the overall security categorization of the system + under + assessment. If you are unfamiliar with the FIPS 199 SAL Determination screen, please read the guide before + proceeding.

- +  FIPS 199 SAL Selection Guidance

Other Guides:

@@ -125,29 +129,35 @@

CIA Values Based on Selected Information Types

- + - {{salsSvc.getDisplayLevel(model.confidentiality_Value)}} {{salsSvc.getDisplayLevel(model.confidentiality_Value)}} - {{salsSvc.getDisplayLevel(model.integrity_Value)}} {{salsSvc.getDisplayLevel(model.integrity_Value)}} - {{salsSvc.getDisplayLevel(model.availability_Value)}} {{salsSvc.getDisplayLevel(model.availability_Value)}} @@ -165,11 +175,15 @@

Answer Questions

{{question.question_Text}}
-
@@ -182,13 +196,13 @@

Answer Questions

Determine Special Factors

- + - + - +
-
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.ts b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.ts index b17fef41f6..e99eb25470 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-nist/sal-nist.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ import { ConfirmComponent } from '../../../../dialogs/confirm/confirm.component' selector: 'app-sal-nist', templateUrl: './sal-nist.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class SalNistComponent implements OnInit { @@ -69,7 +69,7 @@ export class SalNistComponent implements OnInit { } saveLevel(level: string, ltype: string) { - this.salsSvc.selectedSAL.last_Sal_Determination_Type = 'NIST'; + this.salsSvc.selectedSAL.methodology = 'NIST'; switch (ltype) { case 'C': { this.salsSvc.selectedSAL.selectedSALOverride = false; diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.html b/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.html index 84e58608c4..d335cd0dd9 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.html +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.html @@ -1,6 +1,6 @@ -
-

Overall SAL

-
- - - -
-
+--------------------------> + +
+

{{t('titles.sal.overall sal')}}

+
+ +
-
-

Integrity

-
- This value relates to the the importance of the accuracy of information. The more important it is that - information is kept consistent, accurate, and only changed by those authorized the higher your SAL level. +
+

{{t('titles.sal.confidentiality')}}

+
+ {{t('titles.sal.confidentiality text')}} +
+
+ + + +
-
- - - -
-
-
-

Availability

-
- This value relates to the importance of information being readily available. The more important it is to have your - information available for use the higher your SAL level. +
+

{{t('titles.sal.integrity')}}

+
+ {{t('titles.sal.integrity text')}} +
+
+ + + +
-
- - - + +
+

{{t('titles.sal.availability')}}

+
+ {{t('titles.sal.availability text')}} +
+
+ + + +
-
+ \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.ts b/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.ts index 8f891d2fa0..f5a1a6d8b2 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/sals/sal-simple/sal-simple.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -52,7 +52,7 @@ export class SalSimpleComponent implements OnInit { } saveLevel(level: string, ltype: string) { - this.salsSvc.selectedSAL.last_Sal_Determination_Type = 'Simple'; + this.salsSvc.selectedSAL.methodology = 'Simple'; switch (ltype) { case 'C': { this.salsSvc.selectedSAL.cLevel = level; diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sals.component.html b/CSETWebNg/src/app/assessment/prepare/sals/sals.component.html index 99e314e5d5..b76a36132e 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sals.component.html +++ b/CSETWebNg/src/app/assessment/prepare/sals/sals.component.html @@ -1,6 +1,6 @@
-

{{t('titles.security assurance level (sal)')}}

+

{{t('titles.sal.security assurance level (sal)')}}

- {{t('sal intro 1')}} - {{t('sal intro 2')}} + {{t('titles.sal.sal intro1')}} + {{t('titles.sal.sal intro2')}}
- {{t('sal intro 3')}} + {{t('titles.sal.sal intro3')}}
- Current Security Assurance Level + {{t('titles.sal.current level')}}
-
Overall
+
{{t('titles.sal.overall')}}
{{ - this.salsSvc.selectedSAL.selected_Sal_Level }}
+ t('titles.sal.' + this.salsSvc.selectedSAL.selected_Sal_Level?.toLowerCase()) }}
-
Confidentiality
+
{{t('titles.sal.confidentiality')}}
{{ - this.salsSvc.selectedSAL.cLevel }}
+ t('titles.sal.' + this.salsSvc.selectedSAL.cLevel?.toLowerCase()) }}
-
Integrity
+
{{t('titles.sal.integrity')}}
{{ - this.salsSvc.selectedSAL.iLevel }}
+ t('titles.sal.' + this.salsSvc.selectedSAL.iLevel?.toLowerCase()) }}
-
Availability
+
{{t('titles.sal.availability')}}
{{ - this.salsSvc.selectedSAL.aLevel }}
+ t('titles.sal.' + this.salsSvc.selectedSAL.aLevel?.toLowerCase()) }}
- Choose one of the three SAL methodologies below to determine the correct level for your assessment. + {{t('titles.sal.choose methodology')}}
diff --git a/CSETWebNg/src/app/assessment/prepare/sals/sals.component.ts b/CSETWebNg/src/app/assessment/prepare/sals/sals.component.ts index b9d659cf0f..73cb8ee901 100644 --- a/CSETWebNg/src/app/assessment/prepare/sals/sals.component.ts +++ b/CSETWebNg/src/app/assessment/prepare/sals/sals.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -44,7 +44,7 @@ export class SalsComponent implements OnInit { public salsSvc: SalService, public navSvc: NavigationService, public layoutSvc: LayoutService - ) { + ) { } ngOnInit() { @@ -53,14 +53,14 @@ export class SalsComponent implements OnInit { (data: Sal) => { this.salsSvc.selectedSAL = data; this.sal_Levels = data; - if (data.last_Sal_Determination_Type.toLowerCase() === 'simple') { - data.last_Sal_Determination_Type = 'Simple'; + if (data.methodology.toLowerCase() === 'simple') { + data.methodology = 'Simple'; } - if (!data.last_Sal_Determination_Type) { - data.last_Sal_Determination_Type = 'Simple'; + if (!data.methodology) { + data.methodology = 'Simple'; } - this.selectedSal = data.last_Sal_Determination_Type; + this.selectedSal = data.methodology; }, error => { console.log('Error Getting all standards: ' + (error).name + (error).message); diff --git a/CSETWebNg/src/app/assessment/prepare/standards/awwa-standard/awwa-standard.component.html b/CSETWebNg/src/app/assessment/prepare/standards/awwa-standard/awwa-standard.component.html index 53aabc8fb1..f61e14e1e9 100644 --- a/CSETWebNg/src/app/assessment/prepare/standards/awwa-standard/awwa-standard.component.html +++ b/CSETWebNg/src/app/assessment/prepare/standards/awwa-standard/awwa-standard.component.html @@ -1,6 +1,6 @@

ask-questions works! -

+

\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.scss b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.scss +++ b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.spec.ts b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.spec.ts index e18b73cab8..b3543ab1d7 100644 --- a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.spec.ts +++ b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('AskQuestionsComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ AskQuestionsComponent ] + declarations: [AskQuestionsComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.ts b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.ts index 19530452ca..b6825bc83d 100644 --- a/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.ts +++ b/CSETWebNg/src/app/assessment/questions/ask-questions/ask-questions.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/category-block/category-block.component.html b/CSETWebNg/src/app/assessment/questions/category-block/category-block.component.html index 4c4d04cd52..3a96d9a8c3 100644 --- a/CSETWebNg/src/app/assessment/questions/category-block/category-block.component.html +++ b/CSETWebNg/src/app/assessment/questions/category-block/category-block.component.html @@ -1,6 +1,6 @@ +-------------------------->
+ {{ t(l.label.toLowerCase()) }} +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/questions/domain-maturity-filter/domain-maturity-filter.component.ts b/CSETWebNg/src/app/assessment/questions/domain-maturity-filter/domain-maturity-filter.component.ts index 76d8b03afb..af46261183 100644 --- a/CSETWebNg/src/app/assessment/questions/domain-maturity-filter/domain-maturity-filter.component.ts +++ b/CSETWebNg/src/app/assessment/questions/domain-maturity-filter/domain-maturity-filter.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html b/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html index 112e1dd040..a3fa65466b 100644 --- a/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html +++ b/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html @@ -1,6 +1,6 @@ -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/questions/grouping-description/grouping-description.component.ts b/CSETWebNg/src/app/assessment/questions/grouping-description/grouping-description.component.ts index d97b044306..b64d6b1407 100644 --- a/CSETWebNg/src/app/assessment/questions/grouping-description/grouping-description.component.ts +++ b/CSETWebNg/src/app/assessment/questions/grouping-description/grouping-description.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/issues/issues.component.html b/CSETWebNg/src/app/assessment/questions/issues/issues.component.html index c64186bf01..889738b867 100644 --- a/CSETWebNg/src/app/assessment/questions/issues/issues.component.html +++ b/CSETWebNg/src/app/assessment/questions/issues/issues.component.html @@ -1,6 +1,6 @@ -
+

{{title}}

- +
- +
-
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.scss b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.scss index bd82e51afb..40dbce557c 100644 --- a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.scss +++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.ts index 6bc998e857..33b5746653 100644 --- a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.ts +++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/grouping-block-nested/grouping-block-nested.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/maturity-questions-nested/maturity-questions-nested.component.html b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/maturity-questions-nested/maturity-questions-nested.component.html index ed7de7c010..99df23c8e2 100644 --- a/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/maturity-questions-nested/maturity-questions-nested.component.html +++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/nested/maturity-questions-nested/maturity-questions-nested.component.html @@ -1,6 +1,6 @@ -
+
- + (click)="changeRadio(o, $event)" [checked]="o.selected" + (keydown.Space)="catchSpace($event, optionGroupName + '-' + o.optionId)"> +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/analysis/components-results/components-results.component.ts b/CSETWebNg/src/app/assessment/results/analysis/components-results/components-results.component.ts index f6c704bfde..f5be0c7886 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/components-results/components-results.component.ts +++ b/CSETWebNg/src/app/assessment/results/analysis/components-results/components-results.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -26,7 +26,7 @@ import { Router } from '../../../../../../node_modules/@angular/router'; import { AnalysisService } from '../../../../services/analysis.service'; import { AssessmentService } from '../../../../services/assessment.service'; import { NavigationService } from '../../../../services/navigation/navigation.service'; -import Chart from 'chart.js/auto'; +import Chart from 'chart.js/auto'; @Component({ selector: 'app-components-results', templateUrl: './components-results.component.html' diff --git a/CSETWebNg/src/app/assessment/results/analysis/components-summary/components-summary.component.html b/CSETWebNg/src/app/assessment/results/analysis/components-summary/components-summary.component.html index 1030202b08..ca2a9d7c90 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/components-summary/components-summary.component.html +++ b/CSETWebNg/src/app/assessment/results/analysis/components-summary/components-summary.component.html @@ -1,6 +1,6 @@ +-------------------------->
@@ -28,8 +28,8 @@

Answers By Component Type

+
+
@@ -51,9 +51,8 @@

Answers By Component Type

- + - -
-
+
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/analysis/components-types/components-types.component.ts b/CSETWebNg/src/app/assessment/results/analysis/components-types/components-types.component.ts index 1f247a18c1..ec8dda631a 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/components-types/components-types.component.ts +++ b/CSETWebNg/src/app/assessment/results/analysis/components-types/components-types.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/analysis/components-warnings/components-warnings.component.html b/CSETWebNg/src/app/assessment/results/analysis/components-warnings/components-warnings.component.html index e649eda346..7f263c1681 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/components-warnings/components-warnings.component.html +++ b/CSETWebNg/src/app/assessment/results/analysis/components-warnings/components-warnings.component.html @@ -1,6 +1,6 @@ -
-

Control Priorities

-

- Information on ranking can be found in the User Guide. +

+

{{t('titles.control priorities')}}

+

-
+
- + {{row.standard}}
- + {{row.category}}
- + {{row.displayAnswer}}
- + {{row.rank}}
@@ -63,11 +65,13 @@

Control Priorities

- +
- - {{row.questionRef}} + + {{row.questionRef}}
@@ -77,5 +81,5 @@

Control Priorities

- +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/analysis/ranked-questions/ranked-questions.component.ts b/CSETWebNg/src/app/assessment/results/analysis/ranked-questions/ranked-questions.component.ts index 84738ac458..be5506c7ad 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/ranked-questions/ranked-questions.component.ts +++ b/CSETWebNg/src/app/assessment/results/analysis/ranked-questions/ranked-questions.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/analysis/standards-ranked/standards-ranked.component.html b/CSETWebNg/src/app/assessment/results/analysis/standards-ranked/standards-ranked.component.html index 505202326a..9e572a816c 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/standards-ranked/standards-ranked.component.html +++ b/CSETWebNg/src/app/assessment/results/analysis/standards-ranked/standards-ranked.component.html @@ -1,6 +1,6 @@

Results By Category

-

This chart shows the individual scores for each of the categories from a positive perspective. +

This chart shows the individual scores for each of the categories from a positive perspective. High scores on this chart show areas of strength.

{{chart}} @@ -34,7 +34,8 @@

Results By Category

-
+
+
{{ds.label}}

@@ -54,4 +55,4 @@

- + \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/analysis/standards-results/standards-results.component.ts b/CSETWebNg/src/app/assessment/results/analysis/standards-results/standards-results.component.ts index f57cbb5fa3..5358517bd1 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/standards-results/standards-results.component.ts +++ b/CSETWebNg/src/app/assessment/results/analysis/standards-results/standards-results.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.html b/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.html index d7466163ec..e1e7b6ce65 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.html +++ b/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.html @@ -1,6 +1,6 @@ +-------------------------->

Standards Summary

This chart shows the overall answer percentages for each individual answer type.

@@ -47,7 +47,7 @@

Standards Summary

- + - -
+ +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.ts b/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.ts index 948a61cc6f..0cce33d580 100644 --- a/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.ts +++ b/CSETWebNg/src/app/assessment/results/analysis/standards-summary/standards-summary.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -87,7 +87,7 @@ export class StandardsSummaryComponent implements OnInit, AfterViewInit { tooltip: { callbacks: { label: function (context) { - const label = context.dataset.label + (!!context.dataset.label ? ': ' : ' ') + const label = context.dataset.label + (!!context.dataset.label ? ': ' : ' ') + (context.dataset.data[context.dataIndex]).toFixed() + '%'; return label; } diff --git a/CSETWebNg/src/app/assessment/results/analytics-compare/analytics-compare.component.html b/CSETWebNg/src/app/assessment/results/analytics-compare/analytics-compare.component.html index fe246a51c3..ed172646e8 100644 --- a/CSETWebNg/src/app/assessment/results/analytics-compare/analytics-compare.component.html +++ b/CSETWebNg/src/app/assessment/results/analytics-compare/analytics-compare.component.html @@ -1,6 +1,6 @@
-
-
-

CIS Deficiencies

- -
- - - +
+
+

CIS Deficiencies

+
+ + +
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.scss b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.scss +++ b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.spec.ts b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.spec.ts index 9d6aae00ff..60f8b23c75 100644 --- a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.spec.ts +++ b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('RankedDeficiencyComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ RankedDeficiencyComponent ] + declarations: [RankedDeficiencyComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.ts b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.ts index 1c4bdf5334..3b54d6902a 100644 --- a/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.ts +++ b/CSETWebNg/src/app/assessment/results/cis/ranked-deficiency/ranked-deficiency.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ import { CisService } from '../../../../services/cis.service'; }) export class RankedDeficiencyComponent implements OnInit { - hasBaseline:boolean = false; + hasBaseline: boolean = false; constructor(public cisSvc: CisService) { } diff --git a/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.html b/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.html index 5b8db04656..2622dcd2e0 100644 --- a/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.html +++ b/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.html @@ -1,6 +1,6 @@
-
-
-

CIS Section Scoring

-
- +
+
+

CIS Section Scoring

+
+ +
-
-
-
- -
-
+
+
+
+ +
- - -
+ + +
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.ts b/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.ts index 48551774d3..223f1962a8 100644 --- a/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.ts +++ b/CSETWebNg/src/app/assessment/results/cis/section-scoring/section-scoring.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import { MaturityService } from '../../../../services/maturity.service'; templateUrl: './section-scoring.component.html' }) export class SectionScoringComponent implements OnInit { - + baselineAssessmentName: string; myModel: any; - loading:boolean = true; + loading: boolean = true; constructor( public maturitySvc: MaturityService, diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.html b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.html index c033aa21fe..3b735078f0 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.html +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.html @@ -1,6 +1,6 @@
-
COST: {{greenDollars}}{{grayDollars}}
-
IMPACT: {{impact}}
-
COMPLEXITY: {{complexity}}
-
+
COST: {{greenDollars}}{{grayDollars}}
+
IMPACT: {{impact}}
+
COMPLEXITY: {{complexity}}
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.scss b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.scss index 44d4b132f2..8c2206ecad 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.scss +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.ts b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.ts index cf670a106e..f84cf81c0d 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.ts +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-cost-impact-complexity/cpg-cost-impact-complexity.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-domain-summary-table/cpg-domain-summary-table.component.html b/CSETWebNg/src/app/assessment/results/cpg/cpg-domain-summary-table/cpg-domain-summary-table.component.html index e5248259f0..286c7f9723 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-domain-summary-table/cpg-domain-summary-table.component.html +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-domain-summary-table/cpg-domain-summary-table.component.html @@ -1,6 +1,6 @@
-
{{d.title}}
- - - @@ -63,4 +63,4 @@ - + \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.ts b/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.ts index 3cf7885909..91503f3ac6 100644 --- a/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.ts +++ b/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -32,7 +32,7 @@ import { AuthenticationService } from '../../services/authentication.service'; selector: 'app-assessment-documents', templateUrl: './assessment-documents.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class AssessmentDocumentsComponent implements OnInit { @@ -53,10 +53,10 @@ export class AssessmentDocumentsComponent implements OnInit { download(doc: any) { // get short-term JWT from API this.authSvc.getShortLivedToken().subscribe((response: any) => { - const url = this.fileSvc.downloadUrl + doc.document_Id + "?token=" + response.token; - window.location.href = url; + const url = this.fileSvc.downloadUrl + doc.document_Id + "?token=" + response.token; + window.location.href = url; }); -} + } close() { return this.dialog.close(); diff --git a/CSETWebNg/src/app/dialogs/assessment-encryption/export-password/export-password.component.html b/CSETWebNg/src/app/dialogs/assessment-encryption/export-password/export-password.component.html index eaa9397b3a..1840acca9a 100644 --- a/CSETWebNg/src/app/dialogs/assessment-encryption/export-password/export-password.component.html +++ b/CSETWebNg/src/app/dialogs/assessment-encryption/export-password/export-password.component.html @@ -1,6 +1,6 @@ +-------------------------->
@@ -33,6 +33,5 @@ - -
- \ No newline at end of file + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/charter-mistmatch/charter-mismatch.component.ts b/CSETWebNg/src/app/dialogs/charter-mistmatch/charter-mismatch.component.ts index 87ccb492b8..91cdeb1400 100644 --- a/CSETWebNg/src/app/dialogs/charter-mistmatch/charter-mismatch.component.ts +++ b/CSETWebNg/src/app/dialogs/charter-mistmatch/charter-mismatch.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -23,19 +23,19 @@ //////////////////////////////// import { Component, Inject } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; - + @Component({ selector: 'charter-mismatch', templateUrl: 'charter-mismatch.component.html', }) export class CharterMismatchComponent { - + constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } - + confirmWarning(): void { this.dialogRef.close(); } - + } \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/component-override/component-override.component.html b/CSETWebNg/src/app/dialogs/component-override/component-override.component.html index 2acc49f225..eb80cd09a4 100644 --- a/CSETWebNg/src/app/dialogs/component-override/component-override.component.html +++ b/CSETWebNg/src/app/dialogs/component-override/component-override.component.html @@ -1,6 +1,6 @@
-
+
Component Question Overrides
-

Change the answers that are specific to each component listed below. Answers +

Change the answers that are specific to each component listed below. Answers set at the component level override any default answer for the component type.

The question list will be refreshed to reflect answer changes when this dialog is dismissed. @@ -44,43 +44,47 @@ {{data.myQuestion.questionText}}

-
-
-
+
@@ -46,17 +46,18 @@
+ CURRENT ASSESSMENT + NOTES
- +
@@ -66,7 +67,7 @@ {{t}} - +
@@ -78,26 +79,22 @@
- IMPLEMENTED
- IN PROGRESS
- SCOPED
- NOT STARTED
diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.scss b/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.scss index bf56f8f729..52e6396f2a 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.scss +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.ts b/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.ts index 5c541ea082..e2416b3a56 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.ts +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-practice-table/cpg-practice-table.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.html b/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.html index 0364ef0991..01ae85ba7f 100644 --- a/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.html +++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.html @@ -1,6 +1,6 @@
-
-
- - -
- -
- - -
+
+
+ + +
- +
+ +
-
+ + +
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/crr/crr-summary-results/crr-summary-results.component.ts b/CSETWebNg/src/app/assessment/results/crr/crr-summary-results/crr-summary-results.component.ts index 510b34cec3..ef0af02200 100644 --- a/CSETWebNg/src/app/assessment/results/crr/crr-summary-results/crr-summary-results.component.ts +++ b/CSETWebNg/src/app/assessment/results/crr/crr-summary-results/crr-summary-results.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,7 +39,7 @@ export class CrrSummaryResultsComponent implements OnInit { constructor( private crrSvc: CrrService, - ) { + ) { } ngOnInit(): void { diff --git a/CSETWebNg/src/app/assessment/results/dashboard/acet-dashboard.component.html b/CSETWebNg/src/app/assessment/results/dashboard/acet-dashboard.component.html index 3802b0467a..b35d78e3e7 100644 --- a/CSETWebNg/src/app/assessment/results/dashboard/acet-dashboard.component.html +++ b/CSETWebNg/src/app/assessment/results/dashboard/acet-dashboard.component.html @@ -1,6 +1,6 @@
-
-
-
-
-
-
{{shorten(rp.parent.title_Id)}}
-
-
-
-
-
{{rc.title_Id}}
-
-
-
{{c.title_Id}}
+
+
+
+
+
+
+ {{shorten(rp.parent.title_Id)}}
+
+
+
+
+
+ {{rc.title_Id}}
+
+
+
{{c.title_Id}}
@@ -43,3 +47,4 @@
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.scss b/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.scss index d157e5dffb..2fe9ff5a7c 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.scss +++ b/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.ts b/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.ts index 9328e64745..9751516b94 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.ts +++ b/CSETWebNg/src/app/assessment/results/edm/edm-blocks-compact/edm-blocks-compact.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-q-blocks-horizontal/edm-q-blocks-horizontal.component.html b/CSETWebNg/src/app/assessment/results/edm/edm-q-blocks-horizontal/edm-q-blocks-horizontal.component.html index b06820797d..999ea5a4a0 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-q-blocks-horizontal/edm-q-blocks-horizontal.component.html +++ b/CSETWebNg/src/app/assessment/results/edm/edm-q-blocks-horizontal/edm-q-blocks-horizontal.component.html @@ -1,6 +1,6 @@
-
-
-
-
-
-
{{rp.parent.title_Id}}
-
-
-
-
-
{{rc.title_Id}}
-
-
-
{{c.title_Id}}
-
+
+
+
+
+
+
+ {{rp.parent.title_Id}}
+
+
+
+
+
{{rc.title_Id}}
+
+
+
{{c.title_Id}}
@@ -43,3 +44,4 @@
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.scss b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.scss index 32b742bd94..34867490a9 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.scss +++ b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.spec.ts b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.spec.ts index 6512a51e6b..62a1ccfaca 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.spec.ts +++ b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('EdmRelationshipComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ EdmRelationshipComponent ] + declarations: [EdmRelationshipComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.ts b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.ts index 215e851564..f7842bf860 100644 --- a/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.ts +++ b/CSETWebNg/src/app/assessment/results/edm/edm-relationship/edm-relationship.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/edm/maturity-indicator-levels/maturity-indicator-levels.component.html b/CSETWebNg/src/app/assessment/results/edm/maturity-indicator-levels/maturity-indicator-levels.component.html index 1d9252ac5e..4cd75e9b99 100644 --- a/CSETWebNg/src/app/assessment/results/edm/maturity-indicator-levels/maturity-indicator-levels.component.html +++ b/CSETWebNg/src/app/assessment/results/edm/maturity-indicator-levels/maturity-indicator-levels.component.html @@ -1,6 +1,6 @@
-
+
-
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.scss b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.scss +++ b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.spec.ts b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.spec.ts index 0281f8cfdd..ad52888419 100644 --- a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.spec.ts +++ b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('SummaryResultsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ SummaryResultsComponent ] + declarations: [SummaryResultsComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.ts b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.ts index 98119dbc3b..abb9b17f2e 100644 --- a/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.ts +++ b/CSETWebNg/src/app/assessment/results/edm/summary-results/summary-results.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/assessment/results/feedback/feedback.component.css b/CSETWebNg/src/app/assessment/results/feedback/feedback.component.css index b290ba3fc7..3b5eaa203d 100644 --- a/CSETWebNg/src/app/assessment/results/feedback/feedback.component.css +++ b/CSETWebNg/src/app/assessment/results/feedback/feedback.component.css @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -22,8 +22,8 @@ SOFTWARE. */ .copytxt { - min-height: 400px; - min-height: 400px; - padding: 30px; - overflow: scroll; + min-height: 400px; + min-height: 400px; + padding: 30px; + overflow: scroll; } \ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/feedback/feedback.component.html b/CSETWebNg/src/app/assessment/results/feedback/feedback.component.html index f1b154b40d..fd2431e9db 100644 --- a/CSETWebNg/src/app/assessment/results/feedback/feedback.component.html +++ b/CSETWebNg/src/app/assessment/results/feedback/feedback.component.html @@ -1,6 +1,6 @@
- +
- +
- + {{item.question.category}}
- + {{item.question.sub_Category}}
- + {{item.question.question_Text}}
- +
{{hydroSvc.impactTranslator(item.action.severity)}}
- +
- +

- +
- +
@@ -79,4 +85,4 @@
-
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/hydro/hydro-actions/hydro-actions.component.html b/CSETWebNg/src/app/assessment/results/hydro/hydro-actions/hydro-actions.component.html index 708b5fd01d..580d1dd565 100644 --- a/CSETWebNg/src/app/assessment/results/hydro/hydro-actions/hydro-actions.component.html +++ b/CSETWebNg/src/app/assessment/results/hydro/hydro-actions/hydro-actions.component.html @@ -1,6 +1,6 @@
- - + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/hydro/hydro-deficiency/hydro-deficiency.component.html b/CSETWebNg/src/app/assessment/results/hydro/hydro-deficiency/hydro-deficiency.component.html index bd4bbc005a..c684d5554c 100644 --- a/CSETWebNg/src/app/assessment/results/hydro/hydro-deficiency/hydro-deficiency.component.html +++ b/CSETWebNg/src/app/assessment/results/hydro/hydro-deficiency/hydro-deficiency.component.html @@ -1,6 +1,6 @@
-
-
-

Assessment Scores

-

- Your current percentage implemented based on questions answered, weighted by Impact. -

-
+
+
+

Assessment Scores

+

+ Your current percentage implemented based on questions answered, weighted by Impact. +

+
-
-
-
- - High Impact -
-
- - Medium Impact -
-
- - Low Impact -
-
- - UnImplemented -
+
+
+
+ + High Impact +
+
+ + Medium Impact +
+
+ + Low Impact +
+
+ + UnImplemented
-
-
-
- -
- -
+
+
+
+
+ +
+
-
- -
-
- -
-
- -
-
- -
-
- - - +
+ +
+
+ +
+
+ +
+
+ +
+
-
\ No newline at end of file + + + +
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/assessment/results/hydro/hydro-feasibility/hydro-feasibility.component.html b/CSETWebNg/src/app/assessment/results/hydro/hydro-feasibility/hydro-feasibility.component.html index 0cf746ef7f..7218a43201 100644 --- a/CSETWebNg/src/app/assessment/results/hydro/hydro-feasibility/hydro-feasibility.component.html +++ b/CSETWebNg/src/app/assessment/results/hydro/hydro-feasibility/hydro-feasibility.component.html @@ -1,6 +1,6 @@
- {{ doc.title }} + {{ doc.title }} - diff --git a/CSETWebNg/src/app/builder/standard-documents/standard-documents.component.ts b/CSETWebNg/src/app/builder/standard-documents/standard-documents.component.ts index d5283ab5a4..a9362b3ca2 100644 --- a/CSETWebNg/src/app/builder/standard-documents/standard-documents.component.ts +++ b/CSETWebNg/src/app/builder/standard-documents/standard-documents.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.html b/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.html index 78de3b6907..ecc01c8ae4 100644 --- a/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.html +++ b/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.html @@ -1,6 +1,6 @@
-
- - {{ 'about.about' | transloco }} -
- -
-
-
- - - - - - Automated Cybersecurity Evaluation Toolbox - {{ 'about.version' | transloco }}: {{version}} - https://www.ncua.gov - +
+ + {{ 'about.about' | transloco }} +
+ +
+
+
+ + + + + + Automated Cybersecurity Evaluation Toolbox + {{ 'about.version' | transloco }}: {{version}} + https://www.ncua.gov + +
+
+
+ ncua +
+
National Credit Union Administration
-
-
- ncua -
-
National Credit Union Administration
+
+
+
+
+
+ {{ t('we ensure financial stability') }}
-
-
-
-
-
- {{ t('we ensure financial stability') }} -
-
- {{ t('description') }} -
+
+ {{ t('description') }}
-
- -
- +
+
- + + - -
-

{{ 'contact.contact' | transloco }}

-
-
- Office of Examination and Insurance, - Critical Infrastructure Division -
-
- CU_Cybersecurity@NCUA.GOV -
-
+ +
+

{{ 'contact.contact' | transloco }}

+
+
+ Office of Examination and Insurance, + Critical Infrastructure Division +
+
+ CU_Cybersecurity@NCUA.GOV +
- - -
- - -
\ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts b/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts index b49c28e708..b3168da9a1 100644 --- a/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts +++ b/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ import { ConfigService } from '../../services/config.service'; selector: 'app-about-acet', templateUrl: './about-acet.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class AboutAcetComponent { version = environment.visibleVersion; diff --git a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.html b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.html index 1f0b7a5746..dd6da3ea92 100644 --- a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.html +++ b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.html @@ -1,6 +1,6 @@
- - About -
- -
-
-
- - - - - CYBER SECURITY EVALUATION TOOL - Version: {{version}} -
Build Date: {{linkerTime}}
-
-
-
- -
-
- Welcome to the CyberSecureFlorida initiative, a first-of-its-kind effort to assess the cybersecurity strengths and weaknesses of Florida’s collective critical infrastructure. The information gathered through this effort will be critical to helping Florida’s elected leaders determine how best to allocate resources and enact appropriate legislation to create a more secure Sunshine State! -
-
- -
- \ No newline at end of file + + About + + +
+
+
+ + + + + CYBER SECURITY EVALUATION TOOL + Version: {{version}} +
Build Date: {{linkerTime}}
+
+
+
+ +
+
+ Welcome to the CyberSecureFlorida initiative, a first-of-its-kind effort to assess the cybersecurity strengths + and weaknesses of Florida’s collective critical infrastructure. The information gathered through this effort + will be critical to helping Florida’s elected leaders determine how best to allocate resources and enact + appropriate legislation to create a more secure Sunshine State! +
+
+ +
+ \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.scss b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.scss +++ b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.spec.ts b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.spec.ts index 99cb1de7e5..8c4c517012 100644 --- a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.spec.ts +++ b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('AboutCfComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ AboutCfComponent ] + declarations: [AboutCfComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts index f9321b7156..8dae50a47f 100644 --- a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts +++ b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -38,22 +38,22 @@ export class AboutCfComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public data: any) { } - linkerTime: string = null; - /** - * - */ - ngOnInit() { - if (this.configSvc.config.debug.showBuildTime ?? false) { - this.linkerTime = localStorage.getItem('cset.linkerDate'); - } - - } - version = environment.visibleVersion; - helpContactEmail = this.configSvc.helpContactEmail; - helpContactPhone = this.configSvc.helpContactPhone; - - close() { - return this.dialog.close(); + linkerTime: string = null; + /** + * + */ + ngOnInit() { + if (this.configSvc.config.debug.showBuildTime ?? false) { + this.linkerTime = localStorage.getItem('cset.linkerDate'); } - - } \ No newline at end of file + + } + version = environment.visibleVersion; + helpContactEmail = this.configSvc.helpContactEmail; + helpContactPhone = this.configSvc.helpContactPhone; + + close() { + return this.dialog.close(); + } + +} \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html b/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html index a8d15e017a..56c07a099e 100644 --- a/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html +++ b/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.html @@ -1,6 +1,6 @@
- - About -
- -
-
-
- - - Ransomware Readiness Assessment - Version: {{version}} -
-
- -
-
- This is where text and links will go. -
-
- + + About + + +
+
+
+ + + Ransomware Readiness Assessment + Version: {{version}} +
+
+
+
+ This is where text and links will go. +
+
+ \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts b/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts index fd58d274a8..afa87f5d32 100644 --- a/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts +++ b/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.html b/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.html index 67c0c9d176..cf072da2b8 100644 --- a/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.html +++ b/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.html @@ -1,6 +1,6 @@
- + @@ -30,4 +31,4 @@ -
+ \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/about/about.component.ts b/CSETWebNg/src/app/dialogs/about/about.component.ts index 75d2045088..ad9a02c50a 100644 --- a/CSETWebNg/src/app/dialogs/about/about.component.ts +++ b/CSETWebNg/src/app/dialogs/about/about.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/add-requirement/add-requirement/add-requirement.component.html b/CSETWebNg/src/app/dialogs/add-requirement/add-requirement/add-requirement.component.html index 99008d495a..152d839f1e 100644 --- a/CSETWebNg/src/app/dialogs/add-requirement/add-requirement/add-requirement.component.html +++ b/CSETWebNg/src/app/dialogs/add-requirement/add-requirement/add-requirement.component.html @@ -1,6 +1,6 @@ +-------------------------->
@@ -37,4 +37,4 @@ -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/alert/alert.component.ts b/CSETWebNg/src/app/dialogs/alert/alert.component.ts index ee871936ba..b4eee4acd6 100644 --- a/CSETWebNg/src/app/dialogs/alert/alert.component.ts +++ b/CSETWebNg/src/app/dialogs/alert/alert.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.html b/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.html index ea3ad54841..0469be01c4 100644 --- a/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.html +++ b/CSETWebNg/src/app/dialogs/assessment-documents/assessment-documents.component.html @@ -1,6 +1,6 @@ +-------------------------->
- + Assessment Documents
@@ -51,7 +51,7 @@
{{doc.fileName}}
 -
- - - - - -
Specific Component Name
{{q.componentName}} -
- - - - -
-
- -
-
-
-
- - - - -
+
+
+ + + + + + +
Specific Component Name
{{q.componentName}} +
+ + + + +
+
+ +
+
+
+
+ + + + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/component-override/component-override.component.ts b/CSETWebNg/src/app/dialogs/component-override/component-override.component.ts index 592bec0c29..145d083092 100644 --- a/CSETWebNg/src/app/dialogs/component-override/component-override.component.ts +++ b/CSETWebNg/src/app/dialogs/component-override/component-override.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -97,7 +97,7 @@ export class ComponentOverrideComponent { is_Maturity: q.is_Maturity, componentGuid: q.component_GUID }; - + // update the master question structure this.questionsSvc.setAnswerInQuestionList(q.question_Id, q.answer_Id, q.answer_Text); diff --git a/CSETWebNg/src/app/dialogs/confirm/confirm.component.html b/CSETWebNg/src/app/dialogs/confirm/confirm.component.html index 6c3f2c1b19..d19971617a 100644 --- a/CSETWebNg/src/app/dialogs/confirm/confirm.component.html +++ b/CSETWebNg/src/app/dialogs/confirm/confirm.component.html @@ -1,6 +1,6 @@ +-------------------------->
Access Denied
-

Your session has expired, a connection error has occurred, or you are no longer authorized to access that +

Your session has expired, a connection error has occurred, or you are no longer authorized to access + that assessment.

Please log in again.

 -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/ejection/ejection.component.ts b/CSETWebNg/src/app/dialogs/ejection/ejection.component.ts index 325de253c3..7e07684757 100644 --- a/CSETWebNg/src/app/dialogs/ejection/ejection.component.ts +++ b/CSETWebNg/src/app/dialogs/ejection/ejection.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import { MatDialogRef } from '@angular/material/dialog'; selector: 'app-ejection', templateUrl: './ejection.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class EjectionComponent implements OnInit { constructor(private dialog: MatDialogRef) { } diff --git a/CSETWebNg/src/app/dialogs/email/email.component.html b/CSETWebNg/src/app/dialogs/email/email.component.html index 876cc0da2d..509222ed4f 100644 --- a/CSETWebNg/src/app/dialogs/email/email.component.html +++ b/CSETWebNg/src/app/dialogs/email/email.component.html @@ -1,6 +1,6 @@ +-------------------------->
@@ -34,32 +34,34 @@
-
- +
- +
- + -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/email/email.component.ts b/CSETWebNg/src/app/dialogs/email/email.component.ts index acb4767b61..b25754b007 100644 --- a/CSETWebNg/src/app/dialogs/email/email.component.ts +++ b/CSETWebNg/src/app/dialogs/email/email.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -33,7 +33,7 @@ import { EmailService } from '../../services/email.service'; selector: 'app-email', templateUrl: './email.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class EmailComponent implements OnInit { showContacts = true; @@ -57,7 +57,7 @@ export class EmailComponent implements OnInit { this.contacts = this.data.contacts; this.subject = this.data.subject; this.body = this.data.body; - this.from = {firstName: this.auth.firstName(), lastName: this.auth.lastName(), primaryEmail: this.auth.email(), isPrimaryPoc: false, isSiteParticipant: false}; + this.from = { firstName: this.auth.firstName(), lastName: this.auth.lastName(), primaryEmail: this.auth.email(), isPrimaryPoc: false, isSiteParticipant: false }; for (const c of this.contacts) { this.textList += c.primaryEmail; @@ -83,13 +83,13 @@ export class EmailComponent implements OnInit { } testEmails(evt) { - switch (evt.keyCode) { - case 32: - case 186: - case 13: - this.textList = this.emailSvc.makeEmailList(this.textList) + ' '; - break; - } + switch (evt.keyCode) { + case 32: + case 186: + case 13: + this.textList = this.emailSvc.makeEmailList(this.textList) + ' '; + break; + } } close() { diff --git a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html index 2430e7a4e1..7fa0d62a2b 100644 --- a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html +++ b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html @@ -1,6 +1,6 @@
-
- - Submission Export Path -
-
{{errorMessage}}
- - UNC Path: - - - - - - - - - -
+ + + + + + + + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.scss b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.scss index bfac214df6..ded9bfbd14 100644 --- a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.scss +++ b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.spec.ts b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.spec.ts index 6dc88406a5..84254e8c98 100644 --- a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.spec.ts +++ b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('GlobalConfigurationComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ GlobalConfigurationComponent ] + declarations: [GlobalConfigurationComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.ts b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.ts index 6e742d8202..129d028b13 100644 --- a/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.ts +++ b/CSETWebNg/src/app/dialogs/global-configuration/global-configuration.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -45,9 +45,9 @@ export class GlobalConfigurationComponent implements OnInit { ngOnInit() { this.ncuaSvc.getUncPath().subscribe( (uncPath: any) => { - this.uncPath = uncPath.data; + this.uncPath = uncPath.data; }, - error => { + error => { var stuff: string[] = error.error.split(':'); this.errorMessage = stuff[0]; this.uncPath = stuff[1]; @@ -68,7 +68,7 @@ export class GlobalConfigurationComponent implements OnInit { (r: any) => { this.close(); }, - error => { + error => { var stuff: string[] = error.error.split(':'); this.errorMessage = stuff[0]; this.uncPath = stuff[1]; diff --git a/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.html b/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.html index 42fe9e6e37..0a50a8bbcd 100644 --- a/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.html +++ b/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.html @@ -1,6 +1,6 @@ +-------------------------->
- + Parameter Editor
@@ -43,7 +43,8 @@
-
+
The selected cybersecurity standards do not contain any parameters for customization. @@ -57,10 +58,10 @@ {{p.parameterName}} -
{{p.parameterValue}}
- +
{{p.parameterValue}}
+ @@ -70,4 +71,4 @@ -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.ts b/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.ts index fcc298e613..e15f246b44 100644 --- a/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.ts +++ b/CSETWebNg/src/app/dialogs/global-parameters/global-parameters.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.html b/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.html index 48c1527c68..c20b5b1820 100644 --- a/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.html +++ b/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.html @@ -1,6 +1,6 @@ +-------------------------->
Define Parameter Value
@@ -28,7 +28,8 @@ Define the input value for the selected parameter.

{{originalValue}}
- +
@@ -36,4 +37,4 @@ -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.ts b/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.ts index 7313f60643..ba9ff88132 100644 --- a/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.ts +++ b/CSETWebNg/src/app/dialogs/inline-parameter/inline-parameter.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ import { QuestionsService } from '../../services/questions.service'; selector: 'app-inline-parameter', templateUrl: './inline-parameter.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class InlineParameterComponent implements OnInit { diff --git a/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.html b/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.html index 79166c20d0..05e1b4bd3e 100644 --- a/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.html +++ b/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.html @@ -1,6 +1,6 @@ diff --git a/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.ts b/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.ts index d6d327a6fb..8978de672c 100644 --- a/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.ts +++ b/CSETWebNg/src/app/dialogs/ise-merit/merit-check.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -26,16 +26,16 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-merit-check', - + templateUrl: './merit-check.component.html', }) - + export class MeritCheckComponent implements OnInit { - + constructor( private dialog: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any - ) {} - + ) { } + dialogTitle: string = "Notification"; iconClass: string = "cset-icons-bell"; public hasHeader: boolean; @@ -53,7 +53,7 @@ export class MeritCheckComponent implements OnInit { } submit(overrideChoice: string) { - this.dialog.close(overrideChoice); + this.dialog.close(overrideChoice); } } \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.html b/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.html index 5544ce0fb8..b546722ce9 100644 --- a/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.html +++ b/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.html @@ -1,6 +1,6 @@ +-------------------------->
@@ -100,4 +100,4 @@ -
+
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.ts b/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.ts index 133d66d515..214dfe46ef 100644 --- a/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.ts +++ b/CSETWebNg/src/app/dialogs/keyboard-shortcuts/keyboard-shortcuts.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import { MatDialogRef } from '@angular/material/dialog'; selector: 'app-keyboard-shortcuts', templateUrl: './keyboard-shortcuts.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class KeyboardShortcutsComponent implements OnInit { diff --git a/CSETWebNg/src/app/dialogs/license/license.component.html b/CSETWebNg/src/app/dialogs/license/license.component.html index 32951d0ddc..9f15010f0c 100644 --- a/CSETWebNg/src/app/dialogs/license/license.component.html +++ b/CSETWebNg/src/app/dialogs/license/license.component.html @@ -1,6 +1,6 @@ +-------------------------->
-
- The MIT License (MIT) -
- -
-

- Copyright 2023 Battelle Energy Alliance, LLC -

-

- Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: -

-

- The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. -

-

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -

-
- - - - +
+ The MIT License (MIT)
- + +
+

+ Copyright 2024 Battelle Energy Alliance, LLC +

+

+ Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: +

+

+ The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. +

+

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +

+
+ + + + +
\ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/license/license.component.ts b/CSETWebNg/src/app/dialogs/license/license.component.ts index c70014cb9b..6a0e79572d 100644 --- a/CSETWebNg/src/app/dialogs/license/license.component.ts +++ b/CSETWebNg/src/app/dialogs/license/license.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import { MatDialogRef } from '@angular/material/dialog'; selector: 'app-license', templateUrl: './license.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class LicenseComponent { constructor(private dialog: MatDialogRef) { } diff --git a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html index b40cfb013e..ae1299b5fb 100644 --- a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html +++ b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html @@ -1,6 +1,6 @@
-
- - {{dialogTitle}} -
+
+ + {{dialogTitle}} +
- -
-

It appears one or more errors occured during the Malcolm data upload process.

- -
- The following files were returned with errors -
  • {{ file }}

    • -

    Please ensure all files are valid JSON and have the correct schema.


    -
    + +
    +

    It appears one or more errors occured during the Malcolm data upload process.

    -
    - The following files were returned because they are an unsupported file type: -
  • {{ file }}

    • -

    The upload process only accepts .JSON files at the current time.


    -
    +
    + The following files were returned with errors +
  • {{ file }}

    • +

    Please ensure all files are valid JSON and have the correct schema.


    +
    +
    + The following files were returned because they are an unsupported file type: +
  • {{ file }}

    • +

    The upload process only accepts .JSON files at the current time.


    - - - - -
    \ No newline at end of file +
    +     + + + + +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts index 5629ae3012..930754e27f 100644 --- a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts +++ b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -56,26 +56,26 @@ export class MalcolmUploadErrorComponent implements OnInit { checkErrors() { // Check each error we got back, and save the file name this.errors.forEach(error => { - if (error.statusCode == 400) { - this.errorCode400Files.push(error.file); - } - if (error.statusCode == 415) { - this.errorCode415Files.push(error.file); - } + if (error.statusCode == 400) { + this.errorCode400Files.push(error.file); + } + if (error.statusCode == 415) { + this.errorCode415Files.push(error.file); + } }); // Show the files that caused HTTP code 400 if (this.errorCode400Files.length > 0) { - this.have400errors = true; + this.have400errors = true; } else { - this.have400errors = false; + this.have400errors = false; } // Show the files that caused HTTP code 415 if (this.errorCode415Files.length > 0) { - this.have415errors = true; + this.have415errors = true; } else { - this.have415errors = false; + this.have415errors = false; } } diff --git a/CSETWebNg/src/app/dialogs/merge-question-detail/merge-question-detail.component.html b/CSETWebNg/src/app/dialogs/merge-question-detail/merge-question-detail.component.html index a8fa6260b4..7e95f12f34 100644 --- a/CSETWebNg/src/app/dialogs/merge-question-detail/merge-question-detail.component.html +++ b/CSETWebNg/src/app/dialogs/merge-question-detail/merge-question-detail.component.html @@ -1,6 +1,6 @@
    -
    - - Assesment Description +
    + + Assesment Description +
    + +
    +
    - -
    - -
    -
    -

    {{ data.title }}

    -
    -
    +
    +

    {{ data.title }}

    +
    - - - - - -
    +
    +     + + + + +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.scss b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.scss index 6e18fd15e1..51f8a11b26 100644 --- a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.scss +++ b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.spec.ts b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.spec.ts index c4b79c94c7..bda87cf71d 100644 --- a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.spec.ts +++ b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('NewAssessmentDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ NewAssessmentDialogComponent ] + declarations: [NewAssessmentDialogComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.ts b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.ts index 4324dce223..26f792998c 100644 --- a/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.ts +++ b/CSETWebNg/src/app/dialogs/new-assessment-dialog/new-assessment-dialog.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/okay/okay.component.html b/CSETWebNg/src/app/dialogs/okay/okay.component.html index c794749595..6187ce3c82 100644 --- a/CSETWebNg/src/app/dialogs/okay/okay.component.html +++ b/CSETWebNg/src/app/dialogs/okay/okay.component.html @@ -1,6 +1,6 @@ +-------------------------->
    {{dialogTitle}}
    -
    -
    +
    +
    -
    +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/okay/okay.component.ts b/CSETWebNg/src/app/dialogs/okay/okay.component.ts index cbb339f9d1..ec331d3a77 100644 --- a/CSETWebNg/src/app/dialogs/okay/okay.component.ts +++ b/CSETWebNg/src/app/dialogs/okay/okay.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; selector: 'app-okay', templateUrl: './okay.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a'} + host: { class: 'd-flex flex-column flex-11a' } }) export class OkayComponent implements OnInit { constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } diff --git a/CSETWebNg/src/app/dialogs/online-disclaimer/online-disclaimer.component.html b/CSETWebNg/src/app/dialogs/online-disclaimer/online-disclaimer.component.html index fb3cfec368..570c4b89ee 100644 --- a/CSETWebNg/src/app/dialogs/online-disclaimer/online-disclaimer.component.html +++ b/CSETWebNg/src/app/dialogs/online-disclaimer/online-disclaimer.component.html @@ -1,6 +1,6 @@ +-------------------------->
    @@ -29,11 +29,13 @@
    - +
    - + @@ -41,51 +43,59 @@
    - +
    - +
    - +
    - +
    -
    - +
    +
    - +
    - +
    - + @@ -96,4 +106,4 @@ -
    +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/question-filters/question-filters.component.ts b/CSETWebNg/src/app/dialogs/question-filters/question-filters.component.ts index 7a169bd13d..efffc1318e 100644 --- a/CSETWebNg/src/app/dialogs/question-filters/question-filters.component.ts +++ b/CSETWebNg/src/app/dialogs/question-filters/question-filters.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.html b/CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.html index 25fbcef71d..e3b501a99d 100644 --- a/CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.html +++ b/CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.html @@ -1,6 +1,6 @@ + [disabled]="canBeClosed">{{ t('buttons.cancel') }} - +
    @@ -70,4 +75,4 @@

    {{file.name}}

    -
    --> +
    --> \ No newline at end of file diff --git a/CSETWebNg/src/app/dialogs/upload-export/upload-export.component.ts b/CSETWebNg/src/app/dialogs/upload-export/upload-export.component.ts index bc588b99ae..cb3d4cbbe3 100644 --- a/CSETWebNg/src/app/dialogs/upload-export/upload-export.component.ts +++ b/CSETWebNg/src/app/dialogs/upload-export/upload-export.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -75,7 +75,7 @@ export class UploadExportComponent implements OnInit { ngOnInit() { this.appCode = this.configSvc.installationMode; - + if (this.data) { const files: { [key: string]: File } = this.data.files; for (const key in files) { @@ -184,7 +184,7 @@ export class UploadExportComponent implements OnInit { this.successfulAssessmentIndexes.push(i); this.files.delete(fileToRemove); - if (count >= allProgressObservables.length){ + if (count >= allProgressObservables.length) { if (this.data.isCsafUpload) { this.canBeClosed = true; this.dialog.disableClose = false; diff --git a/CSETWebNg/src/app/dialogs/user-language/user-language.component.html b/CSETWebNg/src/app/dialogs/user-language/user-language.component.html index b579679527..69ffed5ce5 100644 --- a/CSETWebNg/src/app/dialogs/user-language/user-language.component.html +++ b/CSETWebNg/src/app/dialogs/user-language/user-language.component.html @@ -1,6 +1,6 @@ +--------------------------> - + - - - - + d="M 7.329664,92.631569 49.071542,134.28055 139.20911,44.21687 122.03725,26.811109 50.103141,98.935959 25.354402,74.187222" + fill="#ffffff" transform="rotate(90) scale(.2) translate(30, -175)" /> + \ No newline at end of file diff --git a/CSETWebNg/src/app/helpers/progress/progress.component.ts b/CSETWebNg/src/app/helpers/progress/progress.component.ts index d9a8cc5fc5..2c2f15f9a5 100644 --- a/CSETWebNg/src/app/helpers/progress/progress.component.ts +++ b/CSETWebNg/src/app/helpers/progress/progress.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/helpers/run-scripts.directive.ts b/CSETWebNg/src/app/helpers/run-scripts.directive.ts index f7fdd1452d..d0a420ed89 100644 --- a/CSETWebNg/src/app/helpers/run-scripts.directive.ts +++ b/CSETWebNg/src/app/helpers/run-scripts.directive.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,18 +34,18 @@ export class RunScriptsDirective implements OnInit { reinsertScripts(): void { const scripts = this.elementRef.nativeElement.getElementsByTagName('script'); const scriptsInitialLength = scripts.length; - - for (let i = 0; i < scriptsInitialLength; i++) { - const script = scripts[i]; - const scriptCopy = document.createElement('script'); - scriptCopy.type = script.type ? script.type : 'text/javascript'; - if (script.innerHTML) { - scriptCopy.innerHTML = script.innerHTML; - } else if (script.src) { - scriptCopy.src = script.src; - } - scriptCopy.async = false; - script.parentNode.replaceChild(scriptCopy, script); + + for (let i = 0; i < scriptsInitialLength; i++) { + const script = scripts[i]; + const scriptCopy = document.createElement('script'); + scriptCopy.type = script.type ? script.type : 'text/javascript'; + if (script.innerHTML) { + scriptCopy.innerHTML = script.innerHTML; + } else if (script.src) { + scriptCopy.src = script.src; } + scriptCopy.async = false; + script.parentNode.replaceChild(scriptCopy, script); + } } } \ No newline at end of file diff --git a/CSETWebNg/src/app/helpers/safe.pipe.ts b/CSETWebNg/src/app/helpers/safe.pipe.ts index 58becdd6c3..e7e9e51dd5 100644 --- a/CSETWebNg/src/app/helpers/safe.pipe.ts +++ b/CSETWebNg/src/app/helpers/safe.pipe.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/helpers/zip-code.directive.ts b/CSETWebNg/src/app/helpers/zip-code.directive.ts index 1600f11518..ca0eeb50b7 100644 --- a/CSETWebNg/src/app/helpers/zip-code.directive.ts +++ b/CSETWebNg/src/app/helpers/zip-code.directive.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/import/formatting/commands/formatAsXml.ts b/CSETWebNg/src/app/import/formatting/commands/formatAsXml.ts index 55e7879238..60b234ac6b 100644 --- a/CSETWebNg/src/app/import/formatting/commands/formatAsXml.ts +++ b/CSETWebNg/src/app/import/formatting/commands/formatAsXml.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,9 +39,9 @@ export function formatAsXml(editor: editor.ICodeEditor, edit: editor.ISingleEdit edits = xmlFormattingEditProvider.provideDocumentRangeFormattingEdits( editor.getModel(), new monaco.Range(selection.selectionStartLineNumber, - selection.selectionStartColumn, - selection.endLineNumber, - selection.endColumn), + selection.selectionStartColumn, + selection.endLineNumber, + selection.endColumn), formattingOptions, null); } else { diff --git a/CSETWebNg/src/app/import/formatting/commands/index.ts b/CSETWebNg/src/app/import/formatting/commands/index.ts index 7f24a2fd1c..cc6be2df17 100644 --- a/CSETWebNg/src/app/import/formatting/commands/index.ts +++ b/CSETWebNg/src/app/import/formatting/commands/index.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/import/formatting/commands/minifyXml.ts b/CSETWebNg/src/app/import/formatting/commands/minifyXml.ts index e59d6e570c..65c8fa3a71 100644 --- a/CSETWebNg/src/app/import/formatting/commands/minifyXml.ts +++ b/CSETWebNg/src/app/import/formatting/commands/minifyXml.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/import/formatting/formatters/index.ts b/CSETWebNg/src/app/import/formatting/formatters/index.ts index 74ef8d02e2..6c3c580f8f 100644 --- a/CSETWebNg/src/app/import/formatting/formatters/index.ts +++ b/CSETWebNg/src/app/import/formatting/formatters/index.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/import/formatting/formatters/v2-xml-formatter.ts b/CSETWebNg/src/app/import/formatting/formatters/v2-xml-formatter.ts index e05ddf271e..106f1afd2a 100644 --- a/CSETWebNg/src/app/import/formatting/formatters/v2-xml-formatter.ts +++ b/CSETWebNg/src/app/import/formatting/formatters/v2-xml-formatter.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -74,9 +74,9 @@ export class V2XmlFormatter implements XmlFormatter { function refreshMixedContentFlag(): void { inMixedContent = - (isLastNonTextLocation(Location.StartTag) - || isLastNonTextLocation(Location.EndTag)) - && lastWordCharacter !== undefined; + (isLastNonTextLocation(Location.StartTag) + || isLastNonTextLocation(Location.EndTag)) + && lastWordCharacter !== undefined; } function setLocation(loc: Location): void { @@ -179,7 +179,7 @@ export class V2XmlFormatter implements XmlFormatter { && cc === "/" && pc !== " " && options.enforcePrettySelfClosingTagOnFormat) { - output += " /"; + output += " /"; } else if ((isLocation(Location.StartTag) || isLocation(Location.StartTagName)) && cc === ">") { // if this was a self-closing tag, we need to decrement the indent level and add a newLine if (pc === "/") { diff --git a/CSETWebNg/src/app/import/formatting/index.ts b/CSETWebNg/src/app/import/formatting/index.ts index cb2ccdb369..b452f09088 100644 --- a/CSETWebNg/src/app/import/formatting/index.ts +++ b/CSETWebNg/src/app/import/formatting/index.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/import/formatting/xml-formatter.ts b/CSETWebNg/src/app/import/formatting/xml-formatter.ts index d7dcbfd600..519bdbc588 100644 --- a/CSETWebNg/src/app/import/formatting/xml-formatter.ts +++ b/CSETWebNg/src/app/import/formatting/xml-formatter.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -38,7 +38,7 @@ export class XmlFormatterFactory { return XmlFormatterFactory._xmlFormatter; } - const xmlFormatterImplementation: XmlFormatter = new V2XmlFormatter(); + const xmlFormatterImplementation: XmlFormatter = new V2XmlFormatter(); return (XmlFormatterFactory._xmlFormatter = xmlFormatterImplementation); diff --git a/CSETWebNg/src/app/import/formatting/xml-formatting-edit-provider.ts b/CSETWebNg/src/app/import/formatting/xml-formatting-edit-provider.ts index 9aa076683e..173be49e16 100644 --- a/CSETWebNg/src/app/import/formatting/xml-formatting-edit-provider.ts +++ b/CSETWebNg/src/app/import/formatting/xml-formatting-edit-provider.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,43 +29,43 @@ export class XmlFormattingEditProvider implements languages.DocumentFormattingEditProvider, languages.DocumentRangeFormattingEditProvider { - provideDocumentRangeFormattingEdits( - model: editor.ITextModel, - range: Range, - options: languages.FormattingOptions, - token: CancellationToken - ): languages.TextEdit[] - | PromiseLike { - let xml = model.getValueInRange(range); + provideDocumentRangeFormattingEdits( + model: editor.ITextModel, + range: Range, + options: languages.FormattingOptions, + token: CancellationToken + ): languages.TextEdit[] + | PromiseLike { + let xml = model.getValueInRange(range); - xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, model)); + xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, model)); - return [ {range: range, text: xml} ]; - } - provideDocumentFormattingEdits(model: editor.ITextModel, - options: languages.FormattingOptions, token: CancellationToken - ): languages.TextEdit[] | PromiseLike { - const documentRange = model.getFullModelRange(); - return this.provideDocumentRangeFormattingEdits(model, documentRange, options, token); - } - constructor( - public xmlFormatter: XmlFormatter - ) { } + return [{ range: range, text: xml }]; + } + provideDocumentFormattingEdits(model: editor.ITextModel, + options: languages.FormattingOptions, token: CancellationToken + ): languages.TextEdit[] | PromiseLike { + const documentRange = model.getFullModelRange(); + return this.provideDocumentRangeFormattingEdits(model, documentRange, options, token); + } + constructor( + public xmlFormatter: XmlFormatter + ) { } - // provideDocumentFormattingEdits(document: TextDocument, - // options: FormattingOptions, token: CancellationToken): ProviderResult { - // const lastLine = document.lineAt(document.lineCount - 1); - // const documentRange = new Range(document.positionAt(0), lastLine.range.end); + // provideDocumentFormattingEdits(document: TextDocument, + // options: FormattingOptions, token: CancellationToken): ProviderResult { + // const lastLine = document.lineAt(document.lineCount - 1); + // const documentRange = new Range(document.positionAt(0), lastLine.range.end); - // return this.provideDocumentRangeFormattingEdits(document, documentRange, options, token); - // } + // return this.provideDocumentRangeFormattingEdits(document, documentRange, options, token); + // } - // provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): - // ProviderResult { - // let xml = document.getText(range); + // provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): + // ProviderResult { + // let xml = document.getText(range); - // xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, document)); + // xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, document)); - // return [ TextEdit.replace(range, xml) ]; - // } + // return [ TextEdit.replace(range, xml) ]; + // } } diff --git a/CSETWebNg/src/app/import/formatting/xml-formatting-options.ts b/CSETWebNg/src/app/import/formatting/xml-formatting-options.ts index cfd322fb0c..cb365c672f 100644 --- a/CSETWebNg/src/app/import/formatting/xml-formatting-options.ts +++ b/CSETWebNg/src/app/import/formatting/xml-formatting-options.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -35,7 +35,7 @@ export interface XmlFormattingOptions { export class XmlFormattingOptionsFactory { static getXmlFormattingOptions(formattingOptions: languages.FormattingOptions, document: editor.ITextModel): - XmlFormattingOptions { + XmlFormattingOptions { return { editorOptions: formattingOptions, enforcePrettySelfClosingTagOnFormat: true, diff --git a/CSETWebNg/src/app/import/import.component.html b/CSETWebNg/src/app/import/import.component.html index c323bab8db..89d7d17255 100644 --- a/CSETWebNg/src/app/import/import.component.html +++ b/CSETWebNg/src/app/import/import.component.html @@ -1,6 +1,6 @@ - - +--------------------------> + \ No newline at end of file diff --git a/CSETWebNg/src/app/initial/initial.component.ts b/CSETWebNg/src/app/initial/initial.component.ts index d4fb268d02..3887e7d322 100644 --- a/CSETWebNg/src/app/initial/initial.component.ts +++ b/CSETWebNg/src/app/initial/initial.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,12 +27,12 @@ import { Component, OnInit } from '@angular/core'; selector: 'app-initial', templateUrl: './initial.component.html', // eslint-disable-next-line - host: {class: 'd-flex flex-column flex-11a w-100'} + host: { class: 'd-flex flex-column flex-11a w-100' } }) export class InitialComponent implements OnInit { - constructor() { - + constructor() { + } ngOnInit() { diff --git a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.html b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.html index 05d5defd04..e6aea78622 100644 --- a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.html +++ b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.html @@ -1,6 +1,6 @@
    - -
    -
    -
      -
    • - -
      • -
    • - -
      • -
    -
    + +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    -
    -
    -
    -
    - -
    - -
    +
    +
    +
    +
    +
    + +
    +
    -
    -
    - -
    +
    +
    +
    +
    -
    - - -
    -
    - +
    -
    + + +
    +
    + +
    +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.scss b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.scss index 5872c1de4c..3d7c47f10c 100644 --- a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.scss +++ b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.spec.ts b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.spec.ts index 727dc75879..ecb32140a1 100644 --- a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.spec.ts +++ b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.spec.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ describe('LandingPageTabsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ LandingPageTabsComponent ] + declarations: [LandingPageTabsComponent] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.ts b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.ts index 210062d3fb..7eab1c2bc0 100644 --- a/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.ts +++ b/CSETWebNg/src/app/initial/landing-page-tabs/landing-page-tabs.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.html b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.html index 17f7f9c073..43a53cea21 100644 --- a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.html +++ b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.html @@ -1,6 +1,6 @@ -
    +
    Online @@ -49,7 +48,8 @@
    @@ -64,12 +64,14 @@
    - +
    -
    +
    \ No newline at end of file diff --git a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.scss b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.scss index d370e422ba..4e6e0759ed 100644 --- a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.scss +++ b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.scss @@ -1,6 +1,6 @@ /* - Copyright 2023 Battelle Energy Alliance, LLC + Copyright 2024 Battelle Energy Alliance, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.ts b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.ts index 7d4f004009..5bad34cbe3 100644 --- a/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.ts +++ b/CSETWebNg/src/app/initial/login-access-key/login-access-key.component.ts @@ -1,6 +1,6 @@ //////////////////////////////// // -// Copyright 2023 Battelle Energy Alliance, LLC +// Copyright 2024 Battelle Energy Alliance, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CSETWebNg/src/app/initial/login-acet/login-acet.component.html b/CSETWebNg/src/app/initial/login-acet/login-acet.component.html index 9b1a5dc872..86b3c69182 100644 --- a/CSETWebNg/src/app/initial/login-acet/login-acet.component.html +++ b/CSETWebNg/src/app/initial/login-acet/login-acet.component.html @@ -1,6 +1,6 @@ -
    -