Compare commits
No commits in common. "main" and "moreOnStyle" have entirely different histories.
main
...
moreOnStyl
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
||||
__pycacahe__/*
|
||||
freeriders/__pycacahe__/*
|
||||
instance/
|
||||
|
||||
@ -7,4 +7,3 @@ Web app for tracking current ticket numbers
|
||||
- keep all ticket numbers and timestamps in SQL table "tickets"
|
||||
- display last ticket number
|
||||
- don't allow tickets that are out of probable ticket number range
|
||||
- if last submited ticket is timestamped more then 90 minutes ago, try to predict the next number
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
import time
|
||||
import datetime
|
||||
|
||||
def datetounix(day, month, year, hour, minute, second):
|
||||
seconds = datetime.datetime(year, month, day, hour, minute, second).timestamp()
|
||||
return int(seconds)
|
||||
|
||||
def formatprefix2(number):
|
||||
return "{:02d}".format(number)
|
||||
|
||||
def formatprefix10(number):
|
||||
return "{:010d}".format(number)
|
||||
|
||||
def predict(timestamp):
|
||||
base_ticket = 7157662
|
||||
base_timestamp = 1695887564
|
||||
step = 0.688
|
||||
|
||||
ticket = base_ticket + (timestamp - base_timestamp) * step
|
||||
return int(ticket)
|
||||
|
||||
@ -1,26 +1,14 @@
|
||||
from flask import render_template, request, redirect
|
||||
from freeriders import app, db
|
||||
from freeriders.functions import formatprefix2,formatprefix10, predict
|
||||
from freeriders.models import Tickets
|
||||
from datetime import datetime
|
||||
from freeriders.models import Ticket
|
||||
import time
|
||||
|
||||
@app.route('/sms', methods=['GET'])
|
||||
def sms():
|
||||
if request.method == 'GET':
|
||||
timenow = int(time.time())
|
||||
|
||||
try:
|
||||
lastticket = Tickets.query.order_by(Tickets.timestamp.desc()).first()
|
||||
|
||||
if lastticket.timestamp < timenow - (90 * 60):
|
||||
lastticket = formatprefix10(predict(timenow))
|
||||
else:
|
||||
lastticket = formatprefix10(lastticket.ticket)
|
||||
date = datetime.now()
|
||||
datenow = f'{formatprefix2(date.day)}.{formatprefix2(date.month)}.{date.year}'
|
||||
timenow = f'{formatprefix2(date.hour)}:{formatprefix2(date.minute)}:{formatprefix2(date.second)}'
|
||||
return render_template('sms.html', ticket = lastticket, date = datenow, time = timenow)
|
||||
lastticket = Ticket.query.order_by(Ticket.timestamp.desc()).first()
|
||||
return render_template('sms.html', ticket = lastticket)
|
||||
except:
|
||||
return 'Error retriving last ticket'
|
||||
else:
|
||||
@ -28,7 +16,6 @@ def sms():
|
||||
|
||||
@app.route('/submit', methods=['POST', 'GET'])
|
||||
def submit():
|
||||
PREDICTTIMERANGE = 60 * 60 * 24
|
||||
if request.method == 'GET':
|
||||
return render_template('submit.html')
|
||||
elif request.method == 'POST':
|
||||
@ -36,14 +23,7 @@ def submit():
|
||||
ticket_input = request.form['ticket']
|
||||
|
||||
if ticket_input.isdigit() and len(ticket_input) == 10:
|
||||
if int(ticket_input) < predict(timenow + PREDICTTIMERANGE ) and int(ticket_input) > predict(timenow - PREDICTTIMERANGE ) :
|
||||
ticket = Tickets(ticket = int(ticket_input), timestamp = timenow)
|
||||
else:
|
||||
print(int(ticket_input))
|
||||
print(predict(timenow - PREDICTTIMERANGE))
|
||||
print(predict(timenow + PREDICTTIMERANGE))
|
||||
print(predict(timenow))
|
||||
return 'Ticket number is in unexpected range.'
|
||||
ticket = Ticket(ticket = int(ticket_input), timestamp = timenow)
|
||||
else:
|
||||
return 'Ticket format is wrong. Only 10 digits allowed.'
|
||||
|
||||
|
||||
14
freeriders/templates/index.html
Normal file
14
freeriders/templates/index.html
Normal file
@ -0,0 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" href="/styles/style.css">
|
||||
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
|
||||
<title>Ticket tracking</title>
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@ -4,7 +4,7 @@
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Karta</title>
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<link rel="stylesheet" href="style.css">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
@ -20,8 +20,35 @@
|
||||
U Beogradu, za broj telefona ste kupili
|
||||
VREMENSKU KARTU OD 90 MINUTA U ZONI A po
|
||||
ceni od 50 din + osnovna cena poruke,
|
||||
koja vazi do {{ date }}, {{ time }}.
|
||||
Karta broj: {{ ticket }}.
|
||||
koja vazi do 03.10.2023, 09:42:54.
|
||||
Karta broj: 0000343232.
|
||||
Placanjem operateru izmirujete dugovanja
|
||||
za ovu kartu prema JKP Naplata prevozne
|
||||
usluge Beograd. Sacuvajte ovu poruku.
|
||||
</section>
|
||||
<section class='request'>
|
||||
A90
|
||||
</section>
|
||||
<section class='ticket'>
|
||||
U Beogradu, za broj telefona ste kupili
|
||||
VREMENSKU KARTU OD 90 MINUTA U ZONI A po
|
||||
ceni od 50 din + osnovna cena poruke,
|
||||
koja vazi do 03.10.2023, 09:42:54.
|
||||
Karta broj: 0000343232.
|
||||
Placanjem operateru izmirujete dugovanja
|
||||
za ovu kartu prema JKP Naplata prevozne
|
||||
usluge Beograd. Sacuvajte ovu poruku.
|
||||
</section>
|
||||
<section class='date'>08:23</section>
|
||||
<section class='request'>
|
||||
A90
|
||||
</section>
|
||||
<section class='ticket'>
|
||||
U Beogradu, za broj telefona ste kupili
|
||||
VREMENSKU KARTU OD 90 MINUTA U ZONI A po
|
||||
ceni od 50 din + osnovna cena poruke,
|
||||
koja vazi do 03.10.2023, 09:42:54.
|
||||
Karta broj: 0000343232.
|
||||
Placanjem operateru izmirujete dugovanja
|
||||
za ovu kartu prema JKP Naplata prevozne
|
||||
usluge Beograd. Sacuvajte ovu poruku.
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Submit</title>
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<form action="/submit" method="POST">
|
||||
<label for="ticket">ticket</label>
|
||||
<input type="text" name="ticket" id="ticket" placeholder="1234567890" required>
|
||||
<button> Submit </button>
|
||||
</form>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user