diff --git a/README.md b/README.md index 3f795a7..f68982d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ # car-repair-site Learning purposes -![Task](https://github.com/Prominence/car-repair-site/blob/master/java-task-1.1.jpg) - -![Task](https://github.com/Prominence/car-repair-site/blob/master/java-task-1.2.jpg) +![Task](https://github.com/Prominence/car-repair-site/blob/master/src/main/resources/static/images/task.png) diff --git a/java-task-1.1.jpg b/java-task-1.1.jpg deleted file mode 100644 index aac4fda..0000000 Binary files a/java-task-1.1.jpg and /dev/null differ diff --git a/java-task-1.2.jpg b/java-task-1.2.jpg deleted file mode 100644 index 2e3f356..0000000 Binary files a/java-task-1.2.jpg and /dev/null differ diff --git a/src/main/resources/static/images/java-task-1.1.jpg b/src/main/resources/static/images/java-task-1.1.jpg deleted file mode 100644 index aac4fda..0000000 Binary files a/src/main/resources/static/images/java-task-1.1.jpg and /dev/null differ diff --git a/src/main/resources/static/images/java-task-1.2.jpg b/src/main/resources/static/images/java-task-1.2.jpg deleted file mode 100644 index 2e3f356..0000000 Binary files a/src/main/resources/static/images/java-task-1.2.jpg and /dev/null differ diff --git a/src/main/resources/static/images/task.png b/src/main/resources/static/images/task.png new file mode 100644 index 0000000..5267991 Binary files /dev/null and b/src/main/resources/static/images/task.png differ diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 552998b..c9484e2 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -12,8 +12,7 @@

:

- Requirements - Requirements + Requirements diff --git a/src/main/resources/templates/order/edit.html b/src/main/resources/templates/order/edit.html index 6b39b14..feab8e1 100644 --- a/src/main/resources/templates/order/edit.html +++ b/src/main/resources/templates/order/edit.html @@ -95,7 +95,12 @@ transformResult: function(response) { return { suggestions: $.map($.parseJSON(response), function(item) { - return { value: item.firstName + ' ' + item.lastName, data: item.id}; + var value = item.firstName; + if (item.middleName) { + value += (' ' + item.middleName); + } + value += (' ' + item.lastName) + return { value: value, data: item.id}; }) }; },