Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(1/3) Merge questionnaire into master #603

Closed
Closed
Changes from 3 commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
341fbba
add multi-content annotations, refs #370
May 12, 2020
c54b955
refactor modal-*-labelled views
May 27, 2020
363c82f
add optional title to content items, refs #370, #388
Jun 2, 2020
a31ffcc
add multi-content annotations, refs #370
May 12, 2020
d087d01
add questionnaire based annotations
May 12, 2020
dd3bc7e
add questionnaire from university of muenster
Jul 9, 2020
6ec4991
Merge branch 'master' into mca-update
JulianKniephoff Oct 15, 2020
6f609ba
Merge branch 'mca' into mca-update
JulianKniephoff Oct 15, 2020
1c98f3d
Merge branch 'master' into mca
JulianKniephoff Oct 15, 2020
7884d62
Merge branch 'master' into mca
JulianKniephoff Nov 10, 2020
3b085b6
Merge branch 'master' of github.com:opencast/annotation-tool into mca
JulianKniephoff Jan 14, 2021
8276fa2
First draft of the MCA backend
JulianKniephoff Nov 16, 2020
241e961
Remove some dead code
JulianKniephoff Nov 18, 2020
3bd076f
Fix a typo
JulianKniephoff Nov 18, 2020
067c062
Improve "preview" when deleting an annotation
JulianKniephoff Jan 6, 2021
e265cef
Rerender expanded annotations when the categories change
JulianKniephoff Jan 6, 2021
ff41887
More work towards fully functioning multi content annotations
JulianKniephoff Jan 14, 2021
8c2e938
Improve and unify the coloring of MCAs between the list and timeline
JulianKniephoff Jan 6, 2021
cc3bb78
Delete remnants of moved/renamed code
JulianKniephoff Jan 14, 2021
830c604
Access a label's category in a more uniform way
JulianKniephoff Jan 14, 2021
0b8a6f0
Merge remote-tracking branch 'origin/fix-deleting-scales' into mca
JulianKniephoff Jan 18, 2021
1ba915b
Improve the behavior when you delete "structure"
JulianKniephoff Jan 18, 2021
c6de1cd
Remove an unused parameter `Category#toExportJSON`
JulianKniephoff Jan 18, 2021
8c8fce3
Exclude deleted labels from the category export
JulianKniephoff Jan 18, 2021
039d334
Ignore deleted scalevalues in the category export
JulianKniephoff Jan 18, 2021
a33532a
Reformat some things
JulianKniephoff Jan 19, 2021
52c3e04
Slightly fix `package-lock.json`
JulianKniephoff Jan 19, 2021
94fbe13
Always start the scale editor in "not-edit mode"
JulianKniephoff Jan 19, 2021
22179c0
Allow updating deleted categories, labels, etc.
JulianKniephoff Jan 19, 2021
1acaa09
Merge branch 'fix-double-modals' into mca
JulianKniephoff Jan 19, 2021
458ec09
Style
JulianKniephoff Jan 19, 2021
18425e4
Keep deleted entities around in the frontend ...
JulianKniephoff Jan 19, 2021
d50312f
Further improvements to deleting and updating structure
JulianKniephoff Jan 20, 2021
9ae31f4
Style
JulianKniephoff Jan 20, 2021
599ebca
Allow deleting and updating already deleted structure
JulianKniephoff Jan 20, 2021
1f22846
Merge remote-tracking branch 'origin/fix-german-translations' into mca
JulianKniephoff Jan 20, 2021
94ef57f
Merge remote-tracking branch 'origin/scale-editor-improvements' into mca
JulianKniephoff Jan 20, 2021
4656dae
Update content item type of labeled content items when saving them
JulianKniephoff Jan 20, 2021
57c4eb1
Preserve expansion state of content items across rerenders
JulianKniephoff Jan 20, 2021
6fd91a7
Merge branch 'more-scale-editor-improvements' into mca
JulianKniephoff Jan 20, 2021
0581bfb
Merge remote-tracking branch 'luniki/questionnaire' into questionnaire
JulianKniephoff Jan 20, 2021
96d8dd2
Fix build and basic errors
JulianKniephoff Jan 20, 2021
efe3d25
Add a missing dependency and fix some stylistic issues
JulianKniephoff Jan 20, 2021
3f8c004
Readd a translation key that was deleted on accident
JulianKniephoff Jan 20, 2021
9c23c04
Some more stylistic and dependency issues
JulianKniephoff Jan 20, 2021
069159f
Always allow adding new content items for now
JulianKniephoff Jan 21, 2021
25606ed
Add basic migration script
JulianKniephoff Jan 21, 2021
5a83d4d
Remove unused field from questionnaire JSON
JulianKniephoff Jan 22, 2021
0e3e826
Format the questionnaire nicely
JulianKniephoff Jan 22, 2021
8e2eca6
Adapt the questionnaire
JulianKniephoff Jan 22, 2021
6a2c4f2
Remove the double scrollbar from the questionnaire view
JulianKniephoff Jan 26, 2021
68e6f42
Merge branch 'master' into questionnaire
JulianKniephoff Feb 15, 2021
9c0ae9f
WIP 1
Arnei Jul 30, 2021
9844b6a
Fix module paths
JulianKniephoff Aug 2, 2021
4568ab4
Merge branch 'questionnaire' into questionnaire-annotation-new-field
Arnei Aug 2, 2021
a6483fa
Added new field createdFromQuestionnaire to annotations
Arnei Aug 2, 2021
38cbb5c
Merge pull request #504 from Arnei/questionnaire-annotation-new-field
JulianKniephoff Sep 8, 2021
498e095
show all categories, refs #505
Sep 8, 2021
6dc6939
resets questionnaire after an annotation was created.
Sep 8, 2021
d0f1dbb
Protect annotations created by questionnaire.
Sep 17, 2021
628369c
Merge pull request #514 from luniki/505-show-all-categories
JulianKniephoff Sep 22, 2021
f85d5a0
Merge pull request #515 from luniki/506-reset-form-after-submit
JulianKniephoff Sep 22, 2021
8a9a3cc
Update dependencies to compile with Java 11
JulianKniephoff Apr 26, 2021
37c2877
Fix the backend tests
JulianKniephoff Jun 25, 2021
8a226c9
Provisional fix for the deletion tests
JulianKniephoff Sep 22, 2021
27d445c
Merge branch '507-508-edit-only-via-questionnaire' into questionnaire
JulianKniephoff Sep 23, 2021
f530abd
add
ComeIn-NRW Oct 7, 2021
ce58c6a
fix comments
ComeIn-NRW Oct 21, 2021
723d192
fix validation questionnaire
ComeIn-NRW Oct 21, 2021
779e53d
some quick look changes
ComeIn-NRW Oct 21, 2021
72807ac
hide deleted categories in questionnaire
ComeIn-NRW Oct 21, 2021
2716e50
add edit functions, small fixes
ComeIn-NRW Oct 21, 2021
730a7c8
add missing language translations annotate.confirm edit
ComeIn-NRW Oct 22, 2021
50ed4c6
style changes to (hopefully) imporive usability
ComeIn-NRW Oct 22, 2021
7be1487
fixes #214
ComeIn-NRW Oct 27, 2021
f3da389
workaround fullscreen bug chrome (#214)
ComeIn-NRW Oct 27, 2021
2c5536c
sort labels
github-canni Apr 8, 2022
a6e9487
fix label size
github-canni Apr 8, 2022
f18087e
sort categories
github-canni Apr 8, 2022
44d6ccd
removed background color list annotation
github-canni Apr 8, 2022
91e39bd
change active color
github-canni Apr 8, 2022
2a64bb0
enlarge modal
github-canni Apr 8, 2022
1a22cf7
hide mca creator
github-canni Apr 8, 2022
0139481
change label display
github-canni Apr 8, 2022
1728024
localstorage questionnaire
Apr 10, 2022
54278a9
feature: items always draggable
github-canni Apr 11, 2022
2273b71
timeline - font color black
github-canni Apr 11, 2022
362c887
label tmpl
github-canni Apr 11, 2022
8247246
text tmpl
github-canni Apr 11, 2022
f44a429
category tmpl
github-canni Apr 11, 2022
d55d426
fix overflow
github-canni Apr 11, 2022
0c782cb
switch layout to tab on edit (questionnaire)
github-canni Apr 12, 2022
d04b475
get name for nickname (instead of user_extid)
Apr 22, 2022
4ca9d0b
fix fullscreen bug
Apr 22, 2022
8397285
hand over framerate and resolution additionally as sources-properties
github-canni May 4, 2022
14d8608
swap symbol
ComeIn-NRW May 18, 2022
361400e
swap symbol (2)
ComeIn-NRW May 18, 2022
a737633
Add new sharing option to the `ACCESS` enum
JulianKniephoff Apr 19, 2021
7788ee8
add sharing option group to access enum
ComeIn-NRW May 18, 2022
e4af065
show only isPublic || isMine categories
ComeIn-NRW May 23, 2022
4a42479
unhide description
ComeIn-NRW May 23, 2022
004f622
reduced margin questionnaire
ComeIn-NRW May 23, 2022
0e9015b
Merge master branch + Fix conflicts. Potentially WIP, needs thorough …
ChristianOellers Jul 25, 2022
70e2281
Revert wrong merge-conflict resolve decision to state of 1c30633eb21c…
ChristianOellers Aug 4, 2022
868e26d
VsCode support
ChristianOellers Aug 4, 2022
150b0ea
Update migration script
ChristianOellers Aug 4, 2022
add5e1b
WIP Merge - Variants of parse() - both fail differently
ChristianOellers Jul 26, 2022
44f64db
VsCode support improvement
ChristianOellers Aug 5, 2022
95996cb
Self-QA from another, separate Master-merge based on new knowledge. C…
ChristianOellers Aug 8, 2022
4119547
Fix modals - Add missing content
ChristianOellers Aug 12, 2022
5253d1a
Add missing function
ChristianOellers Aug 12, 2022
517f9f2
Reset wrongly applied historical changes for modals; except the #dial…
ChristianOellers Aug 18, 2022
3a065ba
Implement refactoring of category/free-text filtering of annotations,…
ChristianOellers Aug 18, 2022
56d95bd
Java support
ChristianOellers Aug 23, 2022
f5daf8d
Fix duplicate function. Fix comments not being displayed anymore
ChristianOellers Aug 23, 2022
647e2c2
404 URL workaround fix: On category deletion, the last GET request wo…
ChristianOellers Sep 20, 2022
4d46238
Don't format
ChristianOellers Sep 22, 2022
db785c5
Fix XLS export: Respect content and MCA items. WIP: Scale + Values
ChristianOellers Sep 23, 2022
aac7b7a
Resort export
ChristianOellers Sep 23, 2022
bcd568a
Remove outdated files that have been removed in master (mistake durin…
ChristianOellers Sep 23, 2022
8e6e0bc
Examination - WIP
ChristianOellers Sep 26, 2022
3498a8b
Examination, debugging, pre-fix state
ChristianOellers Sep 30, 2022
33cc459
Fix scale values not being able to saved properly
ChristianOellers Oct 1, 2022
0c8acb0
Comments to check modal bug
ChristianOellers Oct 1, 2022
d966448
.
ChristianOellers Oct 1, 2022
7313e46
Update VSCode config
ChristianOellers Oct 4, 2022
38e34d3
Remove old scripts (accidentially kept during merge)
ChristianOellers Oct 4, 2022
725bb93
XLS/CSV export fix (basically, but without scales yet)
ChristianOellers Oct 4, 2022
472c991
Fix scale saving
ChristianOellers Oct 4, 2022
1727c15
Merge master. Java/DTO: Added @Lob to field content and removed text …
ChristianOellers Nov 9, 2022
16d3dff
Merged master
ChristianOellers Mar 21, 2023
17e495f
Fixed merge conflict - Whitespaces
ChristianOellers Mar 26, 2023
60fe7f2
Fix db compatibility issues with Opencast 13
Arnei Jun 7, 2023
f0d0526
Fix license text
JulianKniephoff Jul 13, 2023
edd9970
Rename Maven parameter `maxWarnings`
JulianKniephoff Jul 13, 2023
7726bfe
Update to `grunt-stylelint@^0.17.0` and `stylelint@^14`
JulianKniephoff Jul 13, 2023
9ebefa8
Update and adapt our use of `{grunt-,}stylelint` to upstream
JulianKniephoff Jul 13, 2023
acc3023
Bump word-wrap from 1.2.3 to 1.2.4 in /frontend
dependabot[bot] Jul 19, 2023
c58f98c
Merge pull request #610 from JulianKniephoff/stylelint
JulianKniephoff Jul 19, 2023
52c0f3a
Merge pull request #612 from opencast/dependabot/npm_and_yarn/fronten…
JulianKniephoff Jul 19, 2023
675d8ce
Code Cleanup
Arnei Jul 20, 2023
615155a
Make findById more consistent
Arnei Jul 20, 2023
cad330f
Fix support Opencast version
Arnei Jul 20, 2023
daa7367
Copy `configureQuery` from Opencast
Arnei Jul 24, 2023
486692d
Indentation
Arnei Jul 24, 2023
563a73d
Makes use of Java's polymorphic exception handling, instead of rollin…
Arnei Jul 24, 2023
20a705c
Use id function everywhere
Arnei Jul 24, 2023
4816134
Dont cast, pass type
Arnei Jul 24, 2023
66a049e
Make private
Arnei Jul 25, 2023
9828d19
Make private
Arnei Jul 25, 2023
541b95a
Drop dead code
Arnei Jul 25, 2023
5ff454b
Merge pull request #607 from Arnei/fix-db-rework-issues-oc-13
JulianKniephoff Jul 25, 2023
f587a52
Clean up `persistence.xml`
JulianKniephoff Jul 13, 2023
e52fa17
Update `h2`
JulianKniephoff Jul 13, 2023
c4e7f87
Merge pull request #611 from JulianKniephoff/h2
Arnei Jul 28, 2023
b3e691f
Revert "Update `h2`"
JulianKniephoff Jul 28, 2023
c6ebdd7
Merge pull request #613 from opencast/revert-611-h2
JulianKniephoff Jul 28, 2023
78819d9
Clean up `persistence.xml`
JulianKniephoff Jul 13, 2023
7947760
Scope `h2` to `test`
JulianKniephoff Jul 28, 2023
3fe3b7a
Fix a test
JulianKniephoff Aug 11, 2023
ade4456
Get rid of a redundant workaround
JulianKniephoff Aug 11, 2023
a2c617d
Update REST Assured
JulianKniephoff Aug 11, 2023
de79678
Get rid of warnings regarding parallel builds
JulianKniephoff Aug 11, 2023
3c830ae
Merge pull request #615 from JulianKniephoff/maintenance
JulianKniephoff Aug 14, 2023
2b2e976
Remove an unused test file
JulianKniephoff Aug 14, 2023
2443773
Merge branch 'master' into cc/master-merge
JulianKniephoff Aug 14, 2023
90f33ee
Remove VSCode stuff
JulianKniephoff Aug 14, 2023
5fcbb65
Fix a typo
JulianKniephoff Aug 17, 2023
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
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ public class AnnotationDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_annotation_tags", joinColumns = @JoinColumn(name = "annotation_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ public class CategoryDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_category_tags", joinColumns = @JoinColumn(name = "category_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ public class CommentDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_comment_tags", joinColumns = @JoinColumn(name = "comment_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ public class LabelDto extends AbstractResourceDto {
@Column(name = "series_label_id")
private Long seriesLabelId;

@Column(name = "value", nullable = false)
@Column(name = "\"VALUE\"", nullable = false)
private String value;

@Column(name = "abbreviation", nullable = false)
@@ -90,7 +90,7 @@ public class LabelDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_label_tags", joinColumns = @JoinColumn(name = "label_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ public class ScaleDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_scale_tags", joinColumns = @JoinColumn(name = "scale_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ public class ScaleValueDto extends AbstractResourceDto {
@Column(name = "name", nullable = false)
private String name;

@Column(name = "value", nullable = false)
@Column(name = "\"VALUE\"", nullable = false)
private double value;

@Column(name = "order_value", nullable = false)
@@ -82,7 +82,7 @@ public class ScaleValueDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_scale_value_tags", joinColumns = @JoinColumn(name = "scale_value_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ public class TrackDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_track_tags", joinColumns = @JoinColumn(name = "track_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ public class UserDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_user_tags", joinColumns = @JoinColumn(name = "user_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ public final class VideoDto extends AbstractResourceDto {

@ElementCollection
@MapKeyColumn(name = "name")
@Column(name = "value")
@Column(name = "\"VALUE\"")
@CollectionTable(name = "xannotations_video_tags", joinColumns = @JoinColumn(name = "video_id"))
protected Map<String, String> tags = new HashMap<String, String>();

Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence
version="2.1"
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
>
<persistence-unit name="org.opencast.annotation.impl.persistence" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<non-jta-data-source>osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/opencast)</non-jta-data-source>
@@ -16,8 +21,6 @@
<properties>
<property name="eclipselink.ddl-generation" value="create-tables"/>
<property name="eclipselink.logging.logger" value="JavaLogger"/>
<property name="eclipselink.create-ddl-jdbc-file-name" value="create-matterhorn-extended-annotation-impl.jdbc"/>
<property name="eclipselink.drop-ddl-jdbc-file-name" value="drop-matterhorn-extended-annotation-impl.jdbc"/>
</properties>
</persistence-unit>
</persistence>
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -521,7 +521,8 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.176</version>
<version>2.2.220</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>