Some Fixes in admin dashboard

mablue · Aug 24, 2019 · e9037fc · e9037fc
1 parent cc616d9
commit e9037fc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/aghlam/models.py b/aghlam/models.py
@@ -15,7 +15,7 @@ class Aghlam(models.Model):
     kala = models.ForeignKey(Kala, on_delete=models.DO_NOTHING, verbose_name="نام کالا")
     sherkat = models.ForeignKey(Sherkat, on_delete=models.DO_NOTHING, verbose_name="تامین کننده", null=True, blank=True,)
     mablagh = models.IntegerField(verbose_name="مبلغ واحد", null=True, blank=True, )
-    meghdar = models.IntegerField(verbose_name="مقدار", null=True, blank=True,)
+    meghdar = models.IntegerField(verbose_name="مقدار", )
     external = models.BooleanField(verbose_name="خارجی", default=False)
 
     class Meta:

diff --git a/factor/models.py b/factor/models.py
@@ -8,7 +8,7 @@ class Factor(models.Model):
 
 
     aghlam = models.ManyToManyField(Aghlam, verbose_name="اقلام خریداری شده",)
-    shomare = models.CharField(verbose_name="شماره فاکتور", null=True, max_length=500, unique=True )
+    shomare = models.CharField(verbose_name="شماره فاکتور", max_length=500, unique=True )
     tarikh = models.DateField(auto_now=False, auto_now_add=False, verbose_name="تاریخ فاکتور",)
     arzeshe_afzude = models.BooleanField(default=True, verbose_name="ارزش افزوده")
 

diff --git a/kala/admin.py b/kala/admin.py
@@ -6,6 +6,7 @@
 from aghlam.models import Aghlam
 class aghlamAdmin (admin.TabularInline):
     model = Aghlam
+    extra=0
     # inlines = [aghlamAdmin,]
 
 

diff --git a/kala/models.py b/kala/models.py
@@ -13,7 +13,7 @@ class Kala(models.Model):
     # estefade = models.CharField(max_length=500, verbose_name="مورد استفاده",null=True,blank=True,)
     # jens = models.CharField(max_length=500, verbose_name="جنس",null=True,blank=True,)
     vahede_andazegiri = models.CharField(max_length=500, verbose_name="واحد کالا")
-    mesc = models.CharField(max_length=500, verbose_name="شماره طبقه بندی کالا (MESC)")
+    mesc = models.CharField(max_length=10, verbose_name="شماره طبقه بندی کالا (MESC)")
     class Meta:
         verbose_name = "کالا"
         verbose_name_plural = "کالا ها"

diff --git a/resid/models.py b/resid/models.py
@@ -7,8 +7,8 @@
 
 class Resid(models.Model):
     taghaza = models.ForeignKey(Taghaza, on_delete=models.DO_NOTHING, verbose_name="تقاضا")
-    tarikh = models.DateField(verbose_name="تاریخ رسید",null=True)
-    shomare = models.CharField(verbose_name="شماره رسید",null=True,max_length=500,)
+    tarikh = models.DateField(verbose_name="تاریخ رسید")
+    shomare = models.CharField(verbose_name="شماره رسید",null=True,blank=True,max_length=500)
 
 
     def __str__(self):

diff --git a/taghaza/admin.py b/taghaza/admin.py
@@ -71,7 +71,7 @@ def dehydrate_type(self, taghaza):
             return "متوسط"
 
 class AghlamInline(admin.TabularInline):
-    extra = 0
+    extra = 10
 
     model = Aghlam
     # sortable_field_name = "factor"
@@ -83,18 +83,18 @@ class AghlamInline(admin.TabularInline):
         )}),
     )
 class FactorInline(admin.TabularInline):
-    extra = 0
+    extra = 1
     model = Factor
     fieldsets = (
         (None, {'fields': (('shomare','tarikh','arzeshe_afzude'),'image')}),
     )
 
 class ResidInline(admin.TabularInline):
-    extra = 0
+    extra = 1
     model = Resid
 
 class TasfieInline(admin.TabularInline):
-    extra =0
+    extra = 1
     model = Tasfie
 
 

diff --git a/templates/admin/base.html b/templates/admin/base.html
@@ -252,6 +252,9 @@
 
 
   <script>
+    $('body').on('DOMNodeInserted', 'select', function () {
+      $(this).select2();
+    });
     $('#id_taghaza').on('change', function () {
       var activeTaghaza = $('#id_taghaza').select2('data')[0].text;
       var NotWanted = $('#id_aghlam').find("option:not(:contains('" + activeTaghaza + "'))");
@@ -260,7 +263,6 @@
 
     });
 
-
     $('#id_aghlam').on('select2:opening', function () {
 
       var activeTaghaza = $('#id_taghaza').select2('data')[0].text;
@@ -283,6 +285,9 @@
       var targetUrl = "/aghlam/aghlam/" + targetId + "/change/?&_popup=1";
       window.open(targetUrl, "popupWindow", "width=800,height=600,");
     });
+
+
+
     $("#recent-actions-module").hide();
     $('#add_id_aghlam').hide();
     $('.import_link').hide();