From 18bbdad468ff9c64c1de79c28c4219aca2f854a4 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 28 Feb 2020 12:16:51 +0530 Subject: removed deprectetd package --- arduino_blog/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arduino_blog') diff --git a/arduino_blog/views.py b/arduino_blog/views.py index b2dc9f4..e1081fe 100644 --- a/arduino_blog/views.py +++ b/arduino_blog/views.py @@ -1,5 +1,5 @@ from django.http import HttpResponse -from django.shortcuts import render_to_response, render, redirect, get_object_or_404 +from django.shortcuts import render, redirect, get_object_or_404 from django.template import loader from django.template import RequestContext from django.contrib.auth.forms import UserCreationForm -- cgit From 6f19057de04c6b13878c668692054240b0c9fb12 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 28 Feb 2020 12:18:57 +0530 Subject: fixed button issue --- arduino_blog/templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arduino_blog') diff --git a/arduino_blog/templates/login.html b/arduino_blog/templates/login.html index 7c9bfc2..052fd99 100644 --- a/arduino_blog/templates/login.html +++ b/arduino_blog/templates/login.html @@ -26,7 +26,7 @@
{% csrf_token %} {{ form.as_p }} - +

Create an Account -- cgit From 79f1b9f4c7a4a988c6582488d1f33c06061bd114 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 1 Mar 2020 23:15:05 +0530 Subject: added mail funtion ad decorator --- arduino_blog/decorators.py | 45 ++++++++++++++++++++++++++++++++++++++++++++- arduino_blog/views.py | 26 ++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 3 deletions(-) (limited to 'arduino_blog') diff --git a/arduino_blog/decorators.py b/arduino_blog/decorators.py index ddb888c..2644256 100644 --- a/arduino_blog/decorators.py +++ b/arduino_blog/decorators.py @@ -1,5 +1,7 @@ from django.shortcuts import render, redirect from django.conf import settings +from arduino_blog.models import Proposal +from django.db.models import Q def email_verified(func): """ @@ -21,6 +23,47 @@ def email_verified(func): request, 'activation-status.html', context ) return func(request, *args, **kwargs) - except: + except Exception as e: + print (e) return redirect('/') return is_email_verified + + +def is_proposal_submitted(func): + def is_submitted(request, *args, **kwargs): + user = request.user + context = {} + try: + if user.is_authenticated: + if not user.profile.is_email_verified: + context['success'] = False + context['msg'] = "Your account is not verified. \ + Please verify your account" + return render( + request, 'activation-status.html', context + ) + else: + _q = Proposal.objects + _q = _q.filter(Q(user_id=user.id)&Q(proposal_status='0')) + _q = _q.values('proposal_status') + _q = _q.order_by('proposal_status'); + is_sub = _q.all()[:1] + if is_sub == 0: + context['success'] = True + context['msg'] = "You have alredy submited a \ + proposal" + return render( + request, 'dashboard.html', context + ) + else: + context['success'] = False + context['msg'] = "You can submit a new \ + proposal" + return render( + request, 'dashboard.html', context + ) + return func(request, *args, **kwargs) + except Exception as e: + print (e) + return redirect('/') + return is_submitted diff --git a/arduino_blog/views.py b/arduino_blog/views.py index e1081fe..6cad284 100644 --- a/arduino_blog/views.py +++ b/arduino_blog/views.py @@ -16,8 +16,9 @@ from .send_emails import (send_user_mail, generate_activation_key) from django.utils import timezone from arduino_projects_website.settings import URL_ROOT -from .decorators import email_verified - +from .decorators import email_verified, is_proposal_submitted +from django.core.mail import EmailMultiAlternatives +import datetime def my_redirect(url): """An overridden redirect to deal with URL_ROOT-ing. See settings.py @@ -183,6 +184,7 @@ def new_activation(request, email=None): @csrf_protect @login_required @email_verified +@is_proposal_submitted def submitabstract(request): context = {} if request.user.is_authenticated: @@ -197,11 +199,17 @@ def submitabstract(request): data.name_of_author = social_user.first_name + ' ' + social_user.last_name data.email = social_user.email data.attachment = request.FILES + data.proposal_status = 0 + data.approval_date = datetime.date.today() data.save() context['proposal_submit'] = True + context['display_message'] = """Thank you for your submission! """ #mail function + #message = render_to_string('email/propodal_received.html', context) + #send_email(sender_email, to, subject, message, bcc_email) return render_to_response('index.html', context) else: + print(form.errors) context['proposal_form'] = form #context['proposals_a'] = proposals_a template = loader.get_template('submit-cfp.html') @@ -212,3 +220,17 @@ def submitabstract(request): else: context['login_required'] = True return render_to_response('login.html', context) + + +def send_email(sender_email, to, subject, message, bcc_email=None): + email = EmailMultiAlternatives( + subject, '', + sender_email, to, + bcc=[bcc_email], + headers={"Content-type": "text/html;charset=iso-8859-1"} + ) + email.attach_alternative(message, "text/html") + email.content_subtype = 'html' # Main content is text/html + email.mixed_subtype = 'related' + email.send(fail_silently=True) + -- cgit From f4592b80146098ca9380c98d66e4102dae978a35 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 1 Mar 2020 23:16:39 +0530 Subject: added default date in form --- arduino_blog/forms.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'arduino_blog') diff --git a/arduino_blog/forms.py b/arduino_blog/forms.py index ee8b6b1..35a64a2 100644 --- a/arduino_blog/forms.py +++ b/arduino_blog/forms.py @@ -2,6 +2,10 @@ from django import forms from django.forms import ModelForm, widgets +import datetime +from dateutil.relativedelta import relativedelta + + from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.models import User from django.core.validators import MinLengthValidator, MinValueValidator, \ @@ -23,6 +27,7 @@ from arduino_blog.models import ( ) from .send_emails import (send_user_mail, generate_activation_key) +from arduino_blog.views import * UNAME_CHARS = letters + "._" + digits PWD_CHARS = letters + punctuation + digits @@ -245,13 +250,28 @@ class AbstractProposalForm(forms.ModelForm): error_messages={ 'required': 'Abstract field required.'}, ) + + completion_date = forms.DateTimeField( + input_formats=['%YY-%mm-%dd'], + widget=forms.DateTimeInput(attrs={ + 'class': 'form-control datetimepicker-input', + 'data-target': '#datetimepicker1' + }) + ) + terms_and_conditions = forms.BooleanField(widget=forms.CheckboxInput(), required=True, label='I agree to the terms and conditions') class Meta: model = Proposal - exclude = ('user','name_of_author', 'email', 'status', 'rate') + exclude = ('user','name_of_author', 'email', 'status', 'rate','proposal_status', 'approval_date') + + def __init__(self, *args, **kwargs): + super(AbstractProposalForm, self).__init__(*args, **kwargs) + self.fields['completion_date'].disabled = True + self.fields['completion_date'].initial = (datetime.date.today() + relativedelta(months=1)).strftime("%Y-%m-%d") + def clean_attachment(self): import os cleaned_data = self.cleaned_data -- cgit From df264aadde958473d500b1ad55418ce6ac8fea24 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 1 Mar 2020 23:18:24 +0530 Subject: added dashboard file --- arduino_blog/templates/dashboard.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 arduino_blog/templates/dashboard.html (limited to 'arduino_blog') diff --git a/arduino_blog/templates/dashboard.html b/arduino_blog/templates/dashboard.html new file mode 100644 index 0000000..a4528a8 --- /dev/null +++ b/arduino_blog/templates/dashboard.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block css%} + +{% endblock %} +{% block content %} +{% if success %} +
+ + +
+{% else %} + {% if msg %} +
+ + {% endif %} +{% endif %} +
+{% endblock content %} -- cgit From b45dbd8d445b3e951e586c186c90a9b40597050d Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 1 Mar 2020 23:18:53 +0530 Subject: added new migrations --- arduino_blog/migrations/0002_auto_20200228_0903.py | 33 ++++++++++++++++++++++ arduino_blog/migrations/0003_auto_20200228_1102.py | 33 ++++++++++++++++++++++ arduino_blog/migrations/0004_auto_20200228_1219.py | 27 ++++++++++++++++++ arduino_blog/migrations/0005_auto_20200228_1241.py | 23 +++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 arduino_blog/migrations/0002_auto_20200228_0903.py create mode 100644 arduino_blog/migrations/0003_auto_20200228_1102.py create mode 100644 arduino_blog/migrations/0004_auto_20200228_1219.py create mode 100644 arduino_blog/migrations/0005_auto_20200228_1241.py (limited to 'arduino_blog') diff --git a/arduino_blog/migrations/0002_auto_20200228_0903.py b/arduino_blog/migrations/0002_auto_20200228_0903.py new file mode 100644 index 0000000..e82c871 --- /dev/null +++ b/arduino_blog/migrations/0002_auto_20200228_0903.py @@ -0,0 +1,33 @@ +# Generated by Django 3.0.3 on 2020-02-28 09:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('arduino_blog', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='proposal', + name='approval_date', + field=models.IntegerField(default=0, max_length=100), + ), + migrations.AddField( + model_name='proposal', + name='completion_date', + field=models.IntegerField(default=0, max_length=100), + ), + migrations.AddField( + model_name='proposal', + name='creation_date', + field=models.IntegerField(default=0, max_length=100), + ), + migrations.AddField( + model_name='proposal', + name='proposal_status', + field=models.IntegerField(default=0, max_length=2), + ), + ] diff --git a/arduino_blog/migrations/0003_auto_20200228_1102.py b/arduino_blog/migrations/0003_auto_20200228_1102.py new file mode 100644 index 0000000..d2c5ae8 --- /dev/null +++ b/arduino_blog/migrations/0003_auto_20200228_1102.py @@ -0,0 +1,33 @@ +# Generated by Django 3.0.3 on 2020-02-28 11:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('arduino_blog', '0002_auto_20200228_0903'), + ] + + operations = [ + migrations.AlterField( + model_name='proposal', + name='approval_date', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.AlterField( + model_name='proposal', + name='completion_date', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.AlterField( + model_name='proposal', + name='creation_date', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.AlterField( + model_name='proposal', + name='proposal_status', + field=models.IntegerField(default=0), + ), + ] diff --git a/arduino_blog/migrations/0004_auto_20200228_1219.py b/arduino_blog/migrations/0004_auto_20200228_1219.py new file mode 100644 index 0000000..a583a84 --- /dev/null +++ b/arduino_blog/migrations/0004_auto_20200228_1219.py @@ -0,0 +1,27 @@ +# Generated by Django 3.0.3 on 2020-02-28 12:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('arduino_blog', '0003_auto_20200228_1102'), + ] + + operations = [ + migrations.RemoveField( + model_name='proposal', + name='creation_date', + ), + migrations.AlterField( + model_name='proposal', + name='approval_date', + field=models.DateTimeField(), + ), + migrations.AlterField( + model_name='proposal', + name='completion_date', + field=models.DateTimeField(), + ), + ] diff --git a/arduino_blog/migrations/0005_auto_20200228_1241.py b/arduino_blog/migrations/0005_auto_20200228_1241.py new file mode 100644 index 0000000..ccea2fa --- /dev/null +++ b/arduino_blog/migrations/0005_auto_20200228_1241.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.3 on 2020-02-28 12:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('arduino_blog', '0004_auto_20200228_1219'), + ] + + operations = [ + migrations.AlterField( + model_name='proposal', + name='approval_date', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='proposal', + name='completion_date', + field=models.DateTimeField(blank=True, null=True), + ), + ] -- cgit From 398f19633ff99333bd76321dfccdd12c0fd6dbb0 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Sun, 1 Mar 2020 23:19:25 +0530 Subject: added new models --- arduino_blog/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arduino_blog') diff --git a/arduino_blog/models.py b/arduino_blog/models.py index 4d2f36d..b8c60c8 100644 --- a/arduino_blog/models.py +++ b/arduino_blog/models.py @@ -119,5 +119,8 @@ class Proposal(BaseClass): abstract = models.TextField(max_length=700) attachment = models.FileField(upload_to=get_document_dir) status = models.CharField(max_length=100, default='Pending', editable=True) + completion_date = models.DateTimeField(null=True, blank=True) + approval_date = models.DateTimeField(null=True, blank=True) + proposal_status = models.IntegerField(default=0, editable=True) #tags = models.CharField(max_length=250) - terms_and_conditions = models.BooleanField(default= 'True') \ No newline at end of file + terms_and_conditions = models.BooleanField(default= 'True') -- cgit From ad1a740a6b70ff349b1cb1eb006d4eb8ae5c69d7 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Mon, 2 Mar 2020 11:10:53 +0530 Subject: fixed issues --- arduino_blog/decorators.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'arduino_blog') diff --git a/arduino_blog/decorators.py b/arduino_blog/decorators.py index 2644256..6c185d5 100644 --- a/arduino_blog/decorators.py +++ b/arduino_blog/decorators.py @@ -44,14 +44,12 @@ def is_proposal_submitted(func): ) else: _q = Proposal.objects - _q = _q.filter(Q(user_id=user.id)&Q(proposal_status='0')) - _q = _q.values('proposal_status') - _q = _q.order_by('proposal_status'); - is_sub = _q.all()[:1] - if is_sub == 0: + is_sub = _q.get(Q(user_id=user.id)&Q(proposal_status='0')) + if is_sub.proposal_status == 0: context['success'] = True context['msg'] = "You have alredy submited a \ - proposal" + proposal. Your proposal is under \ + review" return render( request, 'dashboard.html', context ) -- cgit