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

extension/anwesenheit_assistenz -> extension/anw_ent_admin; removed hardocoded status; check for overlapping excuse timespans; and a lot more ;)

Browse Source
This commit is contained in:
Johann Hoffmann
2024-07-15 17:38:13 +02:00
parent 66b151dce0
commit 630d2659b3
2 changed files with 110 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Form/Upload/Dms.js
+8 -3
View File
@@ -11,7 +11,11 @@ export default {
id: String,
name: String,
inputClass: [String, Array, Object],
noList: Boolean
noList: Boolean,
accept: {
type: String,
default: ''
}
},
methods: {
stringifyFile(file) {
@@ -71,10 +75,11 @@ export default {
this.$emit('update:modelValue', dt.files);
}
},
template: `
<div class="form-upload-dms">
<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
<input ref="upload" class="form-control" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-start">
<span class="col-auto"><i class="fa fa-file me-1"></i></span>
<span class="col">{{ file.name }}</span>
system/phrasesupdate.php
+102 -5
View File
@@ -25060,7 +25060,6 @@ array(
)
)
),
// FHC-CORE-ANWESENHEITEN BEGIN
array(
'app' => 'anwesenheiten',
'category' => 'global',
@@ -25144,7 +25143,27 @@ array(
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'entschuldigungAngenommen',
'phrase' => 'abgelehnt',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Abgelehnt',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'declined',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'entschuldigungAkzeptiert',
'insertvon' => 'system',
'phrases' => array(
array(
@@ -25161,6 +25180,26 @@ array(
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'akzeptiert',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Akzeptiert',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'accepted',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
@@ -25175,7 +25214,27 @@ array(
),
array(
'sprache' => 'English',
'text' => 'excuse note open',
'text' => 'excuse note status open',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'hochgeladen',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Hochgeladen',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'uploaded',
'description' => '',
'insertvon' => 'system'
)
@@ -25441,6 +25500,26 @@ array(
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'entschuldigungAutoEmailBetreff',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
@@ -26960,8 +27039,26 @@ array(
'insertvon' => 'system'
)
)
)
// FHC-CORE-ANWESENHEITEN END
),
array(
'app' => 'anwesenheiten',
'category' => 'global',
'phrase' => 'errorInvalidFiletype',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Ungültiges Dateiformat!',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Invalid Filetype!',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',