update rcr migration app
This commit is contained in:
+46
-7
@@ -1,6 +1,7 @@
|
||||
from typing import Any
|
||||
from django.db import models
|
||||
from django.shortcuts import render
|
||||
from django.http import Http404
|
||||
from django.shortcuts import redirect, render
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic.edit import UpdateView
|
||||
from django.views.generic.detail import DetailView
|
||||
@@ -12,18 +13,40 @@ from rcr.forms import ItemForm
|
||||
|
||||
def radiology_index(request):
|
||||
|
||||
items = Item.objects.all()
|
||||
items = Item.objects.all().exclude(completed=True)
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/index.html",
|
||||
{
|
||||
"items": items
|
||||
"items": items,
|
||||
"completed": False
|
||||
},
|
||||
)
|
||||
|
||||
def radiology_index_completed(request):
|
||||
|
||||
items = Item.objects.filter(completed=True)
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/index.html",
|
||||
{
|
||||
"items": items,
|
||||
"completed": True
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
class ItemUpdateView(UpdateView):
|
||||
class ItemUpdateBase(UpdateView):
|
||||
def form_valid(self, form):
|
||||
self.object = form.save(commit=False)
|
||||
self.object.save()
|
||||
|
||||
form.instance.author.add(self.request.user.id)
|
||||
return super().form_valid(form)
|
||||
|
||||
class ItemUpdateView(ItemUpdateBase):
|
||||
model = Item
|
||||
|
||||
form_class = ItemForm
|
||||
@@ -31,17 +54,33 @@ class ItemUpdateView(UpdateView):
|
||||
#excludes = ["rcr_platform_id"]
|
||||
#fields = ["category", "level"]
|
||||
|
||||
class ItemUpdateNextView(UpdateView):
|
||||
class ItemUpdateNextView(ItemUpdateBase):
|
||||
model = Item
|
||||
|
||||
form_class = ItemForm
|
||||
template_name = "rcr/item_update.html"
|
||||
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
try:
|
||||
self.object = self.get_object()
|
||||
print("What", self.object)
|
||||
except Http404:
|
||||
print("YES")
|
||||
# redirect here
|
||||
return redirect("rcr:radiology_index_view")
|
||||
context = self.get_context_data(object=self.object)
|
||||
return self.render_to_response(context)
|
||||
|
||||
def get_object(self):
|
||||
obj = Item.objects.filter(completed=False).first()
|
||||
|
||||
#~if not obj:
|
||||
#~ return reverse_lazy("rcr:radiology_index_view")
|
||||
print("HELLO", obj)
|
||||
print(obj)
|
||||
|
||||
if not obj:
|
||||
print("raise")
|
||||
raise Http404
|
||||
|
||||
return obj
|
||||
print("test")
|
||||
|
||||
Reference in New Issue
Block a user