diff --git a/ModelCatalogueCorePluginTestApp/build.gradle b/ModelCatalogueCorePluginTestApp/build.gradle index 353ecabc44..f5ab65a8e1 100644 --- a/ModelCatalogueCorePluginTestApp/build.gradle +++ b/ModelCatalogueCorePluginTestApp/build.gradle @@ -39,7 +39,7 @@ task npmCacheConfig(type: NpmTask, dependsOn: nodeSetup) { task npmPackages(type: NpmTask, dependsOn: npmCacheConfig) { description = "Install Node.js packages" args = [ 'install' ] - // inputs.files file('package.json') + inputs.files file('package.json') outputs.files file('node_modules') } @@ -50,7 +50,7 @@ task bowerInstall(type: NodeTask) { "--config.storage.packages=${gradle.getGradleUserHomeDir()}/caches/bower/packages", "--config.storage.registry=${gradle.getGradleUserHomeDir()}/caches/bower/registry", 'install'] - // inputs.files file('bower.json') + inputs.files file('bower.json') outputs.files file('grails-app/assets/bower_components') dependsOn npmPackages } @@ -483,8 +483,10 @@ task stop(type: Exec) { bowerInstall.finalizedBy cleanUpBowerDependencies stop.finalizedBy stopContainers - -task war(type: Exec, dependsOn: bowerInstall) { +task deleteUnnecessaryJavascript(type: Delete) { + delete 'grails-app/assets/bower_components/d3/test', 'grails-app/assets/bower_components/validator-js/src', 'grails-app/assets/bower_components/validator-js/lib' +} +task war(type: Exec, dependsOn: [bowerInstall, deleteUnnecessaryJavascript]) { description = "Build production war of MX application" commandLine grailsw, 'war', '--non-interactive', '--stacktrace' } diff --git a/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/init.js b/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/init.js index e8dde8da51..86fb8d23a4 100644 --- a/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/init.js +++ b/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/init.js @@ -3,6 +3,9 @@ //= require underscore/underscore-min.js //= require_self // @flow +/** + * D3 basicView/basic data model view + */ // exposed variable var serverUrl = "" @@ -123,7 +126,9 @@ var initD3 = (function() { } function writeMessage(text) { - $('#d3-info-messages').append("
  • " + (new Date().toLocaleString()) + ":
    " + text + "
  • ") + console.log((new Date().toLocaleString())) + console.log(text) + } diff --git a/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/style.css b/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/style.css index 974a1e8bd4..3dd190eb93 100644 --- a/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/style.css +++ b/ModelCatalogueCorePluginTestApp/grails-app/assets/other/d3_data_model_view/style.css @@ -44,20 +44,21 @@ } .column-left { - width: 60%; + width: 75%; } .column-right { - width: 20%; - overflow: scroll; - border: solid 3px; -} -.column-right-2 { - width: 20%; + width: 25%; overflow: scroll; border: solid 3px; } +/*.column-right-2 {*/ + /*width: 20%;*/ + /*overflow: scroll;*/ + /*border: solid 3px;*/ +/*}*/ + .info-box { padding: 0.8em; diff --git a/ModelCatalogueCorePluginTestApp/grails-app/views/dataModel/d3_data_model_view.gsp b/ModelCatalogueCorePluginTestApp/grails-app/views/dataModel/d3_data_model_view.gsp index 9aaf0b48fc..d3fe7bf7b3 100644 --- a/ModelCatalogueCorePluginTestApp/grails-app/views/dataModel/d3_data_model_view.gsp +++ b/ModelCatalogueCorePluginTestApp/grails-app/views/dataModel/d3_data_model_view.gsp @@ -1,5 +1,6 @@ // @flow <%-- + Basic Data Model View, using D3.js (basicView) Created by IntelliJ IDEA. User: james Date: 16/05/2018 @@ -70,17 +71,18 @@ - -
    -
    -

    Messages:

    - -
    -