Commit ef26e648 by Nilu

forgot password changes

parent 0f997969
......@@ -28,8 +28,9 @@ public class ForgotPasswordFP extends SaveFP
{
HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
String email = (String) request.getParameter("email");
Job job = (Job) process.getAttribute("Job");
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
String email = job != null ? job.getEmail() : (companyUser != null ? companyUser.getEmail() : null);
Debug.assertion(StringUtils.subBlanks(email) != null, "Email not avaialble");
......@@ -54,7 +55,7 @@ public class ForgotPasswordFP extends SaveFP
LogMgr.log(LOG, LogLevel.PROCESSING1, "Inside ForgotPasswordFP for send reset pasword link mail to ", email);
Map emailParams;
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(companyUser != null)
{
......
......@@ -12,25 +12,11 @@
$(document).ready(function() {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
validate();
$('input[type="text"]').keyup(function() {
$(this).change();
validate();
});
$('#right-mark-div').onChange(function() {
alert($(this).attr('class'));
});
});
function validate() {
if ($('#send-link-div')) {
$('.send-btn').attr('disabled', 'disabled');
} else {
$('.send-btn').removeAttr('disabled');
}
}
</script>
<style>
.btn-disabled button{
......@@ -78,10 +64,11 @@
</oneit:recalcClass>
</div>
<div class="form-group">
<oneit:recalcClass id="right-mark-div" htmlTag="div" classScript="companyUser.emailExists() ? 'show': 'btn-disabled'" companyUser="<%= companyUser %>" class="right-mark">
<oneit:recalcClass htmlTag="div" classScript="companyUser.emailExists() ? 'show': 'btn-disabled'" companyUser="<%= companyUser %>">
<oneit:button value="Send reset link" name="forgotPassword" cssClass="box-btn send-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "sign_in.jsp?sent=true")
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "resetPasswordEmailSent")
.mapEntry ("CompanyUser", companyUser)
.toMap() %>"/>
</oneit:recalcClass>
</div>
......
......@@ -10,34 +10,42 @@
$(document.body).addClass('bg-color');
$(document).ready(function() {
validate();
$('input').on('change keyup', function() { validate() });
});
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
function validate() {
var empty = false;
$('input[required]').each(function() {
if ( $.trim($( this ).val()) === '') {
empty = true;
if ($( this ).css('background-color') === 'rgb(250, 255, 189)') {
empty = false;
}
}
$('input[type="text"]').keyup(function() {
$(this).change();
});
});
if (empty) {
$('.send-btn').attr('disabled', 'disabled');
} else {
$('.send-btn').removeAttr('disabled');
}
}
</script>
<style>
button[disabled] {
.btn-disabled button{
opacity: 0.6;
background-color: #0582ba;
}
#right-mark {
width: 24px;
height: 24px;
border-radius: 30px;
position: absolute;
top: 51%;
right: 37px;
background-color: #67b413;
padding-top: 5px;
}
#right-mark img {
width: 15px;
height: 15px;
display: block;
margin: auto auto;
}
</style>
<%
ORMProcessState process = (ORMProcessState) ProcessDecorator.getDefaultProcess(request);
ObjectTransaction objTran = process.getTransaction ();
Job job = (Job) process.getAttribute("Job");
%>
<div class="main-verify-identity">
<div class="login-logo"><img src="<%= request.getContextPath() %>/images/logo.svg" /></div>
<oneit:form name="forgotPassword" method="post">
......@@ -51,15 +59,20 @@
<div>&nbsp;</div>
<div class="form-group text-left">
<label>Email Address</label>
<input type="email" class="form-control" name="email" required>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="Email" cssClass="form-control second-style" style="text-transform: lowercase" autocomplete="off"/>
<oneit:recalcClass htmlTag="div" classScript="job.isEmailFound() ? 'show': 'hide'" job="<%= job %>" class="right-mark">
<span id="right-mark"><img src="images/right-mark.svg"/></span>
</oneit:recalcClass>
</div>
<div class="form-group">
<oneit:button value="Send" name="forgotPassword" cssClass="box-btn send-btn"
<oneit:recalcClass htmlTag="div" classScript="job.isEmailFound() ? 'show': 'btn-disabled'" job="<%= job %>">
<oneit:button value="Send reset link" name="forgotPassword" cssClass="box-btn send-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", WebUtils.getSamePageInRenderMode(request, "ResetPasswordSent"))
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
.toMap() %>"/>
</oneit:recalcClass>
</div>
</div>
</oneit:form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment