Add months timeframe for newsletters

* Closes #1876
This commit is contained in:
JonnyWong16 2022-11-07 11:26:13 -08:00
parent b74a1a3c32
commit a3ad40122d
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 5 additions and 2 deletions

View file

@ -56,11 +56,12 @@
<div class="form-group"> <div class="form-group">
<label for="time_frame">Time Frame</label> <label for="time_frame">Time Frame</label>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-5">
<div class="input-group newsletter-time_frame"> <div class="input-group newsletter-time_frame">
<span class="input-group-addon form-control btn-dark inactive">Last</span> <span class="input-group-addon form-control btn-dark inactive">Last</span>
<input type="number" class="form-control" id="newsletter_config_time_frame" name="newsletter_config_time_frame" value="${newsletter['config']['time_frame']}"> <input type="number" class="form-control" id="newsletter_config_time_frame" name="newsletter_config_time_frame" value="${newsletter['config']['time_frame']}">
<select class="form-control" id="newsletter_config_time_frame_units" name="newsletter_config_time_frame_units"> <select class="form-control" id="newsletter_config_time_frame_units" name="newsletter_config_time_frame_units">
<option value="months" ${'selected' if newsletter['config']['time_frame_units'] == 'months' else ''}>months</option>
<option value="days" ${'selected' if newsletter['config']['time_frame_units'] == 'days' else ''}>days</option> <option value="days" ${'selected' if newsletter['config']['time_frame_units'] == 'days' else ''}>days</option>
<option value="hours" ${'selected' if newsletter['config']['time_frame_units'] == 'hours' else ''}>hours</option> <option value="hours" ${'selected' if newsletter['config']['time_frame_units'] == 'hours' else ''}>hours</option>
</select> </select>

View file

@ -402,7 +402,9 @@ class Newsletter(object):
pass pass
if self.start_date is None: if self.start_date is None:
if self.config['time_frame_units'] == 'days': if self.config['time_frame_units'] == 'months':
self.start_date = self.end_date.shift(months=-self.config['time_frame'])
elif self.config['time_frame_units'] == 'days':
self.start_date = self.end_date.shift(days=-self.config['time_frame']) self.start_date = self.end_date.shift(days=-self.config['time_frame'])
else: else:
self.start_date = self.end_date.shift(hours=-self.config['time_frame']) self.start_date = self.end_date.shift(hours=-self.config['time_frame'])