From 5cf73d441c072e0786a99d3d647c47290a052b34 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Wed, 3 Dec 2014 12:13:13 +0000
Subject: [PATCH] Added event items to the event form.

Need to get this working, thinking probably best to serialize the data and submit it that way so changes are only saved on update
---
 RIGS/forms.py                       |   1 +
 RIGS/templates/RIGS/event_form.html |  13 ++++++++++++-
 RIGS/templates/RIGS/item_row.html   |   4 ++--
 RIGS/templates/RIGS/item_table.html |   4 ++--
 db.sqlite3                          | Bin 25445376 -> 25445376 bytes
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/RIGS/forms.py b/RIGS/forms.py
index 9e883252..e7541421 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -10,6 +10,7 @@ class EventForm(forms.ModelForm):
     meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
     access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
     name = forms.CharField(min_length=3)
+
     class Meta:
         model = models.Event
         fields = ['is_rig', 'name', 'venue', 'start_date', 'start_time', 'end_date',
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 77601dd2..3b7de673 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -294,7 +294,6 @@
                                        value="{{ object.mic.name|default_if_none:"" }}"/>
                             </div>
                         </div>
-                        {#% include 'RIGS/eventitem_table.html' %#}
                     </div>
                     <div class="col-sm-12">
                         <div class="pull-right">
@@ -307,6 +306,18 @@
             </div>
         </div>
     </div>
+    <!-- /.col-md-6 -->
+    <div class="col-sm-12">
+         <div class="panel panel-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
+            <div class="panel-body">
+                <div class="form-group">
+                    <label for="{{ form.notes.id_for_label }}">{{ form.notes.label }}</label>
+                    {% render_field form.notes class+="form-control" %}
+                </div>
+                {% include "RIGS/item_table.html" %}
+            </div>
+         </div>
+    </div>
     </form>
     <div class="modal fade" id="itemModal" role="dialog" aria-labelledby="itemModal" aria-hidded="true">
         <div class="modal-dialog">
diff --git a/RIGS/templates/RIGS/item_row.html b/RIGS/templates/RIGS/item_row.html
index 203fa12c..20613110 100644
--- a/RIGS/templates/RIGS/item_row.html
+++ b/RIGS/templates/RIGS/item_row.html
@@ -1,4 +1,4 @@
-<tr id="item-{{item.pk}}" data-url="{#% url item_row item.pk %#}" data-pk="{{item.pk}}">
+<tr id="item-{{item.pk}}" data-url="{% url 'api_secure' item.pk %}" data-pk="{{item.pk}}">
 	<td>
 		{{ item.name }}
 		{% if item.description %}
@@ -9,7 +9,7 @@
 	<td>£&nbsp;{{item.cost}}</td>
 	<td>{{item.quantity}}</td>
 	<td class="sub-total" data-subtotal="{{item.total_cost}}">£&nbsp;{{item.total_cost}}</td>
-	{% if response.edit %}
+	{% if edit %}
 	<td class="vert-align text-right">
 		<button type="button" class="item-edit btn btn-xs btn-default" 
 				data-pk="{{item.pk}}"
diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/RIGS/item_table.html
index e423f88c..8a849ece 100644
--- a/RIGS/templates/RIGS/item_table.html
+++ b/RIGS/templates/RIGS/item_table.html
@@ -1,12 +1,12 @@
 <div class="panel">
-	<table class="table table-hover" id="item-table">
+	<table class="table table-hover" id="item-table" {% if edit %}data-orderurl="{#% url 'item_order' %#}"{% endif %}>
 		<thead>
 			<tr>
 				<td>Item</td>
 				<td>Price</td>
 				<td>Quantity</td>
 				<td>Sub-total</td>
-				{% if response.edit %}
+				{% if edit %}
 				<td class="text-right">
 					<button type="button" class="btn btn-default btn-xs item-add"
 						data-url="{#% url eventitem_add object.pk %#}" data-toggle="modal"
diff --git a/db.sqlite3 b/db.sqlite3
index 80bdc87f6dc6bd5bbf331b08be4f1983d721c15a..a1cb58ec8481aec90512ef1015b793a1b0868051 100644
GIT binary patch
delta 2266
zcmZYAc~n$Y9Ki8+-;BTj!!C;=g8Q!Ef}kjhBDmtdE1QZd%z%oD<ESN;V`7%C5`3mv
zrj=SLY3Z0*so7>Oty<ZR3zem2S>NC3pU&x>_xav??tSOn|L$|I-5BUbRbzXOrsaid
zTFe$rQzJLFNme=gbF=-GZPRZ5^UAZ@9Z=~GP|#t46%F76U--cWf5^9iup<b;2tg>q
z5RM2mL?ogRjTkgSW5l8f;?NZFNI)|*M+>w>E3`%%v_(6#M+bC7Cv-*^Bq9l2(GA_v
z1Ig%#6r`dTdLs>e&==|GhyKXG01QMX1|bXC7>pqpieVUz5y-(vjKXM)!B~vLcuc@V
zOu}SL!BkAcbmSrr`6xgkX4JX^W>!vVFkaJQvnvCOW?~kKFdK6)7xOS53s77eSX6TR
zVy(5raX=}XaoFKV@h>gQD_dCFEH%E1(J#0((r6Rpj59jlaI`eK`$R>VyHB~4-59jn
z(a!9#*QJ8YkWoWapiyUcMjM66k<qq-;(7CC6qFS^jl}I4kw)QEdx*L4v`d8<?&}U8
zqs%`d+?bSa4>im{r?0u?(qa{1xJ%h-xWFD^xJn&<hS%;4Glz`JQz1sN(-CfDTql=G
z9SO>_W`N`10H-x1&aO^qmUEU}mI_ObrG<W5KcjEc%k(TgR@JK$wV_2(+m)s5-9YnL
zu1iIRca2X>Ozqw?H7TW2w=O9?lan-0W&KzuN>PS|ScJtW#}X{XGE`tWTv!1&R$>)a
z<38MvHK@c|Jb(wW4szCdJcJFX!bUudO?U*4VlxaphR5*)wxAj{*a{Qd@Fcd^){os0
zk!hK%q7C2b9iw%|+^a!O<5+cy)i_(dBh%(*(Ji(M+8$eFLd_05g`IdB&tMmx#cu4u
zb9f#vU@!JzKVHO3co_$95Vd#(hj19L;x!z>QFw6-uj4r0zzMvGx9~Pj;uKEf9h||t
zcn|O61AK_H_z3549v5&CALA2ziqG&lzQ841#+UdCU*ihC!MFGh-{S}Th@Vi0tGI^i
zxPf~7j9>68ZsIrmj$62mJNN^4@hASmJ^Z~cp+;?hM3-13R!IYikHlBvC$UNVB>|E^
ziCq#T36_LNLM366a7l!up(IigC5e{ANE%5ROJXHWByp0al6Xmiq?x3-q=lrVq?M$#
zq>ZGlq@AR_q=TfRq?4qxq>Cg`k|gOW=_cte=^;s$^pvDXQYF14y(MXqK9atYbV)x+
ze@TX9fMlQ~Q!+@BCCQcymJE>$l?;;%myD3)NJdIVNk&V?NXAOWNybYiNG3`qNhV9C
zNTy1rNv2D3C3%v3Nr9wLGD9*`GD}h<nJt+knJbwmnJ-x&DVCH-91^FbR8l5cC|M*~
zth@;|<?2elb(VHTGyPAtR>j8r*yF8r?TWFlDknMOj^&Q8Me$mKwST+Ew!UtOT3@#m
z%hZv&3Kg^1TBgD@GsIJ_4wy&ED^!vSGwT_f`TAOPUGt=QW0q8?x_j2<dWvRts>)LR
zt$L=OVx)WYK3-4xa&<^4k2iDaa&>fxU$J&e<JU9N$Su@M%!-@K)%=FC^4}+R>Z%KV
z-h1r%EVEA1E^vCqG_~2>TH;b^Ru7ky_cGI#?XAIjyk^8#>9M*VZ^oafP>sCl)h=~S
e{r@6Q^K3}p>QZEd#4TAVS*5(`TUV=NJO2T=o=txM

delta 2143
zcmXBVX;f8J7=Yok&$-HsAc_K41sqUuo>5UmM4SKz6bBR>5C;Zl&<moFSZYF)w-PuO
zS&CYjDVf7nv(nUZ%m$OvW=P32u|a#k)mrCy_jlIXd+nb)e`ASzK8gc8Vl^$rThsiu
zYnqx+(y_ma-Jd+lRXLYdxn5J73i92G^4%147_gub8p8?BaDgjiuRA>8i6-!ZH=4o+
z&CndaXn~gSgFgabMJu#M8w4T<!Dx$iXpasEK}U2#XM~~)x}qDpqX&AT7kZ-)`l28D
zV*tW15Q8un;TVFUh`=yJVmP8O0?`<W7>vSbjKNrpLoDJDkMWp*iI{{0OvV%>Vk)L#
zI%XgVGcgOvNWpB(!CcI%&UZ^Kn$ajx)2!o*+|yDqA8A;Cg;<2eNJj=TtKHMG8m^lb
z=R#%bx<^G#wrXRZ=5L9cv0LA_E~(VrUkfoW-CVDH>^r7sTFfafh00+u?y3~i-?dO#
zIpr9@;Hx~0JNn+lQdd7MR10&qpS(KR$INgmRD%r_Ync0({Ml@tW$0}&8njy*qLv(r
zT59pKx~qE4xN7V&Y(~7%PH)i9>pS%2dW>#W_0`^m!!N3$`h=xehUHj+l~{#r<X|<{
zz=mApVJ-5p4(m~XLOg{HD8fcOjc2e4o3RDYVk?SKg6B|*=kWrz!HyU45?;o3l%X6I
zFtG!#;MMB-gvw^o#xxaVcPgu#Xiu*5oMS(CG{D<_qAbi}zg$)s?V=klSG1}d&PGvC
zc_m)MPP~pcunW6Ug+17deRvaZ;ce{4J2-%MaS(@4jrVXE@8bxL;uwy@ffG21Q}_U<
z@gY9K$2fzt_yp&09vAQ_KEp*^!ev~+Rb0d8xQ;LICBDMfxPfnQ6E*l2-{BT+<9qyo
zAMq1@#xM94wWz~yxP!Z>$M3j@KX4xp@FyOk0gvz({>DG}7mx8|Q&73u3W+W;Bo;{{
zNn?qV#987Zah149+$A0oPe~Jrm&9ArRN^CPCTTA5m9&twl=w;fB>@tvq?M$#q>Us{
z5+n(hw3W1zw3l>{gh)C{I!QW9LM2@!T_xQl-6cIFJte&)y(N7leI@-Q{Urk=VUmH8
zL6X6eaLEwKP)USjm?Tm%ToNT2A&HiZl*C9zNk&V?NXAOWNn#~&l6c8@$ppzn$s|dF
zWU^$6BvCR|GEFjFGDDIinJJkiNtUEYW=rNs=1S&CQYG^xX_5t!g_1>*#gcSMh9pyx
zC0Qa_Dp@93E?FU2DOsf)LFL)%_H0Y4R;!t=XF^n_J>7b$v;9DEd>`L?#v|jAlcD&G
zCfXjS|JN<GIciJoYOGPmYHiAIm1UXo*G#X?+3KKqEZe4fsV-(cYp_#zfs>)@n!_*0
zrfMHsg7s+4>{cA3B6U65?7<M>*qoiK4l9-Fh+dtmj^{XMXpc2si6ndSTs_OQ-Op9&
zC6O(TKgd;<HI}Jb4HwyFs%>UPR-OvC*tDvLjvB`Hp%za)LbC@J>sEVUol7gnu(CW=
fr_2jSa#irwxQaYQ)=Kgv>m=)yBd(%A?cezyo1H6K