From 7de5410d0e0be801f19a8843bed22f6d49a4a7a3 Mon Sep 17 00:00:00 2001
From: osaajani <pierre.lin@free.fr>
Date: Sun, 10 Nov 2019 02:04:13 +0100
Subject: [PATCH] use status for delivered

---
 controllers/internals/Sended.php | 14 +++++++++++++-
 createDatabase.sql               |  1 +
 templates/sended/list.php        | 14 +++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/controllers/internals/Sended.php b/controllers/internals/Sended.php
index ca6fbf5..4262865 100755
--- a/controllers/internals/Sended.php
+++ b/controllers/internals/Sended.php
@@ -143,6 +143,18 @@ namespace controllers\internals;
             return $this->model_sended->decrement_before_delivered($id_sended);
         }
 
+        /**
+         * Update status
+         *
+         * @param int $id_sended : id of the sended to mark as delivered
+         * @param string $status : new status
+         * @return int
+         */
+        public function update_status($id_sended, $status)
+        {
+            return $this->model_sended->update($id_sended, ['status' => $status]);
+        }
+        
         /**
          * Update sended to delivered.
          *
@@ -152,6 +164,6 @@ namespace controllers\internals;
          */
         public function set_delivered($id_sended)
         {
-            return $this->model_sended->update($id_sended, ['before_delivered' => 0, 'delivered' => true]);
+            return $this->model_sended->update($id_sended, ['status' => 'delivered']);
         }
     }
diff --git a/createDatabase.sql b/createDatabase.sql
index fdd13ee..e596906 100755
--- a/createDatabase.sql
+++ b/createDatabase.sql
@@ -45,6 +45,7 @@ CREATE TABLE IF NOT EXISTS sended
     origin VARCHAR(20) NOT NULL,
     destination VARCHAR(20),
     flash BOOLEAN NOT NULL DEFAULT 0,
+    status ENUM('unknown', 'delivered', 'failed') NOT NULL DEFAULT 'unknown',
 	PRIMARY KEY (id)
 );
 
diff --git a/templates/sended/list.php b/templates/sended/list.php
index 41eaa56..3c3a4ee 100755
--- a/templates/sended/list.php
+++ b/templates/sended/list.php
@@ -56,10 +56,18 @@
                                             <?php foreach ($sendeds as $sended) { ?>
                                                     <tr>
                                                         <td><?php $this->s($sended['id']); ?></td>
-                                                        <td><?php $this->s($sended['target']); ?></td>
-                                                        <td><?php $this->s($sended['content']); ?></td>
+                                                        <td><?php $this->s($sended['destination']); ?></td>
+                                                        <td><?php $this->s($sended['text']); ?></td>
                                                         <td><?php $this->s($sended['at']); ?></td>
-                                                        <td><?php $this->s($sended['delivered'] ? 'Délivré' : ($sended['failed'] ? 'Échoué' : 'Inconnu')); ?></td>
+
+                                                        <?php if ($sended['status'] == 'unknown') { ?>
+                                                            <td>Inconnu</td>
+                                                        <?php } elseif ($sended['status'] == 'delivered') { ?>
+                                                            <td>Délivré</td>
+                                                        <?php } elseif ($sended['status'] == 'failed') { ?>
+                                                            <td>Échoué</td>
+                                                        <?php } ?>
+
                                                         <?php if ($_SESSION['user']['admin']) { ?>
                                                             <td><input name="ids[]" type="checkbox" value="<?php $this->s($sended['id']); ?>"></td>
                                                         <?php } ?>