Skip to content

Commit 053b7b3

Browse files
committed
💥 Only curriculum workbooks are filtered by grades (#1285)
1 parent a01d4fd commit 053b7b3

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/lib/components/WorkBooks/WorkBookList.svelte

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
}
3737
}
3838
39-
// 手引き
39+
// カリキュラム(手引き)、解法別、ユーザ作成
4040
let mainWorkbooks: WorkbooksList;
4141
4242
$: mainWorkbooks =
43-
workbookType === WorkBookType.CREATED_BY_USER
44-
? workbooks
45-
: workbooks.filter((workbook: WorkbookList) => {
43+
workbookType === WorkBookType.CURRICULUM
44+
? workbooks.filter((workbook: WorkbookList) => {
4645
const gradeMode = getGradeMode(workbook.id);
4746
return gradeMode === selectedGrade && !workbook.isReplenished;
48-
});
47+
})
48+
: workbooks;
4949
$: readableMainWorkbooksCount = () => countReadableWorkbooks(mainWorkbooks);
5050
51-
// 補充
51+
// カリキュラム(補充)
5252
let replenishedWorkbooks: WorkbooksList;
5353
5454
$: replenishedWorkbooks = workbooks.filter((workbook: WorkbookList) => {
@@ -80,7 +80,7 @@
8080

8181
<!-- TODO: 6Q〜1Q?にも対応 -->
8282
<!-- TODO: 「ユーザ作成」の問題集には、検索機能を追加 -->
83-
{#if workbookType !== WorkBookType.CREATED_BY_USER}
83+
{#if workbookType === WorkBookType.CURRICULUM}
8484
<div class="mb-6">
8585
<div class="flex flex-col md:flex-row items-start md:items-center justify-between">
8686
<div class="flex items-center space-x-4">
@@ -100,11 +100,9 @@
100100
/>
101101
</div>
102102

103-
{#if workbookType === WorkBookType.CURRICULUM}
104-
<div class="mt-4 md:mt-0">
105-
<Toggle bind:checked={isShowReplenishment}>「補充」があれば表示</Toggle>
106-
</div>
107-
{/if}
103+
<div class="mt-4 md:mt-0">
104+
<Toggle bind:checked={isShowReplenishment}>「補充」があれば表示</Toggle>
105+
</div>
108106
</div>
109107
</div>
110108
{/if}

0 commit comments

Comments
 (0)