registring region,district and village models

Reviewed-on: #63

config/conf/navigation.py

@@ -165,5 +165,26 @@ PAGES = [
                 "link": reverse_lazy("admin:evaluation_documentcategorymodel_changelist"),
             }
         ]
+    },
+    {
+        "title": _("Joylashuvlar"),
+        "separator": True,
+        "items": [
+            {
+                "title": _("Shaharlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:shared_regionmodel_changelist"),
+            },
+            {
+                "title": _("Tumanlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:shared_districtmodel_changelist"),
+            },
+            {
+                "title": _("Mahallalar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:shared_villagemodel_changelist"),
+            },
+        ]
     }
 ]

config/urls.py

@@ -13,7 +13,7 @@ from config.env import env
 
 
 def home(request):
-    return HttpResponse("OK: #22284f228f624acb523a88bec26076c1cef7f72a")
+    return HttpResponse("OK: #503c16bdb81281f1483c938c26a17bbdb9ec6e2a")
 
 
 urlpatterns = [

core/apps/evaluation/serializers/request/EvaluationRequest.py

@@ -115,7 +115,7 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
     rate_goal = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
     property_rights = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
     form_ownership = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
-    user = serializers.PrimaryKeyRelatedField(required=False, queryset=User.objects.all())
+    user = serializers.PrimaryKeyRelatedField(read_only=True)
 
     class Meta:
         model = EvaluationrequestModel
@@ -134,6 +134,7 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
             "need_delivering",
             "location",
             "locationName",
+            "user",
         ]
 
     def validate_tex_passport(self, value):

core/apps/shared/admin/region.py

@@ -1,21 +1,21 @@
-# from django.contrib import admin
+from django.contrib import admin
 
-# from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
+from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
 
 
-# @admin.register(RegionModel)
+@admin.register(RegionModel)
-# class RegionAdmin(admin.ModelAdmin):
+class RegionAdmin(admin.ModelAdmin):
-#     list_display = ('name', 'code')
+    list_display = ('id', 'name',)
-#     search_fields = ('name', 'code')
+    search_fields = ('name')
 
 
-# @admin.register(DistrictModel)
+@admin.register(DistrictModel)
-# class DistrictAdmin(admin.ModelAdmin):
+class DistrictAdmin(admin.ModelAdmin):
-#     list_display = ('name', 'code', 'region')
+    list_display = ('id', 'name', 'region')
-#     search_fields = ('name', 'code')
+    search_fields = ('name', 'region')
 
 
-# @admin.register(VillageModel)
+@admin.register(VillageModel)
-# class VillageAdmin(admin.ModelAdmin):
+class VillageAdmin(admin.ModelAdmin):
-#     list_display = ('name', 'code', 'district')
+    list_display = ('id', 'name', 'district')
-#     search_fields = ('name', 'code')
+    search_fields = ('name', 'district')

stack.yaml

@@ -84,7 +84,7 @@ services:
         max-file: "5"
 
   web:
-    image: husanjon/sifatbaho:76
+    image: husanjon/sifatbaho:82
     env_file:
       - .env
     environment:
@@ -129,7 +129,7 @@ services:
         max-file: "5"
 
   celery:
-    image: husanjon/sifatbaho:76
+    image: husanjon/sifatbaho:82
     env_file:
       - .env
     environment: