Commit Graph

316 Commits

Author SHA1 Message Date
Henrik Giesel
681d82f5cc Replace CountMethodRadios with SeparateInactiveCheckbox method
* cards will still be mostly counted by ctype rather than queue
* if the user wants to include inactive cards buried and suspended will
  be first filtered out, before the rest is counted by ctype
2021-01-05 16:13:06 +01:00
Henrik Giesel
2ae09ae39e Satisfy formatter 2021-01-04 15:36:15 +01:00
Henrik Giesel
9e0984fee1 Refresh colours on Card Count Pies 2021-01-04 15:14:50 +01:00
Henrik Giesel
ecbb08e4c5 Add gatherByQueue and gatherByCtype methods 2021-01-04 14:04:51 +01:00
Henrik Giesel
47551df2f9 Add CountMethodRadios and CardCountMethod enum 2021-01-04 12:21:30 +01:00
Damien Elmes
3240fd2e15 remove empty es6 group; reference original ts_library instead 2021-01-02 21:18:10 +10:00
Damien Elmes
85621867ca remove the unused ts/vendor folder 2021-01-02 11:25:09 +10:00
Damien Elmes
5ec5a47708 merge separate vendor rules into single rule
Rather than creating a separate rule for each package, we can just
create a generic one and reuse it. Also switch to keyword arguments
in the resulting macros, as it's easier to read.
2021-01-02 11:14:00 +10:00
Henrik Giesel
f97ad260bb Add base argument to copy_select_files 2021-01-01 14:39:15 +01:00
Henrik Giesel
12dfb38609 Be a bit more precise when excluding mathmaps_ie.js
* for documentation purposes
2021-01-01 14:16:52 +01:00
Henrik Giesel
8e8a3e220b Remove duplicated logic in ts bzl files by using copy_select_files 2021-01-01 13:45:25 +01:00
Henrik Giesel
ebb8171021 Add css-browser-selector to BAZEL build file in data/web/js/vendor 2020-12-31 16:41:31 +01:00
Henrik Giesel
bfd9c93e61 Add css-browser-selector as bazel rule, and update from 0.4.0 to 0.6.5 2020-12-31 16:27:52 +01:00
Henrik Giesel
079ce6bdf0 Add bazel recipe and update protobufjs to 6.10.2 2020-12-31 16:06:44 +01:00
Damien Elmes
6902a61c21 use :yarn not :yarn_bin
The latter fails on Windows
2020-12-31 12:32:51 +10:00
Damien Elmes
29c2fa2317 add add.sh helper for adding dependency and updating licenses 2020-12-31 12:20:51 +10:00
Damien Elmes
ace834a21b run ts/update.sh 2020-12-31 12:18:49 +10:00
Henrik Giesel
a22d303e2f Add jquery-ui to vendor/BUILD.bazel 2020-12-30 12:06:06 +01:00
Henrik Giesel
988d0df3e7 Install jquery-ui-dist 2020-12-30 11:56:49 +01:00
Henrik Giesel
84f8a2450a Add jquery-ui bazel build file 2020-12-30 11:56:20 +01:00
Damien Elmes
9e1eaacc06 Revert "Merge pull request #873 from hgiesel/otherjsdeps"
This reverts commit 62600051ae, reversing
changes made to 88553acb0d.

- Standard graphs render incorrectly on latest version - the wrong number
of days are shown, and the grid lines look wrong. Any version after 0.8.3
seems to suffer from this problem.
- Pie graphs and stack graphs don't render - they are provided in separate
files, and plot.js in previous Anki versions has them included in the one
file. To maintain compatibility with add-ons, we'd need to create a single
file as before, instead of importing multiple files.

If the above issues are fixed I'd be happy to merge this in again, but
as the old graphs are on the way out, it's probably not worth the effort.
2020-12-30 14:13:52 +10:00
Henrik Giesel
ef9b52f861 Copy flot file to vendor directory 2020-12-29 12:11:28 +01:00
Henrik Giesel
6aad58260b Install flot 4.2.1
Old version was 0.8.3
2020-12-29 12:02:41 +01:00
Damien Elmes
ddc48d8897 controller should be marked nullable
While 'SvelteComponent | null' seems to make it into the .tsx file
created by svelte2tsx, the subsequent tsc call seems to discard the
'| null' part when creating the .d.ts file. Hack around it with a cast
for now; this may be fixed if we move to ts_project in the future.
2020-12-29 15:21:46 +10:00
Damien Elmes
e948544b59 use local strategy for Svelte on CI
Allows some type errors to surface that were only being picked up
on Windows.

The root cause seems to be TypeScript picking up other .d.ts/.tsx
files in the same folder, which it can only do on Windows due to the
lack of sandboxing. On other platforms the other files can't be found,
and tsc changes the types into 'any'.

I experimented with modifying rules_svelte to build all .tsx files up
front and convert them to .d.ts in bulk, but ran into further issues
with conflicting types, as the typings in svelte2tsx seem to conflict
with Svelte's built-in types, and passing the dependencies in explicitly
causes them to be checked even though --skipLibCheck is passed in to
TypeScript.

Forcing sandboxing off is an ugly hack, and our best approach moving
forward may be to switch to ts_project for the Svelte generation -
it does appear that rules_nodejs favours it over ts_library anyway.
2020-12-29 14:50:33 +10:00
Damien Elmes
be7556629b
Merge pull request #864 from hgiesel/graphs
Decouple GraphsPage from individual graphs and RangeBox
2020-12-29 10:14:04 +10:00
Henrik Giesel
0c95cb3514 Remove jquery from Anki repo and replace with Bazel BUILD 2020-12-28 13:16:12 +01:00
Damien Elmes
a21c93f167
Merge pull request #863 from hgiesel/statsoverscroll
Prevent stats screen from overscrolling
2020-12-28 10:34:06 +10:00
Henrik Giesel
0a24f1b2f7 Fix typo 2020-12-27 02:04:45 +01:00
Henrik Giesel
3d7dbfa61c Fix formatting 2020-12-26 18:24:24 +01:00
Henrik Giesel
a7e0fd317f Prevent stats screen from overscrolling 2020-12-26 15:29:45 +01:00
Henrik Giesel
b9fa68673d Add svelte lib as bazel dependency 2020-12-26 15:17:30 +01:00
Henrik Giesel
c72e9e5329 Pass in RangeBox as an argument, decoupling it from GraphsPage 2020-12-26 14:40:55 +01:00
Henrik Giesel
fb33be70b5 Fix displaying issue with active spinner 2020-12-26 00:16:54 +01:00
Henrik Giesel
4826369d7d Make Year/All display correctly 2020-12-26 00:08:24 +01:00
Henrik Giesel
bd47e7c8bf Move spinner back to RangeBox 2020-12-25 22:59:11 +01:00
Henrik Giesel
ea68b5d801 Put RangeBox into its own component 2020-12-25 22:29:42 +01:00
Henrik Giesel
7b5e0134e5 Make spinner's position sticky in relation to graphsContainer 2020-12-25 21:49:56 +01:00
Henrik Giesel
6559b41734 Put a transition:fade on the spinner 2020-12-25 20:11:46 +01:00
Henrik Giesel
aeca0e0544 Remove .active class from .spin 2020-12-25 20:07:52 +01:00
Henrik Giesel
bd1505bdca Turn async function into svelte statement 2020-12-23 16:45:00 +01:00
Henrik Giesel
d51def9d6e Making days settable does not make sense, as it will be overwritten 2020-12-23 16:20:12 +01:00
Damien Elmes
02d7e55f9b update to rules_nodejs 3.0.0
Seems to fix the rollup issues on Windows.
2020-12-23 16:05:15 +10:00
Henrik Giesel
ecaf0d95a3 Move infile to css to scss file 2020-12-22 22:39:22 +01:00
Henrik Giesel
ebc1a86b2e Make showing of rangeBox based on parameter 2020-12-22 22:36:39 +01:00
Henrik Giesel
5d117cf1a0 Bubble up days and search to caller 2020-12-22 22:25:47 +01:00
Henrik Giesel
008940026e Pass in graphs as arguments into graphs() 2020-12-22 22:09:23 +01:00
Damien Elmes
4c06d89644 fix path to anki lib in ts/ when editing 2020-12-16 14:15:49 +10:00
Damien Elmes
77c9db5bba plural rules and decimal separator should use bundle's language
Instead of providing the list of languages in preferred order, when
creating a bundle we need to specify the bundle language as the first
language, so that the correct plural rules are used. Fluent's docs
are misleading here; I will submit a PR to fix them.

The old behaviour caused:
https://forums.ankiweb.net/t/bug-in-review-intervals-for-some-languages-in-number-of-cards/5744
2020-12-14 14:23:49 +10:00
Damien Elmes
1da327c725 minor doc updates 2020-12-11 22:37:12 +10:00
Damien Elmes
178ad36a5f bump ts deps 2020-12-09 15:47:34 +10:00
Damien Elmes
8a80ffe53a add rule to copy mathjax from node_modules 2020-11-15 20:22:28 +10:00
Henrik Giesel
afc7bdf642 Add Mathjax filegroup 2020-11-14 14:14:25 +01:00
Henrik Giesel
6104ea26fb Remove @types/mathjax as it is for MathJax 2 2020-11-14 14:14:25 +01:00
Henrik Giesel
6d4ff1212d Rip out MathJax 2 and setup MathJax 3 environment 2020-11-14 14:14:25 +01:00
Damien Elmes
410987f0a6 relative js package paths 2020-11-12 21:07:59 +10:00
Damien Elmes
b71f55dcc5 make 'bazel run ts:format' work
We're cheating a bit by having it fix files in qt's data folder
as well, but this makes it easier to share the config file.
2020-11-12 20:49:00 +10:00
Damien Elmes
5bb3d7c114 format_fix -> format; rename svelte-check for consistency 2020-11-12 20:19:32 +10:00
Damien Elmes
eed9ca9885 export runtime js licenses 2020-11-12 20:03:41 +10:00
Damien Elmes
2b9d3a808d update ts deps 2020-11-12 20:03:41 +10:00
Damien Elmes
264dd8f1ea fix external consumption of ts rules, and simplify import path 2020-11-05 11:01:52 +10:00
Damien Elmes
e0817c004d move backend.proto into rslib/ 2020-11-02 16:28:31 +10:00
Damien Elmes
b17d537a9e remove old makefiles 2020-11-01 14:41:01 +10:00
Damien Elmes
aea0a6fcc6 initial Bazel conversion
Running and testing should be working on the three platforms, but
there's still a fair bit that needs to be done:

- Wheel building + testing in a venv still needs to be implemented.
- Python requirements still need to be compiled with piptool and pinned;
need to compile on all platforms then merge
- Cargo deps in cargo/ and rslib/ need to be cleaned up, and ideally
unified into one place
- Currently using rustls to work around openssl compilation issues
on Linux, but this will break corporate proxies with custom SSL
authorities; need to conditionally use openssl or use
https://github.com/seanmonstar/reqwest/pull/1058
- Makefiles and docs still need cleaning up
- It may make sense to reparent ts/* to the top level, as we don't
nest the other modules under a specific language.
- rspy and pylib must always be updated in lock-step, so merging
rspy into pylib as a private module would simplify things.
- Merging desktop-ftl and mobile-ftl into the core ftl would make
managing and updating translations easier.
- Obsolete scripts need removing.
- And probably more.
2020-11-01 14:26:58 +10:00
Damien Elmes
70a73b7c60 "fix" ts failing in CI due to improved upstream type signatures
...by throwing non-null assertions everywhere.
2020-09-29 22:13:25 +10:00
Damien Elmes
bbbd3e95c5 use separate opacity css for Qt 5.9/Chromium 56
Fixes black area on alternate Mac build:
https://forums.ankiweb.net/t/statistics-bug-line-graph-graphic/3745
2020-09-27 11:47:08 +10:00
Damien Elmes
fe36fa5fd9 fix average added
https://forums.ankiweb.net/t/statistics-bug-cards-added-average/3556
2020-09-21 11:31:27 +10:00
Damien Elmes
061d89bbda fix padding in RTL langs
closes #757
2020-09-09 09:44:15 +10:00
Damien Elmes
a43135f3d5 fix custom study link being shown in filtered deck
https://forums.ankiweb.net/t/crashing-after-custom-study-learn-forgotten-cards/3013
2020-09-04 08:31:33 +10:00
Damien Elmes
ce49ca9401 log manual reschedule, but ignore the log entry in the stats 2020-09-02 17:56:23 +10:00
Damien Elmes
449f335dde add a small default margin 2020-09-01 10:24:38 +10:00
Damien Elmes
a834df60ce rename some card+note fields in backend 2020-09-01 10:24:38 +10:00
Damien Elmes
f997c7eb8b remove debug statement from graphs 2020-09-01 10:24:38 +10:00
Damien Elmes
dcb6bf2cd4 update ts deps to fix svelte-vscode 2020-09-01 10:24:38 +10:00
Damien Elmes
e5685254c6 reimplement congrats screen in Rust+Typescript 2020-09-01 10:24:38 +10:00
Damien Elmes
0564d4cf86 use css vars for graph styling as well; base webview.scss off core.scss 2020-09-01 10:24:38 +10:00
Damien Elmes
748745fe1a drop the old sass vars and define the properties directly 2020-09-01 10:24:38 +10:00
Damien Elmes
2d26280dab migrate the majority of the sass vars to css variables
Allows add-ons to easily override the theme, and allows us to apply
styling to elements outside of the normal document flow (like applying
the normal background colour to a position: fixed element).
2020-09-01 10:24:38 +10:00
Damien Elmes
ab32623dde move _vars to outer ts folder
First step in sharing styling with graphs + future .html files
2020-09-01 10:24:38 +10:00
Damien Elmes
718b45b505 allow tapping on body to clear tooltip 2020-08-21 15:16:27 +10:00
Damien Elmes
ef47ac96a7 keep label colour box and description together on small screens 2020-08-21 15:06:03 +10:00
Damien Elmes
2b1bcda937 don't fill in blanks outside of year range 2020-08-21 13:41:34 +10:00
Damien Elmes
d24f34c238 blank filling was off by one
leading to jan 1 of next year being included
2020-08-21 13:40:50 +10:00
Damien Elmes
98a0753eb8 average ease + add % to ease ticks 2020-08-21 13:00:16 +10:00
Damien Elmes
c5996fa29b off-white background in graphs 2020-08-20 16:52:56 +10:00
Damien Elmes
4086042970 switch the card counts to a pie graph 2020-08-12 18:58:21 +10:00
Damien Elmes
2364d47687 shift card counts down and future due up 2020-08-10 15:51:45 +10:00
Damien Elmes
649ab9d56a increase h1 top margin; decrease bottom graph margin 2020-08-10 15:34:06 +10:00
Damien Elmes
94e8a8b274 match card counts margin with other graphs 2020-08-10 15:32:03 +10:00
Damien Elmes
62102d85b2 add space after colour square 2020-08-10 15:02:46 +10:00
Damien Elmes
459b9b364d fix lack of padding at bottom of top range area 2020-08-10 14:39:02 +10:00
Damien Elmes
4b14ff8c8e hide backlog button when there's no backlog 2020-08-10 14:37:23 +10:00
Damien Elmes
ceb342cbc2 fix "32 of 31 days"
https://forums.ankiweb.net/t/feedback-on-the-new-graphs-in-anki-ankimobile/1671/41?u=dae
2020-08-10 13:56:16 +10:00
Damien Elmes
1470b3683b more size tweaks for small screens 2020-08-05 19:05:34 +10:00
Damien Elmes
9fe9c7115b reviews graph needs numbers in local locale 2020-08-05 19:05:24 +10:00
Damien Elmes
365e584db8 hide odd hours in small screen 2020-08-05 18:58:31 +10:00
Damien Elmes
818012e015 slightly darker start to reviews graph 2020-08-05 16:06:34 +10:00
Damien Elmes
d8a75c2307 remove selective fade in answer buttons graph 2020-08-05 15:56:21 +10:00
Damien Elmes
ddfd6511bf reduce maximum lightness in added/interval graphs 2020-08-05 15:43:44 +10:00
Damien Elmes
15c50e68eb make the cumulative area a bit more visible 2020-08-05 15:35:07 +10:00
Damien Elmes
b3df572f31 skip missing datapoints in hour graph 2020-08-05 15:25:56 +10:00
Damien Elmes
32612fc84c right axis for reviews graph 2020-08-05 15:01:51 +10:00
Damien Elmes
6592fd0da9 add right axis to hour graph 2020-08-05 15:01:44 +10:00
Damien Elmes
43d8e5c9f0 drop 99.9% interval 2020-08-05 14:50:08 +10:00
Damien Elmes
1909d0a9a2 add right axis to histograms; nice y axis 2020-08-05 14:49:57 +10:00
Damien Elmes
0673193f27 subtitles under title 2020-08-04 17:50:47 +10:00
Damien Elmes
510d9d0bf5 reduce maximum width 2020-08-04 17:29:17 +10:00
Damien Elmes
43c6ec09bd increase axis label size at small screen widths 2020-08-04 17:29:13 +10:00
Damien Elmes
cd4a4dada8 added graph table 2020-08-04 16:01:11 +10:00
Damien Elmes
25948a328e average interval 2020-08-04 15:28:41 +10:00
Damien Elmes
c9f9ae532e textual data for forecast
Also stick to exact xMax, so we match the old graphs.
2020-08-04 15:15:57 +10:00
Damien Elmes
1b62b932fe factor out data table into separate file 2020-08-04 14:41:26 +10:00
Damien Elmes
a5a12e0d00 add textual data to reviews graph 2020-08-04 14:28:46 +10:00
Damien Elmes
07594bc375 fix mature cutoff in reviews graph
https://forums.ankiweb.net/t/statistics-bugs-after-update-2-1-5-to-2-1-29/1620/4
2020-08-01 11:27:24 +10:00
Damien Elmes
1353590a92 move card counts tooltip into permanent table 2020-07-31 17:19:31 +10:00
Damien Elmes
02424ac789 tweaks to print view of graphs 2020-07-31 13:33:41 +10:00
Damien Elmes
f9891da076 handle preview cards in graphs 2020-07-30 09:11:18 +10:00
Damien Elmes
b6687f0203 update svelte-check minimum 2020-07-29 12:06:48 +10:00
Damien Elmes
6d0a8e597e Revert "svelte-check doesn't want a CSS string"
This reverts commit bbff62bf32.

Now they do again.🤷
2020-07-29 12:06:33 +10:00
Damien Elmes
bbff62bf32 svelte-check doesn't want a CSS string 2020-07-28 11:16:10 +10:00
Damien Elmes
0e4dae8ee1 update ts deps 2020-07-28 11:15:49 +10:00
Damien Elmes
88fee1b7aa backlog fix
private message:
https://forums.ankiweb.net/t/issues-on-stats-page-anki-2-1-28beta6/1114
2020-07-27 12:10:45 +10:00
Damien Elmes
15c9cd9108 fix handling of due reviews in filtered deck+future due graph 2020-07-26 10:28:56 +10:00
Damien Elmes
796696afde include learning cards due today in future due graph 2020-07-24 11:09:22 +10:00
Damien Elmes
80a2bfa642 ask user to check db when graphs fail to load 2020-07-24 09:56:28 +10:00
Damien Elmes
bb6124cfd5 letter-spacing breaks RTL layout
https://forums.ankiweb.net/t/anki-2-1-29-beta/1220/8
2020-07-22 15:26:29 +10:00
Damien Elmes
2049f17469 hacks to fix (misaligned (rtl text
To fix this properly the string concatenation should probably be
broken into separate i18n strings and placed in Fluent

https://forums.ankiweb.net/t/anki-2-1-29-beta/1220/8
2020-07-22 15:15:52 +10:00
Damien Elmes
1687f797de ts check doesn't require build 2020-07-22 14:16:51 +10:00
Damien Elmes
0d8df6be20 run svelte-check as part of check 2020-07-22 14:11:35 +10:00
Damien Elmes
2635f8f980 fix some typescript warnings 2020-07-22 14:11:22 +10:00
Damien Elmes
4b6033e17f use short form for time units in graph axis 2020-07-22 12:59:56 +10:00
Damien Elmes
44668c5b1d include 1+ day learning cards in future due graph 2020-07-21 14:10:32 +10:00
Damien Elmes
39ae5936fc switch graphRange on revlogRange change 2020-07-17 14:39:08 +10:00
Damien Elmes
ec9e3646c4 add range selectors to answer button and hour graphs 2020-07-17 14:39:08 +10:00
Glutanimate
8183ed7fa7 Add IDs to stats sections
Allows more targeted manipulation by add-ons
2020-07-16 20:44:21 +02:00
Damien Elmes
658a009ec4 tweak spacing 2020-07-16 13:28:06 +10:00
Damien Elmes
0c1d5ae5a4 add table to reviews tooltip 2020-07-16 13:25:13 +10:00
Damien Elmes
1e48188c14 add table in card count tooltip for readability 2020-07-16 13:25:02 +10:00
Damien Elmes
0ff13828d4 show all counts in tooltip 2020-07-16 12:28:31 +10:00
Damien Elmes
fd0383cbe0 slightly increase x ticks 2020-07-16 11:53:20 +10:00
Damien Elmes
db832ec739 increase number of y ticks 2020-07-16 11:50:04 +10:00
Damien Elmes
6807f49818 smaller button labels on a small screen 2020-07-13 20:52:57 +10:00
Damien Elmes
da0e0e1854 show daily total as well in reviews graph 2020-07-08 14:07:10 +10:00
Damien Elmes
05302e6c2f fix overlapping ranges in histograms
It's bin.x0 <= x < bin.x1
2020-07-08 14:01:09 +10:00
Damien Elmes
7a08970bf7 another attempt at fixing review graph
This should correctly show today count in the 1 month/3 month graphs.
1+ year will have a very tiny bar, but the today count is not so
important at that range. I experimented with shifting the numbers
by one at the gathering stage (so -1 = today) - that makes today fit
in the previous bin, but means the bars no longer match the ticks.
2020-07-08 13:31:09 +10:00
Damien Elmes
ca24dfddb1 make tooltip bg stand out slightly 2020-07-07 12:11:51 +10:00
Damien Elmes
5669101748 de-emphasise axis line, but don't hide completely 2020-07-07 12:06:27 +10:00
Damien Elmes
1162a8feb5 fix card count graph
https://forums.ankiweb.net/t/anki-2-1-28-beta/629/24
2020-07-07 11:39:58 +10:00
Damien Elmes
cfc33815da fix bar of wrong size 2020-07-06 19:16:03 +10:00
Damien Elmes
f072710f67 cards->reviews; total->running total 2020-07-06 19:16:03 +10:00