Feature/w2025 33

modules/weko-admin/tests/test_utils.py

@@ -625,6 +625,11 @@ def test_package_reports(client, mocker):
     assert b"logReport_FileDownload_2022-10.tsv" in result.getvalue()
     mock_make_stats_file.assert_called_once_with("test_stats", "file_download", "2022-10", False)
 
+    with patch("weko_admin.utils.make_stats_file", return_value=mock_stream) as mock_make_stats_file:
+        result = package_reports(all_stats, "2022", "05")
+    assert b"logReport_FileDownload_2022-05.tsv" in result.getvalue()
+    mock_make_stats_file.assert_called_once_with("test_stats", "file_download", "2022-05", False)
+
     with patch("weko_admin.utils.make_stats_file", return_value=mock_stream) as mock_make_stats_file:
         result = package_reports(all_stats, report_date="2022-10-01_2022-10-07")
     assert b"logReport_FileDownload_2022-10-01_2022-10-07.tsv" in result.getvalue()

modules/weko-admin/weko_admin/config.py

@@ -156,9 +156,9 @@
 """Types for the report"""
 
 WEKO_ADMIN_REPORT_HEADERS = {
-    'file_download': _('No. Of File Downloads'),
-    'file_preview': _('No. Of File Previews'),
-    'billing_file_download': _('No. Of Paid File Downloads'),
+    'file_download': _('Number of File Downloads'),
+    'file_preview': _('Number of File Previews'),
+    'billing_file_download': _('Number of Paid File Downloads'),
     'index_access': _('Detail Views Per Index'),
     'detail_view': _('Detail Views Count'),
     'file_using_per_user': _('Usage Count By User'),
@@ -170,23 +170,23 @@
 """Headers for the report .csv files"""
 
 WEKO_ADMIN_REPORT_SUB_HEADERS = {
-    'file_download': _('Open-Access No. Of File Downloads'),
-    'file_preview': _('Open-Access No. Of File Previews'),
+    'file_download': _('Number of Open-Access File Downloads'),
+    'file_preview': _('Number of Open-Access File Previews'),
     'site_access': _('Access Number Breakdown By Site License'),
-    'billing_file_download': _('Open-Access No. Of Paid File Downloads')
+    'billing_file_download': _('Number of Open-Access Paid File Downloads')
 }
 """Sub-Headers for the report .csv files"""
 
 WEKO_ADMIN_REPORT_COLS = {
     'file_download': [
         _('File Name'), _('Registered Index Name'),
-        _('No. Of Times Downloaded'), _('Non-Logged In User'),
-        _('Logged In User'), _('Site License'), _('Admin'),
+        _('No. Of Times Downloaded'), _('Non-Logged in User'),
+        _('Logged in User'), _('Site License'), _('Admin'),
         _('Registrar')],
     'file_preview': [
         _('File Name'), _('Registered Index Name'),
-        _('No. Of Times Viewed'), _('Non-Logged In User'),
-        _('Logged In User'), _('Site License'), _('Admin'),
+        _('No. Of Times Viewed'), _('Non-Logged in User'),
+        _('Logged in User'), _('Site License'), _('Admin'),
         _('Registrar')],
     'index_access': [_('Index'), _('No. Of Views')],
     'detail_view': [

modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.po

@@ -23,26 +23,6 @@ msgstr ""
 msgid "deny access"
 msgstr "Denied access"
 
-#: weko_admin/admin.py:291
-msgid "No. Of File Downloads"
-msgstr "Number of File Downloads"
-
-#: weko_admin/admin.py:292
-msgid "Open-Access No. Of File Downloads"
-msgstr "Number of Open-Access File Downloads"
-
-#: weko_admin/admin.py:294
-msgid "No. Of File Previews"
-msgstr "Number of File Previews"
-
-#: weko_admin/admin.py:295
-msgid "Open-Access No. Of File Previews"
-msgstr "Number of Open-Access File Previews"
-
-#: weko_admin/config.py:158
-msgid "Open-Access No. Of Paid File Downloads"
-msgstr "Number of Open-Access Paid File Downloads"
-
 #: weko_admin/admin.py:301
 msgid "Aggregation Monh"
 msgstr ""
@@ -59,14 +39,6 @@ msgstr ""
 msgid "No. Of Times Downloaded/Viewed"
 msgstr "Number of  Downloads/Views"
 
-#: weko_admin/admin.py:305
-msgid "Non-Logged In User"
-msgstr "Non-Logged in User"
-
-#: weko_admin/admin.py:306
-msgid "Logged In User"
-msgstr "Logged in User"
-
 #: weko_admin/admin.py:306
 msgid "Site License"
 msgstr ""
@@ -111,6 +83,42 @@ msgstr ""
 msgid "Site License Usage Statistics Report"
 msgstr ""
 
+#: weko_admin/config.py:159
+msgid "Number of File Downloads"
+msgstr "Number of File Downloads"
+
+#: weko_admin/config.py:160
+msgid "Number of File Previews"
+msgstr "Number of File Previews"
+
+#: weko_admin/config.py:161
+msgid "Number of Paid File Downloads"
+msgstr "Number of Paid File Downloads"
+
+#: weko_admin/config.py:173
+msgid "Number of Open-Access File Downloads"
+msgstr "Number of Open-Access File Downloads"
+
+#: weko_admin/config.py:174
+msgid "Number of Open-Access File Previews"
+msgstr "Number of Open-Access File Previews"
+
+#: weko_admin/config.py:175
+msgid "Access Number Breakdown By Site License"
+msgstr "Access Number Breakdown By Site License"
+
+#: weko_admin/config.py:176
+msgid "Number of Open-Access Paid File Downloads"
+msgstr "Number of Open-Access Paid File Downloads"
+
+#: weko_admin/config.py:183 weko_admin/config.py:188
+msgid "Non-Logged in User"
+msgstr "Non-Logged in User"
+
+#: weko_admin/config.py:184 weko_admin/config.py:189
+msgid "Logged in User"
+msgstr "Logged in User"
+
 #: weko_admin/config.py:195
 msgid "SetSpec"
 msgstr ""

modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po

@@ -267,23 +267,6 @@ msgstr "統計設定"
 msgid "Site License Usage Statistics Report"
 msgstr "サイトライセンス利用統計"
 
-#: weko_admin/config.py:129
-msgid "No. Of File Downloads"
-msgstr "ファイルダウンロード回数"
-
-#: weko_admin/config.py:130
-msgid "No. Of File Previews"
-msgstr "ファイルプレビュー数"
-
-#: weko_admin/config.py:131
-msgid "No. Of Paid File Downloads"
-msgstr "課金ファイルダウンロード回数"
-
-#: weko_admin/config.py:132
-#, fuzzy
-msgid "No. Of Paid File Previews"
-msgstr "ファイルプレビュー数"
-
 #: weko_admin/config.py:133
 msgid "Detail Views Per Index"
 msgstr "インデックス毎の詳細ビュー"
@@ -313,22 +296,34 @@ msgstr "ユーザー所属情報"
 msgid "Access Count By Site License"
 msgstr "サイトライセンス別アクセス数"
 
-#: weko_admin/config.py:144
-msgid "Open-Access No. Of File Downloads"
+#: weko_admin/config.py:159
+msgid "Number of File Downloads"
+msgstr "ファイルダウンロード回数"
+
+#: weko_admin/config.py:160
+msgid "Number of File Previews"
+msgstr "ファイルプレビュー数"
+
+#: weko_admin/config.py:161
+msgid "Number of Paid File Downloads"
+msgstr "課金ファイルダウンロード回数"
+
+#: weko_admin/config.py:173
+msgid "Number of Open-Access File Downloads"
 msgstr "オープンアクセスファイルダウンロード数"
 
-#: weko_admin/config.py:145
-msgid "Open-Access No. Of File Previews"
+#: weko_admin/config.py:174
+msgid "Number of Open-Access File Previews"
 msgstr "オープンアクセスファイルプレビュー数"
 
-#: weko_admin/config.py:158
-msgid "Open-Access No. Of Paid File Downloads"
-msgstr "オープンアクセス課金ファイルダウンロード数"
-
-#: weko_admin/config.py:146
+#: weko_admin/config.py:175
 msgid "Access Number Breakdown By Site License"
 msgstr "サイトライセンス別アクセス数内訳"
 
+#: weko_admin/config.py:176
+msgid "Number of Open-Access Paid File Downloads"
+msgstr "オープンアクセス課金ファイルダウンロード数"
+
 #: weko_admin/config.py:152 weko_admin/config.py:157
 msgid "File Name"
 msgstr "ファイル名"
@@ -341,12 +336,12 @@ msgstr "登録インデックス名"
 msgid "No. Of Times Downloaded"
 msgstr "ファイルダウンロード回数"
 
-#: weko_admin/config.py:153 weko_admin/config.py:157
-msgid "Non-Logged In User"
+#: weko_admin/config.py:183 weko_admin/config.py:188
+msgid "Non-Logged in User"
 msgstr "未ログインユーザー"
 
-#: weko_admin/config.py:154 weko_admin/config.py:157
-msgid "Logged In User"
+#: weko_admin/config.py:184 weko_admin/config.py:189
+msgid "Logged in User"
 msgstr "ログインユーザー"
 
 #: weko_admin/config.py:154 weko_admin/config.py:159

modules/weko-admin/weko_admin/translations/messages.pot

@@ -280,22 +280,6 @@ msgstr ""
 msgid "statistics report"
 msgstr ""
 
-#: weko_admin/config.py:129
-msgid "No. Of File Downloads"
-msgstr ""
-
-#: weko_admin/config.py:130
-msgid "No. Of File Previews"
-msgstr ""
-
-#: weko_admin/config.py:131
-msgid "No. Of Paid File Downloads"
-msgstr ""
-
-#: weko_admin/config.py:132
-msgid "No. Of Paid File Previews"
-msgstr ""
-
 #: weko_admin/config.py:133
 msgid "Detail Views Per Index"
 msgstr ""
@@ -325,20 +309,32 @@ msgstr ""
 msgid "Access Count By Site License"
 msgstr ""
 
-#: weko_admin/config.py:144
-msgid "Open-Access No. Of File Downloads"
+#: weko_admin/config.py:159
+msgid "Number of File Downloads"
 msgstr ""
 
-#: weko_admin/config.py:145
-msgid "Open-Access No. Of File Previews"
+#: weko_admin/config.py:160
+msgid "Number of File Previews"
 msgstr ""
 
-#: weko_admin/config.py:146
+#: weko_admin/config.py:161
+msgid "Number of Paid File Downloads"
+msgstr ""
+
+#: weko_admin/config.py:173
+msgid "Number of Open-Access File Downloads"
+msgstr ""
+
+#: weko_admin/config.py:174
+msgid "Number of Open-Access File Previews"
+msgstr ""
+
+#: weko_admin/config.py:175
 msgid "Access Number Breakdown By Site License"
 msgstr ""
 
-#: weko_admin/config.py:158
-msgid "Open-Access No. Of Paid File Downloads"
+#: weko_admin/config.py:176
+msgid "Number of Open-Access Paid File Downloads"
 msgstr ""
 
 #: weko_admin/config.py:152 weko_admin/config.py:157
@@ -353,12 +349,12 @@ msgstr ""
 msgid "No. Of Times Downloaded"
 msgstr ""
 
-#: weko_admin/config.py:153 weko_admin/config.py:158
-msgid "Non-Logged In User"
+#: weko_admin/config.py:183 weko_admin/config.py:188
+msgid "Non-Logged in User"
 msgstr ""
 
-#: weko_admin/config.py:154 weko_admin/config.py:159
-msgid "Logged In User"
+#: weko_admin/config.py:184 weko_admin/config.py:189
+msgid "Logged in User"
 msgstr ""
 
 #: weko_admin/config.py:154 weko_admin/config.py:159

modules/weko-admin/weko_admin/utils.py

@@ -417,7 +417,8 @@ def package_reports(
     period = True
     if not report_date:
         period = False
-        report_date = str(year) + '-' + str(month)
+        dt = datetime(int(year), int(month), 1)
+        report_date = dt.strftime('%Y-%m')
 
     file_format = current_app.config.get('WEKO_ADMIN_OUTPUT_FORMAT', 'tsv').lower()
     file_name_mapping = current_app.config['WEKO_ADMIN_REPORT_FILE_NAMES']

modules/weko-deposit/weko_deposit/api.py

@@ -2433,7 +2433,7 @@ def _format_creator_to_show_detail(self, language: str, parent_key: str,
                     if lst_value[i] and lst_value[i].get(lang_key) == language:
                         if name_key in lst_value[i]:
                             lst.append(lst_value[i][name_key])
-                            #break
+                            break
 
     def _get_creator_to_show_popup(self, creators: Union[list, dict],
                                    language: any,

modules/weko-records/weko_records/utils.py

@@ -1464,22 +1464,13 @@ def get_title_option(solst_dict_array):
 def convert_array_to_dict(solst_dict_array,key):
     dict = {}
     idx = 0
-    name_list = []
     for item in solst_dict_array:
         if item.get(key):
             item['idx']=idx
             dict[item.get(key)] = item
-            if key == 'creatorNameLang':
-                name_list.append(item.get('creatorName'))
-                creator_names = ";".join(name_list)
-                dict[item.get(key)]['creatorName'] = creator_names
         else:
             item['idx']=idx
             dict['None'] = item
-            if key == 'creatorNameLang':
-                name_list.append(item.get('creatorName'))
-                creator_names = ";".join(name_list)
-                dict['None']['creatorName'] = creator_names
         idx=idx+1
     return dict