From 4dee8259730899cc241202c9ceb7684e0b2cddbe Mon Sep 17 00:00:00 2001
From: kououken <kououken@gmail.com>
Date: Fri, 1 Mar 2019 12:53:57 -0800
Subject: [PATCH] Updated frontend to send reference number when creating
 report.

---
 .gitignore                     |   1 +
 back/.env                      |   6 +++---
 back/backend/views.py          |  23 ++++++++---------------
 back/db.sqlite3                | Bin 197632 -> 197632 bytes
 front/static/js/viewHistory.js |   2 +-
 front/static/new_report.html   |   4 ++++
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index d25063b..40497c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # Edit at https://www.gitignore.io/?templates=linux,macos,python,django,windows,pycharm,intellij,visualstudio
 
 ### Django ###
+*.env
 *.log
 *.pot
 *.pyc
diff --git a/back/.env b/back/.env
index b47f7a4..be096b6 100644
--- a/back/.env
+++ b/back/.env
@@ -1,4 +1,4 @@
-EMAIL_HOST_USER=accountemail@yourmail.com
-EMAIL_HOST_PASSWORD=accountpasswordhere
-SUBMIT_REPORT_DESTINATION_EMAIL=to-address@yourmail.com
+EMAIL_HOST_USER=reimbursinator@gmail.com
+EMAIL_HOST_PASSWORD=Frank12345
+SUBMIT_REPORT_DESTINATION_EMAIL=kououken@gmail.com
 SUBMIT_REPORT_FROM_EMAIL=from-address@yourmail.com
diff --git a/back/backend/views.py b/back/backend/views.py
index dc5a866..347ceaa 100644
--- a/back/backend/views.py
+++ b/back/backend/views.py
@@ -121,20 +121,13 @@ def report(request):
         "title": "Report Title Here"
     }
     """
-    # Create the report, with reference number if available
-    if 'reference_number' in request.data:
-        report = Report.objects.create(
-            user_id=request.user,
-            title=request.data['title'],
-            date_created=datetime.date.today(),
-            reference_number=request.data['reference_number']
-        )
-    else:
-        report = Report.objects.create(
-            user_id=request.user,
-            title=request.data['title'],
-            date_created=datetime.date.today()
-        )
+    # Create the report
+    report = Report.objects.create(
+        user_id=request.user,
+        title=request.data['title'],
+        date_created=datetime.date.today(),
+        reference_number=request.data['reference']
+    )
     report.save()
 
     # 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_plain = render_to_string('backend/email.txt', params)
     message = EmailMultiAlternatives(
-        "Reimbursinator - {}".format(params['title']),
+        "[RT - Request Tracker #{}] {}".format(params['reference_number'], params['title']),
         msg_plain,
         from_email,
         [to_email],
diff --git a/back/db.sqlite3 b/back/db.sqlite3
index 458fa7cd351163fc89fc149c64d3a57d404d7294..2ab8b3bdf8a093d809e30b5ce96e0b5073a2cf91 100644
GIT binary patch
delta 2625
zcmcJRe{7S-8OQIQbBLY9i4BAX$Ped-Ndkn}G5JXXP68?IU<9^7&}bdUc{5xR+q`x*
z(oSnkvQwn3C~2x4e}Gz~R<MbxlxRt-vJEteBqZ^I#(rqkrdC?DRZ|($G-=ZQ*uJj=
z2~ae3f9!pI_qluCd!M`ap1bdPa3o`JBx7_V|8y+3m4Etf=kL-|6T<Eg<(Bd0^tX81
z#Gld&hdbzv|Ia;c8~w_}#OP=I<y1k$5~7VU-U03b+ri!7Ua%GPf-PVj*bKTrFIWcd
z0v+H^Fb8Y`ZD1p426uprEr<rj*gwH~@E%wP{uz9^7KM*cr~!Y==0!EQ2yO>w*qrcy
z*TE|AJ<tta0bSrFc1u)(Z?IXh4Ll20fTQ46a0J`}4uYG(Q*1_*gAuR{JkDmiL@5fL
zFl+)lKquJFrbP+37c2(7U=dgc7J@F&0hWOUpaaYYbHF^%2Ihihc2jJ;`kKYW|22_z
z_HUxVB)Emr@PwHd6Sp3}$8G0ICU&0tzVN093&MhSF1CPtGn+?V!sd|Yvs=h>*evqZ
zm?OqA*fjE0?4}h+dVYVxUiOYSx(6|+@OaF8{a3ZVNLcsl1CB!)3b87eyS~EZsc^X+
zuDS-73%@6r$X(^xUS0FREw3<caaY_OU;X9}Gko#AY0PXcju&u?I&qmF&O6;4f7&or
z4j;8x%<cM6Zv4wez4^N@am!TiX+F*~upm4z)yJFg)?XKR#PB|4wAyjHl3T{VcJW7<
zhKYC{qb_70jJwTmf4(#8Bb`l^kMTNg9oi6YGh8`kw%IZjdX<mytCua8^Q`>8+{)F#
z^VF^mo+1v(GS%#*dOo8Lyv}pPep#w^c2O<r7hdPtrc${nQ(b$Waz&+VQ@5j3xH{40
z51sJ&ySsHQ8ns~DH`JI;?Q0WyxIY#QeZv>(@9WZZ1f8B!qxDp2Nre1;8mdm!e1~$<
z5`kcBK%g#^y@86X34b6E?hnOQVW#e=d%vc<tffAT*UT_pQjXhveR?7q^T#x-BR;Ga
zh1ist2=wc^777fc!q%?bgH)20xIZvo6~UON;&Zek+b{-W!Engm>kEc@!s(dq1$E{O
z6=g2BH}=_ib>k<LYe~EqjHIA?N;My$lFWr=m$0=heZzwB4d{WDB*&JzkQ|$sJjPA7
zf^_~A6Ca2pqJ(}!BXofB`7il*_(7OIW9ON&ySVcU&%DDj)8p4Qs+CR^d6CLi&va`M
zzaHz?HD5R8W3wz#2ToFc*0ip{7)lxs$zpZ=7&Y=~Rggy6Vy`Sxw@*@I)^s$WYg#CJ
zJRGBKvQWL!LWQ>J-tf1yXv}ByW2%u3H5wr2+J~AZeTsduKs5)b22L-0$g{<>GGBRH
z$b<U7ukdxkCG*tcOIRV(kB-nUbJgGvs15BP1{*|++^F*FsW$zlzbB^YzL*}2Oh&lL
zRg=kn%=qv5E4)t3i?gCfl+xeneHx%DN@f4R!*|&CSdbYK`rxXR4eI2t$Z1`PQh}^j
z7k*0X%}YTllxplaZM5AFQH89{WaUlLqwMdJ$2!;3-`k7t8;E*kl^XO=gJmudj>i7y
z_>@VvI(UML&2u`UvRk@T=V_|3&l#}_V%-^CP?M}wAMc?$^DU!~TDeUPo}zO5Yy{KL
z9n|`K#=CA=p?)z$Tg|gZqei(^E&h?po|+AYz8MY%G~Y@HO_g$sy8Sdc?6ZO6THpj0
zcQRDu#y4N3qBZx;*qBQpbjxy;^$9uG%{;VN4DsRA$*6O}Z97cXCy3bOCC*J#{5@Vy
z8C~&b4aKRBuYsQ3yTgw@NvhK0&lrui427YCZ})QIlUI0(S*3i$Ph||m_Ztr%QpC6?
zzRxf%E24FHU;ImkrFG;eJY4JJtu%QJo2zyW4kht(F(|$+wun^vgeK?=Jx`hZLw=DD
z@guy9ufjp{0-7yf546kvsCN0~9yO}d!8MOdSGC-&#{NJqb5gkqWNUIgS(b!rt87tz
zor*J-b*o%9t9X?1Gar(zLg`gEg0vy+zG}JUE_L!Sm0DLs%O!UzE`)PMgQ{r1Y*K@B
z)VTI@l2sua)xjtgLoS!3*XJ&hJJiQ6$}=Yg>kIFMw3VHpMt=s6%UcH?YnD7NKmtu(
zS*@-gA&+f7;va}$4QqY=U~hxmuEwrVDW6w&|H9W@G%fP$tCENCIUK^T3h`iCZI4gu
u<ZF~}=Gs)oIXb}0BM8rPNPeWZkYY&3kb+2Iq!*BkKQp~k!{_PSJ^ulm@#l^J

delta 2420
zcmbuAeQZ-z6u{59?`?hU+KnN^hHbBp?1RBl=sp4yaE?I?11hsETOS414{99BI=c}Z
zOuBZ%5QE8<60R}x4-zpzW<+Y%s3Rdn|IwJ}riuEGMA4x*WGH?DdR{jWab+ar_MG4Q
zxaXda`+86J0b}<8V_zP2_2;j~t~b438g%aqxr(q*im%E#it`d<S@V12-acnM)VGFY
zP9o7ajuD&#fZIIy0HMi)vk46z%q7%&a2BD?gE@p19?T|GdC)|#deBHH*^F5Pi;4z<
zSw%e|S4D|nP*Fz^RLlf`Ybs_CuBs>!E~zLG##D?j;yD$O@P(>r7*XMG!iR3SL3qy%
z*9oWHaE&nJhQA1JxZzL2u_pL~aHI)-C%oJUzY*e%@GIe9BU~lyZ-ie6`!>PPgxxN<
zLTGcr1fj(Rm;FS)3w|PaTyTlta>6*l?t~u+k2>KZ;SneNK&W=Y_k?l>Tp%oRz!;&>
z0pAhw9q=t-t^>{!vK{aZLFa(4PaV>Wcqw6cX+ogVWipv+1wdtpD+6-eHjqtXNYo4*
z6qeERrE&vlo4k?qBKa}WMY5f=EN>ufme-S>Ew3YOl<P@n%4<ytEYgVvv}!{b6-MK;
zUp>ye>-gzDY%Y*vb@c|2q$Rzo9;JqGu&2PU-LKle7csf>HH>41LK{`dqr>>DwmV6F
zeHarZ6l^L?p;jB%efxm!sj)3yE>%ZX<mg~QrG%CCPNg-tTL}l-Lg9`ITlqs)TZPrO
zOtICJ>A+g4$4XalC%yB9I~B)&CRLOxw(8|J8~xZ#!`q%wC}+~zM>H?DO-{2wciIK+
z&Av9BeI%9U3<1<ExZet3x&$JVb)F#r+T*kt+)Dyv57Sp5GPTh&25^@>ytgfwz5<bH
zKA1G$z<pJqMwxyKBey>FnJX}T2KSf1!hip3GX!vIP(N6Zk9Qf|=0-EGb)%#yUFmXm
zW%}U^goDA>_9sIfN~k1S%O^fZh3|L<!{*1M4`+iqSCS+!nIv3++SIDpQvRZuEz$d1
zeLI5y>~)?yf@O5xuzkFC1Q%&n4ZL*(t=g4^UpBMC9KUb-_HeMhy}5$=1dj7hM$kg9
z@dMs}0hjZ|qnNAR?&aq$U~#rTuqzx6wgx)2#<P}p-@yDFzu(vTRI}z&Yf1(D$S5|G
z3B1G0FJhkFzo(^5YfOjv<>UCE!5?Vp=+s)%uEQ6xFxz*_Jv~~Zc{gYI+B<w5L2b_b
zluf2jvtdJ9P@H8DU?ue<Scxa;TwKfo8~E6#=ojUfaedPM8D^nL?zP*s<9GD|YI@1j
zZ{uo)@=zO!w*MJ#nl!e=jIJqTORv504&xk)c1{au1)-jOgw{m4WI<z3fqKUoFIe`t
z`I0Dhik4_q6CaFX0xd(w5JeO70)w*vXW6^prMMl;yCu~-OiEAQW^J9~=jTe82%YFh
zlS1A+H`@oN_OVfj)p?RiKdwSlhE8IJl*|~!V#Wg7Qt=DQ)M}y<Gj5$sgeDGa<zjdq
z@I3Qk8M%GS*pnBy<t-jMu|bU0Mdxu^`UNps6}4zVSM%qFv5WG%vxm`=AES7Ni!0ez
zSd#LbQ5rKwizhvbrQT>!Dk*we7cHC$xOC_c%aZVD(m232;=(dYZYzn8guYQ|A=yFl
TG)ai0jiiHQOS1PB*7d|c2{S~X

diff --git a/front/static/js/viewHistory.js b/front/static/js/viewHistory.js
index 99d182e..97b4884 100644
--- a/front/static/js/viewHistory.js
+++ b/front/static/js/viewHistory.js
@@ -560,7 +560,7 @@ if (newReportForm) {
     newReportForm.addEventListener("submit", function(event) {
         event.preventDefault();
         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);
         const type = reportType.NEW;
         makeAjaxRequest("POST", url, createReportForm, type, payload);
diff --git a/front/static/new_report.html b/front/static/new_report.html
index 7caf52b..cda82ca 100644
--- a/front/static/new_report.html
+++ b/front/static/new_report.html
@@ -51,6 +51,10 @@
                                 <label for="title">Report title:</label>
                                 <input type="text" class="form-control" name="title" id="title" autofocus>
                             </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>
                         </form>
                     </div>