Move server-side functions from viewerbase to worklist. Split multi-frame and single-image modalities into separate display sets (OHIF-36)

Packages/worklist/client/components/worklist.styl

@@ -14,6 +14,8 @@ body
   background-color: $primaryBackgroundColor
   margin: 0 auto
   color: white
+  float: left;
+  width: 100%;
         
 .tab-content
   width: 100%

Packages/worklist/client/lib/importStudies.js

@@ -0,0 +1,131 @@
+/**
+ * Imports selected studies from local into worklist
+ * @param filesToImport Files located in the client machine to import
+ */
+importStudies = function(filesToImport, importCallback) {
+    if (filesToImport.length < 1) {
+        return;
+    }
+    var fileUploadStatus = {
+        numberOfFilesUploaded: 0,
+        numberOfFilesFailed: 0
+    };
+    var numberOfFilesToUpload = filesToImport.length;
+    var studiesToImport = [];
+    progressDialog.show({
+        title: "Uploading Files...",
+        numberOfCompleted: 0,
+        numberOfTotal: numberOfFilesToUpload
+    });
+
+    //  Upload files to the server
+    filesToImport.forEach(function(fileToUpload) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', "/uploadFilesToImport", true);
+        xhr.setRequestHeader("filename", fileToUpload.name);
+
+        xhr.onload = function() {
+            //  Failed to upload a file
+            if (xhr.readyState === 4 && xhr.status !== 200) {
+                updateFileUploadStatus(fileUploadStatus, false);
+                return;
+            }
+
+            studiesToImport.push(xhr.responseText);
+
+            updateFileUploadStatus(fileUploadStatus, true);
+
+            var numberOfFilesProcessedToUpload = fileUploadStatus.numberOfFilesUploaded + fileUploadStatus.numberOfFilesFailed;
+            progressDialog.update(numberOfFilesProcessedToUpload);
+
+            if (numberOfFilesToUpload === numberOfFilesProcessedToUpload) {
+                //  The upload is completed, so import files
+                importStudiesInternal(studiesToImport, importCallback);
+
+                if (fileUploadStatus.numberOfFilesFailed > 0) {
+                    //TODO: Some files failed to upload, so let user know
+                    log.info("Failed to upload " + fileUploadStatus.numberOfFilesFailed + " of " + numberOfFilesToUpload + " files");
+                }
+            }
+        };
+
+        //  Failed to upload a file
+        xhr.onerror = function() {
+            updateFileUploadStatus(fileUploadStatus, false);
+        };
+
+        xhr.send(fileToUpload);
+    });
+};
+
+function updateFileUploadStatus(fileUploadStatus, isSuccess) {
+    if (!isSuccess) {
+        fileUploadStatus.numberOfFilesFailed++;
+    } else {
+        fileUploadStatus.numberOfFilesUploaded++;
+    }
+}
+function importStudiesInternal(studiesToImport, importCallback) {
+    if (!studiesToImport) {
+        return;
+    }
+
+    var numberOfStudiesToImport = studiesToImport.length;
+
+    progressDialog.show({
+        title: "Importing Studies...",
+        numberOfCompleted: 0,
+        numberOfTotal: numberOfStudiesToImport
+    });
+
+    //  Create/Insert a new study import status item
+    Meteor.call("createStudyImportStatus", function(err, studyImportStatusId) {
+        if (err) {
+            // Hide dialog
+            progressDialog.close();
+            console.log(err.message);
+            return;
+        }
+
+        //  Handle when StudyImportStatus collection is updated
+        StudyImportStatus.find(studyImportStatusId).observe({
+            changed: function(studyImportStatus) {
+                if (!studyImportStatus) {
+                    return;
+                }
+
+                var numberOfStudiesProcessedToImport = studyImportStatus.numberOfStudiesImported + studyImportStatus.numberOfStudiesFailed;
+
+                // Show number of imported files
+                var successMessage = 'Imported '+studyImportStatus.numberOfStudiesImported+' of '+numberOfStudiesToImport;
+                progressDialog.setMessage({
+                    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);
+
+                    //  Let the caller know that import operation is completed
+                    if (importCallback) {
+                        importCallback();
+                    }
+                }
+            }
+        });
+
+        //  Import studies with study import status id to get callbacks
+        Meteor.call("importStudies", studiesToImport, studyImportStatusId);
+    });
+}

Packages/worklist/client/lib/queryStudies.js

@@ -0,0 +1,48 @@
+/**
+ * Queries requested studies to get their metadata from PACS
+ * @param studiesToQuery Studies to query
+ * @param doneCallback Callback to call when the query is done
+ */
+queryStudies = function(studiesToQuery, doneCallback) {
+    if (studiesToQuery.length < 1) {
+        return;
+    }
+
+    var studiesQueried = [];
+    var numberOfStudiesToQuery = studiesToQuery.length;
+
+    progressDialog.show("Querying Studies...", numberOfStudiesToQuery);
+
+    studiesToQuery.forEach(function(studyToQuery) {
+        getStudyMetadata(studyToQuery.studyInstanceUid, function(study) {
+            studiesQueried.push(study);
+
+            var numberOfStudiesQueried = studiesQueried.length;
+
+            progressDialog.update(numberOfStudiesQueried);
+
+            if (numberOfStudiesQueried === numberOfStudiesToQuery) {
+                doneCallback(studiesQueried);
+            }
+        });
+    });
+};
+
+/**
+ * Returns the total number of dicom files in a study
+ * @param study Queried study (includes metadata)
+ * @returns {number}
+ */
+getNumberOfFilesInStudy = function(study) {
+    var numberOFFilesToExport = 0;
+
+    study.seriesList.forEach(function(series) {
+        series.instances.forEach(function(instance) {
+            if (instance.wadouri) {
+                numberOFFilesToExport++;
+            }
+        });
+    });
+
+    return numberOFFilesToExport;
+};

Packages/worklist/client/lib/switchToTab.js

@@ -20,7 +20,6 @@ switchToTab = function(contentId) {
     } else {
         $('.tab-content .tab-pane#' + contentId).addClass('active');
     }
-    
 
     // Remove any previous Viewers from the DOM
     $('.viewerContainer').remove();