diff --git a/.gitmodules b/.gitmodules index 2ba11057ed91f77ecc94e16a99ef91af334c7904..9436955b1cedc29130e4c4e33352ea14fe327101 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "vendor/person-profile"] path = vendor/person-profile url = git@gitlab.tugraz.at:VPU/WebComponents/PersonProfile.git +[submodule "vendor/file-upload"] + path = vendor/file-upload + url = git@gitlab.tugraz.at:VPU/WebComponents/FileUpload.git diff --git a/package-lock.json b/package-lock.json index 9082c71063aa673a97d5fd6be561fbeed28f4192..de2a03f6927bd83eb9f956b4f433ebc64acf390d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3089,6 +3089,11 @@ } } }, + "material-design-icons-svg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/material-design-icons-svg/-/material-design-icons-svg-3.0.0.tgz", + "integrity": "sha512-MbHjWXGzHLPZX9qiICq3CLp0zkxaKm1uzNnrwsmThoCf5J70Lq8zSMKJMxG6uLAZB4b6evvBXrdf3C34RoRfaA==" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -5153,6 +5158,25 @@ "lit-element": "^2.2.1" } }, + "vpu-file-upload": { + "version": "file:vendor/file-upload", + "requires": { + "i18next": "^17.0.3", + "lit-element": "^2.1.0", + "lit-html": "^1.1.1", + "material-design-icons-svg": "^3.0.0" + }, + "dependencies": { + "i18next": { + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.3.1.tgz", + "integrity": "sha512-4nY+yaENaoZKmpbiDXPzucVHCN3hN9Z9Zk7LyQXVOKVIpnYOJ3L/yxHJlBPtJDq3PGgjFwA0QBFm/26Z0iDT5A==", + "requires": { + "@babel/runtime": "^7.3.1" + } + } + } + }, "vpu-language-select": { "version": "file:vendor/language-select", "requires": { diff --git a/package.json b/package.json index e4ef5fdb8d4882cd5429c5bf86f46198a8d25cbc..e8316a48e4b2f57a9eb0c54947dd714342118f10 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "vpu-common": "file:./vendor/common", "vpu-language-select": "file:./vendor/language-select", "vpu-notification": "file:./vendor/notification", - "vpu-person-profile": "file:./vendor/person-profile" + "vpu-person-profile": "file:./vendor/person-profile", + "vpu-file-upload": "file:./vendor/file-upload" }, "scripts": { "clean": "rm dist/* -R", diff --git a/src/vpu-signature-pdf-upload.js b/src/vpu-signature-pdf-upload.js index ddddaa6c426139bd66e7ffc12ac19b873f961b30..7afff0cbd267d7bbe3adc8e1ce148c58c84aa4f5 100644 --- a/src/vpu-signature-pdf-upload.js +++ b/src/vpu-signature-pdf-upload.js @@ -1,14 +1,12 @@ import $ from 'jquery'; import {createI18nInstance} from './i18n.js'; import {css, html} from 'lit-element'; -import {send as notify} from 'vpu-notification'; import VPUSignatureLitElement from "./vpu-signature-lit-element"; -import Suggestions from 'suggestions'; import * as commonUtils from 'vpu-common/utils'; import * as commonStyles from 'vpu-common/styles'; import suggestionsCSSPath from 'suggestions/dist/suggestions.css'; -import * as errorUtils from "vpu-common/error"; import {classMap} from 'lit-html/directives/class-map.js'; +import 'vpu-file-upload'; const i18n = createI18nInstance(); @@ -83,11 +81,8 @@ class SignaturePdfUpload extends VPUSignatureLitElement { <div class="field"> <label class="label">${i18n.t('pdf-upload.label')}</label> <div class="control"> - <!-- - <vpu-knowledge-base-organization-select lang="${this.lang}" - value="${this.organizationId}" - @change="${this.onOrgUnitCodeChanged}"></vpu-knowledge-base-organization-select> ---> + <vpu-fileupload lang="${this.lang}" url="${this.entryPointUrl}/pdf_official_signing_actions" accept="application/pdf" + text="Einreichung als PDF" button-label="PDF auswählen"></vpu-fileupload> </div> </div> diff --git a/vendor/file-upload b/vendor/file-upload new file mode 160000 index 0000000000000000000000000000000000000000..fb38fafc2e2b465b145e0746f997c50287accfc3 --- /dev/null +++ b/vendor/file-upload @@ -0,0 +1 @@ +Subproject commit fb38fafc2e2b465b145e0746f997c50287accfc3