Merge pull request #1762 from openhealthcare/nope-flow

Nope flow
openhealthcare · Aug 19, 2019 · 47a1f15 · 47a1f15
2 parents 934728b + 03c36e0
commit 47a1f15
Show file tree

Hide file tree

Showing 30 changed files with 270 additions and 1,344 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/application.py b/opal/core/application.py
@@ -83,8 +83,6 @@ class OpalApplication(object):
             "js/opal/controllers/edit_teams.js",
             "js/opal/controllers/delete_item_confirmation.js",
             "js/opal/controllers/account.js",
-            "js/opal/controllers/discharge.js",
-            "js/opal/controllers/undischarge.js",
             "js/opal/controllers/keyboard_shortcuts.js",
             "js/opal/controllers/patient_access_log.js",
             "js/opal/controllers/lookup_list_reference.js"

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/scaffolding/scaffold/app/__init__.py.jinja2 b/opal/scaffolding/scaffold/app/__init__.py.jinja2
@@ -6,5 +6,4 @@ from opal.core import application
 class Application(application.OpalApplication):
     javascripts   = [
         'js/{{ name }}/routes.js',
-        'js/opal/controllers/discharge.js'
     ]
diff --git a/opal/static/js/opal/controllers/discharge.js b/opal/static/js/opal/controllers/discharge.js
diff --git a/opal/static/js/opal/controllers/edit_item.js b/opal/static/js/opal/controllers/edit_item.js
@@ -124,17 +124,6 @@ angular.module('opal.controllers').controller(
 		        $modalInstance.close('cancel');
 	        };
 
-            $scope.undischarge = function() {
-                undischargeMoadal = $modal.open({
-                    templateUrl: '/templates/undischarge_modal.html',
-                    controller: 'UndischargeCtrl',
-                    resolve: {episode: function(){ return episode } }
-                }
-                                               ).result.then(function(result){
-                                                   $modalInstance.close(episode.location[0])
-                                               });
-            };
-
             $scope.prepopulate = function($event) {
                 $event.preventDefault();
                 var data = $($event.target).data()

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;