Remove add_consecutive function

src/laboratory/management/commands/precursor_report.py

@@ -8,7 +8,6 @@
     Laboratory
 from laboratory.task_utils import save_object_report_precursor, \
     build_precursor_report_from_reports
-from laboratory.tasks import add_consecutive
 
 
 class Command(BaseCommand):
@@ -34,7 +33,6 @@ def get_change_log(self):
                     month=current_time.month,
                     year=current_time.year,
                     laboratory=lab,
-                    consecutive=add_consecutive(lab)
                 )
                 save_object_report_precursor(report)
                 build_precursor_report_from_reports(report, previos_report)

src/laboratory/models.py

@@ -964,7 +964,17 @@ class PrecursorReport(models.Model):
     consecutive = models.IntegerField(default=1)
     report_values = models.ManyToManyField(Object,through=PrecursorReportValues)
 
-
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            print(self.laboratory)
+            max_consecutive = PrecursorReport.objects.filter(
+                laboratory=self.laboratory).aggregate(Max("consecutive"))["consecutive__max"]
+
+            if max_consecutive is None:
+                self.consecutive=1
+            else:
+                self.consecutive= max_consecutive+1
+        super().save(*args, **kwargs)
 
 STATUS_CHOICES = (
     (_('Eraser'), _('Eraser')),

src/laboratory/task_utils.py

@@ -111,16 +111,6 @@ def get_base_unit(unit):
         return BaseUnitValues.objects.filter(pk=4).first().measurement_unit
     return unit
 
-def set_precursor_report_consecutive(laboratory):
-    reports = PrecursorReport.objects.filter(laboratory=laboratory)
-    years= sorted(set(reports.values_list("year",flat=True).order_by("-year")))
-    consecutive=1
-    for year in years:
-        reports_month = reports.filter(year=year).order_by("month")
-        for res in reports_month:
-            res.consecutive=consecutive
-            res.save()
-            consecutive+=1
 
 def create_new_precursosr_report(laboratories):
     day = now() - relativedelta(months=1)
@@ -132,17 +122,7 @@ def create_new_precursosr_report(laboratories):
                 month=day.month,
                 year=day.year,
                 laboratory=lab,
-                consecutive=add_consecutive(lab)
             )
             save_object_report_precursor(report)
             build_precursor_report_from_reports(report, previous_report)
-            set_precursor_report_consecutive(lab)
 
-
-def add_consecutive(lab):
-    report = PrecursorReport.objects.filter(laboratory=lab).last()
-    consecutive = 1
-    if report is not None:
-        consecutive = int(report.consecutive)+1
-
-    return consecutive

src/laboratory/tasks.py

@@ -14,7 +14,7 @@
 
 from .limit_shelfobject import send_email_limit_objs
 from .task_utils import create_informsperiods, save_object_report_precursor, \
-    build_precursor_report_from_reports, add_consecutive
+    build_precursor_report_from_reports
 
 from dateutil.relativedelta import relativedelta
 from django.utils.timezone import now
@@ -57,7 +57,6 @@ def create_precursor_reports():
                 month=day.month,
                 year=day.year,
                 laboratory=lab,
-                consecutive=add_consecutive(lab)
             )
         save_object_report_precursor(report)
         build_precursor_report_from_reports(report, previous_report)
@@ -73,7 +72,6 @@ def verify_precursor_reports():
                 month=day.month,
                 year=day.year,
                 laboratory=lab,
-                consecutive=add_consecutive(lab)
             )
             save_object_report_precursor(report)
             build_precursor_report_from_reports(report, previous_report)

src/organilab/settings.py

@@ -275,7 +275,7 @@
     },
     'verify_precursor_reports': {
         'task': 'laboratory.tasks.verify_precursor_reports',
-        'schedule': crontab(hour='/*6', day_of_month="/*2"),
+        'schedule': crontab(hour='*/6', day_of_month="*/2"),
     },
 }