blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

funktionen/betriebsmittel table in profil & viewprofil got computed phrasen title; provide computed language reference in fhc app from phrasen plugin to watch for language changes to reevaluate computed phrasen in columns with; added some phrasen;

Browse Source
This commit is contained in:
Johann Hoffmann
2025-02-14 13:34:52 +01:00
parent ff60de5772
commit ff8d1c78fd
4 changed files with 104 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/apps/Dashboard/Fhc.js
+5
View File
@@ -89,6 +89,11 @@ const app = Vue.createApp({
return /Mobi|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
}
},
provide() {
return { // provide injectable & watchable language property
language: Vue.computed(() => this.$p.user_language)
}
},
methods: {
isInternalRoute(href) {
const internalBase = window.location.origin
public/js/components/Cis/Profil/MitarbeiterProfil.js
+30 -18
View File
@@ -25,7 +25,7 @@ export default {
ProfilInformation,
},
inject: ["sortProfilUpdates", "collapseFunction"],
inject: ["sortProfilUpdates", "collapseFunction", "language"],
data() {
return {
@@ -56,21 +56,21 @@ export default {
visible: true
},
{
title: "Bezeichnung",
title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
field: "Bezeichnung",
headerFilter: true,
minWidth: 200,
visible: true
},
{
title: "Organisationseinheit",
title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
field: "Organisationseinheit",
headerFilter: true,
minWidth: 200,
visible: true
},
{
title: "Gültig_von",
title: Vue.computed(() => this.$p.t('global/gueltigVon')),
field: "Gültig_von",
headerFilter: true,
resizable: true,
@@ -78,7 +78,7 @@ export default {
visible: true
},
{
title: "Gültig_bis",
title: Vue.computed(() => this.$p.t('global/gueltigBis')),
field: "Gültig_bis",
headerFilter: true,
resizable: true,
@@ -86,7 +86,7 @@ export default {
visible: true
},
{
title: "Wochenstunden",
title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
field: "Wochenstunden",
headerFilter: true,
minWidth: 200,
@@ -96,6 +96,10 @@ export default {
},
betriebsmittel_table_options: {
persistenceID: "filterTableMaProfilBetriebsmittel",
persistence: {
columns: false
},
height: 300,
layout: "fitColumns",
responsiveLayout: "collapse",
@@ -115,14 +119,14 @@ export default {
visible: true
},
{
title: "Betriebsmittel",
title: Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
field: "betriebsmittel",
headerFilter: true,
minWidth: 200,
visible: true
},
{
title: "Nummer",
title: Vue.computed(() => this.$p.t('profil/inventarnummer')),
field: "Nummer",
headerFilter: true,
resizable: true,
@@ -130,7 +134,7 @@ export default {
visible: true
},
{
title: "Ausgegeben_am",
title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
field: "Ausgegeben_am",
headerFilter: true,
minWidth: 200,
@@ -145,17 +149,14 @@ export default {
data: Object,
editData: Object,
},
'data.funktionen'(newVal) {
if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
},
'data.mittel'(newVal) {
if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setData(newVal);
},
methods: {
betriebsmittelTableBuilt: function () {
this.$refs.betriebsmittelTable.tabulator.setColumns(this.betriebsmittel_table_options.columns)
this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
},
funktionenTableBuilt: function () {
this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
},
hideEditProfilModal: function () {
@@ -202,6 +203,10 @@ export default {
}
});
},
setTableColumnTitles() { // reevaluates computed phrasen
if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setColumns(this.betriebsmittel_table_options.columns)
if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
}
},
computed: {
@@ -274,10 +279,17 @@ export default {
this.data.profilUpdates?.sort(this.sortProfilUpdates);
},
mounted() {
watch: {
'data.funktionen'(newVal) {
if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
},
'data.mittel'(newVal) {
if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setData(newVal);
},
'language.value'(newVal) {
this.setTableColumnTitles()
}
},
template: /*html*/ `
<div class="container-fluid text-break fhc-form" >
<edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+9 -6
View File
@@ -14,7 +14,7 @@ export default {
ProfilEmails,
ProfilInformation,
},
inject: ["collapseFunction"],
inject: ["collapseFunction", "language"],
data() {
return {
collapseIconFunktionen: true,
@@ -44,21 +44,21 @@ export default {
visible: true
},
{
title: "Bezeichnung",
title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
field: "Bezeichnung",
headerFilter: true,
minWidth: 200,
visible: true
},
{
title: "Organisationseinheit",
title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
field: "Organisationseinheit",
headerFilter: true,
minWidth: 200,
visible: true
},
{
title: "Gültig_von",
title: Vue.computed(() => this.$p.t('global/gueltigVon')),
field: "Gültig_von",
headerFilter: true,
resizable: true,
@@ -66,7 +66,7 @@ export default {
visible: true
},
{
title: "Gültig_bis",
title: Vue.computed(() => this.$p.t('global/gueltigBis')),
field: "Gültig_bis",
headerFilter: true,
resizable: true,
@@ -74,7 +74,7 @@ export default {
visible: true
},
{
title: "Wochenstunden",
title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
field: "Wochenstunden",
headerFilter: true,
minWidth: 200,
@@ -96,6 +96,9 @@ export default {
'data.funktionen'(newVal) {
if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
},
'language.value'(newVal) { // reevaluates computed phrasen
if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
}
},
computed: {
getTelefonValue() {
system/phrasesupdate.php
+60
View File
@@ -27536,6 +27536,66 @@ array(
)
)
),
array(
'app' => 'core',
'category' => 'profil',
'phrase' => 'inventarnummer',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Inventarnummer',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'inventory number',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'profil',
'phrase' => 'ausgabedatum',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Ausgabedatum',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'issue date',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'profil',
'phrase' => 'wochenstunden',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Wochenstunden',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'working hours',
'description' => '',
'insertvon' => 'system'
)
)
),
//Profil Phrasen ende
//ProfilUpdate Phrasen start
array(