Merge 7ba8859 into 934728b

openhealthcare · Aug 16, 2019 · cd4cb96 · cd4cb96
2 parents 934728b + 7ba8859
commit cd4cb96
Show file tree

Hide file tree

Showing 17 changed files with 269 additions and 841 deletions.
diff --git a/changelog.md b/changelog.md
@@ -11,6 +11,8 @@ Removes the methods PatientDetailCtrl.dischargeEpisode() and PatientListCtrl.dis
 Removes PatientList.removeFromMine()
 (The special casing of the 'Mine' list is strongly unadvised and set for complete removal.)
 
+Removes the front end Flow service
+
 #### Miscelanious changes
 
 Bumps Flake8 version to 3.7.8 - new code will now be required to pass flake8 v3.7.8

diff --git a/doc/docs/guides/flow.md b/doc/docs/guides/flow.md
diff --git a/doc/docs/guides/topic-guides.md b/doc/docs/guides/topic-guides.md
@@ -22,7 +22,6 @@ A list of all available topic guides.
 |[Core Clinical Model](archetypes.md)| The core clinical data model available to Opal applications|
 |[Reference data](referencedata.md) | Canonical coded terms and reference data|
 |[App metadata](metadata.md) | Working with Metadata on the front end  |
-|[Flow](flow.md)            | Hooks to customise key moments in a patient's flow through a clinical service|
 |[Angular models](working_with_data_in_angular.md)|Working with Clinical data in Angular|
 |[Roles & Permissions](roles_and_permissions.md)| How we handle authorization in Opal|
 |[Tagging](tagging.md) | Tagging episodes in Opal |

diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml
@@ -27,7 +27,6 @@ pages:
       - Referencedata: guides/referencedata.md
       - Metadata: guides/metadata.md
       - Angular Models: guides/working_with_data_in_angular.md
-      - Flow: guides/flow.md
       - Roles & Permissions: guides/roles_and_permissions.md
       - Tagging: guides/tagging.md
       - JSON API: guides/json_api.md

diff --git a/opal/core/episodes.py b/opal/core/episodes.py
@@ -16,7 +16,6 @@
 
 Display
 Permissions
-Flow
 
 By registering episode category, plugins and applications can achieve a huge
 degree of flexibility over the behaviour of their episodes.

diff --git a/opal/core/search/static/js/test/search.controller.test.js b/opal/core/search/static/js/test/search.controller.test.js
@@ -4,7 +4,6 @@ describe('SearchCtrl', function (){
     var $scope, $httpBackend, $window, $rootScope, $controller;
     var ngProgressLite
     var location;
-    var Flow;
     var profile, schema, options, locationDetails, controller;
     var PatientSummary, $analytics;
 
@@ -23,7 +22,6 @@ describe('SearchCtrl', function (){
             $rootScope       = $injector.get('$rootScope');
             $scope           = $rootScope.$new();
             $controller      = $injector.get('$controller');
-            Flow             = $injector.get('Flow');
             PatientSummary   = $injector.get('PatientSummary');
             $httpBackend     = $injector.get('$httpBackend');
             location         = $injector.get('$location');
@@ -40,7 +38,6 @@ describe('SearchCtrl', function (){
             controller = $controller('SearchCtrl', {
                 $scope         : $scope,
                 $location      : location,
-                Flow           : Flow,
                 options        : options,
                 schema         : schema,
                 profile        : profile,

diff --git a/opal/static/js/opal/controllers/patient_detail.js b/opal/static/js/opal/controllers/patient_detail.js
@@ -2,7 +2,7 @@ angular.module('opal.controllers').controller(
     'PatientDetailCtrl',
     function(
         $rootScope, $scope, $modal, $location, $routeParams,
-        Flow, Item, patientLoader, patient, profile, metadata
+        Item, patientLoader, patient, profile, metadata
     ){
         $scope.profile = profile;
         $scope.patient = patient;