diff --git a/app.py b/app.py index 025d143..03af405 100644 --- a/app.py +++ b/app.py @@ -11,9 +11,15 @@ def main(): return pages.main() @app.route('/sauveteurs/') +@app.route('/sauveteur/') def sauveteur(idsauveteur): return pages.sauveteur(idsauveteur) +@app.route('/bateaux/') +@app.route('/bateau/') +def bateau(idbateau): + return pages.bateau(idbateau) + @app.errorhandler(404) def error(e): return pages.error() diff --git a/pages.py b/pages.py index 8135828..8e6fad7 100644 --- a/pages.py +++ b/pages.py @@ -11,6 +11,27 @@ def main(): def error(): return render_template("error.html") +def bateau(idbateau): + dico = {} + dico["NomBateau"] = "Le Bateau" + dico["nom"] = "Le constructeur" + dico["Dimensions"] = 666 + dico["DateInstallation"] = "Aujourd'hui" + dico["DateCondamnation"] = "Demain" + dico["ville"] = "ici" + dico["HistoireBateau"] = "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." + result = lib.ex_sql(dbname,"SELECT * FROM bateau WHERE ship_id=?",(idbateau,)) + if len(result)>=1: + result = result[0] + dico["nom"] = result["nom"] + print(result) + dico["Dimensions"] = result["dimension"] + dico["DateInstallation"] = result["date_naissance"] + dico["DateCondamnation"] = result["date_mort"] + return render_template("sauveteur.html",**dico) + else: + return error() + def sauveteur(idsauveteur): dico = {} dico["nom"] = "John" @@ -19,7 +40,11 @@ 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." - result = lib.ex_sql(dbname,"SELECT * FROM sauveteur WHERE personal_id=?",(idsauveteur,))[0] - dico["nom"] = result["nom"] - dico["prenom"] = result["prenom"] - return render_template("sauveteur.html",**dico) + 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"] + return render_template("sauveteur.html",**dico) + else: + return error() diff --git a/site.db b/site.db index 2add4a5..f4eea1a 100644 Binary files a/site.db and b/site.db differ diff --git a/templates/bateau.html b/templates/bateau.html index 3913bc5..ed969f1 100644 --- a/templates/bateau.html +++ b/templates/bateau.html @@ -9,10 +9,8 @@ origine histoire !--> - {{nom}} - - +

{{nom}}}

@@ -31,33 +29,11 @@ histoire Installation - {{Date}} + {{DateInstallation}} Condamnation - {{Date}} - - - Origine - {{ville}} - Nom - {{NomBateau}} - - - Constructeur - {{nom}} - - - Dimensions - {{Dimensions}} - - - Installation - {{Date}} - - - Condamnation - {{Date}} + {{DateCondamnation}} Origine