Compare commits
4 Commits
a1f4410335
...
fd20cd6319
| Author | SHA1 | Date |
|---|---|---|
batikano1
|
fd20cd6319 | |
|
batikano1
|
1bd58c5886 | |
|
batikano1
|
b518224831 | |
|
batikano1
|
22a73c0a30 |
20
pages.py
20
pages.py
|
|
@ -1,3 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from flask import render_template
|
||||
import definitions as lib
|
||||
from difflib import SequenceMatcher
|
||||
|
|
@ -30,7 +31,6 @@ def bateau(idbateau):
|
|||
dico["date_naissance"] = result["date_naissance"]
|
||||
dico["date_mort"] = result["date_mort"]
|
||||
dico["Histoire"] = result["histoire"]
|
||||
dico["dimensions"] = result["dimension"]
|
||||
return render_template("bateau.html",**dico)
|
||||
else:
|
||||
return error()
|
||||
|
|
@ -56,7 +56,7 @@ def sauveteur(idsauveteur):
|
|||
dico["nb_sauvetages"] = 666
|
||||
dico["nb_sauves"] = 666
|
||||
dico["naissance"] = "vie"
|
||||
dico["deces"] = "mort"
|
||||
dico["deces"] = "mort" #<3
|
||||
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"] = []
|
||||
|
|
@ -69,7 +69,6 @@ def sauveteur(idsauveteur):
|
|||
dico["prenom"] = result["prenom"]
|
||||
dico["date_naissance"] = result["date_naissance"]
|
||||
dico["date_deces"] = result["date_mort"]
|
||||
dico["description"] = result["description"]
|
||||
print(dico["naissance"])
|
||||
print(dico["deces"])
|
||||
ids = lib.ex_sql(dbname,"SELECT * FROM mission WHERE personal_id=?",(idsauveteur,))
|
||||
|
|
@ -84,10 +83,11 @@ def sauveteur(idsauveteur):
|
|||
return error()
|
||||
|
||||
def search(texte):
|
||||
if texte.lower() == "chuck norris" :
|
||||
return render_template("chuck.html")
|
||||
sauveurs = lib.ex_sql(dbname,"SELECT * FROM sauveteur")
|
||||
bateaux = lib.ex_sql(dbname,"SELECT * FROM bateau")
|
||||
expeditions = lib.ex_sql(dbname,"SELECT * FROM expedition")
|
||||
totals = sauveurs+bateaux+expeditions
|
||||
totals = sauveurs+bateaux
|
||||
for i in totals:
|
||||
i["score"] = 0
|
||||
for key in i.keys():
|
||||
|
|
@ -105,17 +105,15 @@ def search(texte):
|
|||
r = {}
|
||||
if "ship_id" in i.keys():
|
||||
r["lien"] = "/bateaux/"+str(i["ship_id"])
|
||||
n = "Bateau"
|
||||
elif "personal_id" in i.keys():
|
||||
r["lien"] = "/sauveteurs/"+str(i["personal_id"])
|
||||
n = "Sauveteurs"
|
||||
elif "expedition_id" in i.keys():
|
||||
r["lien"] = "/expeditions/"+str(i["expedition_id"])
|
||||
n = "Expeditions"
|
||||
r["nom"] = i["nom"]+" - "+n
|
||||
r["nom"] = i["nom"]
|
||||
|
||||
results.append(r)
|
||||
return render_template("searchresults.html",liste=results)
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
def suggestion(nom,prenom,mail,article,modif):
|
||||
lib.ex_sql(dbname,"INSERT INTO suggestion(prenom, nom, mail, nomarticle, suggestion) VALUES (?, ?, ?, ?, ?);",(nom,prenom,mail,article,modif))
|
||||
>>>>>>> a1f4410335d7d6e3a90df8e4ded6d7fa2478086f
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,6 +10,15 @@
|
|||
<p>{{Histoire}}</p>
|
||||
<p class="right-align">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="table_key">Nom</td><td>{{NomBateau}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="table_key">Mise à flot</td><td>{{date_naissance}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="table_key">Mise en arrêt</td><td>{{date_mort}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="table_key">Nom</td><td>{{nom}}</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
<!DOCTYPE html>
|
||||
<head>
|
||||
<title>Chuck Norris - Sauveteurs du Dunkerquois</title>
|
||||
{% include 'head.html' %}
|
||||
</head>
|
||||
<body>
|
||||
{% include "smallheader.html" %}
|
||||
<h1>Chuck Norris</h1>
|
||||
<div class="flexbox">
|
||||
<p>Vous ne pouvez pas trouver Chuck Norris, c'est lui qui vous trouve.</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue