From ebc2c378774f3306a4f91ffa376de3b84e82202d Mon Sep 17 00:00:00 2001
From: "theo@manjaro" <ayte@tutanota.com>
Date: Fri, 3 Dec 2021 06:12:33 +0100
Subject: [PATCH] Ajout des expeditions

---
 definitions.pyc | Bin 763 -> 0 bytes
 pages.py        |  11 ++++++++---
 pages.pyc       | Bin 4214 -> 0 bytes
 3 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 definitions.pyc
 delete mode 100644 pages.pyc

diff --git a/definitions.pyc b/definitions.pyc
deleted file mode 100644
index 74084b1bc6734fe3125fc7d615cea183cff83fa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmbVKL5|Zf6n##bP)Z9DEYJXAoeflo?P!EFGpwMC4ieHxsCXQgahup}>}ZOVuF4U(
z1P9<49D!4C0QldnG<zKT<@v|&|M#t=e@27fpMOY&!$|1;hL(RuP|_5rfJ-6?$`s!O
zE(HfKiXI&>e`!ntF{qT_4lRzK((=Cu=+i==19k%2G;R}gDP}3-qK6%@?V+RO0?P#c
zExH~S89GuW*d-8lbQ_{9f^|9T1likWY>W;s`W#y3Xnw}ycVp%Zn^y<}gnQ^R_CWLO
z(-UlSgdvBz97hz}v*Y!5e6)!AQLMnV4lJXVQ|f3kB|yjtF3#VbpMEIr^PW5R>&gWE
zI&$T#)hYy*Ox+C`02+5Qn@bg3^EK*K+j!T+<9ef28}vTx>e__B_c(D@hm1(OTInYA
ziOqFT*RrZ&xRLgYjx{Q6qoOoalohISUKeaD7AUV~R@OT5Mz34#!-20VsdUt`=a`I)
z1wl#~(G)}x!M`9jzIL@9U&&yW(z@}PQ*BMv{rJ6Xj2)MHZmbE$S^sjiZ&Yt)bT{0P
zf6lqY12K%xqhuroA{P&7cO;$?ABci~!D)oY#BPiKuY*2iIj&vVR{Dg~dWK>04^xSo
AF8}}l

diff --git a/pages.py b/pages.py
index 2e822dd..45de155 100644
--- a/pages.py
+++ b/pages.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from flask import render_template
 import definitions as lib
 from difflib import SequenceMatcher
@@ -85,7 +84,8 @@ def sauveteur(idsauveteur):
 def search(texte):
     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():
@@ -103,9 +103,14 @@ 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)
diff --git a/pages.pyc b/pages.pyc
deleted file mode 100644
index 761cd575cd45715d9e10f40c7bd074c8099aad35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4214
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
Y`GAK=1gt=xl~%9QZ{zo2f3d&%e=^gRxc~qF