Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -596,12 +596,11 @@
 label.policy.status =Policy status
 label.version =Version
 label.last.modified =Last modified
-label.agreements =Agreements
+label.consents =Consents
 label.add.new.policy  =Add a new policy
 label.policy.status.hint  =An active policy will require consent from new users. Existing users will need to consent to this policy on their next log in.
 label.policy.status.active  =Active
 label.policy.status.inactive  =Inactive
-label.policy.status.draft  =Draft
 label.policy.type.site  =Site policy
 label.policy.type.privacy  =Privacy policy
 label.policy.type.third.party  =Third party policy
@@ -611,14 +610,14 @@
 label.view.previous.versions =View previous versions
 label.set.status.to =Set status to "{0}"
 label.minor.change =Minor change
+label.create.new.draft =Create a new draft
+label.policy.consents =Policy consents
+label.consented =Consented?
+label.consented.on =Consented on
+label.user.consents =User consents
 label. =
 label. =
 label. =
 label. =
-label. =
-label. =
-label. =
-label. =
-label. =
 
 #======= End labels: Exported 582 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java	(.../PolicyManagementAction.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java	(.../PolicyManagementAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
@@ -21,7 +22,9 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.web.dto.UserPolicyConsentDTO;
 import org.lamsfoundation.lams.policies.Policy;
+import org.lamsfoundation.lams.policies.PolicyConsent;
 import org.lamsfoundation.lams.policies.service.IPolicyService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -66,8 +69,8 @@
 	    return edit(mapping, form, request, response);
 	} else if (StringUtils.equals(method, "save")) {
 	    return save(mapping, form, request, response);
-	} else if (StringUtils.equals(method, "delete")) {
-	    return delete(mapping, form, request, response);
+	} else if (StringUtils.equals(method, "displayUserConsents")) {
+	    return displayUserConsents(mapping, form, request, response);
 	} else if (StringUtils.equals(method, "viewPreviousVersions")) {
 	    return viewPreviousVersions(mapping, form, request, response);
 	} else if (StringUtils.equals(method, "changeStatus")) {
@@ -80,18 +83,18 @@
     private ActionForward list(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	List<Policy> policies = policyService.getPolicies();
+	List<Policy> policies = policyService.getAllPoliciesWithUserConsentsCount();
 	
-	//calculate which policies have previous version instanses
-	HashMap<Long, Integer> policyCount = new HashMap<Long, Integer>();
+	//calculate which policies have previous version instances
+	HashMap<Long, Integer> policyCount = new LinkedHashMap<Long, Integer>();
 	for (Policy policy : policies) {
 	    Long policyId = policy.getPolicyId();
 	    int previousVersionsCount = policyCount.get(policyId) == null ? 0 : policyCount.get(policyId);
 	    policyCount.put(policy.getPolicyId(), previousVersionsCount + 1);
 	}
 	
 	//filter out older versioned policies
-	HashMap<Long, Policy> filteredPolicies = new HashMap<Long, Policy>();
+	HashMap<Long, Policy> filteredPolicies = new LinkedHashMap<Long, Policy>();
 	for (Policy policy : policies) {
 	    Long policyId = policy.getPolicyId();
 	    boolean hasPreviousVersions = policyCount.get(policyId) != null && policyCount.get(policyId) > 1; 
@@ -105,9 +108,8 @@
 		if (Policy.STATUS_ACTIVE.equals(policyStateId)) {
 		    filteredPolicies.put(policyId, policy);
 
-		    //if both are inactive - newer has priority
-		} else if (Policy.STATUS_INACTIVE.equals(policyStateId)
-			&& Policy.STATUS_INACTIVE.equals(alreadyAddedPolicy.getPolicyStateId())
+		    //if neither are active - newer has priority
+		} else if (!Policy.STATUS_ACTIVE.equals(alreadyAddedPolicy.getPolicyStateId())
 			&& policy.getLastModified().after(alreadyAddedPolicy.getLastModified())) {
 		    filteredPolicies.put(policyId, policy);
 		}
@@ -128,6 +130,7 @@
 	    HttpServletResponse response) {
 
 	Long policyUid = WebUtil.readLongParam(request, "policyUid", true);
+	boolean isEditingPreviousVersion = WebUtil.readBooleanParam(request, "isEditingPreviousVersion", false);
 	if (policyUid != null && policyUid > 0) {
 	    Policy policy = policyService.getPolicyByUid(policyUid);
 	    if (policy != null) {
@@ -140,6 +143,7 @@
 		policyForm.set("policyTypeId", policy.getPolicyTypeId());
 		policyForm.set("version", policy.getVersion());
 		policyForm.set("policyStateId", policy.getPolicyStateId());
+		policyForm.set("editingPreviousVersion", isEditingPreviousVersion);
 		request.setAttribute("policyForm", policyForm);
 	    }
 	}
@@ -152,61 +156,69 @@
 	DynaActionForm policyForm = (DynaActionForm) form;
 	String currentDate = ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE);
 
-//	    ActionMessages errors = new ActionMessages();
-//
-//	    // validate
-//	    if (!StringUtils.equals(policyForm.getString("courseKey"), policyForm.getString("confirmCourseKey"))) {
-//		errors.add("courseKey", new ActionMessage("error.course.keys.unequal"));
-//	    }
-//	    if (policyService.contextExists((Integer) policyForm.get("signupOrganisationId"),
-//		    policyForm.getString("context"))) {
-//		errors.add("context", new ActionMessage("error.context.exists"));
-//	    }
-//
-//	    if (!errors.isEmpty()) {
-//		saveErrors(request, errors);
-//	    } else {
 	Object policyUid = policyForm.get("policyUid");
 	String version = policyForm.getString("version");
 	Integer policyStateId = (Integer) policyForm.get("policyStateId");
 	Boolean isMinorChange = (Boolean) policyForm.get("minorChange");
-	
+	Boolean isEditingPreviousVersion = (Boolean) policyForm.get("editingPreviousVersion");
 
-
 	Policy policy;
-	// edit existing policy
-	if (policyUid != null && (Long) policyUid > 0) {
-	    policy = policyService.getPolicyByUid((Long) policyUid);
-	    
-	   //if it's not a minor change - then instantiate a new child policy
-	    if (!isMinorChange) {
-		Policy oldPolicy = policy;
+	// edit existing policy only in case of minor change
+	if (isMinorChange) {
+	    Policy oldPolicy = policyService.getPolicyByUid((Long) policyUid);
+	    policy = oldPolicy;
 
-		//if the new policy has Active status then set the old one to Inactive
-		if (policyStateId.equals(Policy.STATUS_ACTIVE)) {
-		    oldPolicy.setPolicyStateId(Policy.STATUS_INACTIVE);
-		    oldPolicy.setLastModified(new Date());
-		    userManagementService.save(oldPolicy);
-		}
+	} else {
+	    //if it's not a minor change - then instantiate a new child policy
+	    policy = new Policy();
 
+	    //set policy's policyId
+	    Long policyId;
+	    if (policyUid != null && (Long) policyUid > 0) {
+		Policy oldPolicy = policyService.getPolicyByUid((Long) policyUid);
+		policyId = oldPolicy.getPolicyId();
+	    } else {
+		// generate Unique long ID
+		policyId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE;
+	    }
+	    policy.setPolicyId(policyId);
+	    
+	    //set policy's version
+	    if (policyUid != null && (Long) policyUid > 0) {
+		Policy oldPolicy = policyService.getPolicyByUid((Long) policyUid);
 		//if version was not changed by the user - append current date
 		if (oldPolicy.getVersion().equals(version)) {
 		    version += " " + currentDate;
 		}
+	    }
 
-		policy = new Policy();
-		policy.setPolicyId(oldPolicy.getPolicyId());
+	    //take care about old policy/policies: if the new policy has Active status then set the old one(s) to Inactive
+	    if (policyUid != null && (Long) policyUid > 0 && policyStateId.equals(Policy.STATUS_ACTIVE)) {
+
+		if (isEditingPreviousVersion) {
+		    List<Policy> policyFamily = policyService.getPreviousVersionsPolicies(policyId);
+		    for (Policy policyFromFamily : policyFamily) {
+			if (!policyFromFamily.getUid().equals(policyUid)
+				&& Policy.STATUS_ACTIVE.equals(policyFromFamily.getPolicyStateId())) {
+			    policyFromFamily.setPolicyStateId(Policy.STATUS_INACTIVE);
+			    policyFromFamily.setLastModified(new Date());
+			    userManagementService.save(policyFromFamily);
+			}
+		    }
+		    
+		} else {
+		    Policy oldPolicy = policyService.getPolicyByUid((Long) policyUid);
+		    if (Policy.STATUS_ACTIVE.equals(oldPolicy.getPolicyStateId())) {
+			oldPolicy.setPolicyStateId(Policy.STATUS_INACTIVE);
+			oldPolicy.setLastModified(new Date());
+			userManagementService.save(oldPolicy);
+		    }
+		}
 	    }
-	    
-	//create a new policy
-	} else {
-	    policy = new Policy();
-	    // generate Unique long ID
-	    Long policyId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE;
-	    policy.setPolicyId(policyId);
+
 	}
 
-	//set default version if it's empty
+	//set default version, if it's empty
 	if (StringUtils.isEmpty(version)) {
 	    version = currentDate;
 	}
@@ -224,28 +236,44 @@
 	userManagementService.save(policy);
 
 	return mapping.findForward("policyListMethod");
-//	    }
-
-//	return mapping.findForward("editPolicy");
     }
 
-    private ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    private ActionForward displayUserConsents(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	Long policyUid = WebUtil.readLongParam(request, "policyUid");
-	if (policyUid != null && policyUid > 0) {
-	    userManagementService.deleteById(Policy.class, policyUid);
+	Policy policy = policyService.getPolicyByUid(policyUid);
+	Set<PolicyConsent> consents = policy.getConsents();
+	request.setAttribute("policy", policy);
+	
+	List<User> users = userManagementService.getAllUsers();
+	LinkedList<UserPolicyConsentDTO> userPolicyConsents = new LinkedList<UserPolicyConsentDTO>();
+	for (User user : users) {
+	    UserPolicyConsentDTO userPolicyConsent = new UserPolicyConsentDTO(user.getUserId(), user.getFirstName(), user.getLastName(), user.getLogin());
+	    
+	    for (PolicyConsent consent : consents) {
+		if (consent.getUser().getUserId().equals(user.getUserId())) {
+		    userPolicyConsent.setConsentGivenByUser(true);
+		    userPolicyConsent.setDateAgreedOn(consent.getDateAgreedOn());
+		}
+	    }
+	    userPolicyConsents.add(userPolicyConsent);
 	}
+	request.setAttribute("userPolicyConsents", userPolicyConsents);
 
-	return mapping.findForward("policyListMethod");
+	return mapping.findForward("userConsents");
     }
     
     private ActionForward viewPreviousVersions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	long policyId = WebUtil.readLongParam(request, "policyId");
-	List<Policy> policies = policyService.getPreviousVersionsPolicies(policyId);
-	request.setAttribute("policies", policies);
+	List<Policy> policyFamily = policyService.getPreviousVersionsPolicies(policyId);
+	//remove the first one from the list
+	if (policyFamily.size() > 1) {
+//	    policyFamily.remove(policyFamily.size() - 1);
+	}
+	request.setAttribute("policies", policyFamily);
 
 	int userCount = userManagementService.getCountUsers();
 	request.setAttribute("userCount", userCount);
@@ -260,6 +288,6 @@
 	int newStatus = WebUtil.readIntParam(request, "newStatus");
 	policyService.changePolicyStatus(policyUid, newStatus);
 
-	return list(mapping, form, request, response);
+	return mapping.findForward("policyListMethod");
     }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	(.../SysAdminStartAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -62,7 +62,7 @@
 	    links.add(new LinkBean("signupManagement.do", "admin.signup.title"));
 	    links.add(new LinkBean("serverlist.do", "sysadmin.maintain.external.servers"));
 	    links.add(new LinkBean("ltiConsumerManagement.do", "label.manage.tool.consumers"));
-	    links.add(new LinkBean("policyManagement.do", "admin.policies.title"));
+	    links.add(new LinkBean("policyManagement.do?method=list", "admin.policies.title"));
 	    links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management"));
 	    links.add(new LinkBean("themeManagement.do", "admin.themes.title"));
 	    links.add(new LinkBean("sessionmaintain.do?method=list", "sysadmin.maintain.session"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,37 @@
+package org.lamsfoundation.lams.admin.web.dto;
+
+import java.util.Date;
+
+import org.lamsfoundation.lams.usermanagement.dto.UserBasicDTO;
+
+/**
+ * Used for displaying which users consented to the policy.
+ * 
+ * @author Andrey Balan
+ */
+public class UserPolicyConsentDTO extends UserBasicDTO {
+    private boolean isConsentGivenByUser;
+    
+    private Date dateAgreedOn;
+
+    public UserPolicyConsentDTO(Integer userID, String firstName, String lastName, String login) {
+	super(userID, firstName, lastName, login);
+    }
+    
+    public void setConsentGivenByUser(boolean isConsentGivenByUser) {
+	this.isConsentGivenByUser = isConsentGivenByUser;
+    }
+
+    public boolean isConsentGivenByUser() {
+	return isConsentGivenByUser;
+    }
+    
+    public Date getDateAgreedOn() {
+	return dateAgreedOn;
+    }
+
+    public void setDateAgreedOn(Date dateAgreedOn) {
+	this.dateAgreedOn = dateAgreedOn;
+    }
+
+}
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -170,6 +170,7 @@
 	<form-property name="version" type="java.lang.String" />
 	<form-property name="policyStateId" type="java.lang.Integer" initial="1"/>
 	<form-property name="minorChange" type="java.lang.Boolean" initial="0" />
+	<form-property name="editingPreviousVersion" type="java.lang.Boolean" initial="0" />
 </form-bean>
 
 <form-bean name="OrgPasswordChangeForm" type="org.apache.struts.action.DynaActionForm">
@@ -897,6 +898,11 @@
       <forward
         name="policyListMethod"
         path="/policyManagement.do?method=list"
+        redirect="true"
+      />
+      <forward
+        name="userConsents"
+        path="/policies/userConsents.jsp"
         redirect="false"
       />
     </action>
Index: lams_admin/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -252,13 +252,13 @@
 	<definition name=".editPolicy" path="/template.jsp">
 		<put name="title" value="admin.policies.title" />
 		<put name="subtitle" value="admin.add.edit.policy" />
-		<put name="content" value="policies/edit.jsp" />
+		<put name="content" value="policies/editPolicy.jsp" />
 	</definition>
 
 	<definition name=".policyList" path="/template.jsp">
 		<put name="title" value="admin.policies.title" />
 		<put name="help" value="LAMS+Policies"/>
-		<put name="content" value="policies/list.jsp" />
+		<put name="content" value="policies/policies.jsp" />
 	</definition>
 	
 	<definition name=".orgPasswordChange" path="/template.jsp">
Fisheye: Tag 4c134bb552fd30a24e610ddd532846ec38a3a51c refers to a dead (removed) revision in file `lams_admin/web/policies/edit.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u
--- lams_admin/web/policies/editPolicy.jsp	(revision 0)
+++ lams_admin/web/policies/editPolicy.jsp	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,143 @@
+<%@ include file="/taglibs.jsp"%>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript">	
+	$(document).ready(function(){
+		// validate signup form on keyup and submit
+		var validator = $("#policy-form").validate({
+			ignore: [],
+			rules: {
+				policyName: "required", 
+				summary:{
+                	required: function() {
+
+                		//var ckeditorData = CKEDITOR.instances.summary.getData();
+                		//skip out empty values
+                		//CKEDITOR.instances.summary.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
+
+                    	
+                    	CKEDITOR.instances.summary.updateElement();
+                    	//alert("s"+ckeditorData);
+                    	//return false;
+                	}
+            	},
+            	fullPolicy:{
+                	required: function() {
+                    	CKEDITOR.instances.fullPolicy.updateElement();
+                	}
+            	}
+			},
+			messages: {
+				policyName: "<c:set var="namev"><fmt:message key='label.name' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				summary: "<c:set var="namev"><fmt:message key='label.summary' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				fullPolicy: "<c:set var="namev"><fmt:message key='label.full.policy' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>"
+			},
+			errorPlacement: function(error, element) {
+				var placement = $(element).data('error');
+				
+		        if (element.attr("name") == "summary" ) { //Id of input field
+		        	error.appendTo('#summary-error');
+		        } else if (element.attr("name") == "fullPolicy" )  {//Id of input field
+		            error.appendTo('#full-policy-error');
+		        } else {
+		            error.insertAfter(element);
+		          }
+		    }
+		});
+
+		$('#cancelButton').on('click', function (e) {
+			e.preventDefault();
+			window.location.href = "<lams:LAMSURL/>admin/policyManagement.do?method=list";
+	    });
+	});
+</script>
+
+<div>
+	<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
+		<fmt:message key="sysadmin.maintain" />
+	</a>
+	<a href="policyManagement.do" class="btn btn-default loffset5">
+		<fmt:message key="admin.policies.title" />
+	</a>
+</div>
+
+<html:form action="/policyManagement.do" styleId="policy-form" method="post">
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<html:hidden property="method" value="save" />
+	<html:hidden property="policyUid" />
+	<html:hidden property="policyId" />
+	<html:hidden property="editingPreviousVersion" />
+	
+	<table class="table table-condensed table-no-border">
+		<tr>
+			<td><fmt:message key="label.name" />&nbsp;&nbsp;*</td>
+			<td><html:text property="policyName" size="40" maxlength="255" styleClass="form-control"/></td>
+		</tr>
+		<tr>
+			<td style="width: 250px;"><fmt:message key="label.policy.type" />:</td>
+			<td>
+				<html:select property="policyTypeId" styleClass="form-control">
+					<html:option value="1"><fmt:message key="label.policy.type.site" /></html:option>
+					<html:option value="2"><fmt:message key="label.policy.type.privacy" /></html:option>
+					<html:option value="3"><fmt:message key="label.policy.type.third.party" /></html:option>
+					<html:option value="4"><fmt:message key="label.policy.type.other" /></html:option>
+				</html:select>
+			</td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.version" /></td>
+			<td><html:text property="version" size="40" maxlength="255" styleClass="form-control"/></td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.summary" />&nbsp;&nbsp;*</td>
+			<td>
+			  <lams:CKEditor id="summary" 
+			     value="${policyForm.map.summary}" 
+			     contentFolderID="../public/policies">
+			  </lams:CKEditor>
+			  <span id="summary-error"></span>
+			</td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.full.policy" />&nbsp;&nbsp;*</td>
+			<td>
+			  <lams:CKEditor id="fullPolicy" 
+			     value="${policyForm.map.fullPolicy}" 
+			     contentFolderID="../public/policies">
+			  </lams:CKEditor>
+			  <span id="full-policy-error"></span>
+			</td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.policy.status" /></td>
+			<td>
+				<html:radio property="policyStateId" value="1" />&nbsp;<fmt:message key="label.policy.status.active" />
+				<br>
+				<html:radio property="policyStateId" value="2" />&nbsp;<fmt:message key="label.policy.status.inactive" /> 
+				<div>
+					<fmt:message key="label.policy.status.hint" />
+				</div>
+			</td>
+		</tr>
+		
+		<c:if test="${formBean.map.policyUid != null && !formBean.map.editingPreviousVersion}">
+			<tr>
+				<td><fmt:message key="label.minor.change" /></td>
+				<td><html:checkbox property="minorChange" /></td>
+			</tr>
+		</c:if>
+		
+	</table>
+	
+	<div class="pull-right">
+		<html:cancel styleId="cancelButton" styleClass="btn btn-default">
+			<fmt:message key="admin.cancel" />
+		</html:cancel>
+
+		<html:submit styleId="submitButton" styleClass="btn btn-primary loffset5">
+			<fmt:message key="admin.submit" />
+		</html:submit>
+	</div>
+
+</html:form>
\ No newline at end of file
Fisheye: Tag 4c134bb552fd30a24e610ddd532846ec38a3a51c refers to a dead (removed) revision in file `lams_admin/web/policies/list.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u
--- lams_admin/web/policies/policies.jsp	(revision 0)
+++ lams_admin/web/policies/policies.jsp	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,164 @@
+<%@ include file="/taglibs.jsp"%>
+<style>
+	th, td {
+		text-align: center;
+	}
+	a {
+		white-space: nowrap;
+	}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+<script type="text/javascript">
+	$(window).load(function(){
+		//dialog displaying user consents given for the specified policy
+		$(".policy-consents-link").click(function() {
+			var policyUid = $(this).data("policy-uid");
+			
+			var id = "policy-consents-dialog",
+			dialog = $('#' + id),
+			exists = dialog.length > 0
+			url = '<c:url value="/policyManagement.do"/>?method=displayUserConsents&policyUid=' + policyUid;
+			showDialog(id, {
+				//'resizable' : false,
+				'data' : {
+					'orgID'  : "orgID"
+				},
+				'height' : 600,
+				'width'  : 600,
+				'title'  : "<fmt:message key='label.user.consents'/>",
+				'open'   : function() {
+					$('iframe', this).attr('src', url);
+				}
+			}, true, exists);
+		});
+	});
+</script>
+
+<p>
+	<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
+		<fmt:message key="sysadmin.maintain" />
+	</a>
+	<c:if test="${viewPreviousVersions == 'true'}">
+		<html:link styleClass="btn btn-default" page="/policyManagement.do?method=list">
+			<fmt:message key="admin.policies.title"/>
+		</html:link>
+	</c:if>
+</p>
+
+<c:if test="${not empty error}">
+	<lams:Alert type="warn" id="errorMessage" close="false">	
+		<c:out value="${error}" />
+	</lams:Alert>
+</c:if>
+
+<table class="table table-striped table-condensed" >
+	<tr>
+		<th><fmt:message key="label.name" /></th>
+		<th><fmt:message key="label.policy.status" /></th>
+		<th><fmt:message key="label.policy.type" /></th>
+		<th><fmt:message key="label.version" /></th>
+		<th><fmt:message key="label.last.modified" /></th>
+		<th><fmt:message key="label.consents"/></th>
+		<th><fmt:message key="admin.actions"/></th>
+	</tr>
+	<c:forEach items="${policies}" var="policy">
+		<tr>
+			<td>
+				<c:out value="${policy.policyName}" />
+			</td>
+			<td>
+				<c:choose>
+					<c:when test="${policy.policyStateId == 1}">
+						<span class="label label-success">
+							<fmt:message key="label.policy.status.active"/>
+						</span>
+					</c:when>
+					<c:otherwise>
+						<span class="label label-warning">
+							<fmt:message key="label.policy.status.inactive"/>
+						</span>
+					</c:otherwise>
+				</c:choose>
+			</td>
+			<td>
+				<c:choose>
+					<c:when test="${policy.policyTypeId == 1}">
+						<fmt:message key="label.policy.type.site"/>
+					</c:when>
+					<c:when test="${policy.policyTypeId == 2}">
+						<fmt:message key="label.policy.type.privacy"/>
+					</c:when>
+					<c:when test="${policy.policyTypeId == 3}">
+						<fmt:message key="label.policy.type.third.party"/>
+					</c:when>
+					<c:when test="${policy.policyTypeId == 4}">
+						<fmt:message key="label.policy.type.other"/>
+					</c:when>
+				</c:choose>
+			</td>
+			<td>
+				<c:out value="${policy.version}" />
+			</td>
+			<td>
+				<lams:Date value="${policy.lastModified}"/>
+			</td>
+			<td>
+				<a href="#nogo" class="policy-consents-link" data-policy-uid="${policy.uid}">
+					${fn:length(policy.consents)}/${userCount}
+				</a>
+			</td>
+			<td style="text-align: left;">
+			
+				<c:choose>
+					<c:when test="${viewPreviousVersions == 'true'}">
+						<html:link page="/policyManagement.do?method=edit&policyUid=${policy.uid}&isEditingPreviousVersion=true">
+							<fmt:message key="label.create.new.draft"/>
+						</html:link>
+					</c:when>
+					<c:otherwise>
+						<html:link page="/policyManagement.do?method=edit&policyUid=${policy.uid}">
+							<fmt:message key="admin.edit"/>
+						</html:link>
+						
+						<c:choose>
+							<c:when test="${policy.policyStateId == 1}">
+								<c:set var="statusTo"><fmt:message key="label.policy.status.inactive"/></c:set>
+								<c:set var="newStatus">2</c:set>
+							</c:when>
+							<c:otherwise>
+								<c:set var="statusTo"><fmt:message key="label.policy.status.active"/></c:set>
+								<c:set var="newStatus">1</c:set>						
+							</c:otherwise>
+						</c:choose>
+							
+						&nbsp;&nbsp;
+						<html:link page="/policyManagement.do?method=changeStatus&policyUid=${policy.uid}&newStatus=${newStatus}">
+							<fmt:message key="label.set.status.to">
+								<fmt:param value="${statusTo}"/>
+							</fmt:message>	
+						</html:link>
+						
+						<c:if test="${policy.hasPreviousVersions()}">
+							&nbsp;&nbsp;
+							<html:link page="/policyManagement.do?method=viewPreviousVersions&policyId=${policy.policyId}">
+								<fmt:message key="label.view.previous.versions"/>
+							</html:link>
+						</c:if>	
+										
+					</c:otherwise>
+				</c:choose>
+	
+			</td>
+		</tr>
+	</c:forEach>
+</table>
+
+<c:if test="${viewPreviousVersions != 'true'}">
+	<html:link styleClass="btn btn-default pull-right" page="/policyManagement.do?method=edit">
+		<fmt:message key="label.add.new.policy"/>
+	</html:link>
+</c:if>
Fisheye: Tag 4c134bb552fd30a24e610ddd532846ec38a3a51c refers to a dead (removed) revision in file `lams_admin/web/policies/previousVersionsList.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/policies/userConsents.jsp
===================================================================
diff -u
--- lams_admin/web/policies/userConsents.jsp	(revision 0)
+++ lams_admin/web/policies/userConsents.jsp	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,82 @@
+<%@ include file="/taglibs.jsp"%>
+
+<!DOCTYPE html>
+<lams:html>
+<lams:head>
+	<lams:css/>
+	<lams:css suffix="learner"/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>/admin/css/admin.css" type="text/css" media="screen">
+	<style>
+		th, td {
+			text-align: center;
+		}
+	</style>
+</lams:head>
+
+<body>
+<div class="row no-gutter no-margin">
+<div class="col-xs-12">
+<div class="container" id="content">
+
+	<h4>
+		<c:out value="${policy.policyName}" />
+	</h4>
+	
+	<c:choose>
+		<c:when test="${policy.policyTypeId == 1}">
+			<fmt:message key="label.policy.type.site"/>
+		</c:when>
+		<c:when test="${policy.policyTypeId == 2}">
+			<fmt:message key="label.policy.type.privacy"/>
+		</c:when>
+		<c:when test="${policy.policyTypeId == 3}">
+			<fmt:message key="label.policy.type.third.party"/>
+		</c:when>
+		<c:when test="${policy.policyTypeId == 4}">
+			<fmt:message key="label.policy.type.other"/>
+		</c:when>
+	</c:choose>
+	<br/>
+	<fmt:message key="label.version" />: <c:out value="${policy.version}" />
+	<br/><br/>
+	
+	<table class="table table-striped table-condensed" >
+		<tr>
+			<th><fmt:message key="admin.user.first_name" />&nbsp;<fmt:message key="admin.user.last_name" /></th>
+			<th><fmt:message key="label.consented" /></th>
+			<th><fmt:message key="label.consented.on"/></th>
+		</tr>
+		<c:forEach items="${userPolicyConsents}" var="userPolicyConsent">
+			<tr>
+				<td>
+					<c:out value="${userPolicyConsent.firstName}" /> <c:out value="${userPolicyConsent.lastName}" />
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${userPolicyConsent.consentGivenByUser}">
+							<i class="icon fa fa-check text-success fa-fw" title="Consent given"></i>
+						</c:when>
+						<c:otherwise>
+							<i class="icon fa fa-times text-danger fa-fw" title="Consent not given"></i>
+						</c:otherwise>
+					</c:choose>
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${userPolicyConsent.dateAgreedOn != null}">
+							<lams:Date value="${userPolicyConsent.dateAgreedOn}"/>
+						</c:when>
+						<c:otherwise>
+							-
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+
+</div>
+</div>
+</div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8f516ec9481b6ab34a5cd5e16fc3effc3115104e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8f516ec9481b6ab34a5cd5e16fc3effc3115104e)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -804,6 +804,25 @@
 authoring.error.application.exercise.not.blank.and.grade=Application Exercise {0} may not be blank and must have a grade.	
 authoring.label.grade=Grade	
 authoring.label.none=None	
+
+label.policies.title=Policies
+label.agree.to.policies.before.proceeding=Please agree to all the policies before proceeding
+label.consent.required=Consent is required
+label.agree.to.policy=I agree to the policy
+label.policy.name =Policy name
+label.policy.type =Policy type
+label.policy.type.site  =Site policy
+label.policy.type.privacy  =Privacy policy
+label.policy.type.third.party  =Third party policy
+label.policy.type.other  =Other policy
+label.summary  =Summary
+label.full.policy  =Full policy
+label.consent  =Consent
+label.policies.consents  =Policies and consents
+label.version =Version
+label.consented =Consented?
+label.consented.on =Consented on
+
 	
 #=================== Specific to Team Based Learning (TBL) =========================#	
 authoring.tbl.template.title=Team Based Learning	
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -43,6 +43,7 @@
 import org.lamsfoundation.lams.index.IndexLinkBean;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
+import org.lamsfoundation.lams.policies.service.IPolicyService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -71,6 +72,7 @@
     private static Logger log = Logger.getLogger(IndexAction.class);
     private static IUserManagementService userManagementService;
     private static IIntegrationService integrationService;
+    private static IPolicyService policyService;
 
     @Override
     @SuppressWarnings("unchecked")
@@ -105,7 +107,7 @@
 	}
 	
 	// check if user needs to get his shared two-factor authorization secret
-	if (false) {
+	if (getPolicyService().isPolicyConsentRequiredForUser(loggedInUser.getUserId())) {
 	    return mapping.findForward("policyConsents");
 	}
 
@@ -300,6 +302,14 @@
 	}
 	return userManagementService;
     }
+    
+    private IPolicyService getPolicyService() {
+	if (policyService == null) {
+	    policyService = (IPolicyService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("policyService");
+	}
+	return policyService;
+    }
 
     private static boolean isPedagogicalPlannerAvailable() {
 	String lamsEarPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
diff -u -r6c8f36f8d99200afab3b0de708f89800cedea6f1 -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 6c8f36f8d99200afab3b0de708f89800cedea6f1)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -46,23 +46,27 @@
 import org.lamsfoundation.lams.index.IndexOrgBean;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
+import org.lamsfoundation.lams.policies.PolicyDTO;
+import org.lamsfoundation.lams.policies.service.IPolicyService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.timezone.Timezone;
 import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
 import org.lamsfoundation.lams.timezone.service.ITimezoneService;
-import org.lamsfoundation.lams.timezone.util.TimezoneDTOComparator;
 import org.lamsfoundation.lams.timezone.util.TimezoneIDComparator;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.IndexUtils;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -82,6 +86,8 @@
     private static IThemeService themeService;
 
     private static ITimezoneService timezoneService;
+    
+    private static IPolicyService policyService;
 
     public ActionForward view(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
@@ -184,7 +190,17 @@
 	}
 	return null;
     }
+    
+    public ActionForward policyConsents(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 
+	Integer userId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
+	List<PolicyDTO> policyDtos = getPolicyService().getPolicyDtosByUser(userId);
+	request.setAttribute("policyDtos", policyDtos);
+
+	return mapping.findForward("profilePolicyConsents");
+    }
+
     public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -289,4 +305,13 @@
 	}
 	return timezoneService;
     }
+    
+    private IPolicyService getPolicyService() {
+	if (policyService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    policyService = (IPolicyService) wac.getBean("policyService");
+	}
+	return policyService;
+    }
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java	(.../PolicyConsentsAction.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java	(.../PolicyConsentsAction.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -17,6 +17,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.policies.Policy;
+import org.lamsfoundation.lams.policies.PolicyConsent;
+import org.lamsfoundation.lams.policies.PolicyDTO;
 import org.lamsfoundation.lams.policies.service.IPolicyService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -33,7 +35,7 @@
 import com.warrenstrange.googleauth.GoogleAuthenticatorQRGenerator;
 
 /**
- * Shows policies user has to consent to. Also stores them once user agrees.
+ * Shows policies user has to consent to. Stores PolicyConsents once user agrees to them.
  * 
  * @author Andrey Balan
  */
@@ -57,23 +59,36 @@
 	}
 
 	String method = WebUtil.readStrParam(request, "method", true);
-	if (StringUtils.equals(method, "list") || isCancelled(request)) {
+	if (StringUtils.equals(method, "consent") || isCancelled(request)) {
 	    return consent(mapping, form, request, response);
 	}
 	
-	List<Policy> policies = policyService.getActivePolicies();
-	request.setAttribute("policies", policies);
+	Integer loggedUserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
 	
-//	User loggedInUser = userManagementService.getUserByLogin(request.getRemoteUser());
+	List<PolicyDTO> policyDtos = policyService.getPolicyDtosByUser(loggedUserId);
+	request.setAttribute("policies", policyDtos);
 	
 	return mapping.findForward("policyConsents");
     }
     
     private ActionForward consent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
+	
+	UserDTO userDto = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	User user = userManagementService.getUserByLogin(userDto.getLogin());
+	
+	List<PolicyDTO> policyDtos = policyService.getPolicyDtosByUser(user.getUserId());
+	//create all missing policy consents
+	for (PolicyDTO policyDto : policyDtos) {
+	    if (!policyDto.isConsentedByUser()) {
+		PolicyConsent consent = new PolicyConsent();
+		Policy policy = policyService.getPolicyByUid(policyDto.getUid());
+		consent.setPolicy(policy);
+		consent.setUser(user);
+		userManagementService.save(consent);
+	    }
+	}
 
-	DynaActionForm policyForm = (DynaActionForm) form;
-
 //	    ActionMessages errors = new ActionMessages();
 //
 //	    // validate
@@ -88,66 +103,10 @@
 //	    if (!errors.isEmpty()) {
 //		saveErrors(request, errors);
 //	    } else {
-	Object policyUid = policyForm.get("policyUid");
-	String version = policyForm.getString("version");
-	Integer policyStateId = (Integer) policyForm.get("policyStateId");
-	Boolean isMinorChange = (Boolean) policyForm.get("minorChange");
 	
 
 
-	Policy policy;
-	// edit existing policy
-//	if (policyUid != null && (Long) policyUid > 0) {
-//	    policy = policyService.getPolicyByUid((Long) policyUid);
-//	    
-//	   //if it's not a minor change - then instantiate a new child policy
-//	    if (!isMinorChange) {
-//		Policy oldPolicy = policy;
-//
-//		//if the new policy has Active status then set the old one to Inactive
-//		if (policyStateId.equals(Policy.STATUS_ACTIVE)) {
-//		    oldPolicy.setPolicyStateId(Policy.STATUS_INACTIVE);
-//		    oldPolicy.setLastModified(new Date());
-//		    userManagementService.save(oldPolicy);
-//		}
-//
-//		//if version was not changed by the user - append current date
-//		if (oldPolicy.getVersion().equals(version)) {
-//		    version += " " + currentDate;
-//		}
-//
-//		policy = new Policy();
-//		policy.setPolicyId(oldPolicy.getPolicyId());
-//	    }
-//	    
-//	//create a new policy
-//	} else {
-//	    policy = new Policy();
-//	    // generate Unique long ID
-//	    Long policyId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE;
-//	    policy.setPolicyId(policyId);
-//	}
-//
-//	//set default version if it's empty
-//	if (StringUtils.isEmpty(version)) {
-//	    version = currentDate;
-//	}
-//	policy.setVersion(version);
-//	policy.setSummary(policyForm.getString("summary"));
-//	policy.setFullPolicy(policyForm.getString("fullPolicy"));
-//	policy.setPolicyTypeId((Integer) policyForm.get("policyTypeId"));
-//	policy.setPolicyStateId(policyStateId);
-//	policy.setPolicyName(policyForm.getString("policyName"));
-//	//set created user
-//	Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
-//	User createdBy = (User) userManagementService.findById(User.class, loggeduserId);
-//	policy.setCreatedBy(createdBy);
-//	policy.setLastModified(new Date());
-//	userManagementService.save(policy);
 
-	return mapping.findForward("policyListMethod");
-//	    }
-
-//	return mapping.findForward("editPolicy");
+	return mapping.findForward("index");
     }
 }
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -551,6 +551,11 @@
         redirect="false"
       />
       <forward
+        name="profilePolicyConsents"
+        path="/profile/profilePolicyConsents.jsp"
+        redirect="false"
+      />
+      <forward
         name="edit"
         path="/editprofile.jsp"
         redirect="false"
@@ -667,6 +672,11 @@
         path="/policyConsents.jsp"
         redirect="false"
       />
+      <forward
+        name="index"
+        path="/index.do"
+        redirect="true"
+      />
     </action> 
      
     <action
Index: lams_central/web/policyConsents.jsp
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -1,50 +1,135 @@
-<%@ include file="/taglibs.jsp"%>
+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:if test="${not empty error}">
-	<lams:Alert type="warn" id="errorMessage" close="false">	
-		<c:out value="${error}" />
-	</lams:Alert>
-</c:if>
+<lams:html>
+<lams:head>
+	<title><fmt:message key="label.policies.title" /></title>
+	<link rel="icon" href="/lams/favicon.ico" type="image/x-icon" />
+	<link rel="shortcut icon" href="/lams/favicon.ico" type="image/x-icon" />
+	<lams:css/>
+	<lams:css suffix="main"/>
+	<style>
+		.alert.alert-danger {
+			margin-right: 5px;
+		}
+		.full-policy, .policy-details {
+			padding-left: 15px;
+		}
+	</style>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
+    <script>
+		$(document).ready(function(){	
+		    $("#consents-form").validate({
+	    	    invalidHandler: function(form, validator) {
+	    		      var errors = validator.numberOfInvalids();
+	    		      if (errors) {
+		    		      $("#consent-all").removeClass("alert-info").addClass("alert-danger");
+	    		      } else {
+	    		    	  $("#consent-all").addClass("alert-info").removeClass("alert-danger");
+	    		      }
+	    		},
+	    		errorPlacement: function(error, element) {
+	    		    error.insertBefore( element.parent("label") );
+	    		},
+	    		errorClass: "alert alert-danger"
+		  	});
 
-<table class="table table-striped table-condensed" >
-	<c:forEach items="${policies}" var="policy">
-		<tr>
-			<td>
-				<b>
-					<c:out value="${policy.policyName}" />
-				</b>
-				<br>
-				
-				<fmt:message key="label.policy.type" />: 
-				<c:choose>
-					<c:when test="${policy.policyTypeId == 1}">
-						<fmt:message key="label.policy.type.site"/>
-					</c:when>
-					<c:when test="${policy.policyTypeId == 2}">
-						<fmt:message key="label.policy.type.privacy"/>
-					</c:when>
-					<c:when test="${policy.policyTypeId == 3}">
-						<fmt:message key="label.policy.type.third.party"/>
-					</c:when>
-					<c:when test="${policy.policyTypeId == 4}">
-						<fmt:message key="label.policy.type.other"/>
-					</c:when>
-				</c:choose>
-				<br>
-
-				<fmt:message key="label.version" />: <c:out value="${policy.version}" />
-				<br>
-				
-				<fmt:message key="label.summary" />: <c:out value="${policy.summary}" />
-				<br>
-				
-				<fmt:message key="label.full.policy" />: <c:out value="${policy.fullPolicy}" />
-				
-			</td>
-		</tr>
-	</c:forEach>
-</table>
-
-<html:link styleClass="btn btn-primary pull-right" page="/policyConsents.do?method=consent">
-	<fmt:message key="label.consent"/>
-</html:link>
+		 	// the following method must come AFTER .validate()
+		    $('.required-field').each(function() {
+		        $(this).rules('add', {
+		            required: true,
+		            messages: {
+		                required: "<fmt:message key='label.consent.required' />"
+		            }
+		        });
+		    });
+		}); 
+	</script>
+</lams:head>
+<body class="offcanvas-hidden">
+<div id="page-wrapper">
+<div class="content">
+	
+	<h4>
+		<fmt:message key="label.policies.title" />
+	</h4>
+			
+	<lams:Alert close="false" id="consent-all" type="info">
+		<fmt:message key="label.agree.to.policies.before.proceeding" />
+	</lams:Alert>
+	
+	<form action="/lams/policyConsents.do?method=consent" method="post" id="consents-form">
+	<table class="table table-striped table-condensed" >
+		<c:forEach items="${policies}" var="policy">
+			<tr>
+				<td>
+					<h5>
+						<c:out value="${policy.policyName}" />
+					</h5>
+					
+					<div class="policy-details">
+					<fmt:message key="label.policy.type" />: 
+					<c:choose>
+						<c:when test="${policy.policyTypeId == 1}">
+							<fmt:message key="label.policy.type.site"/>
+						</c:when>
+						<c:when test="${policy.policyTypeId == 2}">
+							<fmt:message key="label.policy.type.privacy"/>
+						</c:when>
+						<c:when test="${policy.policyTypeId == 3}">
+							<fmt:message key="label.policy.type.third.party"/>
+						</c:when>
+						<c:when test="${policy.policyTypeId == 4}">
+							<fmt:message key="label.policy.type.other"/>
+						</c:when>
+					</c:choose>
+					<br>
+					
+					<c:out value="${policy.summary}" escapeXml="false"/>
+					
+					<div>
+						<a data-toggle="collapse" data-target="#full-policy-${policy.uid}" href="#nogo">
+							<i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i>
+							<fmt:message key="label.full.policy" />
+						</a>
+						<div id="full-policy-${policy.uid}"  class="voffset5 collapse form-group full-policy">
+							<c:out value="${policy.fullPolicy}" escapeXml="false"/>
+						</div>
+					</div>
+					</div>
+					
+					<div class="checkbox">
+						<label for="policy-${policy.uid}">
+							<input type="checkbox" name="policy${policy.uid}" value="${policy.uid}"
+									id="policy-${policy.uid}" class="required-field"
+									<c:if test="${policy.consentedByUser}">checked="checked"</c:if>>
+							<fmt:message key="label.agree.to.policy" />
+						</label>
+					</div>
+					
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	
+		<div style="overflow:auto;">
+			<html:submit styleClass="btn btn-primary pull-right">
+				<fmt:message key="label.consent"/>
+			</html:submit>
+		</div>
+	</form>
+	
+</div>
+</div>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/profile.jsp
===================================================================
diff -u -rc4604765c0116218e41964111ac33392757488b3 -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision c4604765c0116218e41964111ac33392757488b3)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -86,6 +86,13 @@
 							<i class="fa fa-fw fa-camera"></i> <span class="hidden-xs"><fmt:message
 									key="title.portrait.change.screen" /></span></i>
 						</a>&nbsp;&nbsp;
+						
+						<a class="btn btn-sm btn-default offset5" href="profile.do?method=policyConsents" role="button">
+							<i class="fa fa-fw fa-calendar-check-o"></i> 
+							<span class="hidden-xs">
+								<fmt:message key="label.policies.consents" />
+							</span>
+						</a>&nbsp;&nbsp;
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
Index: lams_central/web/profile/profilePolicyConsents.jsp
===================================================================
diff -u
--- lams_central/web/profile/profilePolicyConsents.jsp	(revision 0)
+++ lams_central/web/profile/profilePolicyConsents.jsp	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<lams:html>
+<lams:head>
+	<lams:css/>
+	<style>
+		th, td {
+			text-align: center;
+		}
+	</style>
+	
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/profile.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="label.policies.consents" />', '80%');
+		});
+	</script>
+</lams:head>
+
+<body>
+<div style="clear: both;"></div>
+<div class="container">
+	<div class="row vertical-center-row">
+		<div>
+			<div class="panel">
+				<div class="panel-body">
+
+					<table class="table table-striped table-condensed" >
+						<tr>
+							<th><fmt:message key="label.policy.name" /></th>
+							<th><fmt:message key="label.policy.type" /></th>
+							<th><fmt:message key="label.version" /></th>
+							<th><fmt:message key="label.consented" /></th>
+							<th><fmt:message key="label.consented.on"/></th>
+						</tr>
+					
+						<c:forEach items="${policyDtos}" var="policyDto">
+							<tr title="<c:out value="${policyDto.summary}" />">
+								<td>
+									<c:out value="${policyDto.policyName}" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${policyDto.policyTypeId == 1}">
+											<fmt:message key="label.policy.type.site"/>
+										</c:when>
+										<c:when test="${policyDto.policyTypeId == 2}">
+											<fmt:message key="label.policy.type.privacy"/>
+										</c:when>
+										<c:when test="${policyDto.policyTypeId == 3}">
+											<fmt:message key="label.policy.type.third.party"/>
+										</c:when>
+										<c:when test="${policyDto.policyTypeId == 4}">
+											<fmt:message key="label.policy.type.other"/>
+										</c:when>
+									</c:choose>
+								</td>
+								<td>
+									<c:out value="${policyDto.version}" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${policyDto.consentedByUser}">
+											<i class="icon fa fa-check text-success fa-fw" title="Consent given"></i>
+										</c:when>
+										<c:otherwise>
+											<i class="icon fa fa-times text-danger fa-fw" title="Consent not given"></i>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td>
+									<lams:Date value="${policyDto.dateAgreedOn}"/>	
+								</td>
+							</tr>
+						</c:forEach>
+					</table>
+					
+					<div align="center">
+						<input class="btn btn-sm btn-default offset5" type="button"
+							value="<fmt:message key="label.return.to.myprofile" />"
+							onclick="javascript:document.location='index.do?method=profile'" />
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</lams:html>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml	(.../Policy.hbm.xml)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml	(.../Policy.hbm.xml)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -50,7 +50,7 @@
             name="consents"
             lazy="true"
             inverse="false"
-            cascade="all"
+            cascade="none"
             sort="unsorted"
             order-by="date_agreed_on asc"
         >
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180528.sql
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180528.sql	(.../patch20180528.sql)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180528.sql	(.../patch20180528.sql)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -55,7 +55,6 @@
 
 INSERT INTO lams_policy_state VALUES (1, 'ACTIVE');
 INSERT INTO lams_policy_state VALUES (2, 'INACTIVE');
-INSERT INTO lams_policy_state VALUES (3, 'DRAFT');
 
 INSERT INTO lams_policy_type VALUES (1, 'TYPE_SITE_POLICY');
 INSERT INTO lams_policy_type VALUES (2, 'TYPE_PRIVACY_POLICY');
Index: lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java	(.../Policy.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java	(.../Policy.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -11,16 +11,14 @@
     public static final Integer STATUS_ACTIVE = new Integer(1);
     /** inactive policy */
     public static final Integer STATUS_INACTIVE = new Integer(2);
-    /** The state for draft policy */
-    public static final Integer STATUS_DRAFT = new Integer(3);
     
-    /** active policy */
+    /** site policy */
     public static final Integer TYPE_SITE_POLICY = new Integer(1);
-    /** inactive policy */
+    /** privacy policy */
     public static final Integer TYPE_PRIVACY_POLICY = new Integer(2);
-    /** The state for draft policy */
+    /** third party policy */
     public static final Integer TYPE_THIRD_PARTIES_POLICY = new Integer(3);
-    /** The state for draft policy */
+    /** other policy */
     public static final Integer TYPE_OTHER = new Integer(4);
     
     /** identifier field */
@@ -59,6 +57,7 @@
     // *************** NON Persistent Fields ********************
     
     private boolean hasPreviousVersions;
+    private int userConsentsCount;
     
     /** default constructor */
     public Policy() {
@@ -161,4 +160,11 @@
 	return hasPreviousVersions;
     }
 
+    public void setUserConsentsCount(int userConsentsCount) {
+	this.userConsentsCount = userConsentsCount;
+    }
+
+    public int getUserConsentsCount() {
+	return userConsentsCount;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/policies/PolicyDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/policies/PolicyDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/PolicyDTO.java	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -0,0 +1,95 @@
+package org.lamsfoundation.lams.policies;
+
+import java.util.Date;
+
+public class PolicyDTO {
+    private Long uid;
+    
+    private String policyName;
+    
+    private String version;
+    
+    private Integer policyTypeId;
+    
+    private String summary;
+    
+    private String fullPolicy;
+    
+    private boolean isConsentedByUser;
+    
+    private Date dateAgreedOn;
+    
+    /** default constructor */
+    public PolicyDTO(Policy policy) {
+	this.uid = policy.getUid();
+	this.policyName = policy.getPolicyName();
+	this.version = policy.getVersion();
+	this.policyTypeId= policy.getPolicyTypeId();
+	this.summary = policy.getSummary();
+	this.fullPolicy= policy.getFullPolicy();
+    }
+    
+    // ---------------------------------------------------------------------
+    // Getters and Setters
+    // ---------------------------------------------------------------------
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long id) {
+	this.uid = id;
+    }
+
+    public String getPolicyName() {
+	return policyName;
+    }
+    public void setPolicyName(String policyName) {
+	this.policyName = policyName;
+    }
+    
+    public String getVersion() {
+	return version;
+    }
+    public void setVersion(String version) {
+	this.version = version;
+    }
+    
+    public Integer getPolicyTypeId() {
+	return this.policyTypeId;
+    }
+
+    public void setPolicyTypeId(Integer policyTypeId) {
+	this.policyTypeId = policyTypeId;
+    }
+
+    public String getSummary() {
+	return summary;
+    }
+    public void setSummary(String summary) {
+	this.summary = summary;
+    }
+    
+    public String getFullPolicy() {
+	return fullPolicy;
+    }
+    public void setFullPolicy(String fullPolicy) {
+	this.fullPolicy = fullPolicy;
+    }
+    
+    public void setConsentedByUser(boolean isConsentedByUser) {
+	this.isConsentedByUser = isConsentedByUser;
+    }
+
+    public boolean isConsentedByUser() {
+	return isConsentedByUser;
+    }
+    
+    public Date getDateAgreedOn() {
+	return dateAgreedOn;
+    }
+
+    public void setDateAgreedOn(Date dateAgreedOn) {
+	this.dateAgreedOn = dateAgreedOn;
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java	(.../IPolicyDAO.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/dao/IPolicyDAO.java	(.../IPolicyDAO.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -26,17 +26,33 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.policies.Policy;
+import org.lamsfoundation.lams.policies.PolicyConsent;
+import org.lamsfoundation.lams.policies.PolicyDTO;
 
 public interface IPolicyDAO {
 
     Policy getPolicyByUid(Long uid);
 
-    List<Policy> getPolicies();
+    List<Policy> getAllPoliciesWithUserConsentsCount();
     
-    List<Policy> getActivePolicies();
+    List<Policy> getPreviousVersionsPolicies(Long policyId);
     
-    List<Policy> getActivePoliciesWithConsents();
+    boolean isPolicyConsentRequiredForUser(Integer userId);
     
-    List<Policy> getPreviousVersionsPolicies(Long policyId);
+    /**
+     * Return all active policies with indication which one of them has been consented by the user.
+     * 
+     * @param userId
+     * @return
+     */
+    List<PolicyDTO> getPolicyDtosByUser(Integer userId);
+    
+    /**
+     * Return all consents user has given.
+     * 
+     * @param userId
+     * @return
+     */
+    List<PolicyConsent> getConsentsByUserId(Integer userId);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java	(.../PolicyDAO.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java	(.../PolicyDAO.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -1,12 +1,20 @@
 package org.lamsfoundation.lams.policies.dao.hibernate;
 
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
+import org.hibernate.Query;
+import org.hibernate.SQLQuery;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.policies.Policy;
+import org.lamsfoundation.lams.policies.PolicyConsent;
+import org.lamsfoundation.lams.policies.PolicyDTO;
 import org.lamsfoundation.lams.policies.dao.IPolicyDAO;
 import org.springframework.stereotype.Repository;
 
+import com.sun.webkit.PolicyClient;
+
 @Repository
 public class PolicyDAO extends LAMSBaseDAO implements IPolicyDAO {
 
@@ -16,25 +24,88 @@
     }
 
     @Override
-    public List<Policy> getPolicies() {
-	return super.findAll(Policy.class);
+    public List<Policy> getAllPoliciesWithUserConsentsCount() {
+	final String LOAD_POLICIES_WITH_CONSENTS_COUNT = "SELECT policy.*, COUNT(policyConsent.uid) AS userConsentsCount "
+		+ "FROM lams_policy AS policy "
+		+ "LEFT JOIN lams_policy_consent AS policyConsent ON policyConsent.policy_uid = policy.uid "
+		+ "GROUP BY policy.uid ORDER BY policy.last_modified ASC";
+	
+	SQLQuery query = getSession().createSQLQuery(LOAD_POLICIES_WITH_CONSENTS_COUNT);
+	query.addEntity(Policy.class);
+	query.addScalar("userConsentsCount");
+	List<Object[]> resultQuery = query.list();
+	
+	// this map keeps the insertion order
+	LinkedList<Policy> policies = new LinkedList<Policy>();
+	// make the result easier to process
+	for (Object[] entry : resultQuery) {
+	    Policy policy = (Policy) entry[0];
+	    int userConsentsCount = ((Number) entry[1]).intValue();
+	    policy.setUserConsentsCount(userConsentsCount);
+	    
+	    policies.add(policy);
+	}
+	return policies;
     }
     
     @Override
-    public List<Policy> getActivePolicies() {
-	String query = "from Policy p where p.policyStateId=1 GROUP BY p.policyId ";
-	return (List<Policy>) doFind(query);
+    public List<Policy> getPreviousVersionsPolicies(Long policyId) {
+	String query = "from Policy p where p.policyId=? ORDER BY p.lastModified ASC";
+	return (List<Policy>) doFind(query, policyId);
     }
     
     @Override
-    public List<Policy> getActivePoliciesWithConsents() {
-	String query = "from Policy p where p.policyStateId=1 GROUP BY p.policyId ";
-	return (List<Policy>) doFind(query);
+    public boolean isPolicyConsentRequiredForUser(Integer userId) {
+	String SQL = "SELECT count(*) FROM lams_policy as policy" + 
+		" LEFT JOIN lams_policy_consent as policyConsent" + 
+		" ON policy.uid = policyConsent.policy_uid AND policyConsent.user_id = :userId" + 
+		" WHERE policyConsent.uid IS NULL AND policy.policy_state_id=1";
+	
+	Query query = getSession().createSQLQuery(SQL);
+	query.setInteger("userId", userId);
+	Object value = query.uniqueResult();
+	int result = ((Number) value).intValue();
+	
+	return result > 0;
     }
     
     @Override
-    public List<Policy> getPreviousVersionsPolicies(Long policyId) {
-	String query = "from Policy p where p.policyId=? and p.policyStateId=2";
-	return (List<Policy>) doFind(query, policyId);
+    public List<PolicyDTO> getPolicyDtosByUser(Integer userId) {
+	final String LOAD_POLICIES_WITH_USER_CONSENTS = "SELECT policy.*, policyConsent.uid IS NOT NULL as isConsentedByUser, policyConsent.date_agreed_on as dateAgreedOn "
+		+ "FROM lams_policy AS policy "
+		+ "LEFT JOIN lams_policy_consent AS policyConsent ON policyConsent.policy_uid = policy.uid AND policyConsent.user_id = :userId "
+		+ "WHERE policy.policy_state_id=1";
+	
+	SQLQuery query = getSession().createSQLQuery(LOAD_POLICIES_WITH_USER_CONSENTS);
+	query.addEntity(Policy.class);
+	query.addScalar("isConsentedByUser");
+	query.addScalar("dateAgreedOn");
+	query.setInteger("userId", userId);
+	List<Object[]> resultQuery = query.list();
+
+	// this map keeps the insertion order
+	LinkedList<PolicyDTO> policyDtos = new LinkedList<PolicyDTO>();
+	// make the result easier to process
+	for (Object[] entry : resultQuery) {
+	    Policy policy = (Policy) entry[0];
+	    
+	    PolicyDTO policyDto = new PolicyDTO(policy);
+	    
+	    boolean isConsentedByUser = ((Number) entry[1]).intValue() == 1;
+	    policyDto.setConsentedByUser(isConsentedByUser);
+	    
+	    Date dateAgreedOn = (Date) entry[2];
+	    policyDto.setDateAgreedOn(dateAgreedOn);
+	    
+	    policyDtos.add(policyDto);
+	}
+	return policyDtos;
     }
+    
+    @Override
+    public List<PolicyConsent> getConsentsByUserId(Integer userId) {
+	String query = "from PolicyConsent consent where consent.user.userId=? ORDER BY consent.dateAgreedOn ASC";
+	return (List<PolicyConsent>) doFind(query, userId);
+    }
+    
 }
Index: lams_common/src/java/org/lamsfoundation/lams/policies/service/IPolicyService.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/policies/service/IPolicyService.java	(.../IPolicyService.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/service/IPolicyService.java	(.../IPolicyService.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -26,18 +26,48 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.policies.Policy;
+import org.lamsfoundation.lams.policies.PolicyConsent;
+import org.lamsfoundation.lams.policies.PolicyDTO;
 
 public interface IPolicyService {
     
     void storeUserConsent(String login, Long policyUid);
     
     Policy getPolicyByUid(Long uid);
 
-    List<Policy> getPolicies();
+    /**
+     * Return all active policies together with how many users have consented to each of them  
+     * 
+     * @return
+     */
+    List<Policy> getAllPoliciesWithUserConsentsCount();
     
-    List<Policy> getActivePolicies();
-    
     List<Policy> getPreviousVersionsPolicies(Long policyId);
     
+    boolean isPolicyConsentRequiredForUser(Integer userId);
+    
+    /**
+     * Return all active policies together with indication which one of them has been consented by the user.
+     * 
+     * @param userId
+     * @return
+     */
+    List<PolicyDTO> getPolicyDtosByUser(Integer userId);
+    
+    /**
+     * Return all consents user has given.
+     * 
+     * @param userId
+     * @return
+     */
+    List<PolicyConsent> getConsentsByUserId(Integer userId);
+    
+    /**
+     * Changes policy status as set by the admin. In case of deactivating policy, it also removes all associated
+     * consents.
+     * 
+     * @param policyUid
+     * @param newPolicyStatus
+     */
     void changePolicyStatus(Long policyUid, Integer newPolicyStatus);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/policies/service/PolicyService.java
===================================================================
diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r4c134bb552fd30a24e610ddd532846ec38a3a51c
--- lams_common/src/java/org/lamsfoundation/lams/policies/service/PolicyService.java	(.../PolicyService.java)	(revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e)
+++ lams_common/src/java/org/lamsfoundation/lams/policies/service/PolicyService.java	(.../PolicyService.java)	(revision 4c134bb552fd30a24e610ddd532846ec38a3a51c)
@@ -1,30 +1,19 @@
 package org.lamsfoundation.lams.policies.service;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
-import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.policies.Policy;
 import org.lamsfoundation.lams.policies.PolicyConsent;
+import org.lamsfoundation.lams.policies.PolicyDTO;
 import org.lamsfoundation.lams.policies.dao.IPolicyDAO;
-import org.lamsfoundation.lams.signup.dao.ISignupDAO;
-import org.lamsfoundation.lams.signup.model.SignupOrganisation;
-import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
-import org.lamsfoundation.lams.usermanagement.Role;
-import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.LanguageUtil;
 
 public class PolicyService implements IPolicyService {
 
@@ -52,23 +41,48 @@
     public void changePolicyStatus(Long policyUid, Integer newPolicyStatus) {
 	Policy policy = policyDAO.getPolicyByUid(policyUid);
 	policy.setPolicyStateId(newPolicyStatus);
+	policy.setLastModified(new Date());
 	userManagementService.save(policy);
+	
+//	//remove according user consents
+//	if (Policy.STATUS_INACTIVE.equals(newPolicyStatus) || Policy.STATUS_DRAFT.equals(newPolicyStatus)) { 
+//	    HashMap<String, Object> properties = new HashMap<String, Object>();
+//	    properties.put("policy.uid", policyUid);
+//	    List<PolicyConsent> consents = userManagementService.findByProperties(PolicyConsent.class, properties);
+//
+//	    Iterator<PolicyConsent> iter = consents.iterator();
+//	    while (iter.hasNext()) {
+//		PolicyConsent consent = iter.next();
+//		userManagementService.delete(consent);
+//		iter.remove();
+//	    }
+//	}
     }
 
     @Override
-    public List<Policy> getPolicies() {
-	return policyDAO.getPolicies();
+    public List<Policy> getAllPoliciesWithUserConsentsCount() {
+	return policyDAO.getAllPoliciesWithUserConsentsCount();
     }
     
     @Override
-    public List<Policy> getActivePolicies() {
-	return policyDAO.getActivePolicies();
+    public List<Policy> getPreviousVersionsPolicies(Long policyId) {
+	return policyDAO.getPreviousVersionsPolicies(policyId);
     }
     
     @Override
-    public List<Policy> getPreviousVersionsPolicies(Long policyId) {
-	return policyDAO.getPreviousVersionsPolicies(policyId);
+    public boolean isPolicyConsentRequiredForUser(Integer userId) {
+	return policyDAO.isPolicyConsentRequiredForUser(userId);
     }
+    
+    @Override
+    public List<PolicyDTO> getPolicyDtosByUser(Integer userId) {
+	return policyDAO.getPolicyDtosByUser(userId);
+    }
+    
+    @Override
+    public List<PolicyConsent> getConsentsByUserId(Integer userId) {
+	return policyDAO.getConsentsByUserId(userId);
+    }
 
     public void setPolicyDAO(IPolicyDAO policyDAO) {
 	this.policyDAO = policyDAO;