this.comment = comment;
}
- @Override
- public String getControllerType () {
- return "general"; //NOI18N
- }
-
- @Override
- @Deprecated
- public void setControllerType (final String controllerType) {
- throw new UnsupportedOperationException("Setting controller type is not supported."); //NOI18N
- }
-
/**
* Getter for country instance
* <p>
*/
Contact createContactInstance ();
- /**
- * Getter for controller type
- * <p>
- * @return controller type
- */
- String getControllerType ();
-
- /**
- * Setter for controller type
- * <p>
- * @param controllerType Controller type
- * <p>
- * @deprecated Don't use this method.
- */
- @Deprecated
- void setControllerType (final String controllerType);
-
/**
* Checks whether contact instance's email address is used
* <p>
}
/**
- * Returns an array of all profile modes <p <p>
- * @
- *
- *
- * return An array of all profile modes
+ * Returns an array of all profile modes
+ * <p>
+ * @return An array of all profile modes
*/
public ProfileMode[] getProfileModes () {
return ProfileMode.values();
public UserAccountStatus[] getUserAccountStatuses () {
return UserAccountStatus.values();
}
+
}
// Is basic company data set?
if (basicData instanceof BasicData) {
// Short or long name?
- if (useShortName) {
+ if (useShortName || basicData.getCompanyName() == null) {
// Add company's long name
sb.append(basicData.getCompanyShortName()); //NOI18N
} else {
// Has a matching locale
if (null == newLocale) {
// Throw NPE
- throw new NullPointerException("this.localeCode=" + this.getLocaleCode() + " cannot be found."); //NOI18N
+ throw new NullPointerException(MessageFormat.format("this.localeCode={0} cannot be found.", this.getLocaleCode())); //NOI18N
}
// Then change it
}
@Override
- public String formatCurrency (final Float amount) {
+ public String formatFloatNumber (final Float amount) {
+ // Is parameter valid?
+ if (null == amount) {
+ // Throw NPE
+ throw new NullPointerException("amount is null"); //NOI18N
+ }
+
// Format amount
return NUMBER_FORMAT.format(amount);
}
* <p>
* @return Formatted string
*/
- String formatCurrency (final Float amount);
+ String formatFloatNumber (final Float amount);
/**
* Getter for locale
* Default constructor
*/
public JobsEmailAddressValidator () {
+ // Set allowEmpty to FALSE by default
this.allowEmptyRequiredData = Boolean.FALSE;
}
@Override
public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // Validate parameter
+ if (null == context) {
+ // Throw NPE
+ throw new NullPointerException("Parameter context is null"); //NOI18N
+ } else if (null == component) {
+ // Throw NPE again
+ throw new NullPointerException("Parameter component is null"); //NOI18N
+ } else if (null == this.allowEmptyRequiredData) {
+ // Should not be NULL
+ throw new IllegalStateException("this.allowEmptyRequiredData was set to null, this should not happen."); //NOI18N
+ }
+
// The required field
final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
*/
private static final long serialVersionUID = 187_536_745_607_195L;
- /**
- * Whether empty data is allowed
- */
- private Boolean allowEmptyRequiredData;
-
- /**
- * Default constructor
- */
- public JobsBasicDataEmailAddressValidator () {
- this.allowEmptyRequiredData = Boolean.FALSE;
- }
-
- /**
- * Setter for allowEmptyRequiredData flag
- * <p>
- * @param allowEmptyRequiredData Whether empty values are allowed
- */
- public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
- this.allowEmptyRequiredData = allowEmptyRequiredData;
- }
-
@Override
public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // Validate parameter
+ if (null == context) {
+ // Throw NPE
+ throw new NullPointerException("Parameter context is null"); //NOI18N
+ } else if (null == component) {
+ // Throw NPE again
+ throw new NullPointerException("Parameter component is null"); //NOI18N
+ }
+
// The required field
final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
// Pre-validation (example: not null, not a string, empty string ...)
- super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+ super.preValidate(context, component, value, requiredFields, Boolean.TRUE);
// Is the email address empty and allowed?
- if (null == value && this.allowEmptyRequiredData) {
+ if (null == value) {
// Then accept this here
return;
- } else if (null == value) {
- // Abort here
- throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
}
// Get string from object ... ;-)
*/
private static final long serialVersionUID = 187_536_745_607_195L;
- /**
- * Whether empty data is allowed
- */
- private Boolean allowEmptyRequiredData;
-
- /**
- * Default constructor
- */
- public JobsBranchOfficeEmailAddressValidator () {
- this.allowEmptyRequiredData = Boolean.FALSE;
- }
-
- /**
- * Setter for allowEmptyRequiredData flag
- * <p>
- * @param allowEmptyRequiredData Whether empty values are allowed
- */
- public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
- this.allowEmptyRequiredData = allowEmptyRequiredData;
- }
-
@Override
public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // Validate parameter
+ if (null == context) {
+ // Throw NPE
+ throw new NullPointerException("Parameter context is null"); //NOI18N
+ } else if (null == component) {
+ // Throw NPE again
+ throw new NullPointerException("Parameter component is null"); //NOI18N
+ }
+
// The required field
final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
// Pre-validation (example: not null, not a string, empty string ...)
- super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+ super.preValidate(context, component, value, requiredFields, Boolean.TRUE);
- // Is the email address empty and allowed?
- if (null == value && this.allowEmptyRequiredData) {
+ // Is the email address empty?
+ if (null == value) {
// Then accept this here
return;
- } else if (null == value) {
- // Abort here
- throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
}
// Get string from object ... ;-)
*/
private static final long serialVersionUID = 187_536_745_607_196L;
- /**
- * Whether empty data is allowed
- */
- private Boolean allowEmptyRequiredData;
-
- /**
- * Default constructor
- */
- public JobsEmployeeEmailAddressValidator () {
- this.allowEmptyRequiredData = Boolean.FALSE;
- }
-
- /**
- * Setter for allowEmptyRequiredData flag
- * <p>
- * @param allowEmptyRequiredData Whether empty values are allowed
- */
- public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
- this.allowEmptyRequiredData = allowEmptyRequiredData;
- }
-
@Override
public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // Validate parameter
+ if (null == context) {
+ // Throw NPE
+ throw new NullPointerException("Parameter context is null"); //NOI18N
+ } else if (null == component) {
+ // Throw NPE again
+ throw new NullPointerException("Parameter component is null"); //NOI18N
+ }
+
// The required field
final String[] requiredFields = {"employeeEmailAddress"}; //NOI18N
// Pre-validation (example: not null, not a string, empty string ...)
- super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+ super.preValidate(context, component, value, requiredFields, Boolean.TRUE);
// Is the email address empty and allowed?
- if (null == value && this.allowEmptyRequiredData) {
+ if (null == value) {
// Then accept this here
return;
- } else if (null == value) {
- // Abort here
- throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
}
// Get string from object ... ;-)
*/
private static final long serialVersionUID = 187_536_745_607_194L;
- /**
- * Whether empty data is allowed
- */
- private Boolean allowEmptyRequiredData;
-
- /**
- * Default constructor
- */
- public JobsHeadquarterEmailAddressValidator () {
- // Default is not allowed
- this.allowEmptyRequiredData = Boolean.FALSE;
- }
-
- /**
- * Setter for allowEmptyRequiredData flag
- * <p>
- * @param allowEmptyRequiredData Whether empty values are allowed
- */
- public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
- this.allowEmptyRequiredData = allowEmptyRequiredData;
- }
-
@Override
public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ // Validate parameter
+ if (null == context) {
+ // Throw NPE
+ throw new NullPointerException("Parameter context is null"); //NOI18N
+ } else if (null == component) {
+ // Throw NPE again
+ throw new NullPointerException("Parameter component is null"); //NOI18N
+ }
+
// The required field
final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
// Pre-validation (example: not null, not a string, empty string ...)
- super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+ super.preValidate(context, component, value, requiredFields, Boolean.TRUE);
// Is the email address empty and allowed?
- if (null == value && this.allowEmptyRequiredData) {
+ if (null == value) {
// Then accept this here
return;
- } else if (null == value) {
- // Abort here
- throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
}
// Get string from object ... ;-)
COUNTRY_ITALIA=Italien
COUNTRY_NETHERLANDS=Niederlande
COUNTRY_PHILIPPINES=Philippinen
+COUNTRY_POLAND=Polen
+COUNTRY_SWEDEN=Schweden
COUNTRY_TURKEY=T\u00fcrkei
COUNTRY_THAILAND=Thailand
COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Gespr\u00e4che ausserhalb des Ortes ein (meistens 0).
ADMIN_COUNTRY_I18N_KEY_REQUIRED=Bitte geben Sie den Schl\u00fcssel f\u00fcr das Sprachpaket ein (z.B. COUNTRY_GERMANY f\u00fcr Deutschland).
ADMIN_COUNTRY_CODE_REQUIRED=Bitte geben Sie den L\u00e4ndercode ein (z.B. DE f\u00fcr Deutschland).
-ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00).
+ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00).
ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl ohne f\u00fchrende Null f\u00fcr den Mobilfunkanbieter ein (z.B. 177 f\u00fcr E+).
USER_LOGIN_MUST_CHANGE_PASSWORD=Sie m\u00fcssen Ihr Passwort \u00e4ndern. Dies darf nicht mit dem aktuellen \u00fcbereinstimmen.
ADMIN_LOGOUT_TITLE=Aus dem Administrationsbereich ausloggen
COUNTRY_ITALIA=Italia
COUNTRY_NETHERLANDS=Netherlands
COUNTRY_PHILIPPINES=Philippines
+COUNTRY_POLAND=Poland
+COUNTRY_SWEDEN=Sweden
COUNTRY_THAILAND=Thailand
COUNTRY_TURKEY=Turkey
COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Please enter dial prefix for calls outside the current city.
ADMIN_COUNTRY_I18N_KEY_REQUIRED=Please enter the key for the language package (e.g. COUNTRY_USA for U.S.A.).
ADMIN_COUNTRY_CODE_REQUIRED=Please enter country code (e.g. US for U.S.A.).
-ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00).
+ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00).
ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Please enter dial prefix for mobile provider.
USER_LOGIN_MUST_CHANGE_PASSWORD=Please change your password. It must not match with your current one.
ADMIN_LOGOUT_TITLE=Logout from administration area
<to-view-id>/admin/basic_data/admin_basic_data_assign_owner.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_show_contact</from-outcome>
- <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+ <from-outcome>admin_show_employee</from-outcome>
+ <to-view-id>/admin/employee/admin_employee_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin_assign_basic_data_employee</from-outcome>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:core="http://mxchange.org/jsf/core/widgets"
- xmlns:validator="http://mxchange.org/jsf/core/validators"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:p="http://primefaces.org/ui"
- >
- <p:fieldset
- legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}"
- title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
- rendered="#{empty rendered or rendered}"
- >
- <p:panelGrid
- layout="grid"
- columns="2"
- columnClasses="ui-grid-col-4,ui-grid-col-8"
- styleClass="ui-noborder"
- >
- <p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
- <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
-
- <p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
- <p:inputText
- id="firstName"
- size="10"
- maxlength="255"
- value="#{adminContactController.firstName}"
- required="#{empty allowEmptyRequiredData or not allowEmptyRequiredData}"
- requiredMessage="#{msg.ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED}"
- />
-
- <p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
- <p:inputText
- id="title"
- size="5"
- maxlength="255"
- value="#{adminContactController.academicTitle}"
- />
-
- <p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
- <p:inputText
- id="familyName"
- size="10"
- maxlength="255"
- value="#{adminContactController.familyName}"
- required="#{empty allowEmptyRequiredData or not allowEmptyRequiredData}"
- requiredMessage="#{msg.ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED}"
- />
-
- <p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
- <p:inputText
- id="street"
- size="20"
- maxlength="255"
- value="#{adminContactController.street}"
- />
-
- <p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
- <p:inputText
- id="houseNumber"
- size="3"
- maxlength="5"
- value="#{adminContactController.houseNumber}"
- validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
- >
- <f:validateLongRange minimum="1" maximum="500" />
- </p:inputText>
-
- <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
- <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
-
- <p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
- <p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
- <f:validateLongRange minimum="1" maximum="99999" />
- </p:inputText>
-
- <p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
- <p:inputText id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
-
- <p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
- <core:outputCountrySelector
- id="country"
- value="#{adminContactController.contactCountry}"
- required="#{empty allowEmptyRequiredData or not allowEmptyRequiredData}"
- requiredMessage="#{msg.ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED}"
- />
-
- <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
- <core:inputLandLineNumberPanelGrid targetController="#{adminContactController}" />
-
- <p:outputLabel for="faxCountry" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
- <core:inputFaxNumberPanelGrid targetController="#{adminContactController}" />
-
- <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
- <core:inputMobileNumberPanelGrid targetController="#{adminContactController}" />
-
- <p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
- <p:inputText id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
- <validator:emailAddressValidator allowEmptyRequiredData="#{allowEmptyRequiredData}" />
- </p:inputText>
-
- <p:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
- <p:calendar
- id="contactBirthday"
- value="#{contactController.birthday}"
- title="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE}"
- pattern="#{msg.DATE_PATTERN}"
- navigator="true"
- />
-
- <p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
- <p:inputTextarea id="contactComment" value="#{adminContactController.comment}" rows="7" cols="35" />
- </p:panelGrid>
- </p:fieldset>
-
- <h:panelGroup styleClass="para notice" layout="block">
- <ul>
- <li>
- <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
- </li>
- </ul>
- </h:panelGroup>
-</ui:composition>
<p:selectOneRadio
id="personalTitle"
value="#{targetController.personalTitle}"
- required="#{(empty allowEmptyRequiredData or not allowEmptyRequiredData) and featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}"
+ required="true"
requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}"
- rendered="#{empty rendered or rendered == true}"
>
<f:selectItems
- value="#{genderController.selectableGenders}"
+ value="#{dataController.personalTitles}"
var="personalTitle"
itemValue="#{personalTitle}"
itemLabel="#{msg[personalTitle.messageKey]}"
value="#{adminBranchOfficeActionController.branchEmailAddress}"
validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
>
- <validator:branchOfficeEmailAddressValidator allowEmptyRequiredData="true" />
+ <validator:branchOfficeEmailAddressValidator />
</p:inputText>
<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_LAND_LINE_NUMBER}" />
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
+ xmlns:validator="http://mxchange.org/jsf/core/validators"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:p="http://primefaces.org/ui"
+ >
+ <p:fieldset
+ legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}"
+ title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
+ >
+ <p:panelGrid
+ layout="grid"
+ columns="2"
+ columnClasses="ui-grid-col-4,ui-grid-col-8"
+ styleClass="ui-noborder"
+ >
+ <p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+ <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" />
+
+ <p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+ <p:inputText
+ id="firstName"
+ size="10"
+ maxlength="255"
+ value="#{adminContactController.firstName}"
+ required="true"
+ requiredMessage="#{msg.ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED}"
+ />
+
+ <p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+ <p:inputText
+ id="title"
+ size="5"
+ maxlength="255"
+ value="#{adminContactController.academicTitle}"
+ />
+
+ <p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+ <p:inputText
+ id="familyName"
+ size="10"
+ maxlength="255"
+ value="#{adminContactController.familyName}"
+ required="true"
+ requiredMessage="#{msg.ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED}"
+ />
+
+ <p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+ <p:inputText
+ id="street"
+ size="20"
+ maxlength="255"
+ value="#{adminContactController.street}"
+ />
+
+ <p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+ <p:inputText
+ id="houseNumber"
+ size="3"
+ maxlength="5"
+ value="#{adminContactController.houseNumber}"
+ validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
+ >
+ <f:validateLongRange minimum="1" maximum="500" />
+ </p:inputText>
+
+ <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
+ <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+
+ <p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
+ <p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+ <f:validateLongRange minimum="1" maximum="99999" />
+ </p:inputText>
+
+ <p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
+ <p:inputText id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+
+ <p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+ <core:outputCountrySelector
+ id="country"
+ value="#{adminContactController.contactCountry}"
+ required="true"
+ requiredMessage="#{msg.ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED}"
+ />
+
+ <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+ <core:inputLandLineNumberPanelGrid targetController="#{adminContactController}" />
+
+ <p:outputLabel for="faxCountry" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+ <core:inputFaxNumberPanelGrid targetController="#{adminContactController}" />
+
+ <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+ <core:inputMobileNumberPanelGrid targetController="#{adminContactController}" />
+
+ <p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
+ <p:inputText id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+ <validator:emailAddressValidator allowEmptyRequiredData="true" />
+ </p:inputText>
+
+ <p:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+ <p:calendar
+ id="contactBirthday"
+ value="#{contactController.birthday}"
+ title="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE}"
+ pattern="#{msg.DATE_PATTERN}"
+ navigator="true"
+ />
+
+ <p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+ <p:inputTextarea id="contactComment" value="#{adminContactController.comment}" rows="7" cols="35" />
+ </p:panelGrid>
+ </p:fieldset>
+
+ <h:panelGroup styleClass="para notice" layout="block">
+ <ul>
+ <li>
+ <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
+ </li>
+ </ul>
+ </h:panelGroup>
+</ui:composition>
</div>
<div class="table-right-medium">
- <p:inputText id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+ <p:inputText
+ id="countryAbroadDialPrefix"
+ size="2"
+ maxlength="10"
+ value="#{adminCountryController.countryAbroadDialPrefix}"
+ required="true"
+ requiredMessage="#{msg.ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED}"
+ >
<f:validator validatorId="AbroadDialValidator" />
</p:inputText>
</div>
</p:selectOneMenu>
<p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
- <p:inputText id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
- <validator:employeeEmailAddressValidator allowEmptyRequiredData="true" />
+ <p:inputText
+ id="employeeEmailAddress"
+ size="40"
+ maxlength="255"
+ value="#{adminEmployeeController.employeeEmailAddress}"
+ validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+ >
+ <validator:employeeEmailAddressValidator />
</p:inputText>
<p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_STAFF_NUMBER}" />
value="#{adminHeadquarterActionController.headquarterEmailAddress}"
validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
>
- <validator:headquarterEmailAddressValidator allowEmptyRequiredData="true" />
+ <validator:headquarterEmailAddressValidator />
</p:inputText>
<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_HEADQUARTER_LAND_LINE_NUMBER}" />
<validator>
<validator-id>BasicDataEmailAddressValidator</validator-id>
</validator>
- <attribute>
- <description>Whether email address is allowed to be empty.</description>
- <name>allowEmptyRequiredData</name>
- <type>java.lang.Boolean</type>
- <required>false</required>
- </attribute>
</tag>
<tag>
<tag-name>branchOfficeEmailAddressValidator</tag-name>
<validator>
<validator-id>BranchOfficeEmailAddressValidator</validator-id>
</validator>
- <attribute>
- <description>Whether email address is allowed to be empty.</description>
- <name>allowEmptyRequiredData</name>
- <type>java.lang.Boolean</type>
- <required>false</required>
- </attribute>
</tag>
<tag>
<tag-name>employeeEmailAddressValidator</tag-name>
<validator>
<validator-id>EmployeeEmailAddressValidator</validator-id>
</validator>
- <attribute>
- <description>Whether email address is allowed to be empty.</description>
- <name>allowEmptyRequiredData</name>
- <type>java.lang.Boolean</type>
- <required>false</required>
- </attribute>
</tag>
<tag>
<tag-name>headquarterEmailAddressValidator</tag-name>
<validator>
<validator-id>HeadquarterEmailAddressValidator</validator-id>
</validator>
- <attribute>
- <description>Whether email address is allowed to be empty.</description>
- <name>allowEmptyRequiredData</name>
- <type>java.lang.Boolean</type>
- <required>false</required>
- </attribute>
</tag>
<tag>
<tag-name>urlValidator</tag-name>
<tag-name>outputPersonalTitleSelectionBox</tag-name>
<description>This tag renders a selection box for user contact's personal title (Mr./Mrs.).</description>
<source>resources/tags/input/selection_box/personal_title_selection_box.tpl</source>
- <attribute>
- <name>allowEmptyRequiredData</name>
- <description>Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here.</description>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <name>rendered</name>
- <description>Whether this tag is being rendered by JSF engine (default: true).</description>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
<attribute>
<name>targetController</name>
<description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
</attribute>
</tag>
- <tag>
- <tag-name>outputAdminContactDataFormFields</tag-name>
- <description>This tag renders a fieldset for administrative purposes of contact data.</description>
- <source>resources/tags/admin/form_data/contact/admin_form_contact_data.tpl</source>
- <attribute>
- <name>allowEmptyRequiredData</name>
- <description>Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here.</description>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <name>rendered</name>
- <description>Whether this tag is being rendered by JSF engine (default: true).</description>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- </tag>
<tag>
<tag-name>outputAdminFaxDataFormFields</tag-name>
<description>This tag renders a fieldset for administrative purposes of fax data.</description>
value="#{adminBasicCompanyDataController.companyEmailAddress}"
validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
>
- <validator:basicDataEmailAddressValidator allowEmptyRequiredData="true" />
+ <validator:basicDataEmailAddressValidator />
</p:inputText>
<p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_LOGO}" />
<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
</div>
- <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+ <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
<p:panelGrid columns="2" layout="grid">
<p:commandButton
<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
- <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+ <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
<f:facet name="footer">
<p:panelGrid columns="2" layout="grid">
<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
</h:panelGroup>
- <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+ <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
</h:panelGroup>
<f:facet name="footer">