From 9b6cb231c0b68acb52dbff2ea2901e51d94230bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 25 Nov 2020 16:54:44 +0100
Subject: [PATCH] Messages in FAS show the Date of the last Status change
 (read/unread-status)

---
 content/messages.xul.php | 5 +++++
 rdf/messages.rdf.php     | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/content/messages.xul.php b/content/messages.xul.php
index eb3ace222..2ee733c82 100644
--- a/content/messages.xul.php
+++ b/content/messages.xul.php
@@ -122,6 +122,10 @@ echo ']>
 			class="sortDirectionIndicator"
 			sort="rdf:http://www.technikum-wien.at/messages/rdf#status"/>
 		<splitter class="tree-splitter"/>
+		<treecol id="messages-tree-status" label="Letzte Statusänderung" flex="2" hidden="false"
+			class="sortDirectionIndicator"
+			sort="rdf:http://www.technikum-wien.at/messages/rdf#statusdatum"/>
+		<splitter class="tree-splitter"/>
 	</treecols>
 
 	<template>
@@ -137,6 +141,7 @@ echo ']>
 					<treecell label="rdf:http://www.technikum-wien.at/messages/rdf#sender_id"/>
 					<treecell label="rdf:http://www.technikum-wien.at/messages/rdf#recipient_id"/>
 					<treecell label="rdf:http://www.technikum-wien.at/messages/rdf#status"/>
+					<treecell label="rdf:http://www.technikum-wien.at/messages/rdf#statusdatum"/>
 				</treerow>
 			</treeitem>
 		</treechildren>
diff --git a/rdf/messages.rdf.php b/rdf/messages.rdf.php
index 552c50860..7502b6380 100644
--- a/rdf/messages.rdf.php
+++ b/rdf/messages.rdf.php
@@ -22,10 +22,12 @@
 require_once('../config/vilesci.config.inc.php');
 require_once('../include/basis_db.class.php');
 require_once('../include/rdf.class.php');
+require_once('../include/datum.class.php');
 require_once('../include/functions.inc.php');
 require_once('../include/benutzerberechtigung.class.php');
 
 $uid = get_uid();
+$datum_obj = new datum();
 $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($uid);
 if(!$rechte->isBerechtigt('basis/message', null, 's'))
@@ -50,7 +52,8 @@ SELECT
 	(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
 	m.person_id as sender_id,
 	r.person_id as recipient_id,
-	MAX(ss.status) as status
+	MAX(ss.status) as status,
+	MAX(ss.insertamum) as statusdatum
 FROM public.tbl_msg_message m
      JOIN public.tbl_msg_recipient r USING(message_id)
      JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
@@ -67,7 +70,8 @@ SELECT
 	(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
 	m.person_id as sender_id,
 	r.person_id as recipient_id,
-	MAX(ss.status) as status
+	MAX(ss.status) as status,
+	MAX(ss.insertamum) as statusdatum
 FROM public.tbl_msg_recipient r
      JOIN public.tbl_msg_status ss USING(message_id, person_id)
      JOIN public.tbl_msg_message m USING(message_id)
@@ -104,6 +108,7 @@ if($db->db_query($qry))
 		$oRdf->obj[$i]->setAttribut('message_id',$row->message_id,true);
 		$oRdf->obj[$i]->setAttribut('insertamum',$row->insertamum,true);
 		$oRdf->obj[$i]->setAttribut('status',$status,true);
+		$oRdf->obj[$i]->setAttribut('statusdatum',$datum_obj->formatDatum($row->statusdatum,'d.m.Y H:i'),true);
 		$oRdf->obj[$i]->setAttribut('sender',$row->sender,true);
 		$oRdf->obj[$i]->setAttribut('recipient',$row->recipient,true);
 		$oRdf->obj[$i]->setAttribut('sender_id',$row->sender_id,true);