@@ -51,4 +51,20 @@ public void setPassword(String password)
         this.password = password;
     }
 
+    /**
+     * Returns true if the{@code Admin} object specified as an arguement can
+     * be added to the database <br>
+     * It checks that the {@code Admin } object is not {@code null } and 
+     * the username does not contain a space
+     * @param admin the {@code Admin } object
+     * @return {@code true } when the {@code Admin } is valid
+     */
+    public static boolean isValid ( Admin admin ){
+	if( admin !=  null  && admin.getUsername() != null && 
+		admin.getPassword() != null && !admin.getUsername().contains( " " ) )
+	{
+	    return true;
+	}
+	return false;
+    }
 }
@@ -50,6 +50,22 @@ public void setNumberOfUnits(int numberOfUnits)
         this.numberOfUnits = numberOfUnits;
     }
 
-    
+    /** 
+     * Checks that a {@code Module } object by ensuring that the object is not null,
+     * its name attribute is not {@code null} and its units is greater than 0.
+     * Note that it does not connect to the database but ensures that the {@code Module} 
+     * object can be put perform transactions on the database
+     * 
+     * @param module the {@code Module} object to be validated
+     * @return true when the {@code Module } is valid
+     */
+    public static boolean isValid(Module module)
+    {
+	if( module != null && module.getName() != null  && module.getNumberOfUnits() >0)
+	{
+	    return true;
+	}
+	return false;
+    }
 
 }
@@ -1,6 +1,8 @@
 package database.bean;
 
-import exception.InvalidResultException;
+
+
+import java.sql.Date;
 
 /**
  * Objects of this {@code ModuleStatus} represent a single row of the 
@@ -11,37 +13,59 @@
 
 public class ModuleStatus  implements Bean
 {
+    
+    private int id;
     /**Foreign key from the Module table*/
-    private int moduleId;
+    private String moduleName;
     /**Foreign key from the Student table*/
-    private int studentId;
+    private String studentId;
 
     private boolean paymentStatus;
     private boolean bookingStatus;
     private boolean attended;
     private String result;
 
+    private Date dateRegistered;
+    
+    public ModuleStatus(){}
+    
+    public ModuleStatus(  int id , String moduleId, String studentId){
+	setId( id );
+	setModuleName(moduleId);
+	setStudentId(studentId);
+	
+    }
+    
+    public ModuleStatus( int id , String moduleName , String studentId, boolean paid,
+	    boolean booked, boolean attended, String result )
+    {
+	this( id, moduleName, studentId);
+	setPaymentStatus( paid );
+	setBookingStatus(booked);
+	setAttended(attended);
+	setResult(result);
+    }
     /**
      * Gets the moduleId of this object
      * @return int
      */
-    public int getModuleId()
+    public String getModuleName()
     {
-        return moduleId;
+        return moduleName;
     }
     /**
      * Sets this object's moduleId
-     * @param moduleId
+     * @param moduleName
      */
-    public void setModuleId(int moduleId)
+    public void setModuleName(String moduleName)
     {
-        this.moduleId = moduleId;
+        this.moduleName = moduleName;
     }
 
     /**
      *Gets this object's studentId
      */
-    public int getStudentId()
+    public String getStudentId()
     {
         return studentId;
     }
@@ -50,7 +74,7 @@ public int getStudentId()
      * Sets this object's studentId
      * @param moduleId
      */
-    public void setStudentId(int studentId)
+    public void setStudentId(String studentId)
     {
         this.studentId = studentId;
     }
@@ -70,6 +94,7 @@ public boolean hasPaid()
      */
     public void setPaymentStatus(boolean paymentStatus)
     {
+	
         this.paymentStatus = paymentStatus;
     }
 
@@ -83,10 +108,15 @@ public boolean hasBooked()
         return bookingStatus;
     }
 
-    /** Sets the booking status of this object*/
+    /** Sets the booking status of this object. Note that
+     * the payment statsu must be {@code true }  before bookingStatus can
+     * be true.<br>This method sets the bookingStatus to {@code false} if the
+     * paymentStatus is {@code false }
+     * 
+     */
     public void setBookingStatus(boolean bookingStatus)
     {
-        this.bookingStatus = bookingStatus;
+	this.bookingStatus = hasPaid() ? bookingStatus : false;
     }
 
     /**Returns true when the student( with this object's studentId )
@@ -98,14 +128,21 @@ public boolean hasAttended()
     {
         return attended;
     }
+    
+    /** Sets the attended attribute of this object. Note that
+     * this object's booking status must be {@code true }  before this {@code ModuleStatus}
+     * attended attribute  can be {@code true}
+     * be true.<br>
+     * The attended would be set to {@code false } if the attended bookingStatus is {@code false}
+     * 
+     */
     public void setAttended(boolean attended)
     {
-	
-        this.attended = attended;
+        this.attended = hasBooked() ? attended : false;
     }
 
     /**
-     * Returns eitther PASS or FAIL indicatig that the course was passed or failed
+     * Returns either PASS or FAIL indicates that the course was passed or failed
      * 
      * @return String
      */
@@ -117,20 +154,43 @@ public String getResult()
 
     /**
      * Sets the result of this ModuleStatus 
-     * the result must be either "PASS" or "FAIL"
+     * the result must be either "PASS" or "FAIL". <br>
+     *  Sets the result to null if the argument is invalid
      * @param result
-     * @throws InvalidResultException  when the result is neither "pass" nor "fail"
-     */
-    public void setResult(String result) throws InvalidResultException
+    */
+    public void setResult(String result) 
     {
 	if( result.toLowerCase().equals("pass" ) || 
 	    result.toLowerCase().equals("fail") )
 	{
 	    this.result = result;
 	}
 	else
-	    throw new InvalidResultException("The result must be either pass or fail");
+	   this.result = null;
     }
-    
-    
+    public int getId()
+    {
+	return id;
+    }
+    public void setId(int id)
+    {
+	this.id = id;
+    }
+
+    public static boolean isValid(ModuleStatus newModuleStatus)
+    {
+	// TODO Auto-generated method stub
+	return false;
+    }
+
+    public Date getDateRegistered()
+    {
+	return dateRegistered;
+    }
+
+    public void setDateRegistered(Date dateRegistered)
+    {
+	this.dateRegistered = dateRegistered;
+    }
+ 
 }
@@ -1,13 +1,18 @@
 package database.bean;
 
+import java.io.File;
+
+import exception.InvalidImageFormatException;
+
 public class Student  implements Bean 
 {
     private String idCardNumber;
     private String firstName;
     private String lastName;
     private boolean active;
     private String emailAddress;
-
+    private File image;
+    
     public Student(String id, String fName, String lName, String mail, boolean active)
     {
 	setIdCardNumber(id);
@@ -75,10 +80,30 @@ public static boolean isValid( Student student ){
     private static boolean validateName(Student student)
     {
 	if( student.getFirstName().matches( "[A-Za-z]*") && 
-		student.getLastName().matches( "[A-Za-z]* " )){
+		student.getLastName().matches( "[A-Za-z]*" )){
 	    return true;
 	}
 	return false;
     }
 
+    public File getImage()
+    {
+	return image;
+    }
+
+    public void setImage(File image) throws InvalidImageFormatException
+    {
+	
+	String name = image.getName();
+	name = name.substring(name.lastIndexOf( "."), name.length() );
+	
+	boolean isValid = name.toLowerCase().matches( ".jpg|.png|.jpeg|.bmp");
+	
+	if( isValid)
+	    this.image = image;
+	else
+	    throw new InvalidImageFormatException("The student image is inalid and thus cannot be set");
+	
+    }
+
 }