New project_charges to fill project's charges table

hitier
1 parent 709006af
Showing 3 changed files with 57 additions and 1 deletions Show diff stats
app/db_mgr.py
app/main/routes.py
app/main/templates/project.html
@@ -18,6 +18,7 @@ def projects():
     all_projects = db.session.execute(sql_txt).fetchall()
     return all_projects
  
+
 def agents():
     """
     Build the list of all agents, with their charges summed up in one total
@@ -37,6 +38,41 @@ def agents():
     return all_agents
  
  
+def charges_by_project(project_id):
+    """
+    Build the flatten list of charges for one project, period by period
+    :param project_id:
+    :return:
+    """
+
+    req_sql = f"""
+            select p.name as period_name,
+                   a.firstname ||" "|| a.secondname as agent_name,
+                   s.name as service_name,
+                   c2.name as capacity_name,
+                   c.charge_rate as charge_rate
+            from charge as c
+                     join period p on c.period_id = p.id
+                     join project p2 on c.project_id = p2.id
+                     join service s on c.service_id = s.id
+                     join agent a on a.id = c.agent_id
+                     join capacity c2 on c2.id = c.capacity_id
+            where project_id = {project_id}
+            order by c.period_id
+            """
+    print(req_sql)
+    req_res = db.session.execute(req_sql)
+    results = list(req_res)
+    # Remove comma
+    nocomma_results = []
+    for line in results:
+        nocomma_line = [str(cell) for cell in line]
+        nocomma_results.append(nocomma_line)
+    headers = ["Period", "Agent", "Service", "Capacity", "Charge"]
+    nocomma_results.insert(0, headers)
+    return nocomma_results
+
+
 def charges_by_agent_tabled(agent_id):
     """
     Build the flatten list of charges for one agent, period by period
@@ -98,9 +98,10 @@ def charge_add():
 def project(project_id):
     # TODO: am i the project manager ?
     this_project = Project.query.get(int(project_id))
-    # charges_table=db_mgr.charges_by_agent_tabled(agent_id)
+    charges_table = db_mgr.charges_by_project(project_id)
     return render_template('project.html',
                            project=this_project,
+                           charges=charges_table,
                            subtitle="{}".format(this_project.name))
  
 @bp.route('/agent/<agent_id>')
 {% extends "base_page.html" %}
  
 {% block more_heads %}
+<link href="{{ url_for('main.static', filename='css/style.css') }}" rel="stylesheet" type="text/css"/>
 {% endblock %}
  
 {% block content %}
+<table id="charge_table">
+  <thead>
+  <tr>
+    {% for header in charges[0] %}
+    <td>{{header}}</td>
+    {% endfor %}
+  </tr>
+  </thead>
+  <tbody>
+  {% for line in charges[1:] %}
+  <tr>
+    {% for cell in line %}
+    <td>{{cell}}</td>
+    {% endfor %}
+  </tr>
+  {% endfor %}
+  </tbody>
+</table>
 {% endblock %}
  
 {% block more_scripts %}