diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index a490eddc5..952df4e0e 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -44,6 +44,29 @@ const app = Vue.createApp({
ViewStudentProfil,
ViewMitarbeiterProfil,
},
+ provide: {
+
+
+ sortProfilUpdates: (ele1,ele2)=>{
+
+ let result = 0;
+ if(ele1.status === 'pending'){
+ result= -1;
+ }
+ else if(ele1.status === 'accepted'){
+ result= ele2.status ==='rejected'? -1 : 1;
+ }
+ else{
+ result= 1;
+ }
+ //? if they have the same status the insert date is used for ordering
+ if(ele1.status === ele2.status){
+ result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
+ }
+ return result;
+ }
+
+ },
data() {
return {
view:null,
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 21bf32444..9a9766cb6 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -3,6 +3,25 @@ import { CoreFilterCmpt } from "../../components/filter/Filter.js";
import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
Vue.$fhcapi = fhcapifactory;
+const sortProfilUpdates = (ele1,ele2)=>{
+
+ let result = 0;
+ if(ele1.status === 'pending'){
+ result= -1;
+ }
+ else if(ele1.status === 'accepted'){
+ result= ele2.status ==='rejected'? -1 : 1;
+ }
+ else{
+ result= 1;
+ }
+ //? if they have the same status the insert date is used for ordering
+ if(ele1.status === ele2.status){
+ result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
+ }
+ return result;
+ };
+
const app = Vue.createApp({
components: {
CoreFilterCmpt,
@@ -12,7 +31,39 @@ const app = Vue.createApp({
showAll: false,
profil_updates_table_options: {
-
+ ajaxResponse:function(url, params, response){
+ //url - the URL of the request
+ //params - the parameters passed with the request
+ //response - the JSON object returned in the body of the response.
+ //? sorts the response data from the backend
+ response.sort(sortProfilUpdates);
+ return response;
+ },
+ //? adds tooltip with the status message of a profil update request if its status is not pending
+ columnDefaults:{
+ tooltip:function(e, cell, onRendered){
+ //e - mouseover event
+ //cell - cell component
+ //onRendered - onRendered callback registration function
+ let statusMessage = cell.getData().status_message;
+ let statusDate = cell.getData().status_timestamp;
+ let status = cell.getData().status;
+ if(!statusMessage){
+ return null;
+ }
+ let el = document.createElement("div");
+ el.classList.add("border","border-dark");
+
+ let statusDateEl = document.createElement("p");
+ statusDateEl.innerHTML = "Request was "+ status + " on " + statusDate ;
+ let statusMessageEl = document.createElement("span");
+ statusMessageEl.innerHTML = "Status message: " + statusMessage ;
+
+ el.appendChild(statusDateEl);
+ el.appendChild(statusMessageEl);
+ return el;
+ },
+ },
rowContextMenu: (e, component)=>{
let menu =[];
@@ -79,7 +130,7 @@ const app = Vue.createApp({
},
height: 600,
layout: "fitColumns",
-
+
columns: [
{
title: "UID",
@@ -122,11 +173,11 @@ const app = Vue.createApp({
switch (cell.getValue()) {
case "pending":
- return " pending";
+ return "";
case "accepted":
- return " accepted";
+ return "";
case "rejected":
- return " rejected";
+ return "";
default:
return "default
";
}
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index e0463b21d..615ddcc18 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -95,6 +95,7 @@ export default {
this.$emit("submit");
},
+ //TODO: REWRITE THIS TO USE PROVIDE AND INJECT
profilUpdateEmit: function (event) {
//? passes the updated profil information to the parent component
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 147553152..214d30113 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,6 +26,7 @@ export default {
RoleInformation,
ProfilInformation,
},
+ inject: ['sortProfilUpdates'],
data() {
return {
@@ -163,6 +164,7 @@ export default {
.then((res) =>{
if(!res.error){
this.data.profilUpdates = res.data.retval;
+ this.data.profilUpdates.sort(this.sortProfilUpdates);
}else{
alert("Error when fetching profile updates: " +res.data.retval);
}
@@ -242,6 +244,9 @@ export default {
created() {
+ //? sorts the profil Updates: pending -> accepted -> rejected
+ this.data.profilUpdates.sort(this.sortProfilUpdates);
+
this.data.editData = {
view:null,
data:{
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 3b79ee2db..22149fb0e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -84,7 +84,7 @@ export default {
}
},
template: `
- Please update your {{data.titel}} and upload the corresponding Document for proof
+ Please update your {{data.titel}} and upload the corresponding Document of proof