From: Roland Häder <roland@mxchange.org>
Date: Sat, 22 Dec 2018 00:15:33 +0000 (+0100)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7867cd61c382ac822e545c8dcca9e68b945c2158;p=jjobs-war.git

Please cherry-pick:
- introduced 2nd parameter for beanHelper.renderBasicData() to include short or
  long name in view components
- also use that method instead of invoking getter in same helper backing-bean
- re-aligned some JSF tags to have their attributes in distinct lines (easy to
  add another)

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

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
index 6c506324..7a842607 100644
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
@@ -443,18 +443,25 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
 	/**
 	 * Renders data of basic company data
 	 * <p>
-	 * @param basicData Basic company data instance
+	 * @param basicData    Basic company data instance
+	 * @param useShortName Whether to use short name or long name of company
 	 * <p>
 	 * @return Basic company data as string
 	 */
-	public String renderBasicData (final BasicData basicData) {
+	public String renderBasicData (final BasicData basicData, final boolean useShortName) {
 		// Default is empty string, so let's get started
 		final StringBuilder sb = new StringBuilder(30);
 
 		// Is basic company data set?
 		if (basicData instanceof BasicData) {
-			// Add company name
-			sb.append(basicData.getCompanyName()); //NOI18N
+			// Short or long name?
+			if (useShortName) {
+				// Add company's long name
+				sb.append(basicData.getCompanyShortName()); //NOI18N
+			} else {
+				// Add company's long name
+				sb.append(basicData.getCompanyName()); //NOI18N
+			}
 
 			// Is email address set?
 			if (basicData.getCompanyEmailAddress() != null) {
@@ -491,7 +498,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
 			assert (branchOffice.getBranchCompany() instanceof BasicData) : "branchOffice.branchCompany is null"; //NOI18N
 
 			// Yes, then append all data
-			sb.append(branchOffice.getBranchCompany().getCompanyName());
+			sb.append(this.renderBasicData(branchOffice.getBranchCompany(), true));
 			sb.append(", "); //NOI18N
 			sb.append(branchOffice.getBranchStreet());
 			sb.append(" "); //NOI18N
@@ -576,7 +583,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
 			// Then create name
 			sb.append(this.getMessageFromBundle(department.getDepartmentI18nKey()));
 			sb.append(" ("); //NOI18N
-			sb.append(department.getDepartmentCompany().getCompanyName());
+			sb.append(this.renderBasicData(department.getDepartmentCompany(), true));
 			sb.append(")"); //NOI18N
 		}
 
diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 90a88a8d..6b4e9f96 100644
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -36,7 +36,7 @@
 					value="#{basicDataListController.allBasicData}"
 					var="basicData"
 					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index 42747902..6d45042d 100644
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -43,7 +43,7 @@
 					value="#{basicDataListController.allBasicData}"
 					var="basicData"
 					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index 290b73ff..1d42dbe8 100644
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -30,13 +30,18 @@
 
 				<f:converter converterId="BasicCompanyDataConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.PLEASE_SELECT}"
+					noSelectionOption="true"
+					itemDisabled="true"
+					/>
 
 				<f:selectItems
 					value="#{basicDataListController.allBasicData}"
 					var="basicData"
 					itemValue="#{basicData}"
-					itemLabel="#{basicData.companyName}"
+					itemLabel="#{beanHelper.renderBasicData(basicData)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 310934e5..b7abea68 100644
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -102,12 +102,16 @@
 								value="#{basicDataListController.allBasicData}"
 								var="basicData"
 								itemValue="#{basicData}"
-								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(branchOffice.branchCompany, true)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						>
 						<f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
 					</p:link>
 				</p:column>
@@ -221,7 +225,12 @@
 								<h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchNumber}" />
 
 								<p:outputLabel value="#{msg.ASSIGNED_BASIC_DATA_HEADER}" title="#{msg.ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE}" />
-								<p:link outcome="admin_show_basic_data" target="_blank" value="#{beanHelper.renderBasicData(branchOfficeListController.selectedBranchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+								<p:link
+									outcome="admin_show_basic_data"
+									target="_blank"
+									value="#{beanHelper.renderBasicData(branchOfficeListController.selectedBranchOffice.branchCompany, false)}"
+									title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+									>
 									<f:param name="basicDataId" value="#{branchOfficeListController.selectedBranchOffice.branchCompany.basicDataId}" />
 								</p:link>
 
diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 6f49671c..f9df8cc0 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -79,16 +79,18 @@
 								value="#{basicDataListController.allBasicData}"
 								var="basicData"
 								itemValue="#{basicData}"
-								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<h:outputLink value="#{department.departmentCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty department.departmentCompany.companyWebsiteUrl}">
-						<h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" />
-					</h:outputLink>
-
-					<h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(department.departmentCompany, true)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						>
+						<f:param name="basicDataId" value="#{department.departmentCompany.basicDataId}" />
+					</p:link>
 				</p:column>
 
 				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index b2e7f4f8..5d16be5f 100644
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -134,16 +134,18 @@
 								value="#{basicDataListController.allBasicData}"
 								var="basicData"
 								itemValue="#{basicData}"
-								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
 								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<h:outputLink value="#{employee.employeeBasicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeBasicData.companyWebsiteUrl}">
-						<h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" />
-					</h:outputLink>
-
-					<h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeBasicData.companyWebsiteUrl}" />
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(employee.employeeBasicData, true)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						>
+						<f:param name="basicDataId" value="#{employee.employeeBasicData.basicDataId}" />
+					</p:link>
 				</p:column>
 
 				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">