Merge branch 'main' into develop

# Conflicts: # dictation_client/src/translation/de.json # dictation_client/src/translation/en.json # dictation_client/src/translation/es.json # dictation_client/src/translation/fr.json
2024-05-24 17:26:50 +09:00 · 2024-05-24 17:26:50 +09:00 · 3a7c1765ee
commit 3a7c1765ee
parent bd8f035c46 4b16e6a004
7 changed files with 68 additions and 16 deletions
--- a/dictation_client/src/components/footer/index.tsx
+++ b/dictation_client/src/components/footer/index.tsx
@ -6,8 +6,50 @@ import { getTranslationID } from "translation";
 const Footer: React.FC = () => {
  const [t] = useTranslation();
  return (
-    <footer className={`${styles.footer}`}>
-      <div>{t(getTranslationID("common.label.copyRight"))}</div>
+    <footer
+      className={`${styles.footer}`}
+      style={{
+        padding: "0.5rem",
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "center",
+      }}
+    >
+      <div
+        style={{
+          marginBottom: "0.5rem",
+          textAlign: "center",
+        }}
+      >
+        {t(getTranslationID("common.label.copyRight"))}
+      </div>
+      <div
+        style={{
+          display: "flex",
+          gap: "1rem",
+        }}
+      >
+        <a
+          href="https://download.omsystem.com/pages/odms_download/odms_cloud_eula/eula/en/"
+          target="_blank"
+          className={styles.linkTx}
+          style={{ color: "#999999" }}
+          data-tag="open-eula"
+          rel="noreferrer"
+        >
+          {t(getTranslationID("common.label.eula"))}
+        </a>
+        <a
+          href="https://download.omsystem.com/pages/odms_download/odms_cloud_eula/privacy_notice/en/"
+          target="_blank"
+          className={styles.linkTx}
+          style={{ color: "#999999" }}
+          data-tag="open-privacy-notice"
+          rel="noreferrer"
+        >
+          {t(getTranslationID("common.label.privacyNotice"))}
+        </a>
+      </div>
    </footer>
  );
 };
--- a/dictation_client/src/pages/AccountPage/index.tsx
+++ b/dictation_client/src/pages/AccountPage/index.tsx
@ -173,7 +173,7 @@ const AccountPage: React.FC = (): JSX.Element => {
                              changeDealer({
                                parentAccountId:
                                  dealers.find(
-                                    (x) => x.name === event.target.value
+                                    (x) => x.id === Number(event.target.value)
                                  )?.id || undefined,
                              })
                            );
@ -190,7 +190,7 @@ const AccountPage: React.FC = (): JSX.Element => {
                            )} --`}
                          </option>
                          {dealers.map((x) => (
-                            <option key={x.name} value={x.name}>
+                            <option key={x.id} value={x.id}>
                              {x.name}
                            </option>
                          ))}
--- a/dictation_client/src/pages/SupportPage/index.tsx
+++ b/dictation_client/src/pages/SupportPage/index.tsx
@ -4,6 +4,7 @@ import { UpdateTokenTimer } from "components/auth/updateTokenTimer";
 import { useTranslation } from "react-i18next";
 import { getTranslationID } from "translation";
 import styles from "styles/app.module.scss";
+import Footer from "components/footer";

 const SupportPage: React.FC = () => {
  const { t } = useTranslation();
@ -45,6 +46,7 @@ const SupportPage: React.FC = () => {
          </section>
        </div>
      </main>
+      <Footer />
    </div>
  );
 };
--- a/dictation_client/src/translation/de.json
+++ b/dictation_client/src/translation/de.json
@ -31,7 +31,9 @@
      "tier4": "Händler",
      "tier5": "Kunde",
      "notSelected": "Keine",
-      "signOutButton": "Abmelden"
+      "signOutButton": "Abmelden",
+      "eula": "End User License Agreement",
+      "privacyNotice": "Privacy Notice"
    }
  },
  "topPage": {
@ -51,7 +53,7 @@
      "logoAlt": "OM Dictation Management System in the Cloud"
    },
    "text": {
-      "maintenanceNotificationTitle": "(de)サービス停止のお知らせ",
+      "maintenanceNotificationTitle": "Hinweis auf geplante Wartungsarbeiten",
      "maintenanceNotification": "Aufgrund von Systemwartungsarbeiten wird ODMS Cloud ab dem 12. Juni, 6:00 Uhr UTC-Zeit, etwa eine Stunde lang nicht verfügbar sein. Wir entschuldigen uns für etwaige Unannehmlichkeiten, die während der Wartung entstanden sind."
    }
  },
@ -652,4 +654,4 @@
      "lowerLayerId": "Lower Layer ID"
    }
  }
-}
+}
--- a/dictation_client/src/translation/en.json
+++ b/dictation_client/src/translation/en.json
@ -31,7 +31,9 @@
      "tier4": "Dealer",
      "tier5": "Customer",
      "notSelected": "None",
-      "signOutButton": "Sign out"
+      "signOutButton": "Sign out",
+      "eula": "End User License Agreement",
+      "privacyNotice": "Privacy Notice"
    }
  },
  "topPage": {
@ -51,7 +53,7 @@
      "logoAlt": "OM Dictation Management System in the Cloud"
    },
    "text": {
-      "maintenanceNotificationTitle": "サービス停止のお知らせ",
+      "maintenanceNotificationTitle": "Notice of scheduled maintenance",
      "maintenanceNotification": "Due to system maintenance, ODMS Cloud will be unavailable for approximately one hour starting from June 12th, 6:00AM UTC time. We apologize for any inconvenience caused during the maintenance."
    }
  },
@ -652,4 +654,4 @@
      "lowerLayerId": "Lower Layer ID"
    }
  }
-}
+}
--- a/dictation_client/src/translation/es.json
+++ b/dictation_client/src/translation/es.json
@ -31,7 +31,9 @@
      "tier4": "Distribuidor",
      "tier5": "Cliente",
      "notSelected": "Ninguno",
-      "signOutButton": "cerrar sesión"
+      "signOutButton": "cerrar sesión",
+      "eula": "End User License Agreement",
+      "privacyNotice": "Privacy Notice"
    }
  },
  "topPage": {
@ -51,7 +53,7 @@
      "logoAlt": "OM Dictation Management System in the Cloud"
    },
    "text": {
-      "maintenanceNotificationTitle": "(es)サービス停止のお知らせ",
+      "maintenanceNotificationTitle": "Aviso de mantenimiento programado",
      "maintenanceNotification": "Debido al mantenimiento del sistema, ODMS Cloud no estará disponible durante aproximadamente una hora a partir del 12 de junio a las 6:00 am, hora UTC. Pedimos disculpas por cualquier inconveniente causado durante el mantenimiento."
    }
  },
@ -652,4 +654,4 @@
      "lowerLayerId": "Lower Layer ID"
    }
  }
-}
+}
--- a/dictation_client/src/translation/fr.json
+++ b/dictation_client/src/translation/fr.json
@ -31,7 +31,9 @@
      "tier4": "Revendeur",
      "tier5": "Client",
      "notSelected": "Aucune",
-      "signOutButton": "se déconnecter"
+      "signOutButton": "se déconnecter",
+      "eula": "End User License Agreement",
+      "privacyNotice": "Privacy Notice"
    }
  },
  "topPage": {
@ -51,7 +53,7 @@
      "logoAlt": "OM Dictation Management System in the Cloud"
    },
    "text": {
-      "maintenanceNotificationTitle": "(fr)サービス停止のお知らせ",
+      "maintenanceNotificationTitle": "Avis de maintenance programmée",
      "maintenanceNotification": "En raison de la maintenance du système, ODMS Cloud sera indisponible pendant environ une heure à partir du 12 juin à 6h00, heure UTC. Nous nous excusons pour tout inconvénient causé lors de la maintenance."
    }
  },
@ -652,4 +654,4 @@
      "lowerLayerId": "Lower Layer ID"
    }
  }
-}
+}