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

http response returns the timestamp of the change

Browse Source
This commit is contained in:
Simon Gschnell
2023-12-29 12:01:25 +01:00
parent a27b80c394
commit bb0656c480
5 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/Profil.php
+14 -1
View File
@@ -80,9 +80,22 @@ class Profil extends Auth_Controller
if (empty($res)) {
$insert_res = $this->ProfilChangeModel->insert($data);
echo json_encode($insert_res);
if(isError($insert_res)){
//catch error
}else{
//? status code 201 CREATED
$insert_res->code = 201;
$insert_res->retval = $this->ProfilChangeModel->getTimestamp($this->uid)->change_timestamp;
echo json_encode($insert_res);
}
} else {
$update_res = $this->ProfilChangeModel->update([$this->uid], $data);
if(isError($update_res)){
//catch error
}
//? status code 200 OK
$update_res->code = 200;
echo json_encode($update_res);
}
application/models/person/Profil_change_model.php
+5 -15
View File
@@ -19,20 +19,10 @@ class Profil_change_model extends DB_Model
/**
* getLastStatuses
*/
public function getData($uid){
$res = $this->load($uid);
$res = hasData($res) ? getData($res)[0] : null;
return $res;
}
public function insertData($data){
$res = $this->insert($data);
//$res = hasData($res) ? getData($res)[0] : null;
return $res;
}
public function getTimestamp($uid){
$this->addSelect(['change_timestamp']);
$res = $this->load([$uid]);
return hasData($res) ? getData($res)[0] : null;
}
}
public/js/apps/Cis/Profil.js
+9 -1
View File
@@ -95,7 +95,15 @@ const app = Vue.createApp({
col.click();
});
}
}
},
getFormatedDate: function(date){
return [
date.getDate().toString().padStart(2,'0'),
(date.getMonth()+1).toString().padStart(2,'0'),
date.getFullYear(),
].join('/');
},
},
created(){
public/js/components/Bootstrap/Confirm.js
+1 -1
View File
@@ -1,4 +1,4 @@
import BsAlert from './Alert';
import BsAlert from './Alert.js';
export default {
mixins: [
public/js/components/Cis/Profil/MitarbeiterProfil.js
+29 -16
View File
@@ -1,6 +1,7 @@
import fhcapifactory from "../../../apps/api/fhcapifactory.js";
import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
import BsModal from "../../Bootstrap/Modal.js";
import Alert from "../../Bootstrap/Alert.js";
@@ -8,6 +9,7 @@ export default {
components: {
CoreFilterCmpt,
BsModal,
Alert,
},
data() {
return {
@@ -142,7 +144,6 @@ export default {
},
hideModal() {
// You can call the hide method of the modal component if needed
this.$refs.bsmodal.hide();
},
@@ -150,7 +151,22 @@ export default {
submitProfilChange(){
if(this.isEditDataChanged){
//? inserts new row in public.tbl_cis_profil_update
Vue.$fhcapi.UserData.editProfil(this.data.editData);
Vue.$fhcapi.UserData.editProfil(this.data.editData).then((res)=>{
this.hideModal();
if(res.data.error == 0){
//? sets the requested changes as the current data state, so that computed property isEditDataChanged works properly
this.originalEditData = JSON.stringify(this.data.editData);
console.log(this.originalEditData != JSON.stringify(this.data.editData));
//* sets the returned timestamp from the response
this.data.editDataTimestamp = res.data.retval? new Date(res.data.retval) : null;
Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
}else{
Alert.popup("Ein Fehler ist aufgetreten: "+ res.data.retval);
}
//
});
}
},
@@ -167,13 +183,7 @@ export default {
computed: {
editDataTimestampFormated: function(){
return [
this.data.editDataTimestamp.getDate().toString().padStart(2,'0'),
(this.data.editDataTimestamp.getMonth()+1).toString().padStart(2,'0'),
this.data.editDataTimestamp.getFullYear(),
].join('/');
},
//? legacy mailto link to create an email with information that should be changed
refreshMailTo() {
@@ -190,8 +200,8 @@ export default {
},
isEditDataChanged: function(){
return JSON.stringify(this.data.editData) != this.originalEditData;
isEditDataChanged(){
return this.originalEditData != JSON.stringify(this.data.editData)
},
get_mitarbeiter_standort_telefon(){
@@ -275,6 +285,9 @@ export default {
created() {
if(this.data.editData){
this.originalEditData = JSON.stringify(this.data.editData);
}else{
@@ -310,8 +323,8 @@ export default {
template: `
<div class="row"><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
<div class="row"><div class="col"><pre>{{JSON.stringify(JSON.parse(originalEditData),null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div></div>
<p>{{isEditDataChanged}}</p>
<div class="container-fluid text-break fhc-form" >
<!-- ROW -->
<div class="row">
@@ -600,10 +613,10 @@ export default {
</template>
<!-- optional footer -->
<template v-slot:footer>
<p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{editDataTimestampFormated}}</p>
<template v-if="data.editDataTimestamp || isEditDataChanged" v-slot:footer>
<p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{$parent.getFormatedDate(data.editDataTimestamp)}}</p>
<button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
<button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
</template>
<!-- end of optional footer -->
</bs-modal>