Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated frontend to send reference number when creating report.

Browse source
This commit is contained in:
kououken 2019-03-01 12:53:57 -08:00
parent c94bede4be
commit 4dee825973
6 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
# Edit at https://www.gitignore.io/?templates=linux,macos,python,django,windows,pycharm,intellij,visualstudio # Edit at https://www.gitignore.io/?templates=linux,macos,python,django,windows,pycharm,intellij,visualstudio
### Django ### ### Django ###
*.env
*.log *.log
*.pot *.pot
*.pyc *.pyc

6
back/.env
View file

@ -1,4 +1,4 @@
EMAIL_HOST_USER=accountemail@yourmail.com EMAIL_HOST_USER=reimbursinator@gmail.com
EMAIL_HOST_PASSWORD=accountpasswordhere EMAIL_HOST_PASSWORD=Frank12345
SUBMIT_REPORT_DESTINATION_EMAIL=to-address@yourmail.com SUBMIT_REPORT_DESTINATION_EMAIL=kououken@gmail.com
SUBMIT_REPORT_FROM_EMAIL=from-address@yourmail.com SUBMIT_REPORT_FROM_EMAIL=from-address@yourmail.com

23
back/backend/views.py
View file

@ -121,20 +121,13 @@ def report(request):
"title": "Report Title Here" "title": "Report Title Here"
} }
""" """
# Create the report, with reference number if available # Create the report
if 'reference_number' in request.data: report = Report.objects.create(
report = Report.objects.create( user_id=request.user,
user_id=request.user, title=request.data['title'],
title=request.data['title'], date_created=datetime.date.today(),
date_created=datetime.date.today(), reference_number=request.data['reference']
reference_number=request.data['reference_number'] )
)
else:
report = Report.objects.create(
user_id=request.user,
title=request.data['title'],
date_created=datetime.date.today()
)
report.save() report.save()
# Create the sections # Create the sections
@ -399,7 +392,7 @@ def send_report_to_admin(request, report_pk):
msg_html = render_to_string('backend/email.html', params) msg_html = render_to_string('backend/email.html', params)
msg_plain = render_to_string('backend/email.txt', params) msg_plain = render_to_string('backend/email.txt', params)
message = EmailMultiAlternatives( message = EmailMultiAlternatives(
"Reimbursinator - {}".format(params['title']), "[RT - Request Tracker #{}] {}".format(params['reference_number'], params['title']),
msg_plain, msg_plain,
from_email, from_email,
[to_email], [to_email],

BIN
back/db.sqlite3
View file

Binary file not shown.

2
front/static/js/viewHistory.js
View file

@ -560,7 +560,7 @@ if (newReportForm) {
newReportForm.addEventListener("submit", function(event) { newReportForm.addEventListener("submit", function(event) {
event.preventDefault(); event.preventDefault();
const url = getEndpointDomain() + "api/v1/report"; const url = getEndpointDomain() + "api/v1/report";
const payload = JSON.stringify({ "title": event.target.elements.title.value }); const payload = JSON.stringify({ "title": event.target.elements.title.value, "reference": event.target.elements.reference.value });
console.log("Payload:\n" + payload); console.log("Payload:\n" + payload);
const type = reportType.NEW; const type = reportType.NEW;
makeAjaxRequest("POST", url, createReportForm, type, payload); makeAjaxRequest("POST", url, createReportForm, type, payload);

4
front/static/new_report.html
View file

@ -51,6 +51,10 @@
<label for="title">Report title:</label> <label for="title">Report title:</label>
<input type="text" class="form-control" name="title" id="title" autofocus> <input type="text" class="form-control" name="title" id="title" autofocus>
</div> </div>
<div class="form-group">
<label for="reference">Ticket number (if available):</label>
<input type="text" class="form-control" name="reference" id="reference">
</div>
<button type="submit" class="btn btn-primary" data-toggle="modal" data-target="#newReportModal">Create</button> <button type="submit" class="btn btn-primary" data-toggle="modal" data-target="#newReportModal">Create</button>
</form> </form>
</div> </div>