Compare commits

...

3 Commits

Author SHA1 Message Date
Stefano Assenzo
464152de50
Try new style for table 2023-01-26 17:19:45 +00:00
Stefano Assenzo
5ef9c4f0f9
Fix JSON database MongoDB 2023-01-26 17:12:51 +00:00
Stefano Assenzo
debaf06011
Create simple table inteface with school time api 2023-01-26 17:06:43 +00:00
3 changed files with 408 additions and 150 deletions

14
app.py
View File

@ -1,10 +1,14 @@
from flask import Flask, render_template, request, session, jsonify, redirect
from dotenv import load_dotenv
import requests
import urllib.request, json
import pymongo
import logging
import bcrypt
import sys
import os
from urllib import request
from urllib.request import Request, urlopen
logging.basicConfig(
level=logging.INFO,
@ -30,9 +34,11 @@ def homepage():
@app.route('/orario')
def orario():
logging.info("A user went up: Orario")
if 'username' in session:
return "You are logged in as " + session['username']
#return render_template('html/orario.html')
url = "http://127.0.0.1:5000"
response = Request(url, headers={"User-Agent": "Mozilla/5.0"})
webpage = urlopen(response).read()
dict = list(json.loads(webpage))
return render_template('orario/orario.html', data=dict)
@app.route('/calendario')
def calendario():
@ -80,4 +86,4 @@ def login():
if __name__ == '__main__':
logging.info("Web server started!")
app.run()
app.run(port=4999, debug=True)

View File

@ -40,254 +40,254 @@ def update_time_school():
"School Subject": {
"Monday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
"Tuesday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
"Wednesday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
"Thursday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
"Friday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
"Saturday": [
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
{
"Subject": "null",
"Teacher": "null",
"Room": "null",
"Subject": "",
"Teacher": "",
"Room": "",
},
],
}
@ -330,7 +330,7 @@ def update_time_school():
dont_repeat = 0
else:
if day == "None":
if school_subject == 0: #If school subject is 0, add "null" in MongoDB
if school_subject == 0: #If school subject is 0, add "" in MongoDB
number += 1
gagaga += 1
dont_repeat += 1
@ -372,7 +372,7 @@ def update_time_school():
array_test = []
array_test.append(convert_date_to_day)
number_day += 1
if school_subject == 0: #If school subject is 0, add "null" in MongoDB
if school_subject == 0: #If school subject is 0, add "" in MongoDB
find_document_school_time_table = list(collection.find({}, {"Date": long_date}))
find_document_archive_school_time_table = list(collection_archive.find({}, {"Date": long_date}))
array_document_school_time_table = find_document_school_time_table[0]["_id"]

View File

@ -0,0 +1,252 @@
<table>
<tr>
<th scope="col">Lunedì</th>
<th scope="col">Martedì</th>
<th scope="col">Mercoledì</th>
<th scope="col">Giovedì</th>
<th scope="col">Venerdì</th>
<th scope="col">Sabato</th>
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][0]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][0]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][0]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][0]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][0]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][0]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][0]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][0]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][0]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][0]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][0]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][0]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][0]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][0]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][0]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][0]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][0]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][0]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][1]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][1]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][1]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][1]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][1]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][1]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][1]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][1]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][1]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][1]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][1]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][1]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][1]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][1]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][1]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][1]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][1]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][1]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][2]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][2]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][2]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][2]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][2]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][2]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][2]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][2]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][2]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][2]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][2]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][2]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][2]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][2]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][2]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][2]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][2]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][2]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][3]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][3]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][3]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][3]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][3]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][3]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][3]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][3]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][3]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][3]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][3]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][3]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][3]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][3]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][3]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][3]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][3]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][3]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][4]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][4]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][4]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][4]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][4]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][4]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][4]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][4]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][4]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][4]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][4]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][4]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][4]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][4]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][4]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][4]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][4]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][4]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][5]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][5]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][5]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][5]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][5]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][5]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][5]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][5]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][5]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][5]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][5]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][5]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][5]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][5]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][5]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][5]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][5]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][5]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][6]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][6]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][6]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][6]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][6]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][6]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][6]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][6]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][6]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][6]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][6]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][6]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][6]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][6]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][6]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][6]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][6]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][6]['Room'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][7]['Subject'] }}</td>
<td>{{ i['School Subject']['Tuesday'][7]['Subject'] }}</td>
<td>{{ i['School Subject']['Wednesday'][7]['Subject'] }}</td>
<td>{{ i['School Subject']['Thursday'][7]['Subject'] }}</td>
<td>{{ i['School Subject']['Friday'][7]['Subject'] }}</td>
<td>{{ i['School Subject']['Saturday'][7]['Subject'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][7]['Teacher'] }}</td>
<td>{{ i['School Subject']['Tuesday'][7]['Teacher'] }}</td>
<td>{{ i['School Subject']['Wednesday'][7]['Teacher'] }}</td>
<td>{{ i['School Subject']['Thursday'][7]['Teacher'] }}</td>
<td>{{ i['School Subject']['Friday'][7]['Teacher'] }}</td>
<td>{{ i['School Subject']['Saturday'][7]['Teacher'] }}</td>
{% endfor %}
</tr>
<tr>
{% for i in data %}
<td>{{ i['School Subject']['Monday'][7]['Room'] }}</td>
<td>{{ i['School Subject']['Tuesday'][7]['Room'] }}</td>
<td>{{ i['School Subject']['Wednesday'][7]['Room'] }}</td>
<td>{{ i['School Subject']['Thursday'][7]['Room'] }}</td>
<td>{{ i['School Subject']['Friday'][7]['Room'] }}</td>
<td>{{ i['School Subject']['Saturday'][7]['Room'] }}</td>
{% endfor %}
</tr>
</table>