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

show the date of the last edit profil information request if there is any

Browse Source
This commit is contained in:
Simon Gschnell
2023-12-29 10:17:33 +01:00
parent 59b848c576
commit a27b80c394
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/Profil.php
+4 -4
View File
@@ -533,8 +533,8 @@ class Profil extends Auth_Controller
//telefon nummer von dem Standort
$res->standort_telefon = $telefon_res;
$res->editData = json_decode($editData_res->profil_changes);
$res->editDataTimestamp = $editData_res->change_timestamp;
$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
return $res;
}
@@ -733,8 +733,8 @@ class Profil extends Auth_Controller
$res->mailverteiler = $mailverteiler_res;
$res->editData = json_decode($editData_res->profil_changes);
$res->editDataTimestamp = $editData_res->change_timestamp;
$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
return $res;
public/js/apps/Cis/Profil.js
+8 -2
View File
@@ -107,9 +107,15 @@ const app = Vue.createApp({
Vue.$fhcapi.UserData.getView(uid).then((res)=>{
if(!res.data){
this.notFoundUID=uid;
}else{
this.view = res.data?.view;
this.data = res.data?.data;
if(this.data.editDataTimestamp){
this.data.editDataTimestamp= new Date(this.data.editDataTimestamp);
}
}
this.view = res.data?.view;
this.data = res.data?.data;
});
public/js/components/Cis/Profil/MitarbeiterProfil.js
+17 -2
View File
@@ -3,6 +3,7 @@ import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
import BsModal from "../../Bootstrap/Modal.js";
export default {
components: {
CoreFilterCmpt,
@@ -165,6 +166,15 @@ 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() {
return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
@@ -291,6 +301,9 @@ export default {
this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
});
},
@@ -587,8 +600,10 @@ export default {
</template>
<!-- optional footer -->
<template v-if="isEditDataChanged" v-slot:footer>
<button @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
<template v-slot:footer>
<p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{editDataTimestampFormated}}</p>
<button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
</template>
<!-- end of optional footer -->
</bs-modal>