#99 splitted out checklist urls

WiSchLabs · Dec 11, 2016 · 7d3d97a · 7d3d97a
1 parent c992151
commit 7d3d97a
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 47 deletions.
diff --git a/core/checklist_urls.py b/core/checklist_urls.py
@@ -0,0 +1,21 @@
+from django.conf.urls import url
+
+from core.views.checklist_views import CreateChecklistItemView, DeleteChecklistItemView, \
+                                       GetChecklistItemsForTodayView, GetChecklistItemsView, \
+                                       UpdateChecklistItemView, UpdateChecklistPriorityView
+
+app_name = 'checklist'
+urlpatterns = [
+    url(r'^get_checklist_items/?$', GetChecklistItemsView.as_view(),
+        name='get_checklist_items'),
+    url(r'^get_checklist_items_for_today/?$', GetChecklistItemsForTodayView.as_view(),
+        name='get_checklist_items_for_today'),
+    url(r'^add_checklist_item/?$', CreateChecklistItemView.as_view(),
+        name='add_checklist_item'),
+    url(r'^update_checklist_item/?$', UpdateChecklistItemView.as_view(),
+        name='update_checklist_item'),
+    url(r'^delete_checklist_item/?$', DeleteChecklistItemView.as_view(),
+        name='delete_checklist_item'),
+    url(r'^update_checklist_priority/?$', UpdateChecklistPriorityView.as_view(),
+        name='update_checklist_priority'),
+]
diff --git a/core/static/core/js/checklist_settings_handler.js b/core/static/core/js/checklist_settings_handler.js
@@ -58,7 +58,7 @@ $('document').ready( function (){
 
     $('#headingChecklistSettings').click(function(){
         if (! $('#collapseChecklistSettings').hasClass('in')) { // area is being opened
-            $.get("/settings_get_checklist_items",
+            $.get("/checklist/get_checklist_items",
                 function (data) {
                     $('#checklist_items').html('');
                     data.forEach(addChecklistItem);
@@ -70,7 +70,7 @@ $('document').ready( function (){
     $('#add_checklist_item').click( function(event) {
         event.stopPropagation();
         event.preventDefault();
-        $.get("/settings_add_checklist_item",
+        $.get("/checklist/add_checklist_item",
             function (data) {
                 addChecklistItem(data);
             }
@@ -81,7 +81,7 @@ $('document').ready( function (){
         var params = {
             checklist_priority: $('#checklist_items').sortable("toArray").join(",")
         };
-        $.post("/settings_update_checklist_priority", params);
+        $.post("/checklist/update_checklist_priority", params);
         $('#checklist_items_priority_saved').removeClass('invisible');
         setTimeout(function() {
             $('#checklist_items_priority_saved').addClass('invisible');
@@ -93,7 +93,7 @@ $('document').ready( function (){
             checklist_item_id: elem.closest('.checklist_item_container').attr('id'),
             checklist_item_name: elem.val()
         };
-        $.post("/settings_update_checklist_item", params);
+        $.post("/checklist/update_checklist_item", params);
         elem.closest('.checklist_item_container').find('.checklist_item_saved').removeClass('invisible');
     }
     $('#checklist_items').on('focusout', '.checklist_item_name', function() {
@@ -126,7 +126,7 @@ $('document').ready( function (){
             checklist_item_id: elem.closest('.checklist_item_container').attr('id'),
             checklist_item_matchdays: matchdays_comma_seperated
         };
-        $.post("/settings_update_checklist_item", params);
+        $.post("/checklist/update_checklist_item", params);
         elem.closest('.checklist_item_container').find('.checklist_item_saved').removeClass('invisible');
     }
     $('#checklist_items').on('focusout', '.checklist_item_matchdays', function() {
@@ -157,7 +157,7 @@ $('document').ready( function (){
             checklist_item_id: elem.closest('.checklist_item_container').attr('id'),
             checklist_item_matchday_pattern: matchday_pattern
         };
-        $.post("/settings_update_checklist_item", params);
+        $.post("/checklist/update_checklist_item", params);
         elem.closest('.checklist_item_container').find('.checklist_item_saved').removeClass('invisible');
     }
     $('#checklist_items').on('focusout', '.checklist_item_matchday_pattern', function() {
@@ -180,7 +180,7 @@ $('document').ready( function (){
         var params = {
             checklist_item_id: checklist_item.attr('id')
         };
-        $.post("/settings_delete_checklist_item", params);
+        $.post("/checklist/delete_checklist_item", params);
         checklist_item.animate({opacity:0, height:0}, 200);
         setTimeout(function() {
             checklist_item.remove();
@@ -220,7 +220,7 @@ $('document').ready( function (){
             params['checklist_item_everyday'] = true;
         }
 
-        $.post("/settings_update_checklist_item", params);
+        $.post("/checklist/update_checklist_item", params);
     });
 
 

diff --git a/core/static/core/js/checklist_user_handler.js b/core/static/core/js/checklist_user_handler.js
@@ -15,7 +15,7 @@ function showChecklistItem(item) {
 
 $('document').ready( function (){
     $(function() {
-        $.get("/settings_get_checklist_items_for_today",
+        $.get("/checklist/get_checklist_items_for_today",
             function (data) {
                 $('#ChecklistSubMenu').html('');
                 data.forEach(showChecklistItem);
@@ -52,7 +52,7 @@ $('document').ready( function (){
             checklist_item_id: $(this).attr('id'),
             checklist_item_checked: checklistItemGotChecked
         };
-        $.post("/settings_update_checklist_item", params);
+        $.post("/checklist/update_checklist_item", params);
 
         if (checklistItemGotChecked) {
             checklistItem.removeClass('glyphicon-unchecked');

diff --git a/core/tests/unit/views/test_checklist_settings_view.py b/core/tests/unit/views/test_checklist_settings_view.py
@@ -33,7 +33,7 @@ def setUp(self):
 
     def test_get_checklist_items(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertEqual(len(returned_json_data), 1)
@@ -45,7 +45,7 @@ def test_get_checklist_items(self):
 
     def test_create_standard_checklist_item(self):
         self.client.login(username='second', password='second')
-        response = self.client.get(reverse('core:settings_add_checklist_item'))
+        response = self.client.get(reverse('core:checklist:add_checklist_item'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data)
@@ -57,13 +57,13 @@ def test_create_standard_checklist_item(self):
 
     def test_update_checklist_item_name(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_name': 'do even more unit tests'
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -73,13 +73,13 @@ def test_update_checklist_item_name(self):
 
     def test_update_checklist_item_home_match(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_home_match': True
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -95,13 +95,13 @@ def test_update_checklist_item_home_match(self):
 
     def test_update_checklist_item_matchday(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_matchdays': '4'
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -117,13 +117,13 @@ def test_update_checklist_item_matchday(self):
 
     def test_update_checklist_item_matchdays(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_matchdays': '3,33'
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -139,13 +139,13 @@ def test_update_checklist_item_matchdays(self):
 
     def test_update_checklist_item_matchday_pattern(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_matchday_pattern': 2
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -161,13 +161,13 @@ def test_update_checklist_item_matchday_pattern(self):
 
     def test_update_checklist_item_everyday(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_everyday': True
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -182,14 +182,14 @@ def test_update_checklist_item_everyday(self):
 
     def test_update_checklist_item_checked(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_checked': 'true'
                                      })
         self.assertEqual(response.status_code, 200)
         self.assertEqual(ChecklistItem.objects.get(id=self.checklist_item.id).last_checked_on_matchday, self.matchday)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -199,14 +199,14 @@ def test_update_checklist_item_checked(self):
 
     def test_update_checklist_item_unchecked(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_update_checklist_item'),
+        response = self.client.post(reverse('core:checklist:update_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id,
                                      'checklist_item_checked': 'false'
                                      })
         self.assertEqual(response.status_code, 200)
         self.assertEqual(ChecklistItem.objects.get(id=self.checklist_item.id).last_checked_on_matchday, None)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertTrue('id' in returned_json_data[0])
@@ -216,12 +216,12 @@ def test_update_checklist_item_unchecked(self):
 
     def test_delete_checklist_item(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings_delete_checklist_item'),
+        response = self.client.post(reverse('core:checklist:delete_checklist_item'),
                                     {'checklist_item_id': self.checklist_item.id
                                      })
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('core:settings_get_checklist_items'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items'))
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
         self.assertEqual(len(returned_json_data), 0)
@@ -254,7 +254,7 @@ def test_get_checklist_items_for_today(self):
             to_be_checked_on_matchdays='6,9'
         )
 
-        response = self.client.get(reverse('core:settings_get_checklist_items_for_today'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items_for_today'))
 
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))
@@ -292,7 +292,7 @@ def test_get_checklist_items_for_today_if_tomorrow_home_match(self):
             to_be_checked_if_home_match_tomorrow=True
         )
 
-        response = self.client.get(reverse('core:settings_get_checklist_items_for_today'))
+        response = self.client.get(reverse('core:checklist:get_checklist_items_for_today'))
 
         self.assertEqual(response.status_code, 200)
         returned_json_data = json.loads(response.content.decode('utf-8'))

diff --git a/core/urls.py b/core/urls.py
@@ -4,34 +4,22 @@
 import core.views.account_views
 import core.views.settings_views
 import core.views.trigger_parsing_views
-from core.views.checklist_views import CreateChecklistItemView, DeleteChecklistItemView, \
-                                       GetChecklistItemsForTodayView, GetChecklistItemsView, \
-                                       UpdateChecklistItemView, UpdateChecklistPriorityView
 
 app_name = 'core'
 urlpatterns = [
     url(r'^favicon\.ico$', RedirectView.as_view(url='/static/core/img/OFM_favicon.png', permanent=True)),
     url(r'^$', TemplateView.as_view(template_name='core/home.html'), name='home'),
+
     url(r'^register/?$', core.views.account_views.register_view, name='register'),
     url(r'^login/?$', core.views.account_views.login_view, name='login'),
     url(r'^account/?$', core.views.account_views.account_view, name='account'),
     url(r'^logout/?$', core.views.account_views.logout_view, name='logout'),
+
     url(r'^ofm/', include('core.ofm_urls'), name='ofm'),
+    url(r'^checklist/', include('core.checklist_urls'), name='checklist'),
 
     url(r'^settings/?$', core.views.settings_views.settings_view,
         name='settings'),
-    url(r'^settings_get_checklist_items/?$', GetChecklistItemsView.as_view(),
-        name='settings_get_checklist_items'),
-    url(r'^settings_get_checklist_items_for_today/?$', GetChecklistItemsForTodayView.as_view(),
-        name='settings_get_checklist_items_for_today'),
-    url(r'^settings_add_checklist_item/?$', CreateChecklistItemView.as_view(),
-        name='settings_add_checklist_item'),
-    url(r'^settings_update_checklist_item/?$', UpdateChecklistItemView.as_view(),
-        name='settings_update_checklist_item'),
-    url(r'^settings_delete_checklist_item/?$', DeleteChecklistItemView.as_view(),
-        name='settings_delete_checklist_item'),
-    url(r'^settings_update_checklist_priority/?$', UpdateChecklistPriorityView.as_view(),
-        name='settings_update_checklist_priority'),
 
     url(r'^trigger_parsing/?$', core.views.trigger_parsing_views.trigger_parsing,
         name='trigger_parsing'),