0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-11-16 23:10:46 +08:00
commit 81d57bfd0f
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kernel/api/riff.go
View file

@ -36,9 +36,10 @@ func resetRiffCards(c *gin.Context) {
return
}
typ := arg["type"].(string) // notebook, tree, deck
id := arg["id"].(string) // notebook ID, root ID, deck ID
blockIDsArg := arg["blockIDs"] // 如果不传入 blockIDs （或者传入实参为空数组），则重置所有卡片
typ := arg["type"].(string) // notebook, tree, deck
id := arg["id"].(string) // notebook ID, root ID, deck ID
deckID := arg["deckID"].(string) // deck ID
blockIDsArg := arg["blockIDs"] // 如果不传入 blockIDs （或者传入实参为空数组），则重置所有卡片
var blockIDs []string
if nil != blockIDsArg {
for _, blockID := range blockIDsArg.([]interface{}) {
@ -46,7 +47,7 @@ func resetRiffCards(c *gin.Context) {
}
}
model.ResetFlashcards(typ, id, blockIDs)
model.ResetFlashcards(typ, id, deckID, blockIDs)
}
func getNotebookRiffCards(c *gin.Context) {

9
kernel/model/block.go
View file

@ -70,9 +70,14 @@ type RiffCard struct {
Reps uint64 `json:"reps"`
}
func GetRiffCard(card *fsrs.Card) *RiffCard {
func getRiffCard(card *fsrs.Card) *RiffCard {
due := card.Due
if due.IsZero() {
due = time.Now()
}
return &RiffCard{
Due: card.Due,
Due: due,
Reps: card.Reps,
}
}

6
kernel/model/flashcard.go
View file

@ -39,7 +39,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func ResetFlashcards(typ, id string, blockIDs []string) {
func ResetFlashcards(typ, id, deckID string, blockIDs []string) {
// Support resetting the learning progress of flashcards https://github.com/siyuan-note/siyuan/issues/9564
if 0 < len(blockIDs) {
@ -84,7 +84,7 @@ func ResetFlashcards(typ, id string, blockIDs []string) {
}
blockIDs = gulu.Str.RemoveDuplicatedElem(blockIDs)
resetFlashcards(id, blockIDs)
resetFlashcards(deckID, blockIDs)
}
func resetFlashcards(deckID string, blockIDs []string) {
@ -334,7 +334,7 @@ func getCardsBlocks(cards []riff.Card, page int) (blocks []*Block, total, pageCo
}
b.RiffCardID = cards[i].ID()
b.RiffCard = GetRiffCard(cards[i].(*riff.FSRSCard).C)
b.RiffCard = getRiffCard(cards[i].(*riff.FSRSCard).C)
}
return
}