Skip to content

P
PERFORMA_REPLICA
Commit a00dd374 by Nilu
Options

update content of team members based on hiring team. 

Adding common hiring team select to header
parent 2c852b9a
Showing with 352 additions and 55 deletions
cmsWebApp/src/performa/form/SaveCompanyUserFP.java
...@@ -12,6 +12,11 @@ import oneit.utils.BusinessException; ...@@ -12,6 +12,11 @@ import oneit.utils.BusinessException;
import performa.orm.Company; import performa.orm.Company;
import performa.orm.CompanyUser; import performa.orm.CompanyUser;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.CollectionUtils;
import performa.orm.CompanyUserHiringTeamLink;
import performa.orm.HiringTeam;
public class SaveCompanyUserFP extends SaveFP public class SaveCompanyUserFP extends SaveFP
...@@ -20,15 +25,37 @@ public class SaveCompanyUserFP extends SaveFP ...@@ -20,15 +25,37 @@ public class SaveCompanyUserFP extends SaveFP
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{ {
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
HiringTeam hiringTeam = (HiringTeam) request.getAttribute("HiringTeam");
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser"); CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
Boolean disabled = (Boolean) request.getAttribute("disabled"); Boolean disabled = (Boolean) request.getAttribute("disabled");
Boolean remove = (Boolean) request.getAttribute("remove");
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP saving company user : ", companyUser ); LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP saving company user : ", companyUser );
companyUser.setIsDisabled(disabled); if(disabled != null)
{
companyUser.setIsDisabled(disabled);
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP setting is disabled : ", disabled , " for company user : ",companyUser ); LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP setting is disabled : ", disabled , " for company user : ",companyUser );
}
if(CollectionUtils.equals(remove, Boolean.TRUE))
{
CompanyUserHiringTeamLink[] links = CompanyUserHiringTeamLink.SearchByAll()
.andHiringTeam(new EqualsFilter<>(hiringTeam))
.andCompanyUser(new EqualsFilter<>(companyUser))
.search(objTran);
for (CompanyUserHiringTeamLink link: links)
{
link.delete();
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP removing link of company user : ", companyUser , " for hiring team : ",hiringTeam );
}
}
return super.processForm(process, submission, params); return super.processForm(process, submission, params);
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/form/SelectHiringTeamFP.java 0 → 100644
package performa.form;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.*;
import oneit.objstore.StorageException;
import oneit.servlets.forms.*;
import oneit.servlets.process.*;
import oneit.utils.BusinessException;
import performa.orm.*;
public class SelectHiringTeamFP extends ORMProcessFormProcessor
{
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
HttpServletRequest request = submission.getRequest();
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SelectHiringTeamFP for ", companyUser, " selected hiring team : ", companyUser.getSelectedTeam());
request.getSession().setAttribute("SelectedHiringTeam", companyUser.getSelectedTeam());
return RedisplayResult.getInstance();
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SendUserInvitationFP.java
...@@ -41,7 +41,6 @@ public class SendUserInvitationFP extends SaveFP ...@@ -41,7 +41,6 @@ public class SendUserInvitationFP extends SaveFP
{ {
BusinessObjectParser.assertFieldCondition(company.getUserEmail()!=null, company, Company.FIELD_UserEmail, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(company.getUserEmail()!=null, company, Company.FIELD_UserEmail, "mandatory", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(StringUtils.isEmailAddress(company.getUserEmail()), company, Company.FIELD_UserEmail, "invalidEmail", exceptions, true, request); BusinessObjectParser.assertFieldCondition(StringUtils.isEmailAddress(company.getUserEmail()), company, Company.FIELD_UserEmail, "invalidEmail", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), company.getUserEmail()), company, Company.FIELD_UserEmail, "emailExists", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(company.getRoleType()!=null, company, Company.FIELD_RoleType, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(company.getRoleType()!=null, company, Company.FIELD_RoleType, "mandatory", exceptions, true, request);
} }
...@@ -56,6 +55,7 @@ public class SendUserInvitationFP extends SaveFP ...@@ -56,6 +55,7 @@ public class SendUserInvitationFP extends SaveFP
ObjectTransaction objTran = process.getTransaction(); ObjectTransaction objTran = process.getTransaction();
Company company = (Company) process.getAttribute("Company"); Company company = (Company) process.getAttribute("Company");
CompanyUser resendUser = (CompanyUser) request.getAttribute("ResendUser"); CompanyUser resendUser = (CompanyUser) request.getAttribute("ResendUser");
HiringTeam hiringTeam = (HiringTeam) request.getAttribute("HiringTeam");
if(resendUser!=null) if(resendUser!=null)
{ {
...@@ -78,20 +78,31 @@ public class SendUserInvitationFP extends SaveFP ...@@ -78,20 +78,31 @@ public class SendUserInvitationFP extends SaveFP
secUser.setUserName(company.getUserEmail().toLowerCase()); secUser.setUserName(company.getUserEmail().toLowerCase());
} }
CompanyUser newComUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser); CompanyUser comUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
secUser.setEmail(secUser.getUserName()); if(comUser == null)
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD); {
secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran)); comUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
secUser.setFirstName(company.getFirstName());
secUser.setLastName(company.getLastName()); secUser.setEmail(secUser.getUserName());
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
newComUser.setCompany(company); secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
newComUser.setRole(company.getRoleType()); secUser.setFirstName(company.getFirstName());
secUser.setLastName(company.getLastName());
comUser.setDefaultHiringTeam(hiringTeam);
comUser.setCompany(company);
}
CompanyUserHiringTeamLink link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
link.setCompanyUser(comUser);
link.setHiringTeam(hiringTeam);
comUser.setRole(company.getRoleType());
LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
sendInvitationMail(newComUser, request, objTran); sendInvitationMail(comUser, request, objTran);
LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", secUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", secUser);
} }
......
cmsWebApp/src/performa/orm/BaseCompanyUser.java
...@@ -55,6 +55,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -55,6 +55,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
public static final String FIELD_Email = "Email"; public static final String FIELD_Email = "Email";
public static final String FIELD_Password = "Password"; public static final String FIELD_Password = "Password";
public static final String FIELD_ConfirmPassword = "ConfirmPassword"; public static final String FIELD_ConfirmPassword = "ConfirmPassword";
public static final String SINGLEREFERENCE_SelectedTeam = "SelectedTeam";
public static final String SINGLEREFERENCE_Company = "Company"; public static final String SINGLEREFERENCE_Company = "Company";
public static final String BACKREF_Company = ""; public static final String BACKREF_Company = "";
public static final String SINGLEREFERENCE_DefaultHiringTeam = "DefaultHiringTeam"; public static final String SINGLEREFERENCE_DefaultHiringTeam = "DefaultHiringTeam";
...@@ -100,6 +101,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -100,6 +101,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
// Private attributes corresponding to single references // Private attributes corresponding to single references
private SingleAssociation<CompanyUser, HiringTeam> _SelectedTeam;
private SingleAssociation<CompanyUser, Company> _Company; private SingleAssociation<CompanyUser, Company> _Company;
private SingleAssociation<CompanyUser, HiringTeam> _DefaultHiringTeam; private SingleAssociation<CompanyUser, HiringTeam> _DefaultHiringTeam;
...@@ -141,6 +143,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -141,6 +143,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping")); Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping"));
setupAssocMetaData_HiringTeams(); setupAssocMetaData_HiringTeams();
setupAssocMetaData_SelectedTeam();
setupAssocMetaData_Company(); setupAssocMetaData_Company();
setupAssocMetaData_DefaultHiringTeam(); setupAssocMetaData_DefaultHiringTeam();
FIELD_Email_Validators = (AttributeValidator[])setupAttribMetaData_Email(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Email_Validators = (AttributeValidator[])setupAttribMetaData_Email(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -185,6 +188,19 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -185,6 +188,19 @@ public abstract class BaseCompanyUser extends SecUserExtension
// Meta Info setup // Meta Info setup
private static void setupAssocMetaData_SelectedTeam()
{
Map metaInfo = new HashMap ();
metaInfo.put ("name", "SelectedTeam");
metaInfo.put ("type", "HiringTeam");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for CompanyUser.SelectedTeam:", metaInfo);
ATTRIBUTES_METADATA_CompanyUser.put (SINGLEREFERENCE_SelectedTeam, Collections.unmodifiableMap (metaInfo));
}
// Meta Info setup
private static void setupAssocMetaData_Company() private static void setupAssocMetaData_Company()
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -505,6 +521,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -505,6 +521,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
super._initialiseAssociations (); super._initialiseAssociations ();
_SelectedTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_SelectedTeam, null, HiringTeam.REFERENCE_HiringTeam, "");
_Company = new SingleAssociation<CompanyUser, Company> (this, SINGLEREFERENCE_Company, Company.MULTIPLEREFERENCE_Users, Company.REFERENCE_Company, "oneit_sec_user_extension"); _Company = new SingleAssociation<CompanyUser, Company> (this, SINGLEREFERENCE_Company, Company.MULTIPLEREFERENCE_Users, Company.REFERENCE_Company, "oneit_sec_user_extension");
_DefaultHiringTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_DefaultHiringTeam, null, HiringTeam.REFERENCE_HiringTeam, "oneit_sec_user_extension"); _DefaultHiringTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_DefaultHiringTeam, null, HiringTeam.REFERENCE_HiringTeam, "oneit_sec_user_extension");
_HiringTeams = new MultipleAssociation<CompanyUser, CompanyUserHiringTeamLink> (this, MULTIPLEREFERENCE_HiringTeams, CompanyUserHiringTeamLink.SINGLEREFERENCE_CompanyUser, CompanyUserHiringTeamLink.REFERENCE_CompanyUserHiringTeamLink); _HiringTeams = new MultipleAssociation<CompanyUser, CompanyUserHiringTeamLink> (this, MULTIPLEREFERENCE_HiringTeams, CompanyUserHiringTeamLink.SINGLEREFERENCE_CompanyUser, CompanyUserHiringTeamLink.REFERENCE_CompanyUserHiringTeamLink);
...@@ -517,6 +534,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -517,6 +534,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
super.initialiseReference (); super.initialiseReference ();
_SelectedTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_SelectedTeam, null, HiringTeam.REFERENCE_HiringTeam, "");
_Company = new SingleAssociation<CompanyUser, Company> (this, SINGLEREFERENCE_Company, Company.MULTIPLEREFERENCE_Users, Company.REFERENCE_Company, "oneit_sec_user_extension"); _Company = new SingleAssociation<CompanyUser, Company> (this, SINGLEREFERENCE_Company, Company.MULTIPLEREFERENCE_Users, Company.REFERENCE_Company, "oneit_sec_user_extension");
_DefaultHiringTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_DefaultHiringTeam, null, HiringTeam.REFERENCE_HiringTeam, "oneit_sec_user_extension"); _DefaultHiringTeam = new SingleAssociation<CompanyUser, HiringTeam> (this, SINGLEREFERENCE_DefaultHiringTeam, null, HiringTeam.REFERENCE_HiringTeam, "oneit_sec_user_extension");
_HiringTeams = new MultipleAssociation<CompanyUser, CompanyUserHiringTeamLink> (this, MULTIPLEREFERENCE_HiringTeams, CompanyUserHiringTeamLink.SINGLEREFERENCE_CompanyUser, CompanyUserHiringTeamLink.REFERENCE_CompanyUserHiringTeamLink); _HiringTeams = new MultipleAssociation<CompanyUser, CompanyUserHiringTeamLink> (this, MULTIPLEREFERENCE_HiringTeams, CompanyUserHiringTeamLink.SINGLEREFERENCE_CompanyUser, CompanyUserHiringTeamLink.REFERENCE_CompanyUserHiringTeamLink);
...@@ -1811,6 +1829,8 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1811,6 +1829,8 @@ public abstract class BaseCompanyUser extends SecUserExtension
List result = super.getSingleAssocs (); List result = super.getSingleAssocs ();
result.add("SelectedTeam");
result.add("Company"); result.add("Company");
result.add("DefaultHiringTeam"); result.add("DefaultHiringTeam");
...@@ -1826,7 +1846,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1826,7 +1846,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
throw new RuntimeException ("Game over == null!"); throw new RuntimeException ("Game over == null!");
} }
else if (assocName.equals (SINGLEREFERENCE_Company)) else if (assocName.equals (SINGLEREFERENCE_SelectedTeam))
{
return _SelectedTeam.getReferencedType ();
}else if (assocName.equals (SINGLEREFERENCE_Company))
{ {
return _Company.getReferencedType (); return _Company.getReferencedType ();
}else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam)) }else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam))
...@@ -1866,7 +1889,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1866,7 +1889,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
throw new RuntimeException ("Game over == null!"); throw new RuntimeException ("Game over == null!");
} }
else if (assocName.equals (SINGLEREFERENCE_Company)) else if (assocName.equals (SINGLEREFERENCE_SelectedTeam))
{
return getSelectedTeam ();
}else if (assocName.equals (SINGLEREFERENCE_Company))
{ {
return getCompany (); return getCompany ();
}else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam)) }else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam))
...@@ -1886,7 +1912,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1886,7 +1912,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
throw new RuntimeException ("Game over == null!"); throw new RuntimeException ("Game over == null!");
} }
else if (assocName.equals (SINGLEREFERENCE_Company)) else if (assocName.equals (SINGLEREFERENCE_SelectedTeam))
{
return getSelectedTeam (getType);
}else if (assocName.equals (SINGLEREFERENCE_Company))
{ {
return getCompany (getType); return getCompany (getType);
}else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam)) }else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam))
...@@ -1906,7 +1935,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1906,7 +1935,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
throw new RuntimeException ("Game over == null!"); throw new RuntimeException ("Game over == null!");
} }
else if (assocName.equals (SINGLEREFERENCE_Company)) else if (assocName.equals (SINGLEREFERENCE_SelectedTeam))
{
return getSelectedTeamID ();
}else if (assocName.equals (SINGLEREFERENCE_Company))
{ {
return getCompanyID (); return getCompanyID ();
}else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam)) }else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam))
...@@ -1926,7 +1958,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1926,7 +1958,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
throw new RuntimeException ("Game over == null!"); throw new RuntimeException ("Game over == null!");
} }
else if (assocName.equals (SINGLEREFERENCE_Company)) else if (assocName.equals (SINGLEREFERENCE_SelectedTeam))
{
setSelectedTeam ((HiringTeam)(newValue));
}else if (assocName.equals (SINGLEREFERENCE_Company))
{ {
setCompany ((Company)(newValue)); setCompany ((Company)(newValue));
}else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam)) }else if (assocName.equals (SINGLEREFERENCE_DefaultHiringTeam))
...@@ -1942,6 +1977,100 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -1942,6 +1977,100 @@ public abstract class BaseCompanyUser extends SecUserExtension
/** /**
* Get the reference SelectedTeam
*/
public HiringTeam getSelectedTeam () throws StorageException
{
assertValid();
try
{
return (HiringTeam)(_SelectedTeam.get ());
}
catch (ClassCastException e)
{
LogMgr.log (BUSINESS_OBJECTS, LogLevel.SYSTEMERROR2, "Cache collision in CompanyUser:", this.getObjectID (), ", was trying to get HiringTeam:", getSelectedTeamID ());
LogMgr.log (BUSINESS_OBJECTS, LogLevel.SYSTEMERROR2, "Instead I got:", _SelectedTeam.get ().getClass ());
throw e;
}
}
/**
* Get the object id for the referenced object. Does not force a DB access.
*/
public HiringTeam getSelectedTeam (Get getType) throws StorageException
{
assertValid();
return _SelectedTeam.get(getType);
}
/**
* Get the object id for the referenced object. Does not force a DB access.
*/
public Long getSelectedTeamID ()
{
assertValid();
if (_SelectedTeam == null)
{
return null;
}
else
{
return _SelectedTeam.getID ();
}
}
/**
* Called prior to the assoc changing. Subclasses need not call super. If a field exception
* is thrown, the attribute change will fail. The new value is different to the old value.
*/
protected void preSelectedTeamChange (HiringTeam newSelectedTeam) throws FieldException
{
}
/**
* Called after the assoc changes.
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postSelectedTeamChange () throws FieldException
{
}
public FieldWriteability getWriteability_SelectedTeam ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the reference SelectedTeam. Checks to ensure a new value
* has been supplied. If so, marks the reference as altered and sets it.
*/
public void setSelectedTeam (HiringTeam newSelectedTeam) throws StorageException, FieldException
{
if (_SelectedTeam.wouldReferencedChange (newSelectedTeam))
{
assertValid();
Debug.assertion (getWriteability_SelectedTeam () != FieldWriteability.FALSE, "Assoc SelectedTeam is not writeable");
preSelectedTeamChange (newSelectedTeam);
_SelectedTeam.set (newSelectedTeam);
postSelectedTeamChange ();
}
}
/**
* Get the reference Company * Get the reference Company
*/ */
public Company getCompany () throws StorageException public Company getCompany () throws StorageException
...@@ -2623,6 +2752,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2623,6 +2752,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
BaseCompanyUser sourceCompanyUser = (BaseCompanyUser)(source); BaseCompanyUser sourceCompanyUser = (BaseCompanyUser)(source);
_SelectedTeam.copyFrom (sourceCompanyUser._SelectedTeam, linkToGhosts);
_Company.copyFrom (sourceCompanyUser._Company, linkToGhosts); _Company.copyFrom (sourceCompanyUser._Company, linkToGhosts);
_DefaultHiringTeam.copyFrom (sourceCompanyUser._DefaultHiringTeam, linkToGhosts); _DefaultHiringTeam.copyFrom (sourceCompanyUser._DefaultHiringTeam, linkToGhosts);
...@@ -2675,6 +2805,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2675,6 +2805,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
_Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); // _Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
_Password = (String)(HELPER_Password.readExternal (_Password, vals.get(FIELD_Password))); // _Password = (String)(HELPER_Password.readExternal (_Password, vals.get(FIELD_Password))); //
_ConfirmPassword = (String)(HELPER_ConfirmPassword.readExternal (_ConfirmPassword, vals.get(FIELD_ConfirmPassword))); // _ConfirmPassword = (String)(HELPER_ConfirmPassword.readExternal (_ConfirmPassword, vals.get(FIELD_ConfirmPassword))); //
_SelectedTeam.readExternalData(vals.get(SINGLEREFERENCE_SelectedTeam));
_Company.readExternalData(vals.get(SINGLEREFERENCE_Company)); _Company.readExternalData(vals.get(SINGLEREFERENCE_Company));
_DefaultHiringTeam.readExternalData(vals.get(SINGLEREFERENCE_DefaultHiringTeam)); _DefaultHiringTeam.readExternalData(vals.get(SINGLEREFERENCE_DefaultHiringTeam));
_HiringTeams.readExternalData(vals.get(MULTIPLEREFERENCE_HiringTeams)); _HiringTeams.readExternalData(vals.get(MULTIPLEREFERENCE_HiringTeams));
...@@ -2702,6 +2833,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2702,6 +2833,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email)); vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
vals.put (FIELD_Password, HELPER_Password.writeExternal (_Password)); vals.put (FIELD_Password, HELPER_Password.writeExternal (_Password));
vals.put (FIELD_ConfirmPassword, HELPER_ConfirmPassword.writeExternal (_ConfirmPassword)); vals.put (FIELD_ConfirmPassword, HELPER_ConfirmPassword.writeExternal (_ConfirmPassword));
vals.put (SINGLEREFERENCE_SelectedTeam, _SelectedTeam.writeExternalData());
vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData()); vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData());
vals.put (SINGLEREFERENCE_DefaultHiringTeam, _DefaultHiringTeam.writeExternalData()); vals.put (SINGLEREFERENCE_DefaultHiringTeam, _DefaultHiringTeam.writeExternalData());
vals.put (MULTIPLEREFERENCE_HiringTeams, _HiringTeams.writeExternalData()); vals.put (MULTIPLEREFERENCE_HiringTeams, _HiringTeams.writeExternalData());
...@@ -2760,6 +2892,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2760,6 +2892,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
} }
// Compare single assocs // Compare single assocs
_SelectedTeam.compare (otherCompanyUser._SelectedTeam, listener);
_Company.compare (otherCompanyUser._Company, listener); _Company.compare (otherCompanyUser._Company, listener);
_DefaultHiringTeam.compare (otherCompanyUser._DefaultHiringTeam, listener); _DefaultHiringTeam.compare (otherCompanyUser._DefaultHiringTeam, listener);
...@@ -2796,6 +2929,7 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2796,6 +2929,7 @@ public abstract class BaseCompanyUser extends SecUserExtension
visitor.visitField(this, FIELD_IsAccountVerified, HELPER_IsAccountVerified.toObject(getIsAccountVerified())); visitor.visitField(this, FIELD_IsAccountVerified, HELPER_IsAccountVerified.toObject(getIsAccountVerified()));
visitor.visitField(this, FIELD_IsEmailChanged, HELPER_IsEmailChanged.toObject(getIsEmailChanged())); visitor.visitField(this, FIELD_IsEmailChanged, HELPER_IsEmailChanged.toObject(getIsEmailChanged()));
visitor.visitField(this, FIELD_IsDisabled, HELPER_IsDisabled.toObject(getIsDisabled())); visitor.visitField(this, FIELD_IsDisabled, HELPER_IsDisabled.toObject(getIsDisabled()));
visitor.visitAssociation (_SelectedTeam);
visitor.visitAssociation (_Company); visitor.visitAssociation (_Company);
visitor.visitAssociation (_DefaultHiringTeam); visitor.visitAssociation (_DefaultHiringTeam);
visitor.visitAssociation (_HiringTeams); visitor.visitAssociation (_HiringTeams);
...@@ -2807,6 +2941,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -2807,6 +2941,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
super.visitAssociations (visitor, scope); super.visitAssociations (visitor, scope);
if (scope.includes (_SelectedTeam))
{
visitor.visit (_SelectedTeam);
}
if (scope.includes (_Company)) if (scope.includes (_Company))
{ {
visitor.visit (_Company); visitor.visit (_Company);
...@@ -3579,6 +3717,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -3579,6 +3717,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
return getWriteability_ConfirmPassword (); return getWriteability_ConfirmPassword ();
} }
else if (fieldName.equals (SINGLEREFERENCE_SelectedTeam))
{
return getWriteability_SelectedTeam ();
}
else else
{ {
return super.getWriteable (fieldName); return super.getWriteable (fieldName);
...@@ -4028,6 +4170,10 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -4028,6 +4170,10 @@ public abstract class BaseCompanyUser extends SecUserExtension
{ {
return toConfirmPassword (); return toConfirmPassword ();
} }
if (name.equals ("SelectedTeam"))
{
return toSelectedTeam ();
}
if (name.equals ("ForgotPasswordMailSendDate")) if (name.equals ("ForgotPasswordMailSendDate"))
{ {
return toForgotPasswordMailSendDate (); return toForgotPasswordMailSendDate ();
...@@ -4107,6 +4253,12 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -4107,6 +4253,12 @@ public abstract class BaseCompanyUser extends SecUserExtension
public PipeLine<From, Boolean> toIsEmailChanged () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsEmailChanged)); } public PipeLine<From, Boolean> toIsEmailChanged () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsEmailChanged)); }
public PipeLine<From, Boolean> toIsDisabled () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsDisabled)); } public PipeLine<From, Boolean> toIsDisabled () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsDisabled)); }
public HiringTeam.HiringTeamPipeLineFactory<From, HiringTeam> toSelectedTeam () { return toSelectedTeam (Filter.ALL); }
public HiringTeam.HiringTeamPipeLineFactory<From, HiringTeam> toSelectedTeam (Filter<HiringTeam> filter)
{
return HiringTeam.REFERENCE_HiringTeam.new HiringTeamPipeLineFactory<From, HiringTeam> (this, new ORMSingleAssocPipe<Me, HiringTeam>(SINGLEREFERENCE_SelectedTeam, filter));
}
public Company.CompanyPipeLineFactory<From, Company> toCompany () { return toCompany (Filter.ALL); } public Company.CompanyPipeLineFactory<From, Company> toCompany () { return toCompany (Filter.ALL); }
public Company.CompanyPipeLineFactory<From, Company> toCompany (Filter<Company> filter) public Company.CompanyPipeLineFactory<From, Company> toCompany (Filter<Company> filter)
...@@ -4153,6 +4305,11 @@ public abstract class BaseCompanyUser extends SecUserExtension ...@@ -4153,6 +4305,11 @@ public abstract class BaseCompanyUser extends SecUserExtension
public boolean isTransientSingleReference(String assocName) public boolean isTransientSingleReference(String assocName)
{ {
if(CollectionUtils.equals(assocName, "SelectedTeam"))
{
return true;
}
return super.isTransientSingleReference(assocName); return super.isTransientSingleReference(assocName);
} }
...@@ -4171,6 +4328,20 @@ class DummyCompanyUser extends CompanyUser ...@@ -4171,6 +4328,20 @@ class DummyCompanyUser extends CompanyUser
} }
public HiringTeam getSelectedTeam () throws StorageException
{
return (HiringTeam)(HiringTeam.DUMMY_HiringTeam);
}
/**
* Get the object id for the referenced object. Does not force a DB access.
*/
public Long getSelectedTeamID ()
{
return HiringTeam.DUMMY_HiringTeam.getObjectID();
}
public Company getCompany () throws StorageException public Company getCompany () throws StorageException
{ {
return (Company)(Company.DUMMY_Company); return (Company)(Company.DUMMY_Company);
......
cmsWebApp/src/performa/orm/CompanyUser.java
...@@ -185,4 +185,17 @@ public class CompanyUser extends BaseCompanyUser ...@@ -185,4 +185,17 @@ public class CompanyUser extends BaseCompanyUser
{ {
return CollectionUtils.equals(getCompany().getAddedByUser(), this); return CollectionUtils.equals(getCompany().getAddedByUser(), this);
} }
public HiringTeam getActiveHiringTeam()
{
return getSelectedTeam() != null ? getSelectedTeam() : getDefaultHiringTeam();
}
@Override
public HiringTeam getSelectedTeam() throws StorageException
{
return super.getSelectedTeam() == null ? getDefaultHiringTeam() : super.getSelectedTeam();
}
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/CompanyUser.xml
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<TRANSIENT name="Password" type="String"/> <TRANSIENT name="Password" type="String"/>
<TRANSIENT name="ConfirmPassword" type="String"/> <TRANSIENT name="ConfirmPassword" type="String"/>
<TRANSIENTSINGLE name="SelectedTeam" type="HiringTeam" />
<TABLE name="oneit_sec_user_extension" tablePrefix="object" polymorphic="TRUE"> <TABLE name="oneit_sec_user_extension" tablePrefix="object" polymorphic="TRUE">
<ATTRIB name="ForgotPasswordMailSendDate" type="Date" dbcol="forgot_password_mail_send_date" /> <ATTRIB name="ForgotPasswordMailSendDate" type="Date" dbcol="forgot_password_mail_send_date" />
......
cmsWebApp/webroot/css/common.css
...@@ -620,6 +620,8 @@ span.select2-selection.select2-selection--single:focus{ ...@@ -620,6 +620,8 @@ span.select2-selection.select2-selection--single:focus{
} }
.wider-select .select2-container {width: 100% !important;} .wider-select .select2-container {width: 100% !important;}
.header-select{ margin:10px 20px;}
.header-select .select2-container {width: 40% !important;}
.select2-container option{ .select2-container option{
margin: 12px 15px; margin: 12px 15px;
......
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<FORM name="*.replaceCard" factory="Participant" class="performa.form.ReplaceCardFP"/> <FORM name="*.replaceCard" factory="Participant" class="performa.form.ReplaceCardFP"/>
<FORM name="*.addHiringTeam" factory="Participant" class="performa.form.AddHiringTeamFP"/> <FORM name="*.addHiringTeam" factory="Participant" class="performa.form.AddHiringTeamFP"/>
<FORM name="*.saveCompanyUser" factory="Participant" class="performa.form.SaveCompanyUserFP"/> <FORM name="*.saveCompanyUser" factory="Participant" class="performa.form.SaveCompanyUserFP"/>
<FORM name="*.selectHiringTeam" factory="Participant" class="performa.form.SelectHiringTeamFP"/>
</NODE> </NODE>
<NODE name="job_assessment_criteria_add_jsp" factory="Participant"> <NODE name="job_assessment_criteria_add_jsp" factory="Participant">
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
$(".switch input[type='checkbox']").change(function() { $(".switch input[type='checkbox']").change(function() {
$("button[name$='changeAssessmentCriteria']").click(); $("button[name$='changeAssessmentCriteria']").click();
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<script> <script>
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editClient"), {'recalcOnError':true});
$("#upload").change(function(){ $("#upload").change(function(){
readURL(this); readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("forgotPassword"), {'recalcOnError':true});
$('input[type="text"]').keyup(function() { $('input[type="text"]').keyup(function() {
$(this).change(); $(this).change();
......
cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("listHiringTeams"), {'recalcOnError':true});
}); });
</script> </script>
......
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
...@@ -7,7 +7,14 @@ ...@@ -7,7 +7,14 @@
<% <%
Company company = clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null Company company = clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null
? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null; ? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null;
CompanyUser companyUser = clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
User intercomUser = (User)session.getAttribute("IntercomUser"); User intercomUser = (User)session.getAttribute("IntercomUser");
HiringTeam selectedTeam = (HiringTeam) session.getAttribute("SelectedHiringTeam");
if(selectedTeam != null && companyUser != null)
{
companyUser.setSelectedTeam(selectedTeam.getInTransaction(objTran));
}
if(intercomUser == null) if(intercomUser == null)
{ {
...@@ -70,15 +77,44 @@ ...@@ -70,15 +77,44 @@
} }
%> %>
<header> <header>
<oneit:form name="headerForm" method="post" enctype="multipart/form-data">
<script type="text/javascript">
$(document).ready(function()
{
$('select[name$=SelectedTeam]').change(function()
{
$('.change-hiring-team').click();
});
});
</script>
<div class="container-fluid"> <div class="container-fluid">
<div class="row" style="background-color: #ffffff;"> <div class="row" style="background-color: #ffffff;">
<div class="site-logo"> <div class="site-logo">
<a href="<%= homeUrl %>"><img src="images/logo.svg"></a> <a href="<%= homeUrl %>"><img src="images/logo.svg"></a>
</div> </div>
<div class="search-bar" style="display: none;"> <div class="search-bar">
<%
if(companyUser != null)
{
%>
<div class="header-select">
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="SelectedTeam" options="<%= company.getHiringTeamsSet().toArray(new HiringTeam[0]) %>"
cssClass="selected-team"/>
</div>
<%
}
%>
<oneit:button name="selectHiringTeam" value="Save" cssClass="change-hiring-team hidden"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
// .mapEntry("nextPage", currentPage)
.toMap() %>" />
<%--
<div class="inset-shadow"></div> <div class="inset-shadow"></div>
<img src="images/search-icon.svg"/> <img src="images/search-icon.svg"/>
<input type="text" class="form-control" placeholder="<%= company.showHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/> <input type="text" class="form-control" placeholder="<%= company.showHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/>
--%>
</div> </div>
<div class="fl-right"> <div class="fl-right">
<div class="notification-bar"> <div class="notification-bar">
...@@ -117,6 +153,7 @@ ...@@ -117,6 +153,7 @@
</div> </div>
</div> </div>
</div> </div>
</oneit:form>
</header> </header>
<script type="text/javascript"> <script type="text/javascript">
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%> %>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
setupRecalc ($("form"), {'recalcOnError':true}); setupRecalc ($("editJob"), {'recalcOnError':true});
}); });
</script> </script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
......
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
addPostRecalcHandler(function ($fieldThatChanged) { addPostRecalcHandler(function ($fieldThatChanged) {
if (! $fieldThatChanged) { if (! $fieldThatChanged) {
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
$("#upload").change(function(){ $("#upload").change(function(){
readURL(this); readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
...@@ -14,27 +14,20 @@ ...@@ -14,27 +14,20 @@
SecUser secUser = SecUser.getTXUser(objTran); SecUser secUser = SecUser.getTXUser(objTran);
Company company = (Company) process.getAttribute("Company"); Company company = (Company) process.getAttribute("Company");
CompanyUser comUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser comUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = comUser.getActiveHiringTeam();
UserSortOption userSortOpt = (UserSortOption) process.getAttribute("UserSortOption"); UserSortOption userSortOpt = (UserSortOption) process.getAttribute("UserSortOption");
Collection companyUsers = (Collection<CompanyUser>) process.getAttribute("CompanyUsers"); Set<CompanyUser> allUsers = CompanyUserHiringTeamLink.pipesCompanyUserHiringTeamLink(hiringTeam.getUsersSet()).toCompanyUser().uniqueVals();
Collection pendingUsers = (Collection<CompanyUser>) process.getAttribute("PendingUsers"); Collection companyUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
Collection disabledUsers = (Collection<CompanyUser>) process.getAttribute("DisabledUsers"); Collection pendingUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
Collection disabledUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
Debug.assertion(hiringTeam != null, "Hiring Team is null in admin portal Manage Teammates");
if(company == null) if(company == null)
{ {
company = comUser.getCompany(); company = comUser.getCompany();
process.setAttribute("Company", company); process.setAttribute("Company", company);
} }
if(companyUsers == null || pendingUsers == null || disabledUsers == null)
{
companyUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
pendingUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
disabledUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
process.setAttribute("CompanyUsers", companyUsers);
process.setAttribute("PendingUsers", pendingUsers);
process.setAttribute("DisabledUsers", disabledUsers);
}
if( request.getParameter("UserSortOption") != null) if( request.getParameter("UserSortOption") != null)
{ {
...@@ -58,7 +51,7 @@ ...@@ -58,7 +51,7 @@
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("listUsers"), {'recalcOnError':true});
$(".user-role").change(function() $(".user-role").change(function()
{ {
...@@ -133,6 +126,8 @@ ...@@ -133,6 +126,8 @@
</div> </div>
</div> </div>
<div class="main-manage-userlist"> <div class="main-manage-userlist">
<% <%
for(CompanyUser companyUser : sortedCompanyUsers) for(CompanyUser companyUser : sortedCompanyUsers)
{ {
...@@ -140,7 +135,16 @@ ...@@ -140,7 +135,16 @@
%> %>
<div class="user-list-row" id="<%= companyUser.getID() %>"> <div class="user-list-row" id="<%= companyUser.getID() %>">
<div class="m-user-left"> <div class="m-user-left">
<div class="remove-icon">_</div> <oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>">
<oneit:button value=" " name="saveCompanyUser" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("remove", Boolean.TRUE)
.mapEntry("CompanyUser", companyUser)
.mapEntry("HiringTeam", hiringTeam)
.toMap() %>">
<div class="remove-icon">_</div>
</oneit:button>
</oneit:recalcClass>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div> <div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-info"> <div class="m-user-info">
<div class="m-user-name"> <div class="m-user-name">
...@@ -169,7 +173,6 @@ ...@@ -169,7 +173,6 @@
<div class="m-user-right"> <div class="m-user-right">
<oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/> <oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
</div> </div>
<oneit:button name="save" value="Save" cssClass="<%= "save-user" + companyUser.getID().toString() + " hidden"%>" <oneit:button name="save" value="Save" cssClass="<%= "save-user" + companyUser.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser).mapEntry("nextPage", usersPage + "&UserSortOption=" + userSortOpt).toMap() %>" /> requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser).mapEntry("nextPage", usersPage + "&UserSortOption=" + userSortOpt).toMap() %>" />
...@@ -223,6 +226,7 @@ ...@@ -223,6 +226,7 @@
<oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link" <oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("ResendUser", pendingUser) .mapEntry ("ResendUser", pendingUser)
.mapEntry ("HiringTeam", hiringTeam)
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent") .mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.toMap() %>" /> .toMap() %>" />
</div> </div>
...@@ -290,10 +294,6 @@ ...@@ -290,10 +294,6 @@
<label><oneit:label GUIName="Role" /></label> <label><oneit:label GUIName="Role" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/> <oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/>
</div> </div>
<div class="form-group">
<label><oneit:label GUIName="Add to multiple hiring teams" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/>
</div>
<div class="correctEmail" > <div class="correctEmail" >
<oneit:recalc mode="Boolean" script="company.isEmailCorrect()" company="<%= company %>" /> <oneit:recalc mode="Boolean" script="company.isEmailCorrect()" company="<%= company %>" />
</div> </div>
...@@ -301,6 +301,7 @@ ...@@ -301,6 +301,7 @@
<oneit:button value="Invite" name="sendUserInvites" cssClass="btn btn-invite" <oneit:button value="Invite" name="sendUserInvites" cssClass="btn btn-invite"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("restartProcess", Boolean.TRUE) .mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("HiringTeam", hiringTeam)
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent") .mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.toMap() %>" /> .toMap() %>" />
</oneit:recalcClass> </oneit:recalcClass>
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
$("#upload").change(function(){ $("#upload").change(function(){
readURL(this); readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/my_details.jsp
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= Utils.getHiringTeamsByUser(companyUser) %>"/> <tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= Utils.getHiringTeamsByUser(companyUser) %>"/>
</div> </div>
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= companyUser.getCompany().getHiringTeamsSet().toArray(new HiringTeam[0]) %>"/>
</div> </div>
<div class="text-center form-group"> <div class="text-center form-group">
<oneit:button value="Save Updates" name="saveUserDetails" cssClass="btn btn-primary largeBtn" <oneit:button value="Save Updates" name="saveUserDetails" cssClass="btn btn-primary largeBtn"
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
}); });
</script> </script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
] ]
}); });
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
}); });
</script> </script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
}); });
</script> </script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
] ]
}); });
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
}); });
</script> </script>
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
$(document).ready(function(){ $(document).ready(function(){
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
$(".importance_radio").change(function(){ $(".importance_radio").change(function(){
enableElementRating(this); enableElementRating(this);
......
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