diff --git a/application/controllers/api/frontend/v1/notiz/Notiz.php b/application/controllers/api/frontend/v1/notiz/Notiz.php
deleted file mode 100644
index 2288766c4..000000000
--- a/application/controllers/api/frontend/v1/notiz/Notiz.php
+++ /dev/null
@@ -1,384 +0,0 @@
- ['admin:r', 'assistenz:r'],
- 'getNotizen' => ['admin:r', 'assistenz:r'],
- 'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'deleteNotiz' => ['admin:r', 'assistenz:r'],
- 'loadDokumente' => ['admin:r', 'assistenz:r'],
- 'getMitarbeiter' => ['admin:r', 'assistenz:r']
- ]);
-
- //Load Models
- $this->load->model('person/Notiz_model', 'NotizModel');
- $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
- // Load Libraries
- $this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
- // Load language phrases
- $this->loadPhrases([
- 'ui'
- ]);
- }
-
- /* public function getUid()
- {
- $this->terminateWithSuccess(getAuthUID());
- }*/
-
-
- public function getNotizen($id, $type)
- {
-
- //check if valid type
- $result = $this->NotizzuordnungModel->isValidType($type);
- if(isError($result))
- $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
- //$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
- $result = $this->NotizModel->getNotizWithDocEntries($id, $type);
-
- if (isError($result)) {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess(getData($result) ?: []);
-
- // return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
-
- }
-
- /* public function loadNotiz()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
- $notiz_id = $this->input->post('notiz_id');
-
- //$this->load->model('person/Notiz_model', 'NotizModel');
- $this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
- $this->NotizModel->addSelect('*');
- $this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum
- THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
- $this->NotizModel->addLimit(1);
-
- $result = $this->NotizModel->loadWhere(
- array('notiz_id' => $notiz_id)
- );
- if (isError($result))
- {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- elseif (!hasData($result))
- {
- $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
- }
- else
- {
- $this->terminateWithSuccess(current(getData($result)));
- }
- }
-
-
- public function updateNotiz()
- {
- $this->load->library('form_validation');
- $this->load->library('DmsLib');
-
- if (isset($_POST['data']))
- {
- $data = json_decode($_POST['data']);
- unset($_POST['data']);
- foreach ($data as $k => $v) {
- $_POST[$k] = $v;
- }
- }
-
- $notiz_id = $this->input->post('notiz_id');
-
- if(!$notiz_id)
- {
- $this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
- }
-
- //Form Validation
- $this->form_validation->set_rules('titel', 'Titel', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
- ]);
-
- $this->form_validation->set_rules('text', 'Text', 'required', [
- 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
- ]);
-
- if ($this->form_validation->run() == false)
- {
- $this->terminateWithValidationErrors($this->form_validation->error_array());
- }
-
- //update Notiz
- $uid = getAuthUID();
- $titel = $this->input->post('titel');
- $text = $this->input->post('text');
- $verfasser_uid = $this->input->post('verfasser');
- $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
- $erledigt = $this->input->post('erledigt');
- $start = $this->input->post('start');
- $ende = $this->input->post('ende');
-
- $result = $this->NotizModel->update(
- [
- 'notiz_id' => $notiz_id
- ],
- [
- 'titel' => $titel,
- 'updatevon' => $uid,
- 'updateamum' => date('c'),
- 'text' => $text,
- 'verfasser_uid' => $verfasser_uid,
- 'bearbeiter_uid' => $bearbeiter_uid,
- 'start' => $start,
- 'ende' => $ende,
- 'erledigt' => $erledigt
- ]
- );
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- //update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
- $this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
- $this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
- $dms_uploaded = null;
-
- $result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
- if (isError($result))
- {
- $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- elseif (!hasData($result))
- {
- $dms_id_arr = null;
- }
- else
- {
- $result = getData($result);
- foreach($result as $doc) {
- $dms_id_arr[] = array(
- 'name' => $doc->name,
- 'dms_id' => $doc->dms_id
- );
- }
- }
-
- foreach ($_FILES as $k => $file)
- {
- //update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
- if($file["type"] == 'application/x.fhc-dms+json')
- {
- $dms_uploaded[] = array(
- 'name' => $file["name"]
- );
- }
- else
- {
- $dms = array(
- 'kategorie_kurzbz' => 'notiz',
- 'version' => 0,
- 'name' => $file["name"],
- 'mimetype' => $file["type"],
- 'insertamum' => date('c'),
- 'insertvon' => $uid
- );
-
- //Todo(manu) check if filetypes weiter eingeschränkt werden sollen
- //Todo(manu)check name files: nicht gleiches file 2mal hochladen
- $result = $this->dmslib->upload($dms, $k, array('*'));
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- $dms_id = $result->retval['dms_id'];
-
- $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- }
- }
-
- //update(3) check if Dateien gelöscht wurden
- if(count($dms_uploaded) != count($dms_id_arr))
- {
- if (count($dms_uploaded) == 0)
- {
- $filesDeleted = $dms_id_arr;
- }
- else
- {
- $upload_new_names = array_column($dms_uploaded, "name");
-
- $filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
- return !in_array($file["name"], $upload_new_names);
- });
- }
-
- foreach ($filesDeleted as $file)
- {
- $result = $this->dmslib->removeAll($file['dms_id']);
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
- else
- $this->outputJson($result);
- }
- }
- return $this->terminateWithSuccess($result);
- }*/
-
-
- /* public function deleteNotiz()
- {
- $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
- $notiz_id = $this->input->post('notiz_id');
- $type = $this->input->post('type_id');
- $id = $this->input->post('id');
-
- //dms_id auslesen aus notizdokument wenn vorhanden
- $dms_id_arr = [];
- $this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
- $result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- if(hasData($result))
- {
- $result = getData($result);
- foreach ($result as $doc) {
- $dms_id_arr[] = $doc->dms_id;
- }
- }
-
- if($dms_id_arr)
- {
- $this->load->library('DmsLib');
- foreach($dms_id_arr as $dms_id)
- {
- $result = $this->dmslib->removeAll($dms_id);
-
- if (isError($result))
- {
- return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
- }
-
- $this->outputJson($result);
- }
- }
-
- //delete Notizzuordnung
- if($type == "software_id")
- {
- // Loads extension Model
- $this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
- $result = $this->ExtensionnotizzuordnungModel->delete([
- 'notiz_id' => $notiz_id,
- 'id' => strval($id)
- ],
- [
- 'type_id' => $type
- ]);
-
- }
- else
- {
- //notizzuordnungsid!
- $result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
- }
-
-
- $this->load->model('person/Notiz_model', 'NotizModel');
- //$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-
- //TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
-
- //Löschen von Notiz
- $result = $this->NotizModel->delete(
- array('notiz_id' => $notiz_id)
- );
-
- if (isError($result))
- {
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- if(!hasData($result))
- {
- return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
- }
-
- return $this->terminateWithSuccess(current(getData($result)));
- }*/
-
- /* 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.*');
-
- $this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
- $this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
-
- $result = $this->NotizModel->loadWhere(
- array('public.tbl_notiz.notiz_id' => $notiz_id)
- );
- if (isError($result)) {
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
-
- if(!hasData($result))
- {
- return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess(getData($result));
- }*/
-
- /* public function getMitarbeiter($searchString)
- {
- $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
- $result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
- if (isError($result)) {
- $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- return $this->terminateWithSuccess($result);
- }*/
-
- public function isBerechtigt($id, $typeId)
- {
- if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
- {
- $result = $this->p->t('lehre','error_keineSchreibrechte');
-
- return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
- }
- return success("berechtigt in überschreibender Funktion");
- /* return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
- }
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
new file mode 100644
index 000000000..2cf1f2519
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -0,0 +1,33 @@
+ ['admin:r', 'assistenz:r'],
+ ]);
+ }
+
+ public function isBerechtigt($id, $typeId)
+ {
+ if($typeId != "person_id")
+ {
+ 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'))
+ {
+ $result = $this->p->t('lehre','error_keineSchreibrechte');
+
+ return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+ }
+
+ return $this->outputJsonSuccess(true);
+ }
+}
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 51d6854b7..8a93c4f0f 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -10,19 +10,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
- 'getUid' => ['admin:r', 'assistenz:r'],
- 'getNotizen' => ['admin:r', 'assistenz:r'],
- 'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
- 'deleteNotiz' => ['admin:r', 'assistenz:r'],
- 'loadDokumente' => ['admin:r', 'assistenz:r'],
- 'getMitarbeiter' => ['admin:r', 'assistenz:r'],
- 'isBerechtigt' => ['admin:r', 'assistenz:r']
+ 'getUid' => self::PERM_LOGGED,
+ 'getNotizen' => self::PERM_LOGGED,
+ 'loadNotiz' => self::PERM_LOGGED,
+ 'addNewNotiz' => self::PERM_LOGGED,
+ 'updateNotiz' => self::PERM_LOGGED,
+ 'deleteNotiz' => ['admin:w', 'assistenz:w'],
+ 'loadDokumente' => ['admin:w', 'assistenz:w'],
+ 'getMitarbeiter' => self::PERM_LOGGED,
+ 'isBerechtigt' => self::PERM_LOGGED,
]);
//Load Models
$this->load->model('person/Notiz_model', 'NotizModel');
+ $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
// Load Libraries
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -39,7 +40,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
}
- //Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+ //Override function for extensions
protected function assignNotiz($notiz_id, $id, $type)
{
$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -55,7 +56,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
return success(getData($result));
}
- //Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+ //Override function for extensions
protected function deleteNotizzuordnung($notiz_id, $id, $type)
{
$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -72,11 +73,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
}
+ //Override function for extensions
+ public function getNotizen($id, $type)
+ {
+ $result = $this->NotizzuordnungModel->isValidType($type);
+ if(isError($result))
+ $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
- //TODO(manu) abstract
- protected function getNotizen($id, $type) {}
+ $result = $this->NotizModel->getNotizWithDocEntries($id, $type);
- //TODO(manu) to abstract
+ if (isError($result)) {
+ $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+ }
+ return $this->terminateWithSuccess(getData($result) ?: []);
+ }
+
+
+ //Override function
protected function isBerechtigt($id, $typeId){
return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
}
@@ -144,7 +157,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$titel = $this->input->post('titel');
$text = $this->input->post('text');
$erledigt = $this->input->post('erledigt');
- $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+ $verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+ //$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
$type = $this->input->post('typeId');
$start = $this->input->post('start');
@@ -153,7 +167,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
// Start DB transaction
$this->db->trans_start();
- //Speichern der Notiz
+ //Save note
$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
@@ -165,7 +179,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$notiz_id = $result->retval;
- //Speichern der Notizzuordnung
+ //save Notizzuordnung
$result = $this->assignNotiz($notiz_id, $id, $type);
if (isError($result))
@@ -174,7 +188,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
- //Speichern der Dokumente
+ //save Documents
$dms_id_arr = [];
foreach ($_FILES as $k => $file)
{
@@ -189,6 +203,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+ //Todo define in dms component: readFile, downloadFile
$result = $this->dmslib->upload($dms, $k, ['*']);
/* $result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
if (isError($result))
@@ -199,10 +214,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$dms_id_arr[] = $result->retval['dms_id'];
}
- //Eintrag in Notizdokument speichern
+ //save entry in Notizdokument
if($dms_id_arr)
{
- // Loads model Notizdokument_model
$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
foreach($dms_id_arr as $dms_id)
{
@@ -257,8 +271,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$uid = getAuthUID();
$titel = $this->input->post('titel');
$text = $this->input->post('text');
- $verfasser_uid = $this->input->post('verfasser_uid');
- $bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : $uid;
+ $verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+ $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
$erledigt = $this->input->post('erledigt');
$start = $this->input->post('start');
$ende = $this->input->post('ende');
@@ -284,7 +298,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
- //update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+ //update(1) loading all dms-entries with this notiz_id
$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
$dms_uploaded = null;
@@ -311,7 +325,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
foreach ($_FILES as $k => $file)
{
- //update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+ //update(2) attach all new files (except type application/x.fhc-dms+json)
if($file["type"] == 'application/x.fhc-dms+json')
{
$dms_uploaded[] = array(
@@ -331,6 +345,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+ //Todo define in dms component: readFile, downloadFile
$result = $this->dmslib->upload($dms, $k, array('*'));
if (isError($result))
@@ -347,7 +362,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
}
}
- //update(3) check if Dateien gelöscht wurden
+ //update(3) check if all files have been deleted
if(count($dms_uploaded) != count($dms_id_arr))
{
if (count($dms_uploaded) == 0)
@@ -387,12 +402,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$typeId = $this->input->post('type_id');
$id = $this->input->post('id');
- if(!$this->isBerechtigt($id, $typeId))
- {
- $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
- }
+ //TODO(manu): define Permissions for deletion document if filecomponent finished
- //dms_id auslesen aus notizdokument wenn vorhanden
+ //get dms_id from notizdokument
$dms_id_arr = [];
$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
@@ -416,7 +428,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
// Start DB transaction
$this->db->trans_start();
- //return $this->terminateWithError("dms_id kommt: " . $notiz_id, self::ERROR_TYPE_GENERAL);
$this->load->library('DmsLib');
@@ -444,7 +455,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$this->load->model('person/Notiz_model', 'NotizModel');
- //Löschen von Notiz
+ //Delete Note
$result = $this->NotizModel->delete(
array('notiz_id' => $notiz_id)
);
@@ -465,10 +476,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
public function loadDokumente()
{
- if(!$this->isBerechtigt('$id', '$typeId'))
- {
- $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
- }
$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
$notiz_id = $this->input->post('notiz_id');
diff --git a/public/js/api/notiz/person.js b/public/js/api/notiz/person.js
index be19b4ed9..de351b68b 100644
--- a/public/js/api/notiz/person.js
+++ b/public/js/api/notiz/person.js
@@ -1,38 +1,41 @@
export default {
- getNotizen(url, config, params){
- return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getNotizen/' + params.id + '/' + params.type);
+ getNotizen (url, config, params){
+ return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getNotizen/' + params.id + '/' + params.type);
},
getUid(){
- return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getUid/');
+ return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getUid/');
},
addNewNotiz(id, formData) {
- return this.$fhcApi.post('api/frontend/v1/notiz/notiz/addNewNotiz/' + id,
+ return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/addNewNotiz/' + id,
formData
);
},
loadNotiz(notiz_id){
- return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadNotiz/', {
+ return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadNotiz/', {
notiz_id
});
},
loadDokumente(notiz_id){
- return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadDokumente/', {
+ return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadDokumente/', {
notiz_id
});
},
deleteNotiz(notiz_id, type_id, id){
- return this.$fhcApi.post('api/frontend/v1/notiz/notiz/deleteNotiz/', {
+ return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/deleteNotiz/', {
notiz_id,
type_id,
id
});
},
updateNotiz(notiz_id, formData){
- return this.$fhcApi.post('api/frontend/v1/notiz/notiz/updateNotiz/' + notiz_id,
+ return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/updateNotiz/' + notiz_id,
formData
);
},
getMitarbeiter(event){
- return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getMitarbeiter/' + event);
+ return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getMitarbeiter/' + event);
+ },
+ isBerechtigt(id, type_id){
+ return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/isBerechtigt/');
}
}
\ No newline at end of file
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 185e7193d..50677c6a3 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -1036,4 +1036,4 @@ export default {
`,
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 4c128bfea..185b8d0d5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -11,20 +11,6 @@ export default {
Notizen
-
-
-
+
-
-