Show recent cards on trading page

colors.py

@@ -853,7 +853,7 @@ while portfoliosearch > 0:
             latestmonochrome = portfoliosearch
     portfoliosearch -= 1
 
-def filterwrite(page,colour=False,sigs=False):
+def filterwrite(page,colour=False,sigs=False,recent=False):
     filterstring = "<p class=\"typefilter\">"
     if colour:
         filterstring += "Filtered to <span class=\"" + colour + "\"><b>"
@@ -862,6 +862,8 @@ def filterwrite(page,colour=False,sigs=False):
                 filterstring += "grey"
             else:
                 filterstring += "gray"
+        elif colour == "recent":
+            filterstring += "cards gained in " + datetime.datetime.now().strftime("%B")
         else:
             filterstring += colour
         filterstring += "</b></span>. <a href=\""
@@ -870,6 +872,10 @@ def filterwrite(page,colour=False,sigs=False):
         filterstring += "/" + page + "\">Show all</a>"
     else:
         filterstring += "Filter: <a href=\""
+        if recent:
+            if len(variables.subfolder) > 0:
+                filterstring += "/" + variables.subfolder
+            filterstring += "/" + page + "/recent\" title=\"gained this month\">📅</a> <a href=\""
         if len(variables.subfolder) > 0:
             filterstring += "/" + variables.subfolder
         filterstring += "/" + page + "/red\" title=\"red\">🔴</a> <a href=\""
@@ -2580,18 +2586,24 @@ def tradegen(colour=False):
         os.remove(thefile)
     headerwrite(thefile,"trade")
     content = open(thefile,"a")
-    content.write("<h1>available for trade</h1>\n" + filterwrite("trade",colour,True) + "<p class=\"tradeterms\">")
+    content.write("<h1>available for trade</h1>\n" + filterwrite("trade",colour,True,True) + "<p class=\"tradeterms\">")
     if len(variables.tradestatement) > 0:
         content.write(variables.tradestatement + " ")
     content.write("Trade cards <a href=\"" + variables.tradepost + "\">here</a></p>\n<p><textarea readonly>")
     precomma = False
     for card in alltradelist:
         if colour:
-            if card["colour"] == colour:
+            if colour == "recent":
-                if precomma:
+                if card["received"].month == datetime.datetime.now().month and card["received"].year == datetime.datetime.now().year:
-                    content.write(", ")
+                    if precomma:
-                content.write(card["name"])
+                        content.write(", ")
-                precomma = True
+                    content.write(card["name"])
+                    precomma = True
+                elif card["colour"] == colour:
+                    if precomma:
+                        content.write(", ")
+                    content.write(card["name"])
+                    precomma = True
         else:
             if precomma:
                 content.write(", ")
@@ -2600,8 +2612,11 @@ def tradegen(colour=False):
     content.write("</textarea>\n<p>")
     for card in alltradelist:
         if colour:
-            if card["colour"] == colour:
+            if colour == "recent":
-                content.write(printcard(card))
+                if card["received"].month == datetime.datetime.now().month and card["received"].year == datetime.datetime.now().year:
+                    content.write(printcard(card))
+                elif card["colour"] == colour:
+                    content.write(printcard(card))
         else:
             content.write(printcard(card))
     content.write("</p>\n")
@@ -2612,6 +2627,7 @@ def tradeall():
     tradegen()
     for thevalue in values:
         tradegen(thevalue)
+    tradegen("recent")
     tradegen("sig")
         
 if __name__ == "__main__":