Highlight expired nucleus bonus verifications in points overview

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

diff --git a/src/org/cacert/gigi/dbObjects/Assurance.java b/src/org/cacert/gigi/dbObjects/Assurance.java
index 486b5a340d2b468010a9d16d9564c3da422d7ac4..07c3a39be3b721fc10287181aa591087e408a86b 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Assurance.java
+++ b/src/org/cacert/gigi/dbObjects/Assurance.java
@@ -1,11 +1,14 @@
 package org.cacert.gigi.dbObjects;
 
+import java.util.Date;
+
+import org.cacert.gigi.database.DBEnum;
 import org.cacert.gigi.dbObjects.wrappers.DataContainer;
 
 @DataContainer
 public class Assurance {
 
-    public enum AssuranceType {
+    public enum AssuranceType implements DBEnum {
         FACE_TO_FACE("Face to Face Meeting"), TOPUP("TOPUP"), TTP_ASSISTED("TTP-Assisted"), NUCLEUS("Nucleus Bonus");
 
         private final String description;
@@ -17,6 +20,11 @@ public class Assurance {
         public String getDescription() {
             return description;
         }
+
+        @Override
+        public String getDBName() {
+            return description;
+        }
     }
 
     private int id;
@@ -33,9 +41,11 @@ public class Assurance {
 
     private String date;
 
-    private CountryCode country;
+    private Country country;
+
+    private Date expireDate;
 
-    public Assurance(int id, User from, Name to, String location, String method, int points, String date, CountryCode country) {
+    public Assurance(int id, User from, Name to, String location, String method, int points, String date, Country country, Date expireDate) {
         this.id = id;
         this.from = from;
         this.to = to;
@@ -44,7 +54,7 @@ public class Assurance {
         this.points = points;
         this.date = date;
         this.country = country;
-
+        this.expireDate = expireDate;
     }
 
     public User getFrom() {
@@ -75,7 +85,22 @@ public class Assurance {
         return date;
     }
 
-    public CountryCode getCountry() {
+    public Country getCountry() {
         return country;
     }
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public boolean isExpired() {
+        boolean expired = false;
+        if (expireDate == null) {
+            expired = false;
+        } else {
+            Date now = new Date();
+            expired = expireDate.before(now);
+        }
+        return expired;
+    }
 }