Commit a63ce734 by Pradip J. Sabhadiya Committed by Harsh Shah

Added success notification, change system font

parent 462f9fa5
...@@ -4,7 +4,6 @@ import java.util.Map; ...@@ -4,7 +4,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel; import oneit.logging.LogLevel;
import oneit.logging.LogMgr; import oneit.logging.LogMgr;
import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser; import oneit.objstore.parser.BusinessObjectParser;
...@@ -14,6 +13,7 @@ import oneit.servlets.forms.SubmissionDetails; ...@@ -14,6 +13,7 @@ import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult; import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessFormProcessor; import oneit.servlets.process.ORMProcessFormProcessor;
import oneit.servlets.process.ORMProcessState; import oneit.servlets.process.ORMProcessState;
import oneit.servlets.utils.NotificationUtils;
import oneit.utils.*; import oneit.utils.*;
import performa.orm.CultureCriteria; import performa.orm.CultureCriteria;
import performa.orm.CultureCriteriaTemplate; import performa.orm.CultureCriteriaTemplate;
...@@ -33,7 +33,9 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor ...@@ -33,7 +33,9 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
Job job = (Job) request.getAttribute("Job"); Job job = (Job) request.getAttribute("Job");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template for ", job); LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template for ", job);
String messageId = NotificationUtils.getNotifyIdIfRequired(process, request);
objTran.runInNewTX((ObjectTransaction newObjTran) -> { objTran.runInNewTX((ObjectTransaction newObjTran) -> {
CultureCriteriaTemplate newTemplate = CultureCriteriaTemplate.createCultureCriteriaTemplate(newObjTran); CultureCriteriaTemplate newTemplate = CultureCriteriaTemplate.createCultureCriteriaTemplate(newObjTran);
...@@ -52,8 +54,11 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor ...@@ -52,8 +54,11 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
newTemplate.addToCultureCriterias(criteriaCopy); newTemplate.addToCultureCriterias(criteriaCopy);
} }
}); });
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "SaveCultureTemplateFP completed for ", job); LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "SaveCultureTemplateFP completed for ", job);
NotificationUtils.setNotifyIDInRequest(request, messageId);
return RedisplayResult.getInstance(); return RedisplayResult.getInstance();
} }
......
@font-face {font-family: 'PIFont';src: url('../fonts/343A83_1_0.eot');src: url('../fonts/343A83_1_0.eot?#iefix') format('embedded-opentype'),url('../fonts/343A83_1_0.woff2') format('woff2'),url('../fonts/343A83_1_0.woff') format('woff'),url('../fonts/343A83_1_0.ttf') format('truetype');}
* {
font-family: "PIFont";
}
body{ body{
color: #4e5258; color: #4e5258;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
...@@ -4294,3 +4298,10 @@ div.errorField .input-append .add-on { ...@@ -4294,3 +4298,10 @@ div.errorField .input-append .add-on {
background-color: #f2dede; background-color: #f2dede;
border-color: #b94a48; border-color: #b94a48;
} }
.dashboard-content-area .message-common {
margin: 0px;
}
.job-post-name {
cursor: pointer;
font-weight: bold;
}
\ No newline at end of file
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<INHERITS factory="Named" nodename="CoreORMAdminNoPriv"/> <INHERITS factory="Named" nodename="CoreORMAdminNoPriv"/>
<FORM name="*.login" factory="Participant" class="performa.form.UserLoginFP"> <FORM name="*.login" factory="Participant" class="performa.form.UserLoginFP">
<NODE name="loginFailureMessage" factory="String" value="Invalid password, please re-check your login details ... "/> <NODE name="loginFailureMessage" factory="String" value="Invalid password, please re-check your login details ... "/>
<NODE name="onSuccessURL" factory="String" value="frame.jsp"/> <NODE name="onSuccessURL" factory="String" value="../../AdminPortal-Home.htm"/>
<PARSER name="username" factory="Participant" class="oneit.utils.parsers.StringParser"> <PARSER name="username" factory="Participant" class="oneit.utils.parsers.StringParser">
<NODE name="nonExistErrorMessage" factory="String" value="Please enter a value for user name"/> <NODE name="nonExistErrorMessage" factory="String" value="Please enter a value for user name"/>
</PARSER> </PARSER>
...@@ -54,5 +54,7 @@ ...@@ -54,5 +54,7 @@
</format> </format>
<format item="field.*.error.pageHeader_performa_errorText"><![CDATA[<br/><span class="message-txt">?</span>]]></format> <format item="field.*.error.pageHeader_performa_errorText"><![CDATA[<br/><span class="message-txt">?</span>]]></format>
<format item="field.*.error.pageHeader_performa_errorSuffix"><![CDATA[</div>]]></format> <format item="field.*.error.pageHeader_performa_errorSuffix"><![CDATA[</div>]]></format>
<format item="form.*.pageHeader_notifyPrefix"><![CDATA[<div class="success-message message-common"><img src="images/success-alert.png" class="alert-icon" /><span class="message-txt">]]></format>
<format item="form.*.pageHeader_notifySuffix"><![CDATA[</span></div>]]></format>
</NODE> </NODE>
</OBJECTS> </OBJECTS>
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
} }
</script> </script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="main-created-job"> <div class="main-created-job">
<h1 class="page-title created-job-title"> <h1 class="page-title created-job-title">
Congratulations! Your job has been created Congratulations! Your job has been created
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
%> %>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="container-fluid"> <div class="container-fluid">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="row content"> <div class="row content">
<div class="main-content-area"> <div class="main-content-area">
<h1 class="page-title">Edit Job</h1> <h1 class="page-title">Edit Job</h1>
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<oneit:dynIncluded> <oneit:dynIncluded>
<div class="dashboard-content-area" style="padding: 0px">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<div class="dashboard-content-area first-part"> <div class="dashboard-content-area first-part">
<oneit:dynInclude page="/extensions/adminportal/inc/job_title_bar.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/adminportal/inc/job_title_bar.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
...@@ -38,9 +38,8 @@ ...@@ -38,9 +38,8 @@
<a href="#" class="forgot-pass">Forgot password?</a> <a href="#" class="forgot-pass">Forgot password?</a>
<oneit:button value="Sign in" name="login" cssClass="box-btn login-btn" <oneit:button value="Sign in" name="login" cssClass="box-btn login-btn"
requestAttribs="<%= CollectionUtils.EMPTY_MAP%>"/> requestAttribs="<%= CollectionUtils.EMPTY_MAP%>"/>
<input name="LoginRedirectURL" type="hidden" value="/performa/AdminPortal-Home.htm">
</div> </div>
<div class="box-br-line"><span></span></div> <div class="box-br-line"><span></span></div>
<div class="box-label">Sign in using your social network of choice</div> <div class="box-label">Sign in using your social network of choice</div>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<%@ include file="/extensions/performa/inc/stdimports.jsp" %> <%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<oneit:dynIncluded> <oneit:dynIncluded>
<tagfile:saveNotification/>
<% oneit.servlets.jsp.FormInformation fi = oneit.servlets.jsp.FormJSP.getFormInformation (request); <% oneit.servlets.jsp.FormInformation fi = oneit.servlets.jsp.FormJSP.getFormInformation (request);
if (fi != null && fi.hasErrors ()) if (fi != null && fi.hasErrors ())
......
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