Merge "upd: replace preferred name by user id in points issued table"

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 18b50f5df5245bc4ec142d8cd16e0f0bfef328fe..e5175694ed1b8ac1083ad728de76740a283d4cc9 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -323,7 +323,7 @@ public class User extends CertificateOwner {
 
     public synchronized Assurance[] getReceivedAssurances() {
         if (receivedAssurances == null) {
-            try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM `notary` INNER JOIN `names` ON `names`.`id` = `notary`.`to` WHERE `names`.`uid`=? AND `notary`.`deleted` IS NULL")) {
+            try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM `notary` INNER JOIN `names` ON `names`.`id` = `notary`.`to` WHERE `names`.`uid`=? AND `notary`.`deleted` IS NULL ORDER BY `when` DESC")) {
                 query.setInt(1, getId());
 
                 GigiResultSet res = query.executeQuery();
@@ -342,7 +342,7 @@ public class User extends CertificateOwner {
 
     public synchronized Assurance[] getMadeAssurances() {
         if (madeAssurances == null) {
-            try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM notary WHERE `from`=? AND deleted is NULL")) {
+            try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM notary WHERE `from`=? AND deleted is NULL ORDER BY `when` DESC")) {
                 query.setInt(1, getId());
 
                 try (GigiResultSet res = query.executeQuery()) {

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.templ b/src/org/cacert/gigi/pages/wot/MyPoints.templ
index 7fdd5c8fd5adb95b9a64c2bb763921593ceb5dfb..1671f1ad111bcdce1dd00ab8c023c34e4008cd2f 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/MyPoints.templ
+++ b/src/org/cacert/gigi/pages/wot/MyPoints.templ
@@ -1,10 +1,23 @@
+<table>
+    <tr>
+        <td><?=_Verification points?>:</td>
+        <td><?=$assP?></td>
+        <td>(<?=_Sum of most recently issued points per RA-Agent?>)</td>
+    </tr>
+<? if($expP) { ?>
+    <tr>
+        <td><?=_Experience points?>:</td>
+        <td><?=$expP?></td>
+        <td>(<?=_Based on number of applicants verified?>)</td>
+    </tr>
+    <tr>
+        <td><?=_Max points to issue?>:
+        <td><?=$maxP?></td>
+        <td></td>
+    </tr>
+<? } ?>
+<table>
 <h2><?=_Verification Points You Received?></h2>
 <?=$pointlist?>
 <h2><?=_Verification Points You Issued?></h2>
 <?=$madelist?>
-
-<?=_Verification points?>: <?=$assP?><br/>
-<? if($expP) { ?>
-<?=_Experience points?>: <?=$expP?><br/>
-<?=_Max points to issue?>: <?=$maxP?><br/>
-<? } ?>