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

Compare commits

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

4 Commits
a1f4410335 ... fd20cd6319

Author SHA1 Message Date
batikano1 fd20cd6319 Merge branch 'master' of https://forge.chapril.org/CretinsMotorisesIngenieux/Marin 2021-12-03 06:48:35 +01:00
batikano1 1bd58c5886 fini 2021-12-03 06:47:19 +01:00
batikano1 b518224831 Merge branch 'master' of https://forge.chapril.org/CretinsMotorisesIngenieux/Marin 2021-12-03 06:34:18 +01:00
batikano1 22a73c0a30 easter egg 2021-12-03 06:34:04 +01:00
4 changed files with 31 additions and 11 deletions
Show Stats Expand all files Collapse all files

20
pages.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from flask import render_template from flask import render_template
import definitions as lib import definitions as lib
from difflib import SequenceMatcher from difflib import SequenceMatcher
@ -30,7 +31,6 @@ def bateau(idbateau):
dico["date_naissance"] = result["date_naissance"] dico["date_naissance"] = result["date_naissance"]
dico["date_mort"] = result["date_mort"] dico["date_mort"] = result["date_mort"]
dico["Histoire"] = result["histoire"] dico["Histoire"] = result["histoire"]
dico["dimensions"] = result["dimension"]
return render_template("bateau.html",**dico) return render_template("bateau.html",**dico)
else: else:
return error() return error()
@ -56,7 +56,7 @@ def sauveteur(idsauveteur):
dico["nb_sauvetages"] = 666 dico["nb_sauvetages"] = 666
dico["nb_sauves"] = 666 dico["nb_sauves"] = 666
dico["naissance"] = "vie" dico["naissance"] = "vie"
dico["deces"] = "mort" dico["deces"] = "mort" #<3
dico["gratifications"] = 1 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["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"] = [] dico["expeditions"] = []
@ -69,7 +69,6 @@ def sauveteur(idsauveteur):
dico["prenom"] = result["prenom"] dico["prenom"] = result["prenom"]
dico["date_naissance"] = result["date_naissance"] dico["date_naissance"] = result["date_naissance"]
dico["date_deces"] = result["date_mort"] dico["date_deces"] = result["date_mort"]
dico["description"] = result["description"]
print(dico["naissance"]) print(dico["naissance"])
print(dico["deces"]) print(dico["deces"])
ids = lib.ex_sql(dbname,"SELECT * FROM mission WHERE personal_id=?",(idsauveteur,)) ids = lib.ex_sql(dbname,"SELECT * FROM mission WHERE personal_id=?",(idsauveteur,))
@ -84,10 +83,11 @@ def sauveteur(idsauveteur):
return error() return error()
def search(texte): def search(texte):
if texte.lower() == "chuck norris" :
return render_template("chuck.html")
sauveurs = lib.ex_sql(dbname,"SELECT * FROM sauveteur") sauveurs = lib.ex_sql(dbname,"SELECT * FROM sauveteur")
bateaux = lib.ex_sql(dbname,"SELECT * FROM bateau") bateaux = lib.ex_sql(dbname,"SELECT * FROM bateau")
expeditions = lib.ex_sql(dbname,"SELECT * FROM expedition") totals = sauveurs+bateaux
totals = sauveurs+bateaux+expeditions
for i in totals: for i in totals:
i["score"] = 0 i["score"] = 0
for key in i.keys(): for key in i.keys():
@ -105,17 +105,15 @@ def search(texte):
r = {} r = {}
if "ship_id" in i.keys(): if "ship_id" in i.keys():
r["lien"] = "/bateaux/"+str(i["ship_id"]) r["lien"] = "/bateaux/"+str(i["ship_id"])
n = "Bateau"
elif "personal_id" in i.keys(): elif "personal_id" in i.keys():
r["lien"] = "/sauveteurs/"+str(i["personal_id"]) r["lien"] = "/sauveteurs/"+str(i["personal_id"])
n = "Sauveteurs" r["nom"] = i["nom"]
elif "expedition_id" in i.keys():
r["lien"] = "/expeditions/"+str(i["expedition_id"])
n = "Expeditions"
r["nom"] = i["nom"]+" - "+n
results.append(r) results.append(r)
return render_template("searchresults.html",liste=results) return render_template("searchresults.html",liste=results)
<<<<<<< HEAD
=======
def suggestion(nom,prenom,mail,article,modif): 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)) lib.ex_sql(dbname,"INSERT INTO suggestion(prenom, nom, mail, nomarticle, suggestion) VALUES (?, ?, ?, ?, ?);",(nom,prenom,mail,article,modif))
>>>>>>> a1f4410335d7d6e3a90df8e4ded6d7fa2478086f

BIN
site.db-journal Normal file
View File

Binary file not shown.

9
templates/bateau.html
View File

@ -10,6 +10,15 @@
<p>{{Histoire}}</p> <p>{{Histoire}}</p>
<p class="right-align"> <p class="right-align">
<table> <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> <tr>
<td class="table_key">Nom</td><td>{{nom}}</td> <td class="table_key">Nom</td><td>{{nom}}</td>
</tr> </tr>

13
templates/chuck.html Normal file
View File

@ -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>