upd: history also for organisations.

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index eeb79dfdbaa4d3bb03abafe68122c8f44923443c..72c26c237980006d8438382e0a8b5c430f11ba69 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -15,6 +15,7 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.PasswordHash;
 import org.cacert.gigi.util.PasswordStrengthChecker;
@@ -137,7 +138,7 @@ public class User extends CertificateOwner {
     }
 
     public boolean hasPassedCATS() {
-        GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=?");
+        GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=? AND `variant_id`=1");
         query.setInt(1, getId());
         try (GigiResultSet rs = query.executeQuery()) {
             if (rs.next()) {
@@ -461,11 +462,24 @@ public class User extends CertificateOwner {
     public boolean isValidEmail(String email) {
         for (EmailAddress em : getEmails()) {
             if (em.getAddress().equals(email)) {
-                return true;
+                return em.isVerified();
             }
         }
 
         return false;
     }
 
+    public String[] getTrainings() {
+        GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `pass_date`, `type_text` FROM `cats_passed` LEFT JOIN `cats_type` ON `cats_type`.`id`=`cats_passed`.`variant_id`  WHERE `user_id`=? ORDER BY `pass_date` ASC");
+        prep.setInt(1, getId());
+        GigiResultSet res = prep.executeQuery();
+        List<String> entries = new LinkedList<String>();
+
+        while (res.next()) {
+
+            entries.add(DateSelector.getDateFormat().format(res.getTimestamp(1)) + " (" + res.getString(2) + ")");
+        }
+
+        return entries.toArray(new String[0]);
+    }
 }