Merge pull request #8 from BBMRI-ERIC/feat/canserv-third-open-call

Opening of third open call

package.json

@@ -1,7 +1,7 @@
 {
   "name": "molgenis-app-canserv-explorer",
   "license": "LGPL-3.0",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Vue application for the CanSERV service explorer; A card detail view on BBMRI-ERIC service providers / service data. Based on molgenis-app-biobank-explorer version 7.20.0",
   "scripts": {
     "serve": "vue-cli-service serve",

src/components/popovers/NegotiatorSelection.vue

@@ -11,7 +11,7 @@
     v-model="cartVisible"
     @hide="cartVisible = false">
 
-    <template v-if="selectedCollections.length > 1">
+    <template v-if="selectedCollections.length > 0">
       <div
         class="card mb-3 border"
         :key="`${cart.biobankLabel}-${index}`"
@@ -48,7 +48,7 @@
       </div>
     </template>
     <template v-else>
-      <p>Please select at least 2 services to proceed.</p>
+      <p>Please select at least one service to proceed.</p>
     </template>
     <p v-if="isPodium && !collectionsInPodium.length">
       Sorry, none of the samples are currently in Podium.
@@ -72,8 +72,21 @@
       </div>
       <!-- check if URL param "aria_pid" is present using this.$route.query
         if so, only display the button to forward to ARIA for this pid, otherwise display all available pids with info buttons form the website -->
-      <div class="ml-auto text-white font-weight-bold d-block" style="font-weight: bold;font-size: large;">
-        There is no call open at the moment by canSERV.
+        <div class="ml-auto">
+        <b-button
+          :disabled="
+            (isPodium && !collectionsInPodium.length) ||
+            selectedCollections.length < 1
+          "
+          class="btn btn-secondary ml-auto"
+          @click="sendRequest3rdOpenCall">{{ negotiatorOpenCall3ButtonText }}
+        </b-button>
+        <button type="button" class="btn btn-primary" @click="openInNewTab('https://www.canserv.eu/calls/open-call-for-transnational-service-provision/')">
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-square" viewBox="0 0 16 16">
+                  <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"></path>
+                  <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0"></path>
+                </svg>
+        </button>
       </div>
     </template>
   </b-modal>
@@ -158,6 +171,10 @@ export default {
       this.cartVisible = false
       this.SendToARIAwithCID({ ARIAcid: 'canserv-2nd-challenge---driven-call' })
     },
+    sendRequest3rdOpenCall () {
+      this.cartVisible = false
+      this.SendToARIAwithCID({ ARIAcid: 'canserv-third-open-call' })
+    },
     sendRequest3rdChallengeCall () {
       this.cartVisible = false
       this.SendToARIAwithCID({ ARIAcid: 'canserv-3rd-challenge-driven-call' })
@@ -213,6 +230,9 @@ export default {
     negotiatorChallengeCall3ButtonText () {
       return this.isPodium ? this.uiText.send_to_podium : this.uiText.send_to_aria_challenge_call_3
     },
+    negotiatorOpenCall3ButtonText () {
+      return this.isPodium ? this.uiText.send_to_podium : this.uiText.send_to_aria_open_call_3
+    },
     currentSelectedCollections () {
       return this.isPodium ? this.collectionsInPodium : this.selectedCollections
     },

src/config/i18n.js

@@ -16,6 +16,7 @@ const i18n = {
     send_to_aria_open_call: 'Apply through open call until 21st May',
     send_to_aria_challenge_call_x: 'Apply through challenge-driven call: "Reaching an Understanding of Cancer"',
     send_to_aria_challenge_call_3: 'Apply through challenge-driven call: "Revolutionising Cancer Patient Care"',
+    send_to_aria_open_call_3: 'Apply through Open Call',
     send_to_podium: 'Send to Podium',
     card_biobank_details: 'View Service Provider',
     card_collections_details: 'View Services',