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

add video helpers on forms #737

Merged
merged 1 commit into from
Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Expand Up @@ -13,4 +13,12 @@ export default Component.extend(FdReadonlyModeMixin, {
@default undefined
*/
model: undefined,

/**
Url video help.

@property urlHelp
@type String
*/
urlHelp: 'https://www.youtube.com/embed/G9zoWWLCwuk'
});
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,12 @@ export default Component.extend(FdReadonlyModeMixin, {
@default undefined
*/
model: undefined,

/**
Url video help.

@property urlHelp
@type String
*/
urlHelp: 'https://www.youtube.com/embed/G9zoWWLCwuk'
});
18 changes: 17 additions & 1 deletion addon/components/fd-sheets/fd-base-sheet.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Component from '@ember/component';
import FdSaveHasManyRelationshipsMixin from '../../mixins/fd-save-has-many-relationships';
import { inject as service } from '@ember/service';
import { isBlank } from '@ember/utils';
import { isBlank, isNone } from '@ember/utils';
import { assert } from '@ember/debug';
import { getOwner } from '@ember/application';

export default Component.extend(FdSaveHasManyRelationshipsMixin, {

Expand Down Expand Up @@ -72,6 +73,21 @@ export default Component.extend(FdSaveHasManyRelationshipsMixin, {
*/
readonlyMode: true,

/**
Get url video help.

@method getHelpUrl
@param {String} componentName Component name.
*/
getHelpUrl(componentName) {
let component = getOwner(this).lookup(`component:${componentName}`);
if (isNone(component)) {
return;
}

return component.get('urlHelp');
},

init() {
this._super(...arguments);

Expand Down
17 changes: 17 additions & 0 deletions addon/components/fd-sheets/fd-class-sheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,23 @@ export default FdBaseSheet.extend({
}
}),

/**
Url video help.

@method urlVideoHelp
*/
urlVideoHelp: computed('componentNamePart', function() {
let componentNamePart = this.get('componentNamePart');
if (isNone(componentNamePart)) {
return;
}

let componentName = `fd-editing-panels/fd-${componentNamePart}-editing-panel`;
let url = this.getHelpUrl(componentName);

return url;
}),

/**
Opening sheet.

Expand Down
31 changes: 31 additions & 0 deletions addon/components/fd-sheets/fd-diagram-sheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,37 @@ export default FdBaseSheet.extend(
}
}),

/**
Type diagram.

@method diagramType
*/
diagramType: computed('selectedValue.data.constructor.modelName', function() {
let type = this.get('selectedValue.data.constructor.modelName');
if (isNone(type)) {
return undefined;
}

return type.split('-').pop();
}),

/**
Url video help.

@method urlVideoHelp
*/
urlVideoHelp: computed('diagramType', function() {
let diagramType = this.get('diagramType');
if (isNone(diagramType)) {
return;
}

let componentName = `fd-uml-diagram-toolbars/fd-${diagramType}-toolbar`;
let url = this.getHelpUrl(componentName);

return url;
}),

/**
Opening sheet.

Expand Down
18 changes: 18 additions & 0 deletions addon/components/fd-sheets/fd-edit-diagram-object-sheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,24 @@ export default FdBaseSheet.extend({
}
}),

/**
Url video help.

@method urlVideoHelp
*/
urlVideoHelp: computed('objectEditFormNamePart', function() {
let componentNamePart = this.get('objectEditFormNamePart');
if (isNone(componentNamePart)) {
return;
}

let isLink = this.get('isLink') ? '-link' : '';
let componentName = `fd-editing-panels/fd-${componentNamePart}-editing-panel${isLink}`;
let url = this.getHelpUrl(componentName);

return url;
}),

/**
Opening sheet.

Expand Down
22 changes: 15 additions & 7 deletions addon/components/fd-sheets/fd-sheets-tool-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ export default Component.extend(FdReadonlyProjectMixin, {
*/
sheetButtons: undefined,

/**
Url video helper.

@property sheetHelper
@type String
*/
sheetHelper: undefined,

/**
Object visible button.

Expand Down Expand Up @@ -141,11 +149,11 @@ export default Component.extend(FdReadonlyProjectMixin, {
*/
isNewModel: false,

/**
Current sheet content value.
@property contentSheetValue
@type Object
*/
/**
Current sheet content value.
@property contentSheetValue
@type Object
*/
contentSheetValue: undefined,

/**
Expand Down Expand Up @@ -330,7 +338,7 @@ export default Component.extend(FdReadonlyProjectMixin, {

classDiagrams.pushObjects(cadDiagramsCurrentStage.filter(function (diagram) {
if (!isNone(diagram.caseObjectsString)) {
return diagram.caseObjectsString.includes("Class:(" + currentClassName + ")");
return diagram.caseObjectsString.includes("Class:(" + currentClassName + ")");
}
}));

Expand All @@ -341,7 +349,7 @@ export default Component.extend(FdReadonlyProjectMixin, {
on: 'click',
position: 'bottom right',
target: event.currentTarget,
}).popup('show');
}).popup('show');
},

/**
Expand Down
9 changes: 0 additions & 9 deletions addon/components/fd-uml-diagram-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,6 @@ FdPopupActions, {
return this.get('readonlyMode') && !this.get('model.isNew');
}),

diagramType: computed('model.constructor.modelName', function() {
let type = this.get('model.constructor.modelName');
if (isNone(type)) {
return undefined;
}

return type.split('-').pop();
}),

init() {
this._super(...arguments);

Expand Down
10 changes: 9 additions & 1 deletion addon/components/fd-uml-diagram-toolbars/fd-cad-toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@ import layout from '../../templates/components/fd-uml-diagram-toolbars/fd-cad-to
export default Component.extend({
layout,

tagName: ''
tagName: '',

/**
Url video help.

@property urlHelp
@type String
*/
urlHelp: 'https://www.youtube.com/embed/tQLDUXOnxnA'
});
10 changes: 9 additions & 1 deletion addon/components/fd-uml-diagram-toolbars/fd-ucd-toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@ import layout from '../../templates/components/fd-uml-diagram-toolbars/fd-ucd-to
export default Component.extend({
layout,

tagName: ''
tagName: '',

/**
Url video help.

@property urlHelp
@type String
*/
urlHelp: 'https://www.youtube.com/embed/VcPrY-FFjGI'
});
41 changes: 41 additions & 0 deletions addon/components/fd-view-helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import Component from '@ember/component';
import $ from 'jquery';
import layout from '../templates/components/fd-view-helper';

export default Component.extend({
layout,
tagName: '',

/**
Url video.

@property url
@type String
*/
url: '',

/**
Position popup.

@property position
@type String
*/
position: 'center',

actions: {
/**
Open popup with video helper.

@method actions.viewHelper
*/
viewHelper(event) {
let position = this.get('position');
let popup = $(event.currentTarget.nextElementSibling);
popup.popup({
on: 'click',
position: `bottom ${position}`,
target: event.currentTarget,
}).popup('show');
}
}
});
3 changes: 3 additions & 0 deletions addon/locales/en/components/fd-view-helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
'video-help-title': 'Video help'
};
2 changes: 2 additions & 0 deletions addon/locales/en/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ import FdApplicationModelForm from './forms/fd-application-model';
import FdArchitectureForm from './forms/fd-architecture';
import FdGisSubsystem from './components/fd-gis-subsystem';
import FdColorSettingPanel from './components/fd-color-setting-panel';
import FdViewHelperPanel from './components/fd-view-helper';

const translations = {};
$.extend(true, translations, EmberFlexberryTranslations);
Expand Down Expand Up @@ -474,6 +475,7 @@ $.extend(true, translations, {
'fd-modal-message-box': FdfModalMessageBox,
'fd-gis-subsystem': FdGisSubsystem,
'fd-color-setting-panel': FdColorSettingPanel,
'fd-view-helper': FdViewHelperPanel
}

});
Expand Down
3 changes: 3 additions & 0 deletions addon/locales/ru/components/fd-view-helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
'video-help-title': 'Видео подсказка'
};
2 changes: 2 additions & 0 deletions addon/locales/ru/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ import FdApplicationModelForm from './forms/fd-application-model';
import FdArchitectureForm from './forms/fd-architecture';
import FdGisSubsystem from './components/fd-gis-subsystem';
import FdColorSettingPanel from './components/fd-color-setting-panel';
import FdViewHelperPanel from './components/fd-view-helper';

const translations = {};
$.extend(true, translations, EmberFlexberryTranslations);
Expand Down Expand Up @@ -473,6 +474,7 @@ $.extend(true, translations, {
'fd-modal-message-box': FdfModalMessageBox,
'fd-gis-subsystem': FdGisSubsystem,
'fd-color-setting-panel': FdColorSettingPanel,
'fd-view-helper': FdViewHelperPanel
}

});
Expand Down
1 change: 1 addition & 0 deletions addon/templates/components/fd-sheets/fd-class-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
readonlyMode=readonlyMode
isNewModel=selectedValue.data.isNew
sheetButtons=(array 'delete' 'save' 'share' 'dependencies')
sheetHelper=urlVideoHelp
toolbarVisible=(not isAddMode)
saveSheet=(action 'save')
deleteSheet=(action 'delete')
Expand Down
2 changes: 2 additions & 0 deletions addon/templates/components/fd-sheets/fd-diagram-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
readonlyMode=readonlyMode
isNewModel=selectedValue.data.isNew
sheetButtons=(array 'delete' 'save' 'print' 'share' 'steps' 'copy')
sheetHelper=urlVideoHelp
toolbarVisible=(not isAddMode)
saveSheet=(action 'save')
deleteSheet=(action 'delete')
Expand Down Expand Up @@ -73,6 +74,7 @@
model=selectedValue.data
emptyReferenceCountItems=emptyReferenceCountItems
sheetComponentName=sheetComponentName
diagramType=diagramType
readonlyMode=readonlyMode
openEditFormAction=(action "openNestedSheet")
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
readonlyMode=readonlyMode
isNewModel=selectedValue.isNew
sheetButtons=(array 'save' 'share' (if (not isLink) 'dependencies'))
sheetHelper=urlVideoHelp
saveSheet=(action 'save')
contentSheetValue=selectedValue
}}
Expand Down
8 changes: 7 additions & 1 deletion addon/templates/components/fd-sheets/fd-sheets-tool-bar.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<div class="fd-sheet-toolbar">
{{#if sheetHelper}}
{{fd-view-helper
url=sheetHelper
position='right'
}}
{{/if}}
{{#if customButtonVisible}}
<button class="ui button" {{action 'customButtonAction'}}>
{{t customButtonTitle}}
Expand Down Expand Up @@ -61,7 +67,7 @@
</button>
<div class="ui flowing popup" data-variation="wide">
{{fd-attribute-table
tableView=tableViewDiagrams
tableView=tableViewDiagrams
model=classDiagrams
edit=(action 'openDependentDiagram')
toolbarVisible=false
Expand Down
1 change: 1 addition & 0 deletions addon/templates/components/fd-sheets/fd-view-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
readonlyMode=readonlyMode
isNewModel=selectedValue.isNew
sheetButtons=(array 'delete' 'save' 'share')
sheetHelper='https://www.youtube.com/embed/MD89A4qXZ0o'
saveSheet=(action 'save')
deleteSheet=(action 'delete')
contentSheetValue=selectedValue
Expand Down
6 changes: 6 additions & 0 deletions addon/templates/components/fd-view-helper.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<button class="ui icon button help" onclick={{action 'viewHelper'}} title={{t "components.fd-view-helper.video-help-title"}}>
<i class="icon-fd-help icon"></i>
</button>
<div class="ui flowing popup" data-variation="wide">
<iframe width="560" height="315" src={{url}} frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
1 change: 1 addition & 0 deletions app/components/fd-view-helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-flexberry-designer/components/fd-view-helper';
Loading