Changed field 'surname' to 'firstName' as surname is an other word for family name...

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

diff --git a/install/install.sql b/install/install.sql
index 04fb29be2baba9bfb898248acf11eae29eb2c2e6..be0f194b7ede51aeba3a009e1e6c76b6e54c09ab 100644 (file)
--- a/install/install.sql
+++ b/install/install.sql
@@ -1,25 +1,16 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
-
 DROP TABLE IF EXISTS `category`;
 CREATE TABLE IF NOT EXISTS `category` (
-`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
+  `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
   `title` varchar(255) NOT NULL COMMENT 'Category title',
   `parent` bigint(20) unsigned DEFAULT NULL COMMENT 'Parent category'
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='Categories' AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='Categories';
 
 DROP TABLE IF EXISTS `contacts`;
 CREATE TABLE IF NOT EXISTS `contacts` (
-`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
+  `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
   `own_contact` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether own contact',
   `gender` varchar(10) NOT NULL DEFAULT 'UNKNOWN' COMMENT 'Gender',
-  `surname` varchar(100) NOT NULL COMMENT 'Surname',
+  `first_name` varchar(100) NOT NULL COMMENT 'First name',
   `family_name` varchar(100) NOT NULL COMMENT 'Family name',
   `company_name` varchar(255) DEFAULT NULL COMMENT 'Company name',
   `street` varchar(255) DEFAULT NULL COMMENT 'Street name',
@@ -35,16 +26,16 @@ CREATE TABLE IF NOT EXISTS `contacts` (
   `comment` tinytext NOT NULL COMMENT 'Comment',
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Entry created',
   `updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Contacts data' AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Contacts data' ;
 
 DROP TABLE IF EXISTS `products`;
 CREATE TABLE IF NOT EXISTS `products` (
-`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
+  `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key',
   `category` bigint(20) unsigned DEFAULT NULL COMMENT 'Category id',
   `title` varchar(255) NOT NULL COMMENT 'Title of product',
   `price` decimal(20,2) unsigned NOT NULL COMMENT 'Product price',
   `available` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether product is available'
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='Products' AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='Products' ;
 
 
 ALTER TABLE `category`
@@ -58,11 +49,8 @@ ALTER TABLE `products`
 
 
 ALTER TABLE `category`
-MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',AUTO_INCREMENT=3;
+MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key';
 ALTER TABLE `contacts`
 MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key';
 ALTER TABLE `products`
-MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',AUTO_INCREMENT=2;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key';

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 05ee9c0e2166866d528b972387d162ac0632abf8..0e8813704d51794f066ea23fb50fd7504286bb4a 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java b/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java
index bcdafaad04be3e73862b825b517c5da48d39d680..ee40002b3f3ea9cf5183739812ea2ebf4509fc02 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java
+++ b/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java
@@ -210,15 +210,15 @@ public class PizzaServiceCustomerBean extends BasePizzaServiceSystem implements
        }
 
        @Override
-       public String getSurname () {
+       public String getFirstName () {
                // Deligate to "hidden" object
-               return this.getContact().getSurname();
+               return this.getContact().getFirstName();
        }
 
        @Override
-       public void setSurname (final String surname) {
+       public void setFirstName (final String firstName) {
                // Deligate to "hidden" object
-               this.getContact().setSurname(surname);
+               this.getContact().setFirstName(firstName);
        }
 
        @Override

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 78c62db097cb394c560c99d4c02363d4c93ae20a..3d6dc4674d066cb063fa44b0ef08cb93b0b63321 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -3,7 +3,7 @@
     <context-param>
         <description>Full-qualified back class name, must implement DatabaseBackend interface</description>
         <param-name>database.backend.class</param-name>
-        <param-value>org.mxchange.jcore.database.backend.base64.Base64CsvDatabaseBackend</param-value>
+        <param-value>org.mxchange.jcore.database.backend.mysql.MySqlDatabaseBackend</param-value>
     </context-param>
     <context-param>
         <description>Login name for MySQL database, mostly not root</description>

diff --git a/web/customer/register.jsp b/web/customer/register.jsp
index ea441607d768ac30c826d07d3fab731f0e9086d1..7b40113b137d3dd753d43c35dfd8d0aae84de09d 100644 (file)
--- a/web/customer/register.jsp
+++ b/web/customer/register.jsp
@@ -74,11 +74,11 @@
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <label for="surname">Vorname:</label>
+                                                                               <label for="firstName">Vorname:</label>
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <input class="input" type="text" id="surname" name="surname" size="10" maxlength="255" value="${customer.surname}" />
+                                                                               <input class="input" type="text" id="firstName" name="firstName" size="10" maxlength="255" value="${customer.firstName}" />
                                                                        </div>
 
                                                                        <div class="clear"></div>