diff --git a/Project design/BPMN/BPMN descriptie.txt b/Project design/BPMN/BPMN descriptie.txt
new file mode 100755
index 0000000..30afac0
--- /dev/null
+++ b/Project design/BPMN/BPMN descriptie.txt
@@ -0,0 +1,22 @@
+Process beschrijving:
+Het process begint bij de klant, hierna genoemd reiziger. De reiziger vult een bericht in bij een computer zuil.
+Het bericht is maximaal 140 tekens lang, er wordt ook om de naam gevraagt. De naam mag leeg gelaten worden, waarna er automatisch "anoniem" wordt bijgevuld.
+Nadat het bericht in de database is opgeslagen, is het de beurt aan de moderator om het bericht goed te keuren.
+Als de moderator het bericht goedkeurt, wordt automatisch het bericht gepubliseerd op twitter, en wordt op een groot scherm in de stations hal getoond.
+Als het bericht wordt afgekeurd wordt er niets meer met het bericht gedaan.
+
+Actoren:
+klant/reiziger, moderator
+
+ICT infrastructuur:
+computer zuil voor de klant
+computer voor de moderator
+groot beeldscherm in de stations hal
+een database
+
+Diagram structuur:
+ pool: Twitter Zuil Systeem
+ lanes: klant/reiziger, moderator
+
+Diagram gateways:
+ - Exclusive gateway
\ No newline at end of file
diff --git a/Project design/BPMN/BPMN diagram.drawio b/Project design/BPMN/BPMN diagram.drawio
new file mode 100755
index 0000000..99a4550
--- /dev/null
+++ b/Project design/BPMN/BPMN diagram.drawio
@@ -0,0 +1 @@
+5Vrbcts2EP0aPcbDi6jLY3Rx0tTueOrOpM4bSK5IJCChgmAk6uu7IEFRFHVzZEqq6/HIwBIAgbNnF7trdexxtPwkyDx85D6wjmX4y4496ViW2bWsjvo1/KyQDIxuIQgE9fWgSvBMV6CFhpam1IekNlByziSd14Uej2PwZE1GhOCL+rAZZ/W3zkmg32hUgmePMGgM+0p9GepTOBujPwMNwvLNpqGfRKQcrAVJSHy+2BDZ0449FpzLohUtx8AUeCUuxbz7PU/XGxMQy1Mm/Eam/Ns/lHyZjvzPfppOyeP0g17lJ2GpPvBfCyolCBR+S6ma/5wlEiDSh5BZiUyyoBEjMfZGoYwYCk1seiFl/gPJeKo2lUji/Sh7IwEJ6vep3LG5JXokijWGWo8LuuKxJOWquI6QmhxWfcSzeoWepw8DQsJyL0rmGnskLfAIpMhwiJ5ga21l9e6i0v2wpGa4oXdnqIVE8y1Yr1ypBBtaK6/QkNXQ0O+Iuuwobd/j559AVzRQCusxBbKrWoFco3FUYwewfQ2s++nVxFqDa50Irmm3Ba45aIAEPtq/7nIhQx7wmLBpJR0JnsY++BqcaswD53ON6XeQMtOYklTyOuKImcj+1vPzzovq3Dlld7LcfDjJanpQG3ydFjSFEp4KDw6M62n/SkQAB7Xa361WAYxI+rO+uzfXWa9hEE2ih2SumtEyULfSnTuP4jst3FSEojRFX/9AXGBPPKGS8hifuVxKHuEAph6M0MEEudLHnHGRv8Ke5T8ba3xkNFBzpSLBiOieh5pB27RHcxAUz6/aEzwkXl/wVIlG6CAZjWG8vsWMSlj40dgnwlfmmkUuVwcIIAahbPQM+7QO+kLnqC90drnC1oy139D8AyHKE7qIpBeqFsE/+eXl0u/4ucqvsD3sgKWsWbNZJ8cipBKe5yQ3mQXyqEWk1+GOhtp0GlCb1g6sB21hbTegVqGdIBL5f+vXiumceK90u23B12Tq+/dREL+5e7IPGk1/6Gz5p2s7KPP/EE3YJ0YTgxOjiasGE4OGoY6qu2QWwAJWEN/GDXLYGJx+/QbBFPXKV0jpcS9rDW2zevhfYPXwEKsRsgj3kHihKq/APHUZ9QAwuLQMBBnPVlYAbp/1/d523NS8Ai7Meuc9st7snkj74Zm011OfOM1LHHucm7ldbSn2pWdtaXC9jTNqMM0y2ReyU895lFbXTSPM2o7GIur7BQ1UMYy4+XqKCHN1nvyEzqjjTA7ZkS5/6smdjWrmsVDaOWhgH4w7qx5l6Rf+qkbLIXw2S6AVZZm960ZhVeD1Uou7dkdhsKRyYxr2XsoVsV1NUp1LRW4nW/vgLaz9oxAk2xigWd+GGTdrqX8AvBM77h2z457jDGqWXNYFb9iUuw2F7Y1KbjSPFiGP3DTZzKPd9TvweUAkLJD/R9PrmOcVlnV+DUuPpQmq7dOixQCrZ2x5/14zrbhojm1dJav4Ve/euqc+NR0pLOla+Yh5KCEJuMLnB6SYgdj3e+37hrKO7XB0R2H8skmH1b2GUbRNbss+ldznZh3ngd+slaMPl4IzBsW/Ikqq3z6z7cGtMfsq6fSlS6pl3fiou++faBHWHjWfaxHYrb6wUkR51dd+7Om/
\ No newline at end of file
diff --git a/Project design/BPMN/BPMN diagram.png b/Project design/BPMN/BPMN diagram.png
new file mode 100755
index 0000000..0331315
Binary files /dev/null and b/Project design/BPMN/BPMN diagram.png differ
diff --git a/Project design/Use Cases/Invoeren bericht.odt b/Project design/Use Cases/Invoeren bericht.odt
new file mode 100644
index 0000000..9902721
Binary files /dev/null and b/Project design/Use Cases/Invoeren bericht.odt differ
diff --git a/Project design/Use Cases/Usecase diagram.drawio b/Project design/Use Cases/Usecase diagram.drawio
new file mode 100755
index 0000000..ff2e369
--- /dev/null
+++ b/Project design/Use Cases/Usecase diagram.drawio
@@ -0,0 +1 @@
+3ZfbcpswEIafxpfpYA6OfZnacZrpYTJxO0lzJ8MGNBWIkRdj5+m7CsIcPXYPTtJegX6tFu23yyIGzjTeXCmWRp9lAGJgW8Fm4MwGtj10PIsuWtkWyng4KoRQ8cAYVcKCP4ERzbow4wGsGoYopUCeNkVfJgn42NCYUjJvmj1K0XxqykLzRKsSFj4T0DG74wFGJgqvZv0BeBiVTx5aZiZmpbERVhELZF6TnMuBM1VSYnEXb6YgNLySS7Fuvmd2tzEFCR6zIJ/eThZ35/La/fItOkse5v6cnRkvayYyE/BHwcifPb8F/sRDUGbzuC2JUBypvs1iceGjVAPn/RoUcmL2iS1B3MgVRy4TMllKRBnXDC4ED/UEypTUCGNBgyHdygwFT2C6y6JFYjfCcrvkDjY1yUR8BTIGVFsyMbNOSd+Unz0247xKpmukqJbH0oyZ8gl3nivCdGMg/wJwuwNcvzOKaZD/FWnXemXSXod0B7CSWRJAYCDkEUdYpMzXszm1sya4v8DIdQ9X49DugWRbp6I07lC6TtYSKEhSl6C4T3tocyO/1H/hZZh5TWbOqIeZ1cPMORWySQcZvUyopHjD1PrexpelNux2vq85R9RfGOsh49rBYrtCgLhDjoLGJqIV8f5BTUzorjhLZKKxPnIhWhIzbdAnlKB6+mPMg0Dsy0mzP7xuAzhVWpzDbRKS4EIfpSqstUwQDLW9N4ieB9/14J1XDmeb+uRse4jmSmbKh8NnFmQqBDzc2iAoT3h7clNj7/WgLzUFgiFfN8+FffkwT7iRXB+kdt/H81bqJ62UFnGbVfVzXMuR2z7SuC1HBZiOo+fy2IX9BxXj/nMVYx9ZMZM3VTG7f6Dyy9dO9LEVY48OlN5vVwwNqx+Ywrz6DXQufwI=
\ No newline at end of file
diff --git a/Project design/Use Cases/Usecase diagram.png b/Project design/Use Cases/Usecase diagram.png
new file mode 100755
index 0000000..3a41d1e
Binary files /dev/null and b/Project design/Use Cases/Usecase diagram.png differ
diff --git a/Project design/Use Cases/controleren bericht.odt b/Project design/Use Cases/controleren bericht.odt
new file mode 100644
index 0000000..68e5938
Binary files /dev/null and b/Project design/Use Cases/controleren bericht.odt differ
diff --git a/customer_input.py b/customer_input.py
index 3236f05..f54a4cd 100644
--- a/customer_input.py
+++ b/customer_input.py
@@ -36,7 +36,7 @@ def vraaginvoer():
return False
try:
- naam = input('Onder welke naam?:')
+ naam = input('Onder welke naam?: ')
if len(naam) > 32:
print('Uw naam is te lang, verander uw naam in de geboorteakte bij uw gemeente.')
return False
diff --git a/moderator.py b/moderator.py
index c1c925f..0998778 100644
--- a/moderator.py
+++ b/moderator.py
@@ -1,3 +1,8 @@
+"""
+deze python script werkt, en werkt in de terminal
+voor een web versie, zie moderator_web.py
+deze script en moderator_web.py werken onafhankelijk van elkaar
+"""
import hashlib
import getpass
import database_connector
@@ -77,10 +82,11 @@ def publishtwit(berichtid):
cur.execute("SELECT naam FROM locaties WHERE locatieid = (%s)", [bericht[9]])
locatie = cur.fetchone()
+ # het bericht dat gepubliceerd wordt
formatted = str(bericht[1] + ' | Door ' + bericht[4] + ' op ' + locatie[0])
if len(formatted) < 180:
- response = twitter_API.request('statuses/update', {'status': formatted})
+ response = twitter_API.request('statuses/update', {'status': formatted})pytho
jsonresponse = response.json()
if response.status_code == 200:
# vul tabel twitterberichten eerst in
@@ -208,8 +214,28 @@ def listmessages(moderatorid):
print('2. Moderators weergeven')
print('3. Gepubliseerde berichten weergeven')
print('4. Locaties weergeven')
+ print('0. Vorige Menu')
print('_________________________________')
+ while inputcorrect == False:
+ try:
+ optie = int(input('Kies optie: '))
+ inputcorrect = True
+ except:
+ print('Ongeldige invoer')
+
+ if optie == 0:
+ return True
+ elif optie == 1:
+ return
+ elif optie == 2:
+ return
+ elif optie == 3:
+ return
+ elif optie == 4:
+ return
+ else:
+ print('Ongeldige invoer')
def menu(moderatorid, moderatornaam):
while True:
diff --git a/moderator_web.py b/moderator_web.py
new file mode 100644
index 0000000..e69de29
diff --git a/publish.py b/publish.py
deleted file mode 100644
index 325d63f..0000000
--- a/publish.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-from TwitterAPI import TwitterAPI
-from api_keys import * imports these variables
-
-TWITTER_APIKEY
-TWITTER_APISECRET
-TWITTER_BEARER
-TWITTER_ACCESSTOKEN
-TWITTER_ACCESSSECRET
-OWM_KEY
-"""
-from TwitterAPI import TwitterAPI
-from api_keys import *
-
-
-
-
-
-twitter_API = TwitterAPI(TWITTER_APIKEY, TWITTER_APISECRET, TWITTER_ACCESSTOKEN, TWITTER_ACCESSSECRET)
-
-r = twitter_API.request('statuses/update', {'status':'Another test tweet'})
-print(r.status_code)
-print(r.json())
-
-#test = {'created_at': 'Tue Sep 29 20:39:57 +0000 2020', 'id': 1311043058117550087, 'id_str': '1311043058117550087', 'text': 'Another tweet', 'truncated': False, 'entities': {'hashtags': [], 'symbols': [], 'user_mentions': [], 'urls': []}, 'source': '', 'in_reply_to_status_id': None, 'in_reply_to_status_id_str': None, 'in_reply_to_user_id': None, 'in_reply_to_user_id_str': None, 'in_reply_to_screen_name': None, 'user': {'id': 1308331480553267202, 'id_str': '1308331480553267202', 'name': 'nszuiltest33332', 'screen_name': 'nszuiltest33332', 'location': '', 'description': 'this is a testing account for a school project because I MUST use twitter and no other services that also offer an API', 'url': None, 'entities': {'description': {'urls': []}}, 'protected': True, 'followers_count': 0, 'friends_count': 0, 'listed_count': 0, 'created_at': 'Tue Sep 22 09:05:14 +0000 2020', 'favourites_count': 0, 'utc_offset': None, 'time_zone': None, 'geo_enabled': False, 'verified': False, 'statuses_count': 3, 'lang': None, 'contributors_enabled': False, 'is_translator': False, 'is_translation_enabled': False, 'profile_background_color': 'F5F8FA', 'profile_background_image_url': None, 'profile_background_image_url_https': None, 'profile_background_tile': False, 'profile_image_url': 'http://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png', 'profile_image_url_https': 'https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png', 'profile_link_color': '1DA1F2', 'profile_sidebar_border_color': 'C0DEED', 'profile_sidebar_fill_color': 'DDEEF6', 'profile_text_color': '333333', 'profile_use_background_image': True, 'has_extended_profile': True, 'default_profile': True, 'default_profile_image': True, 'following': False, 'follow_request_sent': False, 'notifications': False, 'translator_type': 'none'}, 'geo': None, 'coordinates': None, 'place': None, 'contributors': None, 'is_quote_status': False, 'retweet_count': 0, 'favorite_count': 0, 'favorited': False, 'retweeted': False, 'lang': 'en'}
-
-#print(test['id'])
\ No newline at end of file
diff --git a/scherm_web.py b/scherm_web.py
new file mode 100644
index 0000000..e69de29