New projects list with total charge

calls new db_mgr accessor

New projects list with total charge
calls new db_mgr accessor
hitier
1 parent 70da5dd5
Showing 3 changed files with 25 additions and 2 deletions Show diff stats
app/db_mgr.py
app/main/routes.py
app/main/templates/projects.html
 from app.models import db
  
  
+def projects():
+    """
+    Build the list of all agents, with their charges summed up in one total
+    :return:
+    """
+    sql_txt = """
+            select p.id, p.name, sum(tc.charge_rate) as total_charge
+            from project as p left join
+               ( select c.project_id, c.charge_rate from charge c )
+            tc
+            on p.id = tc.project_id
+            group by p.id
+            order by total_charge desc;
+            """
+    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
@@ -47,7 +47,7 @@ def services():
 @role_required('project')
 def projects():
     # get projects list
-    all_projects = Project.query.order_by(Project.name).all()
+    all_projects = db_mgr.projects()
     num_projects = len(all_projects)
     # pass to template
     return render_template('projects.html', subtitle="Liste des projets ({})".format(num_projects),
@@ -4,12 +4,18 @@
   <thead>
   <tr>
     <th scope="col">Projet</th>
+    <th scope="col">Charge</th>
   </tr>
   </thead>
   <tbody>
   {% for project in projects %}
   <tr>
-    <td>{{ project.name }}</td>
+    <td><a href="{{url_for('main.project', project_id=project.id)}}">
+      {{ project.name }}</a>
+    </td>
+    <td>
+      {{ project.total_charge }}</a>
+    </td>
   </tr>
   {% endfor %}
   </tbody>