From 9f9d6ca94b8e0befc28990266cf6d89d394e75af Mon Sep 17 00:00:00 2001 From: RujitRaval Date: Wed, 8 Jan 2020 12:55:04 -0500 Subject: [PATCH 1/4] Add condition to check survey type --- bloclink/apps/bis/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bloclink/apps/bis/views.py b/bloclink/apps/bis/views.py index ec583c5..2d69ed9 100644 --- a/bloclink/apps/bis/views.py +++ b/bloclink/apps/bis/views.py @@ -324,9 +324,8 @@ class SubmitQuestionnaire(View): 'address': buildingAddress, 'questions': {}, } - comfortIssue = [] + submitAnswers = SubmittedSurvey.objects.using('bis').filter(user_id=put['userId']).order_by('id') - for submitAnswer in submitAnswers: question = Questions.objects.using('bis').filter(id = model_to_dict(submitAnswer)['question_id'])[0].question answer = Answers.objects.using('bis').filter(id = model_to_dict(submitAnswer)['answer_id'])[0].answer @@ -347,12 +346,14 @@ class SubmitQuestionnaire(View): if os.environ['ENVIRONMENT'] == 'prod': msg = EmailMessage(subject, msg_html, from_email, [settings.PROD_EMAIL]) msg.content_subtype = "html" - msg.attach_file(dest_ppt_file) + if put['surveyId'] in [2,3] : + msg.attach_file(dest_ppt_file) msg.send() else: msg = EmailMessage("TEST - " + subject, msg_html, from_email, [settings.TEST_EMAIL]) msg.content_subtype = "html" - msg.attach_file(dest_ppt_file) + if put['surveyId'] in [2,3] : + msg.attach_file(dest_ppt_file) msg.send() return JsonResponse({ -- GitLab From 3ccab854ffb486be2404fc972eec2480eb034696 Mon Sep 17 00:00:00 2001 From: RujitRaval Date: Wed, 8 Jan 2020 12:57:26 -0500 Subject: [PATCH 2/4] Remove unused imports --- bloclink/apps/bis/views.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/bloclink/apps/bis/views.py b/bloclink/apps/bis/views.py index 2d69ed9..c8589ac 100644 --- a/bloclink/apps/bis/views.py +++ b/bloclink/apps/bis/views.py @@ -1,22 +1,14 @@ import json import os from datetime import datetime -import base64 from django.conf import settings -from django.http import HttpResponse, JsonResponse +from django.http import JsonResponse from django.shortcuts import render from django.views import View from .models import Questions, MapBoxBuilding, Answers, SubmittedSurvey, Users, Surveys, SurveyAreas, RecommendationSetMap, Ecm, Report from django.forms.models import model_to_dict -import smtplib -from django.core.mail import send_mail -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from django.template.loader import get_template -from django.template import Context from django.template.loader import render_to_string from django.core.mail import EmailMessage -from django.db import connections import re import boto3 from bpeng.bis.report import generate_pns_report -- GitLab From 308c40379c971c4c24f8ded38e3372115e66d442 Mon Sep 17 00:00:00 2001 From: RujitRaval Date: Wed, 8 Jan 2020 15:22:16 -0500 Subject: [PATCH 3/4] Remove blank line --- bloclink/apps/bis/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bloclink/apps/bis/views.py b/bloclink/apps/bis/views.py index c8589ac..6362131 100644 --- a/bloclink/apps/bis/views.py +++ b/bloclink/apps/bis/views.py @@ -316,7 +316,6 @@ class SubmitQuestionnaire(View): 'address': buildingAddress, 'questions': {}, } - submitAnswers = SubmittedSurvey.objects.using('bis').filter(user_id=put['userId']).order_by('id') for submitAnswer in submitAnswers: question = Questions.objects.using('bis').filter(id = model_to_dict(submitAnswer)['question_id'])[0].question -- GitLab From 042638079de040e555cc85c0e02aba02f29ed4d7 Mon Sep 17 00:00:00 2001 From: RujitRaval Date: Thu, 9 Jan 2020 10:59:27 -0500 Subject: [PATCH 4/4] Chnage ids to variables --- bloclink/apps/bis/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bloclink/apps/bis/views.py b/bloclink/apps/bis/views.py index 6362131..737dc82 100644 --- a/bloclink/apps/bis/views.py +++ b/bloclink/apps/bis/views.py @@ -333,17 +333,19 @@ class SubmitQuestionnaire(View): 'address': buildingData['address'], 'QA': buildingData['questions']}) + oakland_survey = 2 + milwaukee_survey = 3 subject = 'BIS - ' + buildingData['address'] if os.environ['ENVIRONMENT'] == 'prod': msg = EmailMessage(subject, msg_html, from_email, [settings.PROD_EMAIL]) msg.content_subtype = "html" - if put['surveyId'] in [2,3] : + if put['surveyId'] in [oakland_survey, milwaukee_survey]: msg.attach_file(dest_ppt_file) msg.send() else: msg = EmailMessage("TEST - " + subject, msg_html, from_email, [settings.TEST_EMAIL]) msg.content_subtype = "html" - if put['surveyId'] in [2,3] : + if put['surveyId'] in [oakland_survey, milwaukee_survey]: msg.attach_file(dest_ppt_file) msg.send() -- GitLab