From 4d4cc852baf8bf0010184fc0c0b6627f3cd77714 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 23 Sep 2017 00:24:16 +0200 Subject: [PATCH] Please cherry-pick: - need to change java.util.Calendar (bye bye) to java.util.Date in favour of PrimeFaces' p:calendar [!] tag - added more i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../phone/JobsAdminContactPhoneWebRequestBean.java | 14 +++++++------- .../beans/phone/JobsAdminPhoneWebRequestBean.java | 14 +++++++------- .../activity/JobsUserActivityWebRequestBean.java | 6 +++--- .../mxchange/localization/bundle_de_DE.properties | 11 +++++++++++ .../mxchange/localization/bundle_en_US.properties | 8 ++++++++ 5 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index 202210d2..5053f438 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -17,7 +17,7 @@ package org.mxchange.jjobs.beans.contact.phone; import java.text.MessageFormat; -import java.util.Calendar; +import java.util.Date; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; @@ -180,12 +180,12 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements /** * When fax number has been created */ - private Calendar phoneEntryCreated; + private Date phoneEntryCreated; /** * When fax number has been updated */ - private Calendar phoneEntryUpdated; + private Date phoneEntryUpdated; /** * Phone id (primary key) @@ -1031,7 +1031,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements * @param faxNumberEntryCreated Phone entry created */ @SuppressWarnings ("ReturnOfDateField") - private Calendar getPhoneEntryCreated () { + private Date getPhoneEntryCreated () { return this.phoneEntryCreated; } @@ -1041,7 +1041,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements * @param phoneEntryCreated Phone entry created */ @SuppressWarnings ("AssignmentToDateFieldFromParameter") - private void setPhoneEntryCreated (final Calendar phoneEntryCreated) { + private void setPhoneEntryCreated (final Date phoneEntryCreated) { this.phoneEntryCreated = phoneEntryCreated; } @@ -1051,7 +1051,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements * @return Phone entry updated */ @SuppressWarnings ("ReturnOfDateField") - private Calendar getPhoneEntryUpdated () { + private Date getPhoneEntryUpdated () { return this.phoneEntryUpdated; } @@ -1061,7 +1061,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements * @param phoneEntryUpdated Phone entry updated */ @SuppressWarnings ("AssignmentToDateFieldFromParameter") - private void setPhoneEntryUpdated (final Calendar phoneEntryUpdated) { + private void setPhoneEntryUpdated (final Date phoneEntryUpdated) { this.phoneEntryUpdated = phoneEntryUpdated; } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 101c7942..d0fc3a29 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -17,7 +17,7 @@ package org.mxchange.jjobs.beans.phone; import java.text.MessageFormat; -import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Objects; import javax.ejb.EJB; @@ -165,12 +165,12 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd /** * When the phone entry has been created (persisted) */ - private Calendar phoneEntryCreated; + private Date phoneEntryCreated; /** * When the phone entry has been updated */ - private Calendar phoneEntryUpdated; + private Date phoneEntryUpdated; /** * Phone id (aka primary key) @@ -834,7 +834,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd * @return Phone entry created timestamp */ @SuppressWarnings ("ReturnOfDateField") - public Calendar getPhoneEntryCreated () { + public Date getPhoneEntryCreated () { return this.phoneEntryCreated; } @@ -844,7 +844,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd * @param phoneEntryCreated Phone entry created timestamp */ @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setPhoneEntryCreated (final Calendar phoneEntryCreated) { + public void setPhoneEntryCreated (final Date phoneEntryCreated) { this.phoneEntryCreated = phoneEntryCreated; } @@ -854,7 +854,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd * @return Phone entry updated timestamp */ @SuppressWarnings ("ReturnOfDateField") - public Calendar getPhoneEntryUpdated () { + public Date getPhoneEntryUpdated () { return this.phoneEntryUpdated; } @@ -864,7 +864,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd * @param phoneEntryUpdated Phone entry updated timestamp */ @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setPhoneEntryUpdated (final Calendar phoneEntryUpdated) { + public void setPhoneEntryUpdated (final Date phoneEntryUpdated) { this.phoneEntryUpdated = phoneEntryUpdated; } diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java index 7b7056ff..3beb2c04 100644 --- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.user.activity; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Collections; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; @@ -589,7 +589,7 @@ public class JobsUserActivityWebRequestBean extends BaseJobsBean implements Jobs } // Create new activity object - final LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName()); + final LogableUserActivity userActivity = new UserActivityLog(activityType, user, new Date(), this.determinePrincipalName()); // Call bean to add it this.userActivityBean.addUserActivityLog(userActivity); @@ -631,7 +631,7 @@ public class JobsUserActivityWebRequestBean extends BaseJobsBean implements Jobs } // Create new activity object - final LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName()); + final LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new Date(), this.determinePrincipalName()); // Call bean to add it this.userActivityBean.addUserActivityLog(userActivity); diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index ced63609..f2f21b01 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -972,3 +972,14 @@ FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unterne LABEL_COMPANY_EMPLOYEES=Mitarbeiter FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter durchsuchen. ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Filialnummer eingeben: +#@TODO Please fix German umlauts! +ADMIN_SELECT_BRANCH_OFFICE=Filiale auswaehlen: +#@TODO Please fix German umlauts! +PLEASE_SELECT=Bitte auswaehlen +#@TODO Please fix German umlauts! +ADMIN_SELECT_PAYMENT_TYPE=Bezahlungsart auswaehlen: +PAYMENT_TYPE_CASH=Bargeld +PAYMENT_TYPE_CREDIT_CARD=Kreditkarte +PAYMENT_TYPE_DEBIT_CARD=Kundenkarte +PAYMENT_TYPE_PREPAYMENT=Vorkasse +PAYMENT_TYPE_INVOICE=Auf Rechnung diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 665d2f73..bc3b4a24 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -921,3 +921,11 @@ FILTER_BY_MULTIPLE_COMPANIES_TITLE=Filter list by selecting one or more companie LABEL_COMPANY_EMPLOYEES=Employees FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Filter list by selecting one or more employees. ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Enter branch office number: +ADMIN_SELECT_BRANCH_OFFICE=Select branch office: +PLEASE_SELECT=Please select +ADMIN_SELECT_PAYMENT_TYPE=Select payment type: +PAYMENT_TYPE_CASH=Cash +PAYMENT_TYPE_CREDIT_CARD=Credit card +PAYMENT_TYPE_DEBIT_CARD=Debit card +PAYMENT_TYPE_PREPAYMENT=Prepayment +PAYMENT_TYPE_INVOICE=Per invoice -- 2.39.5