CretinsMotorisesIngenieux
/
Marin
5
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: CretinsMotorisesIngenieux:fd20cd63192bbee44064978efbc6f93175b14281
Branches Tags
CretinsMotorisesIngenieux:master
..
compare: CretinsMotorisesIngenieux:a1f4410335d7d6e3a90df8e4ded6d7fa2478086f
Branches Tags
CretinsMotorisesIngenieux:master

No commits in common. "fd20cd63192bbee44064978efbc6f93175b14281" and "a1f4410335d7d6e3a90df8e4ded6d7fa2478086f" have entirely different histories.
fd20cd6319 ... a1f4410335

4 changed files with 11 additions and 31 deletions
Show Stats Expand all files Collapse all files

20
pages.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from flask import render_template
import definitions as lib
from difflib import SequenceMatcher
@ -31,6 +30,7 @@ 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" #<3
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"] = []
@ -69,6 +69,7 @@ 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,))
@ -83,11 +84,10 @@ 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")
totals = sauveurs+bateaux
expeditions = lib.ex_sql(dbname,"SELECT * FROM expedition")
totals = sauveurs+bateaux+expeditions
for i in totals:
i["score"] = 0
for key in i.keys():
@ -105,15 +105,17 @@ 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"])
r["nom"] = i["nom"]
n = "Sauveteurs"
elif "expedition_id" in i.keys():
r["lien"] = "/expeditions/"+str(i["expedition_id"])
n = "Expeditions"
r["nom"] = i["nom"]+" - "+n
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

BIN
site.db-journal
View File

Binary file not shown.

9
templates/bateau.html
View File

@ -10,15 +10,6 @@
<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>

13
templates/chuck.html
View File

@ -1,13 +0,0 @@
<!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>