jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified SignalR disconnected/error dialogs

Browse Source 
Dialogs (with a refresh option) appear whenever the SignalR client
disconnects or encounters an error. Nonsensical error messages replaced.
Page refresh technique changed to allow for urls containing fragment
hashes.
This commit is contained in:
Gary Sharp
2014-09-11 17:21:39 +10:00
parent 4283b62803
commit b1575fa321
20 changed files with 427 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
+27 -7
View File
@@ -38,7 +38,7 @@
<a target="_blank" href="#" data-bind="attr: { href: manuallyAssignUrl }, visible: $parent.sessionEnded">Manually Assign Page</a> <a target="_blank" href="#" data-bind="attr: { href: manuallyAssignUrl }, visible: $parent.sessionEnded">Manually Assign Page</a>
</div> </div>
<div data-bind="visible: detected"> <div data-bind="visible: detected">
Document: <a target="_blank" href="#" data-bind="text: documentTemplate, attr: { href: documentTemplateUrl }"></a> Document: <a target="_blank" href="#" data-bind="text: documentTemplate, attr: { href: documentTemplateUrl }"></a>
<br /> <br />
Target: <a target="_blank" href="#" data-bind="text: assignedData, attr: { href: assignedDataUrl }"></a> Target: <a target="_blank" href="#" data-bind="text: assignedData, attr: { href: assignedDataUrl }"></a>
</div> </div>
@@ -307,15 +307,35 @@
logHub.client.receiveLog = parseLog logHub.client.receiveLog = parseLog
$.connection.hub.qs = { LogModules: '@(Disco.BI.DocumentTemplateBI.DocumentsLog.Current.LiveLogGroupName)' }; $.connection.hub.qs = { LogModules: '@(Disco.BI.DocumentTemplateBI.DocumentsLog.Current.LiveLogGroupName)' };
$.connection.hub.error(function (error) { $.connection.hub.error(onHubFailed);
alert('Live-Log Error: ' + error);
});
$.connection.hub.start() $.connection.hub.start()
.done(function () { isLive = true; }) .done(function () { isLive = true; })
.fail(function (error) { .fail(onHubFailed);
alert('Live-Log Connection Error: ' + error);
}); function onHubFailed(error) {
// Show Dialog Message
if ($('.disconnected-dialog').length == 0) {
$('<div>')
.addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({
resizable: false,
title: 'Disconnected',
width: 400,
modal: true,
buttons: {
'Refresh Now': function () {
$(this).dialog('option', 'buttons', null);
window.location.reload(true);
},
'Close': function () {
$(this).dialog('destroy');
}
}
});
}
}
} }
init(); init();
}); });
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
+21 -16
View File
@@ -157,7 +157,7 @@ WriteLiteral(">\r\n Document: <a");
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
WriteLiteral(" href=\"#\""); WriteLiteral(" href=\"#\"");
WriteLiteral(" data-bind=\"text: documentTemplate, attr: { href: documentTemplateUrl }\""); WriteLiteral(" data-bind=\"text: documentTemplate, attr: { href: documentTemplateUrl }\"");
@@ -471,21 +471,26 @@ WriteLiteral(@"',
#line default #line default
#line hidden #line hidden
WriteLiteral(@"' }; WriteLiteral("\' };\r\n $.connection.hub.error(onHubFailed);\r\n\r\n $.connectio" +
$.connection.hub.error(function (error) { "n.hub.start()\r\n .done(function () { isLive = true; })\r\n " +
alert('Live-Log Error: ' + error); " .fail(onHubFailed);\r\n\r\n function onHubFailed(error) {\r\n " +
}); " // Show Dialog Message\r\n if ($(\'.disconnected-dialog\').le" +
"ngth == 0) {\r\n $(\'<div>\')\r\n .addClass(" +
$.connection.hub.start() "\'dialog disconnected-dialog\')\r\n .html(\'<h3><span class=\"f" +
.done(function () { isLive = true; }) "a-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"fa fa-ban fa-stac" +
.fail(function (error) { "k-2x error\"></i></span>Disconnected from the Disco ICT Server</h3><div>This page" +
alert('Live-Log Connection Error: ' + error); " is not receiving live updates. Please ensure you are connected to the server, t" +
}); "hen refresh this page to enable features.</div>\')\r\n .dial" +
} "og({\r\n resizable: false,\r\n " +
init(); " title: \'Disconnected\',\r\n width: 400,\r\n " +
}); " modal: true,\r\n buttons: {\r\n " +
</script> " \'Refresh Now\': function () {\r\n " +
"); " $(this).dialog(\'option\', \'buttons\', null);\r\n " +
" window.location.reload(true);\r\n },\r\n " +
" \'Close\': function () {\r\n " +
" $(this).dialog(\'destroy\');\r\n }\r\n " +
" }\r\n });\r\n }\r\n }" +
"\r\n }\r\n init();\r\n });\r\n</script>\r\n");
} }
} }
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+1 -1
View File
@@ -286,7 +286,7 @@
dialog.dialog("option", "buttons", null); dialog.dialog("option", "buttons", null);
// Refresh Page // Refresh Page
window.location.href = window.location.href; window.location.reload(true);
} }
function saveChanges() { function saveChanges() {
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+20 -20
View File
@@ -1012,21 +1012,21 @@ WriteLiteral(" <script>\r\n
"el() {\r\n dialog.dialog(\"disable\")" + "el() {\r\n dialog.dialog(\"disable\")" +
";\r\n dialog.dialog(\"option\", \"butt" + ";\r\n dialog.dialog(\"option\", \"butt" +
"ons\", null);\r\n\r\n // Refresh Page\r" + "ons\", null);\r\n\r\n // Refresh Page\r" +
"\n window.location.href = window.l" + "\n window.location.reload(true);\r\n" +
"ocation.href;\r\n }\r\n\r\n " + " }\r\n\r\n " +
" function saveChanges() {\r\n " + " function saveChanges() {\r\n " +
" var form = dialog.find(\'form\');\r\n\r\n " + " var form = dialog.find(\'form\');\r\n\r\n " +
" $(\'input.jobType:unchecked\').each(function () {\r\n " + " $(\'input.jobType:unchecked\').each(function () {\r\n " +
" $(\'#SubTypes_\' + $(this).val()).fi" + " $(\'#SubTypes_\' + $(this).val()).find(\'input\').pro" +
"nd(\'input\').prop(\'checked\', false);\r\n " + "p(\'checked\', false);\r\n });\r\n\r\n " +
" });\r\n\r\n form.submit();\r\n\r\n " + " form.submit();\r\n\r\n " +
" dialog.dialog(\"disable\");\r\n " + " dialog.dialog(\"disable\");\r\n " +
" dialog.dialog(\"option\", \"buttons\", null" + " dialog.dialog(\"option\", \"buttons\", null);\r\n " +
");\r\n }\r\n\r\n " + " }\r\n\r\n " +
" $(function () {\r\n " + " $(function () {\r\n $(\'#Config_Do" +
" $(\'#Config_DocumentTemplates_JobSubTypes_Update\').click(showDialog);\r\n " + "cumentTemplates_JobSubTypes_Update\').click(showDialog);\r\n " +
" });\r\n\r\n " + " });\r\n\r\n })();\r\n " +
" })();\r\n </script>\r\n"); " </script>\r\n");
#line 311 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line 311 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
@@ -1959,16 +1959,16 @@ WriteLiteral(" id=\"dialogBulkGenerate\"");
WriteLiteral(" class=\"hiddenDialog\""); WriteLiteral(" class=\"hiddenDialog\"");
WriteAttribute("title", Tuple.Create(" title=\"", 38168), Tuple.Create("\"", 38219) WriteAttribute("title", Tuple.Create(" title=\"", 38153), Tuple.Create("\"", 38204)
, Tuple.Create(Tuple.Create("", 38176), Tuple.Create("Bulk", 38176), true) , Tuple.Create(Tuple.Create("", 38161), Tuple.Create("Bulk", 38161), true)
, Tuple.Create(Tuple.Create(" ", 38180), Tuple.Create("Generate:", 38181), true) , Tuple.Create(Tuple.Create(" ", 38165), Tuple.Create("Generate:", 38166), true)
#line 683 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line 683 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
, Tuple.Create(Tuple.Create(" ", 38190), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id , Tuple.Create(Tuple.Create(" ", 38175), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
#line default #line default
#line hidden #line hidden
, 38191), false) , 38176), false)
); );
WriteLiteral(">\r\n <div"); WriteLiteral(">\r\n <div");
Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml
+54 -67
View File
@@ -8,101 +8,68 @@
} }
<div id="enrolStatus"> <div id="enrolStatus">
<div id="noSessions" data-bind="visible: noSessions"> <div id="noSessions" data-bind="visible: noSessions">
<h2> <h2>No enrolment sessions today</h2>
No enrolment sessions today</h2>
</div> </div>
<div id="sessions" data-bind="visible: !noSessions(), foreach: {data: sessions, afterRender: sessionRendered, afterAdd: sessionAdded}" <div id="sessions" data-bind="visible: !noSessions(), foreach: { data: sessions, afterRender: sessionRendered, afterAdd: sessionAdded }" style="display: none">
style="display: none"> <div class="session" data-bind="style: { backgroundImage: deviceModelImageUrl }, click: select">
<div class="session" data-bind="style: {backgroundImage: deviceModelImageUrl}, click: select">
<h3> <h3>
<span data-bind="text: title"></span><span class="details" data-bind="text: '(' + deviceModelDescription() + ')'"> <span data-bind="text: title"></span>
</span> <span class="details" data-bind="text: '(' + deviceModelDescription() + ')'"></span>
</h3> </h3>
<p class="sessionStart" data-bind="text: startTime"> <p class="sessionStart" data-bind="text: startTime"></p>
</p> <p class="sessionStatus" data-bind="text: progressStatus"></p>
<p class="sessionStatus" data-bind="text: progressStatus"> <div data-bind="visible: !sessionEnded(), progressValue: progressValue" class="sessionProgress"></div>
</p>
<div data-bind="visible: !sessionEnded(), progressValue: progressValue" class="sessionProgress">
</div>
</div> </div>
</div> </div>
<div id="dialogSession" data-bind="with: currentSession"> <div id="dialogSession" data-bind="with: currentSession">
<div class="sessionHeader clearfix" data-bind="style: {backgroundImage: deviceModelImageUrl}"> <div class="sessionHeader clearfix" data-bind="style: { backgroundImage: deviceModelImageUrl }">
<h2> <h2><a href="" target="_blank" data-bind="text: title, attr: { href: deviceUrl }"></a></h2>
<a href="" target="_blank" data-bind="text: title, attr: {href: deviceUrl}"></a> <h3 data-bind="text: deviceModelDescription"></h3>
</h2>
<h3 data-bind="text: deviceModelDescription">
</h3>
<table data-bind="if: sessionDeviceInfo"> <table data-bind="if: sessionDeviceInfo">
<tr> <tr>
<th style="width: 128px"> <th style="width: 128px">Computer Name:</th>
Computer Name: <td data-bind="text: sessionDeviceInfo().Arguments[3]"></td>
</th>
<td data-bind="text: sessionDeviceInfo().Arguments[3]">
</td>
</tr> </tr>
<tr> <tr>
<th style="width: 128px"> <th style="width: 128px">UUID:</th>
UUID: <td data-bind="text: sessionDeviceInfo().Arguments[2]"></td>
</th>
<td data-bind="text: sessionDeviceInfo().Arguments[2]">
</td>
</tr> </tr>
<tr> <tr>
<th style="width: 128px"> <th style="width: 128px">LAN Mac Address:</th>
LAN Mac Address: <td data-bind="text: sessionDeviceInfo().Arguments[4]"></td>
</th>
<td data-bind="text: sessionDeviceInfo().Arguments[4]">
</td>
</tr> </tr>
<tr> <tr>
<th style="width: 128px"> <th style="width: 128px">WLAN Mac Address:</th>
WLAN Mac Address: <td data-bind="text: sessionDeviceInfo().Arguments[5]"></td>
</th>
<td data-bind="text: sessionDeviceInfo().Arguments[5]">
</td>
</tr> </tr>
<tr> <tr>
<th style="width: 128px"> <th style="width: 128px">Manufacturer/Model:</th>
Manufacturer/Model: <td data-bind="text: sessionDeviceInfo().Arguments[6] + ' ' + sessionDeviceInfo().Arguments[7]"></td>
</th>
<td data-bind="text: sessionDeviceInfo().Arguments[6] + ' ' + sessionDeviceInfo().Arguments[7]">
</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="sessionProgress clearfix"> <div class="sessionProgress clearfix">
<p class="sessionStart" data-bind="text: startTime"> <p class="sessionStart" data-bind="text: startTime"></p>
</p> <p class="sessionStatus" data-bind="text: progressStatus"></p>
<p class="sessionStatus" data-bind="text: progressStatus"> <div data-bind="visible: !sessionEnded(), progressValue: progressValue"></div>
</p>
<div data-bind="visible: !sessionEnded(), progressValue: progressValue">
</div>
</div> </div>
<div class="sessionInfoContainer clearfix"> <div class="sessionInfoContainer clearfix">
<div class="sessionInfoMessages"> <div class="sessionInfoMessages">
<table class="logEventsViewport"> <table class="logEventsViewport">
<thead> <thead>
<tr> <tr>
<th class="icon"> <th class="icon">&nbsp;</th>
&nbsp; <th class="message">Message</th>
</th>
<th class="message">
Message
</th>
</tr> </tr>
</thead> </thead>
</table> </table>
<div class="logEventsViewportContainer"> <div class="logEventsViewportContainer">
<div class="logEventsViewportNoLogs" data-bind="visible: messages().length == 0" <div class="logEventsViewportNoLogs" data-bind="visible: messages().length == 0" style="display: none">No logs</div>
style="display: none">
No logs
</div>
<table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none"> <table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none">
<tbody data-bind="foreach: messages"> <tbody data-bind="foreach: messages">
<tr> <tr>
<td class="icon"><i class="fa" data-bind="css: { 'fa-info-circle': EventTypeSeverity == 0, 'fa-exclamation-triangle': EventTypeSeverity == 1, 'fa-exclamation-circle': EventTypeSeverity == 2 }"></i></td> <td class="icon"><i class="fa" data-bind="css: { 'fa-info-circle': EventTypeSeverity == 0, 'fa-exclamation-triangle': EventTypeSeverity == 1, 'fa-exclamation-circle': EventTypeSeverity == 2 }"></i></td>
<td class="message" data-bind="text: FormattedMessage, attr: {title: EventTypeName}"></td> <td class="message" data-bind="text: FormattedMessage, attr: { title: EventTypeName }"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -360,15 +327,35 @@
logHub.client.receiveLog = parseLog logHub.client.receiveLog = parseLog
$.connection.hub.qs = { LogModules: '@(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName)' }; $.connection.hub.qs = { LogModules: '@(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName)' };
$.connection.hub.error(function (error) { $.connection.hub.error(onHubFailed);
alert('Live-Log Error: ' + error);
});
$.connection.hub.start() $.connection.hub.start()
.done(function () { isLive = true; }) .done(function () { isLive = true; })
.fail(function (error) { .fail(onHubFailed);
alert('Live-Log Connection Error: ' + error);
}); function onHubFailed(error) {
// Show Dialog Message
if ($('.disconnected-dialog').length == 0) {
$('<div>')
.addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({
resizable: false,
title: 'Disconnected',
width: 400,
modal: true,
buttons: {
'Refresh Now': function () {
$(this).dialog('option', 'buttons', null);
window.location.reload(true);
},
'Close': function () {
$(this).dialog('destroy');
}
}
});
}
}
} }
init(); init();
}); });
Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs
+62 -70
View File
@@ -67,51 +67,50 @@ WriteLiteral(" id=\"noSessions\"");
WriteLiteral(" data-bind=\"visible: noSessions\""); WriteLiteral(" data-bind=\"visible: noSessions\"");
WriteLiteral(">\r\n <h2>\r\n No enrolment sessions today</h2>\r\n </div>\r\n <d" + WriteLiteral(">\r\n <h2>No enrolment sessions today</h2>\r\n </div>\r\n <div");
"iv");
WriteLiteral(" id=\"sessions\""); WriteLiteral(" id=\"sessions\"");
WriteLiteral(" data-bind=\"visible: !noSessions(), foreach: {data: sessions, afterRender: sessio" + WriteLiteral(" data-bind=\"visible: !noSessions(), foreach: { data: sessions, afterRender: sessi" +
"nRendered, afterAdd: sessionAdded}\""); "onRendered, afterAdd: sessionAdded }\"");
WriteLiteral("\r\n style=\"display: none\""); WriteLiteral(" style=\"display: none\"");
WriteLiteral(">\r\n <div"); WriteLiteral(">\r\n <div");
WriteLiteral(" class=\"session\""); WriteLiteral(" class=\"session\"");
WriteLiteral(" data-bind=\"style: {backgroundImage: deviceModelImageUrl}, click: select\""); WriteLiteral(" data-bind=\"style: { backgroundImage: deviceModelImageUrl }, click: select\"");
WriteLiteral(">\r\n <h3>\r\n <span"); WriteLiteral(">\r\n <h3>\r\n <span");
WriteLiteral(" data-bind=\"text: title\""); WriteLiteral(" data-bind=\"text: title\"");
WriteLiteral("></span><span"); WriteLiteral("></span>\r\n <span");
WriteLiteral(" class=\"details\""); WriteLiteral(" class=\"details\"");
WriteLiteral(" data-bind=\"text: \'(\' + deviceModelDescription() + \')\'\""); WriteLiteral(" data-bind=\"text: \'(\' + deviceModelDescription() + \')\'\"");
WriteLiteral(">\r\n </span>\r\n </h3>\r\n <p"); WriteLiteral("></span>\r\n </h3>\r\n <p");
WriteLiteral(" class=\"sessionStart\""); WriteLiteral(" class=\"sessionStart\"");
WriteLiteral(" data-bind=\"text: startTime\""); WriteLiteral(" data-bind=\"text: startTime\"");
WriteLiteral(">\r\n </p>\r\n <p"); WriteLiteral("></p>\r\n <p");
WriteLiteral(" class=\"sessionStatus\""); WriteLiteral(" class=\"sessionStatus\"");
WriteLiteral(" data-bind=\"text: progressStatus\""); WriteLiteral(" data-bind=\"text: progressStatus\"");
WriteLiteral(">\r\n </p>\r\n <div"); WriteLiteral("></p>\r\n <div");
WriteLiteral(" data-bind=\"visible: !sessionEnded(), progressValue: progressValue\""); WriteLiteral(" data-bind=\"visible: !sessionEnded(), progressValue: progressValue\"");
WriteLiteral(" class=\"sessionProgress\""); WriteLiteral(" class=\"sessionProgress\"");
WriteLiteral(">\r\n </div>\r\n </div>\r\n </div>\r\n <div"); WriteLiteral("></div>\r\n </div>\r\n </div>\r\n <div");
WriteLiteral(" id=\"dialogSession\""); WriteLiteral(" id=\"dialogSession\"");
@@ -121,21 +120,21 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" class=\"sessionHeader clearfix\""); WriteLiteral(" class=\"sessionHeader clearfix\"");
WriteLiteral(" data-bind=\"style: {backgroundImage: deviceModelImageUrl}\""); WriteLiteral(" data-bind=\"style: { backgroundImage: deviceModelImageUrl }\"");
WriteLiteral(">\r\n <h2>\r\n <a"); WriteLiteral(">\r\n <h2><a");
WriteLiteral(" href=\"\""); WriteLiteral(" href=\"\"");
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
WriteLiteral(" data-bind=\"text: title, attr: {href: deviceUrl}\""); WriteLiteral(" data-bind=\"text: title, attr: { href: deviceUrl }\"");
WriteLiteral("></a>\r\n </h2>\r\n <h3"); WriteLiteral("></a></h2>\r\n <h3");
WriteLiteral(" data-bind=\"text: deviceModelDescription\""); WriteLiteral(" data-bind=\"text: deviceModelDescription\"");
WriteLiteral(">\r\n </h3>\r\n <table"); WriteLiteral("></h3>\r\n <table");
WriteLiteral(" data-bind=\"if: sessionDeviceInfo\""); WriteLiteral(" data-bind=\"if: sessionDeviceInfo\"");
@@ -143,54 +142,45 @@ WriteLiteral(">\r\n <tr>\r\n <th");
WriteLiteral(" style=\"width: 128px\""); WriteLiteral(" style=\"width: 128px\"");
WriteLiteral(">\r\n Computer Name:\r\n </th>\r\n " + WriteLiteral(">Computer Name:</th>\r\n <td");
" <td");
WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[3]\""); WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[3]\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n <tr>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n <tr>\r\n <th");
" <th");
WriteLiteral(" style=\"width: 128px\""); WriteLiteral(" style=\"width: 128px\"");
WriteLiteral(">\r\n UUID:\r\n </th>\r\n " + WriteLiteral(">UUID:</th>\r\n <td");
"<td");
WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[2]\""); WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[2]\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n <tr>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n <tr>\r\n <th");
" <th");
WriteLiteral(" style=\"width: 128px\""); WriteLiteral(" style=\"width: 128px\"");
WriteLiteral(">\r\n LAN Mac Address:\r\n </th>\r\n " + WriteLiteral(">LAN Mac Address:</th>\r\n <td");
" <td");
WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[4]\""); WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[4]\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n <tr>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n <tr>\r\n <th");
" <th");
WriteLiteral(" style=\"width: 128px\""); WriteLiteral(" style=\"width: 128px\"");
WriteLiteral(">\r\n WLAN Mac Address:\r\n </th>\r\n " + WriteLiteral(">WLAN Mac Address:</th>\r\n <td");
" <td");
WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[5]\""); WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[5]\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n <tr>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n <tr>\r\n <th");
" <th");
WriteLiteral(" style=\"width: 128px\""); WriteLiteral(" style=\"width: 128px\"");
WriteLiteral(">\r\n Manufacturer/Model:\r\n </th>\r\n " + WriteLiteral(">Manufacturer/Model:</th>\r\n <td");
" <td");
WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[6] + \' \' + sessionDeviceInfo().Ar" + WriteLiteral(" data-bind=\"text: sessionDeviceInfo().Arguments[6] + \' \' + sessionDeviceInfo().Ar" +
"guments[7]\""); "guments[7]\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n </table>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n </table>\r\n </div>\r\n <div" +
" </div>\r\n <div"); "");
WriteLiteral(" class=\"sessionProgress clearfix\""); WriteLiteral(" class=\"sessionProgress clearfix\"");
@@ -200,17 +190,17 @@ WriteLiteral(" class=\"sessionStart\"");
WriteLiteral(" data-bind=\"text: startTime\""); WriteLiteral(" data-bind=\"text: startTime\"");
WriteLiteral(">\r\n </p>\r\n <p"); WriteLiteral("></p>\r\n <p");
WriteLiteral(" class=\"sessionStatus\""); WriteLiteral(" class=\"sessionStatus\"");
WriteLiteral(" data-bind=\"text: progressStatus\""); WriteLiteral(" data-bind=\"text: progressStatus\"");
WriteLiteral(">\r\n </p>\r\n <div"); WriteLiteral("></p>\r\n <div");
WriteLiteral(" data-bind=\"visible: !sessionEnded(), progressValue: progressValue\""); WriteLiteral(" data-bind=\"visible: !sessionEnded(), progressValue: progressValue\"");
WriteLiteral(">\r\n </div>\r\n </div>\r\n <div"); WriteLiteral("></div>\r\n </div>\r\n <div");
WriteLiteral(" class=\"sessionInfoContainer clearfix\""); WriteLiteral(" class=\"sessionInfoContainer clearfix\"");
@@ -227,14 +217,12 @@ WriteLiteral(">\r\n <thead>\r\n <tr>\r
WriteLiteral(" class=\"icon\""); WriteLiteral(" class=\"icon\"");
WriteLiteral(">\r\n &nbsp;\r\n </th>\r\n " + WriteLiteral(">&nbsp;</th>\r\n <th");
" <th");
WriteLiteral(" class=\"message\""); WriteLiteral(" class=\"message\"");
WriteLiteral(">\r\n Message\r\n </th>\r\n " + WriteLiteral(">Message</th>\r\n </tr>\r\n </thead>\r\n " +
" </tr>\r\n </thead>\r\n </tab" + " </table>\r\n <div");
"le>\r\n <div");
WriteLiteral(" class=\"logEventsViewportContainer\""); WriteLiteral(" class=\"logEventsViewportContainer\"");
@@ -244,10 +232,9 @@ WriteLiteral(" class=\"logEventsViewportNoLogs\"");
WriteLiteral(" data-bind=\"visible: messages().length == 0\""); WriteLiteral(" data-bind=\"visible: messages().length == 0\"");
WriteLiteral("\r\n style=\"display: none\""); WriteLiteral(" style=\"display: none\"");
WriteLiteral(">\r\n No logs\r\n </div>\r\n " + WriteLiteral(">No logs</div>\r\n <table");
" <table");
WriteLiteral(" class=\"logEventsViewport\""); WriteLiteral(" class=\"logEventsViewport\"");
@@ -275,7 +262,7 @@ WriteLiteral("></i></td>\r\n <td");
WriteLiteral(" class=\"message\""); WriteLiteral(" class=\"message\"");
WriteLiteral(" data-bind=\"text: FormattedMessage, attr: {title: EventTypeName}\""); WriteLiteral(" data-bind=\"text: FormattedMessage, attr: { title: EventTypeName }\"");
WriteLiteral("></td>\r\n </tr>\r\n </tbody>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n </tbody>\r\n " +
" </table>\r\n </div>\r\n </div>\r\n " + " </table>\r\n </div>\r\n </div>\r\n " +
@@ -323,7 +310,7 @@ WriteLiteral(@">
var deviceBaseUrl = '"); var deviceBaseUrl = '");
#line 140 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 107 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.Device.Show())); Write(Url.Action(MVC.Device.Show()));
@@ -332,7 +319,7 @@ WriteLiteral(@">
WriteLiteral("/\'\r\n var deviceModelImageUrl = \'"); WriteLiteral("/\'\r\n var deviceModelImageUrl = \'");
#line 141 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 108 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.DeviceModel.Image())); Write(Url.Action(MVC.API.DeviceModel.Image()));
@@ -341,7 +328,7 @@ WriteLiteral("/\'\r\n var deviceModelImageUrl = \'");
WriteLiteral("/\'\r\n var iconWarningUrl = \'url("); WriteLiteral("/\'\r\n var iconWarningUrl = \'url(");
#line 142 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 109 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Links.ClientSource.Style.Images.Status.warning32_png); Write(Links.ClientSource.Style.Images.Status.warning32_png);
@@ -350,7 +337,7 @@ WriteLiteral("/\'\r\n var iconWarningUrl = \'url(");
WriteLiteral(")\';\r\n var iconErrorUrl = \'url("); WriteLiteral(")\';\r\n var iconErrorUrl = \'url(");
#line 143 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 110 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Links.ClientSource.Style.Images.Status.fail32_png); Write(Links.ClientSource.Style.Images.Status.fail32_png);
@@ -453,7 +440,7 @@ WriteLiteral(")\';\r\n\r\n function pageViewModel() {\r\n var
" vm = new pageViewModel();\r\n $.ajax({\r\n url: \'"); " vm = new pageViewModel();\r\n $.ajax({\r\n url: \'");
#line 307 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 274 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.DeviceModel.Index())); Write(Url.Action(MVC.API.DeviceModel.Index()));
@@ -487,7 +474,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 332 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 299 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.Logging.RetrieveEvents())); Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
@@ -526,27 +513,32 @@ WriteLiteral(@"',
$.connection.hub.qs = { LogModules: '"); $.connection.hub.qs = { LogModules: '");
#line 362 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 329 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName); Write(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName);
#line default #line default
#line hidden #line hidden
WriteLiteral(@"' }; WriteLiteral("\' };\r\n $.connection.hub.error(onHubFailed);\r\n\r\n $.connectio" +
$.connection.hub.error(function (error) { "n.hub.start()\r\n .done(function () { isLive = true; })\r\n " +
alert('Live-Log Error: ' + error); " .fail(onHubFailed);\r\n\r\n function onHubFailed(error) {\r\n " +
}); " // Show Dialog Message\r\n if ($(\'.disconnected-dialog\').le" +
"ngth == 0) {\r\n $(\'<div>\')\r\n .addClass(" +
$.connection.hub.start() "\'dialog disconnected-dialog\')\r\n .html(\'<h3><span class=\"f" +
.done(function () { isLive = true; }) "a-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"fa fa-ban fa-stac" +
.fail(function (error) { "k-2x error\"></i></span>Disconnected from the Disco ICT Server</h3><div>This page" +
alert('Live-Log Connection Error: ' + error); " is not receiving live updates. Please ensure you are connected to the server, t" +
}); "hen refresh this page to enable features.</div>\')\r\n .dial" +
} "og({\r\n resizable: false,\r\n " +
init(); " title: \'Disconnected\',\r\n width: 400,\r\n " +
}); " modal: true,\r\n buttons: {\r\n " +
</script> " \'Refresh Now\': function () {\r\n " +
"); " $(this).dialog(\'option\', \'buttons\', null);\r\n " +
" window.location.reload(true);\r\n },\r\n " +
" \'Close\': function () {\r\n " +
" $(this).dialog(\'destroy\');\r\n }\r\n " +
" }\r\n });\r\n }\r\n }" +
"\r\n }\r\n init();\r\n });\r\n</script>\r\n");
} }
} }
Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
+26 -6
View File
@@ -120,13 +120,33 @@
}; };
$.connection.hub.qs = {LogModules: logModuleLiveGroupName}; $.connection.hub.qs = {LogModules: logModuleLiveGroupName};
$.connection.hub.error(function(error){ $.connection.hub.error(onHubFailed);
alert('Live-Log Error: '+error);
});
$.connection.hub.start().fail(function(error){ $.connection.hub.start().fail(onHubFailed);
alert('Live-Log Connection Error: '+error);
}); function onHubFailed(error) {
// Show Dialog Message
if ($('.disconnected-dialog').length == 0) {
$('<div>')
.addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({
resizable: false,
title: 'Disconnected',
width: 400,
modal: true,
buttons: {
'Refresh Now': function () {
$(this).dialog('option', 'buttons', null);
window.location.reload(true);
},
'Close': function () {
$(this).dialog('destroy');
}
}
});
}
}
} }
} }
Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
+23 -6
View File
@@ -329,12 +329,29 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
"ge.UseDisplay) logsViewModel.EventLogs.unshift(message);\r\n " + "ge.UseDisplay) logsViewModel.EventLogs.unshift(message);\r\n " +
" if (liveEventReceivedFunction) liveEventReceivedFunction(message);\r\n " + " if (liveEventReceivedFunction) liveEventReceivedFunction(message);\r\n " +
" };\r\n\r\n $.connection.hub.qs = {LogModules: logModule" + " };\r\n\r\n $.connection.hub.qs = {LogModules: logModule" +
"LiveGroupName};\r\n $.connection.hub.error(function(error){\r\n " + "LiveGroupName};\r\n $.connection.hub.error(onHubFailed);\r\n\r\n " +
" alert(\'Live-Log Error: \'+error);\r\n });\r" + " $.connection.hub.start().fail(onHubFailed);\r\n\r\n " +
"\n\r\n $.connection.hub.start().fail(function(error){\r\n " + " function onHubFailed(error) {\r\n // Show Dialog Messag" +
" alert(\'Live-Log Connection Error: \'+error);\r\n " + "e\r\n if ($(\'.disconnected-dialog\').length == 0) {\r\n " +
"});\r\n }\r\n }\r\n\r\n loadInitialData();\r\n " + " $(\'<div>\')\r\n .addClass(\'dial" +
" });\r\n </script>\r\n</div>\r\n"); "og disconnected-dialog\')\r\n .html(\'<h3><span class" +
"=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"fa fa-ban fa-s" +
"tack-2x error\"></i></span>Disconnected from the Disco ICT Server</h3><div>This p" +
"age is not receiving live updates. Please ensure you are connected to the server" +
", then refresh this page to enable features.</div>\')\r\n " +
" .dialog({\r\n resizable: false,\r\n " +
" title: \'Disconnected\',\r\n " +
" width: 400,\r\n modal: true,\r\n " +
" buttons: {\r\n \'" +
"Refresh Now\': function () {\r\n $(this)" +
".dialog(\'option\', \'buttons\', null);\r\n " +
" window.location.reload(true);\r\n },\r\n " +
" \'Close\': function () {\r\n " +
" $(this).dialog(\'destroy\');\r\n " +
" }\r\n }\r\n " +
" });\r\n }\r\n }\r\n }\r\n" +
" }\r\n\r\n loadInitialData();\r\n });\r\n </script>\r\n</d" +
"iv>\r\n");
} }
} }
Disco.Web/Areas/Config/Views/Shared/TaskStatus.cshtml
+26 -6
View File
@@ -247,14 +247,34 @@
notificationsHub.client.updateTaskStatus = vm.Update; notificationsHub.client.updateTaskStatus = vm.Update;
$.connection.hub.qs = { TaskSessionId: sessionId }; $.connection.hub.qs = { TaskSessionId: sessionId };
$.connection.hub.error(function (error) { $.connection.hub.error(onHubFailed);
alert('Live-Status Error: ' + error);
});
$.connection.hub.start() $.connection.hub.start()
.fail(function (error) { .fail(onHubFailed);
alert('Live-Status Connection Error: ' + error); }
});
function onHubFailed(error) {
// Show Dialog Message
if ($('.disconnected-dialog').length == 0) {
$('<div>')
.addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({
resizable: false,
title: 'Disconnected',
width: 400,
modal: true,
buttons: {
'Refresh Now': function () {
$(this).dialog('option', 'buttons', null);
window.location.reload(true);
},
'Close': function () {
$(this).dialog('destroy');
}
}
});
}
} }
}); });
Disco.Web/Areas/Config/Views/Shared/TaskStatus.generated.cs
+18 -5
View File
@@ -281,11 +281,24 @@ WriteLiteral("\';\r\n\r\n var view = $(\'#Logging_Task_Status\');\r\n
"n.scheduledTaskNotifications;\r\n notificationsHub.client.initializeTas" + "n.scheduledTaskNotifications;\r\n notificationsHub.client.initializeTas" +
"kStatus = vm.Initialize;\r\n notificationsHub.client.updateTaskStatus =" + "kStatus = vm.Initialize;\r\n notificationsHub.client.updateTaskStatus =" +
" vm.Update;\r\n\r\n $.connection.hub.qs = { TaskSessionId: sessionId };\r\n" + " vm.Update;\r\n\r\n $.connection.hub.qs = { TaskSessionId: sessionId };\r\n" +
" $.connection.hub.error(function (error) {\r\n alert(\'Li" + " $.connection.hub.error(onHubFailed);\r\n\r\n $.connection.hub" +
"ve-Status Error: \' + error);\r\n });\r\n\r\n $.connection.hub.st" + ".start()\r\n .fail(onHubFailed);\r\n }\r\n\r\n function onH" +
"art()\r\n .fail(function (error) {\r\n alert(\'Live" + "ubFailed(error) {\r\n // Show Dialog Message\r\n if ($(\'.disco" +
"-Status Connection Error: \' + error);\r\n });\r\n }\r\n\r\n });" + "nnected-dialog\').length == 0) {\r\n $(\'<div>\')\r\n " +
"\r\n</script>\r\n"); " .addClass(\'dialog disconnected-dialog\')\r\n .html(\'<h3><span c" +
"lass=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"fa fa-ban " +
"fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</h3><div>Th" +
"is page is not receiving live updates. Please ensure you are connected to the se" +
"rver, then refresh this page to enable features.</div>\')\r\n .d" +
"ialog({\r\n resizable: false,\r\n titl" +
"e: \'Disconnected\',\r\n width: 400,\r\n " +
" modal: true,\r\n buttons: {\r\n \'" +
"Refresh Now\': function () {\r\n $(this).dialog(\'opt" +
"ion\', \'buttons\', null);\r\n window.location.reload(" +
"true);\r\n },\r\n \'Close\': fun" +
"ction () {\r\n $(this).dialog(\'destroy\');\r\n " +
" }\r\n }\r\n });\r\n " +
" }\r\n }\r\n\r\n });\r\n</script>\r\n");
} }
} }
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml
+1 -1
View File
@@ -351,7 +351,7 @@
} }
window.setTimeout(function () { window.setTimeout(function () {
window.location.href = window.location.href; window.location.reload(true);
}, 10000); }, 10000);
} }
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
+45 -46
View File
@@ -394,52 +394,51 @@ WriteLiteral("\', null, function (data) {\r\n\r\n var inProce
"\r\n $(\'body\').addClass(\'status-error\');\r\n $" + "\r\n $(\'body\').addClass(\'status-error\');\r\n $" +
".connection.hub.stop();\r\n } catch (e) {\r\n // I" + ".connection.hub.stop();\r\n } catch (e) {\r\n // I" +
"gnore\r\n }\r\n\r\n window.setTimeout(function () {\r\n " + "gnore\r\n }\r\n\r\n window.setTimeout(function () {\r\n " +
" window.location.href = window.location.href;\r\n }" + " window.location.reload(true);\r\n }, 10000);\r\n " +
", 10000);\r\n }\r\n\r\n // Helpers\r\n function rotateA" + " }\r\n\r\n // Helpers\r\n function rotateArray(koArray, e" +
"rray(koArray, element) {\r\n var items = koArray();\r\n\r\n " + "lement) {\r\n var items = koArray();\r\n\r\n if (items.l" +
" if (items.length <= 1)\r\n return 0;\r\n\r\n if " + "ength <= 1)\r\n return 0;\r\n\r\n if (element.height" +
"(element.height() < (element.parent().height() - 30)) {\r\n\r\n i" + "() < (element.parent().height() - 30)) {\r\n\r\n if (findUnsorted" +
"f (findUnsortedArrayTopIndex(items) !== 0)\r\n koArray.sort" + "ArrayTopIndex(items) !== 0)\r\n koArray.sort(sortFunction);" +
"(sortFunction);\r\n\r\n // Don\'t rotate if small & sorted correct" + "\r\n\r\n // Don\'t rotate if small & sorted correctly\r\n " +
"ly\r\n return;\r\n }\r\n\r\n // Move La" + " return;\r\n }\r\n\r\n // Move Last Item to Top\r" +
"st Item to Top\r\n var item = koArray.pop();\r\n koArr" + "\n var item = koArray.pop();\r\n koArray.unshift(item" +
"ay.unshift(item);\r\n }\r\n function removeItemFromArray(koArr" + ");\r\n }\r\n function removeItemFromArray(koArray, deviceSeria" +
"ay, deviceSerialNumber) {\r\n var items = koArray();\r\n " + "lNumber) {\r\n var items = koArray();\r\n for (var i =" +
" for (var i = 0; i < items.length; i++) {\r\n if (items[i].De" + " 0; i < items.length; i++) {\r\n if (items[i].DeviceSerialNumbe" +
"viceSerialNumber == deviceSerialNumber) {\r\n koArray.splic" + "r == deviceSerialNumber) {\r\n koArray.splice(i, 1);\r\n " +
"e(i, 1);\r\n items = koArray();\r\n i-" + " items = koArray();\r\n i--;\r\n " +
"-;\r\n }\r\n }\r\n }\r\n functio" + " }\r\n }\r\n }\r\n function findUnsortedA" +
"n findUnsortedArrayTopIndex(items) {\r\n // Only one Item\r\n " + "rrayTopIndex(items) {\r\n // Only one Item\r\n if (ite" +
" if (items.length <= 1)\r\n return 0;\r\n\r\n " + "ms.length <= 1)\r\n return 0;\r\n\r\n for (var i = 1" +
" for (var i = 1; i < items.length; i++) {\r\n var s = sortFunct" + "; i < items.length; i++) {\r\n var s = sortFunction(items[i - 1" +
"ion(items[i - 1], items[i]);\r\n if (s > 0)\r\n " + "], items[i]);\r\n if (s > 0)\r\n return i;" +
" return i;\r\n }\r\n\r\n return 0;\r\n }\r\n" + "\r\n }\r\n\r\n return 0;\r\n }\r\n fun" +
" function findSortedInsertIndex(koArray, heldDeviceItem) {\r\n " + "ction findSortedInsertIndex(koArray, heldDeviceItem) {\r\n var item" +
" var items = koArray();\r\n var startIndex = findUnsortedArra" + "s = koArray();\r\n var startIndex = findUnsortedArrayTopIndex(items" +
"yTopIndex(items);\r\n for (var i = startIndex; i < items.length; i+" + ");\r\n for (var i = startIndex; i < items.length; i++) {\r\n " +
"+) {\r\n var s = sortFunction(heldDeviceItem, items[i]);\r\n " + " var s = sortFunction(heldDeviceItem, items[i]);\r\n " +
" if (s <= 0)\r\n return i;\r\n }" + "if (s <= 0)\r\n return i;\r\n }\r\n " +
"\r\n if (startIndex !== 0) {\r\n for (var i = 0; i" + " if (startIndex !== 0) {\r\n for (var i = 0; i < startIndex; " +
" < startIndex; i++) {\r\n var s = sortFunction(heldDeviceIt" + "i++) {\r\n var s = sortFunction(heldDeviceItem, items[i]);\r" +
"em, items[i]);\r\n if (s <= 0)\r\n " + "\n if (s <= 0)\r\n return i;\r\n " +
" return i;\r\n }\r\n return startIndex;\r\n " + " }\r\n return startIndex;\r\n } el" +
" } else {\r\n return -1;\r\n }\r\n " + "se {\r\n return -1;\r\n }\r\n }\r\n " +
" }\r\n function sortFunction(l, r) {\r\n return l.Devic" + " function sortFunction(l, r) {\r\n return l.DeviceDescription.to" +
"eDescription.toLowerCase() == r.DeviceDescription.toLowerCase() ? 0 : (l.DeviceD" + "LowerCase() == r.DeviceDescription.toLowerCase() ? 0 : (l.DeviceDescription.toLo" +
"escription.toLowerCase() < r.DeviceDescription.toLowerCase() ? -1 : 1)\r\n " + "werCase() < r.DeviceDescription.toLowerCase() ? -1 : 1)\r\n }\r\n " +
" }\r\n function isInProcess(i) {\r\n return !i.ReadyFor" + " function isInProcess(i) {\r\n return !i.ReadyForReturn && !i.Wa" +
"Return && !i.WaitingForUserAction;\r\n }\r\n function isReadyF" + "itingForUserAction;\r\n }\r\n function isReadyForReturn(i) {\r\n" +
"orReturn(i) {\r\n return i.ReadyForReturn && !i.WaitingForUserActio" + " return i.ReadyForReturn && !i.WaitingForUserAction;\r\n " +
"n;\r\n }\r\n function isWaitingForUserAction(i) {\r\n " + " }\r\n function isWaitingForUserAction(i) {\r\n return i.W" +
" return i.WaitingForUserAction;\r\n }\r\n function getQuer" + "aitingForUserAction;\r\n }\r\n function getQueryStringParamete" +
"yStringParameters() {\r\n\r\n if (window.location.search.length === 0" + "rs() {\r\n\r\n if (window.location.search.length === 0)\r\n " +
")\r\n return null;\r\n\r\n var params = {};\r\n " + " return null;\r\n\r\n var params = {};\r\n window" +
" window.location.search.substr(1).split(\"&\").forEach(function (pair) {\r\n" + ".location.search.substr(1).split(\"&\").forEach(function (pair) {\r\n " +
" if (pair === \"\") return;\r\n var parts = pa" + " if (pair === \"\") return;\r\n var parts = pair.split(\"=\");\r" +
"ir.split(\"=\");\r\n params[parts[0]] = parts[1] && decodeURIComp" + "\n params[parts[0]] = parts[1] && decodeURIComponent(parts[1]." +
"onent(parts[1].replace(/\\+/g, \" \"));\r\n });\r\n retur" + "replace(/\\+/g, \" \"));\r\n });\r\n return params;\r\n " +
"n params;\r\n }\r\n\r\n init();\r\n });\r\n </script>\r\n</b" + " }\r\n\r\n init();\r\n });\r\n </script>\r\n</body>\r\n</html>");
"ody>\r\n</html>");
} }
} }
Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml
+1 -1
View File
@@ -351,7 +351,7 @@
} }
window.setTimeout(function () { window.setTimeout(function () {
window.location.href = window.location.href; window.location.reload(true);
}, 10000); }, 10000);
} }
Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs
+45 -45
View File
@@ -394,51 +394,51 @@ WriteLiteral("\', null, function (data) {\r\n\r\n var inProce
" try {\r\n $(\'body\').addClass(\'status-error\');\r\n " + " try {\r\n $(\'body\').addClass(\'status-error\');\r\n " +
" $.connection.hub.stop();\r\n } catch (e) {\r\n " + " $.connection.hub.stop();\r\n } catch (e) {\r\n " +
" // Ignore\r\n }\r\n\r\n window.setTimeout(function (" + " // Ignore\r\n }\r\n\r\n window.setTimeout(function (" +
") {\r\n window.location.href = window.location.href;\r\n " + ") {\r\n window.location.reload(true);\r\n }, 10000" +
" }, 10000);\r\n }\r\n\r\n // Helpers\r\n function" + ");\r\n }\r\n\r\n // Helpers\r\n function rotateArray(ko" +
" rotateArray(koArray, element) {\r\n var items = koArray();\r\n\r\n " + "Array, element) {\r\n var items = koArray();\r\n\r\n if " +
" if (items.length <= 1)\r\n return 0;\r\n\r\n " + "(items.length <= 1)\r\n return 0;\r\n\r\n if (elemen" +
" if (element.height() < (element.parent().height() - 30)) {\r\n\r\n " + "t.height() < (element.parent().height() - 30)) {\r\n\r\n if (find" +
" if (findUnsortedArrayTopIndex(items) !== 0)\r\n koAr" + "UnsortedArrayTopIndex(items) !== 0)\r\n koArray.sort(sortFu" +
"ray.sort(sortFunction);\r\n\r\n // Don\'t rotate if small & sorted" + "nction);\r\n\r\n // Don\'t rotate if small & sorted correctly\r\n " +
" correctly\r\n return;\r\n }\r\n\r\n //" + " return;\r\n }\r\n\r\n // Move Last Item" +
" Move Last Item to Top\r\n var item = koArray.pop();\r\n " + " to Top\r\n var item = koArray.pop();\r\n koArray.unsh" +
" koArray.unshift(item);\r\n }\r\n function removeItemFromArr" + "ift(item);\r\n }\r\n function removeItemFromArray(koArray, Use" +
"ay(koArray, UserId) {\r\n var items = koArray();\r\n f" + "rId) {\r\n var items = koArray();\r\n for (var i = 0; " +
"or (var i = 0; i < items.length; i++) {\r\n if (items[i].UserId" + "i < items.length; i++) {\r\n if (items[i].UserId == UserId) {\r\n" +
" == UserId) {\r\n koArray.splice(i, 1);\r\n " + " koArray.splice(i, 1);\r\n items = k" +
" items = koArray();\r\n i--;\r\n }\r\n " + "oArray();\r\n i--;\r\n }\r\n " +
" }\r\n }\r\n function findUnsortedArrayTopIndex(" + "}\r\n }\r\n function findUnsortedArrayTopIndex(items) {\r\n " +
"items) {\r\n // Only one Item\r\n if (items.length <= " + " // Only one Item\r\n if (items.length <= 1)\r\n " +
"1)\r\n return 0;\r\n\r\n for (var i = 1; i < items.l" + " return 0;\r\n\r\n for (var i = 1; i < items.length; i++) {\r\n" +
"ength; i++) {\r\n var s = sortFunction(items[i - 1], items[i]);" + " var s = sortFunction(items[i - 1], items[i]);\r\n " +
"\r\n if (s > 0)\r\n return i;\r\n " + " if (s > 0)\r\n return i;\r\n }\r\n\r\n " +
" }\r\n\r\n return 0;\r\n }\r\n function findSor" + " return 0;\r\n }\r\n function findSortedInsertIndex(" +
"tedInsertIndex(koArray, heldDeviceItem) {\r\n var items = koArray()" + "koArray, heldDeviceItem) {\r\n var items = koArray();\r\n " +
";\r\n var startIndex = findUnsortedArrayTopIndex(items);\r\n " + " var startIndex = findUnsortedArrayTopIndex(items);\r\n for (var" +
" for (var i = startIndex; i < items.length; i++) {\r\n va" + " i = startIndex; i < items.length; i++) {\r\n var s = sortFunct" +
"r s = sortFunction(heldDeviceItem, items[i]);\r\n if (s <= 0)\r\n" + "ion(heldDeviceItem, items[i]);\r\n if (s <= 0)\r\n " +
" return i;\r\n }\r\n if (startI" + " return i;\r\n }\r\n if (startIndex !== 0) {\r\n" +
"ndex !== 0) {\r\n for (var i = 0; i < startIndex; i++) {\r\n " + " for (var i = 0; i < startIndex; i++) {\r\n " +
" var s = sortFunction(heldDeviceItem, items[i]);\r\n " + " var s = sortFunction(heldDeviceItem, items[i]);\r\n if " +
" if (s <= 0)\r\n return i;\r\n " + "(s <= 0)\r\n return i;\r\n }\r\n " +
" }\r\n return startIndex;\r\n } else {\r\n " + " return startIndex;\r\n } else {\r\n re" +
" return -1;\r\n }\r\n }\r\n function " + "turn -1;\r\n }\r\n }\r\n function sortFunction(l," +
"sortFunction(l, r) {\r\n return l.UserIdFriendly.toLowerCase() == r" + " r) {\r\n return l.UserIdFriendly.toLowerCase() == r.UserIdFriendly" +
".UserIdFriendly.toLowerCase() ? 0 : (l.UserIdFriendly.toLowerCase() < r.UserIdFr" + ".toLowerCase() ? 0 : (l.UserIdFriendly.toLowerCase() < r.UserIdFriendly.toLowerC" +
"iendly.toLowerCase() ? -1 : 1)\r\n }\r\n function isInProcess(" + "ase() ? -1 : 1)\r\n }\r\n function isInProcess(i) {\r\n " +
"i) {\r\n return !i.ReadyForReturn && !i.WaitingForUserAction;\r\n " + " return !i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n " +
" }\r\n function isReadyForReturn(i) {\r\n return i." + " function isReadyForReturn(i) {\r\n return i.ReadyForReturn " +
"ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n function " + "&& !i.WaitingForUserAction;\r\n }\r\n function isWaitingForUse" +
"isWaitingForUserAction(i) {\r\n return i.WaitingForUserAction;\r\n " + "rAction(i) {\r\n return i.WaitingForUserAction;\r\n }\r\n " +
" }\r\n function getQueryStringParameters() {\r\n\r\n " + " function getQueryStringParameters() {\r\n\r\n if (window.loc" +
" if (window.location.search.length === 0)\r\n return null;\r\n\r\n " + "ation.search.length === 0)\r\n return null;\r\n\r\n " +
" var params = {};\r\n window.location.search.substr(1" + "var params = {};\r\n window.location.search.substr(1).split(\"&\").fo" +
").split(\"&\").forEach(function (pair) {\r\n if (pair === \"\") ret" + "rEach(function (pair) {\r\n if (pair === \"\") return;\r\n " +
"urn;\r\n var parts = pair.split(\"=\");\r\n para" + " var parts = pair.split(\"=\");\r\n params[parts[0]] = " +
"ms[parts[0]] = parts[1] && decodeURIComponent(parts[1].replace(/\\+/g, \" \"));\r\n " + "parts[1] && decodeURIComponent(parts[1].replace(/\\+/g, \" \"));\r\n }" +
" });\r\n return params;\r\n }\r\n\r\n " + ");\r\n return params;\r\n }\r\n\r\n init();\r\n " +
"init();\r\n });\r\n </script>\r\n</body>\r\n</html>\r\n"); " });\r\n </script>\r\n</body>\r\n</html>\r\n");
} }
} }
Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+2 -2
View File
@@ -92,7 +92,7 @@
if ($('.disconnected-dialog').length == 0) { if ($('.disconnected-dialog').length == 0) {
$('<div>') $('<div>')
.addClass('dialog disconnected-dialog') .addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>Please ensure you are connected to the server, then refresh this page to enable features.</div>') .html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({ .dialog({
resizable: false, resizable: false,
title: 'Disconnected', title: 'Disconnected',
@@ -101,7 +101,7 @@
buttons: { buttons: {
'Refresh Now': function () { 'Refresh Now': function () {
$(this).dialog('option', 'buttons', null); $(this).dialog('option', 'buttons', null);
window.location.href = window.location.href; window.location.reload(true);
}, },
'Close': function () { 'Close': function () {
$(this).dialog('destroy'); $(this).dialog('destroy');
Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+18 -17
View File
@@ -415,23 +415,24 @@ WriteLiteral("\' };\r\n $.connection.hub.error(onHubF
"(\'dialog disconnected-dialog\')\r\n .html(\'<" + "(\'dialog disconnected-dialog\')\r\n .html(\'<" +
"h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"" + "h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"" +
"fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</" + "fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</" +
"h3><div>Please ensure you are connected to the server, then refresh this page to" + "h3><div>This page is not receiving live updates. Please ensure you are connected" +
" enable features.</div>\')\r\n .dialog({\r\n " + " to the server, then refresh this page to enable features.</div>\')\r\n " +
" resizable: false,\r\n " + " .dialog({\r\n " +
" title: \'Disconnected\',\r\n " + " resizable: false,\r\n title: \'Discon" +
" width: 400,\r\n modal: tru" + "nected\',\r\n width: 400,\r\n " +
"e,\r\n buttons: {\r\n " + " modal: true,\r\n " +
" \'Refresh Now\': function () {\r\n " + " buttons: {\r\n \'Refresh No" +
" $(this).dialog(\'option\', \'buttons\', null);\r\n " + "w\': function () {\r\n $(this).d" +
" window.location.href = window.loca" + "ialog(\'option\', \'buttons\', null);\r\n " +
"tion.href;\r\n },\r\n " + " window.location.reload(true);\r\n " +
" \'Close\': function () {\r\n " + " },\r\n \'Close\': function () {" +
" $(this).dialog(\'destroy\');\r\n " + "\r\n $(this).dialog(\'destroy\');" +
" }\r\n }\r\n " + "\r\n }\r\n " +
" });\r\n }\r\n " + " }\r\n });\r\n " +
" }\r\n\r\n function onAddAttachment(" + " }\r\n }\r\n\r\n " +
"id, quick) {\r\n var data = { id: id };\r\n " + " function onAddAttachment(id, quick) {\r\n var data" +
" $.ajax({\r\n url: \'"); " = { id: id };\r\n $.ajax({\r\n " +
" url: \'");
#line 117 "..\..\Views\Device\DeviceParts\_Resources.cshtml" #line 117 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
Disco.Web/Views/Job/JobParts/Resources.cshtml
+2 -2
View File
@@ -600,7 +600,7 @@
if ($('.disconnected-dialog').length == 0) { if ($('.disconnected-dialog').length == 0) {
$('<div>') $('<div>')
.addClass('dialog disconnected-dialog') .addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>Please ensure you are connected to the server, then refresh this page to enable features.</div>') .html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({ .dialog({
resizable: false, resizable: false,
title: 'Disconnected', title: 'Disconnected',
@@ -609,7 +609,7 @@
buttons: { buttons: {
'Refresh Now': function () { 'Refresh Now': function () {
$(this).dialog('option', 'buttons', null); $(this).dialog('option', 'buttons', null);
window.location.href = window.location.href; window.location.reload(true);
}, },
'Close': function () { 'Close': function () {
$(this).dialog('destroy'); $(this).dialog('destroy');
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+13 -12
View File
@@ -1412,18 +1412,19 @@ WriteLiteral("\r\n $.connection.hub.qs = { JobId: jobId };\r\n
" .addClass(\'dialog disconnected-dialog\')\r\n " + " .addClass(\'dialog disconnected-dialog\')\r\n " +
".html(\'<h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i" + ".html(\'<h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i" +
" class=\"fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT " + " class=\"fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT " +
"Server</h3><div>Please ensure you are connected to the server, then refresh this" + "Server</h3><div>This page is not receiving live updates. Please ensure you are c" +
" page to enable features.</div>\')\r\n .dialog({\r\n " + "onnected to the server, then refresh this page to enable features.</div>\')\r\n " +
" resizable: false,\r\n title: \'Disconn" + " .dialog({\r\n resizable: false,\r\n " +
"ected\',\r\n width: 400,\r\n mo" + " title: \'Disconnected\',\r\n wi" +
"dal: true,\r\n buttons: {\r\n " + "dth: 400,\r\n modal: true,\r\n " +
" \'Refresh Now\': function () {\r\n $(this).di" + " buttons: {\r\n \'Refresh Now\': function () {\r\n " +
"alog(\'option\', \'buttons\', null);\r\n window.loc" + " $(this).dialog(\'option\', \'buttons\', null);\r\n " +
"ation.href = window.location.href;\r\n },\r\n " + " window.location.reload(true);\r\n " +
" \'Close\': function () {\r\n " + " },\r\n \'Close\': function () {\r\n " +
" $(this).dialog(\'destroy\');\r\n }\r\n " + " $(this).dialog(\'destroy\');\r\n " +
" }\r\n });\r\n }\r\n }\r" + " }\r\n }\r\n });\r\n " +
"\n\r\n //#endregion\r\n });\r\n </script>\r\n"); " }\r\n }\r\n\r\n //#endregion\r\n });\r\n </script" +
">\r\n");
#line 625 "..\..\Views\Job\JobParts\Resources.cshtml" #line 625 "..\..\Views\Job\JobParts\Resources.cshtml"
Disco.Web/Views/User/UserParts/_Resources.cshtml
+2 -2
View File
@@ -90,7 +90,7 @@
if ($('.disconnected-dialog').length == 0) { if ($('.disconnected-dialog').length == 0) {
$('<div>') $('<div>')
.addClass('dialog disconnected-dialog') .addClass('dialog disconnected-dialog')
.html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>Please ensure you are connected to the server, then refresh this page to enable features.</div>') .html('<h3><span class="fa-stack fa-lg"><i class="fa fa-wifi fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x error"></i></span>Disconnected from the Disco ICT Server</h3><div>This page is not receiving live updates. Please ensure you are connected to the server, then refresh this page to enable features.</div>')
.dialog({ .dialog({
resizable: false, resizable: false,
title: 'Disconnected', title: 'Disconnected',
@@ -99,7 +99,7 @@
buttons: { buttons: {
'Refresh Now': function () { 'Refresh Now': function () {
$(this).dialog('option', 'buttons', null); $(this).dialog('option', 'buttons', null);
window.location.href = window.location.href; window.location.reload(true);
}, },
'Close': function () { 'Close': function () {
$(this).dialog('destroy'); $(this).dialog('destroy');
Disco.Web/Views/User/UserParts/_Resources.generated.cs
+18 -17
View File
@@ -413,23 +413,24 @@ WriteLiteral("\' };\r\n $.connection.hub.error(onHubF
"(\'dialog disconnected-dialog\')\r\n .html(\'<" + "(\'dialog disconnected-dialog\')\r\n .html(\'<" +
"h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"" + "h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"" +
"fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</" + "fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</" +
"h3><div>Please ensure you are connected to the server, then refresh this page to" + "h3><div>This page is not receiving live updates. Please ensure you are connected" +
" enable features.</div>\')\r\n .dialog({\r\n " + " to the server, then refresh this page to enable features.</div>\')\r\n " +
" resizable: false,\r\n " + " .dialog({\r\n " +
" title: \'Disconnected\',\r\n " + " resizable: false,\r\n title: \'Discon" +
" width: 400,\r\n modal: tru" + "nected\',\r\n width: 400,\r\n " +
"e,\r\n buttons: {\r\n " + " modal: true,\r\n " +
" \'Refresh Now\': function () {\r\n " + " buttons: {\r\n \'Refresh No" +
" $(this).dialog(\'option\', \'buttons\', null);\r\n " + "w\': function () {\r\n $(this).d" +
" window.location.href = window.loca" + "ialog(\'option\', \'buttons\', null);\r\n " +
"tion.href;\r\n },\r\n " + " window.location.reload(true);\r\n " +
" \'Close\': function () {\r\n " + " },\r\n \'Close\': function () {" +
" $(this).dialog(\'destroy\');\r\n " + "\r\n $(this).dialog(\'destroy\');" +
" }\r\n }\r\n " + "\r\n }\r\n " +
" });\r\n }\r\n " + " }\r\n });\r\n " +
" }\r\n\r\n function onAddAttachment(" + " }\r\n }\r\n\r\n " +
"id, quick) {\r\n var data = { id: id };\r\n " + " function onAddAttachment(id, quick) {\r\n var data" +
" $.ajax({\r\n url: \'"); " = { id: id };\r\n $.ajax({\r\n " +
" url: \'");
#line 115 "..\..\Views\User\UserParts\_Resources.cshtml" #line 115 "..\..\Views\User\UserParts\_Resources.cshtml"