Adding swimming pool UI

This commit is contained in:
Nicolas Héron 2019-09-27 14:51:04 +02:00
commit 8a8903096c
7 changed files with 71 additions and 11 deletions

View file

@ -73,7 +73,6 @@ services:
- kieserverdir:/niodir-kieserver - kieserverdir:/niodir-kieserver
environment: environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server1" PYMMA_OPTS: "-Dorg.kie.server.id=server1"
hostname: proxy1.pymma
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.22 ipv4_address: 172.27.1.22
@ -95,7 +94,6 @@ services:
- kieserverdir:/niodir-kieserver - kieserverdir:/niodir-kieserver
environment: environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server2" PYMMA_OPTS: "-Dorg.kie.server.id=server2"
hostname: proxy2.pymma
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.32 ipv4_address: 172.27.1.32
@ -117,7 +115,6 @@ services:
- kieserverdir:/niodir-kieserver - kieserverdir:/niodir-kieserver
environment: environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server3" PYMMA_OPTS: "-Dorg.kie.server.id=server3"
hostname: proxy3.pymma
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.42 ipv4_address: 172.27.1.42
@ -139,7 +136,6 @@ services:
- kieserverdir:/niodir-kieserver - kieserverdir:/niodir-kieserver
environment: environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server4" PYMMA_OPTS: "-Dorg.kie.server.id=server4"
hostname: proxy4.pymma
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.52 ipv4_address: 172.27.1.52
@ -161,7 +157,6 @@ services:
- kieserverdir:/niodir-kieserver - kieserverdir:/niodir-kieserver
environment: environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server5" PYMMA_OPTS: "-Dorg.kie.server.id=server5"
hostname: proxy5.pymma
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.62 ipv4_address: 172.27.1.62

View file

@ -113,7 +113,8 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true "dev": true,
"optional": true
}, },
"assign-symbols": { "assign-symbols": {
"version": "1.0.0", "version": "1.0.0",
@ -429,6 +430,7 @@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
} }
@ -589,7 +591,8 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true "dev": true,
"optional": true
}, },
"depd": { "depd": {
"version": "1.1.2", "version": "1.1.2",
@ -843,7 +846,8 @@
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
"dev": true "dev": true,
"optional": true
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "1.1.0", "version": "1.1.0",

View file

@ -125,7 +125,66 @@
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
</execution>
<execution>
<id>npm generate</id>
<goals>
<goal>npm</goal>
</goals>
<!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase>
<configuration>
<!-- optional: The default argument is actually
"install", so unless you need to run some other npm command,
you can remove this whole <configuration> section.
-->
<arguments>install</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes/resources/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources/static</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>

View file

@ -23,7 +23,7 @@ public class HomeController {
@RequestMapping("/") @RequestMapping("/")
public String home() { public String home() {
return "index"; return "index.html";
} }
} }

View file

@ -107,7 +107,7 @@ productManagerModule.controller('quoteManagerController', function ($scope, $htt
$scope.calculatePrice = function () { $scope.calculatePrice = function () {
var myQuote = $scope.quote; var myQuote = $scope.quote;
$http.put(urlBase + "/swimmingpool-web/quote/calculate/" + $scope.containerid + "/" + $scope.aClassName, myQuote).success(function (data) { $http.put(urlBase + "/quote/calculate/" + $scope.containerid + "/", myQuote).success(function (data) {
$scope.quoteResult = data; $scope.quoteResult = data;
$scope.allSessionExecutionDetails = JSON.parse(data.sessionLogging); $scope.allSessionExecutionDetails = JSON.parse(data.sessionLogging);
$scope.sessionLogging = JSON.stringify($scope.allSessionExecutionDetails, null, 3); $scope.sessionLogging = JSON.stringify($scope.allSessionExecutionDetails, null, 3);

View file

@ -21,7 +21,9 @@
<properties> <properties>
<jbpm.version>7.26.0.Final</jbpm.version> <jbpm.version>7.26.0.Final</jbpm.version>
<node.version>v10.16.3</node.version>
<npm.version>6.11.3</npm.version>
<frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
<spring.boot.version>2.1.2.RELEASE</spring.boot.version> <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
<spring.version>4.3.16.RELEASE</spring.version> <spring.version>4.3.16.RELEASE</spring.version>