mirror of
https://github.com/ankitects/anki.git
synced 2025-09-23 16:26:40 -04:00
Add firstWeekday to GraphsOut
This commit is contained in:
parent
318cc01c73
commit
04e606bf4b
3 changed files with 29 additions and 0 deletions
|
@ -1082,6 +1082,12 @@ message GraphsIn {
|
||||||
}
|
}
|
||||||
|
|
||||||
message GraphsOut {
|
message GraphsOut {
|
||||||
|
enum Weekday {
|
||||||
|
SUNDAY = 0;
|
||||||
|
MONDAY = 1;
|
||||||
|
FRIDAY = 5;
|
||||||
|
SATURDAY = 6;
|
||||||
|
}
|
||||||
repeated Card cards = 1;
|
repeated Card cards = 1;
|
||||||
repeated RevlogEntry revlog = 2;
|
repeated RevlogEntry revlog = 2;
|
||||||
uint32 days_elapsed = 3;
|
uint32 days_elapsed = 3;
|
||||||
|
@ -1090,6 +1096,7 @@ message GraphsOut {
|
||||||
uint32 scheduler_version = 5;
|
uint32 scheduler_version = 5;
|
||||||
/// Seconds to add to UTC timestamps to get local time.
|
/// Seconds to add to UTC timestamps to get local time.
|
||||||
int32 local_offset_secs = 7;
|
int32 local_offset_secs = 7;
|
||||||
|
Weekday first_weekday = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
message RevlogEntry {
|
message RevlogEntry {
|
||||||
|
|
|
@ -18,6 +18,7 @@ pub(crate) fn schema11_config_as_string() -> String {
|
||||||
"curDeck": 1,
|
"curDeck": 1,
|
||||||
"newSpread": 0,
|
"newSpread": 0,
|
||||||
"collapseTime": 1200,
|
"collapseTime": 1200,
|
||||||
|
"firstWeekday": 0,
|
||||||
"timeLim": 0,
|
"timeLim": 0,
|
||||||
"estTimes": true,
|
"estTimes": true,
|
||||||
"dueCounts": true,
|
"dueCounts": true,
|
||||||
|
@ -47,6 +48,7 @@ pub(crate) enum ConfigKey {
|
||||||
ShowRemainingDueCountsInStudy,
|
ShowRemainingDueCountsInStudy,
|
||||||
ShowIntervalsAboveAnswerButtons,
|
ShowIntervalsAboveAnswerButtons,
|
||||||
NewReviewMix,
|
NewReviewMix,
|
||||||
|
FirstWeekday,
|
||||||
AnswerTimeLimitSecs,
|
AnswerTimeLimitSecs,
|
||||||
ShowDayLearningCardsFirst,
|
ShowDayLearningCardsFirst,
|
||||||
LastUnburiedDay,
|
LastUnburiedDay,
|
||||||
|
@ -75,6 +77,7 @@ impl From<ConfigKey> for &'static str {
|
||||||
ConfigKey::ShowRemainingDueCountsInStudy => "dueCounts",
|
ConfigKey::ShowRemainingDueCountsInStudy => "dueCounts",
|
||||||
ConfigKey::ShowIntervalsAboveAnswerButtons => "estTimes",
|
ConfigKey::ShowIntervalsAboveAnswerButtons => "estTimes",
|
||||||
ConfigKey::NewReviewMix => "newSpread",
|
ConfigKey::NewReviewMix => "newSpread",
|
||||||
|
ConfigKey::FirstWeekday => "firstWeekday",
|
||||||
ConfigKey::AnswerTimeLimitSecs => "timeLim",
|
ConfigKey::AnswerTimeLimitSecs => "timeLim",
|
||||||
ConfigKey::ShowDayLearningCardsFirst => "dayLearnFirst",
|
ConfigKey::ShowDayLearningCardsFirst => "dayLearnFirst",
|
||||||
ConfigKey::LastUnburiedDay => "lastUnburied",
|
ConfigKey::LastUnburiedDay => "lastUnburied",
|
||||||
|
@ -227,6 +230,16 @@ impl Collection {
|
||||||
self.set_config(ConfigKey::NewReviewMix, &(mix as u8))
|
self.set_config(ConfigKey::NewReviewMix, &(mix as u8))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
pub(crate) fn get_first_weekday(&self) -> Weekday {
|
||||||
|
match self.get_config_default::<u8, _>(ConfigKey::FirstWeekday) {
|
||||||
|
1 => Weekday::Monday,
|
||||||
|
5 => Weekday::Friday,
|
||||||
|
6 => Weekday::Saturday,
|
||||||
|
_ => Weekday::Sunday,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn get_show_due_counts(&self) -> bool {
|
pub(crate) fn get_show_due_counts(&self) -> bool {
|
||||||
self.get_config_optional(ConfigKey::ShowRemainingDueCountsInStudy)
|
self.get_config_optional(ConfigKey::ShowRemainingDueCountsInStudy)
|
||||||
.unwrap_or(true)
|
.unwrap_or(true)
|
||||||
|
@ -309,6 +322,13 @@ pub(crate) enum NewReviewMix {
|
||||||
NewFirst = 2,
|
NewFirst = 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) enum Weekday {
|
||||||
|
Sunday = 0,
|
||||||
|
Monday = 1,
|
||||||
|
Friday = 5,
|
||||||
|
Saturday = 6,
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::SortKind;
|
use super::SortKind;
|
||||||
|
|
|
@ -25,6 +25,7 @@ impl Collection {
|
||||||
let offset = self.local_utc_offset_for_user()?;
|
let offset = self.local_utc_offset_for_user()?;
|
||||||
let local_offset_secs = offset.local_minus_utc() as i64;
|
let local_offset_secs = offset.local_minus_utc() as i64;
|
||||||
|
|
||||||
|
|
||||||
let cards = self.storage.all_searched_cards()?;
|
let cards = self.storage.all_searched_cards()?;
|
||||||
let revlog = if all {
|
let revlog = if all {
|
||||||
self.storage.get_all_revlog_entries(revlog_start)?
|
self.storage.get_all_revlog_entries(revlog_start)?
|
||||||
|
@ -42,6 +43,7 @@ impl Collection {
|
||||||
next_day_at_secs: timing.next_day_at as u32,
|
next_day_at_secs: timing.next_day_at as u32,
|
||||||
scheduler_version: self.sched_ver() as u32,
|
scheduler_version: self.sched_ver() as u32,
|
||||||
local_offset_secs: local_offset_secs as i32,
|
local_offset_secs: local_offset_secs as i32,
|
||||||
|
first_weekday: self.get_first_weekday() as i32,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue