diff --git a/nginx/ams/weko-frontend/app.config.ts b/nginx/ams/weko-frontend/app.config.ts index e38ac33a0b..96dda29fe7 100644 --- a/nginx/ams/weko-frontend/app.config.ts +++ b/nginx/ams/weko-frontend/app.config.ts @@ -91,9 +91,9 @@ export default defineAppConfig({ // 共有 group: 'restricted access', // 非共有・非公開 - member: 'embargoed access', + member: 'metadata only access', // 公開期間猶予 - private: 'metadata only access' + private: 'embargoed access' } } }, diff --git a/nginx/ams/weko-frontend/assets/data/detailSearch.json b/nginx/ams/weko-frontend/assets/data/detailSearch.json index 4589a22454..2f9b3de5c4 100644 --- a/nginx/ams/weko-frontend/assets/data/detailSearch.json +++ b/nginx/ams/weko-frontend/assets/data/detailSearch.json @@ -12,37 +12,37 @@ "id": 2, "comment": "プロジェクト名", "i18n": "projectName", - "query": "projectName", + "query": "text5", "type": "checkbox", "default": false, "data": [ { "id": 1, - "comment": "MS2合原PJ", + "comment": "'MS2合原PJ' OR 'MS2 Aihara PJ'", "i18n": "MS2 Aihara PJ", "value": false }, { "id": 2, - "comment": "MS2大野PJ", + "comment": "'MS2大野PJ' OR 'MS2 Ohno PJ'", "i18n": "MS2 Ohno PJ", "value": false }, { "id": 3, - "comment": "MS2片桐PJ", + "comment": "'MS2片桐PJ' OR 'MS2 Katagiri PJ'", "i18n": "MS2 Katagiri PJ", "value": false }, { "id": 4, - "comment": "MS2高橋PJ", + "comment": "'MS2高橋PJ' OR 'MS2 Takahashi PJ'", "i18n": "MS2 Takahashi PJ", "value": false }, { "id": 5, - "comment": "MS2松浦PJ", + "comment": "'MS2松浦PJ' OR 'MS2 Matsuura PJ'", "i18n": "MS2 Matsuura PJ", "value": false } @@ -52,7 +52,7 @@ "id": 3, "comment": "データID", "i18n": "dataId", - "query": "dataId", + "query": "text4", "type": "text", "default": false, "data": null @@ -72,8 +72,8 @@ "comment": "メタデータ更新日", "i18n": "dateUpdatedinMetadata", "type": "date", - "queryFrom": "date_range1_from", - "queryTo": "date_range1_to", + "queryFrom": "date_range2_from", + "queryTo": "date_range2_to", "default": false, "data": null }, @@ -81,73 +81,73 @@ "id": 6, "comment": "データセットの分野", "i18n": "datasetResearchField", - "query": "datasetResearchField", + "query": "text1", "type": "checkbox", "default": false, "data": [ { "id": 1, - "comment": "Natural Science", + "comment": "'自然科学一般' OR 'Natural Science'", "i18n": "Natural Science", "value": false }, { "id": 2, - "comment": "Life Science", + "comment": "'ライフサイエンス' OR 'Life Science'", "i18n": "Life Science", "value": false }, { "id": 3, - "comment": "Informatics", + "comment": "'情報通信' OR 'Informatics'", "i18n": "Informatics", "value": false }, { "id": 4, - "comment": "Environmental science", + "comment": "'環境' OR 'Environmental science'", "i18n": "Environmental science", "value": false }, { "id": 5, - "comment": "Nanotechnology/Materials", + "comment": "'ナノテク・材料' OR 'Nanotechnology/Materials'", "i18n": "Nanotechnology/Materials", "value": false }, { "id": 6, - "comment": "Energy Engineering", + "comment": "'エネルギー' OR 'Energy Engineering'", "i18n": "Energy Engineering", "value": false }, { "id": 7, - "comment": "Manufacturing Technology", + "comment": "'ものづくり技術' OR 'Manufacturing Technology'", "i18n": "Manufacturing Technology", "value": false }, { "id": 8, - "comment": "Social Infrastructure", + "comment": "'社会基盤' OR 'Social Infrastructure'", "i18n": "Social Infrastructure", "value": false }, { "id": 9, - "comment": "Frontier Technology", + "comment": "'フロンティア' OR 'Frontier Technology'", "i18n": "Frontier Technology", "value": false }, { "id": 10, - "comment": "Humanities & Social Sciences", + "comment": "'人文・社会' OR 'Humanities & Social Sciences'", "i18n": "Humanities & Social Sciences", "value": false }, { "id": 11, - "comment": "Others", + "comment": "'その他' OR 'Others'", "i18n": "Others", "value": false } @@ -157,7 +157,7 @@ "id": 7, "comment": "解析対象データ", "i18n": "analysisType", - "query": "analysisType", + "query": "text9", "type": "checkbox", "default": false, "data": [ @@ -205,8 +205,20 @@ }, { "id": 8, - "comment": "Other biological analysis data", - "i18n": "Other biological analysis data", + "comment": "Time series data", + "i18n": "Time series data", + "value": false + }, + { + "id": 9, + "comment": "Over time data", + "i18n": "Over time data", + "value": false + }, + { + "id": 10, + "comment": "Other", + "i18n": "Other", "value": false } ] @@ -224,7 +236,7 @@ "id": 9, "comment": "データ作成者 所属", "i18n": "belongingOfDataCreator", - "query": "creativeWorkStatus", + "query": "creator.affiliation.affiliationName", "type": "text", "default": false, "data": null @@ -233,7 +245,7 @@ "id": 10, "comment": "データ作成者 連絡先", "i18n": "contactOfDataCreator", - "query": "contactOfDataCreator", + "query": "text10", "type": "text", "default": false, "data": null @@ -242,7 +254,7 @@ "id": 11, "comment": "データ管理者 氏名", "i18n": "nameOfDataManager", - "query": "nameOfDataManager", + "query": "text11", "type": "text", "default": false, "data": null @@ -251,7 +263,7 @@ "id": 12, "comment": "データ管理者 所属", "i18n": "belongingOfDataManager", - "query": "belongingOfDataManager", + "query": "contributor.affiliation.affiliationName", "type": "text", "default": false, "data": null @@ -260,7 +272,7 @@ "id": 13, "comment": "データ管理者 連絡先", "i18n": "contactOfDataManager", - "query": "contactOfDataManager", + "query": "text12", "type": "text", "default": false, "data": null @@ -269,92 +281,146 @@ "id": 14, "comment": "ライセンス", "i18n": "license", - "query": "license", + "query": "text13", "type": "checkbox", "default": false, "data": [ { "id": 1, - "comment": "license_12", - "i18n": "CC0", + "comment": "N/A(NOT analytical tools)", + "i18n": "N/A(NOT analytical tools)", "value": false }, { "id": 2, - "comment": "license_6", - "i18n": "CC BY 3.0", + "comment": "No license", + "i18n": "No license", "value": false }, { "id": 3, - "comment": "license_0", - "i18n": "CC BY 4.0", + "comment": "CC0 1.0 Universal", + "i18n": "CC0 1.0 Universal", "value": false }, { "id": 4, - "comment": "license_7", - "i18n": "CC BY-SA 3.0", + "comment": "CC BY 4.0 Attribution International", + "i18n": "CC BY 4.0 Attribution International", "value": false }, { "id": 5, - "comment": "license_1", - "i18n": "CC BY-SA 4.0", + "comment": "CC BY-SA 4.0 Attribution-ShareAlike", + "i18n": "CC BY-SA 4.0 Attribution-ShareAlike", "value": false }, { "id": 6, - "comment": "license_8", - "i18n": "CC BY-ND 3.0", + "comment": "CC BY-ND 4.0 Attribution—NoDerivatives", + "i18n": "CC BY-ND 4.0 Attribution—NoDerivatives", "value": false }, { "id": 7, - "comment": "license_2", - "i18n": "CC BY-ND 4.0", + "comment": "CC BY-NC 4.0 Attribution—NonCommercial", + "i18n": "CC BY-NC 4.0 Attribution—NonCommercial", "value": false }, { "id": 8, - "comment": "license_9", - "i18n": "CC BY-NC 3.0", + "comment": "CC BY-NC-SA 4.0 Attribution—NonCommercial—ShareAlike", + "i18n": "CC BY-NC-SA 4.0 Attribution—NonCommercial—ShareAlike", "value": false }, { "id": 9, - "comment": "license_3", - "i18n": "CC BY-NC 4.0", + "comment": "CC BY-NC-ND 4.0 Attribution—NonCommercial—NoDerivatives", + "i18n": "CC BY-NC-ND 4.0 Attribution—NonCommercial—NoDerivatives", "value": false }, { "id": 10, - "comment": "license_10", - "i18n": "CC BY-NC-SA 3.0", + "comment": "Academic Free License (AFL) 3.0", + "i18n": "Academic Free License (AFL) 3.0", "value": false }, { "id": 11, - "comment": "license_4", - "i18n": "CC BY-NC-SA 4.0", + "comment": "Public Domain", + "i18n": "Public Domain", "value": false }, { "id": 12, - "comment": "license_11", - "i18n": "CC BY-NC-ND 3.0", + "comment": "MIT License", + "i18n": "MIT License", "value": false }, { "id": 13, - "comment": "license_5", - "i18n": "CC BY-NC-ND 4.0", + "comment": "Apache License 2.0", + "i18n": "Apache License 2.0", "value": false }, { "id": 14, - "comment": "license_free", - "i18n": "others", + "comment": "BSD 2-Clause \"Simplified\" License", + "i18n": "BSD 2-Clause \"Simplified\" License", + "value": false + }, + { + "id": 15, + "comment": "BSD 3-Clause \"New\"/\"Revised\" License", + "i18n": "BSD 3-Clause \"New\"/\"Revised\" License", + "value": false + }, + { + "id": 16, + "comment": "GNU General Public License (GPL) 3.0", + "i18n": "GNU General Public License (GPL) 3.0", + "value": false + }, + { + "id": 17, + "comment": "GNU General Public License (GPL) 2.0", + "i18n": "GNU General Public License (GPL) 2.0", + "value": false + }, + { + "id": 18, + "comment": "Artistic License 2.0", + "i18n": "Artistic License 2.0", + "value": false + }, + { + "id": 19, + "comment": "Eclipse Public License 1.0", + "i18n": "Eclipse Public License 1.0", + "value": false + }, + { + "id": 20, + "comment": "GNU Lesser General Public License (LGPL) 3.0", + "i18n": "GNU Lesser General Public License (LGPL) 3.0", + "value": false + }, + { + "id": 21, + "comment": "GNU Lesser General Public License (LGPL) 2.1", + "i18n": "GNU Lesser General Public License (LGPL) 2.1", + "value": false + }, + { + "id": 22, + "comment": "Mozilla Public License 2.0", + "i18n": "Mozilla Public License 2.0", + "value": false + }, + { + "id": 23, + "comment": "Other", + "i18n": "Other", "value": false } ] @@ -363,7 +429,7 @@ "id": 15, "comment": "モダリティ用メタデータファイルの有無", "i18n": "presenceOfMetadataFiles", - "query": "presenceOfMetadataFiles", + "query": "text14", "type": "radio", "default": false, "selected": "notSelected", @@ -392,7 +458,7 @@ "id": 16, "comment": "連絡・許諾の要不要", "i18n": "necessityOfContactPermission", - "query": "necessityOfContactPermission", + "query": "text3", "type": "radio", "default": false, "selected": "notSelected", @@ -405,14 +471,20 @@ }, { "id": 2, - "comment": "Necessary", - "i18n": "Necessary", + "comment": "連絡不要", + "i18n": "No contact required", "value": false }, { "id": 3, - "comment": "Unnecessary", - "i18n": "Unnecessary", + "comment": "連絡が必要", + "i18n": "Contact required", + "value": false + }, + { + "id": 4, + "comment": "承諾が必要", + "i18n": "Permission required", "value": false } ] @@ -421,7 +493,7 @@ "id": 17, "comment": "謝辞に記載の要不要", "i18n": "necessityOfIncludingInAcknowledgments", - "query": "necessityOfIncludingInAcknowledgments", + "query": "text15", "type": "radio", "default": false, "selected": "notSelected", @@ -450,7 +522,7 @@ "id": 18, "comment": "有償・無償", "i18n": "payOrFree", - "query": "payOrFree", + "query": "text2", "type": "listbox", "default": false, "selected": "notSelected", @@ -479,7 +551,7 @@ "id": 19, "comment": "商用利用の可否", "i18n": "availabilityOfCommercialUse", - "query": "availabilityOfCommercialUse", + "query": "text16", "type": "radio", "default": false, "selected": "notSelected", @@ -508,7 +580,7 @@ "id": 20, "comment": "アクセス権", "i18n": "authority", - "query": "accessMode", + "query": "text7", "type": "checkbox", "default": false, "data": [ @@ -542,7 +614,7 @@ "id": 21, "comment": "リポジトリ情報", "i18n": "repositoryInformation", - "query": "repositoryInformation", + "query": "text17", "type": "checkbox", "default": false, "data": [ @@ -554,7 +626,7 @@ }, { "id": 2, - "comment": "NBDC Human Database", + "comment": "'NBDCヒトデータベース' OR 'NBDC Human Database'", "i18n": "NBDC Human Database", "value": false }, @@ -602,13 +674,13 @@ }, { "id": 10, - "comment": "Laboratory Storage", + "comment": "'研究室内ストレージ' OR 'Laboratory Storage'", "i18n": "Laboratory Storage", "value": false }, { "id": 11, - "comment": "Other", + "comment": "'その他' OR 'Other'", "i18n": "Other", "value": false } @@ -618,7 +690,7 @@ "id": 22, "comment": "(ヒト)インフォームドコンセント(IC) 有・無・不要", "i18n": "informedConsent", - "query": "informedConsent", + "query": "text8", "type": "radio", "default": false, "selected": "notSelected", @@ -653,7 +725,7 @@ "id": 23, "comment": "(IC有の場合)第三者提供の同意", "i18n": "consentForProvisionToAThirdParty", - "query": "consentForProvisionToAThirdParty", + "query": "text18", "type": "radio", "default": false, "selected": "notSelected", @@ -682,7 +754,7 @@ "id": 24, "comment": "(IC有の場合)海外提供", "i18n": "overseasOfferings", - "query": "overseasOfferings", + "query": "text19", "type": "radio", "default": false, "selected": "notSelected", @@ -711,7 +783,7 @@ "id": 25, "comment": "(IC有の場合)産業利用等", "i18n": "industrialUse", - "query": "industrialUse", + "query": "text20", "type": "radio", "default": false, "selected": "notSelected", @@ -740,7 +812,7 @@ "id": 26, "comment": "(IC無の場合)", "i18n": "iCIsNo", - "query": "iCIsNo", + "query": "text6", "type": "radio", "default": false, "selected": "notSelected", @@ -769,7 +841,7 @@ "id": 27, "comment": "(ヒト)匿名加工の有無", "i18n": "anonymousProcessing", - "query": "anonymousProcessing", + "query": "text21", "type": "radio", "default": false, "selected": "notSelected", @@ -798,7 +870,7 @@ "id": 28, "comment": "利益相反の有無", "i18n": "conflictOfInterest", - "query": "conflictOfInterest", + "query": "text22", "type": "radio", "default": false, "selected": "notSelected", @@ -824,7 +896,7 @@ ] }, { - "id": 30, + "id": 29, "comment": "識別子", "i18n": "identifierText", "query": "id", @@ -832,7 +904,7 @@ "default": false }, { - "id": 31, + "id": 30, "comment": "識別子タイプ", "i18n": "identifierType", "query": "id_attr", @@ -897,4 +969,4 @@ } ] } -] +] \ No newline at end of file diff --git a/nginx/ams/weko-frontend/components/common/SearchForm.vue b/nginx/ams/weko-frontend/components/common/SearchForm.vue index 2525739efb..58319354ef 100644 --- a/nginx/ams/weko-frontend/components/common/SearchForm.vue +++ b/nginx/ams/weko-frontend/components/common/SearchForm.vue @@ -358,7 +358,11 @@ function search() { } // NOTE: 公開区分とダウンロード区分はdetailSearch.jsonのdata.queryに値があれば渡る if (valueList) { - Object.assign(detail, { [column.query]: valueList.join(',') }); + if (column.query === 'id_attr') { + Object.assign(conditions.filter, { [column.query]: valueList.join(',') }); + } else { + Object.assign(detail, { [column.query]: valueList.join(' OR ') }); + } } else { Object.assign(detail, { [column.query]: '' }); } @@ -377,7 +381,7 @@ function search() { Object.assign(detail, { [column.queryTo]: column.data ? (column.data[1] ? column.data[1].replaceAll('-', '') : '') : '' }); - Object.assign(detail, { [column.query]: valueList.join(',') }); + Object.assign(detail, { [column.query]: valueList.join(' OR ') }); } else { Object.assign(detail, { [column.queryFrom]: column.data ? column.data[0].replaceAll('-', '') : '' diff --git a/nginx/ams/weko-frontend/locales/en.json b/nginx/ams/weko-frontend/locales/en.json index c999da55e9..3ff69e78f5 100644 --- a/nginx/ams/weko-frontend/locales/en.json +++ b/nginx/ams/weko-frontend/locales/en.json @@ -228,7 +228,8 @@ "Phosphoproteome data": "Phosphoproteome data", "Metabolome data": "Metabolome data", "Imaging data": "Imaging data", - "Other biological analysis data": "Other biological analysis data", + "Time series data": "Time series data", + "Over time data": "Over time data", "Yes": "Yes", "No": "No", "possible": "Yes", @@ -300,5 +301,14 @@ "identifierText": "identifier", "identifierType": "identifier type", "Institutional Login for institutions in Japan.": "Institutional Login for institutions in Japan.", - "needToLogin": "This item requires login." -} + "needToLogin": "This item requires login.", + "N/A(NOT analytical tools)": "N/A(NOT analytical tools)", + "No license": "No license", + "CC BY 4.0 Attribution International": "CC BY 4.0 Attribution International", + "CC BY-SA 4.0 Attribution-ShareAlike": "CC BY-SA 4.0 Attribution-ShareAlike", + "CC BY-ND 4.0 Attribution—NoDerivatives": "CC BY-ND 4.0 Attribution—NoDerivatives", + "CC BY-NC 4.0 Attribution—NonCommercial": "CC BY-NC 4.0 Attribution—NonCommercial", + "CC BY-NC-SA 4.0 Attribution—NonCommercial—ShareAlike": "CC BY-NC-SA 4.0 Attribution—NonCommercial—ShareAlike", + "CC BY-NC-ND 4.0 Attribution—NonCommercial—NoDerivatives": "CC BY-NC-ND 4.0 Attribution—NonCommercial—NoDerivatives", + "Public Domain": "Public Domain" +} \ No newline at end of file diff --git a/nginx/ams/weko-frontend/locales/ja.json b/nginx/ams/weko-frontend/locales/ja.json index c70b54dd7d..c70fb15d3a 100644 --- a/nginx/ams/weko-frontend/locales/ja.json +++ b/nginx/ams/weko-frontend/locales/ja.json @@ -229,7 +229,8 @@ "Phosphoproteome data": "リン酸化プロテオームデータ", "Metabolome data": "メタボロームデータ", "Imaging data": "イメージデータ", - "Other biological analysis data": "その他の生物学的解析データ", + "Time series data": "時系列データ", + "Over time data": "経時的データ", "Yes": "有", "No": "無", "possible": "可", @@ -301,5 +302,14 @@ "identifierText": "識別子", "identifierType": "識別子タイプ", "Institutional Login for institutions in Japan.": "所属機関のIdPでログインする方", - "needToLogin": "ログインが必要なアイテムです。" -} + "needToLogin": "ログインが必要なアイテムです。", + "N/A(NOT analytical tools)": "該当なし(解析ツールではない)", + "No license": "ライセンスなし", + "CC BY 4.0 Attribution International": "CC BY 4.0 国際", + "CC BY-SA 4.0 Attribution-ShareAlike": "CC BY-SA 4.0 表示—継承", + "CC BY-ND 4.0 Attribution—NoDerivatives": "CC BY-ND 4.0 表示—改変禁止", + "CC BY-NC 4.0 Attribution—NonCommercial": "CC BY-NC 4.0 表示—非営利", + "CC BY-NC-SA 4.0 Attribution—NonCommercial—ShareAlike": "CC BY-NC-SA 4.0 表示—非営利—継承", + "CC BY-NC-ND 4.0 Attribution—NonCommercial—NoDerivatives": "CC BY-NC-ND 4.0 表示—非営利—改変禁止", + "Public Domain": "パブリックドメイン" +} \ No newline at end of file diff --git a/nginx/ams/weko-frontend/pages/ams/files.vue b/nginx/ams/weko-frontend/pages/ams/files.vue index 30106651af..722d5079f7 100644 --- a/nginx/ams/weko-frontend/pages/ams/files.vue +++ b/nginx/ams/weko-frontend/pages/ams/files.vue @@ -187,7 +187,7 @@