diff --git a/Libs/System.Windows.Interactivity.dll b/Libs/System.Windows.Interactivity.dll
new file mode 100644
index 00000000..931c744c
Binary files /dev/null and b/Libs/System.Windows.Interactivity.dll differ
diff --git a/Thermo.Active/App.config b/Thermo.Active/App.config
index b48014f9..38af01d7 100644
--- a/Thermo.Active/App.config
+++ b/Thermo.Active/App.config
@@ -4,81 +4,153 @@
https://go.microsoft.com/fwlink/?LinkId=301879
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Thermo.Active/App_Start/Startup.cs b/Thermo.Active/App_Start/Startup.cs
index 12991bdc..29d585b8 100644
--- a/Thermo.Active/App_Start/Startup.cs
+++ b/Thermo.Active/App_Start/Startup.cs
@@ -107,11 +107,11 @@ namespace Thermo.Active.App_Start
{
map.UseCors(CorsOptions.AllowAll);
- map.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions()
- {
- Provider = new SignalROAuthBearerProvider(),
- AuthenticationType = AUTHENTICATION_TYPE
- });
+ //map.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions()
+ //{
+ // Provider = new SignalROAuthBearerProvider(),
+ // AuthenticationType = AUTHENTICATION_TYPE
+ //});
var hubConfiguration = new HubConfiguration
{
Resolver = GlobalHost.DependencyResolver,
diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj
index f2f75143..3677d1d4 100644
--- a/Thermo.Active/Thermo.Active.csproj
+++ b/Thermo.Active/Thermo.Active.csproj
@@ -119,6 +119,8 @@
..\packages\Owin.1.0\lib\net40\Owin.dll
+
+
..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll
@@ -163,6 +165,10 @@
..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Razor.dll
+
+ ..\Libs\System.Windows.Interactivity.dll
+
+
@@ -204,6 +210,7 @@
..\packages\Microsoft.AspNet.WebPages.WebData.2.0.20505.0\lib\net40\WebMatrix.WebData.dll
+
@@ -16427,6 +16434,7 @@
+
diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html
index f1b8ee9e..fdd93267 100644
--- a/Thermo.Active/wwwroot/index.html
+++ b/Thermo.Active/wwwroot/index.html
@@ -13,7 +13,7 @@
-
+
diff --git a/Thermo.Active/wwwroot/src/main.ts b/Thermo.Active/wwwroot/src/main.ts
index d5592f39..95e26e10 100644
--- a/Thermo.Active/wwwroot/src/main.ts
+++ b/Thermo.Active/wwwroot/src/main.ts
@@ -88,7 +88,12 @@ router.beforeEach((to, from, next) => {
// Initialize default language
import { LocalizationService } from "src/services/localizationService";
-new LocalizationService().init();
+try
+{
+ new LocalizationService().init();
+}
+catch
+{ }
let v = new Vue({
diff --git a/Thermo.Active/wwwroot/src/services/hub.ts b/Thermo.Active/wwwroot/src/services/hub.ts
index d8cfa95d..391dd772 100644
--- a/Thermo.Active/wwwroot/src/services/hub.ts
+++ b/Thermo.Active/wwwroot/src/services/hub.ts
@@ -70,27 +70,29 @@ export class Hub {
try { $.connection.ncHub.logging = true; } catch{ }
// Registro le callback;
- this._hub.client.alarms = this.manageAlarmsCallbacks;
+ // this._hub.client.alarms = this.manageAlarmsCallbacks;
this._hub.client.powerOn = this.managePowerCallbacks;
- this._hub.client.ncNetworkStatus = Hub.manageNcStatus;
- this._hub.client.processesData = Hub.manageProcesses;
- this._hub.client.functionalityData = Hub.functionalityData;
- this._hub.client.expiredMaintenances = Hub.expiredMaintenances;
+ // this._hub.client.ncNetworkStatus = Hub.manageNcStatus;
+ // this._hub.client.processesData = Hub.manageProcesses;
+ // this._hub.client.functionalityData = Hub.functionalityData;
+ // this._hub.client.expiredMaintenances = Hub.expiredMaintenances;
- this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;
- this._hub.client.userSoftKeys = Hub.userSoftKeyChanged;
- this._hub.client.headsData = Hub.headsDataChanged;
- this._hub.client.processesData = Hub.processDataChanged;
- this._hub.client.axesNames = Hub.axesNamesDataChanged;
- this._hub.client.axesPositions = Hub.axesPositionsDataChanged;
- this._hub.client.magazinesStatus = Hub.magazineStatusChanged;
- this._hub.client.activeProgramData = Hub.activeProgramData;
- this._hub.client.magazineIsActive = Hub.magazineIsActive;
- this._hub.client.m155Data = Hub.m155Data;
- this._hub.client.partProgramQueue = Hub.partProgramQueue;
+ // this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;
+ // this._hub.client.userSoftKeys = Hub.userSoftKeyChanged;
+ // this._hub.client.headsData = Hub.headsDataChanged;
+ // this._hub.client.processesData = Hub.processDataChanged;
+ // this._hub.client.axesNames = Hub.axesNamesDataChanged;
+ // this._hub.client.axesPositions = Hub.axesPositionsDataChanged;
+ // this._hub.client.magazinesStatus = Hub.magazineStatusChanged;
+ // this._hub.client.activeProgramData = Hub.activeProgramData;
+ // this._hub.client.magazineIsActive = Hub.magazineIsActive;
+ // this._hub.client.m155Data = Hub.m155Data;
+ // this._hub.client.partProgramQueue = Hub.partProgramQueue;
- this._hub.client.scadaData = Hub.scadaDataChanged;
- this._hub.client.cmsConnectGatewayRebbot = Hub.cmsConnectGatewayRebbot;
+ // this._hub.client.scadaData = Hub.scadaDataChanged;
+ // this._hub.client.cmsConnectGatewayRebbot = Hub.cmsConnectGatewayRebbot;
+
+ // sottoscrivere qui i metodi NUOVI dal server (Recipe, gauges)
this._hub.client.logout = this.logout;
@@ -108,15 +110,15 @@ export class Hub {
$.connection.hub.start({ transport: ['serverSentEvents'] });
}, 5000); // Restart connection after 5 seconds.
});
- $.connection.hub.stateChanged(async (state) => {
- if (state.newState == $.signalR.connectionState.connected) {
- try {
- await scadaService.ListScada();
- }
- catch (err) { }
- Hub.manageServerStatus("connected");
- }
- })
+ // $.connection.hub.stateChanged(async (state) => {
+ // if (state.newState == $.signalR.connectionState.connected) {
+ // try {
+ // await scadaService.ListScada();
+ // }
+ // catch (err) { }
+ // Hub.manageServerStatus("connected");
+ // }
+ // })
$.connection.hub.start({ transport: ['serverSentEvents'] });
@@ -428,6 +430,8 @@ export class Hub {
});
}
+ // mettere qui metodo x pubblicare su server
+
public RefreshAlarm(id: string) {
this._hub.server.refreshAlarm(id)
.catch((err) => {