diff --git a/jobs/admin.py b/jobs/admin.py index 862418b..e84b391 100644 --- a/jobs/admin.py +++ b/jobs/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Job, Application, Tag, Question, Answer +from .models import Job, Application, Tag, Question, Answer, JobMessage -admin.site.register([Job, Application, Tag, Question, Answer]) +admin.site.register([Job, Application, Tag, Question, Answer, JobMessage]) diff --git a/jobs/forms.py b/jobs/forms.py index 66bb207..c94d06e 100644 --- a/jobs/forms.py +++ b/jobs/forms.py @@ -2,7 +2,7 @@ from django import forms from django.forms import inlineformset_factory from dal.autocomplete import ModelSelect2Multiple -from .models import Job, Question, Application, Answer +from .models import Job, Question, Application, Answer, JobMessage class JobForm(forms.ModelForm): @@ -13,6 +13,12 @@ class JobForm(forms.ModelForm): 'tags': ModelSelect2Multiple(url='jobs:tag-autocomplete') } +class MessageForm(forms.ModelForm): + text = forms.CharField(label='', widget=forms.TextInput(attrs={"placeholder": "Write your message"})) + class Meta: + model = JobMessage + fields = ('text',) + class QuestionForm(forms.ModelForm): class Meta: diff --git a/jobs/models.py b/jobs/models.py index 7c16664..2e2efeb 100644 --- a/jobs/models.py +++ b/jobs/models.py @@ -42,6 +42,8 @@ class Job(models.Model): posted_by = models.ForeignKey( User, related_name="jobs", on_delete=models.CASCADE) + active = models.BooleanField(default=True) + def renew(self): self.expires = after_30_days() self.save() @@ -96,3 +98,13 @@ class Answer(models.Model): def __str__(self): return "Answer for : {0} - {1}".format(self.question, self.application) + +class JobMessage(models.Model): + """Basic user to user messaging app""" + sender = models.ForeignKey(User, on_delete=models.CASCADE, related_name="sender") + receiver = models.ForeignKey(User, on_delete=models.CASCADE, related_name="receiver") + text = models.TextField() + date = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return '{}, {}'.format(self.sender, self.text[:50]) diff --git a/jobs/templates/jobs/application_list.html b/jobs/templates/jobs/application_list.html index 0a8c89c..e69de29 100644 --- a/jobs/templates/jobs/application_list.html +++ b/jobs/templates/jobs/application_list.html @@ -1,31 +0,0 @@ -{% extends 'base.html' %} -{% block body_content %} -
- Submitted: {{ application.created }} -
-- {{ application.cover_text }} -
-{{answer.text}}
# | +First | +Last | +Handle | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry the Bird | +