Notes and dates (#133)

sadly the issues this resolves have not been created ;_; --------- Co-authored-by: kaggl <[email protected]>
acdh-oeaw · May 28, 2024 · b4e33d7 · b4e33d7
1 parent 4e36958
commit b4e33d7
Show file tree

Hide file tree

Showing 7 changed files with 1,378 additions and 290 deletions.
diff --git a/components/detail-disclosure.vue b/components/detail-disclosure.vue
@@ -32,12 +32,13 @@ const changeSort = (col: string) => {
 
 const currentRels = computed(() => {
 	let retRels = [...props.rels];
-	if (sortBy.value.includes(":rev")) {
+	const adjValue = sortBy.value.replace(/((?:start|end)_date)/g, "$1_iso");
+	if (adjValue.includes(":rev")) {
 		retRels = retRels.sort((a, b) =>
-			String(a[sortBy.value.split(":")[0]]) < String(b[sortBy.value.split(":")[0]]) ? 1 : -1,
+			String(a[adjValue.split(":")[0]]) < String(b[adjValue.split(":")[0]]) ? 1 : -1,
 		);
 	} else {
-		retRels = retRels.sort((a, b) => (String(a[sortBy.value]) < String(b[sortBy.value]) ? -1 : 1));
+		retRels = retRels.sort((a, b) => (String(a[adjValue]) < String(b[adjValue]) ? -1 : 1));
 	}
 	return retRels.slice(page.value * limit, (page.value + 1) * limit);
 });

diff --git a/locales/de.json b/locales/de.json
@@ -163,7 +163,8 @@
 			"institutions": "Institution",
 			"allowance": "Zahlungen",
 			"same_as": "Onlineressourcen",
-			"confession": "Konfession"
+			"confession": "Konfession",
+			"no-notes": "Keine Notizen vorhanden."
 		},
 		"viecpro_courts": {
 			"model": "Modell",

diff --git a/locales/en.json b/locales/en.json
@@ -162,7 +162,8 @@
 			"institutions": "Institution",
 			"allowance": "Allowance",
 			"same_as": "Online resources",
-			"confession": "Confession"
+			"confession": "Confession",
+			"no-notes": "No notes provided."
 		},
 		"viecpro_courts": {
 			"model": "Model",

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
 		"@headlessui-float/vue": "^0.13.3",
 		"@headlessui/vue": "^1.7.16",
 		"@nuxt/content": "^2.8.5",
-		"@nuxt/image": "npm:@nuxt/image-edge",
+		"@nuxt/image": "npm:@nuxt/image-edge@1.1.0-28344124.5284548",
 		"@nuxtjs/i18n": "^8.0.0",
 		"@tanstack/vue-query": "^5.17.2",
 		"@vueuse/core": "^10.7.1",

diff --git a/pages/detail/persons/[id].vue b/pages/detail/persons/[id].vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useQuery, useQueryClient } from "@tanstack/vue-query";
 import { isEmpty } from "lodash-es";
-import { BookOpenText, ExternalLink, Info } from "lucide-vue-next";
+import { ExternalLink, Info, StickyNote } from "lucide-vue-next";
 import type { SearchResponse } from "typesense/lib/Typesense/Documents";
 import { useRoute } from "vue-router";
 
@@ -67,7 +67,7 @@ definePageMeta({
 });
 
 const title = computed(() => {
-	if (data.value.entity.data?.name) return `${data.value.entity.data.fullname} - Person`;
+	if (!loading.value.entity) return `${data.value.entity.data.fullname} - Person`;
 	return "Person";
 });
 
@@ -124,16 +124,22 @@ useHead({
 							</template>
 						</InfoMenu>
 
-						<BookOpenText class="m-2 h-6 w-6 shrink-0 cursor-not-allowed opacity-50" />
-						<!-- <InfoMenu>
+						<InfoMenu class="text-base font-normal">
 							<template #button>
 								<button class="rounded-full transition hover:bg-slate-200 active:bg-slate-300">
 									<span class="sr-only">{{ t("collection-keys.viecpro_courts.sources") }}</span>
-									<BookOpenText class="m-2 h-6 w-6 shrink-0" />
+									<StickyNote class="m-2 h-6 w-6 shrink-0" />
 								</button>
 							</template>
-							<template #content> hehehehe </template>
-						</InfoMenu> -->
+							<template #content>
+								<div v-if="data.details.data.notes">
+									{{ data.details.data.notes }}
+								</div>
+								<div v-else class="italic">
+									{{ t("collection-keys.viecpro_persons.no-notes") }}
+								</div>
+							</template>
+						</InfoMenu>
 						<DownloadMenu detail :data="data" :collection="collection" />
 					</div>
 				</div>