Refactoring to konova

intervention/views.py

@@ -2,8 +2,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import gettext_lazy as _
 from django.http import HttpRequest
-from django.shortcuts import render, get_object_or_404, redirect
-from django.urls import reverse
+from django.shortcuts import render, get_object_or_404
 
 from intervention.forms import NewInterventionForm, EditInterventionForm, OpenInterventionForm
 from intervention.models import Intervention
@@ -11,14 +10,12 @@ from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import RemoveForm
-from process.models import Process
 
 
 @login_required
-
 def index_view(request: HttpRequest):
     """
-    Renders the index view for process
+    Renders the index view for Interventions
 
     Args:
         request (HttpRequest): The incoming request
@@ -56,14 +53,8 @@ def new_view(request: HttpRequest):
     if request.method == "POST":
         if form.is_valid():
             intervention = form.save(request.user)
-            if intervention.process is None:
-                # An intervention can not be created without a process -> automatically create a new process
-                process = Process.create_from_intervention(intervention)
-                messages.info(request, _("Interventions must be part of a process. Please fill in the missing data for the process"))
-                return redirect("process:edit", id=process.id)
-            else:
-                messages.success(request, _("Intervention {} added").format(intervention.title))
-                return redirect("intervention:index")
+            messages.success(request, _("Intervention {} added").format(intervention.title))
+            return redirect("intervention:index")
         else:
             messages.error(request, _("Invalid input"))
     else:
@@ -129,7 +120,7 @@ def edit_view(request: HttpRequest, id: str):
 
 @login_required
 def remove_view(request: HttpRequest, id: str):
-    """ Renders a remove view for this process
+    """ Renders a remove view for this intervention
 
     Args:
         request (HttpRequest): The incoming request
@@ -139,29 +130,13 @@ def remove_view(request: HttpRequest, id: str):
 
     """
     template = "konova/form.html"
-    # Since an intervention is always organized inside a process, we will call the process removing routine, which
-    # disables all related elements by default
-    obj = get_object_or_404(Intervention, id=id)
-    process = obj.process
-    if request.method == "POST":
-        form = RemoveForm(
-            request.POST or None,
-            object_to_remove=obj,
-            remove_post_url=reverse("process:remove", args=(process.id,)),
-            cancel_url=reverse("intervention:index"),
-        )
-        if form.is_valid():
-            confirmed = form.is_checked()
-            if confirmed:
-                process.deactivate()
-                messages.success(request, _("Intervention {} removed").format(obj))
-            return redirect("intervention:index")
-        else:
-            messages.error(request, _("Invalid input"))
+    obj = Intervention.objects.get(id=id)
+
+    # ToDo
 
     form = RemoveForm(
         object_to_remove=obj,
-        remove_post_url=reverse("process:remove", args=(process.id,)),
+        remove_post_url=reverse("intervention:remove", args=(id,)),
         cancel_url=reverse("intervention:index"),
     )
     context = {