Skip to content
Snippets Groups Projects
Verified Commit 08b9aac8 authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

fix issue with partial ordering in external/internal and cleanup

parent e249cde6
No related branches found
No related tags found
No related merge requests found
...@@ -163,7 +163,6 @@ for folder in cardDirs: ...@@ -163,7 +163,6 @@ for folder in cardDirs:
# set the header of the section # set the header of the section
#index += "\n### " + d.replace("-", " ").capitalize() + "\n" #index += "\n### " + d.replace("-", " ").capitalize() + "\n"
# get the index of the section # get the index of the section
indexS = sections.index(d) indexS = sections.index(d)
maxOrder = 0 maxOrder = 0
...@@ -204,9 +203,6 @@ for folder in cardDirs: ...@@ -204,9 +203,6 @@ for folder in cardDirs:
# define the header for each card # define the header for each card
header = "---\n" header = "---\n"
print(orderArr)
if len(order) > 0: if len(order) > 0:
header += "order: " + str(order) + "\n" header += "order: " + str(order) + "\n"
# append the order of the card # append the order of the card
...@@ -221,11 +217,8 @@ for folder in cardDirs: ...@@ -221,11 +217,8 @@ for folder in cardDirs:
folderFlag = False folderFlag = False
tmp = orderArr[indexS] tmp = orderArr[indexS]
print("tmp")
print(tmp)
tmp.append(maxOrder + int(order)) tmp.append(maxOrder + int(order))
orderArr[indexS] = tmp orderArr[indexS] = tmp
print(tmp)
else: else:
orderArr[indexS] = [] orderArr[indexS] = []
...@@ -291,17 +284,14 @@ for folder in cardDirs: ...@@ -291,17 +284,14 @@ for folder in cardDirs:
print(" + New header added.") print(" + New header added.")
print("-----------------------") print("-----------------------")
if len(orderArr[indexS]) > 0: # join all subcategories to the index
print("here") # if all subcategories have a predefined order
print(localIndexArr[indexS]) if len(orderArr[indexS]) == len(localIndexArr[indexS]) and len(orderArr[indexS]) > 0:
print(orderArr[indexS])
X = localIndexArr[indexS][1:] X = localIndexArr[indexS][1:]
Y = orderArr[indexS] Y = orderArr[indexS]
localIndexArr[indexS] = [x for _, x in sorted(zip(Y, X))] localIndexArr[indexS] = [x for _, x in sorted(zip(Y, X))]
# natural sorting otherwise
print(localIndexArr[indexS])
else: else:
# join all subcategories to the index
localIndexArr[indexS] = natsorted(localIndexArr[indexS]) localIndexArr[indexS] = natsorted(localIndexArr[indexS])
print(localIndexArr) print(localIndexArr)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment