From: Roland Häder <roland@mxchange.org>
Date: Sat, 19 Aug 2017 15:00:39 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d85d77d1dc357ca5d4dfc7bff73a6f32f827660b;p=jjobs-war.git

Please cherry-pick:
- having legal status and company separated was no good idea anyway, so let's
  get rid of it here, too

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jjobs/beans/businessdata/JobsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/businessdata/JobsAdminBusinessDataWebRequestBean.java
index d2b555b8..f378d248 100644
--- a/src/java/org/mxchange/jjobs/beans/businessdata/JobsAdminBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/businessdata/JobsAdminBusinessDataWebRequestBean.java
@@ -63,11 +63,6 @@ public class JobsAdminBusinessDataWebRequestBean extends BaseJobsController impl
 	 */
 	private String companyEmailAddress;
 
-	/**
-	 * Company legal status (example: Incorporated, GmbH)
-	 */
-	private String companyLegalStatus;
-
 	/**
 	 * Company name
 	 */
@@ -153,24 +148,6 @@ public class JobsAdminBusinessDataWebRequestBean extends BaseJobsController impl
 		this.companyEmailAddress = companyEmailAddress;
 	}
 
-	/**
-	 * Getter for company's legal status
-	 * <p>
-	 * @return Company's legal status
-	 */
-	public String getCompanyLegalStatus () {
-		return this.companyLegalStatus;
-	}
-
-	/**
-	 * Setter for company's legal status
-	 * <p>
-	 * @param companyLegalStatus Company's legal status
-	 */
-	public void setCompanyLegalStatus (final String companyLegalStatus) {
-		this.companyLegalStatus = companyLegalStatus;
-	}
-
 	/**
 	 * Getter for company name
 	 * <p>
diff --git a/src/java/org/mxchange/jjobs/beans/businessdata/JobsBusinessDataWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/businessdata/JobsBusinessDataWebSessionBean.java
index c550e33e..7f35ab84 100644
--- a/src/java/org/mxchange/jjobs/beans/businessdata/JobsBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/businessdata/JobsBusinessDataWebSessionBean.java
@@ -58,11 +58,6 @@ public class JobsBusinessDataWebSessionBean extends BaseJobsController implement
 	 */
 	private String companyEmailAddress;
 
-	/**
-	 * Company legal status (example: Incorporated, GmbH)
-	 */
-	private String companyLegalStatus;
-
 	/**
 	 * Company name
 	 */
@@ -148,24 +143,6 @@ public class JobsBusinessDataWebSessionBean extends BaseJobsController implement
 		this.companyEmailAddress = companyEmailAddress;
 	}
 
-	/**
-	 * Getter for company's legal status
-	 * <p>
-	 * @return Company's legal status
-	 */
-	public String getCompanyLegalStatus () {
-		return this.companyLegalStatus;
-	}
-
-	/**
-	 * Setter for company's legal status
-	 * <p>
-	 * @param companyLegalStatus Company's legal status
-	 */
-	public void setCompanyLegalStatus (final String companyLegalStatus) {
-		this.companyLegalStatus = companyLegalStatus;
-	}
-
 	/**
 	 * Getter for company name
 	 * <p>
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 2d24b4d9..d4eb0095 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -846,7 +846,7 @@ ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsform ein.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein.
 #@TODO Please fix German umlauts!
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format.
 #@TODO Please fix German umlauts!
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index dabb9b19..39cdfc80 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -828,7 +828,7 @@ ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Comments:
 ADMIN_BUSINESS_DATA_PHONE_NUMBER=Main phone number:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number:
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Add new business contact
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name and legal status.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name including legal status.
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid.
 ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basic data for business contact:
 #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
diff --git a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
index 7781ac4d..af9c01b8 100644
--- a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
+++ b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
@@ -27,22 +27,6 @@
 				<h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
-					<h:outputLabel for="companyLegalStatus" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="companyLegalStatus" size="5" maxlength="10" value="#{adminBusinessDataController.companyLegalStatus}" />
-				</div>
-
-				<div class="clear"></div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyLegalStatus" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</h:panelGroup>
-
 			<h:panelGroup styleClass="table_row" layout="block">
 				<div class="table_left_medium">
 					<h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />
diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
index 605db6b0..3527e775 100644
--- a/web/admin/business_data/admin_business_data_list.xhtml
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -47,7 +47,7 @@
 					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
 				</f:facet>
 
-				<h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+				<h:outputText value="#{businessContact.companyName}" />
 			</h:column>
 
 			<h:column>