From 2c8930384112d61a47349acfe84dc47b27aeeb6c Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 6 Sep 2016 19:33:10 +0800 Subject: [PATCH 1/8] change default study level instance number to undefined --- .../worklist/client/components/worklistResult/worklistResult.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js index 3f8301ed9..c44dd8a8b 100644 --- a/Packages/worklist/client/components/worklistResult/worklistResult.js +++ b/Packages/worklist/client/components/worklistResult/worklistResult.js @@ -167,7 +167,7 @@ function search() { (convertStringToStudyDate(study.studyDate) <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === '')) { // Convert numberOfStudyRelatedInstance string into integer - study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : 0; + study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined; // Insert any matching studies into the WorklistStudies Collection WorklistStudies.insert(study); From f411d984228e45bf9c587e67da3cc04cefbc4cd1 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 7 Sep 2016 02:29:32 +0800 Subject: [PATCH 2/8] added modality attribute to displayset --- Packages/viewerbase/lib/createStacks.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/viewerbase/lib/createStacks.js b/Packages/viewerbase/lib/createStacks.js index e5c53b6c2..9be7c9f97 100644 --- a/Packages/viewerbase/lib/createStacks.js +++ b/Packages/viewerbase/lib/createStacks.js @@ -75,7 +75,8 @@ function makeDisplaySet(series, instances) { seriesDescription: series.seriesDescription, numImageFrames: instances.length, frameRate: instance.frameTime, - images: instances + images: instances, + modality: series.modality }; // Sort the images in this series From 69e0e30a2a154cc1f315f40042f51e0eb96bac3f Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 7 Sep 2016 19:49:05 +0800 Subject: [PATCH 3/8] expose addMetaData in viewerbase --- Packages/viewerbase/package.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index 68f61f9dc..9c5dfec4e 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -171,6 +171,7 @@ Package.onUse(function(api) { api.export('toggleDialog', 'client'); api.export('isImage', 'client'); api.export('sopClassDictionary', 'client'); + api.export('addMetaData', 'client'); // Viewer management objects api.export('toolManager', 'client'); From 1879fb1b0b8b14326b28ca4d1441dcab9e156fc9 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 7 Sep 2016 20:57:11 +0800 Subject: [PATCH 4/8] move showConfirmDialog from lesiontracker to viewerbase --- .../viewer}/confirmDeleteDialog/confirmDeleteDialog.html | 0 .../components/viewer}/confirmDeleteDialog/confirmDeleteDialog.js | 0 .../viewer}/confirmDeleteDialog/confirmDeleteDialog.styl | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Packages/{lesiontracker/client/components => viewerbase/client/components/viewer}/confirmDeleteDialog/confirmDeleteDialog.html (100%) rename Packages/{lesiontracker/client/components => viewerbase/client/components/viewer}/confirmDeleteDialog/confirmDeleteDialog.js (100%) rename Packages/{lesiontracker/client/components => viewerbase/client/components/viewer}/confirmDeleteDialog/confirmDeleteDialog.styl (100%) diff --git a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html b/Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.html similarity index 100% rename from Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html rename to Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.html diff --git a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js b/Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.js similarity index 100% rename from Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js rename to Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.js diff --git a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.styl b/Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.styl similarity index 100% rename from Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.styl rename to Packages/viewerbase/client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.styl From 37929ca98921ab66d6a0ca4291e888157e24bb5e Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 7 Sep 2016 21:10:53 +0800 Subject: [PATCH 5/8] add showConfirmDialog necessary files --- Packages/viewerbase/package.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index 9c5dfec4e..77c7ab8ad 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -119,6 +119,10 @@ Package.onUse(function(api) { api.addFiles('client/components/viewer/playClipButton/playClipButton.html', 'client'); api.addFiles('client/components/viewer/playClipButton/playClipButton.js', 'client'); + api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); + api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.html', 'client'); + api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.styl', 'client'); + // Library functions api.addFiles('lib/layoutManager.js', 'client'); api.addFiles('lib/createStacks.js', 'client'); From 72ea5d1a2d33e9fd82a9f4198e7c55e12d28ee8e Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 7 Sep 2016 21:12:29 +0800 Subject: [PATCH 6/8] add showConfirmDialog necessary files --- Packages/viewerbase/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index 77c7ab8ad..2a124e37e 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -119,8 +119,8 @@ Package.onUse(function(api) { api.addFiles('client/components/viewer/playClipButton/playClipButton.html', 'client'); api.addFiles('client/components/viewer/playClipButton/playClipButton.js', 'client'); - api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.html', 'client'); + api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); api.addFiles('client/components/viewer/confirmDeleteDialog/confirmDeleteDialog.styl', 'client'); // Library functions From c6690781f884243b2692a46221bd81a5d9009af0 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Fri, 9 Sep 2016 08:45:39 -0300 Subject: [PATCH 7/8] LT-67: Fixing broken lesiontracker package --- LesionTracker/bin/orthancDICOMWeb.bat | 2 +- Packages/lesiontracker/package.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/LesionTracker/bin/orthancDICOMWeb.bat b/LesionTracker/bin/orthancDICOMWeb.bat index a0677c9ee..443d30677 100644 --- a/LesionTracker/bin/orthancDICOMWeb.bat +++ b/LesionTracker/bin/orthancDICOMWeb.bat @@ -1,2 +1,2 @@ -PACKAGE_DIRS=..\Packages +set PACKAGE_DIRS=..\Packages meteor --settings ../config/orthancDICOMWeb.json \ No newline at end of file diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index 8fc480663..92b42e008 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -197,10 +197,6 @@ Package.onUse(function(api) { api.addFiles('client/components/lastLoginModal/lastLoginModal.html', 'client'); - api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.html', 'client'); - api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.styl', 'client'); - api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); - api.addFiles('client/components/emailVerification/emailVerification.html', 'client'); api.addFiles('client/components/emailVerification/emailVerification.styl', 'client'); api.addFiles('client/components/emailVerification/emailVerification.js', 'client'); From 92728c41004645ffef9cdde2908032a1fddddf78 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Fri, 9 Sep 2016 08:50:53 -0300 Subject: [PATCH 8/8] LT-67: Re-validating fields on change only if the form validation has already been called --- Packages/ohif-core/client/components/base/mixins/form.js | 6 ++++++ .../ohif-core/client/components/base/mixins/formItem.js | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Packages/ohif-core/client/components/base/mixins/form.js b/Packages/ohif-core/client/components/base/mixins/form.js index ab9bfbeb0..77ac0edfb 100644 --- a/Packages/ohif-core/client/components/base/mixins/form.js +++ b/Packages/ohif-core/client/components/base/mixins/form.js @@ -17,6 +17,9 @@ OHIF.mixins.form = new OHIF.Mixin({ // Set the form identifier flag component.isForm = true; + // Set the form validated flag + component.isValidatedAlready = false; + component.validationObserver = new Tracker.Dependency(); // Reset the pathKey @@ -34,6 +37,9 @@ OHIF.mixins.form = new OHIF.Mixin({ // Call the original validation function validateSelf(); + // Change the form validated flag to true + component.isValidatedAlready = true; + // Focus the first error field if some validation failed if (component.schema && component.schema._invalidKeys.length) { instance.$('.state-error :input:first').focus(); diff --git a/Packages/ohif-core/client/components/base/mixins/formItem.js b/Packages/ohif-core/client/components/base/mixins/formItem.js index 88b7c4ae8..41632c4b4 100644 --- a/Packages/ohif-core/client/components/base/mixins/formItem.js +++ b/Packages/ohif-core/client/components/base/mixins/formItem.js @@ -235,8 +235,11 @@ OHIF.mixins.formItem = new OHIF.Mixin({ // Enable reactivity by changing a Tracker.Dependency observer component.changeObserver.changed(); - // Revalidate the component - component.validate(); + const form = component.getForm(); + if (form && form.isValidatedAlready) { + // Revalidate the component if form is already validated + component.validate(); + } } },