blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 18:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adaptions FHC-Alert

Browse Source 
- restructure plugins Api, FhcAlert ans Phrasen to use Phrasen in Fhc-Alert
– fix behaviour alert warning: show always clossing cross, and symbol
- fix behaviour alert error: add scrolling to Text MessageError
- phrases alerts
This commit is contained in:
ma0068
2025-07-07 15:36:12 +02:00
parent 4937c1190a
commit ddea3afde4
6 changed files with 97 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/plugins/Api.js
+3 -1
View File
@@ -6,7 +6,9 @@ export default {
if (app.config.globalProperties.$api) {
return;
}
app.use(FhcAlert);
if (!app.config.globalProperties.$fhcAlert)
app.use(FhcAlert);
function _get_config(form, uri, data, config) {
if (typeof form == 'string' && config === undefined) {
public/js/plugins/FhcAlert.js
+15 -8
View File
@@ -96,6 +96,7 @@ import PvConfig from "../../../index.ci.php/public/js/components/primevue/config
import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
import FhcPhrasen from "./Phrasen.js";
import {CoreRESTClient} from '../RESTClient.js';
@@ -138,7 +139,7 @@ const helperApp = Vue.createApp({
return FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto !== '';
}
},
template: `
template: /* html */`
<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
<template #message="slotProps">
@@ -168,7 +169,7 @@ const helperApp = Vue.createApp({
</a>
</div>
<div ref="messageCard" :id="'fhcAlertCollapseMessageCard' + slotProps.message.id" class="collapse mt-3">
<div class="card card-body text-body small">
<div class="card card-body text-body small alertCollapseText">
{{slotProps.message.detail}}
</div>
</div>
@@ -180,6 +181,7 @@ const helperApp = Vue.createApp({
helperApp.use(PvConfig);
helperApp.use(PvConfirmationService);
//helperApp.use(FhcPhrasen);
const helperAppInstance = helperApp.mount(helperAppContainer);
@@ -188,6 +190,9 @@ document.body.appendChild(helperAppContainer);
export default {
install: (app, options) => {
if (!app.config.globalProperties.$p)
app.use(FhcPhrasen);
const $fhcAlert = {
alertSuccess(message) {
if (Array.isArray(message))
@@ -210,6 +215,8 @@ export default {
helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
},
alertSystemError(message) {
//TODO(Manu) for translation of content of template: restructure in data
//and update definitions with translations
if (Array.isArray(message))
return message.forEach(this.alertSystemError);
helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
@@ -218,11 +225,11 @@ export default {
return new Promise((resolve, reject) => {
helperAppInstance.$confirm.require({
group: 'fhcAlertConfirm',
header: 'Achtung',
message: 'Möchten Sie sicher löschen?',
acceptLabel: 'Löschen',
header: Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
message: Vue.computed(() => app.config.globalProperties.$p.t('alert/confirm_delete')),
acceptLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/loeschen')),
acceptClass: 'p-button-danger',
rejectLabel: 'Abbrechen',
rejectLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
rejectClass: 'p-button-secondary',
accept() {
resolve(true);
@@ -237,11 +244,11 @@ export default {
return new Promise((resolve, reject) => {
helperAppInstance.$confirm.require({
group: options?.group ?? 'fhcAlertConfirm',
header: options?.header ?? 'Achtung',
header: options?.header ?? Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
message: options?.message ?? '',
acceptLabel: options?.acceptLabel ?? 'Ok',
acceptClass: options?.acceptClass ?? 'btn btn-primary',
rejectLabel: options?.rejectLabel ?? 'Abbrechen',
rejectLabel: options?.rejectLabel ?? Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary',
accept() {
resolve(true);
public/js/plugins/Phrasen.js
+4 -2
View File
@@ -87,8 +87,10 @@ const phrasen = {
export default {
install(app, options) {
app.use(OldFhcApi); // TODO(chris): remove at some point
app.use(PluginsApi);
if (!app.config.globalProperties.$fhcApi)
app.use(OldFhcApi); // TODO(chris): remove at some point
if (!app.config.globalProperties.$api)
app.use(PluginsApi);
app.config.globalProperties.$p = {
t: phrasen.t,
loadCategory: cat => phrasen.loadCategory.call(app, cat),