Skip to content
Snippets Groups Projects
Unverified Commit 194ec1c9 authored by Bekerle, Patrizio's avatar Bekerle, Patrizio :fire:
Browse files

Get app name for annotation author fields (#37)

parent a4a1df66
No related branches found
No related tags found
No related merge requests found
Pipeline #18306 failed
...@@ -52,6 +52,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem ...@@ -52,6 +52,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
this.allowAnnotating = false; this.allowAnnotating = false;
this.queuedFilesAnnotations = []; this.queuedFilesAnnotations = [];
this.queuedFilesAnnotationsCount = 0; this.queuedFilesAnnotationsCount = 0;
this.activity = new Activity(metadata);
} }
static get scopedElements() { static get scopedElements() {
...@@ -819,14 +820,13 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem ...@@ -819,14 +820,13 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
render() { render() {
const placeholderUrl = commonUtils.getAssetURL(pkgName, 'official-signature-placeholder.png'); const placeholderUrl = commonUtils.getAssetURL(pkgName, 'official-signature-placeholder.png');
const activity = new Activity(metadata);
return html` return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
<div class="field"> <div class="field">
<h2>${activity.getName(this.lang)}</h2> <h2>${this.activity.getName(this.lang)}</h2>
<p class="subheadline"> <p class="subheadline">
${activity.getDescription(this.lang)} ${this.activity.getDescription(this.lang)}
</p> </p>
<div class="control"> <div class="control">
......
...@@ -51,6 +51,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle ...@@ -51,6 +51,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
this.queuedFilesNeedsPlacement = new Map(); this.queuedFilesNeedsPlacement = new Map();
this.currentPreviewQueueKey = ''; this.currentPreviewQueueKey = '';
this.allowAnnotating = false; this.allowAnnotating = false;
this.activity = new Activity(metadata);
this._onReceiveIframeMessage = this.onReceiveIframeMessage.bind(this); this._onReceiveIframeMessage = this.onReceiveIframeMessage.bind(this);
this._onReceiveBeforeUnload = this.onReceiveBeforeUnload.bind(this); this._onReceiveBeforeUnload = this.onReceiveBeforeUnload.bind(this);
...@@ -937,14 +938,13 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle ...@@ -937,14 +938,13 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
render() { render() {
const placeholderUrl = commonUtils.getAssetURL(pkgName, 'qualified-signature-placeholder.png'); const placeholderUrl = commonUtils.getAssetURL(pkgName, 'qualified-signature-placeholder.png');
const activity = new Activity(metadata);
return html` return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
<div class="field ${classMap({"is-disabled": this.isUserInterfaceDisabled()})}"> <div class="field ${classMap({"is-disabled": this.isUserInterfaceDisabled()})}">
<h2>${activity.getName(this.lang)}</h2> <h2>${this.activity.getName(this.lang)}</h2>
<p class="subheadline"> <p class="subheadline">
${activity.getDescription(this.lang)} ${this.activity.getDescription(this.lang)}
</p> </p>
<div class="control"> <div class="control">
......
...@@ -142,6 +142,8 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement { ...@@ -142,6 +142,8 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement {
// We need to work with the AnnotationFactory because the pdf file is broken if // We need to work with the AnnotationFactory because the pdf file is broken if
// we add the multiple annotations to the file itself // we add the multiple annotations to the file itself
let pdfFactory = await utils.getAnnotationFactoryFromFile(file); let pdfFactory = await utils.getAnnotationFactoryFromFile(file);
const appNameDE = this.activity.getName('de');
const appNameEN = this.activity.getName('en');
await commonUtils.asyncObjectForEach(annotations, async (annotation) => { await commonUtils.asyncObjectForEach(annotations, async (annotation) => {
const key1 = (annotation.key1 || '').trim(); const key1 = (annotation.key1 || '').trim();
...@@ -155,7 +157,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement { ...@@ -155,7 +157,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement {
const annotationTypeNames = utils.getAnnotationTypes(key1); const annotationTypeNames = utils.getAnnotationTypes(key1);
pdfFactory = await utils.addKeyValuePdfAnnotationsToAnnotationFactory( pdfFactory = await utils.addKeyValuePdfAnnotationsToAnnotationFactory(
pdfFactory, 'AppNameDE', 'AppNameEN', this.auth['user-full-name'], key1, pdfFactory, appNameDE, appNameEN, this.auth['user-full-name'], key1,
annotationTypeNames.de, annotationTypeNames.en, key2, value); annotationTypeNames.de, annotationTypeNames.en, key2, value);
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment