OO-1702: if recertification is disabled, check if a certificate was already emitted

src/main/java/org/olat/course/assessment/NewCachePersistingAssessmentManager.java

@@ -889,7 +889,7 @@ public class NewCachePersistingAssessmentManager extends BasicManager implements
 				
 				if(passed != null && passed.booleanValue() && course.getCourseConfig().isAutomaticCertificationEnabled()) {
 					CertificatesManager certificatesManager = CoreSpringFactory.getImpl(CertificatesManager.class);
-					if(certificatesManager.isRecertificationAllowed(assessedIdentity, courseEntry)) {
+					if(certificatesManager.isCertificationAllowed(assessedIdentity, courseEntry)) {
 						CertificateTemplate template = null;
 						Long templateId = course.getCourseConfig().getCertificateTemplate();
 						if(templateId != null) {

src/main/java/org/olat/course/certificate/CertificatesManager.java

@@ -137,7 +137,17 @@ public interface CertificatesManager {
 	
 	public List<Certificate> getCertificates(IdentityRef identity, OLATResource resource);
 	
-	public boolean isRecertificationAllowed(Identity identity, RepositoryEntry entry);
+	/**
+	 * Check if recertification is allowed and if it is the case, check the
+	 * recertification period. If not allowed, check if a certificate was
+	 * already emitted.
+	 * 
+	 * @param identity
+	 * @param entry
+	 * @return
+	 */
+	
+	public boolean isCertificationAllowed(Identity identity, RepositoryEntry entry);
 	
 	public File previewCertificate(CertificateTemplate template, RepositoryEntry entry, Locale locale);
 

src/main/java/org/olat/course/certificate/manager/CertificatesManagerImpl.java

@@ -512,7 +512,7 @@ public class CertificatesManagerImpl implements CertificatesManager, MessageList
 	}
 
 	@Override
-	public boolean isRecertificationAllowed(Identity identity, RepositoryEntry entry) {
+	public boolean isCertificationAllowed(Identity identity, RepositoryEntry entry) {
 		boolean allowed = false;
 		try {
 			ICourse course = CourseFactory.loadCourse(entry.getOlatResource());
@@ -538,7 +538,7 @@ public class CertificatesManagerImpl implements CertificatesManager, MessageList
 					allowed = nextCertification.before(now);
 				}
 			} else {
-				allowed = true;
+				allowed = !hasCertificate(identity, entry.getOlatResource().getKey());
 			}
 		} catch (CorruptedCourseException e) {
 			log.error("", e);

src/main/java/org/olat/course/certificate/ui/AssessedIdentityCertificatesController.java

@@ -185,7 +185,7 @@ public class AssessedIdentityCertificatesController extends BasicController impl
 		ICourse course = CourseFactory.loadCourse(resource);
 		Identity assessedIdentity = assessedUserCourseEnv.getIdentityEnvironment().getIdentity();
 		RepositoryEntry courseEntry = course.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
-		if(certificatesManager.isRecertificationAllowed(assessedIdentity, courseEntry)) {
+		if(certificatesManager.isCertificationAllowed(assessedIdentity, courseEntry)) {
 			//don't need to confirm
 			doGenerateCertificate(ureq);
 		} else {