From 33c73e7c3ca2e67017b43961f5680ea3c43f4093 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 30 Mar 2017 18:11:13 +0200
Subject: [PATCH] FAS -> Messages tab -> Added column status to check the
 status of the message (unread, read, ...)

---
 content/messages.xul.php |  5 ++++
 rdf/messages.rdf.php     | 53 ++++++++++++++++++++++++++++------------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/content/messages.xul.php b/content/messages.xul.php
index 1450ee52f..1ba680af0 100644
--- a/content/messages.xul.php
+++ b/content/messages.xul.php
@@ -118,6 +118,10 @@ echo ']>
 			class="sortDirectionIndicator"
 			sort="rdf:http://www.technikum-wien.at/messages/rdf#recipient_id"/>
 		<splitter class="tree-splitter"/>
+		<treecol id="messages-tree-status" label="Status" flex="2" hidden="true"
+			class="sortDirectionIndicator"
+			sort="rdf:http://www.technikum-wien.at/messages/rdf#status"/>
+		<splitter class="tree-splitter"/>
 	</treecols>
 
 	<template>
@@ -132,6 +136,7 @@ echo ']>
 					<treecell label="rdf:http://www.technikum-wien.at/messages/rdf#recipient"/>
 					<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"/>
 				</treerow>
 			</treeitem>
 		</treechildren>
diff --git a/rdf/messages.rdf.php b/rdf/messages.rdf.php
index 951cd7cc8..ac05f0268 100644
--- a/rdf/messages.rdf.php
+++ b/rdf/messages.rdf.php
@@ -45,36 +45,57 @@ SELECT
 	(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id=m.person_id) as sender,
 	(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
+	r.person_id as recipient_id,
+	s.status as status
 FROM
 	public.tbl_msg_message m
 	JOIN public.tbl_msg_recipient r USING(message_id)
+	JOIN public.tbl_msg_status s USING(message_id)
 WHERE
  	r.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
 	OR m.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
+	AND s.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
 ORDER BY
-	message_id";
+	message_id, status";
 
 if($db->db_query($qry))
 {
 	$oRdf->sendHeader();
 	while($row = $db->db_fetch_object())
 	{
-			$i=$oRdf->newObjekt($row->message_id);
-			$oRdf->obj[$i]->setAttribut('subject',$row->subject,true);
-			$oRdf->obj[$i]->setAttribut('body',$row->body,true);
-			$oRdf->obj[$i]->setAttribut('message_id',$row->message_id,true);
-			$oRdf->obj[$i]->setAttribut('insertamum',$row->insertamum,true);
-			$oRdf->obj[$i]->setAttribut('status',$row->insertamum,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);
-			$oRdf->obj[$i]->setAttribut('recipient_id',$row->recipient_id,true);
+		$status = '';
+		if ($row->status == 0)
+		{
+			$status = 'Unread';
+		}
+		else if ($row->status == 1)
+		{
+			$status = 'Read';
+		}
+		else if ($row->status == 2)
+		{
+			$status = 'Archived';
+		}
+		else if ($row->status == 2)
+		{
+			$status = 'Deleted';
+		}
+		
+		$i=$oRdf->newObjekt($row->message_id);
+		$oRdf->obj[$i]->setAttribut('subject',$row->subject,true);
+		$oRdf->obj[$i]->setAttribut('body',$row->body,true);
+		$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('sender',$row->sender,true);
+		$oRdf->obj[$i]->setAttribut('recipient',$row->recipient,true);
+		$oRdf->obj[$i]->setAttribut('sender_id',$row->sender_id,true);
+		$oRdf->obj[$i]->setAttribut('recipient_id',$row->recipient_id,true);
 
-			if($row->relationmessage_id!='')
-				$oRdf->addSequence($row->message_id, $row->relationmessage_id);
-			else
-				$oRdf->addSequence($row->message_id);
+		if($row->relationmessage_id!='')
+			$oRdf->addSequence($row->message_id, $row->relationmessage_id);
+		else
+			$oRdf->addSequence($row->message_id);
 	}
 }
 $oRdf->sendRdfText();