Skip to content

Commit

Permalink
Merge 7a58dad into 201e6b5
Browse files Browse the repository at this point in the history
  • Loading branch information
NakitaOza committed Jun 13, 2017
2 parents 201e6b5 + 7a58dad commit 91fd5be
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CONTRIBUTORS
Expand Up @@ -32,3 +32,9 @@ N: Jorge Barata
E: contact@jorgebg.com
W: jorgebg.com
C: Madrid/Spain

N: Nakita Oza
E: ozanakita@gmail.com
W: https://www.linkedin.com/in/nakita-oza-0245719a/
C: Pune/India
*: Contributor
Binary file added db.sqlite-journal
Binary file not shown.
19 changes: 19 additions & 0 deletions jobs/migrations/0007_job_report_clicks.py
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('jobs', '0006_token_unique'),
]

operations = [
migrations.AddField(
model_name='job',
name='report_clicks',
field=models.IntegerField(default=0),
),
]
2 changes: 1 addition & 1 deletion jobs/models.py
Expand Up @@ -24,7 +24,7 @@ class Job(models.Model):
created_at = models.DateTimeField(auto_now_add=True, editable=False)
modified_at = models.DateTimeField(auto_now=True, editable=False)
status = models.BooleanField(default=1)

report_clicks = models.IntegerField(default=0)
cities = (
'Antrim', 'Armagh', 'Carlow', 'Cavan', 'Clare', 'Cork', 'Derry',
'Donegal', 'Down', 'Dublin', 'Fermanagh', 'Galway', 'Kerry',
Expand Down
6 changes: 6 additions & 0 deletions jobs/templates/show.html
Expand Up @@ -59,6 +59,12 @@ <h3 class="bold border title">Apply</h3>
{% if job.phone %}
<span class="bold">Phone:</span> {{ job.phone }}<br />
{% endif %}
<h3 class="bold border title">Trouble?</h3>
<p>
<a class="btn btn-sm btn-warning" href="report">
Report!
</a>
</p>

<div class="clearfix"></div>

Expand Down
7 changes: 6 additions & 1 deletion jobs/tests/test_views.py
Expand Up @@ -18,6 +18,7 @@ def setUp(self):
self.job.description = "Testing"
self.job.email = "test@test.com"
self.job.location = "Testing"
self.job.report_clicks = 4
self.job.save()

def testDown(self):
Expand Down Expand Up @@ -70,7 +71,11 @@ def test_edit_returns_200(self):
def test_edit_template(self):
response = self.client.get(reverse("job-edit", args=[self.job.token]))
self.assertTemplateUsed(response, "edit.html")


def test_report_returns_200(self):
response = self.client.get(reverse("report_click", args=[self.job.pk]))
self.assertEquals(response.status_code, 302)

def test_feed_items_returns_not_empty_list(self):
self.assertNotEqual(len(JobsFeed.items(self)), 0)

Expand Down
2 changes: 2 additions & 0 deletions jobs/urls.py
Expand Up @@ -4,6 +4,7 @@
from django.contrib.sitemaps import GenericSitemap
from jobs.views import IndexView, ShowView, NewView, EditView, JobsFeed
from .models import Job
from . import views

info_job = {
'queryset': Job.get_actives(),
Expand All @@ -24,4 +25,5 @@
sitemap,
{'sitemaps': {'jobs': GenericSitemap(info_job, priority=0.6)}},
name='django.contrib.sitemaps.views.sitemap'),
url(r'^jobs/(?P<pk>[0-9]+)/report$', views.report, name='report_click'),
]
25 changes: 25 additions & 0 deletions jobs/views.py
Expand Up @@ -3,6 +3,8 @@
from django.core.urlresolvers import reverse
from django.shortcuts import get_object_or_404
from jobs.models import Job
from django.shortcuts import redirect
from django.core.mail import send_mail


class IndexView(generic.ListView):
Expand Down Expand Up @@ -80,3 +82,26 @@ def item_pubdate(self, job):

def item_link(self, job):
return reverse('job-show', args=[job.pk])



def report(self,pk, **kwargs):
job= Job.objects.get(id=pk)
job.report_clicks = job.report_clicks + 1
job.save()
if job.report_clicks == 5:
mail_subject = "Job for the position of {} was reported 5 times!!".format(job.position)
mail_content = """
Hello!
The job posted for the position of {}, Location : {} , has ben reported 5 times till now.
Please take appropriate action.
Thanks,
Python Jobs Ireland
""".format(job.position,job.location)
mail_sender = 'job-reports@pythonjobs.com'
send_mail(mail_subject, mail_content, mail_sender, [job.email])
return redirect('job-home')
6 changes: 3 additions & 3 deletions pythonjobs/settings.py
Expand Up @@ -110,9 +110,9 @@

# Mails

EMAIL_HOST = os.environ.get('EMAIL_HOST')
EMAIL_HOST_USER = os.environ.get('EMAIL_USER')
EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_PASSWORD')
EMAIL_HOST = 'smtp.sendgrid.net'
EMAIL_HOST_USER = 'NakitaO'
EMAIL_HOST_PASSWORD = 'nakitao123!'
EMAIL_PORT = 587
EMAIL_USE_TLS = True

Expand Down
14 changes: 12 additions & 2 deletions pythonjobs/static/css/base.css
Expand Up @@ -69,7 +69,18 @@ body {
font-weight: 600;
background-color: #3770a0;
}
.btn.btn-primary:hover {
.btn.btn-primary:hover {
box-shadow: 0 -3px rgba(0, 0, 0, 0.25) inset;
}
.jumbotron .btn-warning {
margin-top: 30px;
font-size: 24px;
}
.btn.btn-warning, .btn.btn-warning:hover {
padding: 11px 55px;
font-weight: 600;
}
.btn.btn-warning:hover {
box-shadow: 0 -3px rgba(0, 0, 0, 0.25) inset;
}
.btn-group-sm > .btn, .btn-sm {
Expand All @@ -78,7 +89,6 @@ body {




/* Index Page */
.job {
color: #000;
Expand Down

0 comments on commit 91fd5be

Please sign in to comment.