Merge pull request #766 from amida-tech/pre-1.5-merge

Pre 1.5 merge

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "client/app/bower_components"
+}

.gitignore

@@ -1,13 +1,16 @@
 node_modules
 bower_components
 
+typings
+
 .project
 .settings
 .vagrant
 .pem
 
 server/coverage
 client/coverage
+protractor-result
 coverage
 test/coverage
 .DS_Store
@@ -18,6 +21,11 @@ test/coverage
 
 npm-debug.log
 
+log
+
 .anvil
 
 #client/app/styles/main.css
+
+.nodemon_find_ref
+.sass-cache

.jshintrc

@@ -1,18 +1,37 @@
 {
-    "browser": false, // Standard browser globals e.g. `window`, `document`.
-
-    "node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
-    "indent": 4, // Specify indentation spacing
-
+    "bitwise": true,
+    "browser": false,
+    "camelcase": false,
+    "curly": true,
+    "eqeqeq": true,
+    "esnext": true,
     "expr": true,
-    "quotmark":false,
     "globals": {
-        'it': true,
-        'describe': true,
-        'xit': true,
-        'xdescribe': true,
-        'before': true,
-        'after': true,
-        'done': true
-    }
-}
+        "$": false,
+        "DeepDiff": false,
+        "_": true,
+        "after": true,
+        "angular": false,
+        "before": true,
+        "describe": true,
+        "done": true,
+        "it": true,
+        "moment": false,
+        "Promise": true,
+        "xdescribe": true,
+        "xit": true
+    },
+    "immed": true,
+    "indent": 4,
+    "latedef": "nofunc",
+    "multistr": true,
+    "newcap": true,
+    "noarg": true,
+    "node": true,
+    "quotmark": false,
+    "regexp": true,
+    "smarttabs": true,
+    "trailing": true,
+    "undef": true,
+    "unused": false
+}

.travis.yml

@@ -1,29 +1,27 @@
 language: node_js
 node_js:
-- '0.10'
-before_script:
-- npm install -g [email protected]
-- npm install -g mocha
+- '0.12'
+install:
+- npm install -g npm
+- npm install -g bower grunt-cli 
+- npm install -g mocha 
 - npm install -g istanbul
+- npm install -g protractor
 - npm install --quiet
-- sleep 3
-- cd ./client
-- npm install --quiet
-- cd ..
+- bower install
+- webdriver-manager update --firefox
+before_script:
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start 
+- nohup bash -c "webdriver-manager start 2>&1 &"
+- sleep 5
 services:
 - mongodb
 - redis-server
 script:
-- grunt --gruntfile client/Gruntfile.js
 - grunt --gruntfile ./Gruntfile.js
-#- git config --global user.email "[email protected]"
-#- git config --global user.name "Dmitry Kachaev"
-#- git add -A
-#- git commit -a -m "commit post-build files"
-#deploy:
-#  provider: heroku
-#  api_key:
-#    secure: Vd+ZApYihHFIquQXWElWtJjv4Y9Jchy/48GL7DwOH/WHVOdUJT2PlYypSugtQvJI09QbW4Kb/C471kS4+iH/vyg3ZUkc4TCcHnI50EI8F0V2p/CX2GWvA9IS9bUICHseIqfUtrWowGOhOg2gAlPMhqAETgMMB0Z8OWVqnzKr0aU=
-#  app:
-#    master: amida-dre
-#    deployment: amida-dre
+- node server.js &
+- sleep 5
+- grunt travis-protractor --gruntfile ./Gruntfile.js
+notifications:
+  slack: amida:GclZqFLfLqmjWZ4bwUbRIw5M

EntryHeaders.md

@@ -0,0 +1,54 @@
+MHR Component Headers
+=====================
+
+The Master Health Record has summary information in each entry header which varies by component. This is the information that is displayed (using the entryheader.js directive). 
+
+#### 1 - Medications.
+
++ Medication name
++ When/how often it is taken
++ Indication
++ Active/Inactive
+
+#### 2 - Test Results/Labs and Radiology?
+
++ Test name
++ Date
+
+#### 3 - Encounters.
+
++ Encounter name
++ Location/organization name where encounter took place
++ Date of encounter
+
+#### 4 - Vital Signs. 
+
++ Vital name
++ Vital value
++ Date
+
+#### 5 - Immunizations.
+
++ Immunization name
++ Date of immunization(s)
+
+#### 6 - Allergies.
+
++ Date
++ Name
++ Reaction type
+
+#### 7 - Conditions.
+
++ Problem
++ Date of diagnosis
+
+#### 8 - Procedures.
+
++ Procedure name
++ Date
+
+#### 9 - Social History.
+
++ Instead of date use 'current/active' and 'past/inactive'
+