Skip to content

Commit

Permalink
Merge pull request #651 from xzzy/master
Browse files Browse the repository at this point in the history 
Mooring Bug Fixes & Business Logic Correction
  • Loading branch information
@dbca-asi
dbca-asi committed Jun 25, 2019
2 parents 2bd1251 + bf43f48 commit 0180d6b
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 21 deletions.
15 changes: 15 additions & 0 deletions ledger/order/admin.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
from django.contrib import admin
from oscar.apps.order.admin import * # noqa
from oscar.core.loading import get_model

Order = get_model('order', 'Order')

admin.site.unregister(Order)
class OrderAdmin(OrderAdmin):
raw_id_fields = ['user', 'billing_address', 'shipping_address', 'basket']
list_display = ('number', 'total_incl_tax', 'site', 'user',
'billing_address', 'date_placed')
readonly_fields = ('number', 'total_incl_tax', 'total_excl_tax',
'shipping_incl_tax', 'shipping_excl_tax',)
inlines = [LineInline]

admin.site.register(Order, OrderAdmin)
9 changes: 9 additions & 0 deletions mooring/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ class MooringAreaAdmin(admin.GeoModelAdmin):
class MooringAreaGroupAdmin(admin.ModelAdmin):
filter_horizontal = ('members','moorings')

def formfield_for_manytomany(self, db_field, request, **kwargs):
if db_field.name == "members":
kwargs["queryset"] = EmailUser.objects.filter(is_staff=True)
return super(MooringAreaGroupAdmin, self).formfield_for_manytomany(db_field, request, **kwargs)

def get_queryset(self, request):
""" Filter based on the mooring group of the user. """
qs = super(MooringAreaGroupAdmin, self).get_queryset(request)
Expand Down Expand Up @@ -148,10 +153,12 @@ class CancelPricePeriodAdmin(admin.ModelAdmin):

@admin.register(models.Booking)
class BookingAdmin(admin.ModelAdmin):
raw_id_fields = ('customer','created_by','overridden_by','canceled_by','old_booking','admission_payment',)
list_display = ('id','arrival','departure','booking_type','mooringarea','legacy_id','legacy_name','status','cost_total')
ordering = ('-id',)
search_fileds = ('arrival','departure')
list_filter = ('id','arrival','departure','mooringarea')
readonly_fields=('created',)
inlines = [BookingInvoiceInline,MooringsiteBookingInline]

def has_add_permission(self, request, obj=None):
Expand Down Expand Up @@ -393,7 +400,9 @@ class AdmissionLineInline(admin.TabularInline):

@admin.register(models.AdmissionsBooking)
class AdmissionBooking(admin.ModelAdmin):
raw_id_fields = ('customer',)
list_display = ('confirmation_number', 'customer', 'totalCost')
readonly_fields=('created_by','canceled_by',)
inlines = [AdmissionLineInline]


Expand Down
18 changes: 9 additions & 9 deletions mooring/frontend/availability2/src/availability.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,28 +161,28 @@
<div class="small-6 columns">
<label for="vesselSize" class="text-left">Vessel Size (Meters)</label>
</div><div class="small-6 columns">
<input type="number" id="vesselSize" ref="vesselSize" name="vessel_size" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselSize" step="1" :disabled="current_booking.length > 0"/>
<input type="number" id="vesselSize" ref="vesselSize" name="vessel_size" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselSize" step='0.01' :disabled="current_booking.length > 0"/>
</div>
</div>
<div class="row">
<div class="small-6 columns">
<label for="vesselDraft" class="text-left">Vessel Draft (Meters)</label>
</div><div class="small-6 columns">
<input type="number" id="vesselDraft" ref="vesselDraft" name="vessel_draft" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselDraft" step="1" :disabled="current_booking.length > 0"/>
<input type="number" id="vesselDraft" ref="vesselDraft" name="vessel_draft" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselDraft" step='0.01' :disabled="current_booking.length > 0"/>
</div>
</div>
<div class="row">
<div class="small-6 columns">
<label for="vesselBeam" class="text-left">Vessel Beams (Meters)</label>
</div><div class="small-6 columns">
<input type="number" id="vesselBeam" ref="vesselBeam" name="vessel_beam" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselBeam" step="1" :disabled="current_booking.length > 0" />
<input type="number" id="vesselBeam" ref="vesselBeam" name="vessel_beam" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselBeam" step='0.01' :disabled="current_booking.length > 0" />
</div>
</div>
<div class="row">
<div class="small-6 columns">
<label for="vesselWeight" class="text-left">Vessel Weight (Tonnes)</label>
</div><div class="small-6 columns">
<input type="number" id="vesselWeight" ref="vesselWeight" name="vessel_weight" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselWeight" step="1" :disabled="current_booking.length > 0"/>
<input type="number" id="vesselWeight" ref="vesselWeight" name="vessel_weight" @change="checkDetails(false)" @blur="checkDetails(false)" v-model="vesselWeight" step='0.01' :disabled="current_booking.length > 0"/>
</div>
</div>
</div>
Expand Down Expand Up @@ -929,10 +929,10 @@ export default {
success: function(data, stat, xhr) {
vm.searchedRego = reg;
if(data[0]){
vm.vesselSize = Math.ceil(data[0].vessel_size);
vm.vesselWeight = Math.ceil(data[0].vessel_weight);
vm.vesselDraft = Math.ceil(data[0].vessel_draft);
vm.vesselBeam = Math.ceil(data[0].vessel_beam);
vm.vesselSize = parseFloat(data[0].vessel_size);
vm.vesselWeight = parseFloat(data[0].vessel_weight);
vm.vesselDraft = parseFloat(data[0].vessel_draft);
vm.vesselBeam = parseFloat(data[0].vessel_beam);
} else {
console.log("Registration was not found.");
}
Expand Down Expand Up @@ -1196,7 +1196,7 @@ export default {
if (booking_period.length > 1) {
vm.mooring_book_row[index] = false;
} else {
if (booking_period[0].status == 'closed' || booking_period[0].status == 'selected' || booking_period[0].status == 'perday' || booking_period[0].status == 'maxstay') {
if (booking_period[0].status == 'closed' || booking_period[0].status == 'selected' || booking_period[0].status == 'perday' || booking_period[0].status == 'maxstay' || booking_period[0].status == 'toofar' || booking_period[0].status == 'maxstay') {
// vm.mooring_book_row[index] = 'disabled';
vm.mooring_book_row_disabled[index] = true;
}
Expand Down
18 changes: 9 additions & 9 deletions mooring/frontend/exploreparks/src/parkfinder.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
</div>
<div class="row">
<div class="small-12 medium-12 large-6 columns">
<label>Vessel Registration <input v-model="vesselRego" id="vesselRego" name="vessel_rego" type="text" placeholder="REGO134" style="text-transform:uppercase" :disabled="current_booking.length > 0" /></label>
<label>Vessel Registration <input v-model="vesselRego" id="vesselRego" name="vessel_rego" type="text" placeholder="REGO134" style="text-transform:uppercase" :disabled="current_booking.length > 0" step='0.01' /></label>
</div>
<div class="small-12 medium-12 large-6 columns">
<label>Vessel Size (Meters) <input v-model="vesselSize" id="vesselSize" name="vessel_size" type="number" placeholder="35" :disabled="current_booking.length > 0" /></label>
<label>Vessel Size (Meters) <input v-model="vesselSize" id="vesselSize" name="vessel_size" type="number" placeholder="35" :disabled="current_booking.length > 0" step='0.01' /></label>
</div>
<div class="small-12 medium-12 large-6 columns">
<label>Vessel Draft (Meters) <input v-model="vesselDraft" id="vesselDraft" name="vessel_draft" type="number" placeholder="10" :disabled="current_booking.length > 0" /></label>
<label>Vessel Draft (Meters) <input v-model="vesselDraft" id="vesselDraft" name="vessel_draft" type="number" placeholder="10" :disabled="current_booking.length > 0" step='0.01' /></label>
</div>
<div class="small-12 medium-12 large-6 columns">
<label>Vessel Beams (Meters) <input v-model="vesselBeam" id="vesselBeam" name="vessel_beams" type="number" placeholder="3" :disabled="current_booking.length > 0" /></label>
<label>Vessel Beams (Meters) <input v-model="vesselBeam" id="vesselBeam" name="vessel_beams" type="number" placeholder="3" :disabled="current_booking.length > 0" step='0.01' /></label>
</div>
<div class="small-12 medium-12 large-6 columns">
<label>Vessel Weight (Tonnes) <input v-model="vesselWeight" id="vesselWeight" name="vessel_weight" type="number" placeholder="2" :disabled="current_booking.length > 0" /></label>
<label>Vessel Weight (Tonnes) <input v-model="vesselWeight" id="vesselWeight" name="vessel_weight" type="number" placeholder="2" :disabled="current_booking.length > 0" step='0.01' /></label>
</div>
<div class="small-12 medium-12 large-6 columns" >
<label>
Expand Down Expand Up @@ -912,10 +912,10 @@ export default {
method: 'GET',
success: function(data, stat, xhr) {
if(data[0]){
vm.vesselWeight = Math.ceil(data[0].vessel_weight);
vm.vesselBeam = Math.ceil(data[0].vessel_beam);
vm.vesselSize = Math.ceil(data[0].vessel_size);
vm.vesselDraft = Math.ceil(data[0].vessel_draft);
vm.vesselWeight = parseFloat(data[0].vessel_weight);
vm.vesselBeam = parseFloat(data[0].vessel_beam);
vm.vesselSize = parseFloat(data[0].vessel_size);
vm.vesselDraft = parseFloat(data[0].vessel_draft);
$("#vesselSize").val(data[0].vessel_size);
$("#vesselWeight").val(data[0].vessel_weight);
$("#vesselBeam").val(data[0].vessel_beam);
Expand Down
2 changes: 1 addition & 1 deletion mooring/management/commands/lotus_notes_vessels.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def handle(self, *args, **options):


# Field names in list format.
fields = ["DoTRego", "TotLength", "Draft", "Beam", "Tonnage", "StickerLNo", "StickerAuNo", "StickerAnNo"]
fields = ["DoTRego", "RegLength", "Draft", "Beam", "Tonnage", "StickerLNo", "StickerAuNo", "StickerAnNo"]

for record in regos:
for i in range(1,8):
Expand Down
2 changes: 1 addition & 1 deletion mooring/static/availability2/js/app.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mooring/static/exploreparks/js/map.js
View file

Large diffs are not rendered by default.

0 comments on commit 0180d6b

Please sign in to comment.