add antemortem postmortem sample types

I-TECH-UW · Sep 19, 2023 · f45d800 · f45d800
1 parent e4d9cd8
commit f45d800
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/frontend/src/components/layout/Header.js b/frontend/src/components/layout/Header.js
@@ -6,14 +6,13 @@ import UserSessionDetailsContext from "../../UserSessionDetailsContext";
 import "../Style.css";
 import { Select, SelectItem } from "@carbon/react";
 import config from "../../config.json";
-import { getFromOpenElisServer } from "../utils/Utils";
 import {
   Search,
   Notification,
   Language,
   UserAvatarFilledAlt,
   Logout,
-  Close 
+  Close,
 } from "@carbon/icons-react";
 
 import {
@@ -33,7 +32,7 @@ import {
 
 function OEHeader(props) {
   const { releaseNumber } = useContext(ConfigurationContext);
-  const {BANNER_TEXT} = useContext(ConfigurationContext);
+  const { BANNER_TEXT } = useContext(ConfigurationContext);
   const { userSessionDetails, logout } = useContext(UserSessionDetailsContext);
   const [switchCollapsed, setSwitchCollapsed] = useState(true);
   const userSwitchRef = createRef();
@@ -51,9 +50,15 @@ function OEHeader(props) {
 
   const panelSwitchIcon = () => {
     return userSessionDetails.authenticated ? (
-       switchCollapsed?<UserAvatarFilledAlt size={20} />:<Close size={20}/>
+      switchCollapsed ? (
+        <UserAvatarFilledAlt size={20} />
+      ) : (
+        <Close size={20} />
+      )
+    ) : switchCollapsed ? (
+      <Language size={20} />
     ) : (
-      switchCollapsed? <Language size={20} />:<Close size={20}/>
+      <Close size={20} />
     );
   };
 
@@ -76,7 +81,7 @@ function OEHeader(props) {
       <div className="container">
         <Theme>
           <HeaderContainer
-            render={({ isSideNavExpanded, onClickSideNavExpand}) => (
+            render={({ isSideNavExpanded, onClickSideNavExpand }) => (
               <Header id="mainHeader" className="mainHeader" aria-label="">
                 {userSessionDetails.authenticated && (
                   <HeaderMenuButton
@@ -173,7 +178,11 @@ function OEHeader(props) {
                       </Select>
                     </li>
                     <li className="userDetails">
-                      <label className="cds--label"> <FormattedMessage id="header.label.version" />: {releaseNumber}</label>
+                      <label className="cds--label">
+                        {" "}
+                        <FormattedMessage id="header.label.version" />:{" "}
+                        {releaseNumber}
+                      </label>
                     </li>
                   </ul>
                 </HeaderPanel>
@@ -321,7 +330,12 @@ function OEHeader(props) {
                           <SideNavMenuItem href="/validation?type=routine">
                             <FormattedMessage id="sidenav.label.validation.routine" />
                           </SideNavMenuItem>
-                          <SideNavMenuItem href={config.serverBaseUrl + "/ResultValidationRetroC?type=Immunology"}>
+                          <SideNavMenuItem
+                            href={
+                              config.serverBaseUrl +
+                              "/ResultValidationRetroC?type=Immunology"
+                            }
+                          >
                             <FormattedMessage id="sidenav.label.validation.study" />
                           </SideNavMenuItem>
                           <SideNavMenuItem href="/validation?type=order">

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 		<major.version>2</major.version>
 		<minor.version>8</minor.version>
 		<state.version>0</state.version> <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-		<fix.version>14</fix.version>
+		<fix.version>15</fix.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
 		<castor.version>1.4.1</castor.version>

diff --git a/src/main/resources/liquibase/2.8.x.x/base.xml b/src/main/resources/liquibase/2.8.x.x/base.xml
@@ -11,4 +11,5 @@
 	<include relativeToChangelogFile="true" file="calculated_value.xml" />
 	<include relativeToChangelogFile="true" file="immunohistochemistry.xml" />
 	<include relativeToChangelogFile="true" file="cytology.xml" />
+	<include relativeToChangelogFile="true" file="sample_types.xml" />
 </databaseChangeLog>
diff --git a/src/main/resources/liquibase/2.8.x.x/immunohistochemistry.xml b/src/main/resources/liquibase/2.8.x.x/immunohistochemistry.xml
@@ -130,7 +130,7 @@
 		<validCheckSum>8:0fb458f9d4381982c866b642617489ba</validCheckSum>
 		<preConditions onFail="MARK_RAN">
         	<sqlCheck expectedResult="0">
-				select count(*) from clinlims.test where description = 'Immunohistochemistry examination'; 
+				select count(*) from clinlims.test where description = 'Anti-Pan Keratin'; 
 			</sqlCheck>
 		</preConditions>
 		<comment>add immunohistochemistry test and sample type info</comment>