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

Merge branch 'master' of https://forge.chapril.org/CretinsMotorisesIngenieux/Marin

Browse Source
This commit is contained in:
theo@manjaro 2021-12-03 03:53:11 +01:00
commit fa6dd6f351
9 changed files with 126 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app.py
View File

@ -25,6 +25,11 @@ def sauveteur(idsauveteur):
def bateau(idbateau): def bateau(idbateau):
return pages.bateau(idbateau) return pages.bateau(idbateau)
@app.route('/expeditions/<int:idexpe>')
@app.route('/expedition/<int:idexpe>')
def expe(idexpe):
return pages.expeditions(idexpe)
@app.errorhandler(404) @app.errorhandler(404)
def error(e): def error(e):
return pages.error() return pages.error()

12
pages.py
View File

@ -33,6 +33,18 @@ def bateau(idbateau):
else: else:
return error() return error()
def expeditions(idexpedition):
dico = {}
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")
return render_template("expedition.html",**dico)
else:
return error()
def sauveteur(idsauveteur): def sauveteur(idsauveteur):
dico = {} dico = {}
dico["nom"] = "John" dico["nom"] = "John"

4
static/style.css
View File

@ -45,6 +45,10 @@ table, tr, td {
font-size: 30px; font-size: 30px;
} }
#searchresults {
width: 75%;
}
.searchbar { .searchbar {
float: right; float: right;
padding-right: 20px; padding-right: 20px;

43
templates/bateau.html
View File

@ -9,41 +9,54 @@ origine
histoire histoire
!--> !-->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{nom}}</title>
<link href="/static/style.css" rel="stylesheet" type="text/css"> <title>{{nom}} - Sauveuteurs du dunkerquois</title>
<link rel="icon" type="image/png" href="../static/favicon.png" /> <link href="../static/style.css" rel="stylesheet" type="text/css">
<link href="file:///C:/Users/rugja/Marin/templates/style.css" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<a href="https://www.google.com/">Proposer une modification</a>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<h1>{{nom}}}</h1> <h1>{{nom}}}</h1>
<div class="flexbox">
<p>{{HistoireBateau}}</p>
<p class="right-align">
<table> <table>
<tbody><tr> <tbody><tr>
<td>Nom</td> <td class="table_key">Nom</td>
<td>{{NomBateau}}</td> <td>{{NomBateau}}</td>
</tr> </tr>
<tr> <tr>
<td>Constructeur</td> <td class="table_key">Constructeur</td>
<td>{{nom}}</td> <td>{{nom}}</td>
</tr> </tr>
<tr> <tr>
<td>Dimensions</td> <td class="table_key">Dimensions</td>
<td>{{Dimensions}}</td> <td>{{Dimensions}}</td>
</tr> </tr>
<tr> <tr>
<td>Installation</td> <td class="table_key">Installation</td>
<td>{{DateInstallation}}</td> <td>{{Date1}}</td>
</tr> </tr>
<tr> <tr>
<td>Condamnation</td> <td class="table_key">Condamnation</td>
<td>{{DateCondamnation}}</td> <td>{{Date2}}</td>
</tr> </tr>
<tr> <tr>
<th>Origine</th> <td class="table_key">Origine</td>
<th>{{ville}}</th> <td>{{ville}}</td>
</tr> </tr>
</tbody></table> </tbody></table>
<p>
{{HistoireBateau}}
</p>
</body></html> </body></html>

16
templates/expedition.html
View File

@ -6,19 +6,29 @@ evenement
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html --> <!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{siecle}}</title> <title>{{siecle}}- Sauveuteurs du dunkerquois</title>
<link href="../static/style.css" rel="stylesheet" type="text/css"> <link href="../static/style.css" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="../static/favicon.png" />
</head> </head>
<body> <body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<a href="https://www.google.com/">Proposer une modification</a>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<h1>{{siecle}}</h1> <h1>{{siecle}}</h1>
<div class="flexbox">
<table> <table>
<tbody><tr> <tbody><tr>
<script> {% for i in range(Date) %} <script> {% for i in range(Date) %}
{{ i }} {{ i }}
{% endfor %} {% endfor %}
</script> </script>
<td>Date</td> <td class="table_key">Date</td>
<td>{{Annee}}</td> <td>{{Annee}}</td>
</tr> </tr>
<tr> <tr>

28
templates/sauvees.html
View File

@ -9,33 +9,43 @@ histoire
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html --> <!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{nom}}{{prenom}}</title> <title>{{nom}}{{prenom}}- Sauveuteurs du dunkerquois</title>
<link href="../static/style.css" rel="stylesheet" type="text/css"> <link href="../static/style.css" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="../static/favicon.png" />
</head> </head>
<body> <body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<a href="https://www.google.com/">Proposer une modification</a>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<h1>{{nom}}}{{prenom}}</h1> <h1>{{nom}}}{{prenom}}</h1>
<div class="flexbox">
<p>{{histoire}}</p>
<p class="right-align">
<table> <table>
<tbody><tr> <tbody><tr>
<td>Nom</td> <td class="table_key">Nom</td>
<td>{{nom}}</td> <td>{{nom}}</td>
</tr> </tr>
<tr> <tr>
<td>Prenom</td> <td class="table_key">Prenom</td>
<td>{{prenom}}</td> <td>{{prenom}}</td>
</tr> </tr>
<tr> <tr>
<td>Date</td> <td class="table_key">Date</td>
<td>{{date}}</td> <td>{{date}}</td>
</tr> </tr>
<tr> <tr>
<td>Place</td> <td class="table_key">Place</td>
<td>{{place}}</td> <td>{{place}}</td>
</tr> </tr>
</tbody></table> </tbody></table>
<p>
{{Histoire}}
</p>
</body></html> </body></html>

23
templates/search.html
View File

@ -1,23 +0,0 @@
<!DOCTYPE html>
<head>
<meta charset="utf-8">
<title>{{nom}} {{prenom}} - Sauveuteurs du dunkerquois</title>
<link href="../static/style.css" rel="stylesheet" type="text/css" />
<link rel="icon" type="image/png" href="../static/favicon.png" />
</head>
<body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<script> {% for key, value in dres %}
{{<a href=}value{>}key{</a>}}
{% endfor %}
</script>
</body>
</html>

34
templates/searchresults.html
View File

@ -1,9 +1,29 @@
<ul> <!DOCTYPE html>
<head>
<meta charset="utf-8">
<title>{{nom}} {{prenom}} - Sauveuteurs du dunkerquois</title>
<link href="../static/style.css" rel="stylesheet" type="text/css" />
<link rel="icon" type="image/png" href="../static/favicon.png" />
</head>
<body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<h1>Résultats de la recherche :</h1>
<center>
<table id="searchresults">
{% for result in liste %} {% for result in liste %}
<tr>
<li><a href="{{result.lien}}">{{result.nom}}</a></li> <td><a href="{{result.lien}}">{{result.nom}}</a></td>
</tr>
{% endfor %} {% endfor %}
</table>
</ul> </center>
</body>
</html>

16
templates/station.html
View File

@ -7,19 +7,29 @@ evenement
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html --> <!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{nom}}</title> <title>{{nom}} - Sauveuteurs du dunkerquois</title>
<link href="../static/style.css" rel="stylesheet" type="text/css"> <link href="../static/style.css" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="../static/favicon.png" />
</head> </head>
<body> <body>
<header id="banner">
<img src="../static/icon.png" width="150" height="75">
<span id="logo_title">Sauveuteurs du dunkerquois</span>
</header>
<br>
<a href="https://www.google.com/">Proposer une modification</a>
<form class="searchbar" method=get>
<input type="text" placeholder="Saisissez votre recherche..." size=20>
<input type="submit" value="Rechercher">
</form>
<h1>{{nom}}</h1> <h1>{{nom}}</h1>
<div class="flexbox">
<table> <table>
<tbody><tr> <tbody><tr>
<script> {% for i in range(Date) %} <script> {% for i in range(Date) %}
{{ i }} {{ i }}
{% endfor %} {% endfor %}
</script> </script>
<td>Date</td> <td class="table_key">Date</td>
<td>{{Annee}}</td> <td>{{Annee}}</td>
</tr> </tr>
<tr> <tr>