Fix wrong agents charge sql req

hitier
1 parent 89219b30
Showing 2 changed files with 11 additions and 6 deletions Show diff stats
app/db_mgr.py
app/main/routes.py
@@ -4,10 +4,15 @@ from app.models import db, Agent, Charge
  
  
 def agents():
-    sql_txt = """select a.id, a.firstname, a.secondname, sum(c.charge_rate) as total_charge
-                from agent as a
-                         inner join charge c on a.id = c.agent_id
-                group by agent_id;"""
+    sql_txt = """
+            select a.id, a.firstname, a.secondname, sum(tc.charge_rate) as total_charge
+            from agent as a left join
+               ( select c.agent_id, c.charge_rate from charge c )
+            tc
+            on a.id = tc.agent_id
+            group by a.id
+            order by total_charge desc;
+            """
     all_agents = db.session.execute(sql_txt).fetchall()
  
     return all_agents
@@ -22,7 +27,7 @@ def stacked_charges_by_agent(agent_id):
         period_charge = {}
         for project_name, project_rate in db.session.execute(charge_by_project_req):
             period_charge[project_name] = project_rate
-        all_charges[period_name]=period_charge
+        all_charges[period_name] = period_charge
  
     pprint(all_charges)
     return all_charges
@@ -106,4 +106,4 @@ def agent(agent_id):
     this_agent = Agent.query.get(int(agent_id))
     return render_template('agent.html',
                            agent=this_agent,
-                           subtitle="{} {}".format(agent.firstname, agent.secondname))
+                           subtitle="{} {}".format(this_agent.firstname, this_agent.secondname))