diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs
index 48082accc6..ef7d611947 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/DbManagerTests.cs
@@ -30,7 +30,7 @@ public void CopyDBAcrossServersTest()
{
string clientCode = "DHS";
string appCode = "CSET";
- DbManager manager = new DbManager(new Version("12.2.6.1"), clientCode, appCode);
+ DbManager manager = new DbManager(new Version("12.2.6.2"), clientCode, appCode);
//TODO finish this.
//manager.CopyDBAcrossServers();
}
@@ -42,7 +42,7 @@ public void CopyDBFromInstallationSource()
//setup a destination file
string clientCode = "DHS";
string appCode = "CSET";
- DbManager manager = new DbManager(new Version("12.2.6.1"), clientCode, appCode);
+ DbManager manager = new DbManager(new Version("12.2.6.2"), clientCode, appCode);
//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";
@@ -68,7 +68,7 @@ public void TestUpgrade()
//setup a destination file
string clientCode = "Test";
string appCode = "Test";
- DbManager manager = new DbManager(new Version("12.2.6.1"), clientCode, appCode);
+ DbManager manager = new DbManager(new Version("12.2.6.2"), clientCode, appCode);
//manager.ForceCloseAndDetach(DbManager.localdb2019_ConnectionString, "TestWeb");
//manager.AttachTest("TestWeb", testdb, testlog);
@@ -81,7 +81,7 @@ public void TestUpgrade()
manager.SetupDb();
- upgrader.UpgradeOnly(new Version("12.2.6.1"), "data source=(localdb)\\inllocaldb2022;initial catalog=TestWeb;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True");
+ upgrader.UpgradeOnly(new Version("12.2.6.2"), "data source=(localdb)\\inllocaldb2022;initial catalog=TestWeb;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True");
}
@@ -94,7 +94,7 @@ public void TestSetup()
//setup a destination file
string clientCode = "DHS";
string appCode = "CSET";
- DbManager manager = new DbManager(new Version("12.2.6.1"), clientCode, appCode);
+ DbManager manager = new DbManager(new Version("12.2.6.2"), clientCode, appCode);
manager.SetupDb();
}
@@ -106,7 +106,7 @@ public void CopyDBFromInstallationSourceTest2()
string mdf = $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\CSETWebTest.mdf";
string ldf = $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\CSETWebTest_log.ldf";
- DbManager manager = new DbManager(new Version("12.2.6.1"), clientCode, appCode);
+ DbManager manager = new DbManager(new Version("12.2.6.2"), clientCode, appCode);
//run the same test twice and make sure that the number increment works
string conString = "Server=(localdb)\\inllocaldb2022;Integrated Security=true;AttachDbFileName=" + mdf;
using (SqlConnection conn = new SqlConnection(conString))
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj
index 5024bf2267..9991ca5808 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj
@@ -2,7 +2,7 @@
net8.0
- 12.2.6.1
+ 12.2.6.2
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12261.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12261.cs
index 0c6ad7fa22..d83504bf34 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12261.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12261.cs
@@ -13,7 +13,7 @@ internal class ConvertDatabase12261 : ConvertSqlDatabase
{
public ConvertDatabase12261(string path) : base(path)
{
- myVersion = new Version("12.2.6.0");
+ myVersion = new Version("12.2.6.1");
}
///
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12262.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12262.cs
new file mode 100644
index 0000000000..055c6db3cb
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/ConvertDatabase12262.cs
@@ -0,0 +1,35 @@
+////////////////////////////////
+//
+// Copyright 2024 Battelle Energy Alliance, LLC
+//
+//
+////////////////////////////////
+using System;
+using Microsoft.Data.SqlClient;
+using System.IO;
+namespace UpgradeLibrary.Upgrade
+{
+ internal class ConvertDatabase12262 : ConvertSqlDatabase
+ {
+ public ConvertDatabase12262(string path) : base(path)
+ {
+ myVersion = new Version("12.2.6.2");
+ }
+
+ ///
+ /// Runs the database update script
+ ///
+ /// F
+ public override void Execute(SqlConnection conn)
+ {
+ try
+ {
+ this.UpgradeToVersionLocalDB(conn, myVersion);
+ }
+ catch (Exception e)
+ {
+ throw new DatabaseUpgradeException("Error in upgrading database version 12.2.6.1 to 12.2.6.2: " + e.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/12260_to_12261.sql b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/12260_to_12261.sql
index ddd7912eed..9c8a17c127 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/12260_to_12261.sql
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/12260_to_12261.sql
@@ -24,6 +24,10 @@ BEGIN TRANSACTION
GO
IF @@ERROR <> 0 SET NOEXEC ON
GO
+IF OBJECT_ID('[dbo].[usp_GetMaturityAnswerTotals]') IS NOT NULL
+BEGIN
+DROP PROCEDURE [dbo].[usp_GetMaturityAnswerTotals]
+END
PRINT N'Creating [dbo].[usp_GetMaturityAnswerTotals]'
GO
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs
index 0488b63e8c..44bf918a7c 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/VersionUpgrader/VersionUpgrader.cs
@@ -119,6 +119,8 @@ public VersionUpgrader(string path)
converters.Add("12.2.4.0", new ConvertDatabase12250(path));
converters.Add("12.2.5.0", new ConvertDatabase12260(path));
converters.Add("12.2.6.0", new ConvertDatabase12261(path));
+ converters.Add("12.2.6.1", new ConvertDatabase12262(path));
+
}
public void UpgradeOnly(Version currentVersion, string tempConnect)
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj
index cce9788cb7..9af92ec8e3 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj
@@ -2,7 +2,7 @@
net8.0
- 12.2.6.1
+ 12.2.6.2
diff --git a/CSETWebNg/main-electron.js b/CSETWebNg/main-electron.js
index 45b02358e7..5530e25c78 100644
--- a/CSETWebNg/main-electron.js
+++ b/CSETWebNg/main-electron.js
@@ -27,7 +27,7 @@ let appName;
switch (installationMode) {
case 'ACET':
clientCode = 'NCUA';
- appName = 'TOOLBOX';
+ appName = 'ACET';
break;
case 'TSA':
clientCode = 'TSA';
@@ -74,7 +74,7 @@ function createWindow() {
height: 800,
webPreferences: { nodeIntegration: true, webSecurity: false },
icon: path.join(__dirname, 'dist/favicon_' + installationMode.toLowerCase() + '.ico'),
- title: appName
+ title: appName === 'ACET' ? 'TOOLBOX' : appName
});
// Default Electron application menu is immutable; have to create new one and modify from there
@@ -208,7 +208,7 @@ function createWindow() {
rootDir = path.dirname(app.getPath('exe'));
}
- log.info('Root Directory of ' + appName + ' Electron app: ' + rootDir);
+ log.info('Root Directory of ' + appName === 'ACET' ? 'TOOLBOX' : appName + ' Electron app: ' + rootDir);
if (app.isPackaged) {
@@ -334,7 +334,7 @@ function createWindow() {
overrideBrowserWindowOptions: {
parent: mainWindow,
icon: path.join(__dirname, 'dist/favicon_' + installationMode.toLowerCase() + '.ico'),
- title: details.frameName === 'csetweb-ng' || '_blank' ? `${appName}` : details.frameName
+ title: details.frameName === 'csetweb-ng' || '_blank' ? `${appName === 'ACET' ? 'TOOLBOX' : appName}` : details.frameName
}
};
})
diff --git a/CSETWebNg/src/app/services/config.service.ts b/CSETWebNg/src/app/services/config.service.ts
index 01a6fbe2f3..b364ac4931 100644
--- a/CSETWebNg/src/app/services/config.service.ts
+++ b/CSETWebNg/src/app/services/config.service.ts
@@ -334,7 +334,7 @@ export class ConfigService {
link.href = 'assets/icons/favicon_acet.ico?app=acet1';
var title = this.document.querySelector('title');
- title.innerText = 'ACET';
+ title.innerText = 'TOOLBOX';
}
break;
case 'TSA':
diff --git a/CSETWebNg/src/assets/settings/config.ACET.json b/CSETWebNg/src/assets/settings/config.ACET.json
index c71a880c0b..26f0f1eae7 100644
--- a/CSETWebNg/src/assets/settings/config.ACET.json
+++ b/CSETWebNg/src/assets/settings/config.ACET.json
@@ -8,7 +8,7 @@
"showAggregation": true,
"showAnalytics": false,
"showAnalyticsAtTheEnd": false,
- "showMenuLanguagePicker": true,
+ "showMenuLanguagePicker": false,
"showAnalyticsColumnOnLanding": false,
"splashPageHTML": "dist/assets/splashACET.html",
"showFacilityName": false,
diff --git a/CSETWebNg/src/assets/splashACET.html b/CSETWebNg/src/assets/splashACET.html
index 08e9edff4a..a17671dca4 100644
--- a/CSETWebNg/src/assets/splashACET.html
+++ b/CSETWebNg/src/assets/splashACET.html
@@ -96,7 +96,7 @@
- v12.2.6.1
+ v12.2.6.2
