LT-239: Handle the error if the last imported file is not dcm file

- Add message label in progress dialog

LesionTracker/defaultSettings.js

@@ -33,7 +33,7 @@ Meteor.startup(function() {
         "public": {
             "verifyEmail": false,
             "ui": {
-                "studyListFunctionsEnabled": false
+                "studyListFunctionsEnabled": true
             }
         }
         //defaultServiceType: 'dimse'

OHIFViewer/defaultSettings.js

@@ -31,7 +31,7 @@ Meteor.startup(function() {
         defaultServiceType: 'dicomWeb',
         public: {
             ui: {
-                studyListFunctionsEnabled: false
+                studyListFunctionsEnabled: true
             }
         }
         //defaultServiceType: 'dimse'

Packages/dimseservice/server/Connection.js

@@ -69,7 +69,7 @@ Connection.prototype.selectPeer = function(aeTitle) {
         throw "No such peer";
     }
     return this.peers[aeTitle];
-}
+};
 
 Connection.prototype._sendFile = function (socket, sHandle, file, maxSend, metaLength, list) {
     var fileNameText = typeof file.file == 'string' ? file.file : 'buffer';
@@ -112,15 +112,20 @@ Connection.prototype._sendFile = function(socket, sHandle, file, maxSend, metaLe
 
 Connection.prototype.storeInstances = function (fileList) {
     var contexts = {}, read = 0, length = fileList.length, toSend = [], self = this, handle = new StoreHandle();
+    var lastProcessedMetaLength;
     fileList.forEach(function (bufferOrFile) {
         var fileNameText = typeof bufferOrFile == 'string' ? bufferOrFile : 'buffer';
         DicomMessage.readMetaHeader(bufferOrFile, function (err, metaMessage, metaLength) {
             read++;
             if (err) {
                 handle.emit('file', err, fileNameText);
+                if (read == length && toSend.length > 0 && lastProcessedMetaLength) {
+                    sendProcessedFiles(self, contexts, toSend, handle, lastProcessedMetaLength);
+                }
                 return;
             }
             console.log('Dicom file ' + (typeof bufferOrFile == 'string' ? bufferOrFile : 'buffer') + ' found');
+            lastProcessedMetaLength = metaLength;
             var syntax = metaMessage.getValue(0x00020010),
                 sopClassUID = metaMessage.getValue(0x00020002),
                 instanceUID = metaMessage.getValue(0x00020003);
@@ -134,6 +139,15 @@ Connection.prototype.storeInstances = function(fileList) {
             toSend.push({file: bufferOrFile, context: sopClassUID, uid: instanceUID});
 
             if (read == length) {
+                sendProcessedFiles(self, contexts, toSend, handle, metaLength);
+            }
+        });
+    });
+    return handle;
+};
+
+// Starts to send dcm files
+sendProcessedFiles = function (self, contexts, toSend, handle, metaLength) {
     var useContexts = [];
     for (var context in contexts) {
         var useSyntaxes = contexts[context];
@@ -151,10 +165,6 @@ Connection.prototype.storeInstances = function(fileList) {
         self._sendFile(this, handle, next, maxSend, metaLength, toSend);
 
     });
-        }
-      });
-    });
-    return handle;
 };
 
 Connection.prototype.storeResponse = function (messageId, msg) {

Packages/viewerbase/client/components/basic/progressDialog/progressDialog.html

@@ -9,7 +9,9 @@
                     {{progressStatus}}
                 </div>
             </div>
-            <div class="message">{{progressMessage}}</div>
+            <div id="message">
+                {{{progressMessage}}}
+            </div>
         </div>
     </div>
 </template>

Packages/viewerbase/client/components/basic/progressDialog/progressDialog.js

@@ -1,9 +1,24 @@
 progressDialog = {
-    'show': function(title, numberOfTotal) {
+    /**
-        Session.set("progressDialogSettings", { title: title, numberOfCompleted: 0, numberOfTotal: numberOfTotal });
+     * Shows progress dialog
-
+     * @param {Object} settings - Settings used by progress dialog
+     * @param {string} settings.title
+     * @param {int} settings.numberOfCompleted - The value of progress dialog
+     * @param {int} settings.numberOfTotal - The max value of progress dialog
+     * @param {Object} [settings.messageParams] - Show a message in progress dialog by setting message and messageType
+     * @param {string} [settings.messageParams.message="Progress"] - The message will be shown in the progress dialog
+     * @param {string} [settings.messageParams.messageType="info"] - Sets ui, accepts bootstrap predefined classes such as success, info, warning, danger
+     */
+    'show': function(settings) {
+        // Set dialog settings
+        Session.set("progressDialogSettings", settings);
         $('#progressDialog').css('display', 'block');
     },
+
+    /**
+     * Updates the value of the progress dialog
+     * @param {int} numberOfCompleted
+     */
     'update': function(numberOfCompleted) {
         var progressDialogSettings = Session.get("progressDialogSettings");
         progressDialogSettings.numberOfCompleted = numberOfCompleted;
@@ -14,13 +29,29 @@ progressDialog = {
             progressDialog.close();
         }
     },
+
+    /**
+     * Closes the progress dialog
+     */
     'close': function() {
-        Session.set("progressDialogSettings", { title: "", numberOfCompleted: 0, numberOfTotal: 1 });
+        // Reset progressDialogSettings session
+        resetDialogSettingsSession();
+
+        // Close dialog
         $('#progressDialog').css('display', 'none');
     },
-    'setMessage': function(message) {
+    /**
+     * Shows a message in the progress dialog
+     * @param {Object} messageParams
+     * @param {string} messageParams.message
+     * @param {string} messageParams.messageType
+     */
+    'setMessage': function(messageParams) {
         var progressDialogSettings = Session.get("progressDialogSettings");
-        progressDialogSettings.message = message;
+        if (!messageParams.messageType || messageParams.messageType == '') {
+            messageParams.messageType = 'info';
+        }
+        progressDialogSettings.messageParams = messageParams;
         Session.set("progressDialogSettings", progressDialogSettings);
     }
 };
@@ -31,7 +62,7 @@ Template.progressDialog.helpers({
             return Session.get("progressDialogSettings").title;
         }
 
-        return "";
+        return "Progress:";
     },
     'progressStatus': function() {
         var numberOfCompleted = 0;
@@ -48,9 +79,22 @@ Template.progressDialog.helpers({
     },
     'progressMessage': function() {
         var progressDialogSettings = Session.get("progressDialogSettings");
-        if (progressDialogSettings && progressDialogSettings.message) {
+        var messageParams = progressDialogSettings && progressDialogSettings.messageParams || false;
-            return progressDialogSettings.message;
+        if (messageParams && messageParams.message) {
+            return '<span class="label label-'+messageParams.messageType+'">'+messageParams.message+'</span>';
         }
         return;
     }
 });
+
+// Resets progressDialogSettings
+function resetDialogSettingsSession() {
+    Session.set("progressDialogSettings",
+        {
+            title: 'Progress',
+            numberOfCompleted: 0,
+            numberOfTotal: 0,
+            messageParams: {message: null, messageType: 'info'}
+        }
+    );
+}

Packages/viewerbase/client/components/basic/progressDialog/progressDialog.styl

@@ -7,7 +7,7 @@
   right: 0
   margin: auto
   width: 20%
-  height: 15%
+  height: 20%
   z-index: 100
   border-radius: 5px
   padding: 10px 20px 10px 20px
@@ -16,3 +16,10 @@
 
   .dialogContent
     margin-bottom: 20px
+
+    #message
+      width: 100%
+
+      span
+        display: inline-block;
+        width: 100%

Packages/viewerbase/lib/importStudies.js

@@ -10,11 +10,13 @@ importStudies = function(filesToImport, importCallback) {
         numberOfFilesUploaded: 0,
         numberOfFilesFailed: 0
     };
-
     var numberOfFilesToUpload = filesToImport.length;
     var studiesToImport = [];
-
+    progressDialog.show({
-    progressDialog.show("Uploading Files...", numberOfFilesToUpload);
+        title: "Uploading Files...",
+        numberOfCompleted: 0,
+        numberOfTotal: numberOfFilesToUpload
+    });
 
     //  Upload files to the server
     filesToImport.forEach(function(fileToUpload) {
@@ -70,7 +72,11 @@ function importStudiesInternal(studiesToImport, importCallback) {
 
     var numberOfStudiesToImport = studiesToImport.length;
 
-    progressDialog.show("Importing Studies...", numberOfStudiesToImport);
+    progressDialog.show({
+        title: "Importing Studies...",
+        numberOfCompleted: 0,
+        numberOfTotal: numberOfStudiesToImport
+    });
 
     //  Create/Insert a new study import status item
     Meteor.call("createStudyImportStatus", function(err, studyImportStatusId) {
@@ -81,7 +87,7 @@ function importStudiesInternal(studiesToImport, importCallback) {
             return;
         }
 
-        //  Handle when it is updated
+        //  Handle when StudyImportStatus collection is updated
         StudyImportStatus.find(studyImportStatusId).observe({
             changed: function(studyImportStatus) {
                 if (!studyImportStatus) {
@@ -90,26 +96,27 @@ function importStudiesInternal(studiesToImport, importCallback) {
 
                 var numberOfStudiesProcessedToImport = studyImportStatus.numberOfStudiesImported + studyImportStatus.numberOfStudiesFailed;
 
-                // Show failed message in the dialog
+                // Show number of imported files
-                if (studyImportStatus.numberOfStudiesFailed > 0) {
+                var successMessage = 'Imported '+studyImportStatus.numberOfStudiesImported+' of '+numberOfStudiesToImport;
-                    var failMessage = "Failed to import " + studyImportStatus.numberOfStudiesFailed + " of " + numberOfStudiesToImport + " files";
+                progressDialog.setMessage({
-                    progressDialog.setMessage(failMessage);
+                    message: successMessage,
-                }
+                    messageType: 'success'
-
+                });
                 progressDialog.update(numberOfStudiesProcessedToImport);
 
+                // Show number of failed files if there is at least one failed file
+                if (studyImportStatus.numberOfStudiesFailed > 0) {
+                    var successMessage = 'Failed '+studyImportStatus.numberOfStudiesFailed+' of '+numberOfStudiesToImport;
+                    progressDialog.setMessage({
+                        message: successMessage,
+                        messageType: 'warning'
+                    });
+                }
+
                 if (numberOfStudiesProcessedToImport == numberOfStudiesToImport) {
                     //  The entire import operation is completed, so remove the study import status item
                     Meteor.call("removeStudyImportStatus", studyImportStatus._id);
 
-                    if (studyImportStatus.numberOfStudiesFailed > 0) {
-                        //TODO: Some files failed to import, so let user know
-                        // Update progress dialog message
-                        var failMessage = "Failed to import " + studyImportStatus.numberOfStudiesFailed + " of " + numberOfStudiesToImport + " files";
-                        progressDialog.setMessage(failMessage);
-                        console.log(failMessage);
-                    }
-
                     //  Let the caller know that import operation is completed
                     if (importCallback) {
                         importCallback();

Packages/worklist/client/components/worklistToolbar/worklistToolbar.js

@@ -6,6 +6,12 @@ Template.worklistToolbar.events({
         });
         
         importStudies(selectedFiles);
+    },
+
+    'click #btnImport': function(e) {
+        // Reset file input
+        var fileInput = e.currentTarget;
+        $(fileInput).val("");
     }
 });