Lists can be sorted by title and date now

Resolves: https://github.com/cweiske/grauphel/issues/59

diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index ef109a7fb787b9faeba03e3553ff079264966608..cac2f290c88aea7171bab2c9bc0f0c58ac957fe6 100644 (file)
--- a/controller/guicontroller.php
+++ b/controller/guicontroller.php
@@ -171,12 +171,29 @@ class GuiController extends Controller
     {
         $rawtag = $this->unescapeTagFromUrl($rawtag);
         $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true);
-        usort(
-            $notes,
-            function($noteA, $noteB) {
-                return strcmp($noteA['title'], $noteB['title']);
-            }
-        );
+
+        if (!isset($_GET['sortby'])) {
+            $_GET['sortby'] = 'title';
+        }
+
+        switch ($_GET['sortby']) {
+        case 'title':
+            usort(
+                $notes,
+                function($noteA, $noteB) {
+                    return strcasecmp($noteA['title'], $noteB['title']);
+                }
+            );
+            break;
+        case 'date':
+            usort(
+                $notes,
+                function($noteA, $noteB) {
+                    return strcmp($noteB['last-change-date'], $noteA['last-change-date']);
+                }
+            );
+            break;
+        }
 
         foreach ($notes as &$note) {
             $diffInDays = intval(
@@ -195,6 +212,10 @@ class GuiController extends Controller
                 'tag'    => $this->getPrettyTagName($rawtag),
                 'rawtag' => $rawtag,
                 'notes'  => $notes,
+                'tagUrl' => $this->urlGen->linkToRoute(
+                    'grauphel.gui.tag',
+                    array('rawtag' => $this->escapeTagForUrl($rawtag))
+                ),
             )
         );
         $this->addGlobalVars($res);

diff --git a/templates/tag.php b/templates/tag.php
index e8e092efd058de847a2f6dc8f16e3f4c287d827b..4c20378b8ff7d9bee5333aa52d745ce1c617b066 100644 (file)
--- a/templates/tag.php
+++ b/templates/tag.php
@@ -10,8 +10,12 @@
   <table class="table" id="grauphel-notes">
    <thead>
     <tr>
-     <th id="headerTitle">Title</th>
-     <th>Modified</th>
+     <th id="headerTitle">
+      <a href="<?php p($tagUrl); ?>?sortby=title">Title</a>
+     </th>
+     <th>
+      <a href="<?php p($tagUrl); ?>?sortby=date">Modified</a>
+     </th>
     </tr>
    </thead>
    <tbody>
@@ -21,7 +25,8 @@
       <td>
        <a class="cellclick" href="<?php p($_['urlGen']->linkToRoute('grauphel.gui.note', array('guid' => $note['guid']))); ?>"><?php echo ($note['title']); ?></a>
       </td>
-      <td style="color: <?php echo p($note['dateColor']); ?>">
+      <td style="color: <?php echo p($note['dateColor']); ?>"
+          title="<?php p(date('Y-m-d H:i:s', strtotime($note['last-change-date']))); ?>">
        <?php p($_['date']->formatDate(strtotime($note['last-change-date']))); ?>
       </td>
      </tr>