Merge pull request #528 from uib-ub/tpw/display-gp-data

Tpw/display gp data
uib-ub · Oct 10, 2024 · 11571b8 · 11571b8
2 parents 9f75cd8 + 0c1f9f1
commit 11571b8
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/apps/sps-termportal-admin/pages/tasks/memberupdate.vue b/apps/sps-termportal-admin/pages/tasks/memberupdate.vue
@@ -28,7 +28,7 @@
       <h2 class="text-xl pb-3 font-semibold">Termgrupper</h2>
       <DataTable
         ref="datatable"
-        v-model:selection="selectedTermbase"
+        v-model:selection="selectedTermgroup"
         v-model:expandedRows="expandedRows"
         selection-mode="single"
         :value="termgroupProc"
@@ -68,7 +68,7 @@
         <Column header="">
           <template #body="slotProps">
             <AppLink
-              :to="`${studioBaseRoute}/group;${slotProps.data.id}`"
+              :to="`${studioBaseRoute}/group;${slotProps.data._id}`"
               target="_blank"
               class="hover:bg-gray-100 p-1 rounded"
             >
@@ -148,7 +148,7 @@
 <script setup lang="ts">
 const datatable = ref();
 const expandedRows = ref();
-const selectedTermbase = ref();
+const selectedTermgroup = ref();
 
 const queryActivity = `
 *[_type == "activity"

diff --git a/apps/sps-termportal-web/components/termpost/Base.vue b/apps/sps-termportal-web/components/termpost/Base.vue
@@ -7,7 +7,7 @@
       <h2
         v-if="pagetitle"
         :id="mainp ? '#main' : `#${encodeURI(pagetitle)}`"
-        class="pb-4 mt-3 md:mt-4 lg:mt-6"
+        class="pb-0 xl:pb-4 mt-3 md:mt-4 lg:mt-6"
       >
         <AppLink
           class="text-3xl"
@@ -37,7 +37,7 @@
             :pagetitle="pagetitle"
           />
         </div>
-        <div class="grid gap-y-7 shrink-0 lg:shrink lg:min-w-[30em]">
+        <div class="grid gap-y-3 lg:gap-y-4 shrink-0 lg:shrink lg:min-w-[30em]">
           <div
             v-for="lang in displayInfo?.displayLanguages"
             :key="'disp_' + lang"

diff --git a/apps/sps-termportal-web/components/termpost/TermDescription.vue b/apps/sps-termportal-web/components/termpost/TermDescription.vue
@@ -4,7 +4,7 @@
     :key="d + 'key'"
     class="px-2"
     :class="{
-      'border-l-solid my-1 border-2 border-transparent border-l-gray-300 border-r-transparent hover:border-l-tpblue-200':
+      'border-l-solid my-1 lg:my-2 pt-[0px] border-2 border-transparent border-l-gray-300 border-r-transparent hover:border-l-tpblue-200':
         !flex,
     }"
   >
@@ -25,7 +25,8 @@
     </div>
     <dl
       v-if="
-        (d?.note ||
+        (d?.audience ||
+          d?.note ||
           d?.scopeNote ||
           d?.isOfAbbreviationType ||
           d?.isAbbreviationOf ||
@@ -38,7 +39,7 @@
         prop !== 'equivalencenote'
       "
       class="grid-col-3 flex max-w-prose flex-wrap gap-x-8 gap-y-1"
-      :class="{ 'mt-4': mainValue(d) }"
+      :class="{ 'mt-1.5': mainValue(d) }"
     >
       <TermpostTermProp
         v-if="d.isOfAbbreviationType"
@@ -100,6 +101,13 @@
           v-html="d.source?.['@value']"
         />
       </TermpostTermProp>
+      <!-- audience -->
+      <TermpostTermProp v-if="d?.audience" :label="$t('id.audience')">
+        <dd class="max-w-prose">
+          {{ $t("global.audience." + d?.audience) }}
+        </dd>
+      </TermpostTermProp>
+
       <!-- note -->
       <TermpostTermProp v-if="d.note" :label="$t('id.note')">
         <dd

diff --git a/apps/sps-termportal-web/locales/en.json b/apps/sps-termportal-web/locales/en.json
@@ -92,6 +92,10 @@
       "delvis": "partial equivalence to",
       "bredere": "Broader intension than",
       "smalere": "Narrower intension than"
+    },
+    "audience": {
+      "termportalen:gp:prefLabel": "Recommended for general practitioner",
+      "termportalen:gp:altLabel": "Allowed for general practitioner"
     }
   },
   "domainOverview": { "domainsAndBases": "Domains & Termbases" },
@@ -192,7 +196,8 @@
     "visualization": "Visualization",
     "imageAltLabel": "Visualization of the concept",
     "version": "Version",
-    "browser": "External browser"
+    "browser": "External browser",
+    "audience": "Audience note"
   },
   "index": { "title": "Termportalen" },
   "search": {

diff --git a/apps/sps-termportal-web/locales/nb.json b/apps/sps-termportal-web/locales/nb.json
@@ -92,6 +92,10 @@
       "delvis": "delvis ekvivalens med",
       "bredere": "bredere intensjon enn",
       "smalere": "smalare intensjon enn"
+    },
+    "audience": {
+      "termportalen:gp:prefLabel": "Anbefalt for allmennlege",
+      "termportalen:gp:altLabel": "Tillatt for allmennlege"
     }
   },
   "domainOverview": { "domainsAndBases": "Domener og termbaser" },
@@ -193,7 +197,8 @@
     "visualization": "Visualisering",
     "imageAltLabel": "Visualisering av begrepet",
     "version": "Versjon",
-    "browser": "Ekstern nettleser"
+    "browser": "Ekstern nettleser",
+    "audience": "Målgruppemerknad"
   },
   "index": { "title": "Termportalen" },
   "search": {

diff --git a/apps/sps-termportal-web/locales/nn.json b/apps/sps-termportal-web/locales/nn.json
@@ -93,6 +93,10 @@
       "delvis": "delvis ekvivalens til",
       "bredere": "breiare intensjon enn",
       "smalere": "smalare intensjon enn"
+    },
+    "audience": {
+      "termportalen:gp:prefLabel": "Anbefalt for allmennlege",
+      "termportalen:gp:altLabel": "Tillatt for allmennlege"
     }
   },
   "domainOverview": { "domainsAndBases": "Domene og termbasar" },
@@ -193,7 +197,8 @@
     "visualization": "Visualisering",
     "imageAltLabel": "Visualisering av omgrepet",
     "version": "Versjon",
-    "browser": "Ekstern nettlesar"
+    "browser": "Ekstern nettlesar",
+    "audience": "Målgruppemerknad"
   },
   "index": { "title": "Termportalen" },
   "search": {

diff --git a/apps/sps-termportal-web/server/utils/frameData.ts b/apps/sps-termportal-web/server/utils/frameData.ts
@@ -60,6 +60,7 @@ export default function (
       },
       contactPoint: "dcat:contactPoint",
       hasTelephone: "vcard:hasTelephone",
+      audience: { "@id": "dct:audience", "@type": "@id" },
       hasEmail: { "@id": "vcard:hasEmail", "@type": "@id" },
       domene: { "@id": "skosp:domene", "@type": "@id" },
       publisere: { "@id": "skosp:publisere", "@type": "xsd:boolean" },