diff --git a/blood/blog/__pycache__/views.cpython-36.pyc b/blood/blog/__pycache__/views.cpython-36.pyc index 85b548d..0971e12 100644 Binary files a/blood/blog/__pycache__/views.cpython-36.pyc and b/blood/blog/__pycache__/views.cpython-36.pyc differ diff --git a/blood/blog/static/blog/donors-script.js b/blood/blog/static/blog/donors-script.js index bef0c93..1e1b8fe 100644 --- a/blood/blog/static/blog/donors-script.js +++ b/blood/blog/static/blog/donors-script.js @@ -4,7 +4,8 @@ var criterion_map = { "Blood Group": 2, "Mobile number": 3, "Eligible by(days)": 4, - "Everything": 5 + "event": 5, + "Everything": 6, }; var column_names=[ @@ -13,7 +14,8 @@ var column_names=[ "Blood Group", "Mobile number", "Eligible by(days)", - "Everything" + "event", + "Everything", ]; function editTable(){ @@ -81,8 +83,16 @@ function showForm(button){ } -function changeFilter(index) { - document.getElementById("criterion").innerHTML = column_names[index]; +function changeFilter(index, eventId) { + if(index != -1){ + document.getElementById("criterion").innerHTML = column_names[index]; + } + if(eventId!=-1){ + document.getElementById("eventId").innerHTML = eventId; + } + if(index == -1){ + myFunction(); + } } function myFunction() { @@ -92,6 +102,7 @@ function myFunction() { var table = document.getElementById("myTable"); var tr = table.getElementsByTagName("tr"); var criterion = document.getElementById("criterion").innerHTML; + var eventId = document.getElementById("eventId"); // Loop through all table rows, and hide those who don't match the search query for (var i = 1; i < tr.length; i++) { @@ -100,7 +111,7 @@ function myFunction() { var j = criterion_map[criterion]; if(criterion ==="Everything"){ //enable display if atleast one of the fields match the query - for(var j =0; j-1) tr[i].style.display = ""; @@ -117,9 +128,13 @@ function myFunction() { if(td[j].innerHTML.toUpperCase().indexOf(filter)>-1) tr[i].style.display = ""; } - if(filter=="") + + if(td[td.length-1].innerHTML != eventId.innerHTML){ + tr[i].style.display = "none"; + } + if(filter=="" && eventId.innerHTML==0 ) tr[i].style.display = ""; } - //after the fiter call form, but tell it not to change the state of the + editTable(); } \ No newline at end of file diff --git a/blood/blog/static/blog/index.css b/blood/blog/static/blog/index.css index 2294365..69f590d 100644 --- a/blood/blog/static/blog/index.css +++ b/blood/blog/static/blog/index.css @@ -229,3 +229,6 @@ nav{ padding: 10px; } +#eventFilter{ + border-radius: 0 .25rem .25rem 0; +} \ No newline at end of file diff --git a/blood/blog/templates/blog/donors.html b/blood/blog/templates/blog/donors.html index e4cf4e4..2ecdf94 100644 --- a/blood/blog/templates/blog/donors.html +++ b/blood/blog/templates/blog/donors.html @@ -32,26 +32,45 @@

This page is for admin only

-
+
Name
-
+
Email
-
+
Blood Group
-
+
Mobile number
-
+
Eligible by(days)
-
+
Everything
-
+
+ + +
+
+ Clear event filter +
+ + {% for post in posts %} +
+ {{post.title}} +
+ {% endfor %} +
+
+
+ @@ -60,6 +79,7 @@

This page is for admin only

+ {% for donor in people %} @@ -68,6 +88,7 @@

This page is for admin only

+ {% endfor %} diff --git a/blood/blog/templates/blog/home.html b/blood/blog/templates/blog/home.html index feb5483..f988953 100644 --- a/blood/blog/templates/blog/home.html +++ b/blood/blog/templates/blog/home.html @@ -45,31 +45,36 @@ }
- {% if isEle %} + {% if user.is_authenticated and not isEle and not user.is_staff %} {% endif %} + {% if user.is_staff %} + + {% endif %}

Upcoming Camps


{% for post in posts %}
- {{ post.author }} - {{ post.date_posted }} + Date and time: + {{ post.event_date }}

{{ post.title }}

Venue: {{ post.venue }}

-
+ {% csrf_token %} - {% if isELe %} + {% if isEle %}
diff --git a/blood/blog/views.py b/blood/blog/views.py index 89b83f9..446b4b8 100644 --- a/blood/blog/views.py +++ b/blood/blog/views.py @@ -11,6 +11,9 @@ from datetime import * from django.core.mail import send_mail from django.conf import settings +def cleanUser(user): + if user.profile.current_event_id>0 and Eli(user)>0: + user.profile.current_event_id = 0 def home(request): if request.user.is_authenticated: @@ -23,8 +26,10 @@ def home(request): post = Post.objects.get(id = form.instance.event) temp = post.event_date.date() request.user.profile.last_donated = temp + request.user.profile.current_event_id = form.instance.event request.user.profile.save() form.save() + return redirect('blog-home') else: # we come here first and..... form = EnrollForm() @@ -37,7 +42,7 @@ def home(request): 'form': form, 'isEle': isEle>=112, 'daysLeft': 112-isEle - } + } return render(request, 'blog/home.html', context) else: context = { @@ -70,6 +75,9 @@ def Eli(x): return (datetime.now().date() - x.profile.last_donated).days def donors(request): + users = User.objects.all() + for user in users: + cleanUser(user) form = EmergencyEmailForm() if request.method == 'POST': form = EmergencyEmailForm(request.POST) @@ -87,10 +95,12 @@ def donors(request): success_mssg = "" people = User.objects.all() people = list(map(lambda x:[x,Eli(x)], people)) + posts = Post.objects.all().order_by("-event_date")[:3] context = { 'people' : people, 'form' : form, - 'message' : success_mssg + 'message' : success_mssg, + 'posts' : posts, } return render(request, 'blog/donors.html', context) diff --git a/blood/blood/__pycache__/settings.cpython-36.pyc b/blood/blood/__pycache__/settings.cpython-36.pyc index c1c96b3..d869417 100644 Binary files a/blood/blood/__pycache__/settings.cpython-36.pyc and b/blood/blood/__pycache__/settings.cpython-36.pyc differ diff --git a/blood/blood/__pycache__/urls.cpython-36.pyc b/blood/blood/__pycache__/urls.cpython-36.pyc index 4bcb452..5f64dfc 100644 Binary files a/blood/blood/__pycache__/urls.cpython-36.pyc and b/blood/blood/__pycache__/urls.cpython-36.pyc differ diff --git a/blood/blood/settings.py b/blood/blood/settings.py index 1673eb9..852638c 100644 --- a/blood/blood/settings.py +++ b/blood/blood/settings.py @@ -138,6 +138,6 @@ EMAIL_HOST = 'smtp.gmail.com' EMAIL_PORT = 587 EMAIL_USE_TLS = True -EMAIL_HOST_SSL = True +EMAIL_HOST_SSL = False EMAIL_HOST_USER = 'casualdeepak@gmail.com' EMAIL_HOST_PASSWORD = 'tczwijngqqeasnwp' \ No newline at end of file diff --git a/blood/blood/urls.py b/blood/blood/urls.py index af51938..f0230d0 100644 --- a/blood/blood/urls.py +++ b/blood/blood/urls.py @@ -12,7 +12,7 @@ #Including another URLconf # 1. Import the include() function: from django.urls import include, path # 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) - +from django.conf.urls import url from django.contrib import admin from django.urls import path, include from users import views as user_views @@ -20,7 +20,6 @@ urlpatterns = [ path('admin/', admin.site.urls), - path('register/', user_views.register, name='register'), path('login/', auth_views.LoginView.as_view(template_name = 'users/login.html'), name='login'), path('logout/', auth_views.LogoutView.as_view(template_name = 'users/logout.html'), name='logout'), path('profile/', user_views.profile, name='profile'), @@ -29,6 +28,8 @@ path('password-reset/done', auth_views.PasswordResetDoneView.as_view(template_name = 'users/password_reset_done.html'), name='password_reset_done'), path('password-reset-confirm///', auth_views.PasswordResetConfirmView.as_view(template_name = 'users/password_reset_confirm.html'), name='password_reset_confirm'), path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name = 'users/password_reset_complete.html'), name='password_reset_complete'), - - + url(r'^activate/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + user_views.activate, name='activate'), + path('register/', user_views.register, name='register'), + ] diff --git a/blood/db.sqlite3 b/blood/db.sqlite3 index 0ac4cde..67b0f39 100644 Binary files a/blood/db.sqlite3 and b/blood/db.sqlite3 differ diff --git a/blood/users/__pycache__/models.cpython-36.pyc b/blood/users/__pycache__/models.cpython-36.pyc index 969a5ec..3e0444a 100644 Binary files a/blood/users/__pycache__/models.cpython-36.pyc and b/blood/users/__pycache__/models.cpython-36.pyc differ diff --git a/blood/users/__pycache__/tokens.cpython-36.pyc b/blood/users/__pycache__/tokens.cpython-36.pyc new file mode 100644 index 0000000..ddb01b4 Binary files /dev/null and b/blood/users/__pycache__/tokens.cpython-36.pyc differ diff --git a/blood/users/__pycache__/views.cpython-36.pyc b/blood/users/__pycache__/views.cpython-36.pyc index 511d331..9afd17b 100644 Binary files a/blood/users/__pycache__/views.cpython-36.pyc and b/blood/users/__pycache__/views.cpython-36.pyc differ diff --git a/blood/users/migrations/0002_profile_current_event_id.py b/blood/users/migrations/0002_profile_current_event_id.py new file mode 100644 index 0000000..3ae85c2 --- /dev/null +++ b/blood/users/migrations/0002_profile_current_event_id.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.2 on 2018-11-27 19:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='profile', + name='current_event_id', + field=models.IntegerField(default=0), + ), + ] diff --git a/blood/users/migrations/__pycache__/0002_profile_current_event_id.cpython-36.pyc b/blood/users/migrations/__pycache__/0002_profile_current_event_id.cpython-36.pyc new file mode 100644 index 0000000..2d32e0e Binary files /dev/null and b/blood/users/migrations/__pycache__/0002_profile_current_event_id.cpython-36.pyc differ diff --git a/blood/users/models.py b/blood/users/models.py index 9eacfee..687ae5e 100644 --- a/blood/users/models.py +++ b/blood/users/models.py @@ -27,6 +27,7 @@ class Profile(models.Model): date_of_birth = models.DateField(default = timezone.now) gender = models.CharField(max_length = 10, default = Male, choices = gender_choice) is_registered = models.BooleanField(default = False) + current_event_id = models.IntegerField(default = 0) def __str__(self): diff --git a/blood/users/templates/users/acc_active_email.html b/blood/users/templates/users/acc_active_email.html new file mode 100644 index 0000000..fa5f16d --- /dev/null +++ b/blood/users/templates/users/acc_active_email.html @@ -0,0 +1,5 @@ +{% autoescape off %} +Hi {{ user.username }}, +Please click on the link to confirm your registration, +http://{{ domain }}{% url 'activate' uidb64=uid token=token %} +{% endautoescape %} \ No newline at end of file diff --git a/blood/users/templates/users/profile.html b/blood/users/templates/users/profile.html index 7654c4e..7bf46ce 100644 --- a/blood/users/templates/users/profile.html +++ b/blood/users/templates/users/profile.html @@ -13,9 +13,6 @@ align-items: center; } - #profile-info { - margin-right: 100px; - } #profile-info th{ font-size: 1.1em; @@ -34,6 +31,11 @@ align-items: baseline; } + #profile-info { + width: 400px; + margin-right: 100px; + } + #register-mid{ padding-top: 0; max-width: 700px; diff --git a/blood/users/tokens.py b/blood/users/tokens.py index 463633e..06aee6a 100644 --- a/blood/users/tokens.py +++ b/blood/users/tokens.py @@ -1 +1,9 @@ -from django.auth.contrib.tokens import \ No newline at end of file +from django.contrib.auth.tokens import PasswordResetTokenGenerator +from django.utils import six +class TokenGenerator(PasswordResetTokenGenerator): + def _make_hash_value(self, user, timestamp): + return ( + six.text_type(user.pk) + six.text_type(timestamp) + + six.text_type(user.is_active) + ) +account_activation_token = TokenGenerator() \ No newline at end of file diff --git a/blood/users/views.py b/blood/users/views.py index 341ab2f..2babcf4 100644 --- a/blood/users/views.py +++ b/blood/users/views.py @@ -1,3 +1,4 @@ +from django.http import HttpResponse from django.shortcuts import render, redirect from django import forms from django.contrib.auth.models import User @@ -11,9 +12,18 @@ # these were added for email-verification from django.core.mail import send_mail from django.conf import settings +from django.contrib.sites.shortcuts import get_current_site +from django.utils.encoding import force_bytes, force_text +from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode +from django.template.loader import render_to_string +from .tokens import account_activation_token +from django.core.mail import EmailMessage + # Create your views here. def register(request): + if request.user.is_authenticated: + return redirect('blog-home') emailFlag = False count = 0 tempUser = '' @@ -25,27 +35,22 @@ def register(request): if count > 0: emailFlag = True else: - form.save() + user = form.save(commit=False) + user.is_active = False + user.save() + current_site = get_current_site(request) username = form.cleaned_data.get('username') - + print("before sending") #this is for sending email - sentences=[ - "Dear ", str(username), - ",\n\tWelcome to IIT Dharwad's Blood Donation Portal. ", - "We really appreciate your initiative to donate blood. ", - "We look forward to see you take part in our blood donation camps." - "\n\nYours faithfully", - "\nIITDh BDP Team\n" - ] - subject = "Thank you for signing up at the Blood Donation Portal" - ddklal = ft.reduce(lambda x,y: x+y, sentences) - from_email = settings.EMAIL_HOST_USER - to_list = [form.cleaned_data.get('email')] - send_mail(subject, ddklal, from_email, to_list, fail_silently=False) - #email is sent - - messages.success(request, f'Account created for {username}!') - return redirect('login') + mail_subject = "Activate your BDP account" + uid = urlsafe_base64_encode(force_bytes(user.pk)).decode() + token = account_activation_token.make_token(user) + message = render_to_string('users/acc_active_email.html', {'user': user,'domain': current_site.domain,'uid':uid,'token': token, }) + to_email = form.cleaned_data.get('email') + email = EmailMessage(mail_subject, message, to=[to_email]) + email.send() + print("after sending") + return HttpResponse('Please confirm your email address to complete the registration') form = UserRegisterForm() context = { 'count': count, @@ -54,6 +59,22 @@ def register(request): } return render(request, 'users/register.html',context) + +def activate(request, uidb64, token): + try: + uid = force_text(urlsafe_base64_decode(uidb64)) + user = User.objects.get(pk=uid) + except(TypeError, ValueError, OverflowError, User.DoesNotExist): + user = None + if user is not None and account_activation_token.check_token(user, token): + user.is_active = True + user.save() + # return redirect('home') + return HttpResponse('Thank you for your email confirmation. Now you can login your account.') + else: + return HttpResponse('Activation link is invalid!') + + @login_required def profile(request): if request.method == 'POST':
Blood Group Mobile number Last donated (Days ago)Current Event
{{ donor.0.profile.blood_group }} {{ donor.0.profile.mobile_number}} {{ donor.1 }}{{ donor.0.profile.current_event_id }}