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

Ftr/358 grayout goto movement #398

Merged
merged 61 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
089e6d9
rename workflow
bwbohl Jun 25, 2024
607e919
create deve release
bwbohl Jun 25, 2024
1d9e7fd
update artifact path
bwbohl Jun 25, 2024
86c1686
XQuery update to styleguide
bwbohl Jun 27, 2024
8e8ce56
fix JS indentation
bwbohl Jun 27, 2024
a85ead7
Ignore annotation category or priority filter if not defined
bwbohl Jun 27, 2024
897dd7b
OpenSeadragonViewer: remove duplicate funtion definition
bwbohl Jun 27, 2024
d5cba22
fix tip target
bwbohl Jun 27, 2024
d4f8750
add some code comments
bwbohl Jun 27, 2024
4d08448
ad some code comments
bwbohl Jun 27, 2024
47d3b33
View OpenSeaDragonView: fix what is pushed to me.shapes annotations
bwbohl Jun 27, 2024
c16012e
Viw OpenSeaDragonView: fix alternative retrieval of shape element
bwbohl Jun 27, 2024
79c0036
View OpenSeaDargonViewer: push to array instead of insert
bwbohl Jun 27, 2024
4d1ace3
View OpenSeaDragonViewer: stick to standard annotation ID scheme for…
bwbohl Jun 27, 2024
df98a4c
View OpenSeadragonViewer: add some ode comment
bwbohl Jun 27, 2024
f6e1429
View SourceView: do not iterate over PrioritiesMenu if it is null
bwbohl Jun 27, 2024
d846306
getAnnotationsOnPage: element name as fallback for annotation type
bwbohl Jun 27, 2024
1825bec
XQdoc
bwbohl Jun 28, 2024
6ca8684
Styleguide: improve conformity
bwbohl Jun 28, 2024
22a395e
add som e code comments
bwbohl Jun 28, 2024
c23a9eb
XQuery: style conformance improve and TODO comment
bwbohl Jun 28, 2024
90e676b
View SourceView: check if categroeis menu exists when populating visi…
bwbohl Jun 28, 2024
c3ccb19
fix indentation
bwbohl Jun 28, 2024
765b009
View SourceView: only add annotation filter menu entries if respectiv…
bwbohl Jun 28, 2024
2e812b3
View SourceView: fix JS syntax error
bwbohl Jun 28, 2024
a62afee
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
d489432
View SourceView: add some TODOs
bwbohl Jun 28, 2024
7c3f555
whitespace
bwbohl Jun 28, 2024
b39095b
Controller SourceView: remove lang parameter as not available
bwbohl Jun 28, 2024
065bc44
whitespace
bwbohl Jun 28, 2024
0c613b8
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
3d14008
code comments
bwbohl Jun 28, 2024
72fb2ac
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
43921f7
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
d473cd9
View PageBasedView: use annotation.id to retrieve element
bwbohl Jun 28, 2024
d534d7a
whitespace
bwbohl Jun 28, 2024
fecbada
whitespace
bwbohl Jun 28, 2024
a91a5a1
View OpenSeaDragonViewer: add a html template from ImageViewer
bwbohl Jun 28, 2024
e32d30a
View OpenSeaDragonVirwer: add some code comments
bwbohl Jun 28, 2024
77864e2
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
72535ef
View MeasureBasedView HorizontalMeasureViewer: fix retrieval of annot…
bwbohl Jun 28, 2024
fca2adb
whitespace
bwbohl Jun 28, 2024
7afd0d8
View PageBasedView: fix annotation filer
bwbohl Jun 28, 2024
24da899
View OpenSeadragonViewer: fix annotation IDs
bwbohl Jun 28, 2024
257fb2c
View PageBasedView: fix annotation filters
bwbohl Jun 30, 2024
6e769b4
Update add/index.xql
bwbohl Jul 3, 2024
b45eeb6
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 3, 2024
a422ba6
View TextFacsimileSplitView: add openseadragon as alternative viewer
bwbohl Jul 3, 2024
72fb478
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 11, 2024
554fd88
View SourceView: gray-out go to movement menu if number of movements …
bwbohl Jul 11, 2024
88506b7
View SourceView GotoMsg: gray-out movement combobox if number of move…
bwbohl Jul 11, 2024
038f369
View VerovioView: gray-out gotoMovement menu if number of movements 1…
bwbohl Jul 12, 2024
8461f4e
View MeasureBasedView: refine a TODO comment
bwbohl Jul 12, 2024
b48c420
View MeasureBasedView: disable movement-comboBox on one or lesser mov…
bwbohl Jul 12, 2024
e3108a7
Merge branch 'develop' into ftr/358-grayout-gotoMovement
bwbohl Jul 12, 2024
a8e4f6f
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 15, 2024
0809e00
Merge branch 'develop' into fix/339-facsimile-view-with-tei-documents
bwbohl Jul 16, 2024
282ae2b
Merge branch 'develop' into bazga/dev
bwbohl Aug 12, 2024
98f15db
Merge pull request #26 from Edirom/fix/annotations-on-page
bwbohl Aug 12, 2024
62aad2d
Merge pull request #27 from Edirom/fix/339-facsimile-view-with-tei-do…
bwbohl Aug 15, 2024
9b09664
Merge branch 'bazga/dev' into ftr/358-grayout-gotoMovement
bwbohl Aug 15, 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
29 changes: 26 additions & 3 deletions app/view/window/source/MeasureBasedView.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Ext.define('EdiromOnline.view.window.source.MeasureBasedView', {

var me = this;

// create movementComboBox
me.mdivSelector = Ext.create('Ext.form.ComboBox', {
store: Ext.create('Ext.data.Store', {
fields: ['id', 'name'],
Expand All @@ -75,6 +76,9 @@ Ext.define('EdiromOnline.view.window.source.MeasureBasedView', {
margin: '0 0 0 0',
id: 'mdiv_combo_' + me.id,
hidden: true,
cls: 'movementCombo',
disabled: false,
disabledCls: 'x-disabled',
listeners:{
scope: me,
'select': me.setMdiv
Expand All @@ -83,7 +87,7 @@ Ext.define('EdiromOnline.view.window.source.MeasureBasedView', {

me.measureSpinner = Ext.create('EdiromOnline.view.window.source.MeasureSpinner', {
width: 121,
cls: 'pageSpinner', //TODO
cls: 'pageSpinner', //TODO adjust class to measureSpinner and add in SCSS
owner: me,
hidden: true
});
Expand Down Expand Up @@ -156,16 +160,35 @@ Ext.define('EdiromOnline.view.window.source.MeasureBasedView', {

setMovements: function(movements) {
var me = this;

// set view movements to submitted movements
me.movements = movements;


// initialize variable data
var data = [];

// create a reduced array from me.movements in variable data without movements wrapper
movements.data.each(function(elem) {
data.push(elem.data);
});

console.log(me.mdivSelector);

// push data variable to view's mdivSelector store
me.mdivSelector.getStore().loadData(data);


// ? set a value on mdivSelector
if(me.owner.window.internalIdType != 'measure')
me.mdivSelector.setValue(data[0]['id']);

// check if data contains more than one item and save to variable as boolean
var isDisabled = ((data.length <= 1) ? true : false);

// set disabled state on views mdivSelector
if (isDisabled) {
me.mdivSelector.disable();
}

},

setMeasures: function(measures) {
Expand Down
21 changes: 20 additions & 1 deletion app/view/window/source/SourceView.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,20 +210,33 @@ Ext.define('EdiromOnline.view.window.source.SourceView', {
setMovements: function(movements) {
var me = this;

// set me.movements to submitted JSON array
me.movements = movements;

// set meovements for measureBaseView
me.measureBasedView.setMovements(movements);

// initialize movementItems variable
var movementItems = [];

// iterate over submitted movements and push them to movementItems variable
movements.each(function(movement) {
movementItems.push({
text: movement.get('name'),
handler: Ext.bind(me.gotoMovement, me, movement.get('id'), true)
});
});

// check if contains more than one item and save to variable as boolean
var isDisabled = ((movementItems.length <= 1) ? true : false);

// add gotoMovement entry to goto menu
me.gotoMenu.menu.add({
id: me.id + '_gotoMovement',
text: getLangString('view.window.source.SourceView_gotoMovement'),
cls: 'gotoMovement',
disabled: isDisabled,
disabledCls: 'x-disabled',
menu: {
items: movementItems
}
Expand Down Expand Up @@ -557,12 +570,18 @@ Ext.define('EdiromOnline.view.window.source.GotoMsg', {

me.title = getLangString('view.window.source.SourceView_GotoMsg_Title');

// check if contains more than one item and save to variable as boolean
var isDisabled = ((me.movements.data.length <= 1) ? true : false);

me.combo = Ext.create('Ext.form.ComboBox', {
fieldLabel: getLangString('view.window.source.SourceView_GotoMsg_MovmentNumber'),
store: me.movements,
queryMode: 'local',
displayField: 'name',
valueField: 'id'
valueField: 'id',
cls: 'gotoMovement',
disabled: isDisabled,
disabledCls: 'x-disabled'
});

me.field = Ext.create('Ext.form.field.Text', {
Expand Down
17 changes: 14 additions & 3 deletions app/view/window/source/VerovioView.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,31 @@ Ext.define('EdiromOnline.view.window.source.VerovioView', {

setMovements: function (movements) {
var me = this;


// set me.movements to submitted JSON array
me.movements = movements;


// initialize movementItems variable
var movementItems =[];

// iterate over submitted movements and push them to movementItems variable
movements.each(function (movement) {
movementItems.push({
text: movement. get ('name'),
handler: Ext.bind(me.showMovement, me, movement. get ('id'), true)
});
});


// check if contains more than one item and save to variable as boolean
var isDisabled = ((movementItems.length <= 1) ? true : false);

// add gotoMovement entry to goto menu
me.gotoMenu.menu.add({
id: me.id + '_gotoMovement',
text: getLangString('view.window.source.SourceView_gotoMovement'),
cls: 'gotoMovement',
disabled: isDisabled,
disabledCls: 'x-disabled',
menu: {
items: movementItems
}
Expand Down
7 changes: 7 additions & 0 deletions packages/eoTheme/sass/var/form/field/Base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.x-form-item {

&.x-disabled {
opacity: 0.5;
}

}
4 changes: 4 additions & 0 deletions packages/eoTheme/sass/var/menu/Menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ $menu-border-color: darken($window-base-color,15%);
top: 3px !important;
}

.x-disabled {
opacity: 0.5;
}

}