diff --git a/src/adminApp/ApplicationMenu/ApplicationMenuShow.js b/src/adminApp/ApplicationMenu/ApplicationMenuShow.js index b1018d804..64b4b1765 100644 --- a/src/adminApp/ApplicationMenu/ApplicationMenuShow.js +++ b/src/adminApp/ApplicationMenu/ApplicationMenuShow.js @@ -6,7 +6,7 @@ import { Title } from "react-admin"; import Button from "@material-ui/core/Button"; import Grid from "@material-ui/core/Grid"; import _ from "lodash"; -import { Audit } from "../../formDesigner/components/Audit"; +import { SystemInfo } from "../../formDesigner/components/SystemInfo"; import RuleDisplay from "../components/RuleDisplay"; import ApplicationMenuService from "../service/ApplicationMenuService"; import { ShowLabelValue } from "../../formDesigner/common/ShowLabelValue"; @@ -52,7 +52,7 @@ const ApplicationMenuShow = props => {

)} - + {editAlert && } diff --git a/src/adminApp/EncounterType/EncounterTypeShow.js b/src/adminApp/EncounterType/EncounterTypeShow.js index 718ffd04a..48738387b 100644 --- a/src/adminApp/EncounterType/EncounterTypeShow.js +++ b/src/adminApp/EncounterType/EncounterTypeShow.js @@ -15,7 +15,7 @@ import { findProgramEncounterForm } from "../domain/formMapping"; import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow"; -import { Audit } from "../../formDesigner/components/Audit"; +import { SystemInfo } from "../../formDesigner/components/SystemInfo"; import RuleDisplay from "../components/RuleDisplay"; import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer"; import { getMessageRules, getMessageTemplates } from "../service/MessageService"; @@ -166,7 +166,7 @@ const EncounterTypeShow = props => { readOnly={true} />

- + {editAlert && } diff --git a/src/adminApp/Program/ProgramShow.js b/src/adminApp/Program/ProgramShow.js index 023cd9d1b..654f42b55 100644 --- a/src/adminApp/Program/ProgramShow.js +++ b/src/adminApp/Program/ProgramShow.js @@ -11,7 +11,7 @@ import { ShowSubjectType } from "../WorkFlow/ShowSubjectType"; import { get, identity } from "lodash"; import { findProgramEnrolmentForm, findProgramExitForm } from "../domain/formMapping"; import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow"; -import { Audit } from "../../formDesigner/components/Audit"; +import { SystemInfo } from "../../formDesigner/components/SystemInfo"; import RuleDisplay from "../components/RuleDisplay"; import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer"; import { getMessageRules, getMessageTemplates } from "../service/MessageService"; @@ -173,7 +173,7 @@ const ProgramShow = props => { entityTypeId={program.programId} readOnly={true} /> - + {editAlert && } diff --git a/src/adminApp/SubjectType/SubjectTypeShow.js b/src/adminApp/SubjectType/SubjectTypeShow.js index 0d91286e4..da648d53c 100644 --- a/src/adminApp/SubjectType/SubjectTypeShow.js +++ b/src/adminApp/SubjectType/SubjectTypeShow.js @@ -12,7 +12,7 @@ import { GroupRoleShow } from "./GroupRoleShow"; import { findRegistrationForm } from "../domain/formMapping"; import { useFormMappings, useLocationType } from "./effects"; import { BooleanStatusInShow } from "../../common/components/BooleanStatusInShow"; -import { Audit } from "../../formDesigner/components/Audit"; +import { SystemInfo } from "../../formDesigner/components/SystemInfo"; import { AdvancedSettingShow } from "./AdvancedSettingShow"; import RuleDisplay from "../components/RuleDisplay"; import { MessageReducer } from "../../formDesigner/components/MessageRule/MessageReducer"; @@ -150,7 +150,7 @@ const SubjectTypeShow = props => { /> {subjectType.group && } - + {editAlert && } diff --git a/src/documentation/components/Documentation.js b/src/documentation/components/Documentation.js index a43e10369..7330b8d69 100644 --- a/src/documentation/components/Documentation.js +++ b/src/documentation/components/Documentation.js @@ -9,7 +9,7 @@ import { DocumentationItem } from "./DocumentationItem"; import { SaveComponent } from "../../common/components/SaveComponent"; import api from "../api"; import { cloneForSave } from "../reducers"; -import { Audit } from "../../formDesigner/components/Audit"; +import { SystemInfo } from "../../formDesigner/components/SystemInfo"; import { Privilege } from "openchs-models"; import UserInfo from "../../common/model/UserInfo"; import { connect } from "react-redux"; @@ -96,7 +96,7 @@ const Documentation = ({ userInfo }) => { /> {createdBy && ( -

- + {editAlert && } diff --git a/src/formDesigner/components/SystemInfo.js b/src/formDesigner/components/SystemInfo.js index 65b72ffa6..04e54f5c8 100644 --- a/src/formDesigner/components/SystemInfo.js +++ b/src/formDesigner/components/SystemInfo.js @@ -2,8 +2,10 @@ import React from "react"; import { Grid } from "@material-ui/core"; import FormLabel from "@material-ui/core/FormLabel"; import { createdAudit, modifiedAudit } from "../../adminApp/components/AuditUtil"; +import _ from "lodash"; -export const Audit = ({ +export const SystemInfo = ({ + uuid, createdBy, lastModifiedBy, createdDateTime, @@ -40,6 +42,16 @@ export const Audit = ({ })} + {!_.isEmpty(uuid) && ( + + + UUID + + + {uuid} + + + )} ); diff --git a/src/formDesigner/views/FormDetails.js b/src/formDesigner/views/FormDetails.js index 3e76f07f8..55700aef5 100644 --- a/src/formDesigner/views/FormDetails.js +++ b/src/formDesigner/views/FormDetails.js @@ -20,7 +20,7 @@ import { Redirect } from "react-router-dom"; import { SaveComponent } from "../../common/components/SaveComponent"; import FormLevelRules from "../components/FormLevelRules"; -import { Audit } from "../components/Audit"; +import { SystemInfo } from "../components/SystemInfo"; import StaticFormElementGroup from "../components/StaticFormElementGroup"; import { DeclarativeRuleHolder } from "rules-config"; import FormDesignerContext from "./FormDesignerContext"; @@ -1124,7 +1124,7 @@ class FormDetails extends Component { - + {/* */}