HealthCard UI; confirm fetch Innovative Express Clinic records

Author: Abigail Watson

app/Styles.js

@@ -257,7 +257,18 @@ let rawStyles = {
     },
     divider: {
       height: '2px'
+    },
+    mainAppDialogPaper: {
+      width: '100%',
+      marginLeft: '0px',
+      marginRight: '0px'
+    },
+    mainAppDialogContainer: {
+      width: '100%',
+      paddingLeft: '40px',
+      paddingRight: '40px'
     }
+
   }
 
 

app/core/QrScannerPage.jsx

@@ -216,8 +216,8 @@ export function QrScannerPage(props){
   }
 
   return (
-    <PageCanvas id='QrScannerPage' headerHeight={headerHeight} paddingLeft={paddingWidth} paddingRight={paddingWidth} style={{overflowX: 'hidden', marginBottom: '80px', background: 'transparent'}}>
-      <Container maxWidth="md" style={{height: containerHeight}}>
+    <PageCanvas id='QrScannerPage' headerHeight={headerHeight} paddingLeft={0} paddingRight={0} style={{overflowX: 'hidden', marginBottom: '80px', background: 'transparent'}}>
+      <Container id="QrScannerContainer" maxWidth="lg" style={{height: containerHeight}}>
         <div style={{display: 'flex', flexDirection: 'column', justifyContent: 'space-between', height: '100%', paddingBottom: '20px'}}>
           <Button color="primary" variant="contained" onClick={activateCamera.bind(this)} style={{width: '100%', marginTop: '20px'}}>
             <CardHeader title="Scan Vaccine Code"  />   

app/layout/Dialog.jsx

@@ -20,7 +20,9 @@ import LogoutDialog from '../core/LogoutDialog';
 
 import { get } from 'lodash';
 
+import theme from '../Theme';
 import logger from '../Logger';
+import useStyles from '../Styles';
 
 // ==============================================================================
 // Dynamic Imports 
@@ -69,13 +71,26 @@ if(Meteor.isClient){
   Session.setDefault('mainAppDialogJson', false);
   Session.setDefault('mainAppDialogErrorMessage', '');
   Session.setDefault('mainAppDialogErrorShowAgain', true);
-  Session.setDefault('mainAppDialogmaxWidth', get(Meteor, 'settings.public.defaults.modals.maxWidth', "xl"));
+  Session.setDefault('mainAppDialogMaxWidth', get(Meteor, 'settings.public.defaults.modals.maxWidth', "xl"));
 
 
   Session.setDefault('showDialogTitle', true);
 }
 
 export default function ScrollDialog(props) {
+  if(typeof logger === "undefined"){
+    logger = props.logger;
+  }
+
+  // ------------------------------------------------------------
+  // Styling
+
+  let classes = useStyles();
+
+
+  // ------------------------------------------------------------
+  // State
+
   let [open, setOpen] = React.useState(false);
   let [scroll, setScroll] = React.useState('paper');
 
@@ -87,7 +102,7 @@ export default function ScrollDialog(props) {
   } = props;
 
   maxWidth = useTracker(function(){
-    return Session.get('mainAppDialogmaxWidth')
+    return Session.get('mainAppDialogMaxWidth')
   }, []);
 
 
@@ -205,14 +220,22 @@ export default function ScrollDialog(props) {
   }
 
   return (
-    <div>
+    <div id="mainDialogContainer">
       <Dialog
+        id="mainDialog"
         open={open}
         onClose={handleClose}
         scroll={scroll}
         maxWidth={maxWidth}
         aria-labelledby="scroll-dialog-title"
         aria-describedby="scroll-dialog-description"
+        classes={{
+          container: classes.mainAppDialogContainer,
+          paper: classes.mainAppDialogPaper 
+        }}        
+        style={{
+          marginLeft: '0px', marginRight: '0px', 
+          paddingLeft: '0px', paddingRight: '0px'}}
       >        
         { dialogTitleToRender }
         { dialogContentToRender }

packages/vaccine-wallet

@@ -1 +1 @@
-Subproject commit a0ccb7211fbae8d854b54fd3027d54f80be7b6a5
+Subproject commit aff0bdf87e4156ec81ed97998eef4fe7192286c8

server/SmartHealthCards.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check'
+
 import { HTTP } from 'meteor/http';
 import { Random } from 'meteor/random';
 import { get, has, findIndex } from 'lodash';
@@ -256,7 +258,7 @@ Meteor.methods({
         return shcNumericString;
     },
     parseHealthCard: async function(healthCardToken){
-        check(healthCardToken, Object);
+        check(healthCardToken, String);
         console.log('==============================================================================')
         console.log('parseHealthCard().healthCardToken', healthCardToken)