From df2091f9d9b8a9f40e242d362cacd9ec9fbe30c4 Mon Sep 17 00:00:00 2001 From: SobieS93 Date: Thu, 10 Dec 2015 12:10:47 +0100 Subject: [PATCH 1/5] enitities .json --- .jhipster/NewStockWallet.json | 76 +++++++++++++++++++++++++++++++++++ .jhipster/PortfolioStore.json | 29 +++++++++++++ .jhipster/StockInfo.json | 53 ++++++++++++++++++++++++ .jhipster/StockQuotes.json | 39 ++++++++++++++++++ 4 files changed, 197 insertions(+) create mode 100644 .jhipster/NewStockWallet.json create mode 100644 .jhipster/PortfolioStore.json create mode 100644 .jhipster/StockInfo.json create mode 100644 .jhipster/StockQuotes.json diff --git a/.jhipster/NewStockWallet.json b/.jhipster/NewStockWallet.json new file mode 100644 index 0000000..26c7965 --- /dev/null +++ b/.jhipster/NewStockWallet.json @@ -0,0 +1,76 @@ +{ + "relationships": [ + { + "relationshipId": 1, + "relationshipName": "user", + "otherEntityName": "user", + "relationshipType": "many-to-one", + "otherEntityField": "1" + }, + { + "relationshipId": 2, + "relationshipName": "portfolioStore", + "otherEntityName": "portfolioStore", + "relationshipType": "one-to-many", + "otherEntityField": "1" + } + ], + "fields": [ + { + "fieldId": 1, + "fieldName": "name", + "fieldType": "String", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldId": 2, + "fieldName": "historicalDataDate", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldId": 3, + "fieldName": "calculatingsDate", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldId": 4, + "fieldName": "prognoseDate", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldId": 5, + "fieldName": "riskfreeRate", + "fieldType": "Double" + }, + { + "fieldId": 6, + "fieldName": "expectedReturn", + "fieldType": "Double" + }, + { + "fieldId": 7, + "fieldName": "expectedVariation", + "fieldType": "Double" + }, + { + "fieldId": 8, + "fieldName": "sharpRatio", + "fieldType": "Double" + } + + ], + "changelogDate": "20151107161521", + "dto": "mapstruct", + "pagination": "pager" +} diff --git a/.jhipster/PortfolioStore.json b/.jhipster/PortfolioStore.json new file mode 100644 index 0000000..b4dc521 --- /dev/null +++ b/.jhipster/PortfolioStore.json @@ -0,0 +1,29 @@ +{ + "relationships": [ + { + "relationshipId": 1, + "relationshipName": "stockWallet", + "otherEntityName": "stockWallet", + "relationshipType": "many-to-one", + "otherEntityField": "name" + }, + { + "relationshipId": 2, + "relationshipName": "stockInfo", + "otherEntityName": "stockInfo", + "relationshipType": "many-to-one", + "otherEntityField": "1" + } + ], + "fields": [ + { + "fieldId": 1, + "fieldName": "percent", + "fieldType": "Double" + } + ], + "changelogDate": "20151209201934", + "dto": "no", + "service": "no", + "pagination": "no" +} diff --git a/.jhipster/StockInfo.json b/.jhipster/StockInfo.json new file mode 100644 index 0000000..50c1b11 --- /dev/null +++ b/.jhipster/StockInfo.json @@ -0,0 +1,53 @@ +{ + "relationships": [ + { + "relationshipId": 1, + "relationshipName": "stockQuotes", + "otherEntityName": "stockQuotes", + "relationshipType": "one-to-many", + "otherEntityRelationshipName": "stockInfo" + }, + { + "relationshipId": 2, + "relationshipName": "portfolioStore", + "otherEntityName": "portfolioStore", + "relationshipType": "one-to-many", + "otherEntityRelationshipName": "stockInfo" + } + ], + "fields": [ + { + "fieldId": 1, + "fieldName": "name", + "fieldType": "String", + "fieldValidateRules": [] + }, + { + "fieldId": 2, + "fieldName": "symbol", + "fieldType": "String", + "fieldValidateRules": [] + }, + { + "fieldId": 3, + "fieldName": "quotesStartDate", + "fieldType": "LocalDate", + "fieldValidateRules": [] + }, + { + "fieldId": 4, + "fieldName": "quotesEndDate", + "fieldType": "LocalDate", + "fieldValidateRules": [] + }, + { + "fieldId": 5, + "fieldName": "isInvestorModeAvaiable", + "fieldType": "Boolean" + } + ], + "changelogDate": "20151209210649", + "dto": "no", + "service": "no", + "pagination": "no" +} \ No newline at end of file diff --git a/.jhipster/StockQuotes.json b/.jhipster/StockQuotes.json new file mode 100644 index 0000000..00aec15 --- /dev/null +++ b/.jhipster/StockQuotes.json @@ -0,0 +1,39 @@ +{ + "relationships": [ + { + "relationshipId": 1, + "relationshipName": "stockInfo", + "otherEntityName": "stockInfo", + "relationshipType": "many-to-one", + "otherEntityField": "id" + } + ], + "fields": [ + { + "fieldId": 1, + "fieldName": "date", + "fieldType": "LocalDate", + "fieldValidateRules": [] + }, + { + "fieldId": 2, + "fieldName": "value", + "fieldType": "Double", + "fieldValidateRules": [] + }, + { + "fieldId": 3, + "fieldName": "splitRate", + "fieldType": "Double" + }, + { + "fieldId": 4, + "fieldName": "dividend", + "fieldType": "Double" + } + ], + "changelogDate": "20151209205511", + "dto": "no", + "service": "no", + "pagination": "no" +} \ No newline at end of file From f2c282cbe077ec5079a087c39e63389c85c7524d Mon Sep 17 00:00:00 2001 From: SobieS93 Date: Thu, 10 Dec 2015 14:04:45 +0100 Subject: [PATCH 2/5] correction --- .jhipster/NewStockWallet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jhipster/NewStockWallet.json b/.jhipster/NewStockWallet.json index 26c7965..4c703c4 100644 --- a/.jhipster/NewStockWallet.json +++ b/.jhipster/NewStockWallet.json @@ -5,14 +5,14 @@ "relationshipName": "user", "otherEntityName": "user", "relationshipType": "many-to-one", - "otherEntityField": "1" + "otherEntityField": "id" }, { "relationshipId": 2, "relationshipName": "portfolioStore", "otherEntityName": "portfolioStore", "relationshipType": "one-to-many", - "otherEntityField": "1" + "otherEntityField": "id" } ], "fields": [ From 72ebf79a2c07c74c352585f3cddb01c6e799cdf3 Mon Sep 17 00:00:00 2001 From: SobieS93 Date: Thu, 10 Dec 2015 15:29:15 +0100 Subject: [PATCH 3/5] entities correction --- .jhipster/NewStockWallet.json | 16 +++++++--------- .jhipster/PortfolioStore.json | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.jhipster/NewStockWallet.json b/.jhipster/NewStockWallet.json index 4c703c4..89f9e84 100644 --- a/.jhipster/NewStockWallet.json +++ b/.jhipster/NewStockWallet.json @@ -5,14 +5,14 @@ "relationshipName": "user", "otherEntityName": "user", "relationshipType": "many-to-one", - "otherEntityField": "id" + "otherEntityField": "login" }, { "relationshipId": 2, "relationshipName": "portfolioStore", "otherEntityName": "portfolioStore", "relationshipType": "one-to-many", - "otherEntityField": "id" + "otherEntityRelationshipName": "newStockWallet" } ], "fields": [ @@ -43,10 +43,7 @@ { "fieldId": 4, "fieldName": "prognoseDate", - "fieldType": "LocalDate", - "fieldValidateRules": [ - "required" - ] + "fieldType": "LocalDate" }, { "fieldId": 5, @@ -70,7 +67,8 @@ } ], - "changelogDate": "20151107161521", - "dto": "mapstruct", - "pagination": "pager" + "changelogDate": "20151209201934", + "dto": "no", + "service": "no", + "pagination": "no" } diff --git a/.jhipster/PortfolioStore.json b/.jhipster/PortfolioStore.json index b4dc521..709afc8 100644 --- a/.jhipster/PortfolioStore.json +++ b/.jhipster/PortfolioStore.json @@ -2,8 +2,8 @@ "relationships": [ { "relationshipId": 1, - "relationshipName": "stockWallet", - "otherEntityName": "stockWallet", + "relationshipName": "newStockWallet", + "otherEntityName": "newStockWallet", "relationshipType": "many-to-one", "otherEntityField": "name" }, @@ -12,7 +12,7 @@ "relationshipName": "stockInfo", "otherEntityName": "stockInfo", "relationshipType": "many-to-one", - "otherEntityField": "1" + "otherEntityField": "name" } ], "fields": [ From b983ea08178091f52f04d72d1c1932a2928e6f5b Mon Sep 17 00:00:00 2001 From: SobieS93 Date: Thu, 10 Dec 2015 17:46:32 +0100 Subject: [PATCH 4/5] entities common files --- .../resources/config/liquibase/master.xml | 6 ++++ src/main/webapp/i18n/en/global.json | 5 ++++ src/main/webapp/i18n/pl/global.json | 5 ++++ src/main/webapp/index.html | 28 +++++++++++++++++++ .../scripts/components/navbar/navbar.html | 12 +++++++- 5 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index f979b90..b0cf7c0 100755 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -7,5 +7,11 @@ + + + + + + diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 24a68e8..fe0d4d1 100755 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -1,3 +1,4 @@ + { "global": { "title": "Cabzza", @@ -8,6 +9,10 @@ "main": "Entities", "stockWallet": "StockWallet", "stockWallet1": "StockWallet1", + "stockQuotes": "StockQuotes", + "stockInfo": "StockInfo", + "portfolioStore": "PortfolioStore", + "newStockWallet": "NewStockWallet", "additionalEntity": "JHipster will add additional entities here (do not translate!)" }, "account": { diff --git a/src/main/webapp/i18n/pl/global.json b/src/main/webapp/i18n/pl/global.json index d2d99ab..ccda69b 100644 --- a/src/main/webapp/i18n/pl/global.json +++ b/src/main/webapp/i18n/pl/global.json @@ -1,3 +1,4 @@ + { "global": { "title": "Cabzza", @@ -7,6 +8,10 @@ "entities": { "main": "Encje", "stockWallet": "Portfele", + "stockQuotes": "StockQuotes", + "stockInfo": "StockInfo", + "portfolioStore": "PortfolioStore", + "newStockWallet": "NewStockWallet", "additionalEntity": "JHipster will add additional entities here (do not translate!)" }, "account": { diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 7eaf853..4fffa54 100755 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -197,6 +197,34 @@

Title 4

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/scripts/components/navbar/navbar.html b/src/main/webapp/scripts/components/navbar/navbar.html index f455486..b4ee5c8 100755 --- a/src/main/webapp/scripts/components/navbar/navbar.html +++ b/src/main/webapp/scripts/components/navbar/navbar.html @@ -30,7 +30,17 @@