Fixed some code smells

hitier
1 parent d568e561
Showing 2 changed files with 31 additions and 22 deletions Show diff stats
app/db_mgr.py
app/main/routes.py
@@ -8,6 +8,19 @@ from app.models import db, Period, Project, Category
 charge_unit = 100
  
  
+def get_periods():
+    return db.session.execute("select id, name from period order by id")
+
+
+def get_current_period():
+    """
+    :return:  the id of the period of current day
+    """
+    # TODO: request on dates as soon as periods are dated
+    p = Period.query.filter((Period.name == '2021') | (Period.name == '2021_S1')).one()
+    return p.id
+
+
 def category_labels():
     """
     Build a list of dicts of the categorized labels for form display:
@@ -192,7 +205,7 @@ def charges_by_project_stacked(project_id, category=&quot;service&quot;):
     categories = [c for (c,) in db.session.execute(categories_req)]
     headers = ['period'] + categories
     all_charges = [headers]
-    for (period_id, period_name) in db.session.execute("select id, name from period order by id"):
+    for (period_id, period_name) in get_periods():
         # build the request from the string previously set
         charge_by_categorie_req = sql_req.format(project_id, period_id)
         # build the charges line for the current period
@@ -242,7 +255,7 @@ def charges_by_labels_stacked(category_id):
     labels_names = [name for (name,) in db.session.execute(labels_req)]
     headers = ['period'] + labels_names
     all_charges = [headers]
-    for (period_id, period_name) in db.session.execute("select id, name from period order by id"):
+    for (period_id, period_name) in get_periods():
         project_charges = [period_name]
         charges_for_projects_req = sql_req.format(period_id, category_id)
         for (project_name, project_charge) in db.session.execute(charges_for_projects_req):
@@ -280,7 +293,7 @@ def charges_for_projects_stacked():
     projects_names = [name for (name,) in db.session.execute(projects_req)]
     headers = ['period'] + projects_names
     all_charges = [headers]
-    for (period_id, period_name) in db.session.execute("select id, name from period order by id"):
+    for (period_id, period_name) in get_periods():
         project_charges = [period_name]
         charges_for_projects_req = sql_req.format(period_id)
         for (project_name, project_charge) in db.session.execute(charges_for_projects_req):
@@ -301,7 +314,7 @@ def charges_by_agent_stacked(agent_id):
     categories = [c for (c,) in db.session.execute(categories_req)]
     headers = ['period'] + categories
     all_charges = [headers]
-    for (period_id, period_name) in db.session.execute("select id, name from period order by id"):
+    for (period_id, period_name) in get_periods():
         charge_by_project_req = """
                                select sum(c.charge_rate)
                                 from project p
@@ -366,12 +379,3 @@ def charges_by_agent(agent_id):
         else:
             all_charges.append([p, 0])
     return all_charges
-
-
-def get_current_period():
-    """
-    :return:  the id of the period of current day
-    """
-    # TODO: request on dates as soon as periods are dated
-    p = Period.query.filter((Period.name == '2021') | (Period.name == '2021_S1')).one()
-    return p.id
@@ -164,6 +164,11 @@ def agent(agent_id):
  
  
 # - - - - - - - - - - - - - - - - - - - -  FORMS  - - - - - - - - - - - - - - - - - - - - #
+
+updated_message = "mis à jour"
+added_message = "ajouté"
+
+
 @bp.route('/project/<project_id>/delete', methods=('POST', 'GET'))
 @role_required('admin')
 def project_delete(project_id=None):
@@ -185,8 +190,8 @@ def agent_delete(agent_id=None):
 @bp.route('/category/<category_id>/delete', methods=('POST', 'GET'))
 @role_required('admin')
 def category_delete(category_id=None):
-    this_category = Category.query.get(int(category_id))
     flash("Suppression de la Catégorie pas encore implémentée", 'warning')
+    # this_category = Category.query.get(int(category_id))
     # flash(f"Category {this_category.name} effacé")
     return redirect(url_for('main.categories'))
  
@@ -194,8 +199,8 @@ def category_delete(category_id=None):
 @bp.route('/label/<label_id>/delete', methods=('POST', 'GET'))
 @role_required('admin')
 def label_delete(label_id=None):
-    this_label = Label.query.get(int(label_id))
     flash("Suppression du Label pas encore implémentée", 'warning')
+    # this_label = Label.query.get(int(label_id))
     # flash(f"Label {this_label.name} effacé")
     return redirect(url_for('main.labels'))
  
@@ -220,11 +225,11 @@ def label_edit(label_id=None):
         if label_id:
             # then update existing
             this_label = Label.query.get(int(label_id))
-            done_string = "mis à jour."
+            done_string = updated_message+"."
         else:
             # or create from scratch
             this_label = Label()
-            done_string = "ajouté."
+            done_string = added_message+"."
         # fill orm with form and write to db
         this_label.from_request(request)
         db.session.add(this_label)
@@ -254,7 +259,7 @@ def category_edit(category_id=None):
         if category_id:
             # then update existing
             this_category = Category.query.get(int(category_id))
-            done_string = "mise à jour."
+            done_string = updated_message+"."
         else:
             # or create from scratch
             this_category = Category()
@@ -289,7 +294,7 @@ def project_edit(project_id=None):
         if project_id:
             # then update existing
             this_project = Project.query.get(int(project_id))
-            done_string = "mis à jour."
+            done_string = updated_message+"."
         else:
             # check name doesnt exist yet
             existing_project = Project.query.filter(Project.name == request.form.get('name')).one_or_none()
@@ -298,7 +303,7 @@ def project_edit(project_id=None):
                 return redirect(url_for('main.project_edit'))
             # or create from scratch
             this_project = Project()
-            done_string = "ajouté."
+            done_string = added_message+"."
         # fill orm with form and write to db
         this_project.from_request(request)
         db.session.add(this_project)
@@ -340,11 +345,11 @@ def agent_edit(agent_id=None):
         if agent_id:
             # then update existing
             this_agent = Agent.query.get(int(agent_id))
-            done_string = "mis à jour."
+            done_string = updated_message+"."
         else:
             # or create from scratch
             this_agent = Agent()
-            done_string = "ajouté."
+            done_string = added_message+"."
         # fill orm with form and write to db
         this_agent.from_request(request)
         db.session.add(this_agent)