Merge remote-tracking branch 'origin/master' into feat/opd-report

eHealthAfrica · Jan 30, 2017 · d16bc06 · d16bc06
2 parents f24c59e + b16ee17
commit d16bc06
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 78 deletions.
diff --git a/app/admin/custom-forms/edit/controller.js b/app/admin/custom-forms/edit/controller.js
@@ -75,7 +75,6 @@ export default AbstractEditController.extend({
   }),
 
   formTypeValues: [
-    'operationReport',
     'operativePlan',
     'patient',
     'socialwork',

diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
@@ -134,8 +134,7 @@ export default {
         includeOtherOption: 'Include Other Option',
         label: 'Label',
         newForm: 'New Form',
-        operationReportFormType: 'Operation Report',
-        operativePlanFormType: 'Operative Plan',
+        operativePlanFormType: 'Operative Plan and Report',
         otherOptionLabel: 'Other Option Label',
         patientFormType: 'Patient',
         property: 'Property',

diff --git a/app/mixins/navigation.js b/app/mixins/navigation.js
@@ -291,12 +291,6 @@ export default Ember.Mixin.create({
           iconClass: 'octicon-chevron-right',
           route: 'admin.roles',
           capability: 'define_user_roles'
-        },
-        {
-          title: 'Workflow',
-          iconClass: 'octicon-chevron-right',
-          route: 'admin.workflow',
-          capability: 'update_config'
         }
       ]
     }

diff --git a/app/patients/operation-report/route.js b/app/patients/operation-report/route.js
@@ -13,6 +13,6 @@ export default AbstractEditRoute.extend({
     let newData = {
       customForms: Ember.Object.create()
     };
-    return customForms.setDefaultCustomForms(['operationReport'], newData);
+    return customForms.setDefaultCustomForms(['operativePlan'], newData);
   }
 });
diff --git a/app/patients/operation-report/template.hbs b/app/patients/operation-report/template.hbs
@@ -32,6 +32,6 @@
     </div>
     {{operative-procedures model=model procedureList=procedureList}}
     {{em-text property="additionalNotes" label=(t 'operationReport.labels.additionalNotes')}}
-    {{custom-form-manager model=model formType="operationReport"}}
+    {{custom-form-manager model=model formType="operativePlan"}}
   {{/em-form}}
 {{/edit-panel}}
diff --git a/app/patients/operative-plan/controller.js b/app/patients/operative-plan/controller.js
@@ -18,6 +18,7 @@ const {
 const PLAN_KEYS_TO_COPY = [
   'additionalNotes',
   'caseComplexity',
+  'customForms',
   'patient',
   'procedures',
   'operationDescription',

diff --git a/...alrun-38a54f98b12e54e0f5ba180d922ed4ae.js → ...alrun-46e7b2466fc73d5406bd19252eed1865.js b/...alrun-38a54f98b12e54e0f5ba180d922ed4ae.js → ...alrun-46e7b2466fc73d5406bd19252eed1865.js
diff --git a/prod/assets/vendor-80966598fce8f30be95b5ab02fe4b305.js b/prod/assets/vendor-80966598fce8f30be95b5ab02fe4b305.js
diff --git a/prod/assets/vendor-fbb0a62b2ab75946f6a34fb066ad5d78.js b/prod/assets/vendor-fbb0a62b2ab75946f6a34fb066ad5d78.js
diff --git a/prod/index.html b/prod/index.html
@@ -10,7 +10,7 @@
     <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
 
 
-<meta name="hospitalrun/config/environment" content="%7B%22modulePrefix%22%3A%22hospitalrun%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22hospitalrun%22%2C%22version%22%3A%220.9.17+c9cab8ce%22%7D%2C%22contentSecurityPolicy%22%3A%7B%22connect-src%22%3A%22%27self%27%22%2C%22default-src%22%3A%22%27self%27%22%2C%22frame-src%22%3A%22%27self%27%22%2C%22img-src%22%3A%22%27self%27%20filesystem%3A%20data%3A%22%2C%22script-src%22%3A%22%27self%27%20%27unsafe-inline%27%20%27unsafe-eval%27%22%2C%22style-src%22%3A%22%27self%27%20%27unsafe-inline%27%22%2C%22font-src%22%3A%5B%22%27self%27%22%5D%2C%22media-src%22%3A%5B%22%27self%27%22%5D%7D%2C%22i18n%22%3A%7B%22defaultLocale%22%3A%22en%22%7D%2C%22manifest%22%3A%7B%22enabled%22%3Atrue%2C%22appcacheFile%22%3A%22/manifest.appcache%22%2C%22excludePaths%22%3A%5B%22index.html%22%2C%22tests/index.html%22%2C%22robots.txt%22%2C%22crossdomain.xml%22%2C%22testem.js%22%5D%2C%22showCreateDate%22%3Atrue%2C%22includePaths%22%3A%5B%5D%2C%22network%22%3A%5B%22*%22%5D%7D%2C%22serviceWorker%22%3A%7B%22enabled%22%3Atrue%2C%22debug%22%3Afalse%2C%22excludePaths%22%3A%5B%22manifest.appcache%22%5D%2C%22swIncludeFiles%22%3A%5B%22node_modules/pouchdb/dist/pouchdb.js%22%5D%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy-Report-Only%22%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="hospitalrun/config/environment" content="%7B%22modulePrefix%22%3A%22hospitalrun%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22hospitalrun%22%2C%22version%22%3A%220.9.17+bc5ef6c6%22%7D%2C%22contentSecurityPolicy%22%3A%7B%22connect-src%22%3A%22%27self%27%22%2C%22default-src%22%3A%22%27self%27%22%2C%22frame-src%22%3A%22%27self%27%22%2C%22img-src%22%3A%22%27self%27%20filesystem%3A%20data%3A%22%2C%22script-src%22%3A%22%27self%27%20%27unsafe-inline%27%20%27unsafe-eval%27%22%2C%22style-src%22%3A%22%27self%27%20%27unsafe-inline%27%22%2C%22font-src%22%3A%5B%22%27self%27%22%5D%2C%22media-src%22%3A%5B%22%27self%27%22%5D%7D%2C%22i18n%22%3A%7B%22defaultLocale%22%3A%22en%22%7D%2C%22manifest%22%3A%7B%22enabled%22%3Atrue%2C%22appcacheFile%22%3A%22/manifest.appcache%22%2C%22excludePaths%22%3A%5B%22index.html%22%2C%22tests/index.html%22%2C%22robots.txt%22%2C%22crossdomain.xml%22%2C%22testem.js%22%5D%2C%22showCreateDate%22%3Atrue%2C%22includePaths%22%3A%5B%5D%2C%22network%22%3A%5B%22*%22%5D%7D%2C%22serviceWorker%22%3A%7B%22enabled%22%3Atrue%2C%22debug%22%3Afalse%2C%22excludePaths%22%3A%5B%22manifest.appcache%22%5D%2C%22swIncludeFiles%22%3A%5B%22node_modules/pouchdb/dist/pouchdb.js%22%5D%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy-Report-Only%22%2C%22exportApplicationGlobal%22%3Afalse%7D" />
 
     <link rel="stylesheet" href="/assets/vendor-ed8acd5f4063b4b83b5df16f6da9e8b0.css" integrity="sha256-8SEzsmD/Yu0KXXOOfKz1o2a7UPfUg0z/idfuC6vxZWY= sha512-rBdZdkJyfXTenDbP1KZYS3FLalUji+IE+vxyRjp0xrjs0jI7NO4zKk6EkPAC3XGwtiVf3Fy/PnJpQM3VOZd7Pg==" >
     <link rel="stylesheet" href="/assets/hospitalrun-b0e09cdd6138878cb83c34961b0d81e0.css" integrity="sha256-eR6nGVnvl8W/B6Br1wbLjzg+USMpQe3a+o5tHRRtgyU= sha512-LgETtTsojG9IV7PcdQUg23VcbHMtZX4wvBwSd9lOv416i3uXA3XmsQj9NIpxBICs8/1HkwPXCqsrMt0qK7oKxg==" >
@@ -44,8 +44,8 @@
     </script>
 
 
-    <script src="/assets/vendor-80966598fce8f30be95b5ab02fe4b305.js" integrity="sha256-cp5Jl0ldY/hzA0YHNIoH4Cd9cyxMWuB8YwYNWUfZToA= sha512-7cT8uJ8JtqTJBW3uTWIU0P542WJzA3yYex8B8OUJFJHkg0hD4y6QbC5SUUJOJna8jhyTr6pRMO8VEJ2ZhKSdaA==" ></script>
-    <script src="/assets/hospitalrun-38a54f98b12e54e0f5ba180d922ed4ae.js" integrity="sha256-CggS49lLomQFyVq313n35iwY2KYUCzDo1T/JtyFMAXU= sha512-eAJauUAmrFlENFyesF9h/kSe35VU5kO/+kxJL/rIkF9bZj3V/s8vZwM985i3nQ7+UTT0EP7H7ZUAAyiMEA7z0A==" ></script>
+    <script src="/assets/vendor-fbb0a62b2ab75946f6a34fb066ad5d78.js" integrity="sha256-ZVMACso7Ehquf+G2ujxh6Ha6gEwlu4hZ8adZT+TB40M= sha512-/wg1VVnbS/m88v6et3HTw3li4ApcDFmvCjbJllKEy4AozCRpyTEfCzBlSLO8kxrveBLVQEH8FnUSFZq+kwMOvg==" ></script>
+    <script src="/assets/hospitalrun-46e7b2466fc73d5406bd19252eed1865.js" integrity="sha256-l+r0L/1TsaHhnShiAdOPcd2ztmTGNlOKrfjxaVkckUo= sha512-xUttFQXwPYw/9B5X4j5oeqrRH1BQuxfQAL9DhRDt1EXe1VtwX+e/SYalxt6KyVLXuweE+IhCWjIzbGq50h5bBA==" ></script>
 
     <script>if ('serviceWorker' in navigator) {
   navigator.serviceWorker.register('/service-worker.js', {scope: '/'})

diff --git a/prod/manifest.appcache b/prod/manifest.appcache
@@ -1,11 +1,11 @@
 CACHE MANIFEST
-# created 2017-01-24T19:10:38.229Z
+# created 2017-01-26T21:45:52.039Z
 
 CACHE:
-assets/hospitalrun-38a54f98b12e54e0f5ba180d922ed4ae.js
+assets/hospitalrun-46e7b2466fc73d5406bd19252eed1865.js
 assets/hospitalrun-b0e09cdd6138878cb83c34961b0d81e0.css
-assets/vendor-80966598fce8f30be95b5ab02fe4b305.js
 assets/vendor-ed8acd5f4063b4b83b5df16f6da9e8b0.css
+assets/vendor-fbb0a62b2ab75946f6a34fb066ad5d78.js
 dymo/BarcodeAsImage.label
 favicon-7440091f4e8bd83e23e4d5824c2c3da4.png
 favicon.ico

diff --git a/prod/service-worker.js b/prod/service-worker.js
@@ -1,14 +1,14 @@
 var swEnvironment = {};
 importScripts('sw-toolbox.js');
 var CACHE_PREFIX = 'brocsw-v';
-var CACHE_VERSION = CACHE_PREFIX+'1485285038315';
+var CACHE_VERSION = CACHE_PREFIX+'1485467152142';
 toolbox.options.cache.name = CACHE_VERSION;
 var urlsToPrefetch = [
     '/',
-    "assets/hospitalrun-38a54f98b12e54e0f5ba180d922ed4ae.js",
+    "assets/hospitalrun-46e7b2466fc73d5406bd19252eed1865.js",
     "assets/hospitalrun-b0e09cdd6138878cb83c34961b0d81e0.css",
-    "assets/vendor-80966598fce8f30be95b5ab02fe4b305.js",
     "assets/vendor-ed8acd5f4063b4b83b5df16f6da9e8b0.css",
+    "assets/vendor-fbb0a62b2ab75946f6a34fb066ad5d78.js",
     "crossdomain.xml",
     "dymo/BarcodeAsImage.label",
     "favicon-7440091f4e8bd83e23e4d5824c2c3da4.png",