All charges now include period with no charge

hitier
1 parent 04e2a90d
Showing 2 changed files with 16 additions and 2 deletions Show diff stats
app/db_mgr.py
app/main/routes.py
+from pprint import pprint
+
 from app.models import db, Agent, Charge
  
  
@@ -8,9 +10,17 @@ def agents():
  
 def charges_by_agent(agent_id):
     # all_charges = db.session.query(Charge).all()
-    sql_txt = "select sum(charge_rate), p.name from charge inner join period p on charge.period_id = p.id\
+    periods = db.session.execute("select name from period")
+    sql_txt = "select p.name, sum(charge_rate)  from charge inner join period p on charge.period_id = p.id\
                 where agent_id={} group by period_id order by p.name" \
         .format(agent_id)
     request = db.session.execute(sql_txt)
-    all_charges = [[period, rate] for (rate, period) in request.fetchall()]
+    all_charges = []
+    charges_list = [(period, charge) for (period, charge) in request.fetchall()]
+    charges_dict = dict(charges_list)
+    for (p,) in periods:
+        if p in charges_dict.keys():
+            all_charges.append([p, charges_dict[p]])
+        else:
+            all_charges.append([p, 0])
     return all_charges
@@ -42,6 +42,7 @@ def agents():
     return render_template('agents.html', subtitle="Liste des agents ({})".format(num_agents),
                            agents=all_agents)
  
+
 @bp.route('/capacities')
 def capacities():
     # get capacities list
@@ -51,6 +52,7 @@ def capacities():
     return render_template('capacities.html', subtitle="Liste des fonctions ({})".format(num_capacities),
                            capacities=all_capacities)
  
+
 @bp.route('/periods')
 def periods():
     # get capacities list
@@ -60,6 +62,7 @@ def periods():
     return render_template('periods.html', subtitle="Liste des périodes ({})".format(num_periods),
                            periods=all_periods)
  
+
 @bp.route('/charge/add')
 def charge_add():
     return render_template('charge.html', subtitle="Affecter un agent")
@@ -75,6 +78,7 @@ def charge_agent(agent_id):
     resp.headers['Content-Type'] = 'application/json'
     return resp
  
+
 @bp.route('/agent/<agent_id>')
 def agent(agent_id):
     agent = Agent.query.get(int(agent_id))