Allow spaces in portfolio decknames
This commit is contained in:
parent
65ffda928e
commit
128b824bc4
1 changed files with 29 additions and 27 deletions
56
new.py
56
new.py
|
|
@ -64,10 +64,11 @@ for event in log.log:
|
|||
if event["event"] == "portfolio":
|
||||
portfolio = {}
|
||||
thedecks = {}
|
||||
for deck in event["decks"]:
|
||||
for spacedeck in event["decks"]:
|
||||
deck = spacedeck.replace(" ","")
|
||||
for keydeck in deckkey:
|
||||
if deck in keydeck:
|
||||
thedecks[deck] = keydeck[deck]
|
||||
thedecks[spacedeck] = keydeck[deck]
|
||||
break
|
||||
portcolours = list(thedecks.values())
|
||||
portcolours = sorted(list(dict.fromkeys(portcolours)))
|
||||
|
|
@ -248,7 +249,8 @@ portdecks = []
|
|||
|
||||
for portfolio in portfolios:
|
||||
oneportdecks = list(portfolio["decks"].keys())
|
||||
portdecks.extend(oneportdecks)
|
||||
for deck in oneportdecks:
|
||||
portdecks.append(deck.replace(" ",""))
|
||||
|
||||
portdecks = sorted(list(dict.fromkeys(portdecks)))
|
||||
|
||||
|
|
@ -483,7 +485,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
reddeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("red")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == reddeck:
|
||||
if deck["name"] == reddeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -493,7 +495,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -504,7 +506,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
bluedeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("blue")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == bluedeck:
|
||||
if deck["name"] == bluedeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -514,7 +516,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -525,7 +527,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
orangedeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("orange")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == orangedeck:
|
||||
if deck["name"] == orangedeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -535,7 +537,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -546,7 +548,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
purpledeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("purple")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == purpledeck:
|
||||
if deck["name"] == purpledeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -556,7 +558,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -567,7 +569,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
yellowdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("yellow")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == yellowdeck:
|
||||
if deck["name"] == yellowdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -577,7 +579,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -588,7 +590,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
browndeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("brown")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == browndeck:
|
||||
if deck["name"] == browndeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -598,7 +600,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -609,7 +611,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
greendeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("green")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == greendeck:
|
||||
if deck["name"] == greendeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -619,7 +621,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -630,7 +632,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
try:
|
||||
greydeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("gray")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == greydeck:
|
||||
if deck["name"] == greydeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -640,7 +642,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
except:
|
||||
specialdeck = list(theportfolio["decks"].keys())[list(theportfolio["decks"].values()).index("special")]
|
||||
for deck in decklist:
|
||||
if deck["name"] == specialdeck:
|
||||
if deck["name"] == specialdeck.replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -658,7 +660,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
portstring = "<table class=\"" + thecolour + " portfolio\">\n<tbody>\n<tr>\n<td colspan=\"2\">" + variables.name.lower() + "</td>\n</tr>\n<tr>\n<td class=\"deck1\">"
|
||||
thedecks = sorted(list(theportfolio["decks"].keys()))
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[0]:
|
||||
if deck["name"] == thedecks[0].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -666,7 +668,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[0] + "</td>\n<td class=\"deck5\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[4]:
|
||||
if deck["name"] == thedecks[4].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -674,7 +676,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[4] + "</td>\n</tr>\n<tr>\n<td class=\"deck2\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[1]:
|
||||
if deck["name"] == thedecks[1].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -682,7 +684,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[1] + "</td>\n<td class=\"deck6\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[5]:
|
||||
if deck["name"] == thedecks[5].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -690,7 +692,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[5] + "</td>\n</tr>\n<tr>\n<td class=\"deck3\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[2]:
|
||||
if deck["name"] == thedecks[2].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -698,7 +700,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[2] + "</td>\n<td class=\"deck7\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[6]:
|
||||
if deck["name"] == thedecks[6].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -706,7 +708,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[6] + "</td>\n</tr>\n<tr>\n<td class=\"deck4\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[3]:
|
||||
if deck["name"] == thedecks[3].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
@ -714,7 +716,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
|
|||
break
|
||||
portstring += " " + thedecks[3] + "</td>\n<td class=\"deck8\">"
|
||||
for deck in decklist:
|
||||
if deck["name"] == thedecks[7]:
|
||||
if deck["name"] == thedecks[7].replace(" ",""):
|
||||
if deck["mastered"]:
|
||||
portstring += "■"
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue