From 2943c5be22d39c4627943ec8c1c501980a48f307 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 10 May 2022 20:28:40 +0200 Subject: [PATCH] Sortablejs integration for sorting contacts of a sci project --- sci-types-project/package-lock.json | 253 +----------------- sci-types-project/package.json | 4 +- .../ui/sciproject-description.xhtml | 49 +++- .../sciproject/ui/SciProjectBundle.properties | 5 + .../ui/SciProjectBundle_de.properties | 5 + .../main/typescript/sciproject-contacts.ts | 151 +++++++++++ ...ption.ts => sciproject-description.ts.off} | 0 ...gtext.ts => sciproject-fundingtext.ts.off} | 0 ...ume.ts => sciproject-fundingvolume.ts.off} | 0 ...t-members.ts => sciproject-members.ts.off} | 0 sci-types-project/webpack.config.js | 2 +- 11 files changed, 220 insertions(+), 249 deletions(-) create mode 100644 sci-types-project/src/main/typescript/sciproject-contacts.ts rename sci-types-project/src/main/typescript/{sciproject-description.ts => sciproject-description.ts.off} (100%) rename sci-types-project/src/main/typescript/{sciproject-fundingtext.ts => sciproject-fundingtext.ts.off} (100%) rename sci-types-project/src/main/typescript/{sciproject-fundingvolume.ts => sciproject-fundingvolume.ts.off} (100%) rename sci-types-project/src/main/typescript/{sciproject-members.ts => sciproject-members.ts.off} (100%) diff --git a/sci-types-project/package-lock.json b/sci-types-project/package-lock.json index ceef2bc..5ee323d 100644 --- a/sci-types-project/package-lock.json +++ b/sci-types-project/package-lock.json @@ -8,11 +8,12 @@ "name": "sci-types-project", "version": "7.0.0", "license": "LGPL-3.0-or-later", + "dependencies": { + "sortablejs": "^1.14.0" + }, "devDependencies": { - "@types/jquery": "^3.5.6", "@types/sortablejs": "^1.10.7", "npm-run-all": "^4.1.5", - "sass": "^1.42.1", "ts-loader": "^9.2.6", "typescript": "^4.4.3", "webpack": "^5.55.1", @@ -50,14 +51,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/jquery": { - "version": "3.5.14", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/sizzle": "*" - } - }, "node_modules/@types/json-schema": { "version": "7.0.11", "dev": true, @@ -68,11 +61,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/sizzle": { - "version": "2.3.3", - "dev": true, - "license": "MIT" - }, "node_modules/@types/sortablejs": { "version": "1.10.7", "dev": true, @@ -305,31 +293,11 @@ "node": ">=4" } }, - "node_modules/anymatch": { - "version": "3.1.2", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "dev": true, "license": "MIT" }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "dev": true, @@ -423,32 +391,6 @@ "node": ">=4" } }, - "node_modules/chokidar": { - "version": "3.5.3", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/chrome-trace-event": { "version": "1.0.3", "dev": true, @@ -839,17 +781,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/glob-parent": { - "version": "5.1.2", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/glob-to-regexp": { "version": "0.4.1", "dev": true, @@ -936,11 +867,6 @@ "node": ">=10.17.0" } }, - "node_modules/immutable": { - "version": "4.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/import-local": { "version": "3.1.0", "dev": true, @@ -996,17 +922,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/is-boolean-object": { "version": "1.1.2", "dev": true, @@ -1058,25 +973,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-extglob": { - "version": "2.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-negative-zero": { "version": "2.0.2", "dev": true, @@ -1400,14 +1296,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "node_modules/normalize-path": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/npm-run-all": { "version": "4.1.5", "dev": true, @@ -1650,17 +1538,6 @@ "node": ">=4" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, "node_modules/rechoir": { "version": "0.7.1", "dev": true, @@ -1726,22 +1603,6 @@ ], "license": "MIT" }, - "node_modules/sass": { - "version": "1.51.0", - "dev": true, - "license": "MIT", - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/schema-utils": { "version": "3.1.1", "dev": true, @@ -1828,6 +1689,11 @@ "dev": true, "license": "ISC" }, + "node_modules/sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" + }, "node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -1836,14 +1702,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-js": { - "version": "1.0.2", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-support": { "version": "0.5.21", "dev": true, @@ -2391,13 +2249,6 @@ "version": "0.0.51", "dev": true }, - "@types/jquery": { - "version": "3.5.14", - "dev": true, - "requires": { - "@types/sizzle": "*" - } - }, "@types/json-schema": { "version": "7.0.11", "dev": true @@ -2406,10 +2257,6 @@ "version": "17.0.27", "dev": true }, - "@types/sizzle": { - "version": "2.3.3", - "dev": true - }, "@types/sortablejs": { "version": "1.10.7", "dev": true @@ -2586,22 +2433,10 @@ "color-convert": "^1.9.0" } }, - "anymatch": { - "version": "3.1.2", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, "balanced-match": { "version": "1.0.2", "dev": true }, - "binary-extensions": { - "version": "2.2.0", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "dev": true, @@ -2653,20 +2488,6 @@ "supports-color": "^5.3.0" } }, - "chokidar": { - "version": "3.5.3", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, "chrome-trace-event": { "version": "1.0.3", "dev": true @@ -2921,13 +2742,6 @@ "get-intrinsic": "^1.1.1" } }, - "glob-parent": { - "version": "5.1.2", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, "glob-to-regexp": { "version": "0.4.1", "dev": true @@ -2977,10 +2791,6 @@ "version": "2.1.0", "dev": true }, - "immutable": { - "version": "4.0.0", - "dev": true - }, "import-local": { "version": "3.1.0", "dev": true, @@ -3013,13 +2823,6 @@ "has-bigints": "^1.0.1" } }, - "is-binary-path": { - "version": "2.1.0", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, "is-boolean-object": { "version": "1.1.2", "dev": true, @@ -3046,17 +2849,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-extglob": { - "version": "2.1.1", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, "is-negative-zero": { "version": "2.0.2", "dev": true @@ -3253,10 +3045,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "normalize-path": { - "version": "3.0.0", - "dev": true - }, "npm-run-all": { "version": "4.1.5", "dev": true, @@ -3398,13 +3186,6 @@ "path-type": "^3.0.0" } }, - "readdirp": { - "version": "3.6.0", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, "rechoir": { "version": "0.7.1", "dev": true, @@ -3436,15 +3217,6 @@ "version": "5.2.1", "dev": true }, - "sass": { - "version": "1.51.0", - "dev": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, "schema-utils": { "version": "3.1.1", "dev": true, @@ -3500,14 +3272,15 @@ "version": "3.0.7", "dev": true }, + "sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" + }, "source-map": { "version": "0.6.1", "dev": true }, - "source-map-js": { - "version": "1.0.2", - "dev": true - }, "source-map-support": { "version": "0.5.21", "dev": true, diff --git a/sci-types-project/package.json b/sci-types-project/package.json index f37e2fe..0585be6 100644 --- a/sci-types-project/package.json +++ b/sci-types-project/package.json @@ -10,17 +10,15 @@ "author": "Jens Pelzetter", "license": "LGPL-3.0-or-later", "devDependencies": { - "@types/jquery": "^3.5.6", "@types/sortablejs": "^1.10.7", "npm-run-all": "^4.1.5", - "sass": "^1.42.1", "ts-loader": "^9.2.6", "typescript": "^4.4.3", "webpack": "^5.55.1", "webpack-cli": "^4.8.0" }, "dependencies": { - + "sortablejs": "^1.14.0" }, "targets": { "main": false diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml index 5b0737a..1e8258a 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml @@ -18,6 +18,19 @@ #{SciProjectMessageBundle.getMessage('description_step.errors.contactable_not_found', [contactableNotFound])} + + + + +
+

#{SciProjectMessageBundle['contacts.none']}

- +
@@ -79,8 +107,19 @@ - - + +
#{SciProjectMessageBundle['contacts.cols.contactable']}
#{contact.contactable}
+ + + + #{contact.contactable} + #{contact.contactType}