cailean
/
cn-py
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

spotlight update

main
Cailean Finn 2 months ago
parent
acf8d6eb21
commit
092090d639
2 changed files with 36 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      app.py
  2. 40
      templates/newsletter.html

17
app.py
View File

@ -31,9 +31,10 @@ class WikiApp(Flask):
content, title, date = self.fetch_page(title) content, title, date = self.fetch_page(title)
given_date = datetime.strptime(date, "%Y-%m-%d") given_date = datetime.strptime(date, "%Y-%m-%d")
new_date_opp = given_date + relativedelta(months=2) new_date_opp = given_date + relativedelta(months=2)
new_date_events = given_date + relativedelta(weeks=2) new_date_events = given_date + relativedelta(weeks=4)
opportunites_dict = self.fetch_opportunities(given_date.date(), new_date_opp.date()) opportunites_dict = self.fetch_opportunities(given_date.date(), new_date_opp.date())
events_dict = self.fetch_events(given_date.date(), new_date_events.date()) events_dict = self.fetch_events(given_date.date(), new_date_events.date())
print(events_dict)
return render_template('newsletter.html', nav_elements=self.get_nav_menu(), content=content, title=title, events=events_dict, opportunities=opportunites_dict) return render_template('newsletter.html', nav_elements=self.get_nav_menu(), content=content, title=title, events=events_dict, opportunities=opportunites_dict)
def fetch_opportunities(self, pub_date, future_date): def fetch_opportunities(self, pub_date, future_date):
@ -158,7 +159,7 @@ class WikiApp(Flask):
opp_page_list = {} opp_page_list = {}
categories = ['Events'] categories = ['Events']
for category in categories: for category in categories:
response = requests.get(self.MEDIAWIKI_BASE_URL + self.BASE_API, params={'action': 'ask', 'query': '[[Concept:'+category+']] [[Event:Date::<=' + future_date.strftime("%Y-%m-%d") + ']] [[Event:Date::>='+ pub_date.strftime("%Y-%m-%d") + ']] |?Event:Date|?Event:EndDate|?Event:Name|?Event:Location|?Event:Organiser/s|?Event:Source', 'format': 'json', 'formatversion': '2'}) response = requests.get(self.MEDIAWIKI_BASE_URL + self.BASE_API, params={'action': 'ask', 'query': '[[Concept:'+category+']] [[Event:Date::<=' + future_date.strftime("%Y-%m-%d") + ']] [[Event:Date::>='+ pub_date.strftime("%Y-%m-%d") + ']] |?Event:Date|?Event:EndDate|?Event:Name|?Event:Location|?Event:Organiser/s|?Event:Source|?Event:Spotlight', 'format': 'json', 'formatversion': '2'})
data = response.json() data = response.json()
opp_info = {} opp_info = {}
if not data['query']['results']: if not data['query']['results']:
@ -185,7 +186,17 @@ class WikiApp(Flask):
source = page_data['printouts']['Event:Source'][0] source = page_data['printouts']['Event:Source'][0]
org = page_data['printouts']['Event:Organiser/s'][0]['fulltext'] org = page_data['printouts']['Event:Organiser/s'][0]['fulltext']
opp_info = {'pagetitle': page_title, 'name': name, 'deadline': formatted_deadline, 'endDate': formatted_EndDate,'location': location, 'source' : source, 'org': org, 'text': ''} try:
spotlight = page_data['printouts']['Event:Spotlight'][0]
if spotlight == 't':
spotlight = True
else:
spotlight = False
except:
spotlight = False
opp_info = {'pagetitle': page_title, 'name': name, 'deadline': formatted_deadline, 'endDate': formatted_EndDate,'location': location, 'source' : source, 'org': org, 'spotlight': spotlight, 'text': ''}
if type not in opp_page_list: if type not in opp_page_list:
opp_page_list[type] = [] opp_page_list[type] = []

40
templates/newsletter.html
View File

@ -14,15 +14,17 @@
<hr> <hr>
<div class='list-events'> <div class='list-events'>
{% for data in value %} {% for data in value %}
<div class='event'> {% if data.spotlight %}
<a class='link' href='/{{ data.pagetitle }}' target="_blank"><h4 class='event-name'><b>{{ data.name }}</b></h4></a> <div class='event'>
<p class='event-org'><b>Organiser/s: </b>{{ data.org }}</p> <a class='link' href='/{{ data.pagetitle }}' target="_blank"><h4 class='event-name'><b>{{ data.name }}</b></h4></a>
<p class='event-location'><b>Location: </b>{{ data.location }}</p> <p class='event-org'><b>Organiser/s: </b>{{ data.org }}</p>
<p class='event-deadline'><b>Date: </b>{{ data.deadline }} &#8594; {{ data.endDate}}</p> <p class='event-location'><b>Location: </b>{{ data.location }}</p>
<p class='event-text'>{{ data.text }}</p> <p class='event-deadline'><b>Date: </b>{{ data.deadline }} &#8594; {{ data.endDate}}</p>
<a href={{ data.source }} target='_blank'><p class='event-link'><b>Link ↗</b></p></a> <p class='event-text'>{{ data.text }}</p>
</div> <a href={{ data.source }} target='_blank'><p class='event-link'><b>Link ↗</b></p></a>
<p>&#8203;</p> </div>
<p>&#8203;</p>
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}
@ -33,15 +35,17 @@
<hr> <hr>
<div class='list-events'> <div class='list-events'>
{% for data in value %} {% for data in value %}
<div class='event'> {% if not data.spotlight %}
<a class='link' href='/{{ data.pagetitle }}' target="_blank"><h4 class='event-name'><b>{{ data.name }}</b></h4></a> <div class='event'>
<p class='event-org'><b>Organiser/s: </b>{{ data.org }}</p> <a class='link' href='/{{ data.pagetitle }}' target="_blank"><h4 class='event-name'><b>{{ data.name }}</b></h4></a>
<p class='event-location'><b>Location: </b>{{ data.location }}</p> <p class='event-org'><b>Organiser/s: </b>{{ data.org }}</p>
<p class='event-deadline'><b>Date: </b>{{ data.deadline }} &#8594; {{ data.endDate}}</p> <p class='event-location'><b>Location: </b>{{ data.location }}</p>
<p class='event-text'>{{ data.text }}</p> <p class='event-deadline'><b>Date: </b>{{ data.deadline }} &#8594; {{ data.endDate}}</p>
<a href={{ data.source }} target='_blank'><p class='event-link'><b>Link ↗</b></p></a> <p class='event-text'>{{ data.text }}</p>
</div> <a href={{ data.source }} target='_blank'><p class='event-link'><b>Link ↗</b></p></a>
<p>&#8203;</p> </div>
<p>&#8203;</p>
{%endif%}
{% endfor %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}

Write Preview
Loading…
Cancel
Save