activate/deactivate DPP from env

device/templates/details.html

@@ -80,9 +80,6 @@
           <a href="#dpps" class="nav-link" data-bs-toggle="tab" data-bs-target="#dpps">{% trans 'Dpps' %}</a>
         </li>
 	{% endif %}
-        <li class="nav-item">
-          <a href="#dpps" class="nav-link" data-bs-toggle="tab" data-bs-target="#dpps">{% trans 'Dpps' %}</a>
-        </li>
         <li class="nav-item">
           <a class="nav-link" href="{% url 'device:device_web' object.id %}" target="_blank">Web</a>
         </li>
@@ -228,7 +225,8 @@
         </div>
       </div>
     </div>
-    
+
+    {% if dpps %}
     <div class="tab-pane fade" id="dpps">
       <h5 class="card-title">{% trans 'List of dpps' %}</h5>
       <div class="list-group col">
@@ -245,6 +243,7 @@
         {% endfor %}
       </div>
     </div>
+    {% endif %}
   </div>
 
 {% endblock %}

device/views.py

@@ -1,8 +1,5 @@
-from django.http import JsonResponse
-
 from django.http import JsonResponse
 from django.conf import settings
-from django.db import IntegrityError
 from django.urls import reverse_lazy
 from django.contrib import messages
 from django.shortcuts import get_object_or_404, redirect, Http404
@@ -18,11 +15,11 @@ from action.models import StateDefinition, State, DeviceLog, Note
 from dashboard.mixins import DashboardView, Http403
 from evidence.models import UserProperty, SystemProperty
 from lot.models import LotTag
-from dpp.models import Proof
-from dpp.api_dlt import PROOF_TYPE
 from device.models import Device
 from device.forms import DeviceFormSet
-from device.environmental_impact.calculator import get_device_environmental_impact
+if settings.DPP:
+    from dpp.models import Proof
+    from dpp.api_dlt import PROOF_TYPE
 
 
 class DeviceLogMixin(DashboardView):
@@ -91,10 +88,12 @@ class DetailsView(DashboardView, TemplateView):
         context = super().get_context_data(**kwargs)
         self.object.initial()
         lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
-        dpps = Proof.objects.filter(
-            uuid__in=self.object.uuids,
-            type=PROOF_TYPE["IssueDPP"]
-        )
+        dpps = []
+        if settings.DPP:
+            dpps = Proof.objects.filter(
+                uuid__in=self.object.uuids,
+                type=PROOF_TYPE["IssueDPP"]
+            )
         context.update({
             'object': self.object,
             'snapshot': last_evidence,

dhub/settings.py

@@ -87,8 +87,6 @@ INSTALLED_APPS = [
     "action",
     "admin",
     "api",
-    "dpp",
-    "did",
 ]
 
 DPP = config("DPP", default=False, cast=bool)

dhub/urls.py

@@ -28,8 +28,6 @@ urlpatterns = [
     path("user/", include("user.urls")),
     path("lot/", include("lot.urls")),
     path('api/', include('api.urls')),
-    path('dpp/', include('dpp.urls')),
-    path('did/', include('did.urls')),
 ]
 
 if settings.DPP:

evidence/parse.py

@@ -9,6 +9,11 @@ from evidence.models import Annotation
 from evidence.xapian import index
 from dpp.api_dlt import register_device_dlt, register_passport_dlt
 from evidence.parse_details import get_inxi_key, get_inxi
+from django.conf import settings
+
+if settings.DPP:
+    from dpp.api_dlt import register_device_dlt, register_passport_dlt
+
 
 logger = logging.getLogger('django')
 
@@ -55,7 +60,8 @@ class Build:
 
         self.index()
         self.create_annotations()
-        self.register_device_dlt()
+        if settings.DPP:
+            self.register_device_dlt()
 
     def index(self):
         snap = json.dumps(self.evidence)
@@ -156,26 +162,6 @@ class Build:
                 value=self.sign(v)
             )
 
-<<<<<<< HEAD
-=======
-    def get_chassis_dh(self):
-        chassis = self.get_chassis()
-        lower_type = chassis.lower()
-        for k, v in CHASSIS_DH.items():
-            if lower_type in v:
-                return k
-        return self.default
-
-    def get_sku(self):
-        return self.dmi.get("System")[0].get("SKU Number", "n/a").strip()
-
-    def get_chassis(self):
-        return self.dmi.get("Chassis")[0].get("Type", '_virtual') #
-
-    def get_version(self):
-        return self.dmi.get("System")[0].get("Verson", '_virtual')
-
->>>>>>> 5949049 (new document and out device and components)
     def get_hid(self, snapshot):
         try:
             self.inxi = self.json["data"]["inxi"]