Merge pull request #316 from kbss-cvut/315-rename-patient-record-to-record

Rename patient records to records

Author: palagdan

src/components/dashboard/DashboardController.jsx

@@ -57,7 +57,7 @@ class DashboardController extends React.Component {
 
   _createRecord = () => {
     {
-      /*TODO bug on cancel it doesnt return to dashboard but to patient records */
+      /*TODO bug on cancel it doesnt return to dashboard but to records */
     }
     this.props.transitionToWithOpts(Routes.createRecord, {
       handlers: {

src/components/institution/Institution.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Button, Card } from "react-bootstrap";
 import { FormattedMessage, injectIntl } from "react-intl";
 import InstitutionMembers from "./InstitutionMembers";
-import InstitutionPatients from "./InstitutionPatients";
+import InstitutionRecords from "./InstitutionRecords.jsx";
 import withI18n from "../../i18n/withI18n";
 import HorizontalInput from "../HorizontalInput";
 import PropTypes from "prop-types";
@@ -13,7 +13,7 @@ import { LoaderSmall } from "../Loader";
 import InstitutionValidator from "../../validation/InstitutionValidator";
 import HelpIcon from "../HelpIcon";
 import PromiseTrackingMask from "../misc/PromiseTrackingMask";
-import { canReadInstitutionPatients, canReadInstitutionUsers, canWriteInstitution } from "../../utils/RoleUtils.js";
+import { canReadInstitutionRecords, canReadInstitutionUsers, canWriteInstitution } from "../../utils/RoleUtils.js";
 
 /**
  * Institution detail. Editable only for admins.
@@ -87,11 +87,11 @@ class Institution extends React.Component {
                 {this._renderButtons()}
               </form>
               {!institution.isNew && canReadInstitutionUsers(currentUser, institution.key) && this._renderMembers()}
-              {!institution.isNew && canReadInstitutionPatients(currentUser, institution.key) && (
-                <InstitutionPatients
+              {!institution.isNew && canReadInstitutionRecords(currentUser, institution.key) && (
+                <InstitutionRecords
                   recordsLoaded={recordsLoaded}
                   formTemplatesLoaded={formTemplatesLoaded}
-                  onEdit={this.props.handlers.onEditPatient}
+                  onEdit={this.props.handlers.onEditRecord}
                   onExport={this.props.handlers.onExportRecords}
                   currentUser={currentUser}
                   filterAndSort={this.props.filterAndSort}

src/components/institution/InstitutionController.jsx

@@ -32,7 +32,7 @@ import { trackPromise } from "react-promise-tracker";
 import { INITIAL_PAGE } from "../misc/Pagination";
 import BrowserStorage from "../../utils/BrowserStorage";
 import PropTypes from "prop-types";
-import { canReadInstitutionPatients } from "../../utils/RoleUtils.js";
+import { canReadInstitutionRecords } from "../../utils/RoleUtils.js";
 
 class InstitutionController extends React.Component {
   constructor(props) {
@@ -63,7 +63,7 @@ class InstitutionController extends React.Component {
 
       if (
         this.props.status === ACTION_STATUS.SUCCESS &&
-        canReadInstitutionPatients(this.props.currentUser, institutionKey)
+        canReadInstitutionRecords(this.props.currentUser, institutionKey)
       ) {
         this._loadRecords();
       }
@@ -162,8 +162,8 @@ class InstitutionController extends React.Component {
     });
   };
 
-  _onEditPatient = (patient) => {
-    this.props.transitionToWithOpts(Routes.editRecord, { params: { key: patient.key } });
+  _onEditRecord = (record) => {
+    this.props.transitionToWithOpts(Routes.editRecord, { params: { key: record.key } });
   };
 
   _onExportRecords = (exportType) => {
@@ -206,7 +206,7 @@ class InstitutionController extends React.Component {
       onChange: this._onChange,
       onEditUser: this._onEditUser,
       onAddNewUser: this._onAddNewUser,
-      onEditPatient: this._onEditPatient,
+      onEditRecord: this._onEditRecord,
       onExportRecords: this._onExportRecords,
       onDelete: this._onDeleteUser,
     };

src/components/institution/InstitutionPatients.jsx renamed to src/components/institution/InstitutionRecords.jsx

@@ -6,14 +6,14 @@ import ExportRecordsDropdown from "../record/ExportRecordsDropdown";
 import { useI18n } from "../../hooks/useI18n";
 import { COLUMNS } from "../../constants/DefaultConstants.js";
 
-const InstitutionPatients = (props) => {
+const InstitutionRecords = (props) => {
   const { recordsLoaded, formTemplatesLoaded, onEdit, onExport, currentUser, filterAndSort } = props;
   const { i18n } = useI18n();
 
   return (
     <Card variant="info" className="mt-3">
       <Card.Header className="text-light bg-primary" as="h6">
-        {i18n("institution.patients.panel-title")}
+        {i18n("institution.records.panel-title")}
       </Card.Header>
       <Card.Body>
         <RecordTable
@@ -33,7 +33,7 @@ const InstitutionPatients = (props) => {
   );
 };
 
-InstitutionPatients.propTypes = {
+InstitutionRecords.propTypes = {
   recordsLoaded: PropTypes.object.isRequired,
   formTemplatesLoaded: PropTypes.object.isRequired,
   onEdit: PropTypes.func.isRequired,
@@ -42,4 +42,4 @@ InstitutionPatients.propTypes = {
   filterAndSort: PropTypes.object.isRequired,
 };
 
-export default InstitutionPatients;
+export default InstitutionRecords;

src/components/record/RecordController.jsx

@@ -31,7 +31,7 @@ class RecordController extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      record: this._isNew() ? EntityFactory.initNewPatientRecord() : null,
+      record: this._isNew() ? EntityFactory.initNewRecord() : null,
       saved: false,
       showAlert: false,
     };

src/i18n/cs.js

@@ -140,7 +140,7 @@ export default {
     "institution.email": "Kontaktní email",
     "institution.created": "Instituce zaregistrována {date}",
     "institution.members.panel-title": "Zaměstnanci instituce",
-    "institution.patients.panel-title": "Záznamy instituce",
+    "institution.records.panel-title": "Záznamy instituce",
     "institution.save-success": "Instituce úspěšně uložena.",
     "institution.save-error": "Instituci se nepodařilo uložit. {error}",
     "institution.delete-success": "Instituce úspěšně odstraněna",
@@ -258,7 +258,7 @@ export default {
     "Username cannot contain special characters.": "Přezdívka nesmí obsahovat speciální znaky",
     "Cannot encode an empty password.": "Nelze zašifrovat prázné heslo.",
     "Unable to fetch remote data.": "Nelze načíst vzdálená data.",
-    "User with patient records cannot be deleted.": "Uživatel s vyplněným záznamem nelze odstranit.",
+    "User with records cannot be deleted.": "Uživatel s vyplněným záznamem nelze odstranit.",
     "Cannot update user URI.": "Nelze aktualizovat uživatelské URI.",
     "The passed username already exists.": "Zadané uživatelské jméno již existuje.",
     "User with specified username already exists.": "Uživatel s touto přezdívkou již existuje.",
@@ -269,7 +269,7 @@ export default {
     or: " nebo",
     "error.record.localNameOfRecordIsNotUnique": "Formulářové pole 'Název/Česky' není unikátní napříč všemi záznamy.",
     "error.record.localNameOfRecordIsEmpty": "Formulářové pole 'Název/Česky' je prázdne.",
-    "error.institution.remove.institutionWithMembersOrPatientRecordsCannotBeDeleted":
+    "error.institution.remove.institutionWithMembersOrRecordsCannotBeDeleted":
       "Instituci se zaměstnanci nebo se záznamy nelze odstranit.",
     "error.password.validation.thePassedUsersCurrentPasswordIsDifferentFromTheSpecifiedOne":
       "Původní heslo uživatele neodpovídá heslu uloženému.",

src/i18n/en.js

@@ -138,7 +138,7 @@ export default {
     "institution.email": "Contact email",
     "institution.created": "Institution registered on {date}",
     "institution.members.panel-title": "Institution's members",
-    "institution.patients.panel-title": "Institution's records",
+    "institution.records.panel-title": "Institution's records",
     "institution.save-success": "Institution successfully saved.",
     "institution.save-error": "Unable to save institution. {error}",
     "institution.delete-success": "Institution deleted successfully",
@@ -172,7 +172,7 @@ export default {
     "records.create-tile": "Create",
     "records.opened-study.create-tooltip": "Create new record",
     "records.closed-study.create-tooltip":
-      "Study is closed for addition of patient records. Please, contact a study coordinator in case you need to add new patient record.",
+      "Study is closed for addition of records. Please, contact a study coordinator in case you need to add new record.",
     "records.export": "Export",
     "records.export.excel": "Export to MS Excel",
     "records.export.json": "Export to JSON",
@@ -262,7 +262,7 @@ export default {
     "Username cannot contain special characters.": "Username cannot contain special characters.",
     "Cannot encode an empty password.": "Cannot encode an empty password.",
     "Unable to fetch remote data.": "Unable to fetch remote data.",
-    "User with patient records cannot be deleted.": "User with records cannot be deleted.",
+    "User with records cannot be deleted.": "User with records cannot be deleted.",
     "Cannot update user URI.": "Cannot update user URI:",
     "The passed username already exists.": "The passed username already exists.",
     "User with specified username already exists.": "User with specified username already exists.",
@@ -273,8 +273,8 @@ export default {
     or: " or",
     "error.record.localNameOfRecordIsNotUnique": "Name is not unique.",
     "error.record.localNameOfRecordIsEmpty": "Name is empty.",
-    "error.institution.remove.institutionWithMembersOrPatientRecordsCannotBeDeleted":
-      "Institution with members or patient records cannot be deleted.",
+    "error.institution.remove.institutionWithMembersOrRecordsCannotBeDeleted":
+      "Institution with members or records cannot be deleted.",
     "error.password.validation.thePassedUsersCurrentPasswordIsDifferentFromTheSpecifiedOne":
       "The user's current password is different from the specified one.",
 

src/reducers/RecordReducer.js

@@ -3,7 +3,7 @@ import { ACTION_STATUS } from "../constants/DefaultConstants";
 import without from "lodash/without";
 
 const initialState = {
-  institutionPatients: {},
+  institutionRecords: {},
   recordDeleted: {},
   recordLoaded: {},
   recordSaved: {},

src/utils/EntityFactory.js

@@ -25,7 +25,7 @@ export function initNewInstitution() {
   };
 }
 
-export function initNewPatientRecord() {
+export function initNewRecord() {
   return {
     localName: "",
     formTemplate: "",

src/utils/RoleUtils.js

@@ -32,7 +32,7 @@ export function hasSupersetOfPrivileges(u1, u2) {
   return [...u2RoleSet].every((role) => u1RoleSet.has(role));
 }
 
-export function canReadInstitutionPatients(currentUser, institutionKey) {
+export function canReadInstitutionRecords(currentUser, institutionKey) {
   return (
     hasRole(currentUser, ROLE.READ_ALL_RECORDS) ||
     (hasRole(currentUser, ROLE.READ_ORGANIZATION_RECORDS) && currentUser.institution?.key === institutionKey)