Huge changing 14.07

Author: theMirmakhmudov

institutions/admin.py

@@ -1,16 +1,34 @@
 from django.contrib import admin
+from django.utils.html import format_html
+
 from .models import Institution, Certificate
 
 @admin.register(Institution)
 class InstitutionAdmin(admin.ModelAdmin):
-    list_display = ('id', 'name', 'created_at', 'is_approved')
+    list_display = ('id', 'name', 'created_at', 'is_approved', 'institution_logo', 'institution_seal')
     search_fields = ('name', )
     list_filter = ('is_approved', 'created_at')
     ordering = ('-created_at',)
 
+    def institution_logo(self, obj):
+        return format_html(f'''<a href="{obj.logo.url}" target="_blank"><img src="{obj.logo.url}"
+            alt="image" width="100 height="100" style="object-fit : cover;"/></a>''')
+
+    def institution_seal(self, obj):
+        return format_html(f'''<a href="{obj.seal.url}" target="_blank"><img src="{obj.seal.url}"
+            alt="image" width="100 height="100" style="object-fit : cover;"/></a>''')
+
 @admin.register(Certificate)
 class CertificateAdmin(admin.ModelAdmin):
-    list_display = ('id', 'student__full_name', 'institution', 'issued_date', 'is_verified')
+    list_display = ('id', 'student__full_name', 'institution', 'issued_date', 'is_verified', 'certificate_file', 'certificate_qr_code')
     search_fields = ('serial_number', 'student__full_name', 'institution__name')
     list_filter = ('is_verified', 'institution', 'issued_date')
-    ordering = ('-issued_date',)
+    ordering = ('-issued_date',)
+
+    def certificate_file(self, obj):
+        return format_html(f'''<a href="{obj.file.url}" target="_blank"><img src="{obj.file.url}"
+            alt="image" width="100 height="100" style="object-fit : cover;"/></a>''')
+
+    def certificate_qr_code(self, obj):
+        return format_html(f'''<a href="{obj.qr_code.url}" target="_blank"><img src="{obj.qr_code.url}"
+                    alt="image" width="100 height="100" style="object-fit : cover;"/></a>''')

institutions/models.py

@@ -55,7 +55,6 @@ def save(self, *args, **kwargs):
             self.hash = get_file_hash(self.file)
             self.file.seek(0)
 
-        # QR code faqat hash mavjud bo‘lsa va hali yaratilmagan bo‘lsa
         if self.hash and not self.qr_code:
             qr_data = f"http://127.0.0.1:8000/verify/{self.hash}"
             qr_img = qrcode.make(qr_data)

institutions/serializers.py

@@ -4,13 +4,12 @@
 
 
 class InstitutionSerializer(serializers.ModelSerializer):
-    admin = UserSerializer(read_only=True)
 
     class Meta:
         model = Institution
         fields = [
-            'id', 'name', 'inn', 'address', 'phone', 'email', 'seal',
-            'logo', 'website', 'is_approved', 'admin', 'created_at'
+            'id', 'name', 'inn', 'address', 'admin', 'phone', 'email', 'seal',
+            'logo', 'website', 'is_approved', 'created_at'
         ]
 
 
@@ -25,7 +24,7 @@ class Meta:
         ]
         read_only_fields = ['hash', 'qr_code']
 
-    def get_qr_code_url(self, obj):
+    def get_qr_code_url(self, obj) -> str:
         request = self.context.get('request')
         if obj.qr_code:
             url = obj.qr_code.url

users/admin.py

@@ -1,5 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as DefaultUserAdmin
+from django.utils.html import format_html
+
 from .models import User
 
 @admin.register(User)