diff --git a/documentation/microservice_stock/chapter/Struktur.tex b/documentation/microservice_stock/chapter/Struktur.tex index b7a4014..855219e 100644 --- a/documentation/microservice_stock/chapter/Struktur.tex +++ b/documentation/microservice_stock/chapter/Struktur.tex @@ -25,7 +25,7 @@ Die dritte Schnittstelle besteht zu dem Microservice Produktkatalog, von welchem \begin{lstlisting}[caption=Datenabfrage aus dem Produktkatalog] { "id": <>, - "title": "<>" + "name": "<>" } \end{lstlisting} diff --git a/documentation/microservice_stock/documentation.pdf b/documentation/microservice_stock/documentation.pdf index 1c02abb..ee6fa46 100644 Binary files a/documentation/microservice_stock/documentation.pdf and b/documentation/microservice_stock/documentation.pdf differ diff --git a/webroot/api-test/product/1/index.html b/webroot/api-test/product/1/index.html index d7ae1c0..8f0341f 100644 --- a/webroot/api-test/product/1/index.html +++ b/webroot/api-test/product/1/index.html @@ -1,4 +1,4 @@ { "id": 1, -"title": "Kiwi" +"name": "Kiwi" } diff --git a/webroot/api-test/product/2/index.html b/webroot/api-test/product/2/index.html index 00332d5..dd16b03 100644 --- a/webroot/api-test/product/2/index.html +++ b/webroot/api-test/product/2/index.html @@ -1,4 +1,4 @@ { "id": 2, -"title": "Blueberries" +"name": "Blueberries" } diff --git a/webroot/api-test/product/3/index.html b/webroot/api-test/product/3/index.html index f10251a..f4d932c 100644 --- a/webroot/api-test/product/3/index.html +++ b/webroot/api-test/product/3/index.html @@ -1,4 +1,4 @@ { "id": 3, -"title": "Cherries" +"name": "Cherries" } diff --git a/webroot/api-test/product/4/index.html b/webroot/api-test/product/4/index.html index df11269..be45a3a 100644 --- a/webroot/api-test/product/4/index.html +++ b/webroot/api-test/product/4/index.html @@ -1,4 +1,4 @@ { "id": 4, -"title": "Potatoes" +"name": "Potatoes" } diff --git a/webroot/api-test/product/5/index.html b/webroot/api-test/product/5/index.html index 926d7e0..393756f 100644 --- a/webroot/api-test/product/5/index.html +++ b/webroot/api-test/product/5/index.html @@ -1,4 +1,4 @@ { "id": 5, -"title": "Tomatoes" +"name": "Tomatoes" } diff --git a/webroot/api-test/product/6/index.html b/webroot/api-test/product/6/index.html index bbef7ed..c5684ff 100644 --- a/webroot/api-test/product/6/index.html +++ b/webroot/api-test/product/6/index.html @@ -1,4 +1,4 @@ { "id": 6, -"title": "Rhubarb" +"name": "Rhubarb" } diff --git a/webroot/api-test/product/index.html b/webroot/api-test/product/index.html index 47d53fe..7090800 100644 --- a/webroot/api-test/product/index.html +++ b/webroot/api-test/product/index.html @@ -1,8 +1,8 @@ [ -{"id":1, "title": "Kiwi"}, -{"id":2, "title": "Blueberries"}, -{"id":3, "title": "Cherries"}, -{"id":4, "title": "Potatoes"}, -{"id":5, "title": "Tomatoes"}, -{"id":6, "title": "Rhubarb"} +{"id":1, "name": "Kiwi"}, +{"id":2, "name": "Blueberries"}, +{"id":3, "name": "Cherries"}, +{"id":4, "name": "Potatoes"}, +{"id":5, "name": "Tomatoes"}, +{"id":6, "name": "Rhubarb"} ] diff --git a/webroot/static/html/item-add.html b/webroot/static/html/item-add.html index a1eedf5..3e5f4d0 100644 --- a/webroot/static/html/item-add.html +++ b/webroot/static/html/item-add.html @@ -1,5 +1,5 @@

- {{product.title}} + {{product.name}} diff --git a/webroot/static/html/item.html b/webroot/static/html/item.html index 9db3e2f..03af53f 100644 --- a/webroot/static/html/item.html +++ b/webroot/static/html/item.html @@ -1,5 +1,5 @@

- {{obj.title}} + {{obj.name}}

diff --git a/webroot/static/html/list.html b/webroot/static/html/list.html index 3e0cd42..d572a64 100644 --- a/webroot/static/html/list.html +++ b/webroot/static/html/list.html @@ -11,7 +11,7 @@ {{item.id}} - {{item.title}} + {{item.name}} diff --git a/webroot/static/js/item-add.controller.js b/webroot/static/js/item-add.controller.js index 8a758a6..047a5cb 100644 --- a/webroot/static/js/item-add.controller.js +++ b/webroot/static/js/item-add.controller.js @@ -14,7 +14,7 @@ angular.module('microStock') $scope.submit = function(){ $http.post(config.store.goods.productById.replace("%d",$stateParams.productid)+'?count='+$scope.count,$scope.obj).then(function(){ $scope.obj = {}; - $scope.msg = {type:'success',text:'Saved '+$scope.count+' good(s) from product '+$scope.product.title+'.'}; + $scope.msg = {type:'success',text:'Saved '+$scope.count+' good(s) from product '+$scope.product.name+'.'}; }, function(e){ if(e.status == 403){ $scope.msg = {type:'error',text:'You are not allowed to add goods, maybe you should login!'};