Skip to content
Snippets Groups Projects
Commit a84f00ac authored by Vaibhav Mule's avatar Vaibhav Mule Committed by Fredrik Jonsson
Browse files

remove reminder field and make it as property

parent c4b7e0fa
No related branches found
No related tags found
No related merge requests found
...@@ -432,4 +432,4 @@ class CreateReminderForm(forms.ModelForm): ...@@ -432,4 +432,4 @@ class CreateReminderForm(forms.ModelForm):
class Meta: class Meta:
model = Reminder model = Reminder
fields = ['time', 'action', 'medium'] fields = ['time', 'action']
# Generated by Django 2.2.11 on 2020-03-19 12:31 # Generated by Django 2.2.11 on 2020-03-19 17:28
from django.conf import settings from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
...@@ -19,7 +19,6 @@ class Migration(migrations.Migration): ...@@ -19,7 +19,6 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('time', models.DateTimeField()), ('time', models.DateTimeField()),
('action', models.CharField(choices=[('reviewers_review', 'Remind reviewers to Review')], default='reviewers_review', max_length=50)), ('action', models.CharField(choices=[('reviewers_review', 'Remind reviewers to Review')], default='reviewers_review', max_length=50)),
('medium', models.CharField(choices=[('email', 'Email')], default='email', max_length=15)),
('sent', models.BooleanField(default=False)), ('sent', models.BooleanField(default=False)),
('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reminders', to='funds.ApplicationSubmission')), ('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reminders', to='funds.ApplicationSubmission')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
......
...@@ -11,8 +11,8 @@ class Reminder(models.Model): ...@@ -11,8 +11,8 @@ class Reminder(models.Model):
REVIEW: 'Remind reviewers to Review', REVIEW: 'Remind reviewers to Review',
} }
EMAIL = 'email' EMAIL = 'email'
MEDIUM_TYPES = { MEDIUM = {
EMAIL: 'Email', REVIEW: EMAIL
} }
ACTION_MESSAGE = { ACTION_MESSAGE = {
f'{REVIEW}-{EMAIL}': MESSAGES.REVIEW_REMINDER, f'{REVIEW}-{EMAIL}': MESSAGES.REVIEW_REMINDER,
...@@ -32,11 +32,6 @@ class Reminder(models.Model): ...@@ -32,11 +32,6 @@ class Reminder(models.Model):
default=REVIEW, default=REVIEW,
max_length=50, max_length=50,
) )
medium = models.CharField(
choices=MEDIUM_TYPES.items(),
default=EMAIL,
max_length=15,
)
sent = models.BooleanField(default=False) sent = models.BooleanField(default=False)
def __str__(self): def __str__(self):
...@@ -52,3 +47,8 @@ class Reminder(models.Model): ...@@ -52,3 +47,8 @@ class Reminder(models.Model):
@property @property
def action_message(self): def action_message(self):
return self.ACTION_MESSAGE[f'{self.action}-{self.medium}'] return self.ACTION_MESSAGE[f'{self.action}-{self.medium}']
@property
def medium(self):
return self.MEDIUM[self.action]
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment