Merge branch 'develop' into ccb

dictation_client/src/components/footer/index.tsx

@@ -1,10 +1,14 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import styles from "styles/app.module.scss";
+import { getTranslationID } from "translation";
 
-const Footer: React.FC = () => (
+const Footer: React.FC = () => {
-  <footer className={`${styles.footer}`}>
+  const [t] = useTranslation();
-    <div>&copy; OM Digital Solutions 2023</div>
+  return (
-  </footer>
+    <footer className={`${styles.footer}`}>
-);
+      <div>{t(getTranslationID("common.label.copyRight"))}</div>
-
+    </footer>
+  );
+};
 export default Footer;

dictation_client/src/features/user/constants.ts

@@ -1,3 +1,5 @@
+import type { RoleType } from "./types";
+
 // LicenseStatusTypeの値を定数オブジェクトにする
 export const LICENSE_STATUS = {
   NORMAL: "Normal",
@@ -17,3 +19,10 @@ export const NO_LICENSE = "No License" as const;
 
 // ライセンスが割り当てられている場合の表示
 export const LICENSE_NORMAL = "License Assigned" as const;
+
+// Roleの表示名
+export const ROLE_DISPLAY_NAME: Record<RoleType, string> = {
+  author: "Author",
+  typist: "Transcriptionist",
+  none: "None",
+} as const;

dictation_client/src/features/user/selectors.ts

@@ -9,7 +9,11 @@ import {
   isLicenseStatusType,
   isRoleType,
 } from "./types";
-import { LICENSE_STATUS, LICENSE_ALLOCATE_STATUS } from "./constants";
+import {
+  LICENSE_STATUS,
+  LICENSE_ALLOCATE_STATUS,
+  ROLE_DISPLAY_NAME,
+} from "./constants";
 
 export const selectInputValidationErrors = (state: RootState) => {
   const { name, email, role, authorId, encryption, encryptionPassword } =
@@ -176,8 +180,8 @@ export const selectUserViews = (state: RootState): UserView[] => {
       prompt: convertedValues.prompt,
       encryption: convertedValues.encryption,
       authorId: convertedValues.authorId,
-      // roleの一文字目を大文字に変換する
+      // roleに応じて表示名を変更する
-      role: role.charAt(0).toUpperCase() + role.slice(1),
+      role: ROLE_DISPLAY_NAME[role],
       licenseStatus: convertedLicenseStatus,
       expiration: convertedExpiration,
       remaining: convertedRemaining,

dictation_client/src/pages/AccountPage/index.tsx

@@ -412,15 +412,6 @@ const AccountPage: React.FC = (): JSX.Element => {
                     className={styles.icLoading}
                     alt="Loading"
                   />
-                  {isTier5 && (
-                    <p className={styles.formComment}>
-                      {t(
-                        getTranslationID(
-                          "accountPage.text.dealerManagementAnnotation"
-                        )
-                      )}
-                    </p>
-                  )}
                 </div>
               </div>
               {isTier5 && (

dictation_client/src/pages/WorkTypeIdSettingPage/editOptionItemsPopup.tsx

@@ -136,17 +136,22 @@ export const EditOptionItemsPopup: React.FC<EditOptionItemsPopupProps> = (
                           getTranslationID("worktypeIdSetting.label.itemLabel")
                         )}
                       </th>
+                      {
+                        // https://so-net.backlog.jp/board/OMDS_IS?selectedIssueKey=OMDS_IS-289
+                        // initialValueとdefaultValueの項目名を入れ替え
+                        // その結果 initialValueの項目名がdefaultValueになり、defaultValueの項目名がinitialValueになる
+                      }
                       <th className={styles.noLine}>
                         {t(
                           getTranslationID(
-                            "worktypeIdSetting.label.defaultValue"
+                            "worktypeIdSetting.label.initialValue"
                           )
                         )}
                       </th>
                       <th>
                         {t(
                           getTranslationID(
-                            "worktypeIdSetting.label.initialValue"
+                            "worktypeIdSetting.label.defaultValue"
                           )
                         )}
                       </th>

dictation_client/src/translation/de.json

@@ -220,7 +220,7 @@
     },
     "label": {
       "title": "Diktate",
-      "displayInfomation": "Informations sur l'affichage",
+      "displayInfomation": "Informationen anzeigen",
       "jobNumber": "Aufgabennummer",
       "status": "Status",
       "priority": "Priorität",
@@ -258,7 +258,7 @@
       "changeTranscriptionist": "Transkriptionist ändern",
       "deleteDictation": "Diktat löschen",
       "selectedTranscriptionist": "Ausgewählter transkriptionist",
-      "poolTranscriptionist": "Transkriptionsliste",
+      "poolTranscriptionist": "Liste der Transkriptionisten",
       "fileBackup": "Dateisicherung",
       "downloadForBackup": "Zur Sicherung herunterladen",
       "applications": "Desktopanwendung",
@@ -397,7 +397,7 @@
       "templateOptional": "Vorlage (Optional)",
       "editRule": "Regel bearbeiten",
       "selected": "Ausgewählter transkriptionist",
-      "pool": "Transkriptionsliste",
+      "pool": "Liste der Transkriptionisten",
       "selectAuthor": "Autoren-ID auswählen",
       "selectWorktypeId": "Aufgabentypkennung auswählen",
       "selectTemplate": "Vorlage auswählen"
@@ -411,13 +411,13 @@
   },
   "typistGroupSetting": {
     "label": {
-      "title": "Transkriptionistengruppe",
+      "title": "Gruppeneinstellung für Transkriptionisten",
       "addGroup": "Gruppe hinzufügen",
       "groupName": "Gruppenname",
       "addTypistGroup": "Transkriptionist Gruppe hinzufügen",
       "transcriptionist": "Transkriptionist",
       "selected": "Ausgewählter transkriptionist",
-      "pool": "Transkriptionsliste",
+      "pool": "Liste der Transkriptionisten",
       "add": "Hinzufügen",
       "remove": "Entfernen",
       "editTypistGroup": "Transkriptionistengruppe bearbeiten"
@@ -467,7 +467,7 @@
   },
   "templateFilePage": {
     "label": {
-      "title": "Vorlagenliste",
+      "title": "Vorlageneinstellung",
       "addTemplate": "Vorlage hinzufügen",
       "fileName": "Dateiname",
       "chooseFile": "Datei aussuchen",

dictation_client/src/translation/en.json

@@ -258,7 +258,7 @@
       "changeTranscriptionist": "Change Transcriptionist",
       "deleteDictation": "Delete Dictation",
       "selectedTranscriptionist": "Selected Transcriptionist",
-      "poolTranscriptionist": "Transcription List",
+      "poolTranscriptionist": "Transcriptionist List",
       "fileBackup": "File Backup",
       "downloadForBackup": "Download for backup",
       "applications": "Desktop Application",
@@ -397,7 +397,7 @@
       "templateOptional": "Template (Optional)",
       "editRule": "Edit Rule",
       "selected": "Selected Transcriptionist",
-      "pool": "Transcription List",
+      "pool": "Transcriptionist List",
       "selectAuthor": "Select Author ID",
       "selectWorktypeId": "Select Worktype ID",
       "selectTemplate": "Select Template"
@@ -411,13 +411,13 @@
   },
   "typistGroupSetting": {
     "label": {
-      "title": "Transcriptionist Group",
+      "title": "Transcriptionist Group Setting",
       "addGroup": "Add Group",
       "groupName": "Group Name",
       "addTypistGroup": "Add Transcriptionist Group",
       "transcriptionist": "Transcriptionist",
       "selected": "Selected Transcriptionist",
-      "pool": "Transcription List",
+      "pool": "Transcriptionist List",
       "add": "Add",
       "remove": "Remove",
       "editTypistGroup": "Edit Transcriptionist Group"
@@ -467,7 +467,7 @@
   },
   "templateFilePage": {
     "label": {
-      "title": "Template List",
+      "title": "Template Setting",
       "addTemplate": "Add Template",
       "fileName": "File Name",
       "chooseFile": "Select file",

dictation_client/src/translation/es.json

@@ -220,7 +220,7 @@
     },
     "label": {
       "title": "Dictado",
-      "displayInfomation": "Informationen anzeigen",
+      "displayInfomation": "Mostrar información",
       "jobNumber": "Número de trabajo",
       "status": "Estado",
       "priority": "Prioridad",
@@ -258,7 +258,7 @@
       "changeTranscriptionist": "Cambiar transcriptor",
       "deleteDictation": "Borrar dictado",
       "selectedTranscriptionist": "Transcriptor seleccionado",
-      "poolTranscriptionist": "Lista de transcriptor",
+      "poolTranscriptionist": "Lista de transcriptores",
       "fileBackup": "Copia de seguridad de archivos",
       "downloadForBackup": "Descargar para respaldo",
       "applications": "Aplicación de escritorio",
@@ -397,7 +397,7 @@
       "templateOptional": "Plantilla (Opcional)",
       "editRule": "Editar regla",
       "selected": "Transcriptor seleccionado",
-      "pool": "Lista de transcriptor",
+      "pool": "Lista de transcriptores",
       "selectAuthor": "Seleccionar ID de autor",
       "selectWorktypeId": "Seleccionar ID de tipo de trabajo",
       "selectTemplate": "Seleccionar Plantilla"
@@ -411,13 +411,13 @@
   },
   "typistGroupSetting": {
     "label": {
-      "title": "Grupo de transcriptor",
+      "title": "Configuración del grupo transcriptor",
       "addGroup": "Agregar grupo",
       "groupName": "Nombre del grupo",
       "addTypistGroup": "Agregar grupo transcriptor",
       "transcriptionist": "Transcriptor",
       "selected": "Transcriptor seleccionado",
-      "pool": "Lista de transcriptor",
+      "pool": "Lista de transcriptores",
       "add": "Añadir",
       "remove": "Eliminar",
       "editTypistGroup": "Editar grupo transcriptor"
@@ -467,7 +467,7 @@
   },
   "templateFilePage": {
     "label": {
-      "title": "Lista de plantillas",
+      "title": "Configuración de plantilla",
       "addTemplate": "Agregar plantilla",
       "fileName": "Nombre del archivo",
       "chooseFile": "Seleccione Archivo",

dictation_client/src/translation/fr.json

@@ -258,7 +258,7 @@
       "changeTranscriptionist": "Changer de transcriptionniste ",
       "deleteDictation": "Supprimer la dictée",
       "selectedTranscriptionist": "Transcriptionniste sélectionné",
-      "poolTranscriptionist": "Liste de transcriptionniste",
+      "poolTranscriptionist": "Liste des transcripteurs",
       "fileBackup": "Sauvegarde de fichiers",
       "downloadForBackup": "Télécharger pour sauvegarde",
       "applications": "Application de bureau",
@@ -397,7 +397,7 @@
       "templateOptional": "Masque (Facultatif)",
       "editRule": "Modifier la règle",
       "selected": "Transcriptionniste sélectionné",
-      "pool": "Liste de transcriptionniste",
+      "pool": "Liste des transcripteurs",
       "selectAuthor": "Sélectionner le Identifiant Auteur",
       "selectWorktypeId": "Sélectionner le Identifiant du Type de travail",
       "selectTemplate": "Sélectionner le Masque"
@@ -411,13 +411,13 @@
   },
   "typistGroupSetting": {
     "label": {
-      "title": "Groupe de transcriptionniste",
+      "title": "Paramètre de groupe de transcriptionniste",
       "addGroup": "Ajouter groupe",
       "groupName": "Nom de groupe",
       "addTypistGroup": "Ajouter un groupe de transcripteurs",
       "transcriptionist": "Transcriptionniste",
       "selected": "Transcriptionniste sélectionné",
-      "pool": "Liste de transcriptionniste",
+      "pool": "Liste des transcripteurs",
       "add": "Ajouter",
       "remove": "Supprimer",
       "editTypistGroup": "Modifier le groupe de transcripteurs"
@@ -467,7 +467,7 @@
   },
   "templateFilePage": {
     "label": {
-      "title": "Liste des modèles",
+      "title": "Paramètre de modèle",
       "addTemplate": "Ajouter un modèle",
       "fileName": "Nom de fichier",
       "chooseFile": "Choisir le fichier",