*/
private Short houseNumber;
+ /**
+ * House number extension
+ */
+ private String houseNumberExtension;
+
/**
* Whether a cellphone entry has been unlinked
*/
this.houseNumber = houseNumber;
}
+ @Override
+ public String getHouseNumberExtension () {
+ return this.houseNumberExtension;
+ }
+
+ @Override
+ public void setHouseNumberExtension (final String houseNumberExtension) {
+ this.houseNumberExtension = houseNumberExtension;
+ }
+
@Override
public Long getLandLineId () {
return this.landLineId;
contact.setContactFamilyName(this.getFamilyName());
contact.setContactStreet(this.getStreet());
contact.setContactHouseNumber(this.getHouseNumber());
+ contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
contact.setContactZipCode(this.getZipCode());
contact.setContactCity(this.getCity());
contact.setContactCountry(this.getCountry());
*/
void setHouseNumber (final Short houseNumber);
+ /**
+ * Getter for house number extension, example: 123a 'a' is then the
+ * extension and 123 is the house number.
+ * <p>
+ * @return House number extension
+ */
+ String getHouseNumberExtension ();
+
+ /**
+ * Setter for house number extension
+ * <p>
+ * @param houseNumberExtension House number extension
+ */
+ void setHouseNumberExtension (final String houseNumberExtension);
+
/**
* Getter for phone number's area code
* <p>
*/
private Short houseNumber;
+ /**
+ * House number extension
+ */
+ private String houseNumberExtension;
+
/**
* Whether a cellphone entry has been unlinked
*/
Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
contact.setContactStreet(this.getStreet());
contact.setContactHouseNumber(this.getHouseNumber());
+ contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
contact.setContactZipCode(this.getZipCode());
contact.setContactCity(this.getCity());
contact.setContactCountry(this.getCountry());
contact.setContactFamilyName(this.getFamilyName());
contact.setContactStreet(this.getStreet());
contact.setContactHouseNumber(this.getHouseNumber());
+ contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
contact.setContactZipCode(this.getZipCode());
contact.setContactCity(this.getCity());
contact.setContactCountry(this.getCountry());
this.houseNumber = houseNumber;
}
+ @Override
+ public String getHouseNumberExtension () {
+ return this.houseNumberExtension;
+ }
+
+ @Override
+ public void setHouseNumberExtension (final String houseNumberExtension) {
+ this.houseNumberExtension = houseNumberExtension;
+ }
+
@Override
public Integer getPhoneAreaCode () {
return this.phoneAreaCode;
this.setFamilyName(null);
this.setStreet(null);
this.setHouseNumber(null);
+ this.setHouseNumberExtension(null);
this.setZipCode(null);
this.setCity(null);
this.setCountry(null);
this.setFamilyName(contact.getContactFamilyName());
this.setStreet(contact.getContactStreet());
this.setHouseNumber(contact.getContactHouseNumber());
+ this.setHouseNumberExtension(contact.getContactHouseNumberExtension());
this.setZipCode(contact.getContactZipCode());
this.setCity(contact.getContactCity());
this.setCountry(contact.getContactCountry());
*/
void setHouseNumber (final Short houseNumber);
+ /**
+ * Getter for house number extension, example: 123a 'a' is then the
+ * extension and 123 is the house number.
+ * <p>
+ * @return House number extension
+ */
+ String getHouseNumberExtension ();
+
+ /**
+ * Setter for house number extension
+ * <p>
+ * @param houseNumberExtension House number extension
+ */
+ void setHouseNumberExtension (final String houseNumberExtension);
+
/**
* Getter for phone number's area code
* <p>
country.setCountryAbroadDialPrefix(this.getCountryAbroadDialPrefix());
country.setCountryCode(this.getCountryCode());
country.setCountryExternalDialPrefix(this.getCountryExternalDialPrefix());
- country.setCountryI18nkey(this.getCountryI18nKey());
+ country.setCountryI18nKey(this.getCountryI18nKey());
country.setCountryIsLocalPrefixRequired(this.getCountryIsLocalPrefixRequired());
country.setCountryPhoneCode(this.getCountryPhoneCode());
Country next = iterator.next();
// Is country code or i18n the same?
- if ((Objects.equals(country.getCountryCode(), next.getCountryCode())) || (Objects.equals(country.getCountryI18nkey(), next.getCountryI18nkey()))) {
+ if ((Objects.equals(country.getCountryCode(), next.getCountryCode())) || (Objects.equals(country.getCountryI18nKey(), next.getCountryI18nKey()))) {
// Yes, then abort search
isAdded = true;
break;
import javax.inject.Named;
import org.mxchange.jcontacts.contact.Contact;
import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController;
+import org.mxchange.jjobs.beans.phone.JobsAdminContactPhoneWebRequestController;
import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
--- /dev/null
+/*
+ * Copyright (C) 2016 Roland Haeder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.beans.phone;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.enterprise.context.RequestScoped;
+import javax.faces.view.facelets.FaceletException;
+import javax.inject.Named;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote;
+import org.mxchange.jjobs.beans.BaseJobsController;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+
+/**
+ * Administrative bean (controller) for phone numbers
+ * <p>
+ * @author Roland Haeder<roland@mxchange.org>
+ */
+@Named ("adminPhoneController")
+@RequestScoped
+public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController implements JobsAdminContactPhoneWebRequestController {
+
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 184_598_175_371_269_016L;
+
+ /**
+ * Remote EJB for phone number (administrative)
+ */
+ private AdminContactsPhoneSessionBeanRemote adminRemoteBean;
+
+ /**
+ * Cell phone number
+ */
+ private DialableCellphoneNumber cellPhone;
+
+ /**
+ * Instance of linked contact account
+ * <p>
+ * @deprecated This is a generic phone controller, not just for contact data
+ */
+ @Deprecated
+ private Contact contact;
+
+ /**
+ * "Cache" for contact lists, mostly only one is assigned. So this cache
+ * shouldn't grow beyond control.
+ * <p>
+ * @deprecated This is a generic phone controller, not just for contact data
+ */
+ @Deprecated
+ private final Map<Long, List<Contact>> contacts;
+
+ /**
+ * Fax number
+ */
+ private DialableFaxNumber fax;
+
+ /**
+ * Land-line number
+ */
+ private DialableLandLineNumber landLine;
+
+ /**
+ * Default constructor
+ */
+ public JobsAdminContactPhoneWebRequestBean () {
+ // Try it
+ try {
+ // Get initial context
+ Context context = new InitialContext();
+
+ // Try to lookup the beans
+ this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N
+ } catch (final NamingException e) {
+ // Throw it again
+ throw new FaceletException(e);
+ }
+
+ // Init map
+ this.contacts = new HashMap<>(10);
+ }
+
+ @Override
+ @Deprecated
+ public List<Contact> allCellphoneContacts () {
+ // Get id
+ Long phoneId = this.getCellPhone().getPhoneId();
+
+ // Is cache there?
+ if (this.contacts.containsKey(phoneId)) {
+ // Return cached version
+ return this.contacts.get(phoneId);
+ } else {
+ // Ask bean
+ List<Contact> list = this.adminRemoteBean.allContacts(this.getCellPhone());
+
+ // Store result in cache
+ this.contacts.put(phoneId, list);
+
+ // Return now-cached list
+ return list;
+ }
+ }
+
+ @Override
+ public DialableCellphoneNumber getCellPhone () {
+ return this.cellPhone;
+ }
+
+ @Override
+ public void setCellPhone (final DialableCellphoneNumber cellPhone) {
+ this.cellPhone = cellPhone;
+ }
+
+ @Override
+ @Deprecated
+ public Contact getContact () {
+ return this.contact;
+ }
+
+ @Override
+ @Deprecated
+ public void setContact (final Contact contact) {
+ this.contact = contact;
+ }
+
+ @Override
+ public DialableFaxNumber getFax () {
+ return this.fax;
+ }
+
+ @Override
+ public void setFax (final DialableFaxNumber fax) {
+ this.fax = fax;
+ }
+
+ @Override
+ public DialableLandLineNumber getLandLine () {
+ return this.landLine;
+ }
+
+ @Override
+ public void setLandLine (final DialableLandLineNumber landLine) {
+ this.landLine = landLine;
+ }
+
+}
--- /dev/null
+/*
+ * Copyright (C) 2016 Roland Haeder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.beans.phone;
+
+import java.io.Serializable;
+import java.util.List;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+
+/**
+ * An interface for a request web controller (bean) for administrative phone
+ * number purposes.
+ * <p>
+ * @author Roland Haeder<roland@mxchange.org>
+ */
+public interface JobsAdminContactPhoneWebRequestController extends Serializable {
+
+ /**
+ * Getter for all contacts having current cellphone instance linked
+ * <p>
+ * @return List of all linked contacts
+ */
+ @Deprecated
+ List<Contact> allCellphoneContacts ();
+
+ /**
+ * Getter for dialable cellphone number instance
+ * <p>
+ * @return Dialable cellphone number instance
+ */
+ DialableCellphoneNumber getCellPhone ();
+
+ /**
+ * Setter for dialable land-line number instance
+ * <p>
+ * @param landLine Dialable land-line number instance
+ */
+ void setLandLine (final DialableLandLineNumber landLine);
+
+ /**
+ * Getter for dialable land-line number instance
+ * <p>
+ * @return Dialable land-line number instance
+ */
+ DialableLandLineNumber getLandLine ();
+
+ /**
+ * Setter for dialable fax number instance
+ * <p>
+ * @param fax Dialable fax number instance
+ */
+ void setFax (final DialableFaxNumber fax);
+
+ /**
+ * Getter for dialable fax number instance
+ * <p>
+ * @return Dialable fax number instance
+ */
+ DialableFaxNumber getFax ();
+
+ /**
+ * Setter for dialable cellphone number instance
+ * <p>
+ * @param cellPhone Dialable cellphone number instance
+ */
+ void setCellPhone (final DialableCellphoneNumber cellPhone);
+
+ /**
+ * Getter for linked contact account
+ * <p>
+ * @return Linked contact account
+ */
+ @Deprecated
+ Contact getContact ();
+
+ /**
+ * Setter for linked contact account
+ * <p>
+ * @param contact Linked contact account
+ */
+ @Deprecated
+ void setContact (final Contact contact);
+
+}
+++ /dev/null
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jjobs.beans.phone;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.view.facelets.FaceletException;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote;
-import org.mxchange.jjobs.beans.BaseJobsController;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
-
-/**
- * Administrative bean (controller) for phone numbers
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Named ("adminPhoneController")
-@RequestScoped
-public class JobsAdminContactPhoneWebSessionBean extends BaseJobsController implements JobsAdminContactPhoneWebSessionController {
-
- /**
- * Serial number
- */
- private static final long serialVersionUID = 184_598_175_371_269_016L;
-
- /**
- * Remote EJB for phone number (administrative)
- */
- private AdminContactsPhoneSessionBeanRemote adminRemoteBean;
-
- /**
- * Cell phone number
- */
- private DialableCellphoneNumber cellPhone;
-
- /**
- * Instance of linked contact account
- * <p>
- * @deprecated This is a generic phone controller, not just for contact data
- */
- @Deprecated
- private Contact contact;
-
- /**
- * "Cache" for contact lists, mostly only one is assigned. So this cache
- * shouldn't grow beyond control.
- * <p>
- * @deprecated This is a generic phone controller, not just for contact data
- */
- @Deprecated
- private final Map<Long, List<Contact>> contacts;
-
- /**
- * Fax number
- */
- private DialableFaxNumber fax;
-
- /**
- * Land-line number
- */
- private DialableLandLineNumber landLine;
-
- /**
- * Default constructor
- */
- public JobsAdminContactPhoneWebSessionBean () {
- // Try it
- try {
- // Get initial context
- Context context = new InitialContext();
-
- // Try to lookup the beans
- this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N
- } catch (final NamingException e) {
- // Throw it again
- throw new FaceletException(e);
- }
-
- // Init map
- this.contacts = new HashMap<>(10);
- }
-
- @Override
- @Deprecated
- public List<Contact> allCellphoneContacts () {
- // Get id
- Long phoneId = this.getCellPhone().getPhoneId();
-
- // Is cache there?
- if (this.contacts.containsKey(phoneId)) {
- // Return cached version
- return this.contacts.get(phoneId);
- } else {
- // Ask bean
- List<Contact> list = this.adminRemoteBean.allContacts(this.getCellPhone());
-
- // Store result in cache
- this.contacts.put(phoneId, list);
-
- // Return now-cached list
- return list;
- }
- }
-
- @Override
- public DialableCellphoneNumber getCellPhone () {
- return this.cellPhone;
- }
-
- @Override
- public void setCellPhone (final DialableCellphoneNumber cellPhone) {
- this.cellPhone = cellPhone;
- }
-
- @Override
- @Deprecated
- public Contact getContact () {
- return this.contact;
- }
-
- @Override
- @Deprecated
- public void setContact (final Contact contact) {
- this.contact = contact;
- }
-
- @Override
- public DialableFaxNumber getFax () {
- return this.fax;
- }
-
- @Override
- public void setFax (final DialableFaxNumber fax) {
- this.fax = fax;
- }
-
- @Override
- public DialableLandLineNumber getLandLine () {
- return this.landLine;
- }
-
- @Override
- public void setLandLine (final DialableLandLineNumber landLine) {
- this.landLine = landLine;
- }
-
-}
+++ /dev/null
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jjobs.beans.phone;
-
-import java.io.Serializable;
-import java.util.List;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
-
-/**
- * An interface for a request web controller (bean) for administrative phone
- * number purposes.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface JobsAdminContactPhoneWebSessionController extends Serializable {
-
- /**
- * Getter for all contacts having current cellphone instance linked
- * <p>
- * @return List of all linked contacts
- */
- @Deprecated
- List<Contact> allCellphoneContacts ();
-
- /**
- * Getter for dialable cellphone number instance
- * <p>
- * @return Dialable cellphone number instance
- */
- DialableCellphoneNumber getCellPhone ();
-
- /**
- * Setter for dialable land-line number instance
- * <p>
- * @param landLine Dialable land-line number instance
- */
- void setLandLine (final DialableLandLineNumber landLine);
-
- /**
- * Getter for dialable land-line number instance
- * <p>
- * @return Dialable land-line number instance
- */
- DialableLandLineNumber getLandLine ();
-
- /**
- * Setter for dialable fax number instance
- * <p>
- * @param fax Dialable fax number instance
- */
- void setFax (final DialableFaxNumber fax);
-
- /**
- * Getter for dialable fax number instance
- * <p>
- * @return Dialable fax number instance
- */
- DialableFaxNumber getFax ();
-
- /**
- * Setter for dialable cellphone number instance
- * <p>
- * @param cellPhone Dialable cellphone number instance
- */
- void setCellPhone (final DialableCellphoneNumber cellPhone);
-
- /**
- * Getter for linked contact account
- * <p>
- * @return Linked contact account
- */
- @Deprecated
- Contact getContact ();
-
- /**
- * Setter for linked contact account
- * <p>
- * @param contact Linked contact account
- */
- @Deprecated
- void setContact (final Contact contact);
-
-}
+++ /dev/null
-/*
- * Copyright (C) 2016 Cho-Time GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.pizzaapplication.beans.features;
-
-import java.io.Serializable;
-import javax.ejb.Local;
-
-/**
- * An interface for country beans
- * <p>
- * @author Roland Haeder<rhaeder@cho-time.de>
- */
-@Local
-public interface PizzaFeaturesWebApplicationController extends Serializable {
-
- /**
- * Checks if given feature is enabled.
- * <p>
- * @param feature Feature to be checked
- * <p>
- * @return Whether given feature is enabled
- */
- boolean isFeatureEnabled (final String feature);
-
-}
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
- xmlns="http://www.w3.org/1999/xhtml"\r
- xmlns:f="http://java.sun.com/jsf/core"\r
- xmlns:h="http://java.sun.com/jsf/html"\r
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-\r
- <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">\r
- <f:facet name="header">\r
- <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">\r
- <f:param value="#{beanHelper.contact.contactId}" />\r
- </h:outputFormat>\r
- </f:facet>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />\r
-\r
- <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />\r
-\r
- <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">\r
- <f:convertDateTime for="contactCreated" type="both" />\r
- </h:outputText>\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />\r
-\r
- <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">\r
- <f:convertDateTime for="contactUpdated" type="both" />\r
- </h:outputText>\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />\r
-\r
- <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />\r
-\r
- <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />\r
-\r
- <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />\r
-\r
- <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />\r
-\r
- <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />\r
-\r
- <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />\r
-\r
- <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />\r
-\r
- <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />\r
-\r
- <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />\r
-\r
- <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">\r
- <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />\r
- </h:outputLink>\r
- </h:column>\r
-\r
- <h:column>\r
- <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />\r
-\r
- <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">\r
- <f:convertDateTime for="contactBirthday" type="date" />\r
- </h:outputText>\r
- </h:column>\r
- </h:panelGrid>\r
-</ui:composition>\r
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+ <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">
+ <f:facet name="header">
+ <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+ <f:param value="#{beanHelper.contact.contactId}" />
+ </h:outputFormat>
+ </f:facet>
+
+ <h:column>
+ <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+ <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+
+ <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">
+ <f:convertDateTime for="contactCreated" type="both" />
+ </h:outputText>
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+
+ <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">
+ <f:convertDateTime for="contactUpdated" type="both" />
+ </h:outputText>
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+
+ <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+ <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+ <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+ <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+ <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+
+ <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+
+ <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+ <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+
+ <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+ <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+ <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+ <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
+ </h:outputLink>
+ </h:column>
+
+ <h:column>
+ <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+
+ <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">
+ <f:convertDateTime for="contactBirthday" type="date" />
+ </h:outputText>
+ </h:column>
+ </h:panelGrid>
+</ui:composition>
<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+ <div class="table_row">
+ <div class="table_left_medium">
+ <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+ </div>
+
+ <div class="table_right_medium">
+ <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+ </div>
+
+ <div class="clear"></div>
+ </div>
+
+ <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
<div class="table_row">
<div class="table_left_medium">
<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
</div>
+ <div class="table_row">
+ <div class="table_left">
+ <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+ </div>
+
+ <div class="table_right">
+ <h:inputText styleClass="input" id="houseNumber" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+ </div>
+
+ <div class="clear"></div>
+ </div>
+
+ <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
<div class="table_row">
<div class="table_left">
<h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
projects / jjobs-war.git / commitdiff