Merge pull request #2 from andela/ch-fix-error-140649389

Ch fix error 140649389

.gitignore

@@ -21,6 +21,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+tags
+
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -57,7 +59,11 @@ target/
 
 # IDE
 .idea/
+.vscode
+
 
 # External Libraries
 wger/core/static/bower_components
 node_modules
+
+.DS_Store

docs/conf.py

@@ -18,12 +18,12 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -40,7 +40,7 @@
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -60,41 +60,41 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 
 # -- Options for HTML output ----------------------------------------------
@@ -106,26 +106,26 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -135,48 +135,48 @@
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'wgerWorkoutManagerdoc'
@@ -185,43 +185,43 @@
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    # 'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    # 'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'wgerWorkoutManager.tex', u'wger Workout Manager Documentation',
-   u'Roland Geider', 'manual'),
+    ('index', 'wgerWorkoutManager.tex', u'wger Workout Manager Documentation',
+     u'Roland Geider', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
@@ -234,7 +234,7 @@
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -243,19 +243,19 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'wgerWorkoutManager', u'wger Workout Manager Documentation',
-   u'Roland Geider', 'wgerWorkoutManager', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'wgerWorkoutManager', u'wger Workout Manager Documentation',
+     u'Roland Geider', 'wgerWorkoutManager', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False

extras/bench/test_Simple.py

@@ -6,6 +6,7 @@
 from random import random
 from funkload.FunkLoadTestCase import FunkLoadTestCase
 
+
 class Simple(FunkLoadTestCase):
     '''
     This test uses the configuration file Simple.conf.
@@ -21,14 +22,16 @@ def test_simple(self):
         # The description should be set in the configuration file
         server_url = self.server_url
 
-        # Exercises        
+        # Exercises
         self.get(server_url + '/en/exercise/overview/', description='Get exercise overview')
         self.get(server_url + '/en/exercise/muscle/overview/', description='Get muscle overview')
         self.get(server_url + '/de/exercise/79/view/', description='Get exercise page')
 
         # Nutrition
-        self.get(server_url + '/de/nutrition/ingredient/overview/', description='Get ingredient overview')
-        self.get(server_url + '/de/nutrition/ingredient/8304/view/4-korn-waffeln/', description='Get ingredient page')
+        self.get(server_url + '/de/nutrition/ingredient/overview/',
+                 description='Get ingredient overview')
+        self.get(server_url + '/de/nutrition/ingredient/8304/view/4-korn-waffeln/',
+                 description='Get ingredient page')
 
 
 if __name__ in ('main', '__main__'):

extras/dummy_generator/generator.py

@@ -131,12 +131,12 @@
 # Nutrition options
 nutrition_parser = subparsers.add_parser('nutrition', help='Creates a meal plan')
 nutrition_parser.add_argument('number_nutrition_plans',
-                         action='store',
-                         help='Number of meal plans to create',
-                         type=int)
+                              action='store',
+                              help='Number of meal plans to create',
+                              type=int)
 nutrition_parser.add_argument('--add-to-user',
-                           action='store',
-                           help='Add to the specified user-ID, not all existing users')
+                              action='store',
+                              help='Add to the specified user-ID, not all existing users')
 
 args = parser.parse_args()
 # print(args)
@@ -452,16 +452,17 @@
 
     # Total meals per plan
     total_meals = 4
-    
+
     for user in userlist:
         print('   - generating for {0}'.format(user.username))
 
         # Add nutrition plan
         for i in range(0, args.number_nutrition_plans):
             uid = str(uuid.uuid4()).split('-')
             start_date = datetime.date.today() - datetime.timedelta(days=random.randint(0, 100))
-            nutrition_plan = NutritionPlan(language=Language.objects.all()[1], description='Dummy nutrition plan - {0}'.format(uid[1]),
-                              creation_date=start_date)
+            nutrition_plan = NutritionPlan(language=Language.objects.all()[1],
+                                           description='Dummy nutrition plan - {0}'.format(uid[1]),
+                                           creation_date=start_date)
             nutrition_plan.user = user
 
             nutrition_plan.save()
@@ -471,8 +472,13 @@
             for j in range(0, total_meals):
                 meal = Meal(plan=nutrition_plan, order=order)
                 meal.save()
-                for k in range(0, random.randint(1,5)):
+                for k in range(0, random.randint(1, 5)):
                     ingredient = random.choice(ingredientList)
-                    meal_item = MealItem(meal=meal, ingredient=ingredient, weight_unit=None, order=order, amount=random.randint(10, 250))
+                    meal_item = MealItem(meal=meal,
+                                         ingredient=ingredient,
+                                         weight_unit=None,
+                                         order=order,
+                                         amount=random.randint(10, 250)
+                                         )
                     meal_item.save()
                 order = order + 1

extras/scripts/filter-fixtures.py

@@ -33,6 +33,7 @@ def filter_dump(data, model_list, filename):
     with open(filename, 'w') as outfile:
         json.dump(filter_data, outfile, indent=4)
 
+
 # This is a full dump of the DB
 fixture = open('data.json')
 data = json.load(fixture)