added a button to share multiple studies at once

orthanc-server · Nov 27, 2023 · 62dfd76 · 62dfd76
1 parent ea2ad07
commit 62dfd76
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/WebApplication/src/components/ResourceButtonGroup.vue b/WebApplication/src/components/ResourceButtonGroup.vue
@@ -192,6 +192,13 @@ export default {
                 return true;
             }
         },
+        isShareEnabled() {
+            if (this.resourceLevel == 'bulk') {
+                return this.selectedStudiesIds.length > 0
+            } else {
+                return true;
+            }
+        },
         hasWsiButton() {
             if (this.resourceLevel != 'series' || !("wsi" in this.installedPlugins)) {
                 return false;
@@ -530,9 +537,9 @@ export default {
                 :cancelText="$t('cancel')" :bodyText="$t(this.deleteResourceBody)" @ok="deleteResource($event)">
             </Modal>
         </div>
-        <div class="btn-group" v-if="this.resourceLevel != 'bulk'">
+        <div class="btn-group">
             <button v-if="uiOptions.EnableShares" class="btn btn-sm btn-secondary m-1" type="button" data-bs-toggle="modal"
-                v-bind:data-bs-target="'#share-modal-' + this.resourceOrthancId">
+                v-bind:data-bs-target="'#share-modal-' + this.resourceOrthancId" :disabled="!isShareEnabled">
                 <i class="bi bi-share" data-bs-toggle="tooltip" :title="$t('share.button_title')"></i>
             </button>
             <ShareModal v-if="uiOptions.EnableShares" :id="'share-modal-' + this.resourceOrthancId"

diff --git a/WebApplication/src/components/ShareModal.vue b/WebApplication/src/components/ShareModal.vue
@@ -39,9 +39,13 @@ export default {
             return "" + duration + " " +  this.$i18n.t('share.days');
         },
         async share() {
+            let resourcesIds = [this.orthancId];
+            if (this.isBulkSelection) {
+                resourcesIds = this.selectedStudiesIds;
+            }
             let token = await api.createToken({
                 tokenType: this.tokens.ShareType,  // defined in configuration file
-                resourcesIds: [this.orthancId], 
+                resourcesIds: resourcesIds, 
                 level: 'study', 
                 validityDuration: this.expirationInDays * 24 * 3600
             })
@@ -55,9 +59,20 @@ export default {
         ...mapState({
             uiOptions: state => state.configuration.uiOptions,
             tokens: state => state.configuration.tokens,
+            selectedStudiesIds: state => state.studies.selectedStudiesIds,
         }),
+        isBulkSelection() {
+            return !(this.patientMainDicomTags && this.studyMainDicomTags && Object.keys(this.patientMainDicomTags).length > 0 && Object.keys(this.studyMainDicomTags).length > 0);
+        },
         resourceTitle() {
-            return resourceHelpers.getResourceTitle("study", this.patientMainDicomTags, this.studyMainDicomTags, null, null);
+            if (!this.isBulkSelection) {
+                return resourceHelpers.getResourceTitle("study", this.patientMainDicomTags, this.studyMainDicomTags, null, null);
+            } else {
+                return "";
+            }
+        },
+        studiesCount() {
+            return this.selectedStudiesIds.length;
         }
     },
     components: { CopyToClipboardButton }
@@ -71,7 +86,8 @@ export default {
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="modalLabel">{{ $t("share.modal_title") + " " + resourceTitle }} </h5>
+                    <h5 class="modal-title" id="modalLabel" v-if="!isBulkSelection">{{ $t("share.modal_title") + " " + resourceTitle }} </h5>
+                    <h5 class="modal-title" id="modalLabel" v-if="isBulkSelection">{{ $t("share.modal_title_multiple_studies", { count: studiesCount}) }} </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">

diff --git a/WebApplication/src/locales/en.json b/WebApplication/src/locales/en.json
@@ -176,6 +176,7 @@
         "expires_in": "Expires in",
         "link": "Link",
         "modal_title": "Share study",
+        "modal_title_multiple_studies": "Share {count} studies",
         "never": "never"
     },
     "show_errors": "Show errors",

diff --git a/WebApplication/src/locales/fr.json b/WebApplication/src/locales/fr.json
@@ -176,6 +176,7 @@
         "expires_in": "Expire dans",
         "link": "Lien",
         "modal_title": "Partager l'examen",
+        "modal_title_multiple_studies": "Partager {count} examens",
         "never": "jamais"
     },
     "show_errors": "Afficher les erreurs",

diff --git a/release-notes.md b/release-notes.md
@@ -8,6 +8,7 @@ Changes:
 - new configuration "UiOptions.ShowSamePatientStudiesFilter" to list the tags that 
   are used to identify studies belonging to the same patient.
 - added Russian translations
+- added a button to share multiple studies at once.
 
 
 1.1.3 (2023-10-04)