diff --git a/public/js/apps/Dashboard/WidgetAdmin.js b/public/js/apps/Dashboard/WidgetAdmin.js index c81b5f563..6c92a919b 100644 --- a/public/js/apps/Dashboard/WidgetAdmin.js +++ b/public/js/apps/Dashboard/WidgetAdmin.js @@ -23,7 +23,9 @@ const app = Vue.createApp({
-

Widgets

+

+ {{ $p.t('dashboard/widgets') }} +

diff --git a/public/js/components/Dashboard/WidgetAdmin.js b/public/js/components/Dashboard/WidgetAdmin.js index 33ad326c9..23a26bc61 100644 --- a/public/js/components/Dashboard/WidgetAdmin.js +++ b/public/js/components/Dashboard/WidgetAdmin.js @@ -31,7 +31,6 @@ export default { this.currentData = JSON.parse(JSON.stringify(data)); }, create(data) { - // TODO(chris): modify data with base info this.currentData = JSON.parse(JSON.stringify(data)); this.save(); }, @@ -69,7 +68,7 @@ export default { @saved="save" />
- Please select a widget + {{ $p.t('dashboard/no_widget_selected') }}
diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js index db0acc1b3..ac1ccedad 100644 --- a/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js +++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js @@ -32,11 +32,11 @@ export default {
- {{ $p.t('mobility/kurzbz') }}: + {{ $p.t('dashboard/widget_kurzbz') }}: {{ modelValue.widget_kurzbz }}
- {{ $p.t('zeitaufzeichnung/id') }}: + {{ $p.t('dashboard/widget_id') }}: {{ modelValue.widget_id }}
diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Aggregators.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Aggregators.js index e4cf5fd46..eef87e41b 100644 --- a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Aggregators.js +++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Aggregators.js @@ -72,14 +72,14 @@ export default { :aria-controls="'aggregator_' + myId + '_' + i" > {{ agg.label }} - new + {{ $p.t('ui/neu') }}
- - + +
`, diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Date.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Date.js index 738c2bf3b..db0d811d7 100644 --- a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Date.js +++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Date.js @@ -24,14 +24,13 @@ export default { }, }, }, - // TODO(chris): phrases: placeholder template: /*html*/ ` `, diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Right.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Right.js index cb17c1d9b..7070871b1 100644 --- a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Right.js +++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Calc/Right.js @@ -24,14 +24,13 @@ export default { }, }, }, - // TODO(chris): phrases: placeholder template: /*html*/ ` `, diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Var.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Var.js index 6d4c4508f..67d0d85a5 100644 --- a/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Var.js +++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Report/Vars/Var.js @@ -131,9 +131,9 @@ export default { input-group @update:modelValue="setType" > - - - + + + - +
- {{ $p.t('ui/width') }} + {{ $p.t('dashboard/widget_setup_width') }} - {{ $p.t('ui/height') }} + {{ $p.t('dashboard/widget_setup_height') }}
{ if (!value) return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/fh_technikum_wien_illustration_klein.png'; @@ -41,14 +42,17 @@ export default { { field: 'setup.name', title: 'Name', + titlePhrase: 'global/name', }, { field: 'widget_kurzbz', title: 'Kurzbz', + titlePhrase: 'dashboard/widget_kurzbz', }, { field: 'berechtigung_kurzbz', title: 'Berechtigung', + titlePhrase: 'global/permission', }, ], locale: true, @@ -74,7 +78,7 @@ export default { return true; BsConfirm - .popup('selectablecheck' + row.getData().widget_id) + .popup(this.$p.t('dashboard/confirm_unsaved_progress')) .then(() => { const currentRows = row.getTable().getSelectedRows(); if (currentRows.length) @@ -88,7 +92,7 @@ export default { newWidget() { if (this.unsavedProgress) { BsConfirm - .popup('newcheck') + .popup(this.$p.t('dashboard/confirm_unsaved_progress')) .then(() => this.$emit('new')) .catch(() => {}); } else { @@ -109,7 +113,7 @@ export default { table-only reload new-btn-show - new-btn-label="Widget" + :new-btn-label="$p.t('dashboard/widget')" @click:new="newWidget" > diff --git a/public/js/components/Dashboard/WidgetAdmin/New.js b/public/js/components/Dashboard/WidgetAdmin/New.js index c25ecf53b..15aae589b 100644 --- a/public/js/components/Dashboard/WidgetAdmin/New.js +++ b/public/js/components/Dashboard/WidgetAdmin/New.js @@ -58,24 +58,33 @@ export default { diff --git a/public/js/components/DashboardWidget/Generators/Report/Kpi.js b/public/js/components/DashboardWidget/Generators/Report/Kpi.js index 2926f66ac..1814983d6 100644 --- a/public/js/components/DashboardWidget/Generators/Report/Kpi.js +++ b/public/js/components/DashboardWidget/Generators/Report/Kpi.js @@ -25,8 +25,6 @@ export default { details: null, }; }, - computed: { - }, methods: { attemptReportChange(value) { if (this.modelValue.arguments.statistik_kurzbz == value) @@ -37,7 +35,7 @@ export default { if (hasVars || hasAggregators) { BsConfirm - .popup('change') // TODO(chris): phrase + .popup($p.t('dashboard/widget_report_statistik_change')) .then(() => { this.modelValue.arguments.statistik_kurzbz = value; this.modelValue.arguments.aggregators = []; @@ -69,7 +67,6 @@ export default { this.modelValue.arguments.vars[detail.kurzbz] = { type: 'fix' }; }); - // TODO(chris): emit update:modelValue this.details = result.data; }) .catch(this.$fhcAlert.handleSystemErrors) diff --git a/public/js/components/DashboardWidget/Report/Config/Kpi.js b/public/js/components/DashboardWidget/Report/Config/Kpi.js index 883b2710b..36f9c1e50 100644 --- a/public/js/components/DashboardWidget/Report/Config/Kpi.js +++ b/public/js/components/DashboardWidget/Report/Config/Kpi.js @@ -61,8 +61,8 @@ export default { }, template: /*html*/ `
- +
+
'core', + 'category' => 'global', + 'phrase' => 'label', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bezeichnung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Label', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'global', @@ -1353,6 +1373,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'global', + 'phrase' => 'permission', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berechtigung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Permission', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'global', @@ -1361,7 +1401,7 @@ $phrases = array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Rechte', + 'text' => 'Berechtigungen', 'description' => '', 'insertvon' => 'system' ), @@ -60750,6 +60790,86 @@ I have been informed that I am under no obligation to consent to the transmissio ) ) ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widgets', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Widgets', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Widgets', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Widget', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Widget', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'no_widget_selected', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bitte ein Widget markieren!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Please select a widget!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'confirm_unsaved_progress', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Das Widget wurde geändert! Änderungen verwerfen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The widget has been modified! Discard changes?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'dashboard', @@ -60790,6 +60910,26 @@ I have been informed that I am under no obligation to consent to the transmissio ) ) ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_icon', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Icon', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Icon', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'dashboard', @@ -60810,6 +60950,446 @@ I have been informed that I am under no obligation to consent to the transmissio ) ) ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_setup_size', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Größe', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Size', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_setup_width', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Breite', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Width', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_setup_height', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Höhe', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Height', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_setup_hidefooter', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Footer verstecken', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Hide footer', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_statistik', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Statistik', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Statistic', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_statistik_change', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Die Statistik wurde geändert! Einstellungen für vorherige Statistik verwerfen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The Statistic has been changed! Discard settings for the previous Statistic?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Variablen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Variables', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_var_type_fix', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Fester Wert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Fixed', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_var_type_calc', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berechnet', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Calculated', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_var_type_user', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Benutzerdefiniert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'User defined', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_date', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berechnetes Datum', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Calculated date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_currentstudienjahr', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aktuelles Studienjahr', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Current academic year', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_stgs', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studiengang des Users', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Users degree program', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_date', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berechnetes Datum', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Calculated date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_date_placeholder', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Dauer (fügen Sie am Anfang ein \'-\' hinzu, um es abzuziehen) ab dem aktuellen Datum', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Duration (add \'-\' at the beginning to substract) from current date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_vars_calc_right_placeholder', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berechtigungen (Komma getrennt)', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Access Rights (comma separated)', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregators', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aggregatoren', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Aggregators', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregator', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aggregator', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Aggregator', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregator_type_sum', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Summe', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Sum', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregator_type_count', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zeilenanzahl', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Row count', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregator_fields', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Felder', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Fields', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'dashboard', + 'phrase' => 'widget_report_kpi_aggregator_fields_placeholder', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Felder (Komma getrennt)', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Fields (comma separated)', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'ui',