upd: mark unverified names of agents in points overview

Change-Id: I72d4e357775c72215995b0974c768edac43b5cb9

diff --git a/src/club/wpia/gigi/output/VerificationsDisplay.java b/src/club/wpia/gigi/output/VerificationsDisplay.java
index f3b804489790f3ab666eb301c35b6bca81594671..6e86531c29dd4b123a0058c4dd746da796e0d1c3 100644 (file)
--- a/src/club/wpia/gigi/output/VerificationsDisplay.java
+++ b/src/club/wpia/gigi/output/VerificationsDisplay.java
@@ -56,10 +56,13 @@ public class VerificationsDisplay implements Outputable {
                         vars.put("linkId", to == null ? "" : to.getOwner().getId());
                         vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
                         vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
                         vars.put("linkId", to == null ? "" : to.getOwner().getId());
                         vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
                         vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);

+                        vars.put("agentUnverified", false);

                     } else {
                         vars.put("linkId", verification.getFrom().getId());
                     } else {
                         vars.put("linkId", verification.getFrom().getId());

-                        vars.put("verbVal", verification.getFrom().getPreferredName());
+                        Name name = verification.getFrom().getPreferredName();
+                        vars.put("verbVal", name);

                         vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                         vars.put("myName", to == null ? l.getTranslation("own name removed") : to);

+                        vars.put("agentUnverified", name.getVerificationPoints() <= 0);

                     }
                     vars.put("date", verification.getDate());
                     vars.put("location", verification.getLocation() + " (" + (verification.getCountry() == null ? l.getTranslation("not given") : verification.getCountry().getName()) + ")");
                     }
                     vars.put("date", verification.getDate());
                     vars.put("location", verification.getLocation() + " (" + (verification.getCountry() == null ? l.getTranslation("not given") : verification.getCountry().getName()) + ")");

diff --git a/src/club/wpia/gigi/output/VerificationsDisplay.templ b/src/club/wpia/gigi/output/VerificationsDisplay.templ
index 5ab4453264f5bc91e2552a5b1a267bdae5cfa721..0d45b1cf8c939507f951c0a814c543aca1a20e4a 100644 (file)
--- a/src/club/wpia/gigi/output/VerificationsDisplay.templ
+++ b/src/club/wpia/gigi/output/VerificationsDisplay.templ
@@ -19,7 +19,7 @@
 <td><?=$id?></td>
 <? } ?>
 <td><?=$date?></td>
 <td><?=$id?></td>
 <? } ?>
 <td><?=$date?></td>

-<td><?=$verbVal?></td>
+<td><?=$verbVal?><? if($agentUnverified) { ?> <span class="label label-warning"><?=_name currently not verified?></span><? } ?></td>

 <? if($myName) { ?>
 <td><?=$myName?></td>
 <? } ?>
 <? if($myName) { ?>
 <td><?=$myName?></td>
 <? } ?>