Skip to content

GitLab

Commit dfc3b473 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

split website views in app views

parent 0ae41e86
Hide whitespace changes
Inline Side-by-side
bookshare/core/views.py
View file @ dfc3b473
from django.shortcuts import render
# Create your views here.
# stuff copied out of the website views
# seller's rating
def ratingsAverage(seller):
sellerRating = Seller.objects.filter(user__username=seller)
ratingNumber = 0
ratingTotal = 0
ratingAverage = 0
for rating in sellerRating:
ratingNumber += 1
ratingTotal += rating
ratingAverage = ratingTotal/ratingNumber
return ratingNumber
### VIEWS ###
# USER home page -- rewrite as user homepage
@login_required
def index(request):
lookout_form = LookoutForm()
lookouts = Lookout.objects.filter(
owner__user__username = request.user.username )
# This unwieldy double forloop grabs the pk of each listing that shows
# up for your lookout, and adds it to a list.
listing_pks = []
for lookout in lookouts:
lookout_listings = lookout.get_listings()
for lookout_listing in lookout_listings:
listing_pks.append( lookout_listing.pk )
# The list of pks is then used to create a queryset, ordered by newest
# listing first.
listings = Listing.objects.filter(pk__in=listing_pks).order_by('-date_created')
# Listings will be shown in 3 columns and 2 rows, for a total of 6
# entries per page.
paginator = Paginator(listings, 6) # Show 6 listings per page
page = request.GET.get('page')
try:
listings = paginator.page(page)
except PageNotAnInteger:
# if page is NaN, deliver the first page
listings = paginator.page(1)
except EmptyPage:
# if the page is empty, deliver the last page
listings = paginator.page(paginator.num_pages)
# the rows variable is >= 1, and is determined by the number of
# entries on this page. this is intended to cause the listing
# previews to fill in rows first, rather than columns.
rows = int(math.ceil( len(listings) / 3.0 )) or 1
if request.method == 'POST':
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'homepage' )
return render(request, 'index.html', {
'listings' : listings,
'rows' : rows,
'CreateLookout_form': lookout_form,
},
)
# User profile page
@login_required
def profile(request, username):
# verify that the user exists
seller = get_object_or_404(Seller, user__username=username)
listings = Listing.objects.filter(seller__user__username=username)
lookouts = Lookout.objects.filter(owner__user__username=username)
FinalPrice_form = FinalPriceForm(prefix="finalPrice")
close_form = CloseForm(prefix="close")
DeleteLookout_form = DeleteLookoutForm()
lookout_form = LookoutForm()
if request.method == 'POST':
# Parse the ClosedForm input fields
if 'closed' in request.POST:
close_form = CloseForm( request.POST, prefix="close" )
if close_form.is_valid():
book_id = close_form.cleaned_data.get('book_id')
listing = Listing.objects.get(pk=book_id)
if listing.seller == request.user.seller:
listing.active = False
listing.save()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this listing.")
# Parse the FinalPriceForm input fields
elif 'sold' in request.POST:
FinalPrice_form = FinalPriceForm( request.POST, prefix="finalPrice" )
if FinalPrice_form.is_valid():
book_id = FinalPrice_form.cleaned_data.get('book_id')
listing = Listing.objects.get(pk=book_id)
try:
final_price = int(FinalPrice_form.cleaned_data.get('final_price'))
except ValueError, TypeError:
final_price = 0
if listing.seller == request.user.seller:
listing.finalPrice = final_price
listing.sold = True
listing.active = False
listing.save()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this listing.")
# Parse the DeleteLookoutForm input fields
elif 'lookout' in request.POST:
DeleteLookout_form = DeleteLookoutForm( request.POST )
if DeleteLookout_form.is_valid():
lookout_id = DeleteLookout_form.cleaned_data.get('lookout_id')
lookout = Lookout.objects.get(pk=lookout_id)
if lookout.owner == request.user.seller:
lookout.delete()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this lookout.")
elif 'lookout-create' in request.POST:
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'profile', username )
return render(request, 'profile.html', {
'seller' : seller,
'listings': listings,
'lookouts': lookouts,
'total_sold' : totalSold( username ),
'FinalPrice_form' : FinalPrice_form,
'close_form' : close_form,
'DeleteLookout_form' : DeleteLookout_form,
'CreateLookout_form': lookout_form,
},
)
@login_required
def search(request):
# merely forms
return render(request, 'search.html', {
},
)
bookshare/lookouts/views.py
View file @ dfc3b473
from django.shortcuts import render
# Create your views here.
# stuff copied out of the website views
# saved searches
# need to implement haystack stuff first
### VIEWS ###
@login_required
def create_lookout(request, username):
lookout_form = LookoutForm()
if request.method == 'POST':
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'profile', username )
return render(request, 'create_lookout.html', {
'lookout_form': lookout_form,
},
)
bookshare/trades/views.py
View file @ dfc3b473
......@@ -50,185 +50,18 @@ def totalSold(seller):
# relevant comments
def relevantComments(seller):
sellerListings = Listing.objects.filter(seller__user__username=seller).order_by("-date_created")
sellerListings = Listing.objects.filter(seller__user__username=seller).order_by("-created")
# all listings that seller has commented on (preferably ordered in reverse)
# put those lists together
# return that list
return False
# saved searches
# need to implement haystack stuff first
# seller's rating
def ratingsAverage(seller):
sellerRating = Seller.objects.filter(user__username=seller)
ratingNumber = 0
ratingTotal = 0
ratingAverage = 0
for rating in sellerRating:
ratingNumber += 1
ratingTotal += rating
ratingAverage = ratingTotal/ratingNumber
return ratingNumber
############# VIEWS #######################
# home page
@login_required
def index(request):
lookout_form = LookoutForm()
lookouts = Lookout.objects.filter(
owner__user__username = request.user.username )
# This unwieldy double forloop grabs the pk of each listing that shows
# up for your lookout, and adds it to a list.
listing_pks = []
for lookout in lookouts:
lookout_listings = lookout.get_listings()
for lookout_listing in lookout_listings:
listing_pks.append( lookout_listing.pk )
# The list of pks is then used to create a queryset, ordered by newest
# listing first.
listings = Listing.objects.filter(pk__in=listing_pks).order_by('-date_created')
# Listings will be shown in 3 columns and 2 rows, for a total of 6
# entries per page.
paginator = Paginator(listings, 6) # Show 6 listings per page
page = request.GET.get('page')
try:
listings = paginator.page(page)
except PageNotAnInteger:
# if page is NaN, deliver the first page
listings = paginator.page(1)
except EmptyPage:
# if the page is empty, deliver the last page
listings = paginator.page(paginator.num_pages)
# the rows variable is >= 1, and is determined by the number of
# entries on this page. this is intended to cause the listing
# previews to fill in rows first, rather than columns.
rows = int(math.ceil( len(listings) / 3.0 )) or 1
if request.method == 'POST':
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'homepage' )
return render(request, 'index.html', {
'listings' : listings,
'rows' : rows,
'CreateLookout_form': lookout_form,
},
)
# User profile page
@login_required
def profile(request, username):
# verify that the user exists
seller = get_object_or_404(Seller, user__username=username)
listings = Listing.objects.filter(seller__user__username=username)
lookouts = Lookout.objects.filter(owner__user__username=username)
FinalPrice_form = FinalPriceForm(prefix="finalPrice")
close_form = CloseForm(prefix="close")
DeleteLookout_form = DeleteLookoutForm()
lookout_form = LookoutForm()
if request.method == 'POST':
# Parse the ClosedForm input fields
if 'closed' in request.POST:
close_form = CloseForm( request.POST, prefix="close" )
if close_form.is_valid():
book_id = close_form.cleaned_data.get('book_id')
listing = Listing.objects.get(pk=book_id)
if listing.seller == request.user.seller:
listing.active = False
listing.save()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this listing.")
# Parse the FinalPriceForm input fields
elif 'sold' in request.POST:
FinalPrice_form = FinalPriceForm( request.POST, prefix="finalPrice" )
if FinalPrice_form.is_valid():
book_id = FinalPrice_form.cleaned_data.get('book_id')
listing = Listing.objects.get(pk=book_id)
try:
final_price = int(FinalPrice_form.cleaned_data.get('final_price'))
except ValueError, TypeError:
final_price = 0
if listing.seller == request.user.seller:
listing.finalPrice = final_price
listing.sold = True
listing.active = False
listing.save()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this listing.")
# Parse the DeleteLookoutForm input fields
elif 'lookout' in request.POST:
DeleteLookout_form = DeleteLookoutForm( request.POST )
if DeleteLookout_form.is_valid():
lookout_id = DeleteLookout_form.cleaned_data.get('lookout_id')
lookout = Lookout.objects.get(pk=lookout_id)
if lookout.owner == request.user.seller:
lookout.delete()
return redirect('profile', username)
else:
raise PermissionDenied("You do not own this lookout.")
elif 'lookout-create' in request.POST:
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'profile', username )
return render(request, 'profile.html', {
'seller' : seller,
'listings': listings,
'lookouts': lookouts,
'total_sold' : totalSold( username ),
'FinalPrice_form' : FinalPrice_form,
'close_form' : close_form,
'DeleteLookout_form' : DeleteLookout_form,
'CreateLookout_form': lookout_form,
},
)
@login_required
def create_lookout(request, username):
lookout_form = LookoutForm()
if request.method == 'POST':
lookout_form = LookoutForm( request.POST )
if lookout_form.is_valid():
lookout = lookout_form.save(commit=False)
lookout.ISBN = lookout.ISBN.strip()
lookout.owner = request.user.seller
lookout.save()
return redirect( 'profile', username )
return render(request, 'create_lookout.html', {
'lookout_form': lookout_form,
},
)
### VIEWS ###
class ListListings(LoginRequiredMixin, ListView):
model = Listing
context_object_name = 'listings'
queryset = Listing.objects.all().order_by('-date_created')
queryset = Listing.objects.all().order_by('-created')
paginate_by = 25
login_url = '/'
......@@ -291,11 +124,3 @@ def privacy_opt_out(request):
return render(request, 'privacy_opt_out.html', {
},
)
@login_required
def search(request):
# merely forms
return render(request, 'search.html', {
},
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment