Preparing for a dynamic todo list
This commit is contained in:
+1
-1
@@ -1929,7 +1929,7 @@ namespace Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to No urgent action items right now..
|
||||
/// Looks up a localized string similar to <strong>All Clear:</strong> There are no urgent action items. Yay!.
|
||||
/// </summary>
|
||||
internal static string Sidebar_Todo_None {
|
||||
get {
|
||||
|
||||
@@ -281,7 +281,7 @@
|
||||
<comment>List of todo items</comment>
|
||||
</data>
|
||||
<data name="Sidebar_Todo_None" xml:space="preserve">
|
||||
<value>No urgent action items right now.</value>
|
||||
<value><strong>All Clear:</strong> There are no urgent action items. Yay!</value>
|
||||
<comment>Indicator that nothing needs immediate attention</comment>
|
||||
</data>
|
||||
<data name="Sidebar_Todo_Placeholder" xml:space="preserve">
|
||||
|
||||
@@ -781,6 +781,7 @@
|
||||
var _errorDisplay_clientSocketLost = SwarmopsJS.unescape('<%=this.Localized_ClientError_SocketFail%>');
|
||||
var _errorDisplay_clientHeartbeatLost = SwarmopsJS.unescape('<%=this.Localized_ClientError_HeartbeatFail%>');
|
||||
var _errorDisplay_allClear = SwarmopsJS.unescape('<%=this.Localized_AllErrorsClear%>');
|
||||
var _todoDisplay_allClear = SwarmopsJS.unescape('<%=this.Localized_AllTodosClear%>');
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
@@ -540,6 +540,11 @@ namespace Swarmops.Frontend
|
||||
get { return CommonV5.JavascriptEscape(ErrorMessages.Localized("AllClear")); }
|
||||
}
|
||||
|
||||
public string Localized_AllTodosClear
|
||||
{
|
||||
get { return CommonV5.JavascriptEscape(Resources.Global.Sidebar_Todo_None); }
|
||||
}
|
||||
|
||||
public string GenerateBitIdToken
|
||||
{
|
||||
get
|
||||
|
||||
@@ -113,8 +113,7 @@ function _masterInitializeSocket(authenticationTicket) {
|
||||
}
|
||||
|
||||
function _master_watchHeartbeat() {
|
||||
console.log("WatchHeartbeat()");
|
||||
|
||||
|
||||
_masterWatchingHeartbeat = true;
|
||||
|
||||
// Check again for a new heartbeat in ten seconds
|
||||
@@ -132,19 +131,14 @@ function _master_watchHeartbeat() {
|
||||
|
||||
// If we got a heartbeat more than fifteen seconds ago, we've lost the heartbeat
|
||||
|
||||
console.log(" - checking timestamps");
|
||||
|
||||
if (_masterSocketLastHeartbeat != -1 && !_masterSocketHeartbeatsLost) { // if we've received any at all
|
||||
var curTime = new Date().getTime();
|
||||
var diff = (curTime - _masterSocketLastHeartbeat) / 1000;
|
||||
console.log(" - last heartbeat was " + diff + " seconds ago");
|
||||
if (diff > 15) {
|
||||
console.log(" - Heartbeats LOST");
|
||||
_masterSocketHeartbeatsLost = true;
|
||||
_master_updateMalfunctions();
|
||||
}
|
||||
} else {
|
||||
console.log(" - no previous heartbeat received");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,8 +155,6 @@ function getMasterSocketAddress() {
|
||||
|
||||
function _master_updateMalfunctions(issueList) {
|
||||
|
||||
console.log("UpdateMalfunctions();");
|
||||
|
||||
if (issueList === undefined) {
|
||||
issueList = JSON.parse(JSON.stringify(_master_LastServerMalfunctionsList)); // deep copy
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user