Merge branch 'master' of https://forge.chapril.org/CretinsMotorisesIngenieux/Marin

pages.py

@@ -53,11 +53,19 @@ def sauveteur(idsauveteur):
     dico["nb_sauves"] = 666
     dico["gratifications"] = 1
     dico["description"] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam at odio cursus, rutrum odio non, dignissim risus. Pellentesque non varius ante. Vivamus scelerisque pulvinar mauris, nec imperdiet ante mattis et."
+    dico["expeditions"] = []
     result = lib.ex_sql(dbname,"SELECT * FROM sauveteur WHERE personal_id=?",(idsauveteur,))
     if len(result)==1:
         result = result[0]
         dico["nom"] = result["nom"]
         dico["prenom"] = result["prenom"]
+        ids = lib.ex_sql(dbname,"SELECT * FROM mission WHERE personal_id=?",(idsauveteur,))
+        dico["nb_sauvetages"] = 0
+        dico["nb_sauves"] = 0
+        for id in ids:
+            nbs = lib.ex_sql(dbname,"SELECT * FROM sauvee WHERE expedition_id=?",(id["expedition_id"],))
+            dico["nb_sauvetages"]+=1
+            dico["nb_sauves"] += len(nbs)
         return render_template("sauveteur.html",**dico)
     else:
         return error()