Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitlab.seriate/Renzo' into develop

Browse Source
This commit is contained in:
Emmanuele Sassi
2021-09-16 18:24:48 +02:00
parent 2f78a26dfa e975d227f6
commit 1444babea7
6 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.DataLayer/App.config
+1 -1
View File
@@ -12,7 +12,7 @@
</providers>
</entityFramework>
<connectionStrings>
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb_000102;SslMode=none" providerName="MySql.Data.MySqlClient" />
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
EgtBEAMWALL.DataLayer/DatabaseContext.cs
+3 -3
View File
@@ -39,9 +39,9 @@ namespace EgtBEAMWALL.DataLayer
public DatabaseContext(string connectionString) : base(connectionString)
{
Database.CreateIfNotExists();
//Database.SetInitializer(new MigrateDatabaseToLatestVersion<StratonLocalizerDatabase, Migrations.Configuration>());
Database.Initialize(false);
//Database.CreateIfNotExists();
////Database.SetInitializer(new MigrateDatabaseToLatestVersion<StratonLocalizerDatabase, Migrations.Configuration>());
//Database.Initialize(false);
}
#endregion Public Constructors
EgtBEAMWALL.Supervisor/app.config
+1 -1
View File
@@ -12,7 +12,7 @@
</providers>
</entityFramework>
<connectionStrings>
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=root;password=viacremasca;Persist Security Info=True;database=EgtBwDb_000102;SslMode=none" providerName="MySql.Data.MySqlClient" />
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=root;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
EgtBEAMWALL.ViewerOptimizer/App.config
+1 -1
View File
@@ -12,7 +12,7 @@
</providers>
</entityFramework>
<connectionStrings>
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb_000102;SslMode=none" providerName="MySql.Data.MySqlClient"/>
<add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient"/>
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+1
View File
@@ -104,6 +104,7 @@ Public Class MainWindowVM
End Sub
Friend Sub ContentRendered()
DbControllers.Init()
'' chiamata a caso su Db per inizializzarlo
DbControllers.m_ProjController.FindByProjDbId(0)
' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine
EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb
+22 -1
View File
@@ -1,6 +1,6 @@
Imports EgtUILib
Module DbControllers
Public Module DbControllers
Friend m_SupervisorId As String = "1"
@@ -9,6 +9,27 @@ Module DbControllers
Public m_MachGroupController As DataLayer.Controllers.MachGroupController
Public m_StatusMapController As DataLayer.Controllers.StatusMapController
Sub Init()
' ' se demo--> server = db.steamware.net, nKey e sKey come le hai...
' Dim sKey = "", sUser = "", sPwd = ""
' EgtGetKeyInfo(sKey)
' sKey = sKey.Replace(" ", "")
' If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
' sUser = sKey.Substring(3, 6)
' sPwd = sKey.Substring(10, sKey.Length - 10).Replace("(", "").Replace(")", "")
' End If
' DataLayer.DbConfig.InitDb("127.0.0.1", sUser, sPwd)
' DataLayer.DbConfig.CheckUser(sUser, sPwd)
' m_ProjController = New DataLayer.Controllers.ProjController
' m_ProdController = New DataLayer.Controllers.ProdController
' m_MachGroupController = New DataLayer.Controllers.MachGroupController
' m_StatusMapController = New DataLayer.Controllers.StatusMapController
End Sub
Sub New()
' se demo--> server = db.steamware.net, nKey e sKey come le hai...