mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use events for one day

main
Bob Mottram 2020-02-23 10:20:10 +00:00
parent b193c0d6aa
commit c98e72febc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webinterface.py
View File

@ -66,6 +66,7 @@ from shares import getValidSharedItemID
from happening import todaysEventsCheck from happening import todaysEventsCheck
from happening import thisWeeksEventsCheck from happening import thisWeeksEventsCheck
from happening import getCalendarEvents from happening import getCalendarEvents
from happening import getTodaysEvents
def updateAvatarImageCache(session,baseDir: str,httpPrefix: str,actor: str,avatarUrl: str,personCache: {},force=False) -> str: def updateAvatarImageCache(session,baseDir: str,httpPrefix: str,actor: str,avatarUrl: str,personCache: {},force=False) -> str:
"""Updates the cached avatar for the given actor """Updates the cached avatar for the given actor
@ -3735,17 +3736,17 @@ def htmlCalendar(translate: {}, \
monthNumber=currDate.month monthNumber=currDate.month
nickname=getNicknameFromActor(actor) nickname=getNicknameFromActor(actor)
events=getCalendarEvents(baseDir,nickname,domain,year,monthNumber)
months=('January','February','March','April','May','June','July','August','September','October','November','December')
monthName=translate[months[monthNumber-1]]
if os.path.isfile(baseDir+'/img/calendar-background.png'): if os.path.isfile(baseDir+'/img/calendar-background.png'):
if not os.path.isfile(baseDir+'/accounts/calendar-background.png'): if not os.path.isfile(baseDir+'/accounts/calendar-background.png'):
copyfile(baseDir+'/img/calendar-background.png',baseDir+'/accounts/calendar-background.png') copyfile(baseDir+'/img/calendar-background.png',baseDir+'/accounts/calendar-background.png')
months=('January','February','March','April','May','June','July','August','September','October','November','December')
monthName=translate[months[monthNumber-1]]
if dayNumber: if dayNumber:
dayEvents=None dayEvents=None
events=getTodaysEvents(baseDir,nickname,domain,year,monthNumber,dayNumber)
if events.get(str(dayNumber)): if events.get(str(dayNumber)):
dayEvents=events[str(dayNumber)] dayEvents=events[str(dayNumber)]
return htmlCalendarDay(translate,baseDir,path, \ return htmlCalendarDay(translate,baseDir,path, \
@ -3753,6 +3754,8 @@ def htmlCalendar(translate: {}, \
nickname,domain,dayEvents, \ nickname,domain,dayEvents, \
monthName,actor) monthName,actor)
events=getCalendarEvents(baseDir,nickname,domain,year,monthNumber)
prevYear=year prevYear=year
prevMonthNumber=monthNumber-1 prevMonthNumber=monthNumber-1
if prevMonthNumber<1: if prevMonthNumber<1: