From 9798d0975cafc35ebec8ee7592d7c2c7360108b0 Mon Sep 17 00:00:00 2001 From: zsomborfoldi <96750736+zsomborfoldi@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:25:13 +0100 Subject: [PATCH] Provenances sort add (#427) * Provenances_sort_add * reformatting * set false as default --------- Co-authored-by: fsimonjetz --- src/corpus/domain/provenance.ts | 121 +++++++++--------- .../ui/fragment/ArchaeologyEditor.tsx | 2 +- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/src/corpus/domain/provenance.ts b/src/corpus/domain/provenance.ts index 92f247b02..42f8594f3 100644 --- a/src/corpus/domain/provenance.ts +++ b/src/corpus/domain/provenance.ts @@ -2,126 +2,127 @@ export const Provenances = { 'Standard Text': { name: 'Standard Text', abbreviation: 'Std', parent: null }, Assyria: { name: 'Assyria', abbreviation: 'Assa', parent: null }, Aššur: { name: 'Aššur', abbreviation: 'Ašš', parent: 'Assyria' }, - Ḫuzirina: { name: 'Ḫuzirina', abbreviation: 'Huz', parent: 'Assyria' }, - Kalḫu: { name: 'Kalḫu', abbreviation: 'Kal', parent: 'Assyria' }, - Khorsabad: { name: 'Khorsabad', abbreviation: 'Kho', parent: 'Assyria' }, - Nineveh: { name: 'Nineveh', abbreviation: 'Nin', parent: 'Assyria' }, - Tarbiṣu: { name: 'Tarbiṣu', abbreviation: 'Tar', parent: 'Assyria' }, - Babylonia: { name: 'Babylonia', abbreviation: 'Baba', parent: null }, - Babylon: { name: 'Babylon', abbreviation: 'Bab', parent: 'Babylonia' }, - Borsippa: { name: 'Borsippa', abbreviation: 'Bor', parent: 'Babylonia' }, - Cutha: { name: 'Cutha', abbreviation: 'Cut', parent: 'Babylonia' }, - Dilbat: { name: 'Dilbat', abbreviation: 'Dil', parent: 'Babylonia' }, - Isin: { name: 'Isin', abbreviation: 'Isn', parent: 'Babylonia' }, - Kiš: { name: 'Kiš', abbreviation: 'Kiš', parent: 'Babylonia' }, - Larsa: { name: 'Larsa', abbreviation: 'Lar', parent: 'Babylonia' }, - Meturan: { name: 'Meturan', abbreviation: 'Met', parent: 'Babylonia' }, - Nērebtum: { name: 'Nērebtum', abbreviation: 'Nēr', parent: 'Babylonia' }, - Nippur: { name: 'Nippur', abbreviation: 'Nip', parent: 'Babylonia' }, - Sippar: { name: 'Sippar', abbreviation: 'Sip', parent: 'Babylonia' }, - Šaduppûm: { name: 'Šaduppûm', abbreviation: 'Šad', parent: 'Babylonia' }, - Ur: { name: 'Ur', abbreviation: 'Ur', parent: 'Babylonia' }, - Uruk: { name: 'Uruk', abbreviation: 'Urk', parent: 'Babylonia' }, - Periphery: { name: 'Periphery', abbreviation: '', parent: null }, - Alalakh: { name: 'Alalakh', abbreviation: 'Ala', parent: 'Periphery' }, - 'Tell el-Amarna': { - name: 'Tell el-Amarna', - abbreviation: 'Ama', - parent: 'Periphery', - }, - Emar: { name: 'Emar', abbreviation: 'Emr', parent: 'Periphery' }, - Ḫattuša: { name: 'Ḫattuša', abbreviation: 'Hat', parent: 'Periphery' }, - Mari: { name: 'Mari', abbreviation: 'Mar', parent: 'Periphery' }, - Megiddo: { name: 'Megiddo', abbreviation: 'Meg', parent: 'Periphery' }, - Susa: { name: 'Susa', abbreviation: 'Sus', parent: 'Periphery' }, - Ugarit: { name: 'Ugarit', abbreviation: 'Uga', parent: 'Periphery' }, 'Dūr-Katlimmu': { name: 'Dūr-Katlimmu', abbreviation: 'Dka', parent: 'Assyria', }, + Guzana: { name: 'Guzana', abbreviation: 'Guz', parent: 'Assyria' }, Ḫarrān: { name: 'Ḫarrān', abbreviation: 'Har', parent: 'Assyria' }, + Ḫuzirina: { name: 'Ḫuzirina', abbreviation: 'Huz', parent: 'Assyria' }, 'Imgur-Enlil': { name: 'Imgur-Enlil', abbreviation: 'Img', parent: 'Assyria', }, + Kalḫu: { name: 'Kalḫu', abbreviation: 'Kal', parent: 'Assyria' }, 'Kār-Tukulti-Ninurta': { name: 'Kār-Tukulti-Ninurta', abbreviation: 'Ktn', parent: 'Assyria', }, + Khorsabad: { name: 'Khorsabad', abbreviation: 'Kho', parent: 'Assyria' }, + Nineveh: { name: 'Nineveh', abbreviation: 'Nin', parent: 'Assyria' }, 'Šubat-Enlil': { name: 'Šubat-Enlil', abbreviation: 'Šub', parent: 'Assyria', }, - Guzana: { name: 'Guzana', abbreviation: 'Guz', parent: 'Assyria' }, + Tarbiṣu: { name: 'Tarbiṣu', abbreviation: 'Tar', parent: 'Assyria' }, + Babylonia: { name: 'Babylonia', abbreviation: 'Baba', parent: null }, Adab: { name: 'Adab', abbreviation: 'Adb', parent: 'Babylonia' }, - Ešnunna: { name: 'Ešnunna', abbreviation: 'Ešn', parent: 'Babylonia' }, - Girsu: { name: 'Girsu', abbreviation: 'Gir', parent: 'Babylonia' }, - Lagaš: { name: 'Lagaš', abbreviation: 'Lag', parent: 'Babylonia' }, - Nigin: { name: 'Nigin', abbreviation: 'Nig', parent: 'Babylonia' }, - 'Sippar-Amnānum': { - name: 'Sippar-Amnānum', - abbreviation: 'Sipam', - parent: 'Babylonia', - }, - Šuruppak: { name: 'Šuruppak', abbreviation: 'Šur', parent: 'Babylonia' }, - Ḫursagkalama: { - name: 'Ḫursagkalama', - abbreviation: 'Hur', - parent: 'Babylonia', - }, - Tutub: { name: 'Tutub', abbreviation: 'Ttb', parent: 'Babylonia' }, - Umma: { name: 'Umma', abbreviation: 'Umm', parent: 'Babylonia' }, - Zabalam: { name: 'Zabalam', abbreviation: 'Zab', parent: 'Babylonia' }, + Babylon: { name: 'Babylon', abbreviation: 'Bab', parent: 'Babylonia' }, 'Bad-Tibira': { name: 'Bad-Tibira', abbreviation: 'Btb', parent: 'Babylonia', }, + Borsippa: { name: 'Borsippa', abbreviation: 'Bor', parent: 'Babylonia' }, + Cutha: { name: 'Cutha', abbreviation: 'Cut', parent: 'Babylonia' }, + Dilbat: { name: 'Dilbat', abbreviation: 'Dil', parent: 'Babylonia' }, 'Dūr-Kurigalzu': { name: 'Dūr-Kurigalzu', abbreviation: 'Dku', parent: 'Babylonia', }, Eridu: { name: 'Eridu', abbreviation: 'Eri', parent: 'Babylonia' }, + Ešnunna: { name: 'Ešnunna', abbreviation: 'Ešn', parent: 'Babylonia' }, Garšana: { name: 'Garšana', abbreviation: 'Gar', parent: 'Babylonia' }, + Girsu: { name: 'Girsu', abbreviation: 'Gir', parent: 'Babylonia' }, + Ḫursagkalama: { + name: 'Ḫursagkalama', + abbreviation: 'Hur', + parent: 'Babylonia', + }, Irisagrig: { name: 'Irisagrig', abbreviation: 'Irs', parent: 'Babylonia' }, + Isin: { name: 'Isin', abbreviation: 'Isn', parent: 'Babylonia' }, Kisurra: { name: 'Kisurra', abbreviation: 'Ksr', parent: 'Babylonia' }, + Kiš: { name: 'Kiš', abbreviation: 'Kiš', parent: 'Babylonia' }, Kutalla: { name: 'Kutalla', abbreviation: 'Kut', parent: 'Babylonia' }, + Lagaš: { name: 'Lagaš', abbreviation: 'Lag', parent: 'Babylonia' }, + Larak: { name: 'Larak', abbreviation: 'Lrk', parent: 'Babylonia' }, + Larsa: { name: 'Larsa', abbreviation: 'Lar', parent: 'Babylonia' }, + Malgium: { name: 'Malgium', abbreviation: 'Mal', parent: 'Babylonia' }, Marad: { name: 'Marad', abbreviation: 'Mrd', parent: 'Babylonia' }, 'Maškan-šāpir': { name: 'Maškan-šāpir', abbreviation: 'Maš', parent: 'Babylonia', }, + Meturan: { name: 'Meturan', abbreviation: 'Met', parent: 'Babylonia' }, + Nērebtum: { name: 'Nērebtum', abbreviation: 'Nēr', parent: 'Babylonia' }, + Nigin: { name: 'Nigin', abbreviation: 'Nig', parent: 'Babylonia' }, + Nippur: { name: 'Nippur', abbreviation: 'Nip', parent: 'Babylonia' }, + 'Pī-Kasî': { name: 'Pī-Kasî', abbreviation: 'Pik', parent: 'Babylonia' }, 'Puzriš-Dagān': { name: 'Puzriš-Dagān', abbreviation: 'Puz', parent: 'Babylonia', }, - Larak: { name: 'Larak', abbreviation: 'Lrk', parent: 'Babylonia' }, - 'Pī-Kasî': { name: 'Pī-Kasî', abbreviation: 'Pik', parent: 'Babylonia' }, - Malgium: { name: 'Malgium', abbreviation: 'Mal', parent: 'Babylonia' }, - Pašime: { name: 'Pašime', abbreviation: 'Paš', parent: 'Periphery' }, - Tuttul: { name: 'Tuttul', abbreviation: 'Ttl', parent: 'Periphery' }, - Elam: { name: 'Elam', abbreviation: 'Elam', parent: 'Periphery' }, + Sippar: { name: 'Sippar', abbreviation: 'Sip', parent: 'Babylonia' }, + 'Sippar-Amnānum': { + name: 'Sippar-Amnānum', + abbreviation: 'Sipam', + parent: 'Babylonia', + }, + Šaduppûm: { name: 'Šaduppûm', abbreviation: 'Šad', parent: 'Babylonia' }, + Šaḫrīnu: { name: 'Šaḫrīnu', abbreviation: 'Šah', parent: 'Babylonia' }, + Šuruppak: { name: 'Šuruppak', abbreviation: 'Šur', parent: 'Babylonia' }, + Tutub: { name: 'Tutub', abbreviation: 'Ttb', parent: 'Babylonia' }, + Umma: { name: 'Umma', abbreviation: 'Umm', parent: 'Babylonia' }, + Ur: { name: 'Ur', abbreviation: 'Ur', parent: 'Babylonia' }, + Uruk: { name: 'Uruk', abbreviation: 'Urk', parent: 'Babylonia' }, + Zabalam: { name: 'Zabalam', abbreviation: 'Zab', parent: 'Babylonia' }, + Periphery: { name: 'Periphery', abbreviation: '', parent: null }, + Alalakh: { name: 'Alalakh', abbreviation: 'Ala', parent: 'Periphery' }, + 'Tell el-Amarna': { + name: 'Tell el-Amarna', + abbreviation: 'Ama', + parent: 'Periphery', + }, Anšan: { name: 'Anšan', abbreviation: 'Anš', parent: 'Periphery' }, Dēr: { name: 'Dēr', abbreviation: 'Der', parent: 'Periphery' }, 'Dūr-Untaš': { name: 'Dūr-Untaš', abbreviation: 'Dun', parent: 'Periphery' }, Ebla: { name: 'Ebla', abbreviation: 'Ebl', parent: 'Periphery' }, + Elam: { name: 'Elam', abbreviation: 'Elam', parent: 'Periphery' }, + Emar: { name: 'Emar', abbreviation: 'Emr', parent: 'Periphery' }, + Ḫattuša: { name: 'Ḫattuša', abbreviation: 'Hat', parent: 'Periphery' }, Kaneš: { name: 'Kaneš', abbreviation: 'Kan', parent: 'Periphery' }, Karkemiš: { name: 'Karkemiš', abbreviation: 'Kar', parent: 'Periphery' }, + Mari: { name: 'Mari', abbreviation: 'Mar', parent: 'Periphery' }, + Megiddo: { name: 'Megiddo', abbreviation: 'Meg', parent: 'Periphery' }, + Pašime: { name: 'Pašime', abbreviation: 'Paš', parent: 'Periphery' }, Persepolis: { name: 'Persepolis', abbreviation: 'Per', parent: 'Periphery' }, - Terqa: { name: 'Terqa', abbreviation: 'Ter', parent: 'Periphery' }, + Qaṭnā: { name: 'Qaṭnā', abbreviation: 'Qaṭ', parent: 'Periphery' }, + Susa: { name: 'Susa', abbreviation: 'Sus', parent: 'Periphery' }, 'Tepe Gotvand': { name: 'Tepe Gotvand', abbreviation: 'Tgo', parent: 'Periphery', }, - Qaṭnā: { name: 'Qaṭnā', abbreviation: 'Qaṭ', parent: 'Periphery' }, + Terqa: { name: 'Terqa', abbreviation: 'Ter', parent: 'Periphery' }, + Tuttul: { name: 'Tuttul', abbreviation: 'Ttl', parent: 'Periphery' }, + Ugarit: { name: 'Ugarit', abbreviation: 'Uga', parent: 'Periphery' }, Uncertain: { name: 'Uncertain', abbreviation: 'Unc', parent: null }, } as const export type Provenance = typeof Provenances[keyof typeof Provenances] diff --git a/src/fragmentarium/ui/fragment/ArchaeologyEditor.tsx b/src/fragmentarium/ui/fragment/ArchaeologyEditor.tsx index 723a891b3..6736edca4 100644 --- a/src/fragmentarium/ui/fragment/ArchaeologyEditor.tsx +++ b/src/fragmentarium/ui/fragment/ArchaeologyEditor.tsx @@ -60,7 +60,7 @@ class ArchaeologyEditor extends Component { this.state = { excavationNumber: archaeology.excavationNumber || '', site: (archaeology.site?.name || '') as SiteKey, - isRegularExcavation: archaeology.isRegularExcavation ?? true, + isRegularExcavation: archaeology.isRegularExcavation ?? false, error: null, findspotId: archaeology.findspotId || null, findspot: archaeology.findspot || null,