From 0a706761d1845a259aa4ad6ab48535668aba0cfb Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 24 Oct 2018 14:40:09 +0100 Subject: [PATCH 1/4] Remove logicless UndischargeEpisodeTempalteView refs #1341 --- opal/static/js/opal/controllers/edit_item.js | 2 +- opal/urls.py | 5 ----- opal/views.py | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/opal/static/js/opal/controllers/edit_item.js b/opal/static/js/opal/controllers/edit_item.js index 453ab2b4f..ea7dcd891 100644 --- a/opal/static/js/opal/controllers/edit_item.js +++ b/opal/static/js/opal/controllers/edit_item.js @@ -122,7 +122,7 @@ angular.module('opal.controllers').controller( $scope.undischarge = function() { undischargeMoadal = $modal.open({ - templateUrl: '/templates/modals/undischarge.html/', + templateUrl: '/templates/undischarge_modal.html', controller: 'UndischargeCtrl', resolve: {episode: function(){ return episode } } } diff --git a/opal/urls.py b/opal/urls.py index 37457082c..a6328c7c5 100644 --- a/opal/urls.py +++ b/opal/urls.py @@ -43,11 +43,6 @@ url(r'^templates/episode_detail.html/(?P\d+)/?$', views.EpisodeDetailTemplateView.as_view(), name="episode_detail"), - url(r'^templates/modals/undischarge.html/?$', - views.UndischargeTemplateView.as_view(), - name="undischarge_tempate_view" - ), - url(r'^templates/modals/discharge_episode.html/?$', views.DischargeEpisodeTemplateView.as_view()), diff --git a/opal/views.py b/opal/views.py index d99ed6746..959d8f0f4 100644 --- a/opal/views.py +++ b/opal/views.py @@ -224,10 +224,6 @@ def get_context_data(self, *a, **k): return data -class UndischargeTemplateView(LoginRequiredMixin, TemplateView): - template_name = 'undischarge_modal.html' - - class DischargeEpisodeTemplateView(LoginRequiredMixin, TemplateView): template_name = 'discharge_episode_modal.html' From fe5f98cef6ae0bbcdbe249c62a6254417829479b Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 24 Oct 2018 14:45:13 +0100 Subject: [PATCH 2/4] Delete DischargeEpisodeTemplateView refs #1341 --- doc/docs/guides/flow.md | 2 +- opal/scaffolding/scaffold/app/static/js/app/flow.js | 2 +- opal/static/js/opal/services/flow.js | 2 +- opal/static/js/test/flow.service.test.js | 4 ++-- opal/urls.py | 3 --- opal/views.py | 4 ---- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/docs/guides/flow.md b/doc/docs/guides/flow.md index 19500f688..65b6ca88e 100644 --- a/doc/docs/guides/flow.md +++ b/doc/docs/guides/flow.md @@ -64,6 +64,6 @@ that acts differently for deceased patients might look as follows } return { 'controller': 'DischargeEpisodeCtrl', - 'template' : '/templates/modals/discharge_episode.html/' + 'template' : '/templates/discharge_episode_modal.html' } } diff --git a/opal/scaffolding/scaffold/app/static/js/app/flow.js b/opal/scaffolding/scaffold/app/static/js/app/flow.js index 165f1f185..5b0cfb112 100644 --- a/opal/scaffolding/scaffold/app/static/js/app/flow.js +++ b/opal/scaffolding/scaffold/app/static/js/app/flow.js @@ -19,7 +19,7 @@ angular.module('opal.services').factory('AppFlow', function($routeParams){ exit: function(){ return { 'controller': 'DischargeEpisodeCtrl', - 'template' : '/templates/modals/discharge_episode.html/' + 'template' : '/templates/discharge_episode_modal.html' } } }; diff --git a/opal/static/js/opal/services/flow.js b/opal/static/js/opal/services/flow.js index 91e0fe824..cd6273a38 100644 --- a/opal/static/js/opal/services/flow.js +++ b/opal/static/js/opal/services/flow.js @@ -19,7 +19,7 @@ angular.module( exit: function(){ return { 'controller': 'DischargeEpisodeCtrl', - 'template' : '/templates/modals/discharge_episode.html/' + 'template' : '/templates/discharge_episode_modal.html' }; } }; diff --git a/opal/static/js/test/flow.service.test.js b/opal/static/js/test/flow.service.test.js index 1ca0b4016..f52660bf9 100644 --- a/opal/static/js/test/flow.service.test.js +++ b/opal/static/js/test/flow.service.test.js @@ -52,7 +52,7 @@ describe('Flow ', function(){ Flow.exit('episode', {current_tags: {}}, {some: "context"}); var args = $modal.open.calls.mostRecent().args; expect(args[0].controller).toEqual('DischargeEpisodeCtrl'); - expect(args[0].templateUrl).toEqual('/templates/modals/discharge_episode.html/'); + expect(args[0].templateUrl).toEqual('/templates/discharge_episode_modal.html'); var resolves = args[0].resolve; expect(resolves.tags()).toEqual({}); expect(resolves.episode()).toEqual('episode'); @@ -94,7 +94,7 @@ describe('Flow ', function(){ exit: jasmine.createSpy().and.returnValue( { 'controller': 'DischargeEpisodeCtrl', - 'template' : '/templates/modals/discharge_episode.html/' + 'template' : '/templates/discharge_episode_modal.html' } ) }; diff --git a/opal/urls.py b/opal/urls.py index a6328c7c5..451baa67c 100644 --- a/opal/urls.py +++ b/opal/urls.py @@ -43,9 +43,6 @@ url(r'^templates/episode_detail.html/(?P\d+)/?$', views.EpisodeDetailTemplateView.as_view(), name="episode_detail"), - url(r'^templates/modals/discharge_episode.html/?$', - views.DischargeEpisodeTemplateView.as_view()), - url(r'^templates/modals/delete_item_confirmation.html/?$', views.DeleteItemConfirmationView.as_view()), diff --git a/opal/views.py b/opal/views.py index 959d8f0f4..40f6bdefd 100644 --- a/opal/views.py +++ b/opal/views.py @@ -224,10 +224,6 @@ def get_context_data(self, *a, **k): return data -class DischargeEpisodeTemplateView(LoginRequiredMixin, TemplateView): - template_name = 'discharge_episode_modal.html' - - class DeleteItemConfirmationView(LoginRequiredMixin, TemplateView): template_name = 'delete_item_confirmation_modal.html' From 45fe943860e6336ea8f26cf973df8edbb373b40f Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 24 Oct 2018 14:48:10 +0100 Subject: [PATCH 3/4] Delete logicless DeleteItemConfirmationView refs #1341 --- opal/static/js/opal/controllers/edit_item.js | 2 +- opal/static/js/opal/services/record_editor.js | 2 +- opal/static/js/test/edit_item.controller.test.js | 2 +- opal/static/js/test/record_editor_test.js | 2 +- opal/urls.py | 3 --- opal/views.py | 4 ---- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/opal/static/js/opal/controllers/edit_item.js b/opal/static/js/opal/controllers/edit_item.js index ea7dcd891..107df4987 100644 --- a/opal/static/js/opal/controllers/edit_item.js +++ b/opal/static/js/opal/controllers/edit_item.js @@ -80,7 +80,7 @@ angular.module('opal.controllers').controller( $scope.delete = function(result){ $modalInstance.close(result); var modal = $modal.open({ - templateUrl: '/templates/modals/delete_item_confirmation.html/', + templateUrl: '/templates/delete_item_confirmation_modal.html', controller: 'DeleteItemConfirmationCtrl', resolve: { item: function() { diff --git a/opal/static/js/opal/services/record_editor.js b/opal/static/js/opal/services/record_editor.js index 174f6fa4e..1630f8630 100644 --- a/opal/static/js/opal/services/record_editor.js +++ b/opal/static/js/opal/services/record_editor.js @@ -24,7 +24,7 @@ angular.module('opal.services').factory('RecordEditor', function( } var modal = $modal.open({ - templateUrl: '/templates/modals/delete_item_confirmation.html/', + templateUrl: '/templates/delete_item_confirmation_modal.html', controller: 'DeleteItemConfirmationCtrl', resolve: { item: function() { return item; }, diff --git a/opal/static/js/test/edit_item.controller.test.js b/opal/static/js/test/edit_item.controller.test.js index 898279b40..617d9ec2b 100644 --- a/opal/static/js/test/edit_item.controller.test.js +++ b/opal/static/js/test/edit_item.controller.test.js @@ -162,7 +162,7 @@ describe('EditItemCtrl', function (){ $scope.delete(); expect($modal.open).toHaveBeenCalled() var args = $modal.open.calls.mostRecent().args[0]; - expect(args.templateUrl).toEqual('/templates/modals/delete_item_confirmation.html/'); + expect(args.templateUrl).toEqual('/templates/delete_item_confirmation_modal.html'); expect(args.controller).toEqual('DeleteItemConfirmationCtrl'); expect(args.resolve.item()).toEqual(item) }); diff --git a/opal/static/js/test/record_editor_test.js b/opal/static/js/test/record_editor_test.js index 56c6b106f..14f5d0ca6 100644 --- a/opal/static/js/test/record_editor_test.js +++ b/opal/static/js/test/record_editor_test.js @@ -216,7 +216,7 @@ describe('RecordEditor', function(){ expect(callArgs.length).toBe(1); expect(callArgs[0].controller).toBe('DeleteItemConfirmationCtrl'); expect(callArgs[0].templateUrl).toBe( - '/templates/modals/delete_item_confirmation.html/' + '/templates/delete_item_confirmation_modal.html' ); var resolves = callArgs[0].resolve; expect(resolves.item()).toEqual(episode.recordEditor.getItem('diagnosis', 0)); diff --git a/opal/urls.py b/opal/urls.py index 451baa67c..05b21066b 100644 --- a/opal/urls.py +++ b/opal/urls.py @@ -43,9 +43,6 @@ url(r'^templates/episode_detail.html/(?P\d+)/?$', views.EpisodeDetailTemplateView.as_view(), name="episode_detail"), - url(r'^templates/modals/delete_item_confirmation.html/?$', - views.DeleteItemConfirmationView.as_view()), - # New Public facing API urls url(r'api/v0.1/', include(api.router.urls)), diff --git a/opal/views.py b/opal/views.py index 40f6bdefd..2ab4fcafe 100644 --- a/opal/views.py +++ b/opal/views.py @@ -224,10 +224,6 @@ def get_context_data(self, *a, **k): return data -class DeleteItemConfirmationView(LoginRequiredMixin, TemplateView): - template_name = 'delete_item_confirmation_modal.html' - - class RawTemplateView(LoginRequiredMixin, TemplateView): """ Failover view for templates - just look for this path in Django! From 04a4ee8cd4b710a4b1b2ff03b091a7627502989e Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 24 Oct 2018 14:56:54 +0100 Subject: [PATCH 4/4] Fixup: Remove reference by name to undischarge_template_view in tests refs #1341 --- opal/tests/test_views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/opal/tests/test_views.py b/opal/tests/test_views.py index 5d27f6143..38187d580 100644 --- a/opal/tests/test_views.py +++ b/opal/tests/test_views.py @@ -57,7 +57,6 @@ def get_urls(self): reverse("patient_list_template_view", kwargs=dict(slug="eater-herbivore")), reverse("patient_detail"), reverse("episode_detail", kwargs=dict(pk=self.episode.id)), - reverse("undischarge_tempate_view"), reverse("raw_template_view", kwargs=dict(template_name="not_a_real_template.html")), ]