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

Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp

Browse Source
This commit is contained in:
ma0068
2024-05-28 16:34:47 +02:00
parent 0a4d89543a f218174ad3
commit 0c8d4d830f
4 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/notiz/NotizPerson.php
+13 -3
View File
@@ -17,17 +17,27 @@ class NotizPerson extends Notiz_Controller
{
if($typeId != "person_id")
{
return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
}
//TODO define permission
if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
{
$result = $this->p->t('lehre','error_keineSchreibrechte');
$result = $this->p->t('lehre', 'error_keineSchreibrechte');
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
return $this->outputJsonSuccess(true);
}
public function loadDokumente()
{
$notiz_id = $this->input->post('notiz_id');
// TODO(chris): make CI variant of endpoint
$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview');
return parent::loadDokumente();
}
}
application/core/Notiz_Controller.php
-1
View File
@@ -475,7 +475,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
public function loadDokumente()
{
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$notiz_id = $this->input->post('notiz_id');
$this->NotizModel->addSelect('campus.tbl_dms_version.*');
public/js/components/Form/Upload/Dms.js
+13 -7
View File
@@ -1,4 +1,9 @@
import DmsItem from './Dms/Item.js';
export default {
components: {
DmsItem
},
emits: [
'update:modelValue'
],
@@ -81,13 +86,14 @@ export default {
<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">
<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>
<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
<i class="fa fa-close"></i>
</button>
</li>
<dms-item
v-for="(file, index) in modelValue"
:key="index"
v-model="file"
class="d-flex mx-1 mt-1 align-items-start"
@delete="removeFile(index)"
>
</dms-item>
</ul>
</div>`
}
public/js/components/Form/Upload/Dms/Item.js
+37
View File
@@ -0,0 +1,37 @@
export default {
emits: [
'delete'
],
props: {
modelValue: {
type: [File, Object],
required: true
}
},
data() {
return {
preview: ''
};
},
watch: {
modelValue(n) {
if (n.type == 'application/x.fhc-dms+json') {
n.text().then(result => {
const obj = JSON.parse(result);
this.preview = obj.preview || '';
});
}
}
},
template: `
<li class="form-upload-dms-item">
<span class="col-auto"><i class="fa fa-file me-1"></i></span>
<span class="col">{{ modelValue.name }}</span>
<a v-if="preview" :href="preview" target="_blank" class="col-auto btn btn-outline-secondary btn-p-0 me-1">
<i class="fa fa-download"></i>
</a>
<button class="col-auto btn btn-outline-secondary btn-p-0" @click="$emit('delete')">
<i class="fa fa-close"></i>
</button>
</li>`
}