auction activity graph shows the most recent views up until your auction starts

Author: =

auctions/forms.py

@@ -1590,9 +1590,7 @@ def __init__(self, *args, **kwargs):
         else:
             # self.fields["only_approved_bidders"].widget = forms.HiddenInput()
             self.fields["unsold_lot_fee"].widget = forms.HiddenInput()
-            self.fields[
-                "allow_bidding_on_lots"
-            ].help_text = "Allow people to place bids online.  You should probably leave this unchecked."
+            self.fields["allow_bidding_on_lots"].help_text = "Most auctions should leave this off, it confuses people"
             self.fields[
                 "date_end"
             ].help_text = "You should probably leave this blank so that you can manually set winners. This field has been indefinitely set to hidden - see https://github.com/iragm/fishauctions/issues/116"

auctions/models.py

@@ -583,7 +583,7 @@ class Auction(models.Model):
     use_categories = models.BooleanField(default=True, verbose_name="This is a fish auction")
     use_categories.help_text = "Check to use categories like Cichlids, Livebearers, etc."
     is_deleted = models.BooleanField(default=False)
-    allow_bidding_on_lots = models.BooleanField(default=True)
+    allow_bidding_on_lots = models.BooleanField(default=True, verbose_name="Allow online bidding")
     only_approved_sellers = models.BooleanField(default=False)
     only_approved_sellers.help_text = "Require admin approval before users can add lots.  This will not change permissions for users that have already joined."
     only_approved_bidders = models.BooleanField(default=False)

auctions/views.py

@@ -5697,6 +5697,7 @@ class AuctionStatsActivityJSONView(BaseLineChartView, AuctionStatsPermissionsMix
     bins = 21
     days_before = 16
     days_after = bins - days_before
+    dates_messed_with = False
 
     def dispatch(self, request, *args, **kwargs):
         self.auction = Auction.objects.get(slug=kwargs["slug"], is_deleted=False)
@@ -5708,12 +5709,19 @@ def dispatch(self, request, *args, **kwargs):
         else:  # in person
             self.date_start = self.auction.date_start - timezone.timedelta(days=self.days_before)
             self.date_end = self.auction.date_start + timezone.timedelta(days=self.days_after)
+        # if date_end is in the future, shift the graph to show the same range, but for the present
+        if self.date_end > timezone.now():
+            time_difference = self.date_end - self.date_start
+            self.date_end = timezone.now()
+            self.date_start = self.date_end - time_difference
+            self.dates_messed_with = True
         # self.bin_size = (self.date_end - self.date_start).total_seconds() / self.bins
         # self.bin_edges = [self.date_start + timezone.timedelta(seconds=self.bin_size * i) for i in range(self.bins + 1)]
         return super().dispatch(request, *args, **kwargs)
 
     def get_labels(self):
-        # return [(f"Day {i}") for i in range(self.bins + 1)]
+        if self.dates_messed_with:
+            return [(f"{i-1} days ago") for i in range(self.bins, 0, -1)]
         before = [(f"{i} days before") for i in range(self.days_before, 0, -1)]
         after = [(f"{i} days after") for i in range(1, self.days_after)]
         midpoint = "start"