raphael/calendarwatch_frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adds remove button to all calendars

Browse Source
This commit is contained in:
Raphael Maenle 2020-07-25 19:45:37 +02:00
parent 9ecaf0211f
commit 5ec5ba488d
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/routes.py
View File

@ -96,34 +96,43 @@ def devices():
@app.route("/calendar", methods=['GET', 'POST', 'DELETE']) @app.route("/calendar", methods=['GET', 'POST', 'DELETE'])
@login_required
def calendar(): def calendar():
if not current_user.is_authenticated:
return flask.render_template('login.html')
calendars = backend.calendarsFromDb(current_user) calendars = backend.calendarsFromDb(current_user)
form = CalendarForm() form = CalendarForm()
if request.method == 'POST': if request.method == 'POST':
if form.validate_on_submit(): if request.form.get("submit") == "Remove":
# try to add the submitted ical as a calendar calendar = db.session.query(Calendar).filter(Calendar.calendar_id==request.form.get("calendar")).first()
print(form.iCalURL.data, flush=True) db.session.delete(calendar)
db.session.commit()
elif form.validate_on_submit():
ical.icalToCalendarDb(form.iCalURL.data, form.calName.data, current_user) ical.icalToCalendarDb(form.iCalURL.data, form.calName.data, current_user)
# otherwise it is a javascript POST # otherwise it is a javascript POST
else: else:
try:
calId = request.json.get('calendar_id') calId = request.json.get('calendar_id')
color = request.json.get('color', None) color = request.json.get('color', None)
toggle = request.json.get('toggle', None) toggle = request.json.get('toggle', None)
except:
return flask.render_template('calendar.html', calendars=calendars, form=form)
if color != None: if color != None:
current_user.updateCalendar(calId, color=color) current_user.updateCalendar(calId, color=color)
if toggle != None: if toggle != None:
current_user.updateCalendar(calId, toggle=toggle) current_user.updateCalendar(calId, toggle=toggle)
# toggle specific calendar of user # toggle specific calendar of user
try:
calId = request.json.get('calendar_id') calId = request.json.get('calendar_id')
color = request.json.get('color', None) color = request.json.get('color', None)
toggle = request.json.get('toggle', None) toggle = request.json.get('toggle', None)
except:
return flask.render_template('calendar.html', calendars=calendars, form=form)
if color != None: if color != None:
current_user.updateCalendar(calId, color=color) current_user.updateCalendar(calId, color=color)
@ -133,13 +142,6 @@ def calendar():
return 'OK' return 'OK'
elif request.method == 'DELETE':
# do nothing
return 'NONE'
else:
# POST Error 405
print("405")
return flask.render_template('calendar.html', calendars=calendars, form=form) return flask.render_template('calendar.html', calendars=calendars, form=form)
# POST # POST

7
server/template/calendar.html
View File

@ -9,6 +9,13 @@
{% for item in calendars %} {% for item in calendars %}
<div class="container"> <div class="container">
<!--action button-->
<div style="width: 4rem; margin: 1rem;">
<form action="" method="post">
<input type="hidden" name="calendar" value={{ item.calendarId }}>
<input type="submit" name="submit" value="Remove">
</form>
</div>
<!--Name--> <!--Name-->
<div style="width: 15rem; margin: 1rem;">{{ item.name }}</div> <div style="width: 15rem; margin: 1rem;">{{ item.name }}</div>