Merge pull request #504 from FluxNotes/fix-build-bugs

Fix build bugs

package.json

@@ -3,14 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "babel-cli": "6.26.0",
-    "babel-plugin-transform-class-properties": "6.24.1",
-    "babel-plugin-transform-es2015-destructuring": "6.23.0",
-    "babel-plugin-transform-object-rest-spread": "6.26.0",
-    "babel-plugin-transform-require-ignore": "0.1.1",
-    "babel-polyfill": "6.23.0",
-    "babel-preset-es2015": "6.24.1",
-    "chai": "4.1.2",
     "commander": "2.9.0",
     "cql-exec-fhir": "^1.0.0",
     "cql-exec-vsac": "^1.0.0",
@@ -35,8 +27,6 @@
     "material-ui-icons": "1.0.0-beta.15",
     "mkdirp": "0.5.1",
     "moment": "2.22.0",
-    "node-sass-chokidar": "0.0.3",
-    "npm-run-all": "^4.1.2",
     "positions": "1.6.1",
     "prop-types": "15.5.10",
     "rc-calendar": "^9.0.4",
@@ -55,7 +45,6 @@
     "react-router": "^4.2.0",
     "react-router-dom": "4.2.2",
     "react-router-redux": "^5.0.0-alpha.9",
-    "react-scripts": "0.9.5",
     "react-tap-event-plugin": "2.0.1",
     "recharts": "1.0.0-beta.6",
     "redux": "^3.7.2",
@@ -69,6 +58,17 @@
     "sync-request": "^4.1.0"
   },
   "devDependencies": {
+    "babel-cli": "6.26.0",
+    "babel-plugin-transform-class-properties": "6.24.1",
+    "babel-plugin-transform-es2015-destructuring": "6.23.0",
+    "babel-plugin-transform-object-rest-spread": "6.26.0",
+    "babel-plugin-transform-require-ignore": "0.1.1",
+    "node-sass-chokidar": "0.0.3",
+    "npm-run-all": "^4.1.2",
+    "babel-polyfill": "6.23.0",
+    "babel-preset-es2015": "6.24.1",
+    "react-scripts": "0.9.5",
+    "chai": "4.1.2",
     "enzyme": "3.0.0",
     "enzyme-adapter-react-15": "1.0.0",
     "react-test-renderer": "15.6.2",
@@ -83,7 +83,7 @@
     "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
     "start-js": "react-scripts start",
     "start": "npm-run-all -p watch-css start-js",
-    "build-js": "react-scripts build",
+    "build-js": "node --max-old-space-size=4096 --max_old_space_size=4096 node_modules/.bin/react-scripts build",
     "build": "npm-run-all build-css build-js",
     "eject": "react-scripts eject",
     "parse": "babel-node --presets es2015,react --plugins transform-class-properties,transform-es2015-destructuring,transform-object-rest-spread ./src/noteparser/app.js",

src/patient/PatientRecord.jsx

@@ -1039,12 +1039,11 @@ class PatientRecord {
 
     getEntriesOfType(type) {
         return this.entries.filter((item) => {
-            return item.constructor.name === type.name;
+            return item instanceof type;
         });
     }
 
     getEntriesOfEntryType(entryType) {
-        console.log(entryType)
         return this.entries.filter((entry) => {
             return entry.entryInfo.entryType && entry.entryInfo.entryType.value === entryType;
         });