Skip to content
Merged
Show file tree
Hide file tree
Changes from 118 commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
9d175d6
Update @mui/x-date-pickers
imnasnainaec Jan 16, 2024
f1d101f
Fix localization, modal console error, and date selection
imnasnainaec Jan 16, 2024
46bb29b
Install material-react-table
imnasnainaec Jan 10, 2024
111a865
Add table stub
imnasnainaec Jan 10, 2024
e4d0c34
Start adding columns
imnasnainaec Jan 11, 2024
a07fa8e
Retire ReviewEntriesWord
imnasnainaec Jan 11, 2024
a8c60a3
Add definitions, domains, glosses, note columns
imnasnainaec Jan 11, 2024
331bdfd
Settle duplicate key warning
imnasnainaec Jan 11, 2024
2d04805
Add parts of speeh column
imnasnainaec Jan 12, 2024
91532ab
Add pronunciations column
imnasnainaec Jan 12, 2024
9e20c01
Adjust layout
imnasnainaec Jan 16, 2024
a687aa9
Adjust layout
imnasnainaec Jan 16, 2024
2d15e7a
Add custom column filter functions
imnasnainaec Jan 16, 2024
1b16f9c
Add column comments
imnasnainaec Jan 16, 2024
c42f3de
Improve column filters for parts of speech and domains
imnasnainaec Jan 16, 2024
fb2d14f
Merge branch 'master' into mrt
imnasnainaec Jan 16, 2024
ca6ee23
Use local state instead of redux
imnasnainaec Jan 16, 2024
f3b7138
Hook up PronunciationsCell to local state
imnasnainaec Jan 17, 2024
e8ea317
Add (read-only) row edit dialog
imnasnainaec Jan 17, 2024
5d20bae
Make progress on edit dialog
imnasnainaec Jan 17, 2024
87b141b
Merge branch 'master' into mrt
imnasnainaec Jan 17, 2024
e3d1b3b
Implement save and cancel buttons
imnasnainaec Jan 17, 2024
d16e08f
Fix ReviewEntries test
imnasnainaec Jan 17, 2024
a0a92db
Add change tracking
imnasnainaec Jan 17, 2024
1b72db7
Tidy
imnasnainaec Jan 17, 2024
650cdb3
Start developing edit senses card
imnasnainaec Jan 18, 2024
24d5c0d
Add buttons to delete/edit senses
imnasnainaec Jan 18, 2024
99c7091
Simplify domain filter to only be by id
imnasnainaec Jan 18, 2024
03e3d09
Merge branch 'master' into mrt
imnasnainaec Jan 24, 2024
6e7acbc
Enable pronunciation filtering by speaker name
imnasnainaec Jan 24, 2024
bf4bb69
Fix definition/gloss wrapping and add length limits
imnasnainaec Jan 24, 2024
6872a8f
Set custom senses/flag Headers for narrower columns
imnasnainaec Jan 24, 2024
5af9381
Only show distinct items in parts of speech column, not sense seperated
imnasnainaec Jan 24, 2024
2823e67
Remove unused import
imnasnainaec Jan 24, 2024
2c5147e
Pluralize Parts of Speech
imnasnainaec Jan 24, 2024
41c3ba6
Only show distinct items in domains column, not sense separated
imnasnainaec Jan 24, 2024
7b1f9d8
Simplify gatherGramInfo
imnasnainaec Jan 24, 2024
633b07b
Fix unit test
imnasnainaec Jan 25, 2024
2181d8f
Allow sense movement; Track sense changes
imnasnainaec Jan 25, 2024
f97c89a
Improve sorting and filtering
imnasnainaec Jan 25, 2024
a454431
Don't have sense reorder icon column when only 1 sense
imnasnainaec Jan 25, 2024
a2ee754
Create dialog for sense editing
imnasnainaec Jan 25, 2024
fcc68d6
Add definition editing
imnasnainaec Jan 25, 2024
8a5193d
Add semantic domain editing
imnasnainaec Jan 25, 2024
9eb045f
Add warning dialog when canceling edit with changes
imnasnainaec Jan 25, 2024
cbcdff6
Clear old ReviewEntriesTable
imnasnainaec Jan 25, 2024
81ec895
Narrow import to avoid baggage
imnasnainaec Jan 25, 2024
ed1d694
Tidy
imnasnainaec Jan 25, 2024
b9eacc6
Add sortingFn comments
imnasnainaec Jan 25, 2024
cf4c818
Set prettier dialog widths
imnasnainaec Jan 25, 2024
d415abe
Fix key console error
imnasnainaec Jan 29, 2024
22cedc1
Remove vestigial file
imnasnainaec Jan 29, 2024
5154287
Tidy
imnasnainaec Jan 29, 2024
9d279ab
Clean up domain sorting
imnasnainaec Jan 29, 2024
57abd65
Fix custom Header formatting
imnasnainaec Jan 30, 2024
e9fffd3
Cinch up the size formatting
imnasnainaec Jan 30, 2024
934bd73
Have empty notes alphabetically last
imnasnainaec Jan 30, 2024
ca3d297
Refine note formatting
imnasnainaec Jan 30, 2024
d89198f
Merge branch 'master' into mrt
imnasnainaec Jan 30, 2024
d93f62d
Update table packages
imnasnainaec Jan 30, 2024
6ec0007
Add button to toggle infinite scrolling
imnasnainaec Jan 30, 2024
3a8c916
Fix pagination, scrolling, and sticky header issue
imnasnainaec Feb 2, 2024
c7aecef
Add table localization
imnasnainaec Feb 2, 2024
2c4f41c
Number senses
imnasnainaec Feb 2, 2024
9e057ae
Enable adding senses
imnasnainaec Feb 2, 2024
ccac445
When saving entry edits, allow empty gloss on protected senses
imnasnainaec Feb 2, 2024
56128f2
Rerender EditDialog every time its opened
imnasnainaec Feb 2, 2024
a46762f
Fix ReviewEntriesTable test
imnasnainaec Feb 2, 2024
472fad8
Merge branch 'master' into mrt
imnasnainaec Feb 2, 2024
0c6f930
Move infinite scroll button from left to right
imnasnainaec Feb 5, 2024
ee5cb34
Merge branch 'master' into mrt
imnasnainaec Feb 5, 2024
4b1c2ba
Add scroll to top/bottom capability
imnasnainaec Feb 5, 2024
41819f8
Replace infinite-scroll toggle with All rows-per-page option
imnasnainaec Feb 5, 2024
a2d8e32
Add utility unit tests and fix boolean error
imnasnainaec Feb 6, 2024
30a2d2d
Merge branch 'master' into mrt
imnasnainaec Feb 6, 2024
065d00e
Add unit tests and cleanup EditDialog logic
imnasnainaec Feb 6, 2024
819f9bd
Remove: scroll to bottom/top buttons, 1000-rows-per-page option
imnasnainaec Feb 6, 2024
3660b36
Move EditCell files to own folder
imnasnainaec Feb 6, 2024
29ce042
Expand EditDialog testing
imnasnainaec Feb 6, 2024
fcffb80
Add EditSenseDialog testing and fix a few bugs
imnasnainaec Feb 6, 2024
b756fa6
Merge branch 'master' into mrt
imnasnainaec Feb 6, 2024
c608309
Narrow mock
imnasnainaec Feb 6, 2024
e3a2779
Expand ReviewEntriesTable testing
imnasnainaec Feb 6, 2024
38fd484
Start column-sort tests for ReviewEntriesTable
imnasnainaec Feb 6, 2024
dd6403e
Mock out uuid and start developing mockWords for sort testing
imnasnainaec Feb 7, 2024
aa2f54b
Complete column sorting tests
imnasnainaec Feb 7, 2024
b92ce7e
Fill out tests a little
imnasnainaec Feb 8, 2024
90e56b0
Test EditDialog's sense view toggle
imnasnainaec Feb 8, 2024
44a6c4a
Merge branch 'master' into mrt
imnasnainaec Feb 8, 2024
c95ed88
Only disable virtualization for testing
imnasnainaec Feb 9, 2024
d8c3e72
Try to test filter
imnasnainaec Feb 12, 2024
163dd0e
Merge branch 'mrt' of https://github.com/sillsdev/TheCombine into mrt
imnasnainaec Feb 12, 2024
38cc4a1
Test filterFns in separate file
imnasnainaec Feb 12, 2024
ef354b3
[EditDialog] Expand senses testing
imnasnainaec Feb 13, 2024
d1fa819
Merge branch 'master' into mrt
imnasnainaec Feb 13, 2024
5a24156
Use .some() instead of .find() where appropriate
imnasnainaec Feb 13, 2024
53454d5
Fix crash when filter results in 0 entries
imnasnainaec Feb 14, 2024
e839015
Merge branch 'master' into mrt
imnasnainaec Feb 14, 2024
0880193
Add localization testing
imnasnainaec Feb 14, 2024
b81e810
Merge branch 'master' into mrt
imnasnainaec Feb 14, 2024
97e5eca
[User Guide] Update Review Entries section
imnasnainaec Feb 21, 2024
a9dd499
[User Guide] Capitalize section header
imnasnainaec Feb 21, 2024
ca37005
Remove unused translations
imnasnainaec Feb 22, 2024
7774ab9
Fix tests and tidy code
imnasnainaec Feb 22, 2024
4f71509
Localize error
imnasnainaec Feb 23, 2024
91dbdf1
Merge branch 'master' into mrt
imnasnainaec Feb 23, 2024
bcde482
Hide unnecessary columns from the column menu
imnasnainaec Feb 23, 2024
d1f0e8e
Change WordsMock .tsx -> .ts
imnasnainaec Feb 23, 2024
d6d997e
Merge branch 'master' into mrt
imnasnainaec Mar 5, 2024
24a67e3
Merge branch 'master' into mrt
imnasnainaec Mar 8, 2024
71fbece
Merge branch 'master' into mrt
imnasnainaec Mar 20, 2024
c31cb89
Merge branch 'master' into mrt
imnasnainaec Mar 27, 2024
e017f32
Fix merge error
imnasnainaec Mar 27, 2024
1b26569
Fix new test errors by mocking i18n
imnasnainaec Mar 27, 2024
d90e3f1
Merge branch 'master' into mrt
imnasnainaec Mar 28, 2024
b3e0465
Merge branch 'master' into mrt
imnasnainaec Apr 3, 2024
58a1b16
Merge branch 'master' into mrt
imnasnainaec Apr 4, 2024
8854d73
Allow commit messages of length 4
imnasnainaec Apr 4, 2024
2499f73
[EditCell] Fix function name
imnasnainaec Apr 10, 2024
eafc91c
Merge branch 'master' into mrt
imnasnainaec Apr 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitlint
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[title-min-length]
min-length=4
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.zh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
541 changes: 173 additions & 368 deletions docs/user_guide/assets/licenses/frontend_licenses.txt

Large diffs are not rendered by default.

42 changes: 30 additions & 12 deletions docs/user_guide/docs/goals.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,47 @@

The Review Entries table shows all of the entries in the selected project.

### Sorting and Filtering Columns
### Columns

The columns are: Edit, Vernacular, Senses, Glosses, Domains, Pronunciations, Note, Flag, and Delete.
The columns are: Edit (no header), Vernacular, Number of Senses (#), Glosses, Domains, Pronunciations
(![Review Entries pronunciations column header](images/reviewEntriesColumnPronunciations.png){width=28}), Note, Flag
(![Review Entries flag column header](images/reviewEntriesColumnFlag.png){width=16}), and Delete (no header).

![Review Entries column headers](images/reviewEntriesColumns.png)

At the top of a column with predominantly text content (Vernacular, Glosses, Domains, Note, or Flag), you can sort
alphabetically or filter with a text search.

At the top of either the Senses or Pronunciations column, you can sort or filter by the number of senses or recordings
that entries have.
To show/hide columns or rearrange their order, click on the
![Review Entries columns edit icon](images/reviewEntriesColumnsEdit.png){width=25} icon in the top corner.

Due to the nature of Rapid Word Collection, [Data Entry](dataEntry.md) in The Combine does not support the addition of
definitions or parts of speech. However, if the project has imported data in which definitions or parts of speech were
already present, additional columns will automatically be added to the Review Entries table.
already present, additional columns will be available in the Review Entries table.

#### Sorting and Filtering

There are icons at the top of each column to
![Review Entries column filter icon](images/reviewEntriesColumnFilter.png){width=20} filter and
![Review Entries column sort icon](images/reviewEntriesColumnSort.png){width=20} sort the data.

In a column with predominantly text content (Vernacular, Glosses, Note, or Flag), you can sort alphabetically or filter
with a text search.

In the Number of Senses column or Pronunciations column, you can sort or filter by the number of senses or recordings
that entries have. In the Pronunciations column, you can also filter by speaker name.

In the Domains column, sorting is numerical by each entry's least domain id. To filter by domain, type a domain id with
or without periods. For example, "8111" and "8.1.1.1" both show all entries with a sense in domain 8.1.1.1. To also
include subdomains, add a final period to your filter. For example, "8111." includes domains "8.1.1.1", "8.1.1.1.1", and
"8.1.1.1.2". Filter with just a period (".") to show all entries with any semantic domain.

### Editing Entry Rows

You can record, play, or delete an entry's audio recordings by using the icons in the Pronunciations column. You can
delete an entire entry by using the icon in the Delete column.
You can record, play, or delete an entry's audio recordings by using the icons in the Pronunciations column.

To edit any other part of an entry, click the ![Review Entries row edit icon](images/reviewEntriesRowEdit.png){width=20}
edit icon in the initial column.

To edit an entry's vernacular form, senses (including glosses and domains), note, or flag, click the icon in the Edit
column.
You can delete an entire entry by clicking the
![Review Entries row delete icon](images/reviewEntriesRowDelete.png){width=20} delete icon in the final column.

## Merge Duplicates {#merge-duplicates}

Expand Down
Loading