Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Samuele E. Locatelli
2020-09-28 09:20:07 +02:00
4 changed files with 12 additions and 7 deletions
@@ -173,7 +173,7 @@
}
time {
font-size: 120px;
font-size: 100px;
font-weight: 300;
z-index: 1;
max-height: 140px;
@@ -4347,7 +4347,7 @@ article .box .body {
.dashboard .first_col .timing-area .start time,
.dashboard .first_col .timing-area .current time,
.dashboard .first_col .timing-area .end time {
font-size: 120px;
font-size: 100px;
font-weight: 300;
z-index: 1;
max-height: 140px;
@@ -95,7 +95,7 @@
</div>
<div class="current">
<small>{{'dashboard-timing-elapsed' | localize('tempo trascorso')}}</small>
<time>{{elapsed | date('HH:mm')}}</time>
<time>{{Math.floor(elapsed /1000 / 3600)}}:{{elapsed | date('mm:ss')}}</time>
</div>
<div class="end">
<small>{{'dashboard-timing-end' | localize('fine')}}</small>
+9 -4
View File
@@ -76,10 +76,15 @@ export class Hub {
console.log('SignalrAdapter: ' + error, exc);
};
if (!PRODUCTION) {
try { $.connection.hub.logging = true; } catch { }
try { $.connection.ncHub.logging = true; } catch { }
}
try { $.connection.hub.logging = true; } catch { }
try { $.connection.ncHub.logging = true; } catch { }
try {
if (PRODUCTION) {
try { $.connection.hub.logging = false; } catch { }
try { $.connection.ncHub.logging = false; } catch { }
}
} catch { }
// Registro le callback;
this._hub.client.alarms = this.manageAlarmsCallbacks;