Merge branch 'master' into feature-53938/StV_Tab_Noten_fertigstellen

public/js/plugin/FhcAlert.js

@@ -102,6 +102,7 @@ import {CoreRESTClient} from '../RESTClient.js';
 const helperAppContainer = document.createElement('div');
 
 const helperApp = Vue.createApp({
+	name: "FhcAlertApp",
 	components: {
 		PvToast,
 		PvConfirm
@@ -226,6 +227,25 @@ export default {
 					});
 				});
 			},
+			confirm(options) {
+				return new Promise((resolve, reject) => {
+					helperAppInstance.$confirm.require({
+						group: options?.group ?? 'fhcAlertConfirm',
+						header: options?.header ?? 'Achtung',
+						message: options?.message ?? '',
+						acceptLabel: options?.acceptLabel ?? 'Ok',
+						acceptClass: options?.acceptClass ?? 'btn btn-primary',
+						rejectLabel: options?.rejectLabel ?? 'Abbrechen',
+						rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary',
+						accept() {
+							resolve(true);
+						},
+						reject() {
+							resolve(false);
+						},
+					});
+				});
+			},
 			alertDefault(severity, title, message, sticky = false) {
 				let options = { severity: severity, summary: title, detail: message};
 				
@@ -396,4 +416,4 @@ export default {
 		app.config.globalProperties.$fhcAlert = $fhcAlert;
                 app.provide('$fhcAlert', app.config.globalProperties.$fhcAlert);
 	}
-}
+}

public/js/plugin/FhcApi.js

@@ -46,9 +46,9 @@ export default {
 				result.meta.response = response;
 			return result;
 		}
-
+		const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/";
 		const fhcApiAxios = axios.create({
-			timeout: 5000,
+			timeout: 500000,
 			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"
 		});
 
@@ -58,7 +58,7 @@ export default {
 
 			if (config.data instanceof FormData)
 				return config;
-			
+
 			if (!Object.values(config.data).every(item => {
 				if (item instanceof FileList)
 					return false;
@@ -96,7 +96,7 @@ export default {
 				|| response.config?.errorHandling === false
 				|| response.config?.errorHandling == 'fail')
 				return _clean_return_value(response);
-			
+
 			// NOTE(chris): loop through errors
 			if (response.data.errors)
 				response.data.errors = response.data.errors.filter(
@@ -107,7 +107,7 @@ export default {
 		}, error => {
 			if (error.code == 'ERR_CANCELED')
 				return Promise.reject({...{handled: true}, ...error});
-			
+
 			if (error.config?.errorHandling == 'off'
 				|| error.config?.errorHandling === false
 				|| error.config?.errorHandling == 'success')
@@ -118,7 +118,7 @@ export default {
 					app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
 					return Promise.reject({...{handled: true}, ...error});
 				}
-				
+
 				// NOTE(chris): loop through errors
 				error.response.data.errors = error.response.data.errors.filter(
 					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config)
@@ -132,7 +132,7 @@ export default {
 				app.config.globalProperties.$fhcAlert.alertError(error.message);
 				return Promise.reject({...{handled: true}, ...error});
 			}
-			
+
 			return Promise.reject(error);
 		});
 

public/js/plugin/Phrasen.js

@@ -1,7 +1,9 @@
 import FhcApi from './FhcApi.js';
 
 const categories = Vue.reactive({});
+const user_language = Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.user_language);
 const loadingModules = {};
+let reload = false;
 
 function extractCategory(obj, category) {
 	return obj.filter(e => e.category == category).reduce((res, elem) => {
@@ -19,8 +21,22 @@ function getValueForLoadedPhrase(category, phrase, params) {
 	return result;
 }
 
-
 const phrasen = {
+	setLanguage(language, api) {
+		const catArray = Object.keys(categories)
+		return api.factory.phrasen.setLanguage(catArray, language).then(res => {
+			if(reload) window.location.reload()
+
+			res.data.forEach(row => {
+				categories[row.category][row.phrase] = row.text
+			})
+
+			// update the reactive data that holds the current active user_language
+			user_language.value = language;
+
+			return res
+		})
+	},
 	loadCategory(category) {
 		if (Array.isArray(category))
 			return Promise.all(category.map(this.config.globalProperties
@@ -63,12 +79,15 @@ const phrasen = {
 
 export default {
 	install(app, options) {
+		reload = options?.reload ?? reload
 		app.use(FhcApi, options?.fhcApi || undefined);
 		app.config.globalProperties.$p = {
 			t: phrasen.t,
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
+			setLanguage: phrasen.setLanguage,
+			user_language: user_language,
 			t_ref: phrasen.t_ref
 		};
-                app.provide('$p', app.config.globalProperties.$p);
+		app.provide('$p', app.config.globalProperties.$p);
 	}
-}
+}