From: x2000habouzit <x2000habouzit>
Date: Mon, 26 Apr 2004 14:45:53 +0000 (+0000)
Subject: les trackers sont presque finis, reste à gérer les mails, mais ca ca va aller vite... 
X-Git-Tag: xorg/old~1822
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=045cc0497e2299f10b85784783280689a0b3de45;p=platal.git

les trackers sont presque finis, reste à gérer les mails, mais ca ca va aller vite maintenant
---

diff --git a/htdocs/trackers/answer.php b/htdocs/trackers/answer.php
new file mode 100644
index 0000000..ad7428b
--- /dev/null
+++ b/htdocs/trackers/answer.php
@@ -0,0 +1,38 @@
+<?php
+require('auto.prepend.inc.php');
+new_skinned_page('trackers/answer.tpl', AUTH_COOKIE);
+require('tracker.inc.php');
+
+$tracker = new Tracker($_GET['tr_id']);
+
+if(isset($_POST['a_sub']) && $tracker->post_perms_ok()) {
+    $sql = "INSERT INTO trackers.followups
+            SET         user_id='{$_SESSION['uid']}',
+                        texte='{$_POST['a_text']}',
+                        rq_id='{$_GET['rq_id']}'";
+    $globals->db->query($sql);
+    header("Location: show_rq.php?tr_id={$_GET['tr_id']}&rq_id={$_GET['rq_id']}");
+    
+}
+
+$res = $globals->db->query("SELECT date,summary,texte
+                            FROM   trackers.requests
+                            WHERE  tr_id='{$_GET['tr_id']}' AND rq_id='{$_GET['rq_id']}'");
+
+if(empty($tracker->id) || !$tracker->post_perms_ok() || !mysql_num_rows($res))
+    $page->failure();
+
+$request = mysql_fetch_assoc($res);
+mysql_free_result($res);
+
+$page->assign('request', $request);
+$page->assign('tracker', $tracker);
+
+$sql = "SELECT *, username
+        FROM      trackers.followups 
+        LEFT JOIN auth_user_md5 USING(user_id)
+        WHERE rq_id='{$_GET['rq_id']}'";
+$page->mysql_assign($sql, 'fups');
+
+$page->run();   
+?>
diff --git a/include/tracker.inc.php b/include/tracker.inc.php
index bf67b9e..c919548 100644
--- a/include/tracker.inc.php
+++ b/include/tracker.inc.php
@@ -69,7 +69,7 @@ class Tracker {
         mysql_query("INSERT INTO trackers.requests
                      SET    tr_id='{$this->id}',user_id='{$_SESSION['uid']}',
                             admin_id='-1',st_id='$status',pri='$prio',
-                            summary='$sujet',texte='$text'");
+                            summary='$sujet',texte='$text',date=NOW()");
         $id = mysql_insert_id();
         # TODO : mail
         return $id;
diff --git a/templates/trackers/answer.tpl b/templates/trackers/answer.tpl
new file mode 100644
index 0000000..c9e6b89
--- /dev/null
+++ b/templates/trackers/answer.tpl
@@ -0,0 +1,46 @@
+{* $Id: answer.tpl,v 1.1 2004-04-26 14:45:53 x2000habouzit Exp $ *}
+
+{dynamic}
+
+<p class="normal">
+  [<a href="index.php">Liste des trackers</a>]
+  [<a href="show.php?tr_id={$smarty.get.tr_id}">Revenir au tracker</a>]
+[<a href="show_rq.php?tr_id={$smarty.get.tr_id}&amp;rq_id={$smarty.get.rq_id}">Revenir à la requete</a>]
+</p>
+
+<div class="rubrique">
+  {$request.summary} (posté le {$request.date|date_format:"%d %b %Y"})
+</div>
+
+<table class="bicol">
+  <tr><th>Texte posté</th></tr>
+  <tr><td><tt>{$request.texte|escape|nl2br}</tt></td></tr>
+</table>
+
+<br />
+
+<div class="rubrique">
+  Répondre
+</div>
+
+<form action="{$smarty.server.REQUEST_URI}" method="post">
+  <table class="bicol">
+    <tr>
+      <th>texte de la réponse</th>
+    </tr>
+    <tr>
+      <td class="center">
+        <textarea name="a_text" cols="74" rows="20"></textarea>
+      </td>
+    </tr>
+    <tr>
+      <td class="center">
+        <input type="submit" name="a_sub" />
+      </td>
+    </tr>
+  </table>
+</form>
+
+{/dynamic}
+
+{* vim:set et sw=2 sts=2 sws=2: *}
diff --git a/templates/trackers/show.tpl b/templates/trackers/show.tpl
index 46931ed..9c3876f 100644
--- a/templates/trackers/show.tpl
+++ b/templates/trackers/show.tpl
@@ -1,4 +1,4 @@
-{* $Id: show.tpl,v 1.6 2004-04-26 14:17:19 x2000habouzit Exp $ *}
+{* $Id: show.tpl,v 1.7 2004-04-26 14:45:53 x2000habouzit Exp $ *}
 
 {literal}
 <script type="text/javascript">
@@ -37,7 +37,7 @@
   </tr>
 {foreach item=rq from=$requests}
   <tr class="pri{$rq.pri}">
-    <td>{$rq.date|date_format:"%d %b&nbsp;%Y"}</td>
+    <td>{$rq.date|date_format:"%d&nbsp;%b&nbsp;%Y"}</td>
     <td><a href="show_rq.php?tr_id={$smarty.get.tr_id}&amp;rq_id={$rq.rq_id}">{$rq.summary}</a></td>
     <td class="right">{if $rq.username}<a href="mailto:{$rq.username}@polytechnique.org">{$rq.username}</a>{else}-{/if}</td>
   </tr>
@@ -45,7 +45,7 @@
 <tr><th colspan="3"></th></tr>
 {foreach item=rq from=$close}
   <tr>
-    <td>{$rq.date|date_format:"%d %b&nbsp;%Y"}</td>
+    <td>{$rq.date|date_format:"%d&nbsp;%b&nbsp;%Y"}</td>
     <td><a href="show_rq.php?tr_id={$smarty.get.tr_id}&amp;rq_id={$rq.rq_id}">{$rq.summary}</a></td>
     <td class="action"><a href="javascript:del({$rq.rq_id})">delete</a></td>
   </tr>