diff --git a/app.pyc b/app.pyc
new file mode 100644
index 0000000..0e17e3b
Binary files /dev/null and b/app.pyc differ
diff --git a/definitions.pyc b/definitions.pyc
new file mode 100644
index 0000000..74084b1
Binary files /dev/null and b/definitions.pyc differ
diff --git a/pages.py b/pages.py
index 8c15e71..9377c46 100644
--- a/pages.py
+++ b/pages.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from flask import render_template
import definitions as lib
from difflib import SequenceMatcher
@@ -35,12 +36,14 @@ def bateau(idbateau):
def expeditions(idexpedition):
dico = {}
+ dico["Nom"] = "joe"
+ dico["Date"] = "quatrieme univers"
+
result = lib.ex_sql(dbname,"SELECT * FROM expedition WHERE expedition_id=?",(idexpedition,))
if len(result) >= 1:
result = result[0]
- dico["evenement"] = result["nom"]
- dico["Date"] = result["date"]
- print("dico")
+ dico["nom"] = result["nom"]
+ dico["date"] = result["date"]
return render_template("expedition.html",**dico)
else:
return error()
@@ -51,14 +54,22 @@ def sauveteur(idsauveteur):
dico["prenom"] = "Doe"
dico["nb_sauvetages"] = 666
dico["nb_sauves"] = 666
+ dico["naissance"] = "vie"
+ dico["deces"] = "mort"
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"]
+ print(result["date_naissance"])
+ print(result["date_mort"])
+ dico["nom"] = result["nom"]
+ dico["prenom"] = result["prenom"]
+ dico["date_naissance"] = result["date_naissance"]
+ dico["date_deces"] = result["date_mort"]
+ print(dico["naissance"])
+ print(dico["deces"])
ids = lib.ex_sql(dbname,"SELECT * FROM mission WHERE personal_id=?",(idsauveteur,))
dico["nb_sauvetages"] = 0
dico["nb_sauves"] = 0
diff --git a/pages.pyc b/pages.pyc
new file mode 100644
index 0000000..761cd57
Binary files /dev/null and b/pages.pyc differ
diff --git a/site.db b/site.db
index b535549..3f6fb5d 100644
Binary files a/site.db and b/site.db differ
diff --git a/templates/expedition.html b/templates/expedition.html
index dd7b5b4..0fba98b 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -1,14 +1,30 @@
- {{siecle}}- Sauveuteurs du dunkerquois
+ {{nom}}- Sauveteurs du dunkerquois
{% include 'head.html' %}
-
+
- {% include "smallheader.html" %}
- {{siecle}}
-