From d492b9f7c1cb2c1304df58b24986fea903adf928 Mon Sep 17 00:00:00 2001
From: fordprefect <fordprefect@dukun.de>
Date: Fri, 8 Jan 2021 14:45:34 +0100
Subject: [PATCH] some changes

---
 .gitignore |  2 +-
 pin.run    | 99 +++++++++++++++++++++++++++---------------------------
 style.css  |  4 +--
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index 151a12d..ab8ec4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-db.txt
+db.cfg
diff --git a/pin.run b/pin.run
index bc15ef0..c15f535 100755
--- a/pin.run
+++ b/pin.run
@@ -9,7 +9,7 @@ from datetime import datetime
 #locale.setlocale(locale.LC_TIME, "de_DE")
 
 origin_url = "https://augustiner-kantorei.de/pinnwand"
-database = "db.txt"
+database = "db.cfg"
 
 def get_arguments():
     """Wrapper for cgi-environment.
@@ -60,7 +60,7 @@ with open(database, "r") as f:
 table = ""
 for line in content:
     tstamp, ort, name, comment, timestamp = line.split("\t")
-    if float(tstamp) < now:
+    if float(tstamp) < now - 60*60:
         continue
     zeit = datetime.fromtimestamp(float(tstamp))
     hzeit = datetime.strftime(zeit, "%a, %d.%m.%Y  %H:%M")
@@ -75,8 +75,9 @@ print(f"""
 <h2>Überschrift</h2>
 <div class="box">
 <h2>Terminangebote</h2>
+Termine werden eine Stunde nach Erreichen des Termins automatisch nicht mehr angezeigt.<br>
 <table border="1" style="color:#cecece">
-<tr><th>Zeit</th><th>Ort</th><th>Name</th><th>Bemerkung</th></tr>
+<tr><th>Zeitpunkt</th><th>Treffpunkt</th><th>Name</th><th>Bemerkung</th></tr>
 {table}
 </table>
 
@@ -89,48 +90,6 @@ if oversize:
 else:
     print("""
 <form action="pin.run" method="post" enctype="multipart/form-data">
-    <select name="hour" size=1>
-    <option>0</option>
-    <option>1</option>
-    <option>2</option>
-    <option>3</option>
-    <option>4</option>
-    <option>5</option>
-    <option>6</option>
-    <option>7</option>
-    <option>8</option>
-    <option>9</option>
-    <option>10</option>
-    <option>11</option>
-    <option>12</option>
-    <option>13</option>
-    <option>14</option>
-    <option>15</option>
-    <option>16</option>
-    <option>17</option>
-    <option>18</option>
-    <option>19</option>
-    <option>20</option>
-    <option>21</option>
-    <option>22</option>
-    <option>23</option>
-    </select>
-    :
-    <select name="minute" size=1>
-    <option>00</option>
-    <option>05</option>
-    <option>10</option>
-    <option>15</option>
-    <option>20</option>
-    <option>25</option>
-    <option>30</option>
-    <option>35</option>
-    <option>40</option>
-    <option>45</option>
-    <option>50</option>
-    <option>55</option>
-    </select>
-    &nbsp;
     <select name="day" size=1>
     <option>1</option>
     <option>2</option>
@@ -183,10 +142,52 @@ else:
     <select name="year" size=1>
     <option>2021</option>
     </select>
-    &nbsp; Zeit (hh:mm DD.MM.YYYY) <br>
-    <input type="text" name="ort" placeholder="Ort" /> &nbsp;Ort<br />
-    <input type="text" name="name" placeholder="Name" /> &nbsp;Name<br />
-    <input type="text" name="comment" placeholder="Bemerkung" /> &nbsp;Bemerkung<br />
+    &nbsp;
+    <select name="hour" size=1>
+    <option>0</option>
+    <option>1</option>
+    <option>2</option>
+    <option>3</option>
+    <option>4</option>
+    <option>5</option>
+    <option>6</option>
+    <option>7</option>
+    <option>8</option>
+    <option>9</option>
+    <option>10</option>
+    <option>11</option>
+    <option>12</option>
+    <option>13</option>
+    <option>14</option>
+    <option>15</option>
+    <option>16</option>
+    <option>17</option>
+    <option>18</option>
+    <option>19</option>
+    <option>20</option>
+    <option>21</option>
+    <option>22</option>
+    <option>23</option>
+    </select>
+    :
+    <select name="minute" size=1>
+    <option>00</option>
+    <option>05</option>
+    <option>10</option>
+    <option>15</option>
+    <option>20</option>
+    <option>25</option>
+    <option>30</option>
+    <option>35</option>
+    <option>40</option>
+    <option>45</option>
+    <option>50</option>
+    <option>55</option>
+    </select>
+    &nbsp; Zeitpunkt (Tag. Monat. Jahr  Stunde:Minute) <br>
+    <input type="text" name="ort" placeholder="Treffpunkt" maxlength=30/> &nbsp;Treffpunkt<br />
+    <input type="text" name="name" placeholder="Name" maxlength=30/> &nbsp;Name<br />
+    <input type="text" name="comment" placeholder="Bemerkung" maxlength=130/> &nbsp;Bemerkung<br />
     <input type="submit" name="Absenden" value="Absenden" />
  </form>
 """)
diff --git a/style.css b/style.css
index 477118f..5982fe6 100644
--- a/style.css
+++ b/style.css
@@ -2,8 +2,8 @@ div.box {
     color:#cecece;
     background-image: url('https://dukun.de/linen_login.jpg');
     background-size: 100%;
-    width: 100%;
-    height: 90%;
+    width: 90%;
+    height: 87%;
     margin: 0px auto;
     overflow: auto;
     padding:10px;