From 0974a2e3a691e8a30134db4fda175e9be38259d3 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Thu, 30 Jul 2020 11:31:37 +0200 Subject: [PATCH] =?UTF-8?q?=20=20=20=20-=20[x]=20organizer=20eigene=20enti?= =?UTF-8?q?t=C3=A4t=20mit=20adminunitid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 658 +++++++++--------------- forms/event.py | 29 +- forms/event_suggestion.py | 22 - forms/organizer.py | 41 ++ jsonld.py | 45 +- migrations/versions/699c4f6a7fe8_.py | 42 ++ migrations/versions/dcd0b71650b0_.py | 36 ++ models.py | 11 + scrape_fp.py | 3 +- templates/_macros.html | 67 +-- templates/event/create.html | 27 +- templates/event/list.html | 4 +- templates/event/update.html | 19 +- templates/event_suggestion/create.html | 33 -- templates/event_suggestion/list.html | 36 -- templates/event_suggestion/read.html | 93 ---- templates/layout.html | 9 +- templates/manage/admin_unit.html | 12 + templates/manage/admin_units.html | 13 + templates/manage/organizers.html | 32 ++ templates/organizer/create.html | 57 ++ templates/organizer/delete.html | 24 + templates/organizer/read.html | 29 ++ templates/organizer/update.html | 57 ++ translations/de/LC_MESSAGES/messages.mo | Bin 7055 -> 7271 bytes translations/de/LC_MESSAGES/messages.po | 445 ++++++++-------- 26 files changed, 869 insertions(+), 975 deletions(-) delete mode 100644 forms/event_suggestion.py create mode 100644 forms/organizer.py create mode 100644 migrations/versions/699c4f6a7fe8_.py create mode 100644 migrations/versions/dcd0b71650b0_.py delete mode 100644 templates/event_suggestion/create.html delete mode 100644 templates/event_suggestion/list.html delete mode 100644 templates/event_suggestion/read.html create mode 100644 templates/manage/admin_unit.html create mode 100644 templates/manage/admin_units.html create mode 100644 templates/manage/organizers.html create mode 100644 templates/organizer/create.html create mode 100644 templates/organizer/delete.html create mode 100644 templates/organizer/read.html create mode 100644 templates/organizer/update.html diff --git a/app.py b/app.py index 5afcdde..0f37fbe 100644 --- a/app.py +++ b/app.py @@ -54,7 +54,7 @@ app.json_encoder = DateTimeEncoder # Setup Flask-Security # Define models -from models import EventPlace, EventOrganizer, EventCategory, Image, EventSuggestion, EventSuggestionDate, OrgOrAdminUnit, Actor, Place, Location, User, Role, AdminUnit, AdminUnitMember, AdminUnitMemberRole, OrgMember, OrgMemberRole, Organization, AdminUnitOrg, AdminUnitOrgRole, Event, EventDate +from models import EventPlace, EventOrganizer, EventCategory, Image, OrgOrAdminUnit, Actor, Place, Location, User, Role, AdminUnit, AdminUnitMember, AdminUnitMemberRole, OrgMember, OrgMemberRole, Organization, AdminUnitOrg, AdminUnitOrgRole, Event, EventDate user_datastore = SQLAlchemySessionUserDatastore(db.session, User, Role) security = Security(app, user_datastore) from oauth import blueprint @@ -116,7 +116,7 @@ def upsert_user(email, password="password"): result = user_datastore.create_user(email=email, password=hash_password(password)) return result -def upsert_admin_unit(unit_name, short_name): +def upsert_admin_unit(unit_name, short_name = None): admin_unit = AdminUnit.query.filter_by(name = unit_name).first() if admin_unit is None: admin_unit = AdminUnit(name = unit_name) @@ -221,10 +221,10 @@ def upsert_image_with_res(image, res): return image -def upsert_organization(org_name, street = None, postalCode = None, city = None, latitude = 0, longitude = 0, legal_name = None, url=None, logo_res=None): - result = Organization.query.filter_by(name = org_name).first() +def upsert_organization(name, street = None, postalCode = None, city = None, latitude = 0, longitude = 0, legal_name = None, url=None, logo_res=None): + result = Organization.query.filter_by(name = name).first() if result is None: - result = Organization(name = org_name) + result = Organization(name = name) db.session.add(result) result.legal_name = legal_name @@ -274,6 +274,24 @@ def upsert_location(street, postalCode, city, latitude = 0, longitude = 0, state return result +def upsert_event_organizer(admin_unit_id, name): + result = EventOrganizer.query.filter(and_(EventOrganizer.name == name, EventOrganizer.admin_unit_id == admin_unit_id)).first() + if result is None: + result = EventOrganizer(name = name, admin_unit_id=admin_unit_id) + result.location = Location() + db.session.add(result) + + return result + +def upsert_event_place(admin_unit_id, organizer_id, name): + result = EventPlace.query.filter(and_(EventPlace.name == name, EventPlace.admin_unit_id == admin_unit_id, EventPlace.organizer_id == organizer_id)).first() + if result is None: + result = EventPlace(name = name, admin_unit_id=admin_unit_id, organizer_id=organizer_id) + result.location = Location() + db.session.add(result) + + return result + def upsert_place(name, street = None, postalCode = None, city = None, latitude = 0, longitude = 0, url=None, description=None, photo_res=None): result = Place.query.filter_by(name = name).first() if result is None: @@ -294,33 +312,6 @@ def upsert_place(name, street = None, postalCode = None, city = None, latitude = return result -# def upsert_event_suggestion(event_name, host_name, place_name, start, description, link = None, admin_unit = None): -# if admin_unit is None: -# admin_unit = get_admin_unit('Stadt Goslar') - -# result = EventSuggestion.query.filter_by(event_name = event_name).first() -# if result is None: -# result = EventSuggestion() -# db.session.add(result) - -# result.admin_unit = admin_unit -# result.event_name = event_name -# result.description = description -# result.external_link = link -# result.place_name = place_name -# result.host_name = host_name - -# result.place_postalCode = "Dummy postal code" -# result.place_city = "Dummy city" -# result.contact_name = "Dummy contact name" -# result.contact_email = "Dummy contact email" - -# eventDate = EventSuggestionDate(event_suggestion_id = result.id, start=start) -# result.dates = [] -# result.dates.append(eventDate) - -# return result - def upsert_event_category(category_name): result = EventCategory.query.filter_by(name = category_name).first() if result is None: @@ -380,39 +371,6 @@ def update_event_dates_with_recurrence_rule(event, start, end): event.dates = [date for date in event.dates if date not in dates_to_remove] event.dates.extend(dates_to_add) -def upsert_event(event_name, host, location_name, start, description, link = None, verified = False, admin_unit = None, ticket_link=None, photo_res=None, category=None, recurrence_rule=None): - if admin_unit is None: - admin_unit = get_admin_unit('Stadt Goslar') - place = upsert_place(location_name) - - if category is not None: - category_object = upsert_event_category(category) - else: - category_object = upsert_event_category('Other') - - result = Event.query.filter_by(name = event_name).first() - if result is None: - result = Event() - db.session.add(result) - - result.name = event_name - result.description = description - result.external_link = link - result.verified = verified - result.admin_unit = admin_unit - result.host = host - result.place = place - result.ticket_link = ticket_link - result.category = category_object - - result.recurrence_rule = recurrence_rule - update_event_dates_with_recurrence_rule(result, start, None) - - if photo_res is not None: - result.photo = upsert_image_with_res(result.photo, photo_res) - - return result - def get_admin_units_for_organizations(): if has_current_user_permission('event:create'): return AdminUnit.query.all() @@ -422,6 +380,34 @@ def get_admin_units_for_organizations(): def get_admin_units_for_event(): return AdminUnit.query.all() +def get_admin_units_for_manage(): + # Global admin + if current_user.has_role('admin'): + return AdminUnit.query.all() + + # Admin unit member permissions (Holger, Artur) + admin_units_the_user_is_member_of = admin_units_with_current_user_member_permission('event:verify') + + # Admin org permissions (Marina) + admin_units_via_orgs = admin_units_with_current_user_org_member_permission('event:verify', 'event:verify') + + admin_units = admin_units_the_user_is_member_of + admin_units.extend(admin_units_via_orgs) + + return admin_units + +def get_admin_unit_for_manage(admin_unit_id): + admin_units = get_admin_units_for_manage() + return next((au for au in admin_units if au.id == admin_unit_id), None) + +def get_admin_unit_for_manage_or_404(admin_unit_id): + admin_unit = get_admin_unit_for_manage(admin_unit_id) + + if not admin_unit: + abort(404) + + return admin_unit + def get_event_hosts(): if current_user.is_anonymous: return list() @@ -681,6 +667,9 @@ def can_create_organization(): def can_update_organization(organization): return can_create_organization() +def can_update_organizer(organizer): + return get_admin_unit_for_manage(organizer.admin_unit_id) is not None + def can_verify_event(event): if not current_user.is_authenticated: return False @@ -702,324 +691,56 @@ def can_verify_event(event): return False -# def can_list_event_suggestion(): -# return has_current_user_any_permission('event:verify') - -# def can_read_event_suggestion(suggestion): -# allowed_admin_units = admin_units_from_aaos(get_event_hosts()) -# allowed_admin_unit_ids = [a.id for a in allowed_admin_units] - -# return suggestion.admin_unit_id in allowed_admin_unit_ids - -# def get_event_suggestions_for_current_user(): -# result = list() - -# allowed_admin_units = admin_units_from_aaos(get_event_hosts()) -# allowed_admin_unit_ids = [a.id for a in allowed_admin_units] - -# suggestions = EventSuggestion.query.all() -# for suggestion in suggestions: -# if suggestion.admin_unit_id in allowed_admin_unit_ids: -# result.append(suggestion) - -# return result +def assign_location_values(target, origin): + if origin: + target.street = origin.street + target.postalCode = origin.postalCode + target.city = origin.city + target.state = origin.state + target.country = origin.country + target.latitude = origin.latitude + target.longitude = origin.longitude # Routes @app.before_first_request def create_initial_data(): - return - - # Event categories - upsert_event_category('Art') - upsert_event_category('Book') - upsert_event_category('Movie') - upsert_event_category('Family') - upsert_event_category('Festival') - upsert_event_category('Religious') - upsert_event_category('Shopping') - upsert_event_category('Comedy') - upsert_event_category('Music') - upsert_event_category('Dance') - upsert_event_category('Nightlife') - upsert_event_category('Theater') - upsert_event_category('Dining') - upsert_event_category('Conference') - upsert_event_category('Meetup') - upsert_event_category('Fitness') - upsert_event_category('Sports') - upsert_event_category('Other') - db.session.commit() - - # Admin units - goslar = upsert_admin_unit('Stadt Goslar', 'goslar') - harzburg = upsert_admin_unit('Stadt Bad Harzburg') - upsert_admin_unit('Stadt Clausthal') - upsert_admin_unit('Gemeinde Walkenried') - upsert_admin_unit('Stadt Bad Lauterberg') - upsert_admin_unit('Stadt Harzgerode') - upsert_admin_unit('Stadt Ilsenburg') - upsert_admin_unit('Stadt Osterode') - upsert_admin_unit('Stadt Quedlinburg') - upsert_admin_unit('Stadt Wernigerode') - upsert_admin_unit('Stadt Halberstadt') - upsert_admin_unit('Gemeinde Wennigsen') - upsert_admin_unit('Stadt Hildesheim') - - # Organizations - admin_unit_org_event_verifier_role = upsert_admin_unit_org_role('event_verifier', ['event:verify', "event:create"]) - gmg = upsert_organization("GOSLAR marketing gmbh", "Markt 7", "38640", "Goslar", url='https://www.goslar.de/kontakt', logo_res="gmg.jpeg") - gz = upsert_organization("Goslarsche Zeitung") - celtic_inn = upsert_organization("Celtic Inn") - kloster_woelteringerode = upsert_organization("Kloster Wöltingerode") - miners_rock = upsert_organization("Miner's Rock", "Kuhlenkamp 36", "38640", "Goslar", legal_name="Miner's Rock UG (haftungsbeschränkt)", url="https://www.miners-rock.de/", logo_res="minersrock.jpeg") - - gmg_admin_unit_org = add_organization_to_admin_unit(gmg, goslar) - add_role_to_admin_unit_org(gmg_admin_unit_org, admin_unit_org_event_verifier_role) - - gz_admin_unit_org = add_organization_to_admin_unit(gz, goslar) - add_role_to_admin_unit_org(gz_admin_unit_org, admin_unit_org_event_verifier_role) - - add_organization_to_admin_unit(celtic_inn, goslar) - add_organization_to_admin_unit(miners_rock, goslar) - add_organization_to_admin_unit(upsert_organization("Aids-Hilfe Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Akademie St. Jakobushaus"), goslar) - add_organization_to_admin_unit(upsert_organization("Aktiv für Hahndorf e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Aquantic Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Arbeitsgemeinschaft Hahndorfer Vereine und Verbände"), goslar) - add_organization_to_admin_unit(upsert_organization("attac-Regionalgruppe Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Bildungshaus Zeppelin e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Brauhaus Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Buchhandlung Brumby"), goslar) - add_organization_to_admin_unit(upsert_organization("Bühnenreif Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Bürgerstiftung Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Celtic-Inn Irish-Pub im Bahnhof"), goslar) - add_organization_to_admin_unit(upsert_organization("Cineplex"), goslar) - add_organization_to_admin_unit(upsert_organization("Der Zwinger zu Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("DERPART Reisebüro Goslar GmbH"), goslar) - add_organization_to_admin_unit(upsert_organization("Deutscher Alpenverein Sektion Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("DGB - Frauen Goslar in der Region Südniedersachsen/Harz"), goslar) - add_organization_to_admin_unit(upsert_organization("DGB-Kreisvorstand Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Die Butterhanne"), goslar) - add_organization_to_admin_unit(upsert_organization("E-Bike Kasten"), goslar) - add_organization_to_admin_unit(upsert_organization("Energie-Forschungszentrum der TU Clausthal - Geschäftsstelle Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("engesser marketing GmbH"), goslar) - add_organization_to_admin_unit(upsert_organization("Ev. Kirchengemeinde St. Georg"), goslar) - add_organization_to_admin_unit(upsert_organization("Förderkreis Goslarer Kleinkunsttage e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Frankenberger Kirche"), goslar) - add_organization_to_admin_unit(upsert_organization("Frankenberger Winterabend"), goslar) - add_organization_to_admin_unit(upsert_organization("Frauen-Arbeitsgemeinschaft im Landkreis Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("FreiwilligenAgentur Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Galerie Stoetzel-Tiedt"), goslar) - add_organization_to_admin_unit(upsert_organization("Geschichtsverein GS e.V."), goslar) - add_organization_to_admin_unit(upsert_organization("Gesellschaft der Freunde und Förderer des Internationalen Musikfestes Goslar - Harz e.V."), goslar) - add_organization_to_admin_unit(upsert_organization("GOSLAR marketing gmbh"), goslar) - add_organization_to_admin_unit(upsert_organization("Goslarer Museum"), goslar) - add_organization_to_admin_unit(upsert_organization("Goslarer Theater"), goslar) - add_organization_to_admin_unit(upsert_organization("Goslarsche Höfe"), goslar) - add_organization_to_admin_unit(upsert_organization("Goslarsche Zeitung"), goslar) - add_organization_to_admin_unit(upsert_organization("Große Karnevalsgesellschaft Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Großes Heiliges Kreuz"), goslar) - add_organization_to_admin_unit(upsert_organization("Hahndorfer Tennis Club 77 e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("HAHNENKLEE tourismus marketing gmbh"), goslar) - add_organization_to_admin_unit(upsert_organization("HANSA Seniorenzentrum Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Harz Hochzeit"), goslar) - add_organization_to_admin_unit(upsert_organization("Hotel Der Achtermann"), goslar) - add_organization_to_admin_unit(upsert_organization("Internationale Goslarer Klaviertage "), goslar) - add_organization_to_admin_unit(upsert_organization("Judo-Karate-Club Sportschule Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Kloster Wöltingerode Brennen & Brauen GmbH"), goslar) - add_organization_to_admin_unit(upsert_organization("Klosterhotel Wöltingerode"), goslar) - add_organization_to_admin_unit(upsert_organization("Kontaktstelle Musik - Stadtmusikrat Goslar e.V."), goslar) - add_organization_to_admin_unit(upsert_organization("Kreisjugendpflege Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Kreismusikschule Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("KUBIK Event- und Musikklub"), goslar) - add_organization_to_admin_unit(upsert_organization("Kulturgemeinschaft Vienenburg"), goslar) - add_organization_to_admin_unit(upsert_organization("Kulturinitiative Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Lions Club Goslar Rammelsberg"), goslar) - add_organization_to_admin_unit(upsert_organization("Marketing Club Harz"), goslar) - add_organization_to_admin_unit(upsert_organization("Marktkirche Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Media Markt "), goslar) - add_organization_to_admin_unit(upsert_organization("MGV Juventa von 1877 e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Mönchehaus Museum"), goslar) - add_organization_to_admin_unit(upsert_organization("MTV Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Museumsverein Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("NABU Kreisgruppe Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Naturwissenschaftlicher Verein Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("PT Lounge Christian Brink"), goslar) - add_organization_to_admin_unit(upsert_organization("Rampen für Goslar e.V."), goslar) - add_organization_to_admin_unit(upsert_organization("Residenz Schwiecheldthaus"), goslar) - add_organization_to_admin_unit(upsert_organization("Romantik Hotel Alte Münze"), goslar) - add_organization_to_admin_unit(upsert_organization("Schiefer"), goslar) - add_organization_to_admin_unit(upsert_organization("Schwimmpark Aquantic"), goslar) - add_organization_to_admin_unit(upsert_organization("Seniorenvertretung der Stadt Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Soup & Soul Kitchen"), goslar) - add_organization_to_admin_unit(upsert_organization("Stadtbibliothek Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Stadtjugendpflege Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Stadtteilverein Jerstedt e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Stiftung \"Maria in Horto\""), goslar) - add_organization_to_admin_unit(upsert_organization("Verlag Goslarsche Zeitung"), goslar) - add_organization_to_admin_unit(upsert_organization("Vienenburger Bürgerverein e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Volksfest Goslar e. V."), goslar) - add_organization_to_admin_unit(upsert_organization("Weltkulturerbe Rammelsberg"), goslar) - add_organization_to_admin_unit(upsert_organization("Zinnfigurenmuseum Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Zonta Club Goslar"), goslar) - add_organization_to_admin_unit(upsert_organization("Zontaclub Goslar St. Barbar"), goslar) - - # Places - upsert_place('Vienenburger See', 'In der Siedlung 4', '38690', 'Goslar', 51.958375, 10.559621) - upsert_place('Feuerwehrhaus Hahndorf') - upsert_place('Gemeindehaus St. Kilian Hahndorf') - upsert_place('Grundschule Hahndorf') - upsert_place('Mehrzweckhalle Hahndorf') - upsert_place('Sportplatz Hahndorf') - upsert_place('St. Kilian Hahndorf') - upsert_place("Tourist-Information Goslar", 'Markt 7', '38644', 'Goslar', 51.906172, 10.429346, 'http://www.goslar.de/kontakt', "Zentral am Marktplatz gelegen, ist die Tourist-Information die erste Anlaufstelle für Goslar-Besucher. 14 motivierte und serviceorientierte Mitarbeiter sorgen dafür, dass sich der Gast rundherum wohl fühlt. Die ständige Qualitätsverbesserung und der flexible Umgang mit den Kundenwünschen sind Teil unserer Leitsätze.", 'touristinfo.jpeg') - upsert_place("Nagelkopf am Rathaus Goslar", 'Marktkirchhof 3', '38640', 'Goslar', 51.9055939, 10.4263286) - upsert_place("Kloster Wöltingerode", 'Wöltingerode 3', '38690', 'Goslar', 51.9591156, 10.5371815) - upsert_place("Marktplatz Goslar", 'Markt 6', '38640', 'Goslar', 51.9063601, 10.4249433) - upsert_place("Burg Vienenburg", 'Burgweg 2', '38690', 'Goslar', 51.9476558, 10.5617368) - upsert_place("Kurhaus Bad Harzburg", 'Kurhausstraße 11', '38667', 'Bad Harzburg', 51.8758165, 10.5593392) - upsert_place("Goslarsche Höfe", 'Okerstraße 32', '38640', 'Goslar', 51.911571, 10.4391331, 'https://www.goslarsche-hoefe.de/') - upsert_place("Schlosserei im Rammelsberg", 'Bergtal 19', '38640', 'Goslar', 51.890527, 10.418880, 'http://www.rammelsberg.de/', 'Die "Schlosserei" ist erprobter Veranstaltungsort und bietet Platz für ca. 700 Besucher. Das Ambiente ist technisch gut ausgestattet und flexibel genug, für jeden Künstler individuell wandelbar zu sein. Dabei lebt nicht nur der Veranstaltungsraum, es wirkt der gesamte Komplex des Rammelsberges und macht den Besuch zu einem unvergeßlichen Erlebnis.', photo_res="schlosserei.jpeg") - - # Org or admins - goslar_ooa = upsert_org_or_admin_unit_for_admin_unit(goslar) - kloster_woelteringerode_ooa = upsert_org_or_admin_unit_for_organization(kloster_woelteringerode) - gmg_ooa = upsert_org_or_admin_unit_for_organization(gmg) - harzburg_ooa = upsert_org_or_admin_unit_for_admin_unit(harzburg) - - # Commit - db.session.commit() - - # Users - admin_role = user_datastore.find_or_create_role("admin") - admin_role.add_permissions(["user:create", - "event:verify", - "event:create", - "event_suggestion:read", - "admin_unit:update", - "admin_unit.members:read", - "organization.members:read"]) - - admin_unit_admin_role = upsert_admin_unit_member_role('admin', ["admin_unit.members:read", "admin_unit.organizations.members:read"]) - admin_unit_event_verifier_role = upsert_admin_unit_member_role('event_verifier', ["event:verify", "event:create", "event_suggestion:read"]) - org_member_event_verifier_role = upsert_org_member_role('event_verifier', ["event:verify", "event:create", "event_suggestion:read"]) - org_member_event_creator_role = upsert_org_member_role('event_creator', ["event:create"]) - - daniel = upsert_user("grams.daniel@gmail.com") - user_datastore.add_role_to_user(daniel, admin_role) - - holger = upsert_user("holger@test.de") - holger_goslar_member = add_user_to_admin_unit(holger, goslar) - add_role_to_admin_unit_member(holger_goslar_member, admin_unit_admin_role) - add_role_to_admin_unit_member(holger_goslar_member, admin_unit_event_verifier_role) - - artur = upsert_user("artur@test.de") - artur_goslar_member = add_user_to_admin_unit(artur, goslar) - add_role_to_admin_unit_member(artur_goslar_member, admin_unit_event_verifier_role) - - mia = upsert_user("mia@test.de") - mia_gmg_member = add_user_to_organization(mia, gmg) - add_role_to_org_member(mia_gmg_member, org_member_event_verifier_role) - - marina_vetter = upsert_user("marina.vetter@goslar.de") - marina_vetter_gmg_member = add_user_to_organization(marina_vetter, gmg) - add_role_to_org_member(marina_vetter_gmg_member, org_member_event_verifier_role) - - tom = upsert_user("tom@test.de") - tom_gz_member = add_user_to_organization(tom, gz) - add_role_to_org_member(tom_gz_member, org_member_event_verifier_role) - - jason = upsert_user("jason@test.de") - jason_celtic_inn_member = add_user_to_organization(jason, celtic_inn) - add_role_to_org_member(jason_celtic_inn_member, org_member_event_creator_role) - - grzno = upsert_user("grzno@test.de") - grzno_miners_rock_member = add_user_to_organization(grzno, miners_rock) - add_role_to_org_member(grzno_miners_rock_member, org_member_event_creator_role) - - # Events - upsert_event("Vienenburger Seefest", - goslar_ooa, - "Vienenburger See", - create_berlin_date(2020, 8, 14, 17, 0), - 'Vom 14. bis 16. August 2020 findet im ausgewiesenen Naherholungsgebiet am Fuße des Harzes, dem Goslarer Ortsteil Vienenburg, das Seefest unter dem Motto „Feuer & Wasser“ statt.', - 'https://www.goslar.de/kultur-freizeit/veranstaltungen/156-vienenburger-seefest?layout=*', - True) - - upsert_event("Tausend Schritte durch die Altstadt", - gmg_ooa, - "Tourist-Information Goslar", - create_berlin_date(2020, 1, 2, 10, 0), - 'Erleben Sie einen geführten Stadtrundgang durch den historischen Stadtkern. Lassen Sie sich von Fachwerkromantik und kaiserlichen Bauten inmitten der UNESCO-Welterbestätte verzaubern. ganzjährig (außer 01.01.) täglich 10:00 Uhr Treffpunkt: Tourist-Information am Marktplatz (Dauer ca. 2 Std.) Erwachsene 8,00 Euro Inhaber Gastkarte Goslar/Kurkarte Hahnenklee 7,00 Euro Schüler/Studenten 6,00 Euro', - photo_res="tausend.jpeg", - recurrence_rule="RRULE:FREQ=DAILY;UNTIL=20201231T235959") - - upsert_event("Spaziergang am Nachmittag", - gmg_ooa, - "Tourist-Information Goslar", - create_berlin_date(2020, 4, 1, 13, 30), - 'Begeben Sie sich auf einen geführten Rundgang durch die historische Altstadt. Entdecken Sie malerische Fachwerkgassen und imposante Bauwerke bei einem Streifzug durch das UNESCO-Weltkulturerbe. April – Oktober und 25.11. – 30.12. Montag – Samstag 13:30 Uhr Treffpunkt: Tourist-Information am Marktplatz (Dauer ca. 1,5 Std.) Erwachsene 7,00 Euro Inhaber Gastkarte Goslar/Kurkarte Hahnenklee 6,00 Euro Schüler/Studenten 5,00 Euro', - photo_res="nachmittag.jpeg", - recurrence_rule="""RRULE:FREQ=WEEKLY;UNTIL=20201031T235959;BYDAY=MO,TU,WE,TH,FR,SA""") - - upsert_event("Ein Blick hinter die Kulissen - Rathausbaustelle", - goslar_ooa, - "Nagelkopf am Rathaus Goslar", - create_berlin_date(2020, 9, 3, 17, 0), - 'Allen interessierten Bürgern wird die Möglichkeit geboten, unter fachkundiger Führung des Goslarer Gebäudemanagement (GGM) einen Blick hinter die Kulissen durch das derzeit gesperrte historische Rathaus und die Baustelle Kulturmarktplatz zu werfen. Da bei beiden Führungen die Anzahl der Teilnehmer auf 16 Personen begrenzt ist, ist eine Anmeldung unbedingt notwendig sowie festes Schuhhwerk. Bitte melden Sie sich bei Interesse in der Tourist-Information (Tel. 05321-78060) an. Kinder unter 18 Jahren sind aus Sicherheitsgründen auf der Baustelle nicht zugelassen.') - - upsert_event("Wöltingerode unter Dampf", - kloster_woelteringerode_ooa, - "Kloster Wöltingerode", - create_berlin_date(2020, 9, 5, 12, 0), - 'Mit einem ländlichen Programm rund um historische Trecker und Landmaschinen, köstliche Produkte aus Brennerei und Region, einem Kunsthandwerkermarkt und besonderen Führungen findet das Hoffest auf dem Klostergut statt.', - 'https://www.woelti-unter-dampf.de') - - upsert_event("Altstadtfest", - gmg_ooa, - "Marktplatz Goslar", - create_berlin_date(2020, 9, 11, 15, 0), - 'Drei Tage lang dürfen sich die Besucher des Goslarer Altstadtfestes auf ein unterhaltsames und abwechslungsreiches Veranstaltungsprogramm freuen. Der Flohmarkt auf der Kaiserpfalzwiese lädt zum Stöbern vor historischer Kulisse ein.', - 'https://www.goslar.de/kultur-freizeit/veranstaltungen/altstadtfest') - - upsert_event("Adventsmarkt auf der Vienenburg", - goslar_ooa, - "Burg Vienenburg", - create_berlin_date(2020, 12, 13, 12, 0), - 'Inmitten der mittelalterlichen Burg mit dem restaurierten Burgfried findet der „Advent auf der Burg“ statt. Der Adventsmarkt wird von gemeinnützigen und sozialen Vereinen sowie den Kirchen ausgerichtet.') - - # upsert_event_suggestion("Der Blaue Vogel", - # "Freese-Baus Ballettschule", - # "Kurhaus Bad Harzburg", - # create_berlin_date(2020, 9, 12, 16, 0), - # 'Die Freese-Baus Ballettschule zeigt 2020 ein wenig bekanntes französisches Märchen nach einer Erzählung Maurice Maeterlinck. Die Leiterin der Schule, Hanna-Sibylle Werner, hat die Grundidee übernommen, aber für ein Ballett überarbeitet, verändert und einstudiert. Das Märchen handelt von zwei Mädchen, die einen kleinen blauen Vogel lieb gewonnen haben, der über Nacht verschwunden ist. Mit Hilfe der Berylune und der Fee des Lichts machen sie sich auf den Weg, den Vogel wieder zu finden. Ihre Reise führt sie ins Reich der Erinnerung, des Glücks, der Phantasie und der Elemente. ( Die Einstudierung der Elemente: Luft, Wasser, Feuer übernahm der Choreograf Marco Barbieri, der auch zum Team der Ballettschule gehört ). Im Reich der Königin der Nacht finden sie ihren kleinen Vogel wieder, aber ob sie ihn mit nehmen dürfen, wird nicht verraten. Die Aufführungen werden durch farbenfrohe Kostüme ( Eigentum der Schule ) und Bühnenbilder ( Günter Werner ) ergänzt. Die Musik stammt von verschiedenen Komponisten. Die Tänzer*innen sind im Alter von 3 bis 40 Jahren, die Teilnahme ist für die älteren Schüler*innen freiwillig.', - # 'https://veranstaltungen.meinestadt.de/bad-harzburg/event-detail/35486361/98831674', - # admin_unit = get_admin_unit('Stadt Bad Harzburg')) - - # upsert_event_suggestion("Herbst-Flohmarkt", - # "Goslarsche Höfe - Integrationsbetrieb - gGmbH", - # "Goslarsche Höfe", - # create_berlin_date(2020, 10, 10, 10, 0), - # 'Zum letzten Mal in dieser Saison gibt es einen Hof-Flohmarkt. Wir bieten zwar nicht den größten, aber vielleicht den gemütlichsten Flohmarkt in der Region. Frei von gewerblichen Anbietern, dafür mit Kaffee, Kuchen, Bier und Bratwurst, alles auf unserem schönen Hofgelände.', - # 'https://www.goslarsche-hoefe.de/veranstaltungen/10/2175252/2020/10/10/herbst-flohmarkt.html') - - upsert_event('"MINER\'S ROCK" Schickt XVI - Lotte', - miners_rock.org_or_adminunit, - "Schlosserei im Rammelsberg", - create_berlin_date(2020, 10, 31, 19, 0), - 'Auch im Jahr 2020 wagt sich das MINER’S ROCK wieder an eine Doppel-Schicht. LOTTE wird bei uns das Wochenende am Berg abrunden! Nach der bereits ausverkauften Schicht am 30. Oktober mit Subway to Sally, wird Lotte den Samstagabend zu einem Pop-Erlebnis machen.\nAb Anfang Februar ist sie in den Konzerthallen in Deutschland unterwegs und wird ihr neues Album „Glück“ vorstellen. Glück ist der langersehnte Nachfolger von LOTTEs Debütalbum „Querfeldein". Mit Songs wie der ersten Single „Schau mich nicht so an" oder dem Duett mit Max Giesinger „Auf das was da noch kommt“, durchmisst LOTTE dabei die Höhen und Tiefen des menschlichen Glücksstrebens. Und auch wenn jeder der zwölf Songs seine eigene Geschichte erzählt – sie alle eint die Suche nach der ganz persönlichen Bedeutung dieses großen Wortes. Glück ist kein Werk über einen abgeschlossenen Prozess, sondern ein beeindruckend ehrliches und facettenreiches Album über eine menschliche Suche. „Auf das was da noch kommt“ läuft derzeit in den Radiostationen auf und ab und macht einfach Spaß.\n\nWichtig zu wissen:\n\nEinlass: 19:00 Uhr\nBeginn des Musikprogramms: 20:00 Uhr\nTickets gibt es ab sofort im Shop des MINER‘S ROCK unter www.miners-rock.de und in den Geschäftsstellen der Goslarschen Zeitung.', - 'https://www.miners-rock.de/xvi-lotte', - ticket_link='https://www.regiolights.de/tickets/product/schicht-xvi-lotte', - photo_res="lotte.jpeg", - category='Music') - - db.session.commit() - - events = Event.query.filter_by(start = None).all() + events = Event.query.all() for event in events: - event.start = event.dates[0].start - event.end = event.dates[0].end + if not event.organizer: + ooa = event.host.organization if event.host.organization else event.host.admin_unit + event.organizer = upsert_event_organizer(event.admin_unit_id, ooa.name) + event.organizer.name = ooa.name + event.organizer.url = ooa.url + event.organizer.email = ooa.email + event.organizer.phone = ooa.phone + event.organizer.fax = ooa.fax + event.organizer.logo = ooa.logo + + if not event.organizer.location and ooa.location: + event.organizer.location = Location() + assign_location_values(event.organizer.location, ooa.location) + + event.organizer.adminunit = event.admin_unit + + if not event.event_place: + event.event_place = upsert_event_place(event.admin_unit_id, event.organizer_id, event.place.name) + event.event_place.url = event.place.url + event.event_place.photo = event.place.photo + event.event_place.description = event.place.description + + if not event.event_place.location and event.place.location: + event.event_place.location.location = Location() + assign_location_values(event.event_place.location, event.place.location) + + event.event_place.adminunit = event.admin_unit + event.event_place.eventorganizer = event.organizer + event.event_place.public = True + + organizers = EventOrganizer.query.all() + for organizer in organizers: + if not organizer.name: + organizer.name = organizer.org_name db.session.commit() @@ -1081,6 +802,7 @@ def admin_unit_update(admin_unit_id): flash(gettext('Admin unit successfully updated'), 'success') return redirect(url_for('admin_unit', admin_unit_id=admin_unit.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') return render_template('admin_unit/update.html', @@ -1138,6 +860,7 @@ def organization_create(): flash(gettext('Organization successfully created'), 'success') return redirect(url_for('organization', organization_id=organization.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') return render_template('organization/create.html', form=form) @@ -1158,6 +881,7 @@ def organization_update(organization_id): flash(gettext('Organization successfully updated'), 'success') return redirect(url_for('organization', organization_id=organization.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') return render_template('organization/update.html', @@ -1217,6 +941,7 @@ def place_update(place_id): flash(gettext('Place successfully updated'), 'success') return redirect(url_for('place', place_id=place.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') return render_template('place/update.html', @@ -1240,6 +965,7 @@ def place_create(): flash(gettext('Place successfully created'), 'success') return redirect(url_for('place', place_id=place.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') return render_template('place/create.html', form=form) @@ -1300,9 +1026,9 @@ def api_events(): return jsonify(result) from forms.event import CreateEventForm, UpdateEventForm, DeleteEventForm -from forms.event_suggestion import CreateEventSuggestionForm from forms.place import CreatePlaceForm, UpdatePlaceForm from forms.organization import CreateOrganizationForm, UpdateOrganizationForm +from forms.organizer import CreateOrganizerForm, UpdateOrganizerForm, DeleteOrganizerForm from forms.admin_unit import CreateAdminUnitForm, UpdateAdminUnitForm def update_event_with_form(event, form): @@ -1321,22 +1047,18 @@ def update_event_with_form(event, form): event.photo = upsert_image_with_data(event.photo, fs.read(), fs.content_type) def prepare_event_form(form): - form.host_id.choices = sorted([(ooa.id, ooa.organization.name if ooa.organization is not None else ooa.admin_unit.name) for ooa in get_event_hosts()], key=lambda ooa: ooa[1]) + form.organizer_id.choices = [(o.id, o.name) for o in EventOrganizer.query.filter(EventOrganizer.admin_unit_id == form.admin_unit_id.data).order_by(func.lower(EventOrganizer.name))] form.place_id.choices = [(p.id, p.name) for p in Place.query.order_by('name')] form.category_id.choices = sorted([(c.id, get_event_category_name(c)) for c in EventCategory.query.all()], key=lambda ooa: ooa[1]) form.admin_unit_id.choices = sorted([(admin_unit.id, admin_unit.name) for admin_unit in get_admin_units_for_event()], key=lambda admin_unit: admin_unit[1]) - form.host_id.choices.insert(0, (0, '')) + form.organizer_id.choices.insert(0, (0, '')) form.place_id.choices.insert(0, (0, '')) -def event_create_base(admin_unit = None): - form = CreateEventForm(category_id=upsert_event_category('Other').id) +def event_create_base(admin_unit, organizer_id=0): + form = CreateEventForm(admin_unit_id=admin_unit.id, organizer_id=organizer_id, category_id=upsert_event_category('Other').id) prepare_event_form(form) - if admin_unit: - form.admin_unit_id.data = admin_unit.id - form.admin_unit_is_readonly = True - if form.validate_on_submit(): event = Event() update_event_with_form(event, form) @@ -1347,20 +1069,23 @@ def event_create_base(admin_unit = None): flash(gettext('Event successfully created'), 'success') return redirect(url_for('event', event_id=event.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') else: flash_errors(form) return render_template('event/create.html', form=form) -@app.route("/events/create", methods=('GET', 'POST')) -def event_create(): - return event_create_base() - @app.route("//events/create", methods=('GET', 'POST')) def event_create_for_admin_unit(au_short_name): admin_unit = AdminUnit.query.filter(AdminUnit.short_name == au_short_name).first_or_404() return event_create_base(admin_unit) +@app.route("/admin_unit//events/create", methods=('GET', 'POST')) +def event_create_for_admin_unit_id(id): + admin_unit = AdminUnit.query.get_or_404(id) + organizer_id = request.args.get('organizer_id') if 'organizer_id' in request.args else 0 + return event_create_base(admin_unit, organizer_id) + @app.route('/event//update', methods=('GET', 'POST')) def event_update(event_id): event = Event.query.get_or_404(event_id) @@ -1379,6 +1104,7 @@ def event_update(event_id): flash(gettext('Event successfully updated'), 'success') return redirect(url_for('event', event_id=event.id)) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') else: flash_errors(form) @@ -1406,6 +1132,7 @@ def event_delete(event_id): flash(gettext('Event successfully deleted'), 'success') return redirect(url_for('events')) except SQLAlchemyError as e: + db.session.rollback() flash(handleSqlError(e), 'danger') else: flash_errors(form) @@ -1429,38 +1156,6 @@ def event_rrule(): result = calculate_occurrences(start_date, '"%d.%m.%Y"', rrule_str, start, batch_size) return jsonify(result) -# @app.route("/eventsuggestions") -# @auth_required() -# def eventsuggestions(): -# if not can_list_event_suggestion(): -# abort(401) - -# return render_template('event_suggestion/list.html', -# suggestions=get_event_suggestions_for_current_user()) - -# @app.route('/eventsuggestion/') -# @auth_required() -# def eventsuggestion(event_suggestion_id): -# suggestion = EventSuggestion.query.filter_by(id = event_suggestion_id).first() -# if not can_read_event_suggestion(suggestion): -# abort(401) - -# return render_template('event_suggestion/read.html', suggestion=suggestion) - -# @app.route("/eventsuggestions/create", methods=('GET', 'POST')) -# def event_suggestion_create(): -# form = CreateEventSuggestionForm() -# if form.validate_on_submit(): -# event = EventSuggestion() -# form.populate_obj(event) -# event.admin_unit = get_admin_unit('Stadt Goslar') -# eventDate = EventSuggestionDate(event_suggestion_id = event.id, start=form.start.data) -# event.dates.append(eventDate) -# db.session.commit() -# flash(gettext('Event suggestion successfully created'), 'success') -# return redirect(url_for('home')) -# return render_template('event_suggestion/create.html', form=form) - @app.route("/admin") @roles_required("admin") def admin(): @@ -1472,6 +1167,125 @@ def admin_admin_units(): return render_template('admin/admin_units.html', admin_units=AdminUnit.query.all()) +@app.route("/manage") +def manage(): + admin_units = get_admin_units_for_manage() + + if len(admin_units) == 1: + return redirect(url_for('manage_admin_unit', id=admin_units[0].id)) + + return render_template('manage/admin_units.html', + admin_units=admin_units) + +@app.route('/manage/admin_unit/') +def manage_admin_unit(id): + admin_unit = get_admin_unit_for_manage_or_404(id) + + return redirect(url_for('manage_admin_unit_organizers', id=admin_unit.id)) + + return render_template('manage/admin_unit.html', + admin_unit=admin_unit) + +@app.route('/manage/admin_unit//organizers') +def manage_admin_unit_organizers(id): + admin_unit = get_admin_unit_for_manage_or_404(id) + organizers = EventOrganizer.query.filter(EventOrganizer.admin_unit_id == admin_unit.id).order_by(func.lower(EventOrganizer.name)).all() + + return render_template('manage/organizers.html', + admin_unit=admin_unit, + organizers=organizers) + +@app.route('/organizer/') +def organizer(id): + organizer = EventOrganizer.query.get_or_404(id) + + return render_template('organizer/read.html', + organizer=organizer, + can_update_organizer=can_update_organizer(organizer)) + +def update_organizer_with_form(organizer, form): + form.populate_obj(organizer) + + if form.logo_file.data: + fs = form.logo_file.data + organizer.logo = upsert_image_with_data(organizer.logo, fs.read(), fs.content_type) + +@app.route('/manage/admin_unit//organizers/create', methods=('GET', 'POST')) +def manage_admin_unit_organizer_create(id): + admin_unit = get_admin_unit_for_manage_or_404(id) + + form = CreateOrganizerForm() + + if form.validate_on_submit(): + organizer = EventOrganizer() + organizer.admin_unit_id = admin_unit.id + organizer.location = Location() + update_organizer_with_form(organizer, form) + + try: + db.session.add(organizer) + db.session.commit() + flash(gettext('Organizer successfully created'), 'success') + #return redirect(url_for('organizer', id=organizer.id)) + return redirect(url_for('manage_admin_unit_organizers', id=organizer.admin_unit_id)) + except SQLAlchemyError as e: + db.session.rollback() + flash(handleSqlError(e), 'danger') + return render_template('organizer/create.html', form=form) + +@app.route('/organizer//update', methods=('GET', 'POST')) +def organizer_update(id): + organizer = EventOrganizer.query.get_or_404(id) + + if not can_update_organizer(organizer): + abort(401) + + form = UpdateOrganizerForm(obj=organizer) + + if form.validate_on_submit(): + update_organizer_with_form(organizer, form) + + try: + db.session.commit() + flash(gettext('Organizer successfully updated'), 'success') + #return redirect(url_for('organizer', id=organizer.id)) + return redirect(url_for('manage_admin_unit_organizers', id=organizer.admin_unit_id)) + except SQLAlchemyError as e: + db.session.rollback() + flash(handleSqlError(e), 'danger') + + return render_template('organizer/update.html', + form=form, + organizer=organizer) + +@app.route('/organizer//delete', methods=('GET', 'POST')) +def organizer_delete(id): + organizer = EventOrganizer.query.get_or_404(id) + + if not can_update_organizer(organizer): + abort(401) + + form = DeleteOrganizerForm() + + if form.validate_on_submit(): + if form.name.data != organizer.name: + flash(gettext('Entered name does not match organizer name'), 'danger') + else: + try: + db.session.delete(organizer) + db.session.commit() + flash(gettext('Organizer successfully deleted'), 'success') + return redirect(url_for('manage_admin_unit_organizers', id=organizer.admin_unit_id)) + except SQLAlchemyError as e: + db.session.rollback() + flash(handleSqlError(e), 'danger') + else: + flash_errors(form) + + return render_template('organizer/delete.html', + form=form, + organizer=organizer) + def date_add_time(date, hour=0, minute=0, second=0, tzinfo=None): return datetime(date.year, date.month, date.day, hour=hour, minute=minute, second=second, tzinfo=tzinfo) diff --git a/forms/event.py b/forms/event.py index 9e0a2e0..ba63230 100644 --- a/forms/event.py +++ b/forms/event.py @@ -1,7 +1,7 @@ from flask_babelex import lazy_gettext, gettext from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileAllowed -from wtforms import DateTimeField, StringField, SubmitField, TextAreaField, SelectField, BooleanField, IntegerField, FormField +from wtforms import RadioField, DateTimeField, StringField, SubmitField, TextAreaField, SelectField, BooleanField, IntegerField, FormField from wtforms.fields.html5 import DateTimeLocalField, EmailField from wtforms.validators import DataRequired, Optional from wtforms.widgets import html_params, HTMLString @@ -25,7 +25,6 @@ class EventPlaceForm(FlaskForm): class EventOrganizerForm(FlaskForm): name = StringField(lazy_gettext('Organizator'), validators=[Optional()]) - org_name = StringField(lazy_gettext('Organization'), validators=[Optional()]) url = StringField(lazy_gettext('Link URL'), validators=[Optional()]) email = EmailField(lazy_gettext('Email'), validators=[Optional()]) phone = StringField(lazy_gettext('Phone'), validators=[Optional()]) @@ -43,14 +42,12 @@ class CreateEventForm(FlaskForm): previous_start_date = CustomDateTimeField(lazy_gettext('Previous start date'), validators=[Optional()]) tags = StringField(lazy_gettext('Tags'), validators=[Optional()]) - organizer = FormField(EventOrganizerForm, default=lambda: EventOrganizer()) event_place = FormField(EventPlaceForm, default=lambda: EventPlace()) + organizer_id = SelectField(lazy_gettext('Organizer'), validators=[DataRequired()], coerce=int) place_id = SelectField(lazy_gettext('Existing place'), validators=[Optional()], coerce=int) - host_id = SelectField(lazy_gettext('Host'), validators=[Optional()], coerce=int) category_id = SelectField(lazy_gettext('Category'), validators=[DataRequired()], coerce=int) admin_unit_id = SelectField(lazy_gettext('Admin unit'), validators=[DataRequired()], coerce=int) - admin_unit_is_readonly = False kid_friendly = BooleanField(lazy_gettext('Kid friendly'), validators=[Optional()]) accessible_for_free = BooleanField(lazy_gettext('Accessible for free'), validators=[Optional()]) @@ -67,19 +64,10 @@ class CreateEventForm(FlaskForm): (int(EventAttendanceMode.online), lazy_gettext('EventAttendanceMode.online')), (int(EventAttendanceMode.mixed), lazy_gettext('EventAttendanceMode.mixed'))]) - status = SelectField(lazy_gettext('Status'), coerce=int, choices=[ - (int(EventStatus.scheduled), lazy_gettext('EventStatus.scheduled')), - (int(EventStatus.cancelled), lazy_gettext('EventStatus.cancelled')), - (int(EventStatus.movedOnline), lazy_gettext('EventStatus.movedOnline')), - (int(EventStatus.postponed), lazy_gettext('EventStatus.postponed')), - (int(EventStatus.rescheduled), lazy_gettext('EventStatus.rescheduled'))]) - photo_file = FileField(lazy_gettext('Photo'), validators=[FileAllowed(['jpg', 'jpeg', 'png'], lazy_gettext('Images only!'))]) def populate_obj(self, obj): for name, field in self._fields.items(): - if name == 'organizer' and not obj.organizer: - obj.organizer = EventOrganizer() if name == 'event_place' and not obj.event_place: obj.event_place = EventPlace() field.populate_obj(obj, name) @@ -87,12 +75,6 @@ class CreateEventForm(FlaskForm): def validate(self): if not super(CreateEventForm, self).validate(): return False - if self.host_id.data == 0 and not self.organizer.form.name.data and not self.organizer.form.org_name.data: - msg = gettext('Select existing host or enter organizer') - self.host_id.errors.append(msg) - self.organizer.form.name.errors.append(msg) - self.organizer.form.org_name.errors.append(msg) - return False if self.place_id.data == 0 and not self.event_place.form.name.data: msg = gettext('Select existing place or enter new place') self.place_id.errors.append(msg) @@ -101,6 +83,13 @@ class CreateEventForm(FlaskForm): return True class UpdateEventForm(CreateEventForm): + status = SelectField(lazy_gettext('Status'), coerce=int, choices=[ + (int(EventStatus.scheduled), lazy_gettext('EventStatus.scheduled')), + (int(EventStatus.cancelled), lazy_gettext('EventStatus.cancelled')), + (int(EventStatus.movedOnline), lazy_gettext('EventStatus.movedOnline')), + (int(EventStatus.postponed), lazy_gettext('EventStatus.postponed')), + (int(EventStatus.rescheduled), lazy_gettext('EventStatus.rescheduled'))]) + submit = SubmitField(lazy_gettext("Update event")) class DeleteEventForm(FlaskForm): diff --git a/forms/event_suggestion.py b/forms/event_suggestion.py deleted file mode 100644 index 213afad..0000000 --- a/forms/event_suggestion.py +++ /dev/null @@ -1,22 +0,0 @@ -from flask_babelex import lazy_gettext -from flask_wtf import FlaskForm -from wtforms import StringField, SubmitField, TextAreaField -from wtforms.fields.html5 import DateTimeLocalField, EmailField -from wtforms.validators import DataRequired, Optional -from .widgets import CustomDateTimeField - -class CreateEventSuggestionForm(FlaskForm): - submit = SubmitField(lazy_gettext("Suggest event")) - event_name = StringField(lazy_gettext('Name'), validators=[DataRequired()]) - description = TextAreaField(lazy_gettext('Description'), validators=[DataRequired()]) - start = CustomDateTimeField(lazy_gettext('Start'), validators=[DataRequired()]) - external_link = StringField(lazy_gettext('Link URL'), validators=[Optional()]) - - place_name = StringField(lazy_gettext('Event place'), validators=[DataRequired()]) - place_street = StringField(lazy_gettext('Street'), validators=[Optional()]) - place_postalCode = StringField(lazy_gettext('Postal code'), validators=[DataRequired()]) - place_city = StringField(lazy_gettext('City'), validators=[DataRequired()]) - - host_name = StringField(lazy_gettext('Event host'), validators=[DataRequired()]) - contact_name = StringField(lazy_gettext('Contact name'), validators=[DataRequired()]) - contact_email = EmailField(lazy_gettext('Contact email'), validators=[DataRequired()]) diff --git a/forms/organizer.py b/forms/organizer.py new file mode 100644 index 0000000..16df9a9 --- /dev/null +++ b/forms/organizer.py @@ -0,0 +1,41 @@ +from flask_babelex import lazy_gettext +from flask_wtf import FlaskForm +from flask_wtf.file import FileField, FileAllowed +from wtforms import StringField, SubmitField, DecimalField, TextAreaField, FormField, SelectField +from wtforms.fields.html5 import EmailField, TelField +from wtforms.validators import DataRequired, Optional, Regexp +import decimal +from models import Location + +class OrganizerLocationForm(FlaskForm): + street = StringField(lazy_gettext('Street'), validators=[Optional()]) + postalCode = StringField(lazy_gettext('Postal code'), validators=[Optional()]) + city = StringField(lazy_gettext('City'), validators=[Optional()]) + state = StringField(lazy_gettext('State'), validators=[Optional()]) + latitude = DecimalField(lazy_gettext('Latitude'), places=16, validators=[Optional()]) + longitude = DecimalField(lazy_gettext('Longitude'), places=16, validators=[Optional()]) + +class BaseOrganizerForm(FlaskForm): + name = StringField(lazy_gettext('Name'), validators=[DataRequired()]) + url = StringField(lazy_gettext('Link URL'), validators=[Optional()]) + email = EmailField(lazy_gettext('Email'), validators=[Optional()]) + phone = TelField(lazy_gettext('Phone'), validators=[Optional()]) + fax = TelField(lazy_gettext('Fax'), validators=[Optional()]) + logo_file = FileField(lazy_gettext('Logo'), validators=[FileAllowed(['jpg', 'jpeg', 'png'], lazy_gettext('Images only!'))]) + location = FormField(OrganizerLocationForm) + + def populate_obj(self, obj): + for name, field in self._fields.items(): + if name == 'location' and not obj.location: + obj.location = Location() + field.populate_obj(obj, name) + +class CreateOrganizerForm(BaseOrganizerForm): + submit = SubmitField(lazy_gettext("Create organizer")) + +class UpdateOrganizerForm(BaseOrganizerForm): + submit = SubmitField(lazy_gettext("Update organizer")) + +class DeleteOrganizerForm(FlaskForm): + submit = SubmitField(lazy_gettext("Delete organizer")) + name = StringField(lazy_gettext('Name'), validators=[DataRequired()]) \ No newline at end of file diff --git a/jsonld.py b/jsonld.py index a631ba0..ea7cff6 100644 --- a/jsonld.py +++ b/jsonld.py @@ -42,47 +42,9 @@ def get_sd_for_admin_unit(admin_unit): result["name"] = admin_unit.name return result -def get_sd_for_organizer_organization_contact(organizer): - result = {} - result["@type"] = "ContactPoint" - result["name"] = organizer.name - - if organizer.email: - result["email"] = organizer.email - - if organizer.phone: - result["telephone"] = organizer.phone - - if organizer.fax: - result["faxNumber"] = organization.fax - - return result - def get_sd_for_organizer_organization(organizer): result = {} result["@type"] = "Organization" - result["name"] = organizer.org_name - - if organizer.name: - result["contactPoint"] = get_sd_for_organizer_organization_contact(organizer) - else: - if organizer.email: - result["email"] = organizer.email - - if organizer.phone: - result["phone"] = organizer.phone - - if organizer.fax: - result["faxNumber"] = organizer.fax - - if organizer.url: - result["url"] = organizer.url - - return result - -def get_sd_for_organizer_person(organizer): - result = {} - result["@type"] = "Person" result["name"] = organizer.name if organizer.email: @@ -100,10 +62,7 @@ def get_sd_for_organizer_person(organizer): return result def get_sd_for_organizer(organizer): - if organizer.org_name: - return get_sd_for_organizer_organization(organizer) - - return get_sd_for_organizer_person(organizer) + return get_sd_for_organizer_organization(organizer) def get_sd_for_ooa(ooa): if ooa.organization: @@ -173,8 +132,6 @@ def get_sd_for_event_date(event_date): organizer_list = list() if event.organizer: organizer_list.append(get_sd_for_organizer(event.organizer)) - if event.host: - organizer_list.append(get_sd_for_ooa(event.host)) result["organizer"] = organizer_list if event_date.end: diff --git a/migrations/versions/699c4f6a7fe8_.py b/migrations/versions/699c4f6a7fe8_.py new file mode 100644 index 0000000..058e124 --- /dev/null +++ b/migrations/versions/699c4f6a7fe8_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 699c4f6a7fe8 +Revises: b1c05324cc13 +Create Date: 2020-07-28 16:29:41.403957 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utils +import db + + +# revision identifiers, used by Alembic. +revision = '699c4f6a7fe8' +down_revision = 'b1c05324cc13' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('eventorganizer', sa.Column('admin_unit_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'eventorganizer', 'adminunit', ['admin_unit_id'], ['id']) + op.add_column('eventplace', sa.Column('admin_unit_id', sa.Integer(), nullable=True)) + op.add_column('eventplace', sa.Column('organizer_id', sa.Integer(), nullable=True)) + op.add_column('eventplace', sa.Column('public', sa.Boolean(), nullable=True)) + op.create_foreign_key(None, 'eventplace', 'eventorganizer', ['organizer_id'], ['id']) + op.create_foreign_key(None, 'eventplace', 'adminunit', ['admin_unit_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'eventplace', type_='foreignkey') + op.drop_constraint(None, 'eventplace', type_='foreignkey') + op.drop_column('eventplace', 'public') + op.drop_column('eventplace', 'organizer_id') + op.drop_column('eventplace', 'admin_unit_id') + op.drop_constraint(None, 'eventorganizer', type_='foreignkey') + op.drop_column('eventorganizer', 'admin_unit_id') + # ### end Alembic commands ### diff --git a/migrations/versions/dcd0b71650b0_.py b/migrations/versions/dcd0b71650b0_.py new file mode 100644 index 0000000..1149a11 --- /dev/null +++ b/migrations/versions/dcd0b71650b0_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: dcd0b71650b0 +Revises: 699c4f6a7fe8 +Create Date: 2020-07-28 17:10:49.606513 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utils +import db + + +# revision identifiers, used by Alembic. +revision = 'dcd0b71650b0' +down_revision = '699c4f6a7fe8' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('eventorganizer', sa.Column('location_id', sa.Integer(), nullable=True)) + op.add_column('eventorganizer', sa.Column('logo_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'eventorganizer', 'image', ['logo_id'], ['id']) + op.create_foreign_key(None, 'eventorganizer', 'location', ['location_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'eventorganizer', type_='foreignkey') + op.drop_constraint(None, 'eventorganizer', type_='foreignkey') + op.drop_column('eventorganizer', 'logo_id') + op.drop_column('eventorganizer', 'location_id') + # ### end Alembic commands ### diff --git a/models.py b/models.py index 9e811e5..2206419 100644 --- a/models.py +++ b/models.py @@ -162,6 +162,8 @@ class AdminUnit(db.Model, TrackableMixin): short_name = Column(Unicode(100), unique=True) members = relationship('AdminUnitMember', backref=backref('adminunit', lazy=True)) organizations = relationship('AdminUnitOrg', backref=backref('adminunit', lazy=True)) + event_organizers = relationship('EventOrganizer', backref=backref('adminunit', lazy=True)) + event_places = relationship('EventPlace', backref=backref('adminunit', lazy=True)) location_id = db.Column(db.Integer, db.ForeignKey('location.id')) location = db.relationship('Location') logo_id = db.Column(db.Integer, db.ForeignKey('image.id')) @@ -247,6 +249,9 @@ class EventPlace(db.Model, TrackableMixin): photo = db.relationship('Image', uselist=False) url = Column(String(255)) description = Column(UnicodeText()) + public = Column(Boolean()) + admin_unit_id = db.Column(db.Integer, db.ForeignKey('adminunit.id'), nullable=True) + organizer_id = db.Column(db.Integer, db.ForeignKey('eventorganizer.id'), nullable=True) def is_empty(self): return (not self.name) @@ -315,6 +320,12 @@ class EventOrganizer(db.Model, TrackableMixin): email = Column(Unicode(255)) phone = Column(Unicode(255)) fax = Column(Unicode(255)) + location_id = db.Column(db.Integer, db.ForeignKey('location.id')) + location = db.relationship('Location') + logo_id = db.Column(db.Integer, db.ForeignKey('image.id')) + logo = db.relationship('Image', uselist=False) + admin_unit_id = db.Column(db.Integer, db.ForeignKey('adminunit.id'), nullable=True) + event_places = relationship('EventPlace', backref=backref('organizer', lazy=True)) def is_empty(self): return (not self.name diff --git a/scrape_fp.py b/scrape_fp.py index bbc596a..ad2ab83 100644 --- a/scrape_fp.py +++ b/scrape_fp.py @@ -115,8 +115,7 @@ def scrape(debug): event.organizer = EventOrganizer() js_organizer = js_event['organizer'] - event.organizer.name = js_event['name_public'] - event.organizer.org_name = js_organizer['name'] + event.organizer.name = js_event['name_public'] if js_event['name_public'] else js_organizer['name'] event.organizer.phone = js_event['phone_public'] if js_event['phone_public'] else js_organizer['phone'] event.organizer.email = js_event['email_public'] if js_event['email_public'] else js_organizer['email'] event.organizer.url = js_organizer['website'] if js_organizer['website'] else js_organizer['facebook'] diff --git a/templates/_macros.html b/templates/_macros.html index ccb9766..4bab7b9 100644 --- a/templates/_macros.html +++ b/templates/_macros.html @@ -48,6 +48,10 @@

{% endmacro %} +{% macro render_event_organizer(organizer) %} + {{ organizer.name }} +{% endmacro %} + {% macro render_ooa(ooa) %} {% if ooa.admin_unit %} {{ ooa.admin_unit.name }} @@ -110,7 +114,7 @@ {% endif %} - {{ render_ooa(event.host) }} + {{ render_event_organizer(event.organizer) }} {{ render_place(event.place) }} {% endfor %} @@ -296,7 +300,6 @@ {{ render_range_prop(event.age_from, event.age_to, 'fa-people-arrows', 'Typical Age range') }} {{ render_enum_prop(event.target_group_origin, 'fa-users', 'Target group origin') }} {{ render_enum_prop(event.attendance_mode, 'fa-mouse-pointer', 'Attendance mode') }} - @@ -357,7 +360,6 @@
{{ render_string_prop(event.organizer.name) }} - {{ render_string_prop(event.organizer.org_name) }} {{ render_link_prop(event.organizer.url) }} {{ render_email_prop(event.organizer.email) }} {{ render_phone_prop(event.organizer.phone) }} @@ -367,53 +369,6 @@ {% endif %} - {% if event.host %} - -
-
- {{ _('Host') }} -
-
- - {% if event.host.admin_unit %} -
{{ event.host.admin_unit.name }}
- - {% if event.host.admin_unit.logo_id %} -
{{ render_logo(event.host.admin_unit.logo_id) }}
- {% endif %} - -
- {{ render_link_prop(event.host.admin_unit.url) }} - {{ render_email_prop(event.host.admin_unit.email) }} - {{ render_phone_prop(event.host.admin_unit.phone) }} - {{ render_fax_prop(event.host.admin_unit.fax) }} - {{ render_location_prop(event.host.admin_unit.location) }} -
- - {% endif %} - - {% if event.host.organization %} -
{{ event.host.organization.name }}
- - {% if event.host.organization.logo_id %} -
{{ render_logo(event.host.organization.logo_id) }}
- {% endif %} - -
- {{ render_link_prop(event.host.organization.url) }} - {{ render_email_prop(event.host.organization.email) }} - {{ render_phone_prop(event.host.organization.phone) }} - {{ render_fax_prop(event.host.organization.fax) }} - {{ render_location_prop(event.host.organization.location) }} -
- - {% endif %} - -
-
- - {% endif %} -
{{ _('Admin unit') }} @@ -510,4 +465,16 @@ {% if event.recurrence_rule %} {% endif %} +{% endmacro %} + +{% macro render_tab(id, title, link, active_id=None) %} +
  • + {{ title }} +
    • +{% endmacro %} + +{% macro render_manage_menu(admin_unit, active_id=None) %} +
      + {{ render_tab('organizers', _('Organizers'), url_for('manage_admin_unit_organizers', id=admin_unit.id), active_id) }} +
    {% endmacro %} \ No newline at end of file diff --git a/templates/event/create.html b/templates/event/create.html index 80b004b..661907b 100644 --- a/templates/event/create.html +++ b/templates/event/create.html @@ -8,17 +8,6 @@
    {{ form.hidden_tag() }} - {% if not form.admin_unit_is_readonly %} -
    -
    - {{ _('Admin unit') }} -
    -
    - {{ render_field_with_errors(form.admin_unit_id, class="autocomplete w-100") }} -
    -
    - {% endif %} -
    {{ _('Event') }} @@ -42,22 +31,10 @@
    - {{ _('Host') }} * + {{ _('Organizer') }} *
    - {% if form.host_id.choices|length > 1 %} - {{ render_field_with_errors(form.host_id, class="autocomplete w-100") }} - {% endif %} - -
    - {{ form.organizer.hidden_tag() }} - {{ render_field_with_errors(form.organizer.form.name) }} - {{ render_field_with_errors(form.organizer.form.org_name) }} - {{ render_field_with_errors(form.organizer.form.url) }} - {{ render_field_with_errors(form.organizer.form.email) }} - {{ render_field_with_errors(form.organizer.form.phone) }} - {{ render_field_with_errors(form.organizer.form.fax) }} -
    + {{ render_field_with_errors(form.organizer_id, class="autocomplete w-100") }}
    diff --git a/templates/event/list.html b/templates/event/list.html index 867aac2..f6eb908 100644 --- a/templates/event/list.html +++ b/templates/event/list.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% from "_macros.html" import render_event_status_pill, render_event_date, render_ooa, render_place, render_events_sub_menu %} +{% from "_macros.html" import render_event_organizer, render_event_status_pill, render_event_date, render_ooa, render_place, render_events_sub_menu %} {% block title %} {{ _('Events') }} {% endblock %} @@ -30,7 +30,7 @@ {% endif %} - {{ render_ooa(event.host) }} + {{ render_event_organizer(event.organizer) }} {{ render_place(event.place) }} {% endfor %} diff --git a/templates/event/update.html b/templates/event/update.html index dfdb0bd..f28df72 100644 --- a/templates/event/update.html +++ b/templates/event/update.html @@ -41,20 +41,15 @@
    - {{ _('Host') }} + {{ _('Organizer') }}
    - {{ render_field_with_errors(form.host_id, class="autocomplete w-100") }} - -
    - {{ form.organizer.hidden_tag() }} - {{ render_field_with_errors(form.organizer.form.name) }} - {{ render_field_with_errors(form.organizer.form.org_name) }} - {{ render_field_with_errors(form.organizer.form.url) }} - {{ render_field_with_errors(form.organizer.form.email) }} - {{ render_field_with_errors(form.organizer.form.phone) }} - {{ render_field_with_errors(form.organizer.form.fax) }} -
    + {{ form.organizer.hidden_tag() }} + {{ render_field_with_errors(form.organizer.form.name) }} + {{ render_field_with_errors(form.organizer.form.url) }} + {{ render_field_with_errors(form.organizer.form.email) }} + {{ render_field_with_errors(form.organizer.form.phone) }} + {{ render_field_with_errors(form.organizer.form.fax) }}
    diff --git a/templates/event_suggestion/create.html b/templates/event_suggestion/create.html deleted file mode 100644 index 8135b47..0000000 --- a/templates/event_suggestion/create.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "layout.html" %} -{% from "_macros.html" import render_datepicker_js, render_field_with_errors, render_field %} - -{% block header %} - -{% endblock %} -{% block content %} - -

    {{ _('Suggest event') }}

    - - {{ form.hidden_tag() }} - {{ render_field_with_errors(form.event_name) }} - {{ render_field_with_errors(form.description) }} - {{ render_field_with_errors(form.external_link) }} - {{ render_field_with_errors(form.start) }} - - {{ render_field_with_errors(form.place_name) }} - {{ render_field_with_errors(form.place_street) }} - {{ render_field_with_errors(form.place_postalCode) }} - {{ render_field_with_errors(form.place_city) }} - - {{ render_field_with_errors(form.host_name) }} - {{ render_field_with_errors(form.contact_name) }} - {{ render_field_with_errors(form.contact_email) }} - - {{ render_field(form.submit) }} - - -{% endblock %} diff --git a/templates/event_suggestion/list.html b/templates/event_suggestion/list.html deleted file mode 100644 index 621265e..0000000 --- a/templates/event_suggestion/list.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "layout.html" %} -{% block title %} -{{ _('Event suggestions') }} -{% endblock %} -{% block content %} - -

    {{ _('Event suggestions') }}

    - -
    - - - - - - - - - - - - {% for suggestion in suggestions %} - - - - - - - - {% endfor %} - -
    {{ _('Date') }}{{ _('Name') }}{{ _('Host') }}{{ _('Location') }}{{ _('Created at') }}
    {{ suggestion.dates[0].start | datetimeformat }} - {{ suggestion.event_name }} - {{ suggestion.host_name }}{{ suggestion.place_name }}{{ suggestion.created_at | datetimeformat }}
    -
    - -{% endblock %} \ No newline at end of file diff --git a/templates/event_suggestion/read.html b/templates/event_suggestion/read.html deleted file mode 100644 index 8c70ea3..0000000 --- a/templates/event_suggestion/read.html +++ /dev/null @@ -1,93 +0,0 @@ -{% extends "layout.html" %} -{% block title %} -{{ suggestion.event_name }} -{% endblock %} -{% block content %} - -

    {{ suggestion.event_name }}

    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ _('Event') }}
    {{ _('Date') }}{{ suggestion.dates[0].start | datetimeformat }}
    {{ _('Event name') }}{{ suggestion.event_name }}
    {{ _('Description') }}{{ suggestion.description }}
    {{ _('Link URL') }}{% if suggestion.external_link %}{{ suggestion.external_link }}{% endif %}
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ _('Location') }}
    {{ _('Event place') }}{{ suggestion.place_name }}
    {{ _('Street') }}{{ suggestion.place_street }}
    {{ _('Postal code') }}{{ suggestion.place_postalCode }}
    {{ _('City') }}{{ suggestion.place_city }}
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ _('Contact') }}
    {{ _('Event host') }}{{ suggestion.host_name }}
    {{ _('Contact name') }}{{ suggestion.contact_name }}
    {{ _('Contact email') }}{% if suggestion.contact_email %}{{ suggestion.contact_email }}{% endif %}
    {{ _('Created at') }}{{ suggestion.created_at | datetimeformat }}
    -
    - -{% endblock %} \ No newline at end of file diff --git a/templates/layout.html b/templates/layout.html index 4c01cfa..d1c7ea9 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -47,11 +47,10 @@