uncommented out email module, added dummy backend, removed link for inbox

This commit is contained in:
jeremyklein 2018-02-18 16:04:24 -05:00
parent bf61041e85
commit 9b203843a5
10 changed files with 215 additions and 219 deletions

View file

@ -129,11 +129,12 @@ USE_TZ = True
STATIC_URL = '/static/'
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
EMAIL_HOST = 'localhost'
EMAIL_PORT = 25
AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend', )
# EMAIL_HOST = 'localhost'
# EMAIL_PORT = 25
# AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend', )
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'

View file

@ -14,7 +14,7 @@ urlpatterns = [
url(r'^contacts/', include('contacts.urls', namespace='contacts')),
url(r'^opportunities/', include('opportunity.urls', namespace='opportunities')),
url(r'^cases/', include('cases.urls', namespace='cases')),
# url(r'^emails/', include('emails.urls', namespace='emails')),
url(r'^emails/', include('emails.urls', namespace='emails')),
# url(r'^planner/', include('planner.urls', namespace='planner')),
url(r'^logout/$', views.logout, {'next_page': '/login/'}, name='logout'),

View file

@ -1,14 +1,14 @@
# from django import forms
# from .models import Email
from django import forms
from .models import Email
# class EmailForm(forms.ModelForm):
class EmailForm(forms.ModelForm):
# from_email = forms.EmailField(max_length=200, required=True)
# to_email = forms.EmailField(max_length=200, required=True)
# subject = forms.CharField(max_length=200, required=True)
# message = forms.CharField(max_length=200, required=True)
from_email = forms.EmailField(max_length=200, required=True)
to_email = forms.EmailField(max_length=200, required=True)
subject = forms.CharField(max_length=200, required=True)
message = forms.CharField(max_length=200, required=True)
# class Meta:
# model = Email
# fields = ('from_email', 'to_email', 'subject', 'message')
class Meta:
model = Email
fields = ('from_email', 'to_email', 'subject', 'message')

View file

@ -1,30 +1,30 @@
# from django.conf.urls import url
# from . import views
# from django.conf.urls.static import static
# from django.conf import settings
from django.conf.urls import url
from . import views
from django.conf.urls.static import static
from django.conf import settings
# app_name = 'emails'
app_name = 'emails'
# urlpatterns = [
# url(r'^list/', views.emails_list, name="list"),
# url(r'^compose/', views.email, name="compose"),
# url(r'^email_sent/', views.email_sent, name="email_sent"),
# url(r'^email_move_to_trash/(?P<pk>\d+)/$',
# views.email_move_to_trash, name='email_move_to_trash'),
# url(r'^email_delete/(?P<pk>\d+)/$',
# views.email_delete, name='email_delete'),
# url(r'^email_trash/', views.email_trash, name="email_trash"),
# url(r'^email_trash_delete/(?P<pk>\d+)/$',
# views.email_trash_delete, name="email_trash_delete"),
# url(r'^email_draft/', views.email_draft, name="email_draft"),
# url(r'^email_draft_delete/(?P<pk>\d+)/$',
# views.email_draft_delete, name="email_draft_delete"),
# url(r'^email_imp/(?P<pk>\d+)/$', views.email_imp, name="email_imp"),
# url(r'^email_imp_list/', views.email_imp_list, name="email_imp_list"),
# url(r'^email_sent_edit/(?P<pk>\d+)/$',
# views.email_sent_edit, name="email_sent_edit"),
# url(r'^email_unimp/(?P<pk>\d+)/$', views.email_unimp, name="email_unimp"),
# url(r'^email_view/(?P<pk>\d+)/$', views.email_view, name="email_view"),
urlpatterns = [
url(r'^list/', views.emails_list, name="list"),
url(r'^compose/', views.email, name="compose"),
url(r'^email_sent/', views.email_sent, name="email_sent"),
url(r'^email_move_to_trash/(?P<pk>\d+)/$',
views.email_move_to_trash, name='email_move_to_trash'),
url(r'^email_delete/(?P<pk>\d+)/$',
views.email_delete, name='email_delete'),
url(r'^email_trash/', views.email_trash, name="email_trash"),
url(r'^email_trash_delete/(?P<pk>\d+)/$',
views.email_trash_delete, name="email_trash_delete"),
url(r'^email_draft/', views.email_draft, name="email_draft"),
url(r'^email_draft_delete/(?P<pk>\d+)/$',
views.email_draft_delete, name="email_draft_delete"),
url(r'^email_imp/(?P<pk>\d+)/$', views.email_imp, name="email_imp"),
url(r'^email_imp_list/', views.email_imp_list, name="email_imp_list"),
url(r'^email_sent_edit/(?P<pk>\d+)/$',
views.email_sent_edit, name="email_sent_edit"),
url(r'^email_unimp/(?P<pk>\d+)/$', views.email_unimp, name="email_unimp"),
url(r'^email_view/(?P<pk>\d+)/$', views.email_view, name="email_view"),
# ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

View file

@ -1,202 +1,202 @@
# from django.http import HttpResponseRedirect
# from django.urls import reverse
# from django.shortcuts import render
# from django.shortcuts import get_object_or_404
# from emails.models import Email
# from emails.forms import EmailForm
# from django.core.mail import EmailMessage
# from datetime import datetime
# from datetime import timedelta
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.shortcuts import render
from django.shortcuts import get_object_or_404
from emails.models import Email
from emails.forms import EmailForm
from django.core.mail import EmailMessage
from datetime import datetime
from datetime import timedelta
# def emails_list(request):
# filter_list = Email.objects.all()
# if request.GET.get('from_date', ''):
# from_date = request.GET.get('from_date', '')
# fd = datetime.strptime(from_date, "%Y-%m-%d").date()
# filter_list = filter_list.filter(send_time__gte=fd)
# if request.GET.get('to_date', ''):
# to_date = request.GET.get('to_date', '')
# td = datetime.strptime(to_date, "%Y-%m-%d")
# td = td + timedelta(seconds=(24 * 60 * 60 - 1))
# filter_list = filter_list.filter(send_time__lte=td)
# if request.GET.get('name', ''):
# name = request.GET.get('name', '')
# filter_list = filter_list.filter(to_email__startswith=name)
# return render(request, 'emails/mail_all.html', {
# 'filter_list': filter_list})
def emails_list(request):
filter_list = Email.objects.all()
if request.GET.get('from_date', ''):
from_date = request.GET.get('from_date', '')
fd = datetime.strptime(from_date, "%Y-%m-%d").date()
filter_list = filter_list.filter(send_time__gte=fd)
if request.GET.get('to_date', ''):
to_date = request.GET.get('to_date', '')
td = datetime.strptime(to_date, "%Y-%m-%d")
td = td + timedelta(seconds=(24 * 60 * 60 - 1))
filter_list = filter_list.filter(send_time__lte=td)
if request.GET.get('name', ''):
name = request.GET.get('name', '')
filter_list = filter_list.filter(to_email__startswith=name)
return render(request, 'emails/mail_all.html', {
'filter_list': filter_list})
# def email(request):
# if request.method == "POST":
# form = EmailForm(request.POST, request.FILES)
# if form.is_valid():
# subject = request.POST.get('subject', '')
# message = request.POST.get('message', '')
# from_email = request.POST.get('from_email', '')
# to_email = request.POST.get('to_email', '')
# file = request.FILES.get('files', None)
# status = request.POST.get('email_draft', '')
# email = EmailMessage(subject, message, from_email, [to_email])
# f = form.save()
# if file is not None:
# email.attach(file.name, file.read(), file.content_type)
# f.file = file
# if status:
# f.status = "draft"
# else:
# email.send(fail_silently=False)
# f.save()
# return HttpResponseRedirect(reverse('emails:list'))
# else:
# return render(request, 'emails/create_mail.html', {'form': form})
# else:
# form = EmailForm()
# return render(request, 'emails/create_mail.html', {'form': form})
def email(request):
if request.method == "POST":
form = EmailForm(request.POST, request.FILES)
if form.is_valid():
subject = request.POST.get('subject', '')
message = request.POST.get('message', '')
from_email = request.POST.get('from_email', '')
to_email = request.POST.get('to_email', '')
file = request.FILES.get('files', None)
status = request.POST.get('email_draft', '')
email = EmailMessage(subject, message, from_email, [to_email])
f = form.save()
if file is not None:
email.attach(file.name, file.read(), file.content_type)
f.file = file
if status:
f.status = "draft"
else:
email.send(fail_silently=False)
f.save()
return HttpResponseRedirect(reverse('emails:list'))
else:
return render(request, 'emails/create_mail.html', {'form': form})
else:
form = EmailForm()
return render(request, 'emails/create_mail.html', {'form': form})
# def email_sent(request):
# filter_list = Email.objects.filter(status="sent")
# if request.GET.get('from_date', ''):
# from_date = request.GET.get('from_date', '')
# fd = datetime.strptime(from_date, "%Y-%m-%d").date()
# filter_list = filter_list.filter(send_time__gte=fd)
# if request.GET.get('to_date', ''):
# to_date = request.GET.get('to_date', '')
# td = datetime.strptime(to_date, "%Y-%m-%d")
# td = td + timedelta(seconds=(24 * 60 * 60 - 1))
# filter_list = filter_list.filter(send_time__lte=td)
# if request.GET.get('name', ''):
# name = request.GET.get('name', '')
# filter_list = filter_list.filter(to_email__startswith=name)
# return render(request, 'emails/mail_sent.html',
# {'filter_list': filter_list})
def email_sent(request):
filter_list = Email.objects.filter(status="sent")
if request.GET.get('from_date', ''):
from_date = request.GET.get('from_date', '')
fd = datetime.strptime(from_date, "%Y-%m-%d").date()
filter_list = filter_list.filter(send_time__gte=fd)
if request.GET.get('to_date', ''):
to_date = request.GET.get('to_date', '')
td = datetime.strptime(to_date, "%Y-%m-%d")
td = td + timedelta(seconds=(24 * 60 * 60 - 1))
filter_list = filter_list.filter(send_time__lte=td)
if request.GET.get('name', ''):
name = request.GET.get('name', '')
filter_list = filter_list.filter(to_email__startswith=name)
return render(request, 'emails/mail_sent.html',
{'filter_list': filter_list})
# def email_trash(request):
# filter_list = Email.objects.filter(status="trash")
# if request.GET.get('from_date', ''):
# from_date = request.GET.get('from_date', '')
# fd = datetime.strptime(from_date, "%Y-%m-%d").date()
# filter_list = filter_list.filter(send_time__gte=fd)
# if request.GET.get('to_date', ''):
# to_date = request.GET.get('to_date', '')
# td = datetime.strptime(to_date, "%Y-%m-%d")
# td = td + timedelta(seconds=(24 * 60 * 60 - 1))
# filter_list = filter_list.filter(send_time__lte=td)
# if request.GET.get('name', ''):
# name = request.GET.get('name', '')
# filter_list = filter_list.filter(to_email__startswith=name)
# return render(request, 'emails/mail_trash.html',
# {'filter_list': filter_list})
def email_trash(request):
filter_list = Email.objects.filter(status="trash")
if request.GET.get('from_date', ''):
from_date = request.GET.get('from_date', '')
fd = datetime.strptime(from_date, "%Y-%m-%d").date()
filter_list = filter_list.filter(send_time__gte=fd)
if request.GET.get('to_date', ''):
to_date = request.GET.get('to_date', '')
td = datetime.strptime(to_date, "%Y-%m-%d")
td = td + timedelta(seconds=(24 * 60 * 60 - 1))
filter_list = filter_list.filter(send_time__lte=td)
if request.GET.get('name', ''):
name = request.GET.get('name', '')
filter_list = filter_list.filter(to_email__startswith=name)
return render(request, 'emails/mail_trash.html',
{'filter_list': filter_list})
# def email_trash_delete(request, pk):
# get_object_or_404(Email, id=pk).delete()
# return HttpResponseRedirect(reverse('emails:email_trash'))
def email_trash_delete(request, pk):
get_object_or_404(Email, id=pk).delete()
return HttpResponseRedirect(reverse('emails:email_trash'))
# def email_draft(request):
# filter_list = Email.objects.filter(status="draft")
# if request.GET.get('from_date', ''):
# from_date = request.GET.get('from_date', '')
# fd = datetime.strptime(from_date, "%Y-%m-%d").date()
# filter_list = filter_list.filter(send_time__gte=fd)
# if request.GET.get('to_date', ''):
# to_date = request.GET.get('to_date', '')
# td = datetime.strptime(to_date, "%Y-%m-%d")
# td = td + timedelta(seconds=(24 * 60 * 60 - 1))
# filter_list = filter_list.filter(send_time__lte=td)
# if request.GET.get('name', ''):
# name = request.GET.get('name', '')
# filter_list = filter_list.filter(to_email__startswith=name)
# return render(request, 'emails/mail_drafts.html',
# {'filter_list': filter_list})
def email_draft(request):
filter_list = Email.objects.filter(status="draft")
if request.GET.get('from_date', ''):
from_date = request.GET.get('from_date', '')
fd = datetime.strptime(from_date, "%Y-%m-%d").date()
filter_list = filter_list.filter(send_time__gte=fd)
if request.GET.get('to_date', ''):
to_date = request.GET.get('to_date', '')
td = datetime.strptime(to_date, "%Y-%m-%d")
td = td + timedelta(seconds=(24 * 60 * 60 - 1))
filter_list = filter_list.filter(send_time__lte=td)
if request.GET.get('name', ''):
name = request.GET.get('name', '')
filter_list = filter_list.filter(to_email__startswith=name)
return render(request, 'emails/mail_drafts.html',
{'filter_list': filter_list})
# def email_draft_delete(request, pk):
# get_object_or_404(Email, id=pk).delete()
# return HttpResponseRedirect(reverse('emails:email_draft'))
def email_draft_delete(request, pk):
get_object_or_404(Email, id=pk).delete()
return HttpResponseRedirect(reverse('emails:email_draft'))
# def email_delete(request, pk):
# get_object_or_404(Email, id=pk).delete()
# return HttpResponseRedirect(reverse('emails:email_sent'))
def email_delete(request, pk):
get_object_or_404(Email, id=pk).delete()
return HttpResponseRedirect(reverse('emails:email_sent'))
# def email_move_to_trash(request, pk):
# trashitem = get_object_or_404(Email, id=pk)
# trashitem.status = "trash"
# trashitem.save()
# return HttpResponseRedirect(request.META['HTTP_REFERER'])
def email_move_to_trash(request, pk):
trashitem = get_object_or_404(Email, id=pk)
trashitem.status = "trash"
trashitem.save()
return HttpResponseRedirect(request.META['HTTP_REFERER'])
# def email_imp(request, pk):
# impitem = get_object_or_404(Email, id=pk)
# impitem.important = True
# impitem.save()
# return HttpResponseRedirect(request.META['HTTP_REFERER'])
def email_imp(request, pk):
impitem = get_object_or_404(Email, id=pk)
impitem.important = True
impitem.save()
return HttpResponseRedirect(request.META['HTTP_REFERER'])
# def email_imp_list(request):
# filter_list = Email.objects.filter(important="True")
# if request.GET.get('from_date', ''):
# from_date = request.GET.get('from_date', '')
# fd = datetime.strptime(from_date, "%Y-%m-%d").date()
# filter_list = filter_list.filter(send_time__gte=fd)
def email_imp_list(request):
filter_list = Email.objects.filter(important="True")
if request.GET.get('from_date', ''):
from_date = request.GET.get('from_date', '')
fd = datetime.strptime(from_date, "%Y-%m-%d").date()
filter_list = filter_list.filter(send_time__gte=fd)
# if request.GET.get('to_date', ''):
# to_date = request.GET.get('to_date', '')
# td = datetime.strptime(to_date, "%Y-%m-%d")
# td = td + timedelta(seconds=(24 * 60 * 60 - 1))
# filter_list = filter_list.filter(send_time__lte=td)
# if request.GET.get('name', ''):
# name = request.GET.get('name', '')
# filter_list = filter_list.filter(to_email__startswith=name)
# return render(request, 'emails/mail_important.html',
# {'filter_list': filter_list})
if request.GET.get('to_date', ''):
to_date = request.GET.get('to_date', '')
td = datetime.strptime(to_date, "%Y-%m-%d")
td = td + timedelta(seconds=(24 * 60 * 60 - 1))
filter_list = filter_list.filter(send_time__lte=td)
if request.GET.get('name', ''):
name = request.GET.get('name', '')
filter_list = filter_list.filter(to_email__startswith=name)
return render(request, 'emails/mail_important.html',
{'filter_list': filter_list})
# def email_sent_edit(request, pk):
# em = get_object_or_404(Email, pk=pk)
# if request.method == 'POST':
# form = EmailForm(request.POST, instance=em)
# if form.is_valid():
# subject = request.POST.get('subject', '')
# message = request.POST.get('message', '')
# from_email = request.POST.get('from_email', '')
# to_email = request.POST.get('to_email', '')
# file = request.FILES.get('files', None)
# status = request.POST.get('email_draft', '')
# email = EmailMessage(subject, message, from_email, [to_email])
# f = form.save()
# if file is not None:
# email.attach(file.name, file.read(), file.content_type)
# f.file = file
# if status:
# f.status = "draft"
# else:
# email.send(fail_silently=False)
# f.status = "sent"
# f.save()
# return HttpResponseRedirect(reverse('emails:list'))
# else:
# return render(request, 'emails/create_mail.html',
# {'form': form, 'em': em})
# else:
# form = EmailForm()
# return render(request, 'emails/create_mail.html',
# {'form': form, 'em': em})
def email_sent_edit(request, pk):
em = get_object_or_404(Email, pk=pk)
if request.method == 'POST':
form = EmailForm(request.POST, instance=em)
if form.is_valid():
subject = request.POST.get('subject', '')
message = request.POST.get('message', '')
from_email = request.POST.get('from_email', '')
to_email = request.POST.get('to_email', '')
file = request.FILES.get('files', None)
status = request.POST.get('email_draft', '')
email = EmailMessage(subject, message, from_email, [to_email])
f = form.save()
if file is not None:
email.attach(file.name, file.read(), file.content_type)
f.file = file
if status:
f.status = "draft"
else:
email.send(fail_silently=False)
f.status = "sent"
f.save()
return HttpResponseRedirect(reverse('emails:list'))
else:
return render(request, 'emails/create_mail.html',
{'form': form, 'em': em})
else:
form = EmailForm()
return render(request, 'emails/create_mail.html',
{'form': form, 'em': em})
# def email_unimp(request, pk):
# unimpitem = get_object_or_404(Email, id=pk)
# unimpitem.important = False
# unimpitem.save()
# return HttpResponseRedirect(request.META['HTTP_REFERER'])
def email_unimp(request, pk):
unimpitem = get_object_or_404(Email, id=pk)
unimpitem.important = False
unimpitem.save()
return HttpResponseRedirect(request.META['HTTP_REFERER'])
# def email_view(request, pk):
# email_view = get_object_or_404(Email, pk=pk)
# x = EmailForm(instance=email_view)
# return render(request, 'emails/create_mail.html', {'x': x})
def email_view(request, pk):
email_view = get_object_or_404(Email, pk=pk)
x = EmailForm(instance=email_view)
return render(request, 'emails/create_mail.html', {'x': x})

View file

@ -18,7 +18,6 @@
<div class="panel panel-default">
<div class="panel-content">
<ul class="mail_options">
<li><a href="#">Inbox</a></li>
<li><a href="{% url 'emails:email_sent' %}">Sent Mails</a></li>
<li><a href="{% url 'emails:email_draft' %}">Drafts</a></li>
<li><a href="{% url 'emails:email_imp_list' %}">Important</a></li>

View file

@ -17,7 +17,6 @@
<div class="panel panel-default">
<div class="panel-content">
<ul class="mail_options">
<li><a href="#">Inbox</a></li>
<li><a href="{% url 'emails:email_sent' %}">Sent Mails</a></li>
<li class="active"><a href="{% url 'emails:email_draft' %}">Drafts</a></li>
<li><a href="{% url 'emails:email_imp_list' %}">Important</a></li>

View file

@ -17,7 +17,6 @@
<div class="panel panel-default">
<div class="panel-content">
<ul class="mail_options">
<li><a href="#">Inbox</a></li>
<li><a href="{% url 'emails:email_sent' %}">Sent Mails</a></li>
<li><a href="{% url 'emails:email_draft' %}">Drafts</a></li>
<li class="active"><a href="{% url 'emails:email_imp_list' %}">Important</a></li>

View file

@ -17,7 +17,6 @@
<div class="panel panel-default">
<div class="panel-content">
<ul class="mail_options">
<li><a href="#">Inbox</a></li>
<li class="active"><a href="{% url 'emails:email_sent' %}">Sent Mails</a></li>
<li><a href="{% url 'emails:email_draft' %}">Drafts</a></li>
<li><a href="{% url 'emails:email_imp_list' %}">Important</a></li>

View file

@ -16,7 +16,6 @@
<div class="panel panel-default">
<div class="panel-content">
<ul class="mail_options">
<li><a href="#">Inbox</a></li>
<li><a href="{% url 'emails:email_sent' %}">Sent Mails</a></li>
<li><a href="{% url 'emails:email_draft' %}">Drafts</a></li>
<li><a href="{% url 'emails:email_imp_list' %}">Important</a></li>