began costs in json format
This commit is contained in:
parent
91c5223b37
commit
727a06a2c2
1 changed files with 10 additions and 7 deletions
|
@ -17,10 +17,16 @@ def bird_create(request):
|
||||||
# Just show only related rescuers in select field of the form.
|
# Just show only related rescuers in select field of the form.
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
form = BirdAddForm(request.POST or None, request.FILES or None)
|
form = BirdAddForm(request.POST or None, request.FILES or None)
|
||||||
|
# circumstances = Circumstance.objects.all()
|
||||||
rescuer_id = request.session.get("rescuer_id")
|
rescuer_id = request.session.get("rescuer_id")
|
||||||
rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user)
|
rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user)
|
||||||
|
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
|
# if form.cleaned_data["find_circumstances_new"]:
|
||||||
|
# circumstance = form.cleaned_data["find_circumstances_new"]
|
||||||
|
# if Circumstance.objects.filter(description=circumstance).exists():
|
||||||
|
# print("is in circumstances")
|
||||||
|
|
||||||
fs = form.save(commit=False)
|
fs = form.save(commit=False)
|
||||||
fs.user = request.user
|
fs.user = request.user
|
||||||
fs.rescuer_id = rescuer_id
|
fs.rescuer_id = rescuer_id
|
||||||
|
@ -45,7 +51,7 @@ def bird_all(request):
|
||||||
for bird in birds:
|
for bird in birds:
|
||||||
costs_per_bird = float()
|
costs_per_bird = float()
|
||||||
for item in bird.costs:
|
for item in bird.costs:
|
||||||
costs_per_bird += float(item['cost_entry'])
|
costs_per_bird += float(item["cost_entry"])
|
||||||
if costs_per_bird == 0.0:
|
if costs_per_bird == 0.0:
|
||||||
costs_per_bird = ""
|
costs_per_bird = ""
|
||||||
bird.costs = costs_per_bird
|
bird.costs = costs_per_bird
|
||||||
|
@ -71,10 +77,7 @@ def bird_recover_all(request):
|
||||||
@login_required(login_url="account_login")
|
@login_required(login_url="account_login")
|
||||||
def bird_single(request, id):
|
def bird_single(request, id):
|
||||||
bird = FallenBird.objects.get(id=id)
|
bird = FallenBird.objects.get(id=id)
|
||||||
form = BirdEditForm(
|
form = BirdEditForm(request.POST or None, request.FILES or None, instance=bird)
|
||||||
request.POST or None,
|
|
||||||
request.FILES or None,
|
|
||||||
instance=bird)
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
fs = form.save(commit=False)
|
fs = form.save(commit=False)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue