From d291ad464f4b4639ca43bfacc71530d167b85014 Mon Sep 17 00:00:00 2001
From: Gary Sharp <garypsharp@hotmail.com>
Date: Fri, 1 Aug 2025 11:40:02 +1000
Subject: [PATCH] qol: online upload: remove dialog when attachment received

---
 .../Modules/Disco-AttachmentUploader.js       |  13 +-
 .../Modules/Disco-AttachmentUploader.min.js   |   2 +-
 .../disco-attachmentuploader.js               |  13 +-
 .../Device/DeviceParts/_Resources.cshtml      |   7 +-
 .../DeviceParts/_Resources.generated.cs       | 129 +++++++++--------
 Disco.Web/Views/Job/JobParts/Resources.cshtml |   7 +-
 .../Views/Job/JobParts/Resources.generated.cs | 126 +++++++++--------
 .../Views/User/UserParts/_Resources.cshtml    |   7 +-
 .../User/UserParts/_Resources.generated.cs    | 133 +++++++++---------
 9 files changed, 237 insertions(+), 200 deletions(-)

diff --git a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js
index f2a0c1ad..f5e19670 100644
--- a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js
+++ b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js
@@ -218,12 +218,12 @@
         }
         self.onlineUploadDisplay = function () {
             if (!!window.QRCode && !!self.onlineUploadSession) {
-                var dialog = $('<div>')
+                const dialog = $('<div>')
                     .attr({
                         title: 'Online Upload',
                         'class': 'dialog Disco-AttachmentUpload-OnlineUploadDialog'
                     });
-                var qrCode = QRCode({
+                const qrCode = QRCode({
                     msg: self.onlineUploadSession.SessionUri,
                     ecl: 'L'
                 });
@@ -234,11 +234,15 @@
                 $('<div class="info-box"><p class="fa-p"><i class="fa fa-info-circle information"></i> Scan the QR Code or send the link to upload files</p></div>')
                     .appendTo(dialog);
 
-                var expiration = new Date(self.onlineUploadSession.Expiration);
-                var sessionExpiration = setTimeout(function () {
+                const expiration = new Date(self.onlineUploadSession.Expiration);
+                const sessionExpiration = setTimeout(function () {
                     dialog.dialog('close');
                 }, expiration.getTime() - new Date().getTime());
 
+                self.onlineUploadCloseDialog = function () {
+                    dialog.dialog('close');
+                };
+
                 dialog.dialog({
                     resizable: false,
                     width: 500,
@@ -248,6 +252,7 @@
                         if (!!sessionExpiration) {
                             window.clearTimeout(sessionExpiration);
                         }
+                        self.onlineUploadCloseDialog = null;
                         dialog.dialog('destroy').remove();
                     }
                 });
diff --git a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js
index a7fbd350..79dfd2a1 100644
--- a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js
+++ b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js
@@ -1 +1 @@
-(function(n,t,i){"use strict";var r=function(r){var u=this;if(u.$host=r,u.uploadUrl=r.attr("data-uploadurl"),u.dropTarget=r.find(".Disco-AttachmentUpload-DropTarget"),u.uploadProgressContainer=r.find(".Disco-AttachmentUpload-Progress"),u._uploadFilesInput=null,u.uploadFiles=function(){!u._uploadFilesInput||u._uploadFilesInput.remove();u._uploadFilesInput=i("<input>");u._uploadFilesInput.attr({type:"file",multiple:"multiple",title:"Disco ICT File Uploading"}).hide().change(function(n){var t=n.target.files;!!t&&t.length>0&&u._uploadFiles(t);u._uploadFilesInput.remove()}).appendTo(u.uploadProgressContainer).click()},!!u.dropTarget){var o=i(t),f=!1,e=null;o.on("dragover",function(){u.dropTarget.addClass("dragHighlight");u.dropTarget.removeClass("dragHover");f=!1});o.on("dragleave",function(){!e||n.clearInterval(e);f=!0;n.setTimeout(function(){f&&u.dropTarget.removeClass("dragHighlight");e=null},200)});u.dropTarget.on("dragover",function(n){n.stopPropagation();n.preventDefault();u.dropTarget.addClass("dragHover");f=!1;n.originalEvent.dataTransfer.dropEffect="copy"});u.dropTarget.on("drop",function(n){n.stopPropagation();n.preventDefault();f=!0;u.dropTarget.removeClass("dragHighlight");var t=n.originalEvent.dataTransfer.files;u._uploadFiles(t)})}return u.uploadImage=function(){let e=null,o=!1;var f=i("<div><video><\/video><\/div>").attr({id:"Disco_AttachmentUpload_ImageDialog",title:"Upload Image","class":"dialog Disco-AttachmentUpload-ImageDialog"});f.dialog({autoOpen:!0,draggable:!1,modal:!0,resizable:!1,width:720,height:405,close:function(){e&&e.getTracks().forEach(n=>n.stop());n.setTimeout(function(){f.dialog("destroy")},1)}}).closest(".ui-dialog").children(".ui-dialog-titlebar").css("border-bottom","none");const r=f.find("video")[0];navigator.mediaDevices.getUserMedia({audio:!1,video:{width:{ideal:1920},height:{ideal:1080},facingMode:"environment"}}).then(n=>{e=n,r.srcObject=n,r.play()}).catch(n=>{console.error(n),f.dialog("destroy")});r.addEventListener("canplay",()=>{if(!o){const i=720;let n=r.videoHeight/(r.videoWidth/i);isNaN(n)&&(n=405);r.setAttribute("width",i);r.setAttribute("height",n);o=!0;f.dialog("option","buttons",[{text:"Capture",click:()=>{const n=t.createElement("canvas");n.width=r.videoWidth;n.height=r.videoHeight;const i=n.getContext("2d");i.drawImage(r,0,0);n.toBlob(n=>{u._uploadImage(n)},"image/jpg")}}]);f.css("height","");f.closest(".ui-dialog").children(".ui-dialog-buttonpane").css("margin-top",0).find(".ui-button:first").focus()}})},u.onlineUpload=async function(){const o=u.$host.attr("data-onlineuploadurl"),s=u.$host.attr("data-qrcodeurl"),i=u.$host.find(".attachmentInput span.online-upload");if(!i.hasClass("fa-spinner")){if(i.removeClass("fa-qrcode").addClass("fa-spinner fa-spin d-green"),!n.QRCode){const n=t.createElement("script");n.src=s;n.type="text/javascript";n.onload=function(){u.onlineUploadDisplay()};t.body.appendChild(n)}const e=new FormData;e.append("__RequestVerificationToken",t.body.dataset.antiforgery);const r=await fetch(o,{method:"POST",body:e});if(!r.ok){alert("Error creating online upload session: "+r.statusText);i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode");return}const f=await r.json();if(!f.Success){alert("Unable to create online upload session: "+f.ErrorMessage);i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode");return}u.onlineUploadSession=f;u.onlineUploadDisplay();i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode")}},u.onlineUploadDisplay=function(){var t,f,e,r;!n.QRCode||!u.onlineUploadSession||(t=i("<div>").attr({title:"Online Upload","class":"dialog Disco-AttachmentUpload-OnlineUploadDialog"}),f=QRCode({msg:u.onlineUploadSession.SessionUri,ecl:"L"}),t.append(f),i('<input type="text" readonly>').val(u.onlineUploadSession.SessionUri).appendTo(t),i('<div class="info-box"><p class="fa-p"><i class="fa fa-info-circle information"><\/i> Scan the QR Code or send the link to upload files<\/p><\/div>').appendTo(t),e=new Date(u.onlineUploadSession.Expiration),r=setTimeout(function(){t.dialog("close")},e.getTime()-(new Date).getTime()),t.dialog({resizable:!1,width:500,modal:!0,autoOpen:!0,close:function(){!r||n.clearTimeout(r);t.dialog("destroy").remove()}}))},u.getFileComments=function(t,r,u){var e=!1,f=i("<div>").attr({title:"Upload File","class":"dialog Disco-AttachmentUpload-CommentDialog"}),o,h,s;f.html('<table><tr><th>File Name:<\/th><td class="filename"><\/td><\/tr><tr><th>Comments:<\/th><td><input class="comments" type="text" placeholder="optional" /><\/td><\/tr><tr><td class="thumbnail" colspan="2"><img /><\/td><\/tr><\/table>');!r||(o=f.find("td.thumbnail"),h=o.find("img"),r(h)&&o.show());f.find("td.filename").text(t).attr("title",t);s=f.find("input.comments").keypress(function(n){n.which===13&&(e=!0,f.dialog("close"))});f.dialog({resizable:!1,width:400,modal:!0,autoOpen:!0,buttons:{Upload:function(){e=!0;f.dialog("close");n.setTimeout(function(){s.focus()},1)},Cancel:function(){f.dialog("close")}},close:function(){var n=s.val();f.dialog("destroy").remove();u(e,n)}})},u._uploadImage=function(n){var t="CapturedImage-"+moment().format("YYYYMMDD-HHmmss")+".jpg";u.getFileComments(t,function(t){const i=URL.createObjectURL(n);return t.attr("src",i),!0},function(i,r){i&&u._uploadFile(n,t,r)})},u._uploadFiles=function(n){var t=i.makeArray(n),r=function(){if(t&&t.length!==0){var n=t.shift();u.getFileComments(n.name,function(t){if(!!n.type&&n.type.indexOf("image/")===0){var i=new FileReader;return i.onload=function(n){t.attr("src",n.target.result)},i.readAsDataURL(n),!0}return!1},function(t,i){t&&(u._uploadFile(n,n.name,i),r())})}};r()},u._uploadFile=async function(n,r,f){const e=new FormData,s=i("<div>").append(i("<i>").addClass("fa fa-cog fa-spin")).append(i("<span>").text("Uploading: "+r)).appendTo(u.uploadProgressContainer);e.append("__RequestVerificationToken",t.body.dataset.antiforgery);e.append("comments",f);e.append("file",n,r);const o=await fetch(u.uploadUrl,{method:"POST",body:e});if(s.slideUp(400,function(){s.remove()}),!o.ok){alert("Error Uploading ["+r+"]: "+o.statusText);const n=await o.text();console.error("Failed to upload file ["+r+"]: "+n)}},u};t.Disco||(t.Disco={});t.Disco.AttachmentUploader=r})(this,document,$);
\ No newline at end of file
+(function(n,t,i){"use strict";var r=function(r){var u=this;if(u.$host=r,u.uploadUrl=r.attr("data-uploadurl"),u.dropTarget=r.find(".Disco-AttachmentUpload-DropTarget"),u.uploadProgressContainer=r.find(".Disco-AttachmentUpload-Progress"),u._uploadFilesInput=null,u.uploadFiles=function(){!u._uploadFilesInput||u._uploadFilesInput.remove();u._uploadFilesInput=i("<input>");u._uploadFilesInput.attr({type:"file",multiple:"multiple",title:"Disco ICT File Uploading"}).hide().change(function(n){var t=n.target.files;!!t&&t.length>0&&u._uploadFiles(t);u._uploadFilesInput.remove()}).appendTo(u.uploadProgressContainer).click()},!!u.dropTarget){var o=i(t),f=!1,e=null;o.on("dragover",function(){u.dropTarget.addClass("dragHighlight");u.dropTarget.removeClass("dragHover");f=!1});o.on("dragleave",function(){!e||n.clearInterval(e);f=!0;n.setTimeout(function(){f&&u.dropTarget.removeClass("dragHighlight");e=null},200)});u.dropTarget.on("dragover",function(n){n.stopPropagation();n.preventDefault();u.dropTarget.addClass("dragHover");f=!1;n.originalEvent.dataTransfer.dropEffect="copy"});u.dropTarget.on("drop",function(n){n.stopPropagation();n.preventDefault();f=!0;u.dropTarget.removeClass("dragHighlight");var t=n.originalEvent.dataTransfer.files;u._uploadFiles(t)})}return u.uploadImage=function(){let e=null,o=!1;var f=i("<div><video><\/video><\/div>").attr({id:"Disco_AttachmentUpload_ImageDialog",title:"Upload Image","class":"dialog Disco-AttachmentUpload-ImageDialog"});f.dialog({autoOpen:!0,draggable:!1,modal:!0,resizable:!1,width:720,height:405,close:function(){e&&e.getTracks().forEach(n=>n.stop());n.setTimeout(function(){f.dialog("destroy")},1)}}).closest(".ui-dialog").children(".ui-dialog-titlebar").css("border-bottom","none");const r=f.find("video")[0];navigator.mediaDevices.getUserMedia({audio:!1,video:{width:{ideal:1920},height:{ideal:1080},facingMode:"environment"}}).then(n=>{e=n,r.srcObject=n,r.play()}).catch(n=>{console.error(n),f.dialog("destroy")});r.addEventListener("canplay",()=>{if(!o){const i=720;let n=r.videoHeight/(r.videoWidth/i);isNaN(n)&&(n=405);r.setAttribute("width",i);r.setAttribute("height",n);o=!0;f.dialog("option","buttons",[{text:"Capture",click:()=>{const n=t.createElement("canvas");n.width=r.videoWidth;n.height=r.videoHeight;const i=n.getContext("2d");i.drawImage(r,0,0);n.toBlob(n=>{u._uploadImage(n)},"image/jpg")}}]);f.css("height","");f.closest(".ui-dialog").children(".ui-dialog-buttonpane").css("margin-top",0).find(".ui-button:first").focus()}})},u.onlineUpload=async function(){const o=u.$host.attr("data-onlineuploadurl"),s=u.$host.attr("data-qrcodeurl"),i=u.$host.find(".attachmentInput span.online-upload");if(!i.hasClass("fa-spinner")){if(i.removeClass("fa-qrcode").addClass("fa-spinner fa-spin d-green"),!n.QRCode){const n=t.createElement("script");n.src=s;n.type="text/javascript";n.onload=function(){u.onlineUploadDisplay()};t.body.appendChild(n)}const e=new FormData;e.append("__RequestVerificationToken",t.body.dataset.antiforgery);const r=await fetch(o,{method:"POST",body:e});if(!r.ok){alert("Error creating online upload session: "+r.statusText);i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode");return}const f=await r.json();if(!f.Success){alert("Unable to create online upload session: "+f.ErrorMessage);i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode");return}u.onlineUploadSession=f;u.onlineUploadDisplay();i.removeClass("fa-spinner fa-spin d-green").addClass("fa-qrcode")}},u.onlineUploadDisplay=function(){if(!!n.QRCode&&!!u.onlineUploadSession){const t=i("<div>").attr({title:"Online Upload","class":"dialog Disco-AttachmentUpload-OnlineUploadDialog"}),f=QRCode({msg:u.onlineUploadSession.SessionUri,ecl:"L"});t.append(f);i('<input type="text" readonly>').val(u.onlineUploadSession.SessionUri).appendTo(t);i('<div class="info-box"><p class="fa-p"><i class="fa fa-info-circle information"><\/i> Scan the QR Code or send the link to upload files<\/p><\/div>').appendTo(t);const e=new Date(u.onlineUploadSession.Expiration),r=setTimeout(function(){t.dialog("close")},e.getTime()-(new Date).getTime());u.onlineUploadCloseDialog=function(){t.dialog("close")};t.dialog({resizable:!1,width:500,modal:!0,autoOpen:!0,close:function(){!r||n.clearTimeout(r);u.onlineUploadCloseDialog=null;t.dialog("destroy").remove()}})}},u.getFileComments=function(t,r,u){var e=!1,f=i("<div>").attr({title:"Upload File","class":"dialog Disco-AttachmentUpload-CommentDialog"}),o,h,s;f.html('<table><tr><th>File Name:<\/th><td class="filename"><\/td><\/tr><tr><th>Comments:<\/th><td><input class="comments" type="text" placeholder="optional" /><\/td><\/tr><tr><td class="thumbnail" colspan="2"><img /><\/td><\/tr><\/table>');!r||(o=f.find("td.thumbnail"),h=o.find("img"),r(h)&&o.show());f.find("td.filename").text(t).attr("title",t);s=f.find("input.comments").keypress(function(n){n.which===13&&(e=!0,f.dialog("close"))});f.dialog({resizable:!1,width:400,modal:!0,autoOpen:!0,buttons:{Upload:function(){e=!0;f.dialog("close");n.setTimeout(function(){s.focus()},1)},Cancel:function(){f.dialog("close")}},close:function(){var n=s.val();f.dialog("destroy").remove();u(e,n)}})},u._uploadImage=function(n){var t="CapturedImage-"+moment().format("YYYYMMDD-HHmmss")+".jpg";u.getFileComments(t,function(t){const i=URL.createObjectURL(n);return t.attr("src",i),!0},function(i,r){i&&u._uploadFile(n,t,r)})},u._uploadFiles=function(n){var t=i.makeArray(n),r=function(){if(t&&t.length!==0){var n=t.shift();u.getFileComments(n.name,function(t){if(!!n.type&&n.type.indexOf("image/")===0){var i=new FileReader;return i.onload=function(n){t.attr("src",n.target.result)},i.readAsDataURL(n),!0}return!1},function(t,i){t&&(u._uploadFile(n,n.name,i),r())})}};r()},u._uploadFile=async function(n,r,f){const e=new FormData,s=i("<div>").append(i("<i>").addClass("fa fa-cog fa-spin")).append(i("<span>").text("Uploading: "+r)).appendTo(u.uploadProgressContainer);e.append("__RequestVerificationToken",t.body.dataset.antiforgery);e.append("comments",f);e.append("file",n,r);const o=await fetch(u.uploadUrl,{method:"POST",body:e});if(s.slideUp(400,function(){s.remove()}),!o.ok){alert("Error Uploading ["+r+"]: "+o.statusText);const n=await o.text();console.error("Failed to upload file ["+r+"]: "+n)}},u};t.Disco||(t.Disco={});t.Disco.AttachmentUploader=r})(this,document,$);
\ No newline at end of file
diff --git a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js
index 420444df..80bce8b9 100644
--- a/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js
+++ b/Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js
@@ -218,12 +218,12 @@
         }
         self.onlineUploadDisplay = function () {
             if (!!window.QRCode && !!self.onlineUploadSession) {
-                var dialog = $('<div>')
+                const dialog = $('<div>')
                     .attr({
                         title: 'Online Upload',
                         'class': 'dialog Disco-AttachmentUpload-OnlineUploadDialog'
                     });
-                var qrCode = QRCode({
+                const qrCode = QRCode({
                     msg: self.onlineUploadSession.SessionUri,
                     ecl: 'L'
                 });
@@ -234,11 +234,15 @@
                 $('<div class="info-box"><p class="fa-p"><i class="fa fa-info-circle information"></i> Scan the QR Code or send the link to upload files</p></div>')
                     .appendTo(dialog);
 
-                var expiration = new Date(self.onlineUploadSession.Expiration);
-                var sessionExpiration = setTimeout(function () {
+                const expiration = new Date(self.onlineUploadSession.Expiration);
+                const sessionExpiration = setTimeout(function () {
                     dialog.dialog('close');
                 }, expiration.getTime() - new Date().getTime());
 
+                self.onlineUploadCloseDialog = function () {
+                    dialog.dialog('close');
+                };
+
                 dialog.dialog({
                     resizable: false,
                     width: 500,
@@ -248,6 +252,7 @@
                         if (!!sessionExpiration) {
                             window.clearTimeout(sessionExpiration);
                         }
+                        self.onlineUploadCloseDialog = null;
                         dialog.dialog('destroy').remove();
                     }
                 });
diff --git a/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml b/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
index bf7c97d0..76652fb3 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
@@ -59,6 +59,7 @@
                             const $attachmentOutput = $Attachments.find('.attachmentOutput');
                             let $attachmentDownloadHost = null;
                             let $dialogRemoveAttachment = null;
+                            let attachmentUploader = null;
 
                             function onAttachmentAdded(id, quick) {
                                 var data = { id: id };
@@ -76,6 +77,10 @@
                                                 buildAttachment(a, (a.AuthorId === $Attachments.attr('data-userid')), quick);
                                             else
                                                 buildAttachment(a, false, quick);
+
+                                            if (attachmentUploader && attachmentUploader.onlineUploadCloseDialog) {
+                                                attachmentUploader.onlineUploadCloseDialog();
+                                            }
                                         } else {
                                             alert('Unable to add attachment: ' + d.Result);
                                         }
@@ -182,7 +187,7 @@
                         @if (canAddAttachments)
                         {<text>
                             //#region Add Attachments
-                            var attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
+                            attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
 
                             var $attachmentInput = $Attachments.find('.attachmentInput');
                             $attachmentInput.find('.online-upload').on('click', function () {
diff --git a/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
index 4c026e48..e424fa9d 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
@@ -452,6 +452,7 @@ WriteLiteral(@">
                             const $attachmentOutput = $Attachments.find('.attachmentOutput');
                             let $attachmentDownloadHost = null;
                             let $dialogRemoveAttachment = null;
+                            let attachmentUploader = null;
 
                             function onAttachmentAdded(id, quick) {
                                 var data = { id: id };
@@ -459,7 +460,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 66 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 67 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                      Write(Url.Action(MVC.API.Device.Attachment()));
 
             
@@ -475,24 +476,28 @@ WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n
 "anRemoveOwnAttachments\'))\r\n                                                build" +
 "Attachment(a, (a.AuthorId === $Attachments.attr(\'data-userid\')), quick);\r\n      " +
 "                                      else\r\n                                    " +
-"            buildAttachment(a, false, quick);\r\n                                 " +
-"       } else {\r\n                                            alert(\'Unable to ad" +
-"d attachment: \' + d.Result);\r\n                                        }\r\n       " +
-"                             },\r\n                                    error: func" +
-"tion (jqXHR, textStatus, errorThrown) {\r\n                                       " +
-" alert(\'Unable to add attachment: \' + textStatus);\r\n                            " +
-"        }\r\n                                });\r\n                            }\r\n\r" +
-"\n                            function buildAttachment(a, canRemove, quick) {\r\n  " +
-"                              var t = \'<a><span class=\"icon\"><img alt=\"Attachmen" +
-"t Thumbnail\" /></span><span class=\"comments\"></span><span class=\"author\"></span>" +
-"\';\r\n                                if (canRemove)\r\n                            " +
-"        t += \'<span class=\"remove fa fa-times-circle\"></span>\';\r\n               " +
-"                 t += \'<span class=\"timestamp\"></span></a>\';\r\n\r\n                " +
-"                var e = $(t);\r\n\r\n                                e.attr(\'data-at" +
-"tachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).attr(\'href\', \'");
+"            buildAttachment(a, false, quick);\r\n\r\n                               " +
+"             if (attachmentUploader && attachmentUploader.onlineUploadCloseDialo" +
+"g) {\r\n                                                attachmentUploader.onlineU" +
+"ploadCloseDialog();\r\n                                            }\r\n            " +
+"                            } else {\r\n                                          " +
+"  alert(\'Unable to add attachment: \' + d.Result);\r\n                             " +
+"           }\r\n                                    },\r\n                          " +
+"          error: function (jqXHR, textStatus, errorThrown) {\r\n                  " +
+"                      alert(\'Unable to add attachment: \' + textStatus);\r\n       " +
+"                             }\r\n                                });\r\n           " +
+"                 }\r\n\r\n                            function buildAttachment(a, ca" +
+"nRemove, quick) {\r\n                                var t = \'<a><span class=\"icon" +
+"\"><img alt=\"Attachment Thumbnail\" /></span><span class=\"comments\"></span><span c" +
+"lass=\"author\"></span>\';\r\n                                if (canRemove)\r\n       " +
+"                             t += \'<span class=\"remove fa fa-times-circle\"></spa" +
+"n>\';\r\n                                t += \'<span class=\"timestamp\"></span></a>\'" +
+";\r\n\r\n                                var e = $(t);\r\n\r\n                          " +
+"      e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).attr(\'" +
+"href\', \'");
 
             
-            #line 97 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 102 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                                                               Write(Url.Action(MVC.API.Device.AttachmentDownload()));
 
             
@@ -524,7 +529,7 @@ WriteLiteral(@"/' + a.Id);
                                         img.attr('src', '");
 
             
-            #line 120 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 125 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                      Write(Url.Action(MVC.API.Device.AttachmentThumbnail()));
 
             
@@ -577,60 +582,60 @@ WriteLiteral("/\' + a.Id + \'?v=\' + retryCount);\r\n
 ".onAttachmentRemoved = onAttachmentRemoved;\r\n\r\n");
 
             
-            #line 182 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 187 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 182 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 187 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                          if (canAddAttachments)
                         {
             
             #line default
             #line hidden
 WriteLiteral("\r\n                            //#region Add Attachments\r\n                        " +
-"    var attachmentUploader = new document.Disco.AttachmentUploader($Attachments)" +
-";\r\n\r\n                            var $attachmentInput = $Attachments.find(\'.atta" +
-"chmentInput\');\r\n                            $attachmentInput.find(\'.online-uploa" +
-"d\').on(\'click\', function () {\r\n                                if ($(this).hasCl" +
-"ass(\'disabled\'))\r\n                                    alert(\'Disconnected from t" +
-"he Disco ICT Server, please refresh this page and try again\');\r\n                " +
-"                else\r\n                                    attachmentUploader.onl" +
-"ineUpload();\r\n                            });\r\n                            if (w" +
-"indow.location.protocol != \'https:\') {\r\n                                $attachm" +
-"entInput.find(\'.photo\')\r\n                                    .removeClass(\'enabl" +
-"ed\')\r\n                                    .addClass(\'disabled\')\r\n               " +
-"                     .attr(\'title\', \'Capture Image: this functionality is only a" +
-"vailable over a HTTPS connection\');\r\n                            }\r\n            " +
-"                $attachmentInput.find(\'.photo\').click(function () {\r\n           " +
-"                     if (!$(this).hasClass(\'enabled\'))\r\n                        " +
-"            alert(\'This functionality is only available over a HTTPS connection\'" +
-");\r\n                                else if ($(this).hasClass(\'disabled\'))\r\n    " +
-"                                alert(\'Disconnected from the Disco ICT Server, p" +
-"lease refresh this page and try again\');\r\n                                else\r\n" +
-"                                    attachmentUploader.uploadImage();\r\n         " +
-"                   });\r\n                            $attachmentInput.find(\'.uplo" +
-"ad\').click(function () {\r\n                                if ($(this).hasClass(\'" +
-"disabled\'))\r\n                                    alert(\'Disconnected from the Di" +
-"sco ICT Server, please refresh this page and try again\');\r\n                     " +
-"           else\r\n                                    attachmentUploader.uploadFi" +
-"les();\r\n                            });\r\n\r\n                            var resou" +
-"rcesTab;\r\n                            $(document).on(\'dragover\', function () {\r\n" +
-"                                if (!resourcesTab) {\r\n                          " +
-"          var tabs = $Attachments.closest(\'.ui-tabs\');\r\n                        " +
-"            resourcesTab = {\r\n                                        tabs: tabs" +
-",\r\n                                        resourcesIndex: tabs.children(\'ul.ui-" +
-"tabs-nav\').find(\'a[href=\"#DeviceDetailTab-Resources\"]\').closest(\'li\').index()\r\n " +
-"                                   };\r\n                                }\r\n      " +
-"                          var selectedIndex = resourcesTab.tabs.tabs(\'option\', \'" +
-"active\');\r\n                                if (resourcesTab.resourcesIndex !== s" +
-"electedIndex)\r\n                                    resourcesTab.tabs.tabs(\'optio" +
-"n\', \'active\', resourcesTab.resourcesIndex);\r\n                            });\r\n  " +
-"                          //#endregion\r\n                            ");
+"    attachmentUploader = new document.Disco.AttachmentUploader($Attachments);\r\n\r" +
+"\n                            var $attachmentInput = $Attachments.find(\'.attachme" +
+"ntInput\');\r\n                            $attachmentInput.find(\'.online-upload\')." +
+"on(\'click\', function () {\r\n                                if ($(this).hasClass(" +
+"\'disabled\'))\r\n                                    alert(\'Disconnected from the D" +
+"isco ICT Server, please refresh this page and try again\');\r\n                    " +
+"            else\r\n                                    attachmentUploader.onlineU" +
+"pload();\r\n                            });\r\n                            if (windo" +
+"w.location.protocol != \'https:\') {\r\n                                $attachmentI" +
+"nput.find(\'.photo\')\r\n                                    .removeClass(\'enabled\')" +
+"\r\n                                    .addClass(\'disabled\')\r\n                   " +
+"                 .attr(\'title\', \'Capture Image: this functionality is only avail" +
+"able over a HTTPS connection\');\r\n                            }\r\n                " +
+"            $attachmentInput.find(\'.photo\').click(function () {\r\n               " +
+"                 if (!$(this).hasClass(\'enabled\'))\r\n                            " +
+"        alert(\'This functionality is only available over a HTTPS connection\');\r\n" +
+"                                else if ($(this).hasClass(\'disabled\'))\r\n        " +
+"                            alert(\'Disconnected from the Disco ICT Server, pleas" +
+"e refresh this page and try again\');\r\n                                else\r\n    " +
+"                                attachmentUploader.uploadImage();\r\n             " +
+"               });\r\n                            $attachmentInput.find(\'.upload\')" +
+".click(function () {\r\n                                if ($(this).hasClass(\'disa" +
+"bled\'))\r\n                                    alert(\'Disconnected from the Disco " +
+"ICT Server, please refresh this page and try again\');\r\n                         " +
+"       else\r\n                                    attachmentUploader.uploadFiles(" +
+");\r\n                            });\r\n\r\n                            var resources" +
+"Tab;\r\n                            $(document).on(\'dragover\', function () {\r\n    " +
+"                            if (!resourcesTab) {\r\n                              " +
+"      var tabs = $Attachments.closest(\'.ui-tabs\');\r\n                            " +
+"        resourcesTab = {\r\n                                        tabs: tabs,\r\n " +
+"                                       resourcesIndex: tabs.children(\'ul.ui-tabs" +
+"-nav\').find(\'a[href=\"#DeviceDetailTab-Resources\"]\').closest(\'li\').index()\r\n     " +
+"                               };\r\n                                }\r\n          " +
+"                      var selectedIndex = resourcesTab.tabs.tabs(\'option\', \'acti" +
+"ve\');\r\n                                if (resourcesTab.resourcesIndex !== selec" +
+"tedIndex)\r\n                                    resourcesTab.tabs.tabs(\'option\', " +
+"\'active\', resourcesTab.resourcesIndex);\r\n                            });\r\n      " +
+"                      //#endregion\r\n                            ");
 
             
-            #line 229 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 234 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                    }
 
             
@@ -639,7 +644,7 @@ WriteLiteral("\r\n                            //#region Add Attachments\r\n
 WriteLiteral("                        ");
 
             
-            #line 230 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 235 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                          if (canRemoveAnyAttachments || canRemoveOwnAttachments)
                         {
             
@@ -682,7 +687,7 @@ WriteLiteral("\r\n                            //#region Remove Attachments\r\n
 "       }\r\n                            //#endregion\r\n                        ");
 
             
-            #line 281 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 286 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                }
 
             
@@ -719,7 +724,7 @@ WriteLiteral("></i>&nbsp;Are you sure?\r\n        </p>\r\n    </div>\r\n    <scr
 "etailTab-ResourcesLink\">Attachments [");
 
             
-            #line 302 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
+            #line 307 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
                                                                                                                                 Write(Model.Device.DeviceAttachments == null ? 0 : Model.Device.DeviceAttachments.Count);
 
             
diff --git a/Disco.Web/Views/Job/JobParts/Resources.cshtml b/Disco.Web/Views/Job/JobParts/Resources.cshtml
index 59d66e50..31378a07 100644
--- a/Disco.Web/Views/Job/JobParts/Resources.cshtml
+++ b/Disco.Web/Views/Job/JobParts/Resources.cshtml
@@ -298,11 +298,12 @@
             //#region Attachments
             var $Attachments = $('#Attachments');
             var $attachmentOutput = $Attachments.find('.attachmentOutput');
+            let attachmentUploader = null;
 
             @if (canAddAttachments)
             {<text>
             //#region Add Attachments
-            var attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
+            attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
 
             var $attachmentInput = $Attachments.find('.attachmentInput');
             $attachmentInput.find('.online-upload').on('click', function () {
@@ -424,6 +425,10 @@
                                 buildAttachment(a, (a.AuthorId === $Attachments.attr('data-userid')), quick);
                             else
                                 buildAttachment(a, false, quick);
+
+                            if (attachmentUploader && attachmentUploader.onlineUploadCloseDialog) {
+                                attachmentUploader.onlineUploadCloseDialog();
+                            }
                         } else {
                             alert('Unable to add attachment: ' + d.Result);
                         }
diff --git a/Disco.Web/Views/Job/JobParts/Resources.generated.cs b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
index 48a4c0b8..8377f5de 100644
--- a/Disco.Web/Views/Job/JobParts/Resources.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
@@ -989,55 +989,54 @@ WriteLiteral(@"    <script>
             #line hidden
 WriteLiteral("\');\r\n\r\n            //#region Attachments\r\n            var $Attachments = $(\'#Atta" +
 "chments\');\r\n            var $attachmentOutput = $Attachments.find(\'.attachmentOu" +
-"tput\');\r\n\r\n");
+"tput\');\r\n            let attachmentUploader = null;\r\n\r\n");
 
             
-            #line 302 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 303 "..\..\Views\Job\JobParts\Resources.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 302 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 303 "..\..\Views\Job\JobParts\Resources.cshtml"
              if (canAddAttachments)
             {
             
             #line default
             #line hidden
-WriteLiteral("\r\n            //#region Add Attachments\r\n            var attachmentUploader = new" +
-" document.Disco.AttachmentUploader($Attachments);\r\n\r\n            var $attachment" +
-"Input = $Attachments.find(\'.attachmentInput\');\r\n            $attachmentInput.fin" +
-"d(\'.online-upload\').on(\'click\', function () {\r\n                if ($(this).hasCl" +
-"ass(\'disabled\'))\r\n                    alert(\'Disconnected from the Disco ICT Ser" +
-"ver, please refresh this page and try again\');\r\n                else\r\n          " +
-"          attachmentUploader.onlineUpload();\r\n            });\r\n            if (w" +
-"indow.location.protocol != \'https:\') {\r\n                $attachmentInput.find(\'." +
-"photo\')\r\n                    .removeClass(\'enabled\')\r\n                    .addCl" +
-"ass(\'disabled\')\r\n                    .attr(\'title\', \'Capture Image: this functio" +
-"nality is only available over a HTTPS connection\');\r\n            }\r\n            " +
-"$attachmentInput.find(\'.photo\').click(function () {\r\n                if (!$(this" +
-").hasClass(\'enabled\'))\r\n                    alert(\'This functionality is only av" +
-"ailable over a HTTPS connection\');\r\n                else if ($(this).hasClass(\'d" +
-"isabled\'))\r\n                    alert(\'Disconnected from the Disco ICT Server, p" +
-"lease refresh this page and try again\');\r\n                else\r\n                " +
-"    attachmentUploader.uploadImage();\r\n            });\r\n            $attachmentI" +
-"nput.find(\'.upload\').click(function () {\r\n                if ($(this).hasClass(\'" +
-"disabled\'))\r\n                    alert(\'Disconnected from the Disco ICT Server, " +
-"please refresh this page and try again\');\r\n                else\r\n               " +
-"     attachmentUploader.uploadFiles();\r\n            });\r\n\r\n            var resou" +
-"rcesTab;\r\n            $(document).on(\'dragover\', function () {\r\n                " +
-"if (!resourcesTab) {\r\n                    var tabs = $Attachments.closest(\'.ui-t" +
-"abs\');\r\n                    resourcesTab = {\r\n                        tabs: tabs" +
-",\r\n                        resourcesIndex: tabs.children(\'ul.ui-tabs-nav\').find(" +
-"\'a[href=\"#jobDetailTab-Resources\"]\').closest(\'li\').index()\r\n                    " +
-"};\r\n                }\r\n                var selectedIndex = resourcesTab.tabs.tab" +
-"s(\'option\', \'active\');\r\n                if (resourcesTab.resourcesIndex !== sele" +
-"ctedIndex)\r\n                    resourcesTab.tabs.tabs(\'option\', \'active\', resou" +
-"rcesTab.resourcesIndex);\r\n            });\r\n            //#endregion\r\n           " +
-" ");
+WriteLiteral("\r\n            //#region Add Attachments\r\n            attachmentUploader = new doc" +
+"ument.Disco.AttachmentUploader($Attachments);\r\n\r\n            var $attachmentInpu" +
+"t = $Attachments.find(\'.attachmentInput\');\r\n            $attachmentInput.find(\'." +
+"online-upload\').on(\'click\', function () {\r\n                if ($(this).hasClass(" +
+"\'disabled\'))\r\n                    alert(\'Disconnected from the Disco ICT Server," +
+" please refresh this page and try again\');\r\n                else\r\n              " +
+"      attachmentUploader.onlineUpload();\r\n            });\r\n            if (windo" +
+"w.location.protocol != \'https:\') {\r\n                $attachmentInput.find(\'.phot" +
+"o\')\r\n                    .removeClass(\'enabled\')\r\n                    .addClass(" +
+"\'disabled\')\r\n                    .attr(\'title\', \'Capture Image: this functionali" +
+"ty is only available over a HTTPS connection\');\r\n            }\r\n            $att" +
+"achmentInput.find(\'.photo\').click(function () {\r\n                if (!$(this).ha" +
+"sClass(\'enabled\'))\r\n                    alert(\'This functionality is only availa" +
+"ble over a HTTPS connection\');\r\n                else if ($(this).hasClass(\'disab" +
+"led\'))\r\n                    alert(\'Disconnected from the Disco ICT Server, pleas" +
+"e refresh this page and try again\');\r\n                else\r\n                    " +
+"attachmentUploader.uploadImage();\r\n            });\r\n            $attachmentInput" +
+".find(\'.upload\').click(function () {\r\n                if ($(this).hasClass(\'disa" +
+"bled\'))\r\n                    alert(\'Disconnected from the Disco ICT Server, plea" +
+"se refresh this page and try again\');\r\n                else\r\n                   " +
+" attachmentUploader.uploadFiles();\r\n            });\r\n\r\n            var resources" +
+"Tab;\r\n            $(document).on(\'dragover\', function () {\r\n                if (" +
+"!resourcesTab) {\r\n                    var tabs = $Attachments.closest(\'.ui-tabs\'" +
+");\r\n                    resourcesTab = {\r\n                        tabs: tabs,\r\n " +
+"                       resourcesIndex: tabs.children(\'ul.ui-tabs-nav\').find(\'a[h" +
+"ref=\"#jobDetailTab-Resources\"]\').closest(\'li\').index()\r\n                    };\r\n" +
+"                }\r\n                var selectedIndex = resourcesTab.tabs.tabs(\'o" +
+"ption\', \'active\');\r\n                if (resourcesTab.resourcesIndex !== selected" +
+"Index)\r\n                    resourcesTab.tabs.tabs(\'option\', \'active\', resources" +
+"Tab.resourcesIndex);\r\n            });\r\n            //#endregion\r\n            ");
 
             
-            #line 349 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 350 "..\..\Views\Job\JobParts\Resources.cshtml"
                    }
 
             
@@ -1046,13 +1045,13 @@ WriteLiteral("\r\n            //#region Add Attachments\r\n            var attac
 WriteLiteral("\r\n");
 
             
-            #line 351 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 352 "..\..\Views\Job\JobParts\Resources.cshtml"
             
             
             #line default
             #line hidden
             
-            #line 351 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 352 "..\..\Views\Job\JobParts\Resources.cshtml"
              if (canRemoveAnyAttachments || canRemoveOwnAttachments)
             {
             
@@ -1105,7 +1104,7 @@ WriteLiteral("></i>&nbsp;Are you sure?</p></div>\')\r\n                        .
 "          }\r\n\r\n            //#endregion\r\n\r\n            ");
 
             
-            #line 409 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 410 "..\..\Views\Job\JobParts\Resources.cshtml"
                    }
 
             
@@ -1115,7 +1114,7 @@ WriteLiteral("\r\n            function addAttachment(key, quick) {\r\n
 "id: key };\r\n                $.ajax({\r\n                    url: \'");
 
             
-            #line 414 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 415 "..\..\Views\Job\JobParts\Resources.cshtml"
                      Write(Url.Action(MVC.API.Job.Attachment()));
 
             
@@ -1129,22 +1128,25 @@ WriteLiteral("\',\r\n                    dataType: \'json\',\r\n
 "lse if ($Attachments.hasClass(\'canRemoveOwnAttachments\'))\r\n                     " +
 "           buildAttachment(a, (a.AuthorId === $Attachments.attr(\'data-userid\'))," +
 " quick);\r\n                            else\r\n                                buil" +
-"dAttachment(a, false, quick);\r\n                        } else {\r\n               " +
-"             alert(\'Unable to add attachment: \' + d.Result);\r\n                  " +
-"      }\r\n                    },\r\n                    error: function (jqXHR, tex" +
-"tStatus, errorThrown) {\r\n                        alert(\'Unable to add attachment" +
-": \' + textStatus);\r\n                    }\r\n                });\r\n            }\r\n " +
-"           function buildAttachment(a, canRemove, quick) {\r\n                if (" +
-"parseInt(a.ParentId) == jobId) {\r\n                    var t = \'<a><span class=\"i" +
-"con\"><img alt=\"Attachment Thumbnail\" /></span><span class=\"comments\"></span><spa" +
-"n class=\"author\"></span>\';\r\n                    if (canRemove)\r\n                " +
-"        t += \'<span class=\"remove fa fa-times-circle\"></span>\';\r\n               " +
-"     t += \'<span class=\"timestamp\"></span></a>\';\r\n\r\n                    var e = " +
-"$(t);\r\n\r\n                    e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimety" +
-"pe\', a.MimeType).attr(\'href\', \'");
+"dAttachment(a, false, quick);\r\n\r\n                            if (attachmentUploa" +
+"der && attachmentUploader.onlineUploadCloseDialog) {\r\n                          " +
+"      attachmentUploader.onlineUploadCloseDialog();\r\n                           " +
+" }\r\n                        } else {\r\n                            alert(\'Unable " +
+"to add attachment: \' + d.Result);\r\n                        }\r\n                  " +
+"  },\r\n                    error: function (jqXHR, textStatus, errorThrown) {\r\n  " +
+"                      alert(\'Unable to add attachment: \' + textStatus);\r\n       " +
+"             }\r\n                });\r\n            }\r\n            function buildAt" +
+"tachment(a, canRemove, quick) {\r\n                if (parseInt(a.ParentId) == job" +
+"Id) {\r\n                    var t = \'<a><span class=\"icon\"><img alt=\"Attachment T" +
+"humbnail\" /></span><span class=\"comments\"></span><span class=\"author\"></span>\';\r" +
+"\n                    if (canRemove)\r\n                        t += \'<span class=\"" +
+"remove fa fa-times-circle\"></span>\';\r\n                    t += \'<span class=\"tim" +
+"estamp\"></span></a>\';\r\n\r\n                    var e = $(t);\r\n\r\n                  " +
+"  e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).attr(\'href" +
+"\', \'");
 
             
-            #line 445 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 450 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                   Write(Url.Action(MVC.API.Job.AttachmentDownload()));
 
             
@@ -1176,7 +1178,7 @@ WriteLiteral(@"/' + a.Id);
                             img.attr('src', '");
 
             
-            #line 468 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 473 "..\..\Views\Job\JobParts\Resources.cshtml"
                                          Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
 
             
@@ -1223,14 +1225,14 @@ WriteLiteral("/\' + a.Id + \'?v=\' + retryCount);\r\n                        };\
 "script>\r\n");
 
             
-            #line 538 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 543 "..\..\Views\Job\JobParts\Resources.cshtml"
 }
 
             
             #line default
             #line hidden
             
-            #line 539 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 544 "..\..\Views\Job\JobParts\Resources.cshtml"
  if (canShowLogs || canShowAttachments)
 {
 
@@ -1240,7 +1242,7 @@ WriteLiteral("/\' + a.Id + \'?v=\' + retryCount);\r\n                        };\
 WriteLiteral("    <script>\r\n        $(function () {\r\n            var jobId = parseInt(\'");
 
             
-            #line 543 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 548 "..\..\Views\Job\JobParts\Resources.cshtml"
                               Write(Model.Job.Id);
 
             
@@ -1250,7 +1252,7 @@ WriteLiteral("\');\r\n\r\n            //#region LiveEvents\r\n            var hu
 "dates;\r\n\r\n            // Map Functions\r\n");
 
             
-            #line 549 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 554 "..\..\Views\Job\JobParts\Resources.cshtml"
  if (canShowLogs)
 {
             
@@ -1261,14 +1263,14 @@ WriteLiteral("\r\n            hub.client.addLog = document.DiscoFunctions.liveLo
 "      ");
 
             
-            #line 553 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 558 "..\..\Views\Job\JobParts\Resources.cshtml"
                    }
 
             
             #line default
             #line hidden
             
-            #line 554 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 559 "..\..\Views\Job\JobParts\Resources.cshtml"
  if (canShowAttachments)
 {
             
@@ -1289,7 +1291,7 @@ WriteLiteral(@"
 ");
 
             
-            #line 567 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 572 "..\..\Views\Job\JobParts\Resources.cshtml"
        }
 
             
@@ -1331,7 +1333,7 @@ WriteLiteral("\r\n            $.connection.hub.qs = { JobId: jobId };\r\n
 "});\r\n\r\n            //#endregion\r\n        });\r\n    </script>\r\n");
 
             
-            #line 619 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 624 "..\..\Views\Job\JobParts\Resources.cshtml"
 }
             
             #line default
diff --git a/Disco.Web/Views/User/UserParts/_Resources.cshtml b/Disco.Web/Views/User/UserParts/_Resources.cshtml
index 6846de2d..279d2b6d 100644
--- a/Disco.Web/Views/User/UserParts/_Resources.cshtml
+++ b/Disco.Web/Views/User/UserParts/_Resources.cshtml
@@ -59,6 +59,7 @@
                             var $attachmentOutput = $Attachments.find('.attachmentOutput');
                             var $dialogRemoveAttachment = null;
                             let $attachmentDownloadHost = null;
+                            let attachmentUploader = null;
 
                             function onAttachmentAdded(id, quick) {
                                 var data = { id: id };
@@ -76,6 +77,10 @@
                                                 buildAttachment(a, (a.AuthorId === $Attachments.attr('data-userid')), quick);
                                             else
                                                 buildAttachment(a, false, quick);
+
+                                            if (attachmentUploader && attachmentUploader.onlineUploadCloseDialog) {
+                                                attachmentUploader.onlineUploadCloseDialog();
+                                            }
                                         } else {
                                             alert('Unable to add attachment: ' + d.Result);
                                         }
@@ -181,7 +186,7 @@
                         @if (canAddAttachments)
                         {<text>
                             //#region Add Attachments
-                            var attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
+                            attachmentUploader = new document.Disco.AttachmentUploader($Attachments);
 
                             var $attachmentInput = $Attachments.find('.attachmentInput');
                             $attachmentInput.find('.online-upload').on('click', function () {
diff --git a/Disco.Web/Views/User/UserParts/_Resources.generated.cs b/Disco.Web/Views/User/UserParts/_Resources.generated.cs
index 6a70dea6..f1b5506d 100644
--- a/Disco.Web/Views/User/UserParts/_Resources.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_Resources.generated.cs
@@ -452,6 +452,7 @@ WriteLiteral(@">
                             var $attachmentOutput = $Attachments.find('.attachmentOutput');
                             var $dialogRemoveAttachment = null;
                             let $attachmentDownloadHost = null;
+                            let attachmentUploader = null;
 
                             function onAttachmentAdded(id, quick) {
                                 var data = { id: id };
@@ -459,7 +460,7 @@ WriteLiteral(@">
                                     url: '");
 
             
-            #line 66 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 67 "..\..\Views\User\UserParts\_Resources.cshtml"
                                      Write(Url.Action(MVC.API.User.Attachment()));
 
             
@@ -475,24 +476,28 @@ WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n
 "anRemoveOwnAttachments\'))\r\n                                                build" +
 "Attachment(a, (a.AuthorId === $Attachments.attr(\'data-userid\')), quick);\r\n      " +
 "                                      else\r\n                                    " +
-"            buildAttachment(a, false, quick);\r\n                                 " +
-"       } else {\r\n                                            alert(\'Unable to ad" +
-"d attachment: \' + d.Result);\r\n                                        }\r\n       " +
-"                             },\r\n                                    error: func" +
-"tion (jqXHR, textStatus, errorThrown) {\r\n                                       " +
-" alert(\'Unable to add attachment: \' + textStatus);\r\n                            " +
-"        }\r\n                                });\r\n                            }\r\n " +
-"                           function buildAttachment(a, canRemove, quick) {\r\n    " +
-"                            var t = \'<a><span class=\"icon\"><img alt=\"Attachment " +
-"Thumbnail\" /></span><span class=\"comments\"></span><span class=\"author\"></span>\';" +
-"\r\n                                if (canRemove)\r\n                              " +
-"      t += \'<span class=\"remove fa fa-times-circle\"></span>\';\r\n                 " +
-"               t += \'<span class=\"timestamp\"></span></a>\';\r\n\r\n                  " +
-"              var e = $(t);\r\n\r\n                                e.attr(\'data-atta" +
-"chmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).attr(\'href\', \'");
+"            buildAttachment(a, false, quick);\r\n\r\n                               " +
+"             if (attachmentUploader && attachmentUploader.onlineUploadCloseDialo" +
+"g) {\r\n                                                attachmentUploader.onlineU" +
+"ploadCloseDialog();\r\n                                            }\r\n            " +
+"                            } else {\r\n                                          " +
+"  alert(\'Unable to add attachment: \' + d.Result);\r\n                             " +
+"           }\r\n                                    },\r\n                          " +
+"          error: function (jqXHR, textStatus, errorThrown) {\r\n                  " +
+"                      alert(\'Unable to add attachment: \' + textStatus);\r\n       " +
+"                             }\r\n                                });\r\n           " +
+"                 }\r\n                            function buildAttachment(a, canR" +
+"emove, quick) {\r\n                                var t = \'<a><span class=\"icon\">" +
+"<img alt=\"Attachment Thumbnail\" /></span><span class=\"comments\"></span><span cla" +
+"ss=\"author\"></span>\';\r\n                                if (canRemove)\r\n         " +
+"                           t += \'<span class=\"remove fa fa-times-circle\"></span>" +
+"\';\r\n                                t += \'<span class=\"timestamp\"></span></a>\';\r" +
+"\n\r\n                                var e = $(t);\r\n\r\n                            " +
+"    e.attr(\'data-attachmentid\', a.Id).attr(\'data-mimetype\', a.MimeType).attr(\'hr" +
+"ef\', \'");
 
             
-            #line 96 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 101 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                                                               Write(Url.Action(MVC.API.User.AttachmentDownload()));
 
             
@@ -524,7 +529,7 @@ WriteLiteral(@"/' + a.Id);
                                         img.attr('src', '");
 
             
-            #line 119 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 124 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                      Write(Url.Action(MVC.API.User.AttachmentThumbnail()));
 
             
@@ -577,60 +582,60 @@ WriteLiteral("/\' + a.Id + \'?v=\' + retryCount);\r\n
 "DiscoFunctions.onAttachmentRemoved = onAttachmentRemoved;\r\n\r\n");
 
             
-            #line 181 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 186 "..\..\Views\User\UserParts\_Resources.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 181 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 186 "..\..\Views\User\UserParts\_Resources.cshtml"
                          if (canAddAttachments)
                         {
             
             #line default
             #line hidden
 WriteLiteral("\r\n                            //#region Add Attachments\r\n                        " +
-"    var attachmentUploader = new document.Disco.AttachmentUploader($Attachments)" +
-";\r\n\r\n                            var $attachmentInput = $Attachments.find(\'.atta" +
-"chmentInput\');\r\n                            $attachmentInput.find(\'.online-uploa" +
-"d\').on(\'click\', function () {\r\n                                if ($(this).hasCl" +
-"ass(\'disabled\'))\r\n                                    alert(\'Disconnected from t" +
-"he Disco ICT Server, please refresh this page and try again\');\r\n                " +
-"                else\r\n                                    attachmentUploader.onl" +
-"ineUpload();\r\n                            });\r\n                            if (w" +
-"indow.location.protocol != \'https:\') {\r\n                                $attachm" +
-"entInput.find(\'.photo\')\r\n                                    .removeClass(\'enabl" +
-"ed\')\r\n                                    .addClass(\'disabled\')\r\n               " +
-"                     .attr(\'title\', \'Capture Image: this functionality is only a" +
-"vailable over a HTTPS connection\');\r\n                            }\r\n            " +
-"                $attachmentInput.find(\'.photo\').click(function () {\r\n           " +
-"                     if (!$(this).hasClass(\'enabled\'))\r\n                        " +
-"            alert(\'This functionality is only available over a HTTPS connection\'" +
-");\r\n                                else if ($(this).hasClass(\'disabled\'))\r\n    " +
-"                                alert(\'Disconnected from the Disco ICT Server, p" +
-"lease refresh this page and try again\');\r\n                                else\r\n" +
-"                                    attachmentUploader.uploadImage();\r\n         " +
-"                   });\r\n                            $attachmentInput.find(\'.uplo" +
-"ad\').click(function () {\r\n                                if ($(this).hasClass(\'" +
-"disabled\'))\r\n                                    alert(\'Disconnected from the Di" +
-"sco ICT Server, please refresh this page and try again\');\r\n                     " +
-"           else\r\n                                    attachmentUploader.uploadFi" +
-"les();\r\n                            });\r\n\r\n                            var resou" +
-"rcesTab;\r\n                            $(document).on(\'dragover\', function () {\r\n" +
-"                                if (!resourcesTab) {\r\n                          " +
-"          var tabs = $Attachments.closest(\'.ui-tabs\');\r\n                        " +
-"            resourcesTab = {\r\n                                        tabs: tabs" +
-",\r\n                                        resourcesIndex: tabs.children(\'ul.ui-" +
-"tabs-nav\').find(\'a[href=\"#UserDetailTab-Resources\"]\').closest(\'li\').index()\r\n   " +
-"                                 };\r\n                                }\r\n        " +
-"                        var selectedIndex = resourcesTab.tabs.tabs(\'option\', \'ac" +
-"tive\');\r\n                                if (resourcesTab.resourcesIndex !== sel" +
-"ectedIndex)\r\n                                    resourcesTab.tabs.tabs(\'option\'" +
-", \'active\', resourcesTab.resourcesIndex);\r\n                            });\r\n    " +
-"                        //#endregion\r\n                            ");
+"    attachmentUploader = new document.Disco.AttachmentUploader($Attachments);\r\n\r" +
+"\n                            var $attachmentInput = $Attachments.find(\'.attachme" +
+"ntInput\');\r\n                            $attachmentInput.find(\'.online-upload\')." +
+"on(\'click\', function () {\r\n                                if ($(this).hasClass(" +
+"\'disabled\'))\r\n                                    alert(\'Disconnected from the D" +
+"isco ICT Server, please refresh this page and try again\');\r\n                    " +
+"            else\r\n                                    attachmentUploader.onlineU" +
+"pload();\r\n                            });\r\n                            if (windo" +
+"w.location.protocol != \'https:\') {\r\n                                $attachmentI" +
+"nput.find(\'.photo\')\r\n                                    .removeClass(\'enabled\')" +
+"\r\n                                    .addClass(\'disabled\')\r\n                   " +
+"                 .attr(\'title\', \'Capture Image: this functionality is only avail" +
+"able over a HTTPS connection\');\r\n                            }\r\n                " +
+"            $attachmentInput.find(\'.photo\').click(function () {\r\n               " +
+"                 if (!$(this).hasClass(\'enabled\'))\r\n                            " +
+"        alert(\'This functionality is only available over a HTTPS connection\');\r\n" +
+"                                else if ($(this).hasClass(\'disabled\'))\r\n        " +
+"                            alert(\'Disconnected from the Disco ICT Server, pleas" +
+"e refresh this page and try again\');\r\n                                else\r\n    " +
+"                                attachmentUploader.uploadImage();\r\n             " +
+"               });\r\n                            $attachmentInput.find(\'.upload\')" +
+".click(function () {\r\n                                if ($(this).hasClass(\'disa" +
+"bled\'))\r\n                                    alert(\'Disconnected from the Disco " +
+"ICT Server, please refresh this page and try again\');\r\n                         " +
+"       else\r\n                                    attachmentUploader.uploadFiles(" +
+");\r\n                            });\r\n\r\n                            var resources" +
+"Tab;\r\n                            $(document).on(\'dragover\', function () {\r\n    " +
+"                            if (!resourcesTab) {\r\n                              " +
+"      var tabs = $Attachments.closest(\'.ui-tabs\');\r\n                            " +
+"        resourcesTab = {\r\n                                        tabs: tabs,\r\n " +
+"                                       resourcesIndex: tabs.children(\'ul.ui-tabs" +
+"-nav\').find(\'a[href=\"#UserDetailTab-Resources\"]\').closest(\'li\').index()\r\n       " +
+"                             };\r\n                                }\r\n            " +
+"                    var selectedIndex = resourcesTab.tabs.tabs(\'option\', \'active" +
+"\');\r\n                                if (resourcesTab.resourcesIndex !== selecte" +
+"dIndex)\r\n                                    resourcesTab.tabs.tabs(\'option\', \'a" +
+"ctive\', resourcesTab.resourcesIndex);\r\n                            });\r\n        " +
+"                    //#endregion\r\n                            ");
 
             
-            #line 228 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 233 "..\..\Views\User\UserParts\_Resources.cshtml"
                                    }
 
             
@@ -639,7 +644,7 @@ WriteLiteral("\r\n                            //#region Add Attachments\r\n
 WriteLiteral("                        ");
 
             
-            #line 229 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 234 "..\..\Views\User\UserParts\_Resources.cshtml"
                          if (canRemoveAnyAttachments || canRemoveOwnAttachments)
                         {
             
@@ -683,7 +688,7 @@ WriteLiteral("\r\n                            //#region Remove Attachments\r\n\r
 "");
 
             
-            #line 282 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 287 "..\..\Views\User\UserParts\_Resources.cshtml"
                                }
 
             
@@ -707,7 +712,7 @@ WriteLiteral(@"
         $('#UserDetailTabItems').append('<li><a href=""#UserDetailTab-Resources"" id=""UserDetailTab-ResourcesLink"">Attachments [");
 
             
-            #line 298 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 303 "..\..\Views\User\UserParts\_Resources.cshtml"
                                                                                                                           Write(Model.User.UserAttachments == null ? 0 : Model.User.UserAttachments.Count);
 
             
@@ -716,7 +721,7 @@ WriteLiteral(@"
 WriteLiteral("]</a></li>\');\r\n    </script>\r\n</div>\r\n");
 
             
-            #line 301 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 306 "..\..\Views\User\UserParts\_Resources.cshtml"
  if (canRemoveAnyAttachments || canRemoveOwnAttachments)
 {
 
@@ -738,7 +743,7 @@ WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
 WriteLiteral("></i>&nbsp;Are you sure?\r\n        </p>\r\n    </div>\r\n");
 
             
-            #line 308 "..\..\Views\User\UserParts\_Resources.cshtml"
+            #line 313 "..\..\Views\User\UserParts\_Resources.cshtml"
 }
             
             #line default