Skip to content

Commit

Permalink
code clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
@anishTP
anishTP committed Jan 12, 2024
1 parent 66c3ec7 commit 490f58d
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 66 deletions.
2 changes: 1 addition & 1 deletion devserver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def rq_background_worker(*args: Any, **kwargs: Any) -> Any:
# Only start RQ worker within the reloader environment
background_rq = BackgroundWorker(
rq_background_worker,
mock_transports=bool(getbool(os.environ.get('MOCK_TRANSPORTS', False))),
mock_transports=bool(getbool(os.environ.get('MOCK_TRANSPORTS', True))),
)
background_rq.start()

Expand Down
61 changes: 61 additions & 0 deletions funnel/templates/notifications/layout_email.html.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,67 @@
font-weight: bold;
text-align: center;
}
.schedule {
margin: 32px 0 !important;
}
.schedule__date {
font-size: 16px !important;
margin: 0 !important;
text-align: left;
line-height: 1.5;
padding-left: 0 !important;
}
.schedule__table {
margin: 16px 0;
background-color: #fff !important;
overflow: auto;
}
.schedule__row {
overflow: auto;
border-bottom: 1pt solid rgba(132, 146, 166, 0.3) !important;
}
.schedule__row__column--header {
outline: 1px solid rgba(132, 146, 166, 0.3)
border: none !important;
background-color: #fff;
font-size: 16px;
line-height: 1.5;
align: left;
padding: 4px 16px;
width: calc(100% - 150px);
}
.schedule__row__column--time--header {
outline: 1px solid rgba(132, 146, 166, 0.3)
border: none !important;
background-color: #fff;
width: 150px;
padding: 4px 16px;
align: left;
}
.schedule__row__column {
position: relative !important;
outline: 1px solid rgba(132, 146, 166, 0.3)
}
.schedule__row__column__content__title {
width: 100% !important;
}
.schedule__row__column__content__title__duration {
position: relative !important;
background-color: transparent !important;
font-size: 16px !important;
padding: 0 !important;
margin: 0 0 4px !important;
line-height: 1.5 !important;
}
.schedule__row__column__content__title__heading,
.schedule__row__column__content__title__speaker {
font-size: 16px !important;
font-weight: normal !important;
line-height: 1.5 !important;
margin: 0 0 4px;
color: #4d5763;
}
.unsubscribe {
color: #4d5763;
text-decoration: underline;
Expand Down
74 changes: 53 additions & 21 deletions funnel/templates/notifications/macros_email.html.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,61 @@
{%- endmacro -%}

{% macro cta_button(btn_url, btn_text) %}
<tr>
<td>
<div align="center">
<!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{ btn_url }}" style="height:40px;v-text-anchor:middle;width:200px;" arcsize="10%" strokecolor="#4d5763" fillcolor="#4d5763">
<w:anchorlock/>
<center style="color:#ffffff;font-family:sans-serif;font-size:15px;font-weight:bold;">{{ btn_text }}</center>
</v:roundrect>
<![endif]-->
<!--[if !mso]> <!-->
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
<tr>
<td class="button-td button-td-primary">
<div>
<a class="button-a button-a-primary" href="{{ btn_url }}">{{ btn_text }}</a>
</div>
</td>
</tr>
<tr>
<td>
<div align="center">
<!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{ btn_url }}" style="height:40px;v-text-anchor:middle;width:200px;" arcsize="10%" strokecolor="#4d5763" fillcolor="#4d5763">
<w:anchorlock/>
<center style="color:#ffffff;font-family:sans-serif;font-size:15px;font-weight:bold;">{{ btn_text }}</center>
</v:roundrect>
<![endif]-->
<!--[if !mso]> <!-->
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
<tr>
<td class="button-td button-td-primary">
<div>
<a class="button-a button-a-primary" href="{{ btn_url }}">{{ btn_text }}</a>
</div>
</td>
</tr>
</table>
<!-- <![endif]-->
</div>
</td>
</tr>
{% endmacro %}

{% macro schedule_tables(schedule) %}
<tr>
{% for day, rooms in schedule.items() %}
<table class="schedule">
<h3 class="schedule__date">
<span>{% trans %}{{ day }}{% endtrans %}</span>
</h3>
{% for room, slots in rooms.items() %}
<tbody class="schedule__table">
<tr class="schedule__row">
<th class="schedule__row__column schedule__row__column--time--header">{% trans %}Time{% endtrans %}</th>
<th class="schedule__row__column schedule__row__column--header">{% trans %}{{ room }}{% endtrans %}</th>
</tr>
{% for slot, sessions in slots.items() %}
{% for session in sessions %}
<tr>
<td class="schedule__row__column__content__title__duration">{% trans start_time=session.startTime, end_time=session.endTime %}{{ start_time }}–{{ end_time }}{% endtrans %}</td>
<td class="schedule__row__column__content__title">
{% if session.title %}<p class="schedule__row__column__content__title__heading">{% trans title=session.title %}{{ title }}{% endtrans %}</p>{% endif %}
{% if session.speaker %}<p class="schedule__row__column__content__title__speaker">{% trans speaker=session.speaker %}{{ speaker }}{% endtrans %}</p>{% endif %}
</td>
</tr>
{% endfor %}
{% endfor %}
</tbody>
{% endfor %}
</table>
<!-- <![endif]-->
</div>
</td>
{% endfor %}
</tr>
<br/>
{% endmacro %}

{% macro rsvp_footer(view, rsvp_linktext) %}
Expand Down
35 changes: 5 additions & 30 deletions funnel/templates/notifications/update_new_email.html.jinja2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{%- extends "notifications/layout_email.html.jinja2" -%}
{%- from "notifications/macros_email.html.jinja2" import cta_button -%}
{%- from "notifications/macros_email.html.jinja2" import cta_button, schedule_tables -%}
{%- block content -%}

<tr>
Expand All @@ -17,35 +17,10 @@
{% trans update_body=view.update.body %}{{ update_body }}{% endtrans %}
</td>
</tr>
<tr>
{% for day, rooms in schedule.items() %}
<div class="schedule">
<h3 class="schedule__date collapsible__header mui--clearfix schedule__date--upcoming">
<span class="mui--pull-left">{{ day }}</span>
</h3>
{% for room, slots in rooms.items() %}
<table class="bg-accent schedule__table collapsible__body">
<tr class="schedule__row schedule__row--sticky">
<th class="schedule__row__column schedule__row__column--time schedule__row__column--time--header" style="minWidth: '100px'">Time</th>
<th class="schedule__row__column schedule__row__column--header" style="width: 'calc(100% - '100px)'">{{ room }}</th>
</tr>
{% for slot, sessions in slots.itens() %}
{% for session in sessions %}
<tr>
<td class="mui--text-body2 schedule__row__column__content__title__duration">{{ session.startTime }}–{{ session.endTime }}</td>
<td class="schedule__row__column__content__title">
{% if room.talk.title %}<p class="mui--text-body2 schedule__row__column__content__title__heading">{{ session.title }}</p>{% endif %}
{% if room.talk.speaker %}<p class="mui--text-caption mui--text-light schedule__row__column__content__title__speaker">{{ session.speaker }}</p>{% endif %}
</td>
</tr>
{% endfor %}
{% endfor %}
</table>
{% endfor %}
</div>
{% endfor %}
</tr>
<br/>

{# Schedule : BEGIN #}
{{ schedule_tables(schedules) }}
{# Schedule: END #}

{# Button : BEGIN #}
{{ cta_button(view.update.url_for(_external=true, **view.tracking_tags()), gettext("Read on the website") )}}
Expand Down
16 changes: 7 additions & 9 deletions funnel/views/notifications/update_notification.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

from baseframe import _, __

from ...models import Account, NewUpdateNotification, Update, Project
from ...models import Account, NewUpdateNotification, Project, Update
from ...transports.sms import SmsPriority, SmsTemplate
from ..helpers import shortlink
from ..notification import RenderNotification
from .mixins import TemplateVarMixin
from ..schedule import upcoming_schedule_data_with_room
from .mixins import TemplateVarMixin


class UpdateTemplate(TemplateVarMixin, SmsTemplate):
Expand Down Expand Up @@ -64,14 +64,12 @@ def email_subject(self) -> str:
)

def email_content(self) -> str:
project = self.project.current_access(datasets=('primary', 'related'))
venues = [
venue.current_access(datasets=('without_parent', 'related'))
for venue in self.project.venues
]
schedules = upcoming_schedule_data_with_room(self.project)
return render_template('notifications/update_new_email.html.jinja2', view=self, project=project,
venues=venues, schedules=schedules)
return render_template(
'notifications/update_new_email.html.jinja2',
view=self,
schedules=schedules,
)

def sms(self) -> UpdateTemplate:
return UpdateTemplate(
Expand Down
12 changes: 7 additions & 5 deletions funnel/views/schedule.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,19 @@ def schedule_data(
schedule.append(daydata)
return schedule


def upcoming_schedule_data_with_room(project: Project) -> list[dict]:
schedule = schedule_data(project)
schedule_with_room = []
for key, day in schedule:
if datetime.strptime(key,'%y-%m-%d') >= datetime.today():
daydata_with_room: dict[str, dict[str, Any]] = defaultdict(lambda:
defaultdict(Any))
if datetime.strptime(key, '%y-%m-%d') >= datetime.today():
daydata_with_room: dict[str, dict[str, list]] = defaultdict(
lambda: defaultdict(list)
)
for slots in schedule[day]:
roomdata: dict[str, Any] = defaultdict(Any)
roomdata: dict[str, Any] = {'date': day, 'rooms': defaultdict(list)}
roomdata[slots.sessions.room_scoped_name].append(slots)
daydata_with_room[day]['room'].append(roomdata)
daydata_with_room[day]['rooms'].append(roomdata)
schedule_with_room.append(daydata_with_room)
return schedule_with_room

Expand Down

0 comments on commit 490f58d

Please sign in to comment.