Merge pull request #355 from xzzy/master

Vessel Size Field added to Edit Mooring Frontend
dbca-wa · Jul 24, 2018 · b208c54 · b208c54
2 parents 65bda00 + fcb3129
commit b208c54
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/mooring/api.py b/mooring/api.py
@@ -1372,8 +1372,8 @@ def list(self, request, *args, **kwargs):
         if data is None:
             queryset = self.get_queryset()
             serializer = self.get_serializer(queryset, many=True)
-            print "SERIAL"
-            print serializer
+            #print "SERIAL"
+            #print serializer
             data = serializer.data
             cache.set('parks',data,3600)
         return Response(data)

diff --git a/mooring/frontend/mooring/src/components/campgrounds/campground-attr.vue b/mooring/frontend/mooring/src/components/campgrounds/campground-attr.vue
@@ -17,19 +17,19 @@
 								</div>
 								<div class="panel-body">
 									<div class="row">
-										<div class="col-md-4">
+										<div class="col-md-3">
 											<div class="form-group">
 												<label class="control-label" >Mooring Name</label>
 												<input type="text" name="name" id="name" class="form-control" v-model="campground.name" required/>
 											</div>
 										</div>
-										<div class="col-md-4">
+										<div class="col-md-3">
 											<div class="form-group">
 												<label class="control-label" >Mooring Oracle Code</label>
 												<input type="text" name="oracle_code" id="oracle_code" class="form-control" v-model="campground.oracle_code" required/>
 											</div>
 										</div>
-										<div class="col-md-4">
+										<div class="col-md-3">
 											<div class="form-group ">
 												<label class="control-label" >Park</label>
 												<select name="park" v-show="!parks.length > 0" class="form-control" >
@@ -40,6 +40,13 @@
 												</select>
 											</div>
 										</div>
+                                                                                <div class="col-md-3">
+                                                                                        <div class="form-group">
+                                                                                                <label class="control-label" >Vessel Size</label>
+                                                                                                <input type="text" name="vessel_size_limit" id="vessel_size_limit" class="form-control" v-model="campground.vessel_size_limit" required/>
+                                                                                        </div>
+                                                                                </div>
+
 									</div>
 									<div class="row">
 										<div class="col-md-4">
@@ -63,7 +70,6 @@
 												</select>
 											</div>
 										</div>
-
                                                                                 <div class="col-md-4">
                                                                                         <div class="form-group ">
                                                                                                 <label class="control-label" >Mooring Group (Permissions)</label>
@@ -457,7 +463,6 @@ export default {
                     vm.mooring_groups = data;
                 }
             });
-
         },
         loadFeatures: function() {
             var vm = this;

diff --git a/mooring/serialisers.py b/mooring/serialisers.py
@@ -337,7 +337,8 @@ class Meta:
             'oracle_code',
             'mooring_map',
             'additional_info',
-            'mooring_group'
+            'mooring_group',
+            'vessel_size_limit'
         )
         read_only_fields = ('mooring_group',)
 

diff --git a/mooring/static/parkstay/js/parkstay.js b/mooring/static/parkstay/js/parkstay.js