django-batch-sheet 0.20.2__tar.gz → 0.90.0__tar.gz

{django_batch_sheet-0.20.2 → django_batch_sheet-0.90.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_batch_sheet
-Version: 0.20.2
+Version: 0.90.0
 Summary: Create Excel Sheet from Django Model and load them automatically
 Home-page: https://github.com/mkalioby/django-batch-sheet/
 Download-URL: https://github.com/mkalioby/django-batch-sheet/

{django_batch_sheet-0.20.2 → django_batch_sheet-0.90.0}/batch_sheet/CombinedSheet.py

@@ -4,6 +4,7 @@ import xlrd
 import xlsxwriter
 from django.conf import settings
 from django.core.exceptions import ValidationError
+from django.db import transaction
 from django.db.models import Field
 from .Sheet import Sheet
 
@@ -93,15 +94,20 @@ class CombinedSheet(metaclass=DeclarativeCombinedSheetsMetaclass):
         wb = xlrd.open_workbook(file_name)
         self.xls_sheet = wb.sheets()[0]
 
-    def is_valid(self):
+    def is_valid(self,show_sheet=False):
         if self._valid is None:
             for sheet_name, sheet in self.sheets.items():
                 sheet.sheet =self.xls_sheet
                 if not sheet.is_valid():
                     for k in sheet.errors:
-                        if not k in self.errors:
-                            self.errors[k]={}
-                        self.errors[k].update(sheet.errors[k])
+                        if show_sheet:
+                            if not sheet.name in self.errors:
+                                self.errors[sheet.name]={}
+                            self.errors[sheet.name][k]=sheet.errors[k]
+                        else:
+                            if not k in self.errors:
+                                self.errors[k] = {}
+                            self.errors[k].update(sheet.errors[k])
                 for i,d in enumerate(sheet.data):
                     if len(self.data) == i:
                         self.data.append({})
@@ -116,12 +122,15 @@ class CombinedSheet(metaclass=DeclarativeCombinedSheetsMetaclass):
 
     def process(self):
         if self._valid:
-            for row in self.cleaned_data:
-                row_objs = {}
-                for sheet_name, sheet in self.sheets.items():
-                    obj_name = getattr(sheet._meta, "object_name", sheet_name)
-                    row_objs[obj_name] = sheet.row_processor(row, row_objs)
-                self.instances.append(row_objs)
+            with transaction.atomic():
+                for row in self.cleaned_data:
+                    row_objs = {}
+                    for sheet_name, sheet in self.sheets.items():
+                        obj_name = getattr(sheet._meta, "object_name", sheet_name)
+                        row = sheet.row_preprocessor(row)
+                        row_objs[obj_name] = sheet.row_processor(row, row_objs)
+                    self.instances.append(row_objs)
+            return self.instances
 
 
     def load(self,file_name=None, file_content=None):

{django_batch_sheet-0.20.2 → django_batch_sheet-0.90.0}/batch_sheet/Sheet.py

@@ -114,7 +114,10 @@ class Sheet(metaclass=DeclarativeColumnsMetaclass):
     errors = {}
     data = []
     cleaned_data = []
-
+    @classmethod
+    @property
+    def name(cls):
+        return cls.__name__
     def __init__(self, *args, **kwargs):
         super().__init__()
 
@@ -283,9 +286,11 @@ class Sheet(metaclass=DeclarativeColumnsMetaclass):
     def process(self,):
         self.convert_json(self.sheet)
         for row in self.cleaned_data:
-            x = self.row_processor(row)
+            final_row = self.row_preprocessor(row)
+            x = self.row_processor(final_row)
             if x:
                 self.instances.append(x)
+        return self.instances
 
     def post_process(self):
         pass

{django_batch_sheet-0.20.2 → django_batch_sheet-0.90.0}/django_batch_sheet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-batch-sheet
-Version: 0.20.2
+Version: 0.90.0
 Summary: Create Excel Sheet from Django Model and load them automatically
 Home-page: https://github.com/mkalioby/django-batch-sheet/
 Download-URL: https://github.com/mkalioby/django-batch-sheet/

{django_batch_sheet-0.20.2 → django_batch_sheet-0.90.0}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='django_batch_sheet',
-    version='0.20.2',
+    version='0.90.0',
     description='Create Excel Sheet from Django Model and load them automatically',
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",