Compare commits
89 Commits
1ca4f18e3d
...
standalone
| Author | SHA1 | Date | |
|---|---|---|---|
| eb65b56b78 | |||
| b0415ed972 | |||
| 4b211e425d | |||
| 9459eee606 | |||
| a81c458775 | |||
| ee0eab22f8 | |||
| 9ccb7a14b5 | |||
| 05cc0e985a | |||
| 6dc5ba1a1e | |||
| a6ae8e533e | |||
| 8e0572d35b | |||
| 697d3664aa | |||
| 526e1d842e | |||
| 06c9b4998f | |||
| ac5dcdc58f | |||
| 296d42e721 | |||
| 9db020ceb0 | |||
| 36da503be9 | |||
| 42751f84d4 | |||
| 39d7c029ea | |||
| f072185074 | |||
| 122ba11a79 | |||
| f1d7799bf1 | |||
| 680f1bff03 | |||
| fa0315650a | |||
| 8f765dd478 | |||
| 1234560512 | |||
| 2711579afb | |||
| 3ac021e45f | |||
| c199eae4ff | |||
| 6073dd0779 | |||
| fee5eda780 | |||
| cc0db6d732 | |||
| f084396e95 | |||
| e4b6eea4b1 | |||
| 75fa966af3 | |||
| a3e4917e89 | |||
| 05fc03e48f | |||
| b00ce507ef | |||
| a69fe09464 | |||
| 77b99801e4 | |||
| da210145e6 | |||
| 21a84b5223 | |||
| a99a884423 | |||
| 6d6b6ba00c | |||
| 380bad6967 | |||
| f3556b6909 | |||
| 452030de5e | |||
| 6b8e3d2089 | |||
| b0467c4571 | |||
| a64e851c33 | |||
| fefc7411c1 | |||
| 00a1bf8ffb | |||
| 317d31bbda | |||
| d339f5307f | |||
| b3085c9b0c | |||
| 96955e0515 | |||
| 9a41f132f8 | |||
| 33c4fe1448 | |||
| d320ff3d93 | |||
| 4ce9cca7e0 | |||
| 29215f0410 | |||
| abc60c6de2 | |||
| c969c5c848 | |||
| 6552d51bcc | |||
| 43e13b53b1 | |||
| 731e9264e3 | |||
| 8839ab52a2 | |||
| f8a199fd6a | |||
| 48ae47d050 | |||
| 3386f0994f | |||
| 75f45c4d87 | |||
| bacd86d836 | |||
| c7af333052 | |||
| a3aa62aee2 | |||
| 6d2e8da805 | |||
| 53e7a21602 | |||
| b6045eda22 | |||
| 6d8af4fdc6 | |||
| 359c17bf29 | |||
| 686e3edd60 | |||
| 2310c2ab0d | |||
| a6fbd0c60d | |||
| 2b82a6822c | |||
| 0bc58ba166 | |||
| e543e0b388 | |||
| 882f04d893 | |||
| da4a95e5ed | |||
| 4679da480c |
@@ -1,6 +1,6 @@
|
||||
package org.lucares.pdb.map;
|
||||
|
||||
import java.util.List;
|
||||
import org.lucares.utils.HumanBytes;
|
||||
|
||||
public class PersistentMapStats {
|
||||
private long values = 0;
|
||||
@@ -87,7 +87,7 @@ public class PersistentMapStats {
|
||||
builder.append(String.format("\navg. depth= %.2f", averageDepth));
|
||||
builder.append(String.format("\navg. fill= %.2f", averageFill));
|
||||
builder.append(String.format("\nvalues/node=%.2f", averageValuesInNode));
|
||||
builder.append(String.format("\nfile size= %s\n", toHumanBytes(fileSize)));
|
||||
builder.append(String.format("\nfile size= %s\n", HumanBytes.toHumanBytes(fileSize)));
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
@@ -100,21 +100,9 @@ public class PersistentMapStats {
|
||||
builder.append(String.format("\navg. depth= %.2f -> %.2f", old.averageDepth, averageDepth));
|
||||
builder.append(String.format("\navg. fill= %.2f -> %.2f", old.averageFill, averageFill));
|
||||
builder.append(String.format("\nvalues/node=%.2f -> %.2f", old.averageValuesInNode, averageValuesInNode));
|
||||
builder.append(String.format("\nfile size= %s -> %s\n", toHumanBytes(old.fileSize), toHumanBytes(fileSize)));
|
||||
builder.append(String.format("\nfile size= %s -> %s\n", HumanBytes.toHumanBytes(old.fileSize),
|
||||
HumanBytes.toHumanBytes(fileSize)));
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
private static String toHumanBytes(final long bytes) {
|
||||
final List<String> powers = List.of("bytes", "KB", "MB", "GB", "TB", "PB", "EB");
|
||||
|
||||
int power = 1;
|
||||
String result = String.format("%d bytes", bytes);
|
||||
while (bytes >= Math.pow(1024, power) && power < powers.size()) {
|
||||
result = String.format("%.3f", bytes / Math.pow(1024, power));
|
||||
result = result.replaceAll("\\.?0*$", "");
|
||||
result = result + " " + powers.get(power);
|
||||
power = power + 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
31
build.gradle
@@ -4,27 +4,27 @@ import org.apache.tools.ant.filters.ReplaceTokens
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'eclipse'
|
||||
id 'com.github.ben-manes.versions' version "0.46.0" // check for dependency updates run: gradlew dependenyUpdates
|
||||
id 'com.github.ben-manes.versions' version "0.51.0" // check for dependency updates run: gradlew dependenyUpdates
|
||||
}
|
||||
|
||||
|
||||
ext {
|
||||
|
||||
javaVersion=17
|
||||
javaVersion=21
|
||||
|
||||
version_log4j2= '2.19.0' // keep in sync with spring-boot-starter-log4j2
|
||||
version_spring = '3.0.4'
|
||||
version_junit = '5.9.2'
|
||||
version_junit_platform = '1.9.2'
|
||||
version_nodejs = '16.17.1' // keep in sync with npm
|
||||
version_npm = '8.15.0' // keep in sync with nodejs
|
||||
version_log4j2= '2.20.0' // keep in sync with spring-boot-starter-log4j2
|
||||
version_spring = '3.3.4'
|
||||
version_junit = '5.11.1'
|
||||
version_junit_platform = '1.11.1'
|
||||
version_nodejs = '20.17.0' // keep in sync with npm
|
||||
version_npm = '10.8.2' // keep in sync with nodejs
|
||||
|
||||
lib_antlr = "org.antlr:antlr4:4.11.1"
|
||||
lib_antlr = "org.antlr:antlr4:4.13.2"
|
||||
|
||||
lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
|
||||
lib_commons_csv= 'org.apache.commons:commons-csv:1.10.0'
|
||||
lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.12.0'
|
||||
lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
|
||||
lib_commons_csv= 'org.apache.commons:commons-csv:1.12.0'
|
||||
lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.17.0'
|
||||
lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.18.0'
|
||||
|
||||
lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
|
||||
lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
|
||||
@@ -73,6 +73,11 @@ subprojects {
|
||||
url 'https://repo.lucares.de/'
|
||||
content { includeGroup "org.lucares" }
|
||||
}
|
||||
maven {
|
||||
url "https://nexus.disco.lab/repository/maven-all/"
|
||||
allowInsecureProtocol = true
|
||||
content { excludeGroup "org.lucares" }
|
||||
}
|
||||
mavenCentral(content: { excludeGroup "org.lucares" })
|
||||
}
|
||||
|
||||
@@ -136,5 +141,5 @@ subprojects {
|
||||
}
|
||||
|
||||
wrapper {
|
||||
gradleVersion = '8.0.2'
|
||||
gradleVersion = '8.10.2'
|
||||
}
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
34
gradlew
vendored
@@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@@ -83,10 +85,9 @@ done
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -133,10 +134,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
||||
22
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
|
||||
liquibase.hub.mode=off
|
||||
@@ -1,5 +1,7 @@
|
||||
package org.lucares.pdb.api;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class AbortException extends RuntimeException {
|
||||
|
||||
private static final long serialVersionUID = 7614132985675048490L;
|
||||
@@ -29,4 +31,18 @@ public class AbortException extends RuntimeException {
|
||||
}
|
||||
}
|
||||
|
||||
public static void sleepAbortibly(final long millis) throws AbortException {
|
||||
final long deadline = System.currentTimeMillis() + millis;
|
||||
|
||||
while (System.currentTimeMillis() < deadline) {
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(Math.min(10, deadline - System.currentTimeMillis()));
|
||||
} catch (final InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new AbortException();
|
||||
}
|
||||
AbortException.abortIfInterrupted();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -18,12 +18,15 @@
|
||||
"prefix": "app",
|
||||
"architect": {
|
||||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:browser",
|
||||
"builder": "@angular-devkit/build-angular:application",
|
||||
"options": {
|
||||
"outputPath": "build/generated/resources",
|
||||
"outputPath": {
|
||||
"base": "build/generated/resources"
|
||||
},
|
||||
"index": "src/index.html",
|
||||
"main": "src/main.ts",
|
||||
"polyfills": "src/polyfills.ts",
|
||||
"polyfills": [
|
||||
"src/polyfills.ts"
|
||||
],
|
||||
"tsConfig": "tsconfig.app.json",
|
||||
"inlineStyleLanguage": "scss",
|
||||
"assets": [
|
||||
@@ -33,7 +36,10 @@
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"scripts": []
|
||||
"scripts": [
|
||||
"node_modules/marked/marked.min.js"
|
||||
],
|
||||
"browser": "src/main.ts"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
@@ -55,12 +61,11 @@
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
}
|
||||
],
|
||||
"outputHashing": "all"
|
||||
"outputHashing": "all",
|
||||
"sourceMap": true
|
||||
},
|
||||
"development": {
|
||||
"buildOptimizer": false,
|
||||
"optimization": false,
|
||||
"vendorChunk": true,
|
||||
"extractLicenses": false,
|
||||
"sourceMap": true,
|
||||
"namedChunks": true
|
||||
@@ -75,10 +80,10 @@
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"browserTarget": "pdb-js:build:production"
|
||||
"buildTarget": "pdb-js:build:production"
|
||||
},
|
||||
"development": {
|
||||
"browserTarget": "pdb-js:build:development"
|
||||
"buildTarget": "pdb-js:build:development"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
@@ -86,7 +91,7 @@
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||
"options": {
|
||||
"browserTarget": "pdb-js:build"
|
||||
"buildTarget": "pdb-js:build"
|
||||
}
|
||||
},
|
||||
"test": {
|
||||
@@ -109,5 +114,8 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"cli": {
|
||||
"analytics": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@ import java.nio.file.Files
|
||||
import java.nio.file.Paths
|
||||
|
||||
plugins {
|
||||
id("com.github.node-gradle.node") version "3.5.1"
|
||||
id("com.github.node-gradle.node") version "7.0.0"
|
||||
id("java-library") // not sure why this is needed - is already set in /build.gradle - but without it the project sometimes (not always) is not configured as a java project
|
||||
}
|
||||
|
||||
|
||||
|
||||
25324
pdb-js/package-lock.json
generated
@@ -9,38 +9,44 @@
|
||||
"test": "ng test",
|
||||
"lint": "ng lint",
|
||||
"e2e": "ng e2e",
|
||||
"releasebuild": "ng build --configuration production"
|
||||
"releasebuild": "ng build --configuration production",
|
||||
"explore": "source-map-explorer build/generated/resources/**/*.js"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^15.0.2",
|
||||
"@angular/cdk": "^15.0.1",
|
||||
"@angular/common": "^15.0.2",
|
||||
"@angular/compiler": "^15.0.2",
|
||||
"@angular/core": "^15.0.2",
|
||||
"@angular/forms": "^15.0.2",
|
||||
"@angular/material": "^15.0.1",
|
||||
"@angular/platform-browser": "^15.0.2",
|
||||
"@angular/platform-browser-dynamic": "^15.0.2",
|
||||
"@angular/router": "^15.0.2",
|
||||
"moment": "^2.29.1",
|
||||
"@angular/animations": "^18.2.6",
|
||||
"@angular/cdk": "^18.2.6",
|
||||
"@angular/common": "^18.2.6",
|
||||
"@angular/compiler": "^18.2.6",
|
||||
"@angular/core": "^18.2.6",
|
||||
"@angular/forms": "^18.2.6",
|
||||
"@angular/material": "^18.2.6",
|
||||
"@angular/platform-browser": "^18.2.6",
|
||||
"@angular/platform-browser-dynamic": "^18.2.6",
|
||||
"@angular/router": "^18.2.6",
|
||||
"luxon": "^3.4.3",
|
||||
"marked": "^12",
|
||||
"ngx-markdown": "18.0.0",
|
||||
"rxjs": "~7.5.0",
|
||||
"rxjs-compat": "^6.6.7",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.11.4"
|
||||
"zone.js": "^0.14.10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^15.0.2",
|
||||
"@angular/cli": "^15.0.2",
|
||||
"@angular/compiler-cli": "^15.0.2",
|
||||
"@types/jasmine": "~3.10.0",
|
||||
"@angular-devkit/build-angular": "^18.2.6",
|
||||
"@angular/cli": "^18.2.6",
|
||||
"@angular/compiler-cli": "^18.2.6",
|
||||
"@types/jasmine": "~4.3.0",
|
||||
"@types/luxon": "^3.3.2",
|
||||
"@types/marked": "^4.0.8",
|
||||
"@types/node": "^12.11.1",
|
||||
"jasmine-core": "~3.10.0",
|
||||
"karma": "~6.3.0",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage": "~2.1.0",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine-html-reporter": "~1.7.0",
|
||||
"typescript": "4.8"
|
||||
"jasmine-core": "~4.6.0",
|
||||
"karma": "~6.4.0",
|
||||
"karma-chrome-launcher": "~3.2.0",
|
||||
"karma-coverage": "~2.2.0",
|
||||
"karma-jasmine": "~5.1.0",
|
||||
"karma-jasmine-html-reporter": "~2.1.0",
|
||||
"source-map-explorer": "^2.5.3",
|
||||
"typescript": "^5.4.5"
|
||||
}
|
||||
}
|
||||
@@ -1,31 +1,25 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
import { VisualizationPageComponent } from './visualization-page/visualization-page.component';
|
||||
import { MainPageComponent } from './main-page/main-page.component';
|
||||
import { UploadPageComponent } from './upload-page/upload-page.component';
|
||||
import { HelpPageComponent } from './help-page/help-page.component';
|
||||
import { DashboardPageComponent } from './dashboard-page/dashboard-page.component';
|
||||
import { DashboardComponent } from './dashboard-page/dashboard/dashboard.component';
|
||||
import { CustomizableGridComponent } from './customizable-grid/customizable-grid.component';
|
||||
|
||||
import { NgModule } from "@angular/core";
|
||||
import { RouterModule, Routes } from "@angular/router";
|
||||
import { VisualizationPageComponent } from "./visualization-page/visualization-page.component";
|
||||
import { DashboardPageComponent } from "./dashboard-page/dashboard-page.component";
|
||||
import { DashboardComponent } from "./dashboard-page/dashboard/dashboard.component";
|
||||
|
||||
const routes: Routes = [
|
||||
{ path: '', component: MainPageComponent},
|
||||
{ path: 'vis', component: VisualizationPageComponent },
|
||||
{ path: 'dashboard', component: DashboardPageComponent},
|
||||
{ path: 'dashboard/:id', component: DashboardComponent},
|
||||
{ path: 'upload', component: UploadPageComponent },
|
||||
{ path: 'grid', component: CustomizableGridComponent },
|
||||
{ path: 'help', component: HelpPageComponent },
|
||||
// { path: '**', component: PageNotFoundComponent }
|
||||
{ path: "", loadComponent: () => import("./main-page/main-page.component").then(m => m.MainPageComponent) },
|
||||
{ path: "vis", component: VisualizationPageComponent },
|
||||
{ path: "dashboard", component: DashboardPageComponent },
|
||||
{ path: "dashboard/:id", component: DashboardComponent },
|
||||
{ path: "upload", loadComponent: () => import("./upload-page/upload-page.component").then(m => m.UploadPageComponent) },
|
||||
{ path: "grid", loadComponent: () => import("./customizable-grid/customizable-grid.component").then(m => m.CustomizableGridComponent) },
|
||||
{ path: "help", loadComponent: () => import("./help-page/help-page.component").then(m => m.HelpPageComponent) },
|
||||
// { path: '**', component: PageNotFoundComponent }
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forRoot(routes, {})
|
||||
RouterModule.forRoot(routes, {}),
|
||||
],
|
||||
//declarations: [VisualizationPageComponent],
|
||||
declarations: [],
|
||||
exports: [RouterModule]
|
||||
exports: [RouterModule],
|
||||
})
|
||||
export class AppRoutingModule { }
|
||||
export class AppRoutingModule {}
|
||||
|
||||
@@ -1,109 +1,115 @@
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { NgModule, enableProdMode } from '@angular/core';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { BrowserModule } from "@angular/platform-browser";
|
||||
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
|
||||
import { enableProdMode, NgModule } from "@angular/core";
|
||||
import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
|
||||
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
|
||||
|
||||
import { AppRoutingModule } from './app-routing.module';
|
||||
import { AppComponent } from './app.component';
|
||||
import { MainPageComponent } from './main-page/main-page.component';
|
||||
import { HelpPageComponent } from './help-page/help-page.component';
|
||||
import { UploadPageComponent } from './upload-page/upload-page.component';
|
||||
import { VisualizationPageComponent } from './visualization-page/visualization-page.component';
|
||||
import { AppRoutingModule } from "./app-routing.module";
|
||||
import { AppComponent } from "./app.component";
|
||||
import { VisualizationPageComponent } from "./visualization-page/visualization-page.component";
|
||||
|
||||
import {MatAutocompleteModule} from '@angular/material/autocomplete';
|
||||
import {MatButtonModule} from '@angular/material/button';
|
||||
import {MatCheckboxModule} from '@angular/material/checkbox';
|
||||
import {MatSelectModule} from '@angular/material/select';
|
||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
import {MatProgressBarModule} from '@angular/material/progress-bar';
|
||||
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
|
||||
import {MatRadioModule} from '@angular/material/radio';
|
||||
import {MatSnackBarModule} from '@angular/material/snack-bar';
|
||||
import {MatTooltipModule} from '@angular/material/tooltip';
|
||||
import { YAxisDefinitionComponent } from './y-axis-definition/y-axis-definition.component';
|
||||
import { QueryAutocompleteComponent } from './query-autocomplete/query-autocomplete.component';
|
||||
import { LimitByComponent } from './limit-by/limit-by.component';
|
||||
import { PlotDetailsComponent } from './plot-details/plot-details.component';
|
||||
import { PlotViewComponent } from './plot-view/plot-view.component';
|
||||
import { GalleryViewComponent, GalleryItemView, GalleryFilterView } from './gallery-view/gallery-view.component';
|
||||
import { ImageToggleComponent } from './image-toggle/image-toggle.component';
|
||||
import { DashboardPageComponent } from './dashboard-page/dashboard-page.component';
|
||||
import { NewDashboardComponent } from './dashboard-page/new-dashboard/new-dashboard.component';
|
||||
import { MatDialogModule, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
|
||||
import {MatTableModule} from '@angular/material/table';
|
||||
import {MatGridListModule} from '@angular/material/grid-list';
|
||||
import {MatCardModule} from '@angular/material/card';
|
||||
import {MatBadgeModule} from '@angular/material/badge';
|
||||
import { DashboardComponent } from './dashboard-page/dashboard/dashboard.component';
|
||||
import { AddTextDialogComponent } from './dashboard-page/dashboard/add-text-dialog/add-text-dialog.component';
|
||||
import { TextWidgetComponent } from './dashboard-page/dashboard/text-widget/text-widget.component';
|
||||
import { AddPlotDialogComponent } from './dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component';
|
||||
import { PlotWidgetComponent } from './dashboard-page/dashboard/plot-widget/plot-widget.component';
|
||||
import { FullScreenPlotDialogComponent } from './dashboard-page/dashboard/full-screen-plot-dialog/full-screen-plot-dialog.component';
|
||||
import { CustomizableGridComponent } from './customizable-grid/customizable-grid.component';
|
||||
import { DatePickerComponent } from "./components/datepicker/date-picker.component";
|
||||
|
||||
import {DragDropModule} from '@angular/cdk/drag-drop';
|
||||
import { ConfirmationDialogComponent } from './confirmation-dialog/confirmation-dialog.component';
|
||||
import { FocusDirective } from './focus.directive';
|
||||
import { MatAutocompleteModule } from "@angular/material/autocomplete";
|
||||
import { MatButtonModule } from "@angular/material/button";
|
||||
import { MatCheckboxModule } from "@angular/material/checkbox";
|
||||
import { MatSelectModule } from "@angular/material/select";
|
||||
import { MatFormFieldModule } from "@angular/material/form-field";
|
||||
import { MatInputModule } from "@angular/material/input";
|
||||
import { MatProgressBarModule } from "@angular/material/progress-bar";
|
||||
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
|
||||
import { MatRadioModule } from "@angular/material/radio";
|
||||
import { MatSnackBarModule } from "@angular/material/snack-bar";
|
||||
import { MatTooltipModule } from "@angular/material/tooltip";
|
||||
import { OverlayModule } from "@angular/cdk/overlay";
|
||||
import { YAxisDefinitionComponent } from "./y-axis-definition/y-axis-definition.component";
|
||||
import { QueryAutocompleteComponent } from "./query-autocomplete/query-autocomplete.component";
|
||||
import { PlotDetailsComponent } from "./plot-details/plot-details.component";
|
||||
import { PlotViewComponent } from "./plot-view/plot-view.component";
|
||||
import {
|
||||
GalleryFilterView,
|
||||
GalleryItemView,
|
||||
GalleryViewComponent,
|
||||
} from "./gallery-view/gallery-view.component";
|
||||
import { ImageToggleComponent } from "./image-toggle/image-toggle.component";
|
||||
import { DashboardPageComponent } from "./dashboard-page/dashboard-page.component";
|
||||
import {
|
||||
MAT_DIALOG_DEFAULT_OPTIONS,
|
||||
MatDialogModule,
|
||||
} from "@angular/material/dialog";
|
||||
import { MatTabsModule } from "@angular/material/tabs";
|
||||
import { MatTableModule } from "@angular/material/table";
|
||||
import { MatGridListModule } from "@angular/material/grid-list";
|
||||
import { MatCardModule } from "@angular/material/card";
|
||||
import { MatBadgeModule } from "@angular/material/badge";
|
||||
import { DashboardComponent } from "./dashboard-page/dashboard/dashboard.component";
|
||||
import { TextWidgetComponent } from "./dashboard-page/dashboard/text-widget/text-widget.component";
|
||||
import { AddPlotDialogComponent } from "./dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component";
|
||||
import { PlotWidgetComponent } from "./dashboard-page/dashboard/plot-widget/plot-widget.component";
|
||||
import { FullScreenPlotDialogComponent } from "./dashboard-page/dashboard/full-screen-plot-dialog/full-screen-plot-dialog.component";
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
AppComponent,
|
||||
MainPageComponent,
|
||||
HelpPageComponent,
|
||||
UploadPageComponent,
|
||||
VisualizationPageComponent,
|
||||
YAxisDefinitionComponent,
|
||||
QueryAutocompleteComponent,
|
||||
LimitByComponent,
|
||||
PlotDetailsComponent,
|
||||
PlotViewComponent,
|
||||
GalleryViewComponent,
|
||||
GalleryItemView,
|
||||
GalleryFilterView,
|
||||
ImageToggleComponent,
|
||||
DashboardPageComponent,
|
||||
NewDashboardComponent,
|
||||
DashboardComponent,
|
||||
AddTextDialogComponent,
|
||||
TextWidgetComponent,
|
||||
AddPlotDialogComponent,
|
||||
PlotWidgetComponent,
|
||||
FullScreenPlotDialogComponent,
|
||||
CustomizableGridComponent,
|
||||
ConfirmationDialogComponent,
|
||||
FocusDirective
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
DragDropModule,
|
||||
MatAutocompleteModule,
|
||||
MatBadgeModule,
|
||||
MatButtonModule,
|
||||
MatCardModule,
|
||||
MatCheckboxModule,
|
||||
MatDialogModule,
|
||||
MatFormFieldModule,
|
||||
MatGridListModule,
|
||||
MatInputModule,
|
||||
MatRadioModule,
|
||||
MatProgressBarModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatSelectModule,
|
||||
MatSnackBarModule,
|
||||
MatTableModule,
|
||||
MatTooltipModule,
|
||||
BrowserAnimationsModule,
|
||||
HttpClientModule
|
||||
],
|
||||
providers: [{provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: {hasBackdrop: true}}],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule { }
|
||||
import { DragDropModule } from "@angular/cdk/drag-drop";
|
||||
import { ConfirmationDialogComponent } from "./confirmation-dialog/confirmation-dialog.component";
|
||||
import { FocusDirective } from "./focus.directive";
|
||||
import { MarkdownModule } from "ngx-markdown";
|
||||
import { MainPageComponent } from "./main-page/main-page.component";
|
||||
import { LimitByComponent } from "./limit-by/limit-by.component";
|
||||
|
||||
enableProdMode()
|
||||
@NgModule({ declarations: [
|
||||
AppComponent,
|
||||
VisualizationPageComponent,
|
||||
QueryAutocompleteComponent,
|
||||
PlotDetailsComponent,
|
||||
PlotViewComponent,
|
||||
GalleryViewComponent,
|
||||
GalleryItemView,
|
||||
GalleryFilterView,
|
||||
DashboardPageComponent,
|
||||
DashboardComponent,
|
||||
TextWidgetComponent,
|
||||
AddPlotDialogComponent,
|
||||
PlotWidgetComponent,
|
||||
FullScreenPlotDialogComponent,
|
||||
ConfirmationDialogComponent,
|
||||
FocusDirective,
|
||||
],
|
||||
bootstrap: [AppComponent],
|
||||
imports: [
|
||||
MarkdownModule.forRoot(),
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
DatePickerComponent,
|
||||
DragDropModule,
|
||||
ImageToggleComponent,
|
||||
LimitByComponent,
|
||||
MainPageComponent,
|
||||
MatAutocompleteModule,
|
||||
MatBadgeModule,
|
||||
MatButtonModule,
|
||||
MatCardModule,
|
||||
MatCheckboxModule,
|
||||
MatDialogModule,
|
||||
MatFormFieldModule,
|
||||
MatGridListModule,
|
||||
MatInputModule,
|
||||
MatRadioModule,
|
||||
MatProgressBarModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatSelectModule,
|
||||
MatSnackBarModule,
|
||||
MatTabsModule,
|
||||
MatTableModule,
|
||||
MatTooltipModule,
|
||||
BrowserAnimationsModule,
|
||||
OverlayModule,
|
||||
YAxisDefinitionComponent
|
||||
],
|
||||
providers: [{
|
||||
provide: MAT_DIALOG_DEFAULT_OPTIONS,
|
||||
useValue: { hasBackdrop: true },
|
||||
}, provideHttpClient(withInterceptorsFromDi())] })
|
||||
export class AppModule {}
|
||||
|
||||
enableProdMode();
|
||||
|
||||
188
pdb-js/src/app/components/datepicker/date-picker.component.html
Normal file
@@ -0,0 +1,188 @@
|
||||
<style>
|
||||
.date-picker-overlay {
|
||||
width: 500px;
|
||||
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
|
||||
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
|
||||
0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.tab-quick {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 2em;
|
||||
}
|
||||
.tab-quick-column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.date-picker-form-field {
|
||||
width: 23.5em;
|
||||
}
|
||||
</style>
|
||||
|
||||
<button
|
||||
mat-button
|
||||
matTooltip="Date Picker"
|
||||
(click)="isOpen = !isOpen"
|
||||
cdkOverlayOrigin
|
||||
#trigger="cdkOverlayOrigin"
|
||||
[attr.disabled]="isDisabled ? 'disabled' : null"
|
||||
>
|
||||
{{ datePickerControl.value?.display }}
|
||||
</button>
|
||||
|
||||
<ng-template
|
||||
cdkConnectedOverlay
|
||||
[cdkConnectedOverlayOrigin]="trigger"
|
||||
[cdkConnectedOverlayOpen]="isOpen"
|
||||
>
|
||||
<div class="date-picker-overlay">
|
||||
<mat-tab-group
|
||||
animationDuration="0ms"
|
||||
(selectedTabChange)="tabChange()"
|
||||
[(selectedIndex)]="selectedTabIndex"
|
||||
>
|
||||
<mat-tab label="Quick">
|
||||
<div class="tab-quick">
|
||||
<div class="tab-quick-column">
|
||||
<button mat-button (click)="applyQuick('BD/E1D', 'today')">
|
||||
Today
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('B-1D/E-1D', 'yesterday')">
|
||||
Yesterday
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('BW/EW', 'this week')">
|
||||
This Week
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('BM/EM', 'this month')">
|
||||
This Month
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('BY/EY', 'this year')">
|
||||
This Year
|
||||
</button>
|
||||
</div>
|
||||
<div class="tab-quick-column">
|
||||
<button mat-button (click)="applyQuick('B-7D/ED', 'last 7 days')">
|
||||
Last 7 Days
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('B-1W/ED', 'last week')">
|
||||
Last Week
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('B-30D/ED', 'last 30 days')">
|
||||
Last 30 Days
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('B-1M/E-1M', 'last month')">
|
||||
Last Month
|
||||
</button>
|
||||
<button
|
||||
mat-button
|
||||
(click)="applyQuick('B-3M/E-1M', 'last 3 months')"
|
||||
>
|
||||
Last 3 Months
|
||||
</button>
|
||||
<button mat-button (click)="applyQuick('B-1Y/E-1Y', 'last year')">
|
||||
Last Year
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</mat-tab>
|
||||
|
||||
<mat-tab label="Relative">
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'seconds', 59)"
|
||||
>
|
||||
<mat-label>Seconds:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-seconds"
|
||||
[(ngModel)]="relativeTimeRange.seconds"
|
||||
type="number"
|
||||
min="0"
|
||||
max="59"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'minutes', 59)"
|
||||
>
|
||||
<mat-label>Minutes:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-minutes"
|
||||
[(ngModel)]="relativeTimeRange.minutes"
|
||||
type="number"
|
||||
min="0"
|
||||
max="59"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'hours', 23)"
|
||||
>
|
||||
<mat-label>Hours:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-hours"
|
||||
[(ngModel)]="relativeTimeRange.hours"
|
||||
type="number"
|
||||
min="0"
|
||||
max="23"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'days', 367)"
|
||||
>
|
||||
<mat-label>Days:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-days"
|
||||
[(ngModel)]="relativeTimeRange.days"
|
||||
type="number"
|
||||
min="0"
|
||||
max="367"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'months', 11)"
|
||||
>
|
||||
<mat-label>Months:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-months"
|
||||
[(ngModel)]="relativeTimeRange.months"
|
||||
type="number"
|
||||
min="0"
|
||||
max="11"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<mat-form-field
|
||||
class="pdb-form-number-small"
|
||||
(wheel)="scrollRelativeTimeRange($event, 'years', 10)"
|
||||
>
|
||||
<mat-label>Years:</mat-label>
|
||||
<input
|
||||
matInput
|
||||
name="relative-time-range-years"
|
||||
[(ngModel)]="relativeTimeRange.years"
|
||||
type="number"
|
||||
min="0"
|
||||
max="10"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<button mat-button (click)="applyRelativeTimeRange()">Apply</button>
|
||||
</mat-tab>
|
||||
<mat-tab label="Absolute">
|
||||
<mat-form-field class="date-picker-form-field">
|
||||
<mat-label>Date Range:</mat-label>
|
||||
<input matInput [formControl]="dateRange" name="dates" />
|
||||
</mat-form-field>
|
||||
<button mat-button (click)="applyAbsoluteTime()">Apply</button>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
</div>
|
||||
</ng-template>
|
||||
208
pdb-js/src/app/components/datepicker/date-picker.component.ts
Normal file
@@ -0,0 +1,208 @@
|
||||
import { OverlayModule } from "@angular/cdk/overlay";
|
||||
import {
|
||||
Component,
|
||||
EventEmitter,
|
||||
forwardRef,
|
||||
Input,
|
||||
Output,
|
||||
} from "@angular/core";
|
||||
import {
|
||||
ControlValueAccessor,
|
||||
FormControl,
|
||||
FormsModule,
|
||||
NG_VALUE_ACCESSOR,
|
||||
ReactiveFormsModule,
|
||||
Validators,
|
||||
} from "@angular/forms";
|
||||
import { MatButtonModule } from "@angular/material/button";
|
||||
import { MAT_DIALOG_DEFAULT_OPTIONS } from "@angular/material/dialog";
|
||||
import { MatFormFieldModule } from "@angular/material/form-field";
|
||||
import { MatInputModule } from "@angular/material/input";
|
||||
import { MatTabsModule } from "@angular/material/tabs";
|
||||
import { BrowserModule } from "@angular/platform-browser";
|
||||
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
|
||||
|
||||
export type DateType = "QUICK" | "RELATIVE" | "ABSOLUTE";
|
||||
|
||||
export class DateValue {
|
||||
constructor(
|
||||
public type: DateType,
|
||||
public value: string,
|
||||
public display: string,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class DatePickerChange {
|
||||
constructor(public value: DateValue) {}
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: "app-date-picker",
|
||||
templateUrl: "./date-picker.component.html",
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
MatButtonModule,
|
||||
MatFormFieldModule,
|
||||
MatInputModule,
|
||||
MatTabsModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
OverlayModule
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
provide: NG_VALUE_ACCESSOR,
|
||||
useExisting: forwardRef(() => DatePickerComponent),
|
||||
multi: true,
|
||||
},
|
||||
{
|
||||
provide: MAT_DIALOG_DEFAULT_OPTIONS,
|
||||
useValue: { hasBackdrop: true },
|
||||
}
|
||||
],
|
||||
})
|
||||
export class DatePickerComponent implements ControlValueAccessor {
|
||||
isOpen = false;
|
||||
|
||||
relativeTimeRangeUnit = "relativeTimeRangeMinutes";
|
||||
|
||||
relativeTimeRangeAmount = 15;
|
||||
|
||||
relativeTimeRange = {
|
||||
seconds: 0,
|
||||
minutes: 15,
|
||||
hours: 0,
|
||||
days: 0,
|
||||
months: 0,
|
||||
years: 0,
|
||||
};
|
||||
|
||||
dateRange = new FormControl<string>(
|
||||
"2019-10-05 00:00:00 - 2019-10-11 23:59:59",
|
||||
[
|
||||
Validators.pattern(
|
||||
/^\d{4}-\d{2}-\d{2} ([01][0-9]|2[0-3]):\d{2}:\d{2} - \d{4}-\d{2}-\d{2} ([01][0-9]|2[0-3]):\d{2}:\d{2}$/,
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
datePickerControl = new FormControl(
|
||||
new DateValue("QUICK", "BM/EM", "this month"),
|
||||
);
|
||||
|
||||
@Input()
|
||||
isDisabled: boolean = false;
|
||||
|
||||
@Output()
|
||||
readonly dateValueSelected: EventEmitter<DatePickerChange> = new EventEmitter<
|
||||
DatePickerChange
|
||||
>();
|
||||
|
||||
selectedTabIndex = 0;
|
||||
|
||||
_onChange = (_: any) => {};
|
||||
|
||||
_onTouched = (_: any) => {};
|
||||
|
||||
constructor() {}
|
||||
|
||||
getDateValue(): DateValue {
|
||||
return this.datePickerControl.value!;
|
||||
}
|
||||
|
||||
writeValue(obj: DateValue): void {
|
||||
this.datePickerControl.setValue(obj);
|
||||
switch (obj.type) {
|
||||
case "QUICK":
|
||||
break;
|
||||
case "ABSOLUTE":
|
||||
this.dateRange.setValue(obj.value);
|
||||
break;
|
||||
case "RELATIVE":
|
||||
const x = this.relativeTimeRange;
|
||||
// obj.value looks like "P1Y2M3DT4H5M6S" or "PT4H5M6S" or "P1Y2M3D" or "P1YT6S" or ...
|
||||
const matches = obj.value.match(
|
||||
/P(?:(\d+)Y)(?:(\d+)M)(?:(\d+)D)?(?:T(?:(\d+)H)(?:(\d+)M)(?:(\d+)S))?/,
|
||||
) ?? [];
|
||||
|
||||
x.years = Number.parseInt(matches[1] ?? 0);
|
||||
x.months = Number.parseInt(matches[2] ?? 0);
|
||||
x.days = Number.parseInt(matches[3] ?? 0);
|
||||
x.hours = Number.parseInt(matches[4] ?? 0);
|
||||
x.minutes = Number.parseInt(matches[5] ?? 0);
|
||||
x.seconds = Number.parseInt(matches[6] ?? 0);
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
registerOnChange(fn: any): void {
|
||||
this._onChange = fn;
|
||||
}
|
||||
registerOnTouched(fn: any): void {
|
||||
this._onTouched = fn;
|
||||
}
|
||||
setDisabledState?(isDisabled: boolean): void {
|
||||
this.isDisabled = isDisabled;
|
||||
}
|
||||
|
||||
dateDisplay(): string {
|
||||
return this.datePickerControl.value?.display || "no date set";
|
||||
}
|
||||
|
||||
tabChange() {
|
||||
//(<any> window).initSimpleDatePicker(); // breaks form control
|
||||
}
|
||||
|
||||
setDateValue(dateValue: DateValue) {
|
||||
this.datePickerControl.setValue(dateValue);
|
||||
this._onChange(dateValue);
|
||||
this.dateValueSelected.emit(new DatePickerChange(dateValue));
|
||||
//console.log("date value updated: ", dateValue);
|
||||
}
|
||||
|
||||
applyQuick(value: string, display: string) {
|
||||
const newValue = new DateValue("QUICK", value, display);
|
||||
this.setDateValue(newValue);
|
||||
this.isOpen = false;
|
||||
}
|
||||
|
||||
private fixToRange(val: number, min: number, max: number) {
|
||||
return val < min ? min : (val > max ? max : val);
|
||||
}
|
||||
|
||||
applyRelativeTimeRange() {
|
||||
|
||||
const x = this.relativeTimeRange;
|
||||
const years = x.years ? "-"+x.years + "Y" : "";
|
||||
const months = x.months ? "-"+x.months + "M" : "";
|
||||
const days = x.days ? "-"+x.days + "D" : "";
|
||||
const hours = x.hours ? "-"+x.hours + "H" : "";
|
||||
const minutes = x.minutes ? "-"+x.minutes + "m" : "";
|
||||
|
||||
const timeRange = `B${years}${months}${days}${hours}${minutes}/Bm`;
|
||||
|
||||
const newValue = new DateValue("RELATIVE", timeRange, timeRange);
|
||||
this.setDateValue(newValue);
|
||||
this.isOpen = false;
|
||||
}
|
||||
|
||||
applyAbsoluteTime() {
|
||||
const value = <string> this.dateRange.value;
|
||||
const newValue = new DateValue("ABSOLUTE", value, value);
|
||||
this.setDateValue(newValue);
|
||||
this.isOpen = false;
|
||||
}
|
||||
|
||||
scrollRelativeTimeRange(
|
||||
event: WheelEvent,
|
||||
unit: "seconds" | "minutes" | "hours" | "days" | "months" | "years",
|
||||
max: number,
|
||||
) {
|
||||
this.relativeTimeRange[unit] = this.fixToRange(
|
||||
this.relativeTimeRange[unit] + (event.deltaY > 0 ? -1 : 1),
|
||||
0,
|
||||
max,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
.cdk-drag-preview {
|
||||
box-sizing: border-box;
|
||||
border-color: red;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
|
||||
0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12);
|
||||
@@ -63,6 +64,7 @@
|
||||
|
||||
.cdk-drag-placeholder {
|
||||
opacity: 0.3;
|
||||
border-color: green;
|
||||
}
|
||||
|
||||
.cdk-drag-animating {
|
||||
@@ -96,6 +98,7 @@ button {
|
||||
>
|
||||
<div
|
||||
cdkDropList
|
||||
style="outline: dashed 2px black;"
|
||||
(cdkDropListEntered)="onDropListEntered($event)"
|
||||
(cdkDropListDropped)="onDropListDropped()"
|
||||
></div>
|
||||
@@ -105,6 +108,6 @@ button {
|
||||
(cdkDropListDropped)="onDropListDropped()"
|
||||
*ngFor="let item of items"
|
||||
>
|
||||
<div cdkDrag class="example-box" [ngClass]="{'example-box--wide': item%2==1}">{{ item }}</div>
|
||||
<div cdkDrag class="example-box" [ngClass]="{'example-box--wide': item%14==0}">{{ item }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { CdkDragEnter, CdkDropList, moveItemInArray, DragRef} from '@angular/cdk/drag-drop';
|
||||
import { CdkDragEnter, CdkDropList, moveItemInArray, DragRef, DragDropModule} from '@angular/cdk/drag-drop';
|
||||
import { AfterViewInit } from '@angular/core';
|
||||
import { ViewChild } from '@angular/core';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-customizable-grid',
|
||||
templateUrl: './customizable-grid.component.html'
|
||||
templateUrl: './customizable-grid.component.html',
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
DragDropModule
|
||||
]
|
||||
})
|
||||
export class CustomizableGridComponent implements AfterViewInit {
|
||||
@ViewChild(CdkDropList) placeholder!: CdkDropList;
|
||||
@@ -104,6 +110,7 @@ export class CustomizableGridComponent implements AfterViewInit {
|
||||
this.dragRef = item._dragRef;
|
||||
|
||||
placeholderElement.style.display = '';
|
||||
placeholderElement.style.backgroundColor ='pink';
|
||||
|
||||
dropElement.parentElement!.insertBefore(
|
||||
placeholderElement,
|
||||
|
||||
@@ -46,7 +46,8 @@ export class DashboardPageComponent implements OnInit {
|
||||
|
||||
createNewDashboard() {
|
||||
const dialogRef = this.dialog.open(NewDashboardComponent, {
|
||||
data: {name: "", description: ""}
|
||||
data: {name: "", description: ""},
|
||||
width: '30em'
|
||||
});
|
||||
|
||||
dialogRef.afterClosed().subscribe((result: DashboardCreationData) => {
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
max-height: unset;
|
||||
}
|
||||
</style>
|
||||
<h1 mat-dialog-title>{{data.title}}</h1>
|
||||
|
||||
<pdb-visualization-page mat-dialog-content #plot [defaultConfig]="data.config" [galleryEnabled]="false"></pdb-visualization-page>
|
||||
|
||||
<div mat-dialog-actions align="end">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { AfterViewInit, Component, ElementRef, Inject, ViewChild } from '@angular/core';
|
||||
import { Component, Inject, ViewChild } from '@angular/core';
|
||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { PlotConfig } from 'src/app/plot.service';
|
||||
import { VisualizationPageComponent } from 'src/app/visualization-page/visualization-page.component';
|
||||
|
||||
@@ -1,14 +1,36 @@
|
||||
<style>
|
||||
|
||||
markdown {
|
||||
--mdc-dialog-supporting-text-color: black;
|
||||
}
|
||||
.mat-mdc-dialog-content {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
height: 22em;
|
||||
}
|
||||
.mat-mdc-dialog-content > div {
|
||||
width:50%;
|
||||
}
|
||||
.preview {
|
||||
margin-left: 0.5em;
|
||||
overflow: auto;
|
||||
}
|
||||
mat-form-field textarea {
|
||||
height: 7em;
|
||||
height: 20em;
|
||||
}
|
||||
</style>
|
||||
<h1 mat-dialog-title>Add Text</h1>
|
||||
<div mat-dialog-content>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Text</mat-label>
|
||||
<textarea matInput [(ngModel)]="text" #textElement focus></textarea>
|
||||
</mat-form-field>
|
||||
<div>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Text</mat-label>
|
||||
<textarea matInput [(ngModel)]="text" #textElement focus ></textarea>
|
||||
</mat-form-field>
|
||||
<div>Text field supports <a href="https://spec.commonmark.org/" class="external-link" target="_blank" rel="noopener">Markdown</a>.</div>
|
||||
</div>
|
||||
<div class="preview">
|
||||
<markdown [data]="this.text"></markdown>
|
||||
</div>
|
||||
</div>
|
||||
<div mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close (click)="close()">Cancel</button>
|
||||
|
||||
@@ -1,9 +1,28 @@
|
||||
import { Component, ElementRef, Inject, ViewChild } from '@angular/core';
|
||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
|
||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { MarkdownModule } from 'ngx-markdown';
|
||||
|
||||
@Component({
|
||||
selector: 'app-add-text-dialog',
|
||||
templateUrl: './add-text-dialog.component.html'
|
||||
templateUrl: './add-text-dialog.component.html',
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
BrowserAnimationsModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
MarkdownModule,
|
||||
MatButtonModule,
|
||||
MatDialogModule,
|
||||
MatFormFieldModule,
|
||||
MatInputModule,
|
||||
]
|
||||
})
|
||||
export class AddTextDialogComponent {
|
||||
text = "";
|
||||
|
||||
@@ -3,6 +3,16 @@
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.toolbar {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
.toolbar #filter-date-range{
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.center {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
@@ -21,9 +31,32 @@
|
||||
.content {
|
||||
padding: 0.5em;
|
||||
}
|
||||
.dashboard-area {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: stretch;
|
||||
}
|
||||
.dashboard-column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
/* make all columns equal width - flex-basis:0 to make all resizing start from the same size*/
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
flex-basis: 0;
|
||||
|
||||
}
|
||||
.editable {
|
||||
padding: 0.5em;
|
||||
}
|
||||
|
||||
.editable-hovered {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.editable:hover .editable-hovered{
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.handle {
|
||||
@@ -53,22 +86,24 @@
|
||||
<button mat-button (click)="addText()">Add Text</button>
|
||||
<button mat-button (click)="addPlot()">Add Plot</button>
|
||||
<button class="save-button" mat-button (click)="save()" [disabled]="!isDirty()">Save</button>
|
||||
<div id="filter-date-range">
|
||||
Date range: <app-date-picker #datePicker (dateValueSelected)="updateDateRange($event)" ></app-date-picker>
|
||||
</div>
|
||||
</div>
|
||||
<div class="editable">
|
||||
<h1>{{dashboard.name}}<button mat-icon-button (click)="editNameAndDescription()" class="editable-hovered"><img src="/assets/img/edit-outline.svg"/></button></h1>
|
||||
<p>{{dashboard.description}}</p>
|
||||
</div>
|
||||
|
||||
<div cdkDropListGroup>
|
||||
<div cdkDropListGroup class="dashboard-area">
|
||||
<div
|
||||
cdkDropList
|
||||
class="dashboard-column"
|
||||
*ngFor="let column of dashboard.arrangement"
|
||||
[cdkDropListData]="column"
|
||||
*ngFor="let i of [0,1]"
|
||||
[cdkDropListData]="i"
|
||||
(cdkDropListDropped)="drop($event)">
|
||||
<div
|
||||
cdkDrag
|
||||
*ngFor="let id of column"
|
||||
*ngFor="let id of dashboard.arrangement[i]"
|
||||
[attr.widget-id]="id">
|
||||
<div cdkDragHandle class="handle"><img src="/assets/img/drag_handle.svg" class="icon-small"/></div>
|
||||
<app-text-widget
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import { Component, ElementRef, OnInit } from '@angular/core';
|
||||
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
@@ -9,12 +9,13 @@ import { PlotConfig, PlotResponse, PlotService } from 'src/app/plot.service';
|
||||
import { NewDashboardComponent } from '../new-dashboard/new-dashboard.component';
|
||||
import { AddPlotDialogComponent } from './add-plot-dialog/add-plot-dialog.component';
|
||||
import { AddTextDialogComponent } from './add-text-dialog/add-text-dialog.component';
|
||||
import { DatePickerChange, DatePickerComponent } from 'src/app/components/datepicker/date-picker.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dashboard',
|
||||
templateUrl: './dashboard.component.html'
|
||||
})
|
||||
export class DashboardComponent implements OnInit {
|
||||
export class DashboardComponent implements OnInit{
|
||||
|
||||
dashboard?: Dashboard = undefined;
|
||||
|
||||
@@ -24,6 +25,9 @@ export class DashboardComponent implements OnInit {
|
||||
|
||||
plotWidgetRenderData: PlotWidgetRenderData[] = [];
|
||||
|
||||
@ViewChild("datePicker")
|
||||
datePicker!: DatePickerComponent;
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private service: DashboardService,
|
||||
@@ -40,7 +44,8 @@ export class DashboardComponent implements OnInit {
|
||||
this.repairArrangement();
|
||||
|
||||
dashboard.plots.forEach(p => {
|
||||
this.plotWidgetRenderData.push(new PlotWidgetRenderData(p));
|
||||
const submitterId = (<any>window).submitterId + (<any>window).randomId();
|
||||
this.plotWidgetRenderData.push(new PlotWidgetRenderData(p, submitterId));
|
||||
});
|
||||
|
||||
this.loadImages(0, this.plotWidgetRenderData);
|
||||
@@ -57,6 +62,13 @@ export class DashboardComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
updateDateRange(e: DatePickerChange) {
|
||||
this.plotWidgetRenderData.forEach(r => {
|
||||
r.widget.config.dateRange = e.value;
|
||||
});
|
||||
this.loadImages(0, this.plotWidgetRenderData);
|
||||
}
|
||||
|
||||
isDirty() {
|
||||
return this.pristineDashboardJSON !== JSON.stringify(this.dashboard);
|
||||
}
|
||||
@@ -64,24 +76,35 @@ export class DashboardComponent implements OnInit {
|
||||
loadImages(index: number, plotWidgetQueue: PlotWidgetRenderData[]) {
|
||||
|
||||
if (index < plotWidgetQueue.length){
|
||||
|
||||
const plot = plotWidgetQueue[index];
|
||||
const request = PlotWidget.createPlotRequest(plot.widget);
|
||||
this.plotService.sendPlotRequest(request).subscribe({
|
||||
next: (response: PlotResponse)=> {
|
||||
plot.plotResponse= response;
|
||||
},
|
||||
error: (error:any)=> {},
|
||||
complete: () => {
|
||||
this.loadImages(index +1 , plotWidgetQueue);
|
||||
}
|
||||
});
|
||||
if (plot.isAborted) {
|
||||
this.loadImages(index +1 , plotWidgetQueue);
|
||||
}else{
|
||||
|
||||
plot.plotResponse = undefined; // remove old image and show loading icon
|
||||
|
||||
const request = PlotWidget.createPlotRequest(plot.widget, plot.submitterId);
|
||||
this.plotService.sendPlotRequest(request).subscribe({
|
||||
next: (response: PlotResponse)=> {
|
||||
plot.plotResponse = response;
|
||||
},
|
||||
error: (error:any)=> {
|
||||
plot.error = error;
|
||||
this.loadImages(index +1 , plotWidgetQueue);
|
||||
},
|
||||
complete: () => {
|
||||
this.loadImages(index +1 , plotWidgetQueue);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private repairArrangement(){
|
||||
const arrangement = this.dashboard!.arrangement || [];
|
||||
if (arrangement.length == 0){
|
||||
arrangement[0] = [];
|
||||
for (let i = 0; i < 2; i++){
|
||||
arrangement[i] = arrangement[i] ?? [] ;
|
||||
}
|
||||
this.dashboard?.texts.forEach(t => {
|
||||
if (!this.arrangmentContainsId(arrangement, t.id)){
|
||||
@@ -93,6 +116,7 @@ export class DashboardComponent implements OnInit {
|
||||
arrangement[0].push(t.id);
|
||||
}
|
||||
});
|
||||
|
||||
this.dashboard!.arrangement = arrangement;
|
||||
}
|
||||
|
||||
@@ -109,9 +133,9 @@ export class DashboardComponent implements OnInit {
|
||||
addText() {
|
||||
this.dialog.open(AddTextDialogComponent,{
|
||||
data: {text:""},
|
||||
width: '600px'
|
||||
width: '800px'
|
||||
}).afterClosed().subscribe((text: string) => {
|
||||
const widget = new TextWidget(crypto.randomUUID(),'MEDIUM', text);
|
||||
const widget = new TextWidget((<any>window).randomId(),'MEDIUM', text);
|
||||
this.dashboard!.texts.push(widget);
|
||||
this.dashboard!.arrangement[0].push(widget.id);
|
||||
});
|
||||
@@ -119,15 +143,15 @@ export class DashboardComponent implements OnInit {
|
||||
|
||||
addPlot() {
|
||||
this.dialog.open(AddPlotDialogComponent,{
|
||||
data: {title: "Add Plot"},
|
||||
data: {},
|
||||
width: 'calc(100% - 1em)',
|
||||
height: 'calc(100% - 1em)'
|
||||
}).afterClosed().subscribe((config: PlotConfig | "") => {
|
||||
if (config != "" && config.query.length > 0) {
|
||||
const widget = new PlotWidget(crypto.randomUUID(), 'MEDIUM', config);
|
||||
const widget = new PlotWidget((<any>window).randomId(), 'MEDIUM', config);
|
||||
this.dashboard!.plots.push(widget);
|
||||
this.dashboard!.arrangement[0].push(widget.id);
|
||||
this.plotWidgetRenderData.push(new PlotWidgetRenderData(widget));
|
||||
this.plotWidgetRenderData.push(new PlotWidgetRenderData(widget, (<any>window).randomId()));
|
||||
this.loadImages(this.plotWidgetRenderData.length-1, this.plotWidgetRenderData);
|
||||
}
|
||||
});
|
||||
@@ -204,13 +228,14 @@ export class DashboardComponent implements OnInit {
|
||||
return this.plotWidgetRenderData.find( x => x.widget.id == id);
|
||||
}
|
||||
|
||||
drop(event: CdkDragDrop<string[]>) {
|
||||
drop(event: CdkDragDrop<number>) {
|
||||
if (event.previousContainer === event.container) {
|
||||
moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
|
||||
moveItemInArray(this.dashboard!.arrangement[event.container.data], event.previousIndex, event.currentIndex);
|
||||
} else {
|
||||
window.console.log("from ",event.previousContainer.data, " to ", event.container.data);
|
||||
transferArrayItem(
|
||||
event.previousContainer.data,
|
||||
event.container.data,
|
||||
this.dashboard!.arrangement[event.previousContainer.data],
|
||||
this.dashboard!.arrangement[event.container.data],
|
||||
event.previousIndex,
|
||||
event.currentIndex,
|
||||
);
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
width: 402px;
|
||||
height: 302px;
|
||||
}
|
||||
img {
|
||||
img.render-img {
|
||||
cursor: zoom-in;
|
||||
}
|
||||
|
||||
@@ -38,16 +38,51 @@
|
||||
.dashboard-card:hover .editable-hovered {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.aborted-img {
|
||||
flex-grow: 0.3;
|
||||
opacity: 0.3;
|
||||
}
|
||||
.aborted-img img {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.invader {
|
||||
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAUCAYAAACTQC2+AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kKGRAxBENShygAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAbUlEQVRIx9WVQQrAMAgEM6X///L2FCihYvRg7F416LCsQdKo0DWKZA4CBGzjev1lRHgezS0lkan3IYr485ZFdo5oJZkbWoRWfSWrJ8p6suvZucsgCS8THsHX+zKiO5uLaO763bpobvoS/e6HfQBzIE0PhAsDxgAAAABJRU5ErkJggg==);
|
||||
width: 26px;
|
||||
height: 20px;
|
||||
display: inline-block;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
.spinner {
|
||||
animation: wobble 2s linear infinite;
|
||||
}
|
||||
@keyframes wobble {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.3;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<div class="dashboard-card" [ngClass]="{'size-medium' : true}">
|
||||
<div class="editable-hovered top-right">
|
||||
<button mat-icon-button (click)="edit()" ><img src="/assets/img/edit-outline.svg"/></button>
|
||||
<button mat-icon-button (click)="delete()"><img src="/assets/img/recycle-bin-line.svg"/></button>
|
||||
</div>
|
||||
<mat-spinner *ngIf="!hasRender('main') && !isError"></mat-spinner>
|
||||
<img *ngIf="hasRender('main')" [src]="getImageUrl('main')" (click)="showFullScreenImage()" />
|
||||
<div *ngIf="isError">
|
||||
<div *ngIf="!hasRender('main') && !data?.error && !data.isAborted">
|
||||
<button mat-button (click)="abort()"><span class="invader spinner"></span>Cancel</button>
|
||||
</div>
|
||||
<img *ngIf="hasRender('main')" [src]="getImageUrl('main')" (click)="showFullScreenImage()" class="render-img" />
|
||||
<div *ngIf="data?.error && !data?.isAborted">
|
||||
There was an error! This is a good time to panic!
|
||||
</div>
|
||||
<div *ngIf="data?.isAborted" class="aborted-img">
|
||||
<img src="assets/img/image-aborted.svg" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { AfterViewInit, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
|
||||
import { Component, EventEmitter, Input, Output, ViewChild, input } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { ConfirmationDialogComponent } from 'src/app/confirmation-dialog/confirmation-dialog.component';
|
||||
import { PlotWidget, PlotWidgetRenderData } from 'src/app/dashboard.service';
|
||||
@@ -17,16 +17,14 @@ export class PlotWidgetComponent {
|
||||
|
||||
public thumbnailUrl = "";
|
||||
|
||||
isError = false;
|
||||
|
||||
@ViewChild("plotView") plotView!: PlotViewComponent;
|
||||
//@ViewChild("plotView") plotView!: PlotViewComponent;
|
||||
|
||||
@Output()
|
||||
deleted : EventEmitter<string> = new EventEmitter<string>();
|
||||
|
||||
constructor(private dialog: MatDialog, private service: PlotService){}
|
||||
|
||||
|
||||
hasRender(name: string): boolean{
|
||||
return this.data !== undefined && this.data.plotResponse !== undefined && this.data.plotResponse?.rendered[name] !== undefined;
|
||||
}
|
||||
@@ -45,6 +43,17 @@ export class PlotWidgetComponent {
|
||||
});
|
||||
}
|
||||
|
||||
abort(){
|
||||
window.console.log("abort");
|
||||
this.data.isAborted = true;
|
||||
this.service.abort(this.data.submitterId).subscribe({
|
||||
complete: () => {
|
||||
window.console.log("cancelled");
|
||||
},
|
||||
error: () => {}
|
||||
});
|
||||
}
|
||||
|
||||
delete() {
|
||||
this.dialog
|
||||
.open(ConfirmationDialogComponent, {
|
||||
@@ -60,23 +69,23 @@ export class PlotWidgetComponent {
|
||||
|
||||
edit() {
|
||||
this.dialog.open(AddPlotDialogComponent, {
|
||||
data: {config: this.data.widget.config, title:"Edit Plot"},
|
||||
data: {config: this.data.widget.config},
|
||||
width: 'calc(100% - 15px)',
|
||||
height: 'calc(100% - 15px)',
|
||||
}).afterClosed().subscribe((config?: PlotConfig) => {
|
||||
if (config !== undefined && config.query.length > 0) {
|
||||
this.data.widget.config = config;
|
||||
|
||||
this.isError = false;
|
||||
this.data.error = false;
|
||||
this.data.plotResponse = undefined;
|
||||
|
||||
const request = PlotWidget.createPlotRequest(this.data.widget);
|
||||
const request = PlotWidget.createPlotRequest(this.data.widget, this.data.submitterId);
|
||||
this.service.sendPlotRequest(request).subscribe({
|
||||
next: (response: PlotResponse)=> {
|
||||
this.data.plotResponse = response;
|
||||
},
|
||||
error: (error:any)=> {
|
||||
this.isError = true;
|
||||
this.data.error = true;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
.editable-hovered {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
top: -2em;
|
||||
}
|
||||
|
||||
.text-widget .editable-hovered {
|
||||
@@ -29,5 +29,5 @@
|
||||
<button mat-icon-button (click)="edit()"><img src="/assets/img/edit-outline.svg"/></button>
|
||||
<button mat-icon-button (click)="delete()"><img src="/assets/img/recycle-bin-line.svg"/></button>
|
||||
</div>
|
||||
<p *ngFor="let line of lines()">{{line}}</p>
|
||||
<markdown [data]="this.data.text"></markdown>
|
||||
</div>
|
||||
|
||||
@@ -36,7 +36,7 @@ export class TextWidgetComponent {
|
||||
edit() {
|
||||
this.dialog.open(AddTextDialogComponent,{
|
||||
data: {text : this.data.text},
|
||||
width: '600px'
|
||||
width: '800px'
|
||||
}).afterClosed().subscribe((text?: string) => {
|
||||
if (text !== undefined) {
|
||||
this.data.text = text;
|
||||
|
||||
@@ -3,18 +3,27 @@
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
<h1 mat-dialog-title>Create a new dashboard</h1>
|
||||
<div mat-dialog-content>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput [(ngModel)]="data.name" #name>
|
||||
</mat-form-field>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Description</mat-label>
|
||||
<textarea matInput [(ngModel)]="data.description"></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close>Cancel</button>
|
||||
<button class="save-button" mat-button mat-dialog-close (click)="onSaveClick()" cdkFocusInitial>Save</button>
|
||||
</div>
|
||||
<form [formGroup]="registerForm" >
|
||||
<h1 mat-dialog-title>Create a new dashboard</h1>
|
||||
<div mat-dialog-content>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput [(ngModel)]="data.name" #name formControlName="name" focus maxlength="64" required="required" />
|
||||
<mat-error>Name must be between one and 64 characters.</mat-error>
|
||||
</mat-form-field>
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Description</mat-label>
|
||||
<textarea matInput [(ngModel)]="data.description" maxlength="65535" formControlName="description"></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close>Cancel</button>
|
||||
<button
|
||||
class="save-button"
|
||||
mat-button
|
||||
mat-dialog-close
|
||||
(click)="onSaveClick()"
|
||||
[disabled]="!registerForm.valid">Save</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -1,13 +1,35 @@
|
||||
import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core';
|
||||
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
|
||||
import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
|
||||
import { DashboardCreationData } from 'src/app/dashboard.service';
|
||||
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { OverlayModule } from '@angular/cdk/overlay';
|
||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
|
||||
@Component({
|
||||
selector: 'app-new-dashboard',
|
||||
templateUrl: './new-dashboard.component.html'
|
||||
templateUrl: './new-dashboard.component.html',
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
FormsModule,
|
||||
MatButtonModule,
|
||||
MatDialogModule,
|
||||
MatFormFieldModule,
|
||||
MatInputModule,
|
||||
ReactiveFormsModule
|
||||
]
|
||||
})
|
||||
export class NewDashboardComponent implements OnInit {
|
||||
|
||||
|
||||
registerForm = new FormGroup({
|
||||
name: new FormControl('', [Validators.pattern(/^[^\s]+.{0,63}$/), Validators.required]),
|
||||
description: new FormControl('', [Validators.maxLength(65535)]),
|
||||
});
|
||||
|
||||
@ViewChild('name') nameInput!: ElementRef;
|
||||
|
||||
constructor(public dialogRef: MatDialogRef<NewDashboardComponent>,
|
||||
@@ -15,7 +37,7 @@ export class NewDashboardComponent implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
window.setTimeout(() => this.nameInput.nativeElement.focus(), 0);
|
||||
//window.setTimeout(() => this.nameInput.nativeElement.focus(), 0);
|
||||
}
|
||||
|
||||
onSaveClick(): void {
|
||||
|
||||
@@ -68,7 +68,7 @@ export class PlotWidget extends BaseWidget {
|
||||
super(id, 'PLOT', size);
|
||||
}
|
||||
|
||||
public static createPlotRequest(widget: PlotWidget): PlotRequest {
|
||||
public static createPlotRequest(widget: PlotWidget, submitterId: string): PlotRequest {
|
||||
|
||||
const height = this.height(widget.size);
|
||||
const width = this.width(widget.size);
|
||||
@@ -77,7 +77,7 @@ export class PlotWidget extends BaseWidget {
|
||||
const fullHeight = window.innerHeight-30;
|
||||
|
||||
const request = new PlotRequest(
|
||||
(<any>window).submitterId+crypto.randomUUID(),
|
||||
submitterId,
|
||||
widget.config,
|
||||
{
|
||||
'main': new RenderOptions(height,width, false, true),
|
||||
@@ -115,7 +115,9 @@ export type PlotSize = 'SMALL'|'MEDIUM'|'LARGE';
|
||||
export type PlotType = 'TEXT'|'PLOT';
|
||||
|
||||
export class PlotWidgetRenderData {
|
||||
constructor(public widget: PlotWidget, public plotResponse?: PlotResponse) {
|
||||
public isAborted = false;
|
||||
public error: string|boolean = false;
|
||||
constructor(public widget: PlotWidget, public submitterId: string, public plotResponse?: PlotResponse) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core';
|
||||
@Component({
|
||||
selector: 'pdb-help-page',
|
||||
templateUrl: './help-page.component.html',
|
||||
styleUrls: ['./help-page.component.scss']
|
||||
styleUrls: ['./help-page.component.scss'],
|
||||
standalone: true
|
||||
})
|
||||
export class HelpPageComponent implements OnInit {
|
||||
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-image-toggle',
|
||||
templateUrl: './image-toggle.component.html',
|
||||
styleUrls: ['./image-toggle.component.scss']
|
||||
styleUrls: ['./image-toggle.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule
|
||||
]
|
||||
})
|
||||
export class ImageToggleComponent implements OnInit {
|
||||
|
||||
|
||||
@@ -1,10 +1,25 @@
|
||||
import { Component, Input} from '@angular/core';
|
||||
import {FormControl} from '@angular/forms';
|
||||
import { Component } from '@angular/core';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { MatFormField, MatLabel } from '@angular/material/form-field';
|
||||
import { MatInput } from '@angular/material/input';
|
||||
import { MatOption, MatSelect } from '@angular/material/select';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-limit-by',
|
||||
templateUrl: './limit-by.component.html',
|
||||
styleUrls: ['./limit-by.component.scss']
|
||||
styleUrls: ['./limit-by.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
FormsModule,
|
||||
MatFormField,
|
||||
MatInput,
|
||||
MatLabel,
|
||||
MatSelect,
|
||||
MatOption,
|
||||
ReactiveFormsModule
|
||||
]
|
||||
})
|
||||
export class LimitByComponent {
|
||||
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterLink } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-main-page',
|
||||
templateUrl: './main-page.component.html',
|
||||
styleUrls: ['./main-page.component.scss']
|
||||
standalone: true,
|
||||
imports: [
|
||||
RouterLink
|
||||
]
|
||||
})
|
||||
export class MainPageComponent implements OnInit {
|
||||
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
export class MainPageComponent {
|
||||
|
||||
}
|
||||
|
||||
@@ -1,33 +1,4 @@
|
||||
|
||||
.plot-details-plotType {
|
||||
background-image: url(/assets/img/pointTypes.png);
|
||||
width: 9px;
|
||||
height: 7px;
|
||||
transform: scale(1.5);
|
||||
}
|
||||
|
||||
.plot-details-plotType_0 {background-position-x: 0px;}
|
||||
.plot-details-plotType_1 {background-position-x: -10px;}
|
||||
.plot-details-plotType_2 {background-position-x: -20px;}
|
||||
.plot-details-plotType_3 {background-position-x: -30px;}
|
||||
.plot-details-plotType_4 {background-position-x: -40px;}
|
||||
.plot-details-plotType_5 {background-position-x: -50px;}
|
||||
.plot-details-plotType_6 {background-position-x: -60px;}
|
||||
.plot-details-plotType_7 {background-position-x: -70px;}
|
||||
.plot-details-plotType_8 {background-position-x: -80px;}
|
||||
.plot-details-plotType_9 {background-position-x: -90px;}
|
||||
.plot-details-plotType_10 {background-position-x:-100px;}
|
||||
.plot-details-plotType_11 {background-position-x:-110px;}
|
||||
.plot-details-plotType_12 {background-position-x:-120px;}
|
||||
|
||||
.plot-details-plotType_0051c2 {background-position-y: 0px;}
|
||||
.plot-details-plotType_bf8300 {background-position-y: -8px;}
|
||||
.plot-details-plotType_9400d3 {background-position-y: -16px;}
|
||||
.plot-details-plotType_00c254 {background-position-y: -24px;}
|
||||
.plot-details-plotType_e6e600 {background-position-y: -32px;}
|
||||
.plot-details-plotType_e51e10 {background-position-y: -40px;}
|
||||
.plot-details-plotType_57a1c2 {background-position-y: -48px;}
|
||||
.plot-details-plotType_bd36c2 {background-position-y: -56px;}
|
||||
|
||||
|
||||
.gallery-item-details td {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, OnInit, Input, Output, ViewChild, EventEmitter, ɵpublishDefaultGlobalUtils } from '@angular/core';
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { DashTypeAndColor, PlotResponseStats, DataSeriesStats } from '../plot.service';
|
||||
import { UtilService } from '../utils.service';
|
||||
|
||||
|
||||
@@ -1,3 +1,16 @@
|
||||
|
||||
<!---->
|
||||
<div cdkDrag
|
||||
[ngClass]="{'hidden': !imageUrl || showStats || dataSeries().length == 0}"
|
||||
class="plot-view--legend"
|
||||
[cdkDragFreeDragPosition]="legendInitialPosition">
|
||||
<div cdkDragHandle></div>
|
||||
<div class="plot-view--legend-content">
|
||||
<ol>
|
||||
<li *ngFor="let stat of dataSeries()"><div class="{{ pointTypeClass(stat.dashTypeAndColor) }}" title="{{ stat.name }}"></div>{{ stat.name }}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
*ngIf="imageUrl">
|
||||
<div
|
||||
|
||||
@@ -21,3 +21,60 @@ img {
|
||||
box-shadow: 5px 5px 10px 0px #e0e0e0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.plot-view--legend {
|
||||
border: solid 1px #ccc;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
position: fixed;
|
||||
z-index: 1;
|
||||
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
|
||||
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
|
||||
0 2px 2px 0 rgba(0, 0, 0, 0.14),
|
||||
0 1px 5px 0 rgba(0, 0, 0, 0.12);
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.plot-view--legend:active {
|
||||
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
|
||||
0 8px 10px 1px rgba(0, 0, 0, 0.14),
|
||||
0 3px 14px 2px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
.plot-view--legend div[cdkDragHandle] {
|
||||
visibility: hidden;
|
||||
height: 1.2rem;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.plot-view--legend:hover div[cdkDragHandle] {
|
||||
cursor: move;
|
||||
visibility: visible;
|
||||
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAAF0lEQVQI12P4//8/AwMDhGSEUFCAUwYAJl4R8Z1D4wIAAAAASUVORK5CYII=);
|
||||
}
|
||||
|
||||
.plot-view--legend-content {
|
||||
max-height: 30em;
|
||||
overflow: auto;
|
||||
max-width: 60em;
|
||||
overflow: auto;
|
||||
resize: both;
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.plot-view--legend ol {
|
||||
padding-inline-start: 0.7em;
|
||||
}
|
||||
|
||||
.plot-view--legend ol li {
|
||||
list-style-type: none;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center
|
||||
}
|
||||
.plot-view--legend ol li .plot-details-plotType{
|
||||
margin-right: 0.3em;
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
}
|
||||
@@ -1,23 +1,29 @@
|
||||
import { Component, OnInit, Output, EventEmitter } from '@angular/core';
|
||||
import { DataType, AxesTypes, PlotResponseStats, PlotConfig, PlotService, PlotResponse, PlotRequest, RenderOptions } from '../plot.service';
|
||||
import { Component, Output, EventEmitter } from '@angular/core';
|
||||
import { DataType, AxesTypes, PlotResponseStats, PlotConfig, PlotService, PlotResponse, PlotRequest, RenderOptions, DataSeriesStats, DashTypeAndColor } from '../plot.service';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import * as moment from 'moment';
|
||||
//import * as moment from 'moment';
|
||||
import { WidgetDimensions } from '../dashboard.service';
|
||||
import { Overlay } from "@angular/cdk/overlay";
|
||||
|
||||
import { DateTime, Duration } from "luxon";
|
||||
import { DateValue } from '../components/datepicker/date-picker.component';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-plot-view',
|
||||
templateUrl: './plot-view.component.html',
|
||||
styleUrls: ['./plot-view.component.scss']
|
||||
})
|
||||
export class PlotViewComponent implements OnInit {
|
||||
export class PlotViewComponent {
|
||||
|
||||
readonly DATE_PATTERN = "YYYY-MM-DD HH:mm:ss"; // for moment-JS
|
||||
readonly DATE_PATTERN = "yyyy-MM-dd HH:mm:ss"; // for moment-JS
|
||||
|
||||
readonly gnuplotLMargin = 110; // The left margin configured for gnuplot
|
||||
readonly gnuplotRMargin = 110; // The right margin configured for gnuplot
|
||||
readonly gnuplotTMargin = 57; // The top margin configured for gnuplot
|
||||
readonly gnuplotBMargin = 76; // The bottom margin configured for gnuplot
|
||||
|
||||
isOpen = false;
|
||||
|
||||
imageUrl! : string;
|
||||
stats: PlotResponseStats | null = null;
|
||||
@@ -28,7 +34,7 @@ export class PlotViewComponent implements OnInit {
|
||||
loadingEvent : EventEmitter<LoadingEvent> = new EventEmitter<LoadingEvent>();
|
||||
|
||||
@Output()
|
||||
dateRangeUpdateEvent : EventEmitter<string> = new EventEmitter<string>();
|
||||
dateRangeUpdateEvent : EventEmitter<DateValue> = new EventEmitter<DateValue>();
|
||||
|
||||
in_drag_mode = false;
|
||||
drag_start_x = 0;
|
||||
@@ -47,10 +53,9 @@ export class PlotViewComponent implements OnInit {
|
||||
|
||||
config? : PlotConfig;
|
||||
|
||||
constructor(private service : PlotService, private snackBar: MatSnackBar) { }
|
||||
legendInitialPosition = {x:115,y:60};
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
constructor(private service : PlotService, private snackBar: MatSnackBar, private overlay: Overlay) { }
|
||||
|
||||
|
||||
showError(message:string) {
|
||||
@@ -177,14 +182,12 @@ export class PlotViewComponent implements OnInit {
|
||||
}
|
||||
|
||||
setDateRange(startDate: any, endDate: any) {
|
||||
const formattedStartDate = startDate.format(this.DATE_PATTERN);
|
||||
const formattedEndDate = endDate.format(this.DATE_PATTERN);
|
||||
const formattedStartDate = startDate.toFormat(this.DATE_PATTERN);
|
||||
const formattedEndDate = endDate.toFormat(this.DATE_PATTERN);
|
||||
|
||||
const newDateRange = formattedStartDate+" - "+formattedEndDate;
|
||||
|
||||
//(<HTMLInputElement>document.getElementById("search-date-range")).value = newDateRange;
|
||||
this.dateRangeUpdateEvent.emit(newDateRange);
|
||||
//this.plot();
|
||||
const newDateValue = new DateValue('ABSOLUTE', newDateRange, newDateRange);
|
||||
this.dateRangeUpdateEvent.emit(newDateValue);
|
||||
}
|
||||
|
||||
zoomRange(range: SelectionRange) {
|
||||
@@ -251,6 +254,10 @@ export class PlotViewComponent implements OnInit {
|
||||
|
||||
const request = this.createPlotRequest(dimension);
|
||||
|
||||
this.imageUrl = '';
|
||||
this.stats = null;
|
||||
|
||||
document.dispatchEvent(new Event("invadersStart", {}));
|
||||
this.loadingEvent.emit(new LoadingEvent(true));
|
||||
const x = this.service.sendPlotRequest(request).subscribe({
|
||||
next: (plotResponse: PlotResponse) => {
|
||||
@@ -281,7 +288,7 @@ export class PlotViewComponent implements OnInit {
|
||||
'main': new RenderOptions(actualDimension.height, actualDimension.width, false, true)
|
||||
});
|
||||
return request;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Zoom in/out by zoomFaktor, so that the anchorInPercentOfDateRange keeps the same position.
|
||||
@@ -289,18 +296,26 @@ export class PlotViewComponent implements OnInit {
|
||||
* shiftDateByAnchor(dateRangeAsString, 0.20, 0.5) zooms in by 50%, so that the date that was at 20% before the zoom is still at 20% after the zoom
|
||||
* shiftDateByAnchor(dateRangeAsString, 0.33, 2) zooms out by 50%, so that the date that was at 33% before the zoom is still at 33% after the zoom
|
||||
*/
|
||||
shiftDateByAnchor(dateRange:string, anchorInPercentOfDateRange:number, zoomFactor:number)
|
||||
shiftDateByAnchor(dateValue:DateValue, anchorInPercentOfDateRange:number, zoomFactor:number)
|
||||
{
|
||||
const dateRangeParsed = this.parseDateRange(dateRange);
|
||||
const dateRangeInSeconds = dateRangeParsed.duration.asSeconds();
|
||||
const dateRangeParsed = this.parseDateRange(dateValue);
|
||||
dateRangeParsed.subscribe({
|
||||
next: (dataRange: DateRange) => {
|
||||
const dateRangeInSeconds = Math.floor(dataRange.duration.toMillis()/1000);
|
||||
|
||||
const anchorTimestampInSeconds = dateRangeParsed.startDate.clone().add(Math.floor(dateRangeInSeconds*anchorInPercentOfDateRange), "seconds");
|
||||
const newDateRangeInSeconds = dateRangeInSeconds * zoomFactor;
|
||||
const anchorTimestampInSeconds = dataRange.startDate.plus(Math.floor(dateRangeInSeconds*anchorInPercentOfDateRange)*1000);
|
||||
const newDateRangeInSeconds = dateRangeInSeconds * zoomFactor;
|
||||
|
||||
const newStartDate = anchorTimestampInSeconds.clone().subtract(newDateRangeInSeconds*anchorInPercentOfDateRange, "seconds");
|
||||
const newEndDate = newStartDate.clone().add({seconds: newDateRangeInSeconds});;
|
||||
const newStartDate = anchorTimestampInSeconds.minus(newDateRangeInSeconds*anchorInPercentOfDateRange*1000);
|
||||
const newEndDate = newStartDate.plus({seconds: newDateRangeInSeconds});;
|
||||
|
||||
this.setDateRange(newStartDate, newEndDate);
|
||||
},
|
||||
error: (err: any) => {
|
||||
window.console.error("failed to parse DateValue into DateRange: ", err);
|
||||
}
|
||||
})
|
||||
|
||||
this.setDateRange(newStartDate, newEndDate);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -312,26 +327,47 @@ export class PlotViewComponent implements OnInit {
|
||||
* shiftDate(dateRangeAsString, -0.5, -0.5) will move the range by half its size to older values
|
||||
* shiftDate(dateRangeAsString, 1, 1) will move the range by its size to newer values
|
||||
*/
|
||||
shiftDate(dateRange: string, factorStartDate: number, factorEndDate: number)
|
||||
shiftDate(dateValue: DateValue, factorStartDate: number, factorEndDate: number)
|
||||
{
|
||||
const dateRangeParsed = this.parseDateRange(dateRange);
|
||||
const dateRangeInSeconds = dateRangeParsed.duration.asSeconds();
|
||||
this.parseDateRange(dateValue).subscribe(
|
||||
dateRangeParsed => {
|
||||
const dateRangeInSeconds = Math.floor(dateRangeParsed.duration.toMillis()/1000);
|
||||
|
||||
const newStartDate = dateRangeParsed.startDate.add({seconds: dateRangeInSeconds*factorStartDate});
|
||||
const newEndDate = dateRangeParsed.endDate.add({seconds: dateRangeInSeconds*factorEndDate});
|
||||
const newStartDate = dateRangeParsed.startDate.plus({seconds: dateRangeInSeconds*factorStartDate});
|
||||
const newEndDate = dateRangeParsed.endDate.plus({seconds: dateRangeInSeconds*factorEndDate});
|
||||
|
||||
this.setDateRange(newStartDate, newEndDate);
|
||||
this.setDateRange(newStartDate, newEndDate);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
parseDateRange(dateRangeAsString : string) : DateRange {
|
||||
const startDate = moment(dateRangeAsString.slice(0, 19));
|
||||
const endDate = moment(dateRangeAsString.slice(22, 41));
|
||||
parseDateRange(dateValue : DateValue) : Observable<DateRange> {
|
||||
return this.service.toDateRange(dateValue);
|
||||
/*
|
||||
.pipe(map((dateRangeAsString:string) => {
|
||||
const startDate = DateTime.fromFormat(dateRangeAsString.slice(0, 19), this.DATE_PATTERN );
|
||||
const endDate = DateTime.fromFormat(dateRangeAsString.slice(22, 41), this.DATE_PATTERN );
|
||||
|
||||
return {
|
||||
startDate: startDate,
|
||||
endDate: endDate,
|
||||
duration: moment.duration(endDate.diff(startDate))
|
||||
};
|
||||
|
||||
return {
|
||||
startDate: startDate,
|
||||
endDate: endDate,
|
||||
duration: endDate.diff(startDate),
|
||||
};
|
||||
}));
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
|
||||
dataSeries(): Array<DataSeriesStats> {
|
||||
return this.stats ? this.stats.dataSeriesStats : [];
|
||||
}
|
||||
|
||||
pointTypeClass(typeAndColor: DashTypeAndColor): string {
|
||||
return "plot-details-plotType"
|
||||
+" plot-details-plotType_"+typeAndColor.pointType
|
||||
+" plot-details-plotType_"+typeAndColor.color.toLocaleLowerCase();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -360,7 +396,8 @@ export class LoadingEvent {
|
||||
}
|
||||
|
||||
export class DateRange {
|
||||
startDate: any;
|
||||
endDate: any;
|
||||
duration: any;
|
||||
constructor(
|
||||
public startDate: DateTime,
|
||||
public endDate: DateTime,
|
||||
public duration: Duration){}
|
||||
}
|
||||
@@ -1,72 +1,236 @@
|
||||
import { Injectable, OnInit } from '@angular/core';
|
||||
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
|
||||
import { Injectable, OnInit } from "@angular/core";
|
||||
import { HttpClient, HttpParams } from "@angular/common/http";
|
||||
import { Observable } from "rxjs";
|
||||
import { map } from "rxjs/operators";
|
||||
import { DateValue } from "./components/datepicker/date-picker.component";
|
||||
import { DateRange } from "./plot-view/plot-view.component";
|
||||
import { DateTime } from "luxon";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: "root",
|
||||
})
|
||||
export class PlotService {
|
||||
|
||||
readonly DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
|
||||
|
||||
plotTypes: Array<PlotType>;
|
||||
|
||||
constructor(private http: HttpClient) {
|
||||
this.plotTypes = new Array<PlotType>();
|
||||
this.plotTypes.push(new PlotType("SCATTER","Scatter","scatter-chart2",true,DataType.Time,DataType.Duration));
|
||||
this.plotTypes.push(new PlotType("CUM_DISTRIBUTION", "Cumulative Distribution", "cumulative-distribution-chart", true, DataType.Percent, DataType.Duration));
|
||||
this.plotTypes.push(new PlotType("HISTOGRAM", "Histogram", "histogram", true, DataType.HistogramBin, DataType.HistogramCount));
|
||||
this.plotTypes.push(new PlotType("PARALLEL", "Parallel Requests", "parallel-requests-chart", true, DataType.Time, DataType.Count));
|
||||
this.plotTypes.push(new PlotType("BAR", "Bar (number of requests)", "bar-chart", true, DataType.Group, DataType.Count));
|
||||
this.plotTypes.push(new PlotType("BOX", "Box", "box-plot", true, DataType.Time, DataType.Duration));
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"SCATTER",
|
||||
"Scatter",
|
||||
"scatter-chart2",
|
||||
true,
|
||||
DataType.Time,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"CUM_DISTRIBUTION",
|
||||
"Cumulative Distribution",
|
||||
"cumulative-distribution-chart",
|
||||
true,
|
||||
DataType.Percent,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"HISTOGRAM",
|
||||
"Histogram",
|
||||
"histogram",
|
||||
true,
|
||||
DataType.HistogramBin,
|
||||
DataType.HistogramCount,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"PARALLEL",
|
||||
"Parallel Requests",
|
||||
"parallel-requests-chart",
|
||||
true,
|
||||
DataType.Time,
|
||||
DataType.Count,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"BAR",
|
||||
"Bar (number of requests)",
|
||||
"bar-chart",
|
||||
true,
|
||||
DataType.Group,
|
||||
DataType.Count,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"BOX",
|
||||
"Box",
|
||||
"box-plot",
|
||||
true,
|
||||
DataType.Time,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
|
||||
this.plotTypes.push(new PlotType("HEATMAP", "Heatmap", "heatmap", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("CONTOUR", "Contour", "contour-chart", false, DataType.Time, DataType.Duration));
|
||||
this.plotTypes.push(new PlotType("RIDGELINES", "Ridgelines", "ridgelines", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("QQ", "Quantile-Quantile", "quantile-quantile", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("VIOLIN", "Violin", "violin-chart", false, DataType.Group, DataType.Duration));
|
||||
this.plotTypes.push(new PlotType("STRIP", "Strip", "strip-chart", false, DataType.Group, DataType.Duration));
|
||||
this.plotTypes.push(new PlotType("PIE", "Pie", "pie-chart", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("STEP_FIT", "Step Fit", "step-fit", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("LAG", "Lag", "lag-plot", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(new PlotType("ACF", "ACF", "acf-plot", false, DataType.Other, DataType.Other));
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"HEATMAP",
|
||||
"Heatmap",
|
||||
"heatmap",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"CONTOUR",
|
||||
"Contour",
|
||||
"contour-chart",
|
||||
false,
|
||||
DataType.Time,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"RIDGELINES",
|
||||
"Ridgelines",
|
||||
"ridgelines",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"QQ",
|
||||
"Quantile-Quantile",
|
||||
"quantile-quantile",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"VIOLIN",
|
||||
"Violin",
|
||||
"violin-chart",
|
||||
false,
|
||||
DataType.Group,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"STRIP",
|
||||
"Strip",
|
||||
"strip-chart",
|
||||
false,
|
||||
DataType.Group,
|
||||
DataType.Duration,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"PIE",
|
||||
"Pie",
|
||||
"pie-chart",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"STEP_FIT",
|
||||
"Step Fit",
|
||||
"step-fit",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"LAG",
|
||||
"Lag",
|
||||
"lag-plot",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
this.plotTypes.push(
|
||||
new PlotType(
|
||||
"ACF",
|
||||
"ACF",
|
||||
"acf-plot",
|
||||
false,
|
||||
DataType.Other,
|
||||
DataType.Other,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getPlotTypes(): Array<PlotType> {
|
||||
return this.plotTypes.filter(plotType => plotType.active);
|
||||
return this.plotTypes.filter((plotType) => plotType.active);
|
||||
}
|
||||
|
||||
getTagFields(): Observable<Array<string>> {
|
||||
return this.http.get<Array<string>>('//'+window.location.hostname+':'+window.location.port+'/api/fields');
|
||||
return this.http.get<Array<string>>(
|
||||
"//" + window.location.hostname + ":" + window.location.port +
|
||||
"/api/fields",
|
||||
);
|
||||
}
|
||||
|
||||
autocomplete(query: string, caretIndex: number, resultMode: ResultMode): Observable<AutocompleteResult>
|
||||
{
|
||||
autocomplete(
|
||||
query: string,
|
||||
caretIndex: number,
|
||||
resultMode: ResultMode,
|
||||
): Observable<AutocompleteResult> {
|
||||
const options = {
|
||||
params: new HttpParams()
|
||||
.set('caretIndex', ""+caretIndex)
|
||||
.set('query', query)
|
||||
.set('resultMode', resultMode)
|
||||
.set("caretIndex", "" + caretIndex)
|
||||
.set("query", query)
|
||||
.set("resultMode", resultMode),
|
||||
};
|
||||
return this.http.get<AutocompleteResult>('//'+window.location.hostname+':'+window.location.port+'/api/autocomplete', options);
|
||||
return this.http.get<AutocompleteResult>(
|
||||
"//" + window.location.hostname + ":" + window.location.port +
|
||||
"/api/autocomplete",
|
||||
options,
|
||||
);
|
||||
}
|
||||
|
||||
abort(submitterId: string): Observable<void>{
|
||||
return this.http.delete<void>('//'+window.location.hostname+':'+window.location.port+'/api/plots/'+submitterId)
|
||||
abort(submitterId: string): Observable<void> {
|
||||
return this.http.delete<void>(
|
||||
"//" + window.location.hostname + ":" + window.location.port +
|
||||
"/api/plots/" + submitterId,
|
||||
);
|
||||
}
|
||||
|
||||
sendPlotRequest(plotRequest: PlotRequest): Observable<PlotResponse>{
|
||||
|
||||
sendPlotRequest(plotRequest: PlotRequest): Observable<PlotResponse> {
|
||||
//console.log("send plot request: "+ JSON.stringify(plotRequest));
|
||||
const result = this.http.post<PlotResponse>('//'+window.location.hostname+':'+window.location.port+'/api/plots', plotRequest);
|
||||
const result = this.http.post<PlotResponse>(
|
||||
"//" + window.location.hostname + ":" + window.location.port +
|
||||
"/api/plots",
|
||||
plotRequest,
|
||||
);
|
||||
return result.pipe(map(this.enrichStats));
|
||||
}
|
||||
|
||||
enrichStats(response: PlotResponse): PlotResponse {
|
||||
let maxAvgRatio = 0;
|
||||
let x : DataSeriesStats[] = response.stats.dataSeriesStats;
|
||||
for (const row in x){
|
||||
for (const col in x){
|
||||
let maxAvgRatio = 0;
|
||||
let x: DataSeriesStats[] = response.stats.dataSeriesStats;
|
||||
for (const row in x) {
|
||||
for (const col in x) {
|
||||
maxAvgRatio = Math.max(maxAvgRatio, x[row].average / x[col].average);
|
||||
}
|
||||
}
|
||||
@@ -76,39 +240,56 @@ export class PlotService {
|
||||
return response;
|
||||
}
|
||||
|
||||
getFilterDefaults(): Observable<FilterDefaults>{
|
||||
return this.http.get<FilterDefaults>('//'+window.location.hostname+':'+window.location.port+'/api/filters/defaults')
|
||||
getFilterDefaults(): Observable<FilterDefaults> {
|
||||
return this.http.get<FilterDefaults>(
|
||||
"//" + window.location.hostname + ":" + window.location.port +
|
||||
"/api/filters/defaults",
|
||||
);
|
||||
}
|
||||
|
||||
splitQuery(query: string, splitBy:string) : Observable<Array<string>>{
|
||||
|
||||
const q = "("+query+") and "+splitBy+"=";
|
||||
return this.autocomplete(q, q.length+1, ResultMode.FULL_VALUES).pipe(
|
||||
splitQuery(query: string, splitBy: string): Observable<Array<string>> {
|
||||
const q = "(" + query + ") and " + splitBy + "=";
|
||||
return this.autocomplete(q, q.length + 1, ResultMode.FULL_VALUES).pipe(
|
||||
map(
|
||||
(autocompleteResult: AutocompleteResult) => autocompleteResult.proposals.map((suggestion:Suggestion) => suggestion.value)
|
||||
)
|
||||
(autocompleteResult: AutocompleteResult) =>
|
||||
autocompleteResult.proposals.map((suggestion: Suggestion) =>
|
||||
suggestion.value
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
toDateRange(dateValue: DateValue): Observable<DateRange> {
|
||||
return this.http.post<{start: string, end:string, startEpochMilli: number, endEpochMilli: number}>("//" + window.location.hostname+":" + window.location.port +"/api/dates",dateValue)
|
||||
.pipe(map((data) => {
|
||||
const startDate = DateTime.fromFormat(data.start.slice(0, -1), this.DATE_PATTERN );
|
||||
const endDate = DateTime.fromFormat(data.end.slice(0, -1), this.DATE_PATTERN );
|
||||
|
||||
|
||||
return {
|
||||
startDate: startDate,
|
||||
endDate: endDate,
|
||||
duration: endDate.diff(startDate),
|
||||
};
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export class PlotType {
|
||||
|
||||
constructor(
|
||||
public id: string,
|
||||
public name: string,
|
||||
public icon: string,
|
||||
public active: boolean,
|
||||
public xAxis: DataType,
|
||||
public yAxis: DataType) {
|
||||
|
||||
public yAxis: DataType,
|
||||
) {
|
||||
}
|
||||
|
||||
compatible(others: Array<PlotType>) : boolean {
|
||||
compatible(others: Array<PlotType>): boolean {
|
||||
var xAxisTypes = new Set([this.xAxis]);
|
||||
var yAxisTypes = new Set([this.yAxis]);
|
||||
|
||||
for(var i = 0; i < others.length; i++){
|
||||
for (var i = 0; i < others.length; i++) {
|
||||
var other = others[i];
|
||||
xAxisTypes.add(other.xAxis);
|
||||
yAxisTypes.add(other.yAxis);
|
||||
@@ -127,40 +308,40 @@ export class TagField {
|
||||
}
|
||||
|
||||
export enum DataType {
|
||||
Time,
|
||||
Duration,
|
||||
Percent,
|
||||
Count,
|
||||
Group,
|
||||
Metric,
|
||||
HistogramBin,
|
||||
HistogramCount,
|
||||
Other
|
||||
Time,
|
||||
Duration,
|
||||
Percent,
|
||||
Count,
|
||||
Group,
|
||||
Metric,
|
||||
HistogramBin,
|
||||
HistogramCount,
|
||||
Other,
|
||||
}
|
||||
|
||||
export class AxesTypes {
|
||||
x : Array<DataType>;
|
||||
y : Array<DataType>;
|
||||
x: Array<DataType>;
|
||||
y: Array<DataType>;
|
||||
|
||||
constructor(x: Array<DataType>, y : Array<DataType>) {
|
||||
constructor(x: Array<DataType>, y: Array<DataType>) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
hasXAxis(type : DataType){
|
||||
hasXAxis(type: DataType) {
|
||||
return this.x.includes(type);
|
||||
}
|
||||
|
||||
hasYAxis(type : DataType){
|
||||
hasYAxis(type: DataType) {
|
||||
return this.y.includes(type);
|
||||
}
|
||||
|
||||
/**
|
||||
* return the 1-indexed axis data type, e.g. getXAxisDataType(1) for the x1 axis
|
||||
*/
|
||||
getXAxisDataType(index: number){
|
||||
if (this.x.length+1 >= index){
|
||||
return this.x[index-1];
|
||||
getXAxisDataType(index: number) {
|
||||
if (this.x.length + 1 >= index) {
|
||||
return this.x[index - 1];
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
@@ -168,9 +349,9 @@ export class AxesTypes {
|
||||
/**
|
||||
* return the 1-indexed axis data type, e.g. getYAxisDataType(1) for the x1 axis
|
||||
*/
|
||||
getYAxisDataType(index: number){
|
||||
if (this.y.length+1 >= index){
|
||||
return this.y[index-1];
|
||||
getYAxisDataType(index: number) {
|
||||
if (this.y.length + 1 >= index) {
|
||||
return this.y[index - 1];
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
@@ -181,10 +362,10 @@ export class AxesTypes {
|
||||
const x2 = this.getXAxisDataType(2);
|
||||
const y2 = this.getYAxisDataType(2);
|
||||
|
||||
return (x1 ? "x1:"+DataType[x1] : "")
|
||||
+ (y1 ? " y1:"+DataType[y1] : "")
|
||||
+ (x2 ? " x2:"+DataType[x2] : "")
|
||||
+ (y2 ? " y2:"+DataType[y2] : "");
|
||||
return (x1 ? "x1:" + DataType[x1] : "") +
|
||||
(y1 ? " y1:" + DataType[y1] : "") +
|
||||
(x2 ? " x2:" + DataType[x2] : "") +
|
||||
(y2 ? " y2:" + DataType[y2] : "");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -192,12 +373,12 @@ export class Suggestion {
|
||||
constructor(
|
||||
public value: string,
|
||||
public newQuery: string,
|
||||
public newCaretPosition: number){}
|
||||
public newCaretPosition: number,
|
||||
) {}
|
||||
}
|
||||
|
||||
|
||||
export class AutocompleteResult{
|
||||
constructor(public proposals: Array<Suggestion>){}
|
||||
export class AutocompleteResult {
|
||||
constructor(public proposals: Array<Suggestion>) {}
|
||||
}
|
||||
|
||||
export type RenderOptionsMap = {
|
||||
@@ -212,9 +393,8 @@ export class PlotRequest {
|
||||
constructor(
|
||||
public submitterId: string,
|
||||
public config: PlotConfig,
|
||||
public renders: RenderOptionsMap
|
||||
){}
|
||||
|
||||
public renders: RenderOptionsMap,
|
||||
) {}
|
||||
|
||||
copy(): PlotRequest {
|
||||
return JSON.parse(JSON.stringify(this));
|
||||
@@ -222,76 +402,85 @@ export class PlotRequest {
|
||||
}
|
||||
|
||||
export class PlotConfig {
|
||||
constructor( public query : string,
|
||||
public groupBy : Array<string>,
|
||||
public limitBy : string,
|
||||
public limit : number,
|
||||
public y1:YAxisDefinition,
|
||||
public y2:YAxisDefinition|undefined,
|
||||
public dateRange : string,
|
||||
public aggregates : Array<string>,
|
||||
constructor(
|
||||
public query: string,
|
||||
public groupBy: Array<string>,
|
||||
public limitBy: string,
|
||||
public limit: number,
|
||||
public y1: YAxisDefinition,
|
||||
public y2: YAxisDefinition | undefined,
|
||||
public dateRange: DateValue,
|
||||
public aggregates: Array<string>,
|
||||
public intervalUnit: string,
|
||||
public intervalValue: number,
|
||||
public renderBarChartTickLabels: boolean = false,) {}
|
||||
public renderBarChartTickLabels: boolean = false,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class RenderOptions {
|
||||
constructor(
|
||||
public height: number,
|
||||
public width: number,
|
||||
public keyOutside: boolean,
|
||||
public renderLabels: boolean) {}
|
||||
public showKey: boolean,
|
||||
public renderLabels: boolean,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class YAxisDefinition {
|
||||
constructor(
|
||||
public axisScale : string,
|
||||
public rangeMin : number,
|
||||
public rangeMax : number,
|
||||
public rangeUnit : string){}
|
||||
public axisScale: string,
|
||||
public rangeMin: number,
|
||||
public rangeMax: number,
|
||||
public rangeUnit: string,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class PlotResponse {
|
||||
constructor(
|
||||
public stats : PlotResponseStats,
|
||||
public rendered: RenderedImages){}
|
||||
public stats: PlotResponseStats,
|
||||
public rendered: RenderedImages,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class PlotResponseStats {
|
||||
constructor(
|
||||
public maxValue : number,
|
||||
public values : number,
|
||||
public average : number,
|
||||
public plottedValues : number,
|
||||
public maxValue: number,
|
||||
public values: number,
|
||||
public average: number,
|
||||
public plottedValues: number,
|
||||
public maxAvgRatio: number,
|
||||
public dataSeriesStats : Array<DataSeriesStats>){}
|
||||
public dataSeriesStats: Array<DataSeriesStats>,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class DataSeriesStats {
|
||||
constructor(
|
||||
public name: string,
|
||||
public values : number,
|
||||
public maxValue : number,
|
||||
public average : number ,
|
||||
public plottedValues : number,
|
||||
public values: number,
|
||||
public maxValue: number,
|
||||
public average: number,
|
||||
public plottedValues: number,
|
||||
public dashTypeAndColor: DashTypeAndColor,
|
||||
public percentiles: Map<string, number>){}
|
||||
public percentiles: Map<string, number>,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class DashTypeAndColor {
|
||||
constructor(
|
||||
public color: string,
|
||||
public pointType: number) {}
|
||||
public pointType: number,
|
||||
) {}
|
||||
}
|
||||
|
||||
export class FilterDefaults {
|
||||
constructor(
|
||||
public groupBy: Array<string>,
|
||||
public fields: Array<string>,
|
||||
public splitBy: string){}
|
||||
public splitBy: string,
|
||||
) {}
|
||||
}
|
||||
|
||||
export enum ResultMode {
|
||||
CUT_AT_DOT = "CUT_AT_DOT",
|
||||
FULL_VALUES = "FULL_VALUES"
|
||||
FULL_VALUES = "FULL_VALUES",
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core';
|
||||
@Component({
|
||||
selector: 'pdb-upload-page',
|
||||
templateUrl: './upload-page.component.html',
|
||||
styleUrls: ['./upload-page.component.scss']
|
||||
styleUrls: ['./upload-page.component.scss'],
|
||||
standalone: true
|
||||
})
|
||||
export class UploadPageComponent implements OnInit {
|
||||
|
||||
|
||||
@@ -1,24 +1,34 @@
|
||||
<div id="visualization">
|
||||
<div id="query-box">
|
||||
<pdb-query-autocomplete #query></pdb-query-autocomplete>
|
||||
<pdb-query-autocomplete #query></pdb-query-autocomplete>
|
||||
</div>
|
||||
|
||||
<div id="date-box">
|
||||
<app-date-picker #datePicker></app-date-picker>
|
||||
<!--
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Date Range:</mat-label>
|
||||
<input matInput id="search-date-range" value="dateRange" name="dates" />
|
||||
</mat-form-field>
|
||||
-->
|
||||
</div>
|
||||
|
||||
<div id="filters">
|
||||
<div id="filterpanel">
|
||||
|
||||
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Type:</mat-label>
|
||||
<mat-select multiple [(ngModel)]="selectedPlotType" (ngModelChange)="changePlotType($event)">
|
||||
<mat-option *ngFor="let plotType of plotTypes" [value]="plotType" [disabled]="!plotType.active">
|
||||
<img src="assets/img/{{plotType.icon}}.svg" class="icon-select" /> {{plotType.name}}
|
||||
<mat-select
|
||||
multiple
|
||||
[(ngModel)]="selectedPlotType"
|
||||
(ngModelChange)="changePlotType($event)"
|
||||
>
|
||||
<mat-option
|
||||
*ngFor="let plotType of plotTypes"
|
||||
[value]="plotType"
|
||||
[disabled]="!plotType.active"
|
||||
>
|
||||
<img src="assets/img/{{ plotType.icon }}.svg" class="icon-select" />
|
||||
{{ plotType.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
@@ -26,53 +36,85 @@
|
||||
<mat-form-field class="pdb-form-full-width">
|
||||
<mat-label>Group By:</mat-label>
|
||||
<mat-select multiple [(value)]="groupBy">
|
||||
<mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{tagField.name}}</mat-option>
|
||||
<mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{
|
||||
tagField.name
|
||||
}}</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<pdb-limit-by #limitbycomponent></pdb-limit-by>
|
||||
<div [hidden]="!selectedPlotTypesContains(['BAR', 'BOX'])">
|
||||
<mat-form-field >
|
||||
<mat-label>Intervals (only bar chart):</mat-label>
|
||||
<mat-select [(value)]="intervalUnit">
|
||||
<mat-option value="NO_INTERVAL">-</mat-option>
|
||||
<mat-option value="SECOND">second</mat-option>
|
||||
<mat-option value="MINUTE">minute</mat-option>
|
||||
<mat-option value="HOUR">hour</mat-option>
|
||||
<mat-option value="DAY">day</mat-option>
|
||||
<mat-option value="WEEK">week</mat-option>
|
||||
<mat-option value="MONTH">month</mat-option>
|
||||
<mat-option value="YEAR">year</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-label>Intervals (only bar chart):</mat-label>
|
||||
<mat-select [(value)]="intervalUnit">
|
||||
<mat-option value="NO_INTERVAL">-</mat-option>
|
||||
<mat-option value="SECOND">second</mat-option>
|
||||
<mat-option value="MINUTE">minute</mat-option>
|
||||
<mat-option value="HOUR">hour</mat-option>
|
||||
<mat-option value="DAY">day</mat-option>
|
||||
<mat-option value="WEEK">week</mat-option>
|
||||
<mat-option value="MONTH">month</mat-option>
|
||||
<mat-option value="YEAR">year</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div [hidden]="!selectedPlotTypesContains(['BAR', 'BOX'])">
|
||||
<mat-checkbox [(ngModel)]="renderBarChartTickLabels">Show Tic Labels (bar chart)</mat-checkbox>
|
||||
<mat-checkbox [(ngModel)]="renderBarChartTickLabels"
|
||||
>Show Tic Labels (bar chart)</mat-checkbox
|
||||
>
|
||||
</div>
|
||||
<pdb-y-axis-definition #y1AxisDefinitionComponent yIndex="1"></pdb-y-axis-definition>
|
||||
<pdb-y-axis-definition #y2AxisDefinitionComponent yIndex="2" [hidden]="!y2AxisAvailable"></pdb-y-axis-definition>
|
||||
<pdb-y-axis-definition
|
||||
#y1AxisDefinitionComponent
|
||||
yIndex="1"
|
||||
></pdb-y-axis-definition>
|
||||
<pdb-y-axis-definition
|
||||
#y2AxisDefinitionComponent
|
||||
yIndex="2"
|
||||
[hidden]="!y2AxisAvailable"
|
||||
></pdb-y-axis-definition>
|
||||
|
||||
<mat-checkbox *ngIf="galleryEnabled" [(ngModel)]="enableGallery">Gallery</mat-checkbox>
|
||||
<mat-checkbox
|
||||
*ngIf="galleryEnabled"
|
||||
[(ngModel)]="enableGallery"
|
||||
(click)="toggleGallery($event)"
|
||||
>Gallery</mat-checkbox
|
||||
>
|
||||
|
||||
<mat-form-field *ngIf="enableGallery" class="pdb-form-full-width">
|
||||
<mat-form-field *ngIf="enableGallery" class="pdb-form-full-width">
|
||||
<mat-label>Split By:</mat-label>
|
||||
<mat-select [(value)]="splitBy">
|
||||
<mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{tagField.name}}</mat-option>
|
||||
<mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{
|
||||
tagField.name
|
||||
}}</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="splitBy == null || true">
|
||||
Please select a value!
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
|
||||
<div id="plot-button-bar">
|
||||
<a
|
||||
mat-icon-button
|
||||
[routerLink]="['/vis']"
|
||||
[queryParams]="{ config: serializedConfig() }"
|
||||
target="_blank"
|
||||
aria-label="open new window with the same search"
|
||||
title="open new window with the same search"
|
||||
><img src="assets/img/link.svg" aria-hidden="true"
|
||||
/></a>
|
||||
<button
|
||||
*ngIf="!enableGallery && !plotJobActive"
|
||||
[disabled]="plotJobActive"
|
||||
mat-button
|
||||
matTooltip="Create Plot"
|
||||
(click)="plot()">
|
||||
<img src="assets/img/scatter-chart2.svg" class="icon-inline" aria-hidden="true" title="create plot" />
|
||||
*ngIf="!enableGallery && !plotJobActive"
|
||||
[disabled]="plotJobActive"
|
||||
mat-button
|
||||
matTooltip="Create Plot"
|
||||
(click)="plot()"
|
||||
>
|
||||
<img
|
||||
src="assets/img/scatter-chart2.svg"
|
||||
class="icon-inline"
|
||||
aria-hidden="true"
|
||||
title="create plot"
|
||||
/>
|
||||
Plot
|
||||
</button>
|
||||
<button
|
||||
@@ -80,15 +122,24 @@
|
||||
mat-button
|
||||
matTooltip="Create Gallery"
|
||||
(click)="gallery()"
|
||||
[disabled]="this.splitBy == null">
|
||||
<img src="assets/img/four-squares-line.svg" class="icon-inline" aria-hidden="true" title="Create Gallery (only active if 'Split' is set)" />
|
||||
[disabled]="this.splitBy == null"
|
||||
>
|
||||
<img
|
||||
src="assets/img/four-squares-line.svg"
|
||||
class="icon-inline"
|
||||
aria-hidden="true"
|
||||
title="Create Gallery (only active if 'Split' is set)"
|
||||
/>
|
||||
Gallery
|
||||
</button>
|
||||
<button
|
||||
*ngIf="plotJobActive"
|
||||
mat-button
|
||||
(click)="abort()"
|
||||
matTooltip="abort"><img src="assets/img/close.svg" class="icon-inline" /> Abort</button>
|
||||
matTooltip="abort"
|
||||
>
|
||||
<img src="assets/img/close.svg" class="icon-inline" /> Abort
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -97,12 +148,8 @@
|
||||
<pdb-plot-view
|
||||
#plotView
|
||||
(loadingEvent)="loading($event)"
|
||||
(dateRangeUpdateEvent)="updateDateRange($event)"></pdb-plot-view>
|
||||
<pdb-gallery-view
|
||||
#galleryView>
|
||||
</pdb-gallery-view>
|
||||
(dateRangeUpdateEvent)="updateDateRange($event)"
|
||||
></pdb-plot-view>
|
||||
<pdb-gallery-view #galleryView> </pdb-gallery-view>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
grid:
|
||||
"query-box query-box date-box" auto
|
||||
"filters results results" 1fr
|
||||
/ 25.5em 3fr 23.5em;
|
||||
/ 25.5em 3fr auto;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
|
||||
#date-box{
|
||||
grid-area: date-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,5 +69,7 @@
|
||||
}
|
||||
|
||||
#plot-button-bar {
|
||||
text-align: right;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,21 +1,46 @@
|
||||
import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
|
||||
import { PlotService, PlotType, PlotRequest, TagField, FilterDefaults, DataType, AxesTypes, PlotConfig, RenderOptions, RenderOptionsMap, Suggestion } from '../plot.service';
|
||||
import { UntypedFormControl, } from '@angular/forms';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import { LimitByComponent } from '../limit-by/limit-by.component';
|
||||
import { YAxisDefinitionComponent } from '../y-axis-definition/y-axis-definition.component';
|
||||
import { QueryAutocompleteComponent } from '../query-autocomplete/query-autocomplete.component';
|
||||
import { PlotViewComponent, LoadingEvent } from '../plot-view/plot-view.component';
|
||||
import { GalleryViewComponent } from '../gallery-view/gallery-view.component';
|
||||
import { WidgetDimensions } from '../dashboard.service';
|
||||
import {
|
||||
AfterViewInit,
|
||||
Component,
|
||||
Input,
|
||||
OnInit,
|
||||
ViewChild,
|
||||
} from "@angular/core";
|
||||
import {
|
||||
AxesTypes,
|
||||
DataType,
|
||||
FilterDefaults,
|
||||
PlotConfig,
|
||||
PlotRequest,
|
||||
PlotService,
|
||||
PlotType,
|
||||
RenderOptions,
|
||||
RenderOptionsMap,
|
||||
Suggestion,
|
||||
TagField,
|
||||
} from "../plot.service";
|
||||
import { UntypedFormControl } from "@angular/forms";
|
||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||
import { LimitByComponent } from "../limit-by/limit-by.component";
|
||||
import { YAxisDefinitionComponent } from "../y-axis-definition/y-axis-definition.component";
|
||||
import { QueryAutocompleteComponent } from "../query-autocomplete/query-autocomplete.component";
|
||||
import {
|
||||
DateRange,
|
||||
LoadingEvent,
|
||||
PlotViewComponent,
|
||||
} from "../plot-view/plot-view.component";
|
||||
import { GalleryViewComponent } from "../gallery-view/gallery-view.component";
|
||||
import { WidgetDimensions } from "../dashboard.service";
|
||||
import {
|
||||
DatePickerComponent,
|
||||
DateValue,
|
||||
} from "../components/datepicker/date-picker.component";
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-visualization-page',
|
||||
templateUrl: './visualization-page.component.html',
|
||||
styleUrls: ['./visualization-page.component.scss']
|
||||
selector: "pdb-visualization-page",
|
||||
templateUrl: "./visualization-page.component.html",
|
||||
styleUrls: ["./visualization-page.component.scss"],
|
||||
})
|
||||
export class VisualizationPageComponent implements OnInit, AfterViewInit {
|
||||
|
||||
readonly DATE_PATTERN = "YYYY-MM-DD HH:mm:ss"; // for moment-JS
|
||||
|
||||
@Input()
|
||||
@@ -24,7 +49,9 @@ export class VisualizationPageComponent implements OnInit, AfterViewInit {
|
||||
@Input()
|
||||
galleryEnabled = true;
|
||||
|
||||
dateRange = new UntypedFormControl('2019-10-05 00:00:00 - 2019-10-11 23:59:59');
|
||||
dateRange = new UntypedFormControl(
|
||||
"2019-10-05 00:00:00 - 2019-10-11 23:59:59",
|
||||
);
|
||||
|
||||
selectedPlotType = new Array<PlotType>();
|
||||
plotTypes: PlotType[] = [];
|
||||
@@ -33,133 +60,155 @@ export class VisualizationPageComponent implements OnInit, AfterViewInit {
|
||||
|
||||
groupBy = new Array<TagField>();
|
||||
|
||||
@ViewChild('limitbycomponent')
|
||||
private limitbycomponent! : LimitByComponent;
|
||||
@ViewChild("limitbycomponent")
|
||||
private limitbycomponent!: LimitByComponent;
|
||||
|
||||
@ViewChild("y1AxisDefinitionComponent", { read: YAxisDefinitionComponent })
|
||||
private y1AxisDefinitionComponent!: YAxisDefinitionComponent;
|
||||
|
||||
@ViewChild('y1AxisDefinitionComponent', { read: YAxisDefinitionComponent })
|
||||
private y1AxisDefinitionComponent! : YAxisDefinitionComponent;
|
||||
@ViewChild("y2AxisDefinitionComponent", { read: YAxisDefinitionComponent })
|
||||
private y2AxisDefinitionComponent!: YAxisDefinitionComponent;
|
||||
|
||||
@ViewChild('y2AxisDefinitionComponent', { read: YAxisDefinitionComponent })
|
||||
private y2AxisDefinitionComponent! : YAxisDefinitionComponent;
|
||||
|
||||
@ViewChild('query')
|
||||
@ViewChild("query")
|
||||
query!: QueryAutocompleteComponent;
|
||||
|
||||
@ViewChild('plotView')
|
||||
@ViewChild("plotView")
|
||||
plotView!: PlotViewComponent;
|
||||
|
||||
@ViewChild('galleryView')
|
||||
@ViewChild("galleryView")
|
||||
galleryView!: GalleryViewComponent;
|
||||
|
||||
@ViewChild("datePicker")
|
||||
datePicker!: DatePickerComponent;
|
||||
|
||||
enableGallery = false;
|
||||
splitBy : TagField | undefined = undefined;
|
||||
splitBy: TagField | undefined = undefined;
|
||||
y2AxisAvailable = false;
|
||||
|
||||
intervalUnit = 'NO_INTERVAL';
|
||||
intervalUnit = "NO_INTERVAL";
|
||||
intervalValue = 1;
|
||||
renderBarChartTickLabels = false;
|
||||
|
||||
plotJobActive = false;
|
||||
|
||||
constructor(private plotService: PlotService, private snackBar: MatSnackBar) {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
if (!this.defaultConfig && params.get("config")) {
|
||||
const config = JSON.parse(params.get("config")!);
|
||||
this.defaultConfig = config;
|
||||
}
|
||||
}
|
||||
|
||||
showError(message:string) {
|
||||
showError(message: string) {
|
||||
this.snackBar.open(message, "", {
|
||||
duration: 5000,
|
||||
verticalPosition: 'top'
|
||||
verticalPosition: "top",
|
||||
});
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
(<any>window).initDatePicker();
|
||||
(<any> window).initDatePicker();
|
||||
|
||||
this.plotTypes = this.plotService.getPlotTypes();
|
||||
this.selectedPlotType.push(this.plotTypes[0]);
|
||||
|
||||
this.plotService.getFilterDefaults().subscribe((filterDefaults: FilterDefaults) => {
|
||||
this.plotService.getFilterDefaults().subscribe(
|
||||
(filterDefaults: FilterDefaults) => {
|
||||
filterDefaults.fields.forEach((name: string) => {
|
||||
this.tagFields.push(new TagField(name));
|
||||
}, (error: any) => {
|
||||
this.showError(error.error.message);
|
||||
});
|
||||
|
||||
filterDefaults.fields.forEach((name:string) => {
|
||||
this.tagFields.push(new TagField(name));
|
||||
const groupByDefaults = this.defaultConfig
|
||||
? this.defaultConfig.groupBy
|
||||
: filterDefaults.groupBy;
|
||||
this.groupBy = this.tagFields.filter((val) =>
|
||||
groupByDefaults.includes(val.name)
|
||||
);
|
||||
this.splitBy = this.tagFields.find((val) =>
|
||||
filterDefaults.splitBy == val.name
|
||||
);
|
||||
|
||||
if (this.defaultConfig) {
|
||||
this.plot();
|
||||
}
|
||||
},
|
||||
(error: any) => {
|
||||
this.showError(error.error.message);
|
||||
});
|
||||
|
||||
const groupByDefaults = this.defaultConfig ? this.defaultConfig.groupBy : filterDefaults.groupBy;
|
||||
this.groupBy = this.tagFields.filter(val => groupByDefaults.includes(val.name));
|
||||
this.splitBy = this.tagFields.find(val => filterDefaults.splitBy == val.name);
|
||||
|
||||
if (this.defaultConfig) {
|
||||
this.plot();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
if (this.defaultConfig) {
|
||||
const c = this.defaultConfig;
|
||||
this.query.suggestionFetcherEnabled = false;
|
||||
this.query.queryField.setValue(new Suggestion(c.query, c.query, c.query.length));
|
||||
this.query.suggestionFetcherEnabled = true;
|
||||
ngAfterViewInit(): void {
|
||||
if (this.defaultConfig) {
|
||||
const c = this.defaultConfig;
|
||||
this.query.suggestionFetcherEnabled = false;
|
||||
this.query.queryField.setValue(
|
||||
new Suggestion(c.query, c.query, c.query.length),
|
||||
);
|
||||
this.query.suggestionFetcherEnabled = true;
|
||||
|
||||
this.selectedPlotType = this.plotTypes.filter(pt => c.aggregates.includes(pt.id));
|
||||
this.changePlotType(this.selectedPlotType);
|
||||
this.updateDateRange(c.dateRange, false);
|
||||
this.limitbycomponent.limitBy = c.limitBy;
|
||||
this.limitbycomponent.limit = c.limit;
|
||||
this.y1AxisDefinitionComponent.yAxisScale = c.y1.axisScale;
|
||||
this.y1AxisDefinitionComponent.minYValue = c.y1.rangeMin;
|
||||
this.y1AxisDefinitionComponent.maxYValue = c.y1.rangeMax;
|
||||
this.y1AxisDefinitionComponent.yAxisUnit = c.y1.rangeUnit;
|
||||
this.selectedPlotType = this.plotTypes.filter((pt) =>
|
||||
c.aggregates.includes(pt.id)
|
||||
);
|
||||
this.changePlotType(this.selectedPlotType);
|
||||
this.updateDateRange(c.dateRange, false);
|
||||
this.limitbycomponent.limitBy = c.limitBy;
|
||||
this.limitbycomponent.limit = c.limit;
|
||||
this.intervalUnit = c.intervalUnit;
|
||||
this.intervalValue = c.intervalValue;
|
||||
this.y1AxisDefinitionComponent.yAxisScale = c.y1.axisScale;
|
||||
this.y1AxisDefinitionComponent.minYValue = c.y1.rangeMin;
|
||||
this.y1AxisDefinitionComponent.maxYValue = c.y1.rangeMax;
|
||||
this.y1AxisDefinitionComponent.yAxisUnit = c.y1.rangeUnit;
|
||||
|
||||
if (c.y2) {
|
||||
this.y2AxisDefinitionComponent.yAxisScale = c.y2.axisScale;
|
||||
this.y2AxisDefinitionComponent.minYValue = c.y2.rangeMin;
|
||||
this.y2AxisDefinitionComponent.maxYValue = c.y2.rangeMax;
|
||||
this.y2AxisDefinitionComponent.yAxisUnit = c.y2.rangeUnit;
|
||||
if (c.y2) {
|
||||
this.y2AxisDefinitionComponent.yAxisScale = c.y2.axisScale;
|
||||
this.y2AxisDefinitionComponent.minYValue = c.y2.rangeMin;
|
||||
this.y2AxisDefinitionComponent.maxYValue = c.y2.rangeMax;
|
||||
this.y2AxisDefinitionComponent.yAxisUnit = c.y2.rangeUnit;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
toggleGallery(event: Event) {
|
||||
this.galleryView.show = this.enableGallery;
|
||||
}
|
||||
|
||||
loading(event: LoadingEvent) {
|
||||
this.plotJobActive = event.loading;
|
||||
}
|
||||
|
||||
updateDateRange(newDateRange: string, updatePlot=true) {
|
||||
(<HTMLInputElement>document.getElementById("search-date-range")).value = newDateRange;
|
||||
if (updatePlot){
|
||||
updateDateRange(newDateRange: DateValue, updatePlot = true) {
|
||||
this.datePicker.setDateValue(newDateRange);
|
||||
if (updatePlot) {
|
||||
this.plot();
|
||||
}
|
||||
}
|
||||
|
||||
changePlotType(selectedPlotTypes: Array<PlotType>) {
|
||||
const compatiblePlotTypes = this.plotTypes.filter(pt => pt.compatible(selectedPlotTypes));
|
||||
this.plotTypes.forEach(pt => pt.active=false);
|
||||
compatiblePlotTypes.forEach(pt => pt.active=true);
|
||||
const compatiblePlotTypes = this.plotTypes.filter((pt) =>
|
||||
pt.compatible(selectedPlotTypes)
|
||||
);
|
||||
this.plotTypes.forEach((pt) => pt.active = false);
|
||||
compatiblePlotTypes.forEach((pt) => pt.active = true);
|
||||
|
||||
const axesTypes = this.getAxes();
|
||||
this.y2AxisAvailable = axesTypes.y.length == 2;
|
||||
}
|
||||
|
||||
selectedPlotTypesContains(plotTypeIds: Array<string>){
|
||||
return this.selectedPlotType.filter(pt => plotTypeIds.includes(pt.id)).length > 0;
|
||||
selectedPlotTypesContains(plotTypeIds: Array<string>) {
|
||||
return this.selectedPlotType.filter((pt) => plotTypeIds.includes(pt.id))
|
||||
.length > 0;
|
||||
}
|
||||
|
||||
|
||||
dateRangeAsString() : string {
|
||||
return (<HTMLInputElement>document.getElementById("search-date-range")).value;
|
||||
dateRangeAsString(): DateValue {
|
||||
return this.datePicker.getDateValue();
|
||||
}
|
||||
|
||||
gallery(){
|
||||
if (this.splitBy != null){
|
||||
this.plotView.imageUrl = '';
|
||||
gallery() {
|
||||
if (this.splitBy != null) {
|
||||
this.plotView.imageUrl = "";
|
||||
this.plotView.stats = null;
|
||||
this.galleryView.show=true;
|
||||
this.galleryView.show = true;
|
||||
const request = this.createPlotRequest();
|
||||
this.galleryView.renderGallery(request, this.splitBy.name);
|
||||
} else {
|
||||
@@ -167,12 +216,11 @@ ngAfterViewInit(): void {
|
||||
}
|
||||
}
|
||||
|
||||
getAxes() : AxesTypes {
|
||||
|
||||
getAxes(): AxesTypes {
|
||||
const x = new Array<DataType>();
|
||||
const y = new Array<DataType>();
|
||||
|
||||
for(var i = 0; i < this.selectedPlotType.length; i++){
|
||||
for (var i = 0; i < this.selectedPlotType.length; i++) {
|
||||
var plotType = this.selectedPlotType[i];
|
||||
if (!x.includes(plotType.xAxis)) {
|
||||
x.push(plotType.xAxis);
|
||||
@@ -182,43 +230,46 @@ ngAfterViewInit(): void {
|
||||
}
|
||||
}
|
||||
|
||||
return new AxesTypes(x,y);
|
||||
return new AxesTypes(x, y);
|
||||
}
|
||||
|
||||
abort() {
|
||||
this.plotService.abort((<any>window).submitterId).subscribe({
|
||||
this.plotService.abort((<any> window).submitterId).subscribe({
|
||||
complete: () => {
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
plot(){
|
||||
plot() {
|
||||
const config = this.createPlotConfig();
|
||||
this.plotView.plot(config, this.plotDimensionSupplier);
|
||||
}
|
||||
|
||||
plotDimensionSupplier(): WidgetDimensions{
|
||||
plotDimensionSupplier(): WidgetDimensions {
|
||||
const results = document.getElementById("results");
|
||||
return new WidgetDimensions(
|
||||
results != null ? results.offsetWidth-1 : 1024,
|
||||
results != null ? results.offsetHeight-1: 1024);
|
||||
results != null ? results.offsetWidth - 1 : 1024,
|
||||
results != null ? results.offsetHeight - 1 : 1024,
|
||||
);
|
||||
}
|
||||
|
||||
createPlotConfig(): PlotConfig {
|
||||
const aggregates = new Array<string>();
|
||||
this.selectedPlotType.forEach(a => aggregates.push(a.id));
|
||||
this.selectedPlotType.forEach((a) => aggregates.push(a.id));
|
||||
|
||||
const y1 = this.y1AxisDefinitionComponent.getAxisDefinition();
|
||||
const y2 = this.y2AxisDefinitionComponent ? this.y2AxisDefinitionComponent.getAxisDefinition() : undefined;
|
||||
const y2 = this.y2AxisDefinitionComponent
|
||||
? this.y2AxisDefinitionComponent.getAxisDefinition()
|
||||
: undefined;
|
||||
|
||||
const config = new PlotConfig(
|
||||
this.query.query,
|
||||
this.groupBy.map(o => o.name),
|
||||
this.groupBy.map((o) => o.name),
|
||||
this.limitbycomponent.limitBy,
|
||||
this.limitbycomponent.limit,
|
||||
y1,
|
||||
y2,
|
||||
this.dateRangeAsString(), // dateRange
|
||||
this.datePicker.getDateValue(), // dateRange
|
||||
aggregates, // aggregates
|
||||
this.intervalUnit,
|
||||
this.intervalValue,
|
||||
@@ -232,16 +283,30 @@ ngAfterViewInit(): void {
|
||||
|
||||
const config = this.createPlotConfig();
|
||||
|
||||
const renderOptions : RenderOptionsMap = {
|
||||
'main': new RenderOptions(results!.offsetHeight-1, results!.offsetWidth-1, false, true),
|
||||
'thumbnail': new RenderOptions(200, 300, false, false),
|
||||
const renderOptions: RenderOptionsMap = {
|
||||
"main": new RenderOptions(
|
||||
results!.offsetHeight - 1,
|
||||
results!.offsetWidth - 1,
|
||||
true,
|
||||
true,
|
||||
),
|
||||
"thumbnail": new RenderOptions(200, 300, false, false),
|
||||
};
|
||||
|
||||
const request = new PlotRequest(
|
||||
(<any>window).submitterId,
|
||||
(<any> window).submitterId,
|
||||
config,
|
||||
renderOptions
|
||||
);
|
||||
renderOptions,
|
||||
);
|
||||
return request;
|
||||
}
|
||||
|
||||
serializedConfig(): string {
|
||||
try {
|
||||
const config = this.createPlotConfig();
|
||||
return JSON.stringify(config);
|
||||
} catch (e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,15 @@
|
||||
<mat-form-field class="pdb-form-mid">
|
||||
<mat-label>Y{{yIndex}}-Axis Unit:</mat-label>
|
||||
<mat-select [(value)]="yAxisUnit">
|
||||
<mat-optgroup label="⸺numbers⸺">
|
||||
<mat-optgroup label="—numbers—">
|
||||
<mat-option value="AUTOMATIC_NUMBER">auto (number)</mat-option>
|
||||
<mat-option value="NO_UNIT">no unit</mat-option>
|
||||
</mat-optgroup>
|
||||
<mat-optgroup label="⸺time⸺">
|
||||
<mat-optgroup label="—bytes—">
|
||||
<mat-option value="AUTOMATIC_BYTES">auto (bytes)</mat-option>
|
||||
<mat-option value="BYTES">bytes</mat-option>
|
||||
</mat-optgroup>
|
||||
<mat-optgroup label="—time—">
|
||||
<mat-option value="AUTOMATIC_TIME">auto (time)</mat-option>
|
||||
<mat-option value="MILLISECONDS">millis</mat-option>
|
||||
<mat-option value="SECONDS">seconds</mat-option>
|
||||
@@ -25,11 +29,11 @@
|
||||
</mat-optgroup>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER'" class="pdb-form-number">
|
||||
<mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER' && yAxisUnit !== 'AUTOMATIC_BYTES'" class="pdb-form-number">
|
||||
<mat-label>Min:</mat-label>
|
||||
<input matInput type="number" placeholder="Min" min="0" [(ngModel)]="minYValue">
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER'" class="pdb-form-number">
|
||||
<mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER' && yAxisUnit !== 'AUTOMATIC_BYTES'" class="pdb-form-number">
|
||||
<mat-label>Max:</mat-label>
|
||||
<input matInput type="number" placeholder="Max" min="0" [(ngModel)]="maxYValue">
|
||||
</mat-form-field>
|
||||
|
||||
@@ -1,10 +1,27 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { YAxisDefinition } from '../plot.service';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { MatFormField, MatLabel } from '@angular/material/form-field';
|
||||
import { MatOptgroup, MatOption, MatSelect } from '@angular/material/select';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { MatInput } from '@angular/material/input';
|
||||
|
||||
@Component({
|
||||
selector: 'pdb-y-axis-definition',
|
||||
templateUrl: './y-axis-definition.component.html',
|
||||
styleUrls: ['./y-axis-definition.component.scss']
|
||||
styleUrls: ['./y-axis-definition.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
BrowserModule,
|
||||
FormsModule,
|
||||
MatFormField,
|
||||
MatInput,
|
||||
MatLabel,
|
||||
MatSelect,
|
||||
MatOption,
|
||||
MatOptgroup,
|
||||
ReactiveFormsModule
|
||||
]
|
||||
})
|
||||
export class YAxisDefinitionComponent {
|
||||
|
||||
|
||||
1
pdb-js/src/assets/img/bookmark-add-line.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><rect fill="none" height="24" width="24"/><path d="M17,11v6.97l-5-2.14l-5,2.14V5h6V3H7C5.9,3,5,3.9,5,5v16l7-3l7,3V11H17z M21,7h-2v2h-2V7h-2V5h2V3h2v2h2V7z"/></svg>
|
||||
|
After Width: | Height: | Size: 280 B |
1
pdb-js/src/assets/img/bookmark-line.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17 3H7c-1.1 0-2 .9-2 2v16l7-3 7 3V5c0-1.1-.9-2-2-2zm0 15l-5-2.18L7 18V5h10v13z"/></svg>
|
||||
|
After Width: | Height: | Size: 219 B |
1
pdb-js/src/assets/img/bookmarks-line.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15 7v12.97l-4.21-1.81-.79-.34-.79.34L5 19.97V7h10m4-6H8.99C7.89 1 7 1.9 7 3h10c1.1 0 2 .9 2 2v13l2 1V3c0-1.1-.9-2-2-2zm-4 4H5c-1.1 0-2 .9-2 2v16l7-3 7 3V7c0-1.1-.9-2-2-2z"/></svg>
|
||||
|
After Width: | Height: | Size: 311 B |
5
pdb-js/src/assets/img/image-aborted.svg
Normal file
@@ -0,0 +1,5 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="-30 -30 700 700">
|
||||
<path d="M-.012 65.611h640.024v508.778H-.012V65.611zm180.026 132.273c22.996 0 41.635 18.638 41.635 41.634 0 22.997-18.638 41.635-41.635 41.635-22.996 0-41.634-18.638-41.634-41.635 0-22.996 18.638-41.634 41.634-41.634zm175.207 178.679l83.269-143.978 88.466 223.763h-412.86v-27.756l34.702-1.725 34.69-85.005 17.338 60.722h52.052l45.095-116.222 57.248 90.201zM47.528 107.764h544.944v424.47H47.528v-424.47z"/>
|
||||
|
||||
<line x1="10" y1="630" x2="630" y2="10" style="stroke:#000; stroke-width: 60px; stroke-linecap: round;" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 758 B |
1
pdb-js/src/assets/img/launch.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/></svg>
|
||||
|
After Width: | Height: | Size: 268 B |
1
pdb-js/src/assets/img/move.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-g</title><polyline points="176 112 256 32 336 112" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="255.98" y1="32" x2="256" y2="480" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="176 400 256 480 336 400" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="400 176 480 256 400 336" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="112 176 32 256 112 336" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="32" y1="256" x2="480" y2="256" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
|
||||
|
After Width: | Height: | Size: 928 B |
1
pdb-js/src/assets/img/resize.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-c</title><polyline points="304 96 416 96 416 208" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="405.77" y1="106.2" x2="111.98" y2="400.02" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="208 416 96 416 96 304" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
|
||||
|
After Width: | Height: | Size: 532 B |
1
pdb-js/src/assets/img/save-outline.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-p</title><path d="M380.93,57.37A32,32,0,0,0,358.3,48H94.22A46.21,46.21,0,0,0,48,94.22V417.78A46.21,46.21,0,0,0,94.22,464H417.78A46.36,46.36,0,0,0,464,417.78V153.7a32,32,0,0,0-9.37-22.63ZM256,416a64,64,0,1,1,64-64A63.92,63.92,0,0,1,256,416Zm48-224H112a16,16,0,0,1-16-16V112a16,16,0,0,1,16-16H304a16,16,0,0,1,16,16v64A16,16,0,0,1,304,192Z" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
|
||||
|
After Width: | Height: | Size: 542 B |
@@ -7,35 +7,27 @@ var invaders_stepSize = 5;
|
||||
var invaders_margin = 30;
|
||||
var invaders_city_height = 75;
|
||||
var invaders_pause = true;
|
||||
var invaders_parentDivId = 'invaders_area';
|
||||
var invaders_area = 'invaders_area';
|
||||
var invaders_kills = 0;
|
||||
var invaders_points = 0;
|
||||
var invaders_points_kill = 10;
|
||||
var invaders_points_lost = -50;
|
||||
var invaders_game_over = false;
|
||||
var invaders_loop_count = 0;
|
||||
var invaders_parentDivId = "invaders";
|
||||
|
||||
function initInvaders(parentDivId) {
|
||||
invaders_parentDivId = parentDivId;
|
||||
|
||||
// create a copy of the parentDiv
|
||||
// and set it at the exact same position
|
||||
var parent = $('#'+parentDivId);
|
||||
var height = parent.height();
|
||||
var width = parent.width();
|
||||
$('body').append('<div id="'+invaders_parentDivId+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
|
||||
$('#'+invaders_parentDivId).offset({ top: parent.offset().top, left: parent.offset().left})
|
||||
$('#'+invaders_parentDivId).height(parent.height());
|
||||
$('#'+invaders_parentDivId).width(parent.width());
|
||||
|
||||
$('#'+invaders_parentDivId)
|
||||
$('body').append('<div id="'+invaders_area+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
|
||||
|
||||
$('.invader_notify').click(function() {
|
||||
// restart the game
|
||||
$('#'+invaders_parentDivId).remove();
|
||||
initInvaders(parentDivId);
|
||||
$('#'+invaders_area).remove();
|
||||
initInvaders(invaders_parentDivId);
|
||||
invaders_game_over = false;
|
||||
invaders_kills = 0;
|
||||
invaders_points = 0;
|
||||
invaders_points = 0;
|
||||
|
||||
startInvaders();
|
||||
});
|
||||
@@ -49,7 +41,7 @@ function gameOver() {
|
||||
}
|
||||
|
||||
function pauseInvaders() {
|
||||
$('#'+invaders_parentDivId).hide();
|
||||
$('#'+invaders_area).hide();
|
||||
clearIntervals();
|
||||
}
|
||||
|
||||
@@ -60,15 +52,25 @@ function clearIntervals() {
|
||||
|
||||
function startInvaders() {
|
||||
|
||||
$('#'+invaders_parentDivId).show();
|
||||
// move invaders_area to the same position as the parent div
|
||||
const parent = $('#'+invaders_parentDivId);
|
||||
const height = parent.height();
|
||||
const width = parent.width();
|
||||
const area = document.getElementById(invaders_area);
|
||||
area.style.top=parent.offset().top+"px";
|
||||
area.style.left=parent.offset().left+"px";
|
||||
area.style.height=parent.height()+"px";
|
||||
area.style.width=parent.width()+"px";
|
||||
|
||||
$('#'+invaders_area).show();
|
||||
|
||||
if (!invaders_game_over) {
|
||||
if (invaders_count == 0) {
|
||||
addInvader(invaders_parentDivId);
|
||||
addInvader(invaders_area);
|
||||
}
|
||||
|
||||
clearIntervals();
|
||||
invaders_game_move=window.setInterval("moveRandomly('"+invaders_parentDivId+"')",100);
|
||||
invaders_game_move=window.setInterval("moveRandomly('"+invaders_area+"')",100);
|
||||
invaders_game_new=window.setInterval("addInvader()", 1000);
|
||||
}
|
||||
}
|
||||
@@ -77,7 +79,7 @@ function startInvaders() {
|
||||
function addInvader()
|
||||
{
|
||||
var id = 'invader_' + invaders_count++;
|
||||
var parent = $('#'+invaders_parentDivId);
|
||||
var parent = $('#'+invaders_area);
|
||||
var height = parent.height();
|
||||
var width = parent.width();
|
||||
var top = 10; // start at the top
|
||||
@@ -114,8 +116,8 @@ function moveRandomly(parentDivId)
|
||||
var top = invader.position().top;
|
||||
var left = invader.position().left;
|
||||
|
||||
var parent = $('#'+parentDivId);
|
||||
var minTop = parent.position().top;
|
||||
var parent = $('#'+parentDivId);
|
||||
var minTop = parent.position().top;
|
||||
var maxTop = parent.height();
|
||||
var width = parent.width();
|
||||
|
||||
|
||||
@@ -40,13 +40,29 @@
|
||||
'Last 30 Days': [moment().subtract(29, 'days').startOf('day'), moment().endOf('day')],
|
||||
'This Month': [moment().startOf('month'), moment().endOf('month').endOf('day')],
|
||||
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
|
||||
'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().endOf('month').endOf('day')],
|
||||
'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().subtract(1, 'month').endOf('month').endOf('day')],
|
||||
'This Year': [moment().startOf('year'),moment().endOf('month').endOf('day')],
|
||||
'Last Year': [moment().subtract(1, 'year').startOf('year'),moment().subtract(1, 'year').endOf('year')],
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function initSimpleDatePicker() {
|
||||
$('input[name="dates"]').daterangepicker({
|
||||
timePicker: true,
|
||||
minDate: "2017-01-01",
|
||||
maxDate: "2029-12-31",
|
||||
maxYear: parseInt(moment().format('YYYY'),10),
|
||||
timePicker24Hour: true,
|
||||
timePickerSeconds: true,
|
||||
showDropdowns: true, // drop downs for selecting year and month
|
||||
locale: {
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
"firstDay": 1 // monday is the first day of the week
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
$( document ).ready(function() {
|
||||
initInvaders('results');
|
||||
document.addEventListener("invadersPause", function(event) {
|
||||
|
||||
@@ -8,7 +8,11 @@ if (environment.production) {
|
||||
enableProdMode();
|
||||
}
|
||||
|
||||
(<any>window).submitterId = crypto.randomUUID();
|
||||
(<any>window).randomId = () => {
|
||||
return Math.random().toString(36).replace('0.', '') + Math.random().toString(36).replace('0.', '');
|
||||
};
|
||||
|
||||
(<any>window).submitterId = (<any>window).randomId();
|
||||
|
||||
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||
.catch(err => console.error(err));
|
||||
|
||||
@@ -14,25 +14,21 @@
|
||||
// If you don't need the default component typographies but still want the hierarchy styles,
|
||||
// you can delete this line and instead use:
|
||||
// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
|
||||
/* TODO(mdc-migration): Remove all-legacy-component-typographies once all legacy components are migrated*/
|
||||
@include mat.all-legacy-component-typographies();
|
||||
@include mat.all-component-typographies();
|
||||
/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated*/
|
||||
@include mat.legacy-core();
|
||||
@include mat.core();
|
||||
|
||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
||||
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
|
||||
// hue. Available color palettes: https://material.io/design/color/
|
||||
$candy-app-primary: mat.define-palette(mat.$blue-palette);
|
||||
$candy-app-accent: mat.define-palette(mat.$blue-palette, A200, A100, A400);
|
||||
$candy-app-primary: mat.m2-define-palette(mat.$m2-blue-palette);
|
||||
$candy-app-accent: mat.m2-define-palette(mat.$m2-blue-palette, A200, A100, A400);
|
||||
|
||||
// The warn palette is optional (defaults to red).
|
||||
$candy-app-warn: mat.define-palette(mat.$red-palette);
|
||||
$candy-app-warn: mat.m2-define-palette(mat.$m2-red-palette);
|
||||
|
||||
// Create the theme object. A theme consists of configurations for individual
|
||||
// theming systems such as "color" or "typography".
|
||||
$candy-app-theme: mat.define-light-theme((
|
||||
$candy-app-theme: mat.m2-define-light-theme((
|
||||
color: (
|
||||
primary: $candy-app-primary,
|
||||
accent: $candy-app-accent,
|
||||
@@ -45,8 +41,6 @@ $candy-app-theme: mat.define-light-theme((
|
||||
// Include theme styles for core and each component used in your app.
|
||||
// Alternatively, you can import and @include the theme mixins for each component
|
||||
// that you are using.
|
||||
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||
@include mat.all-legacy-component-themes($candy-app-theme);
|
||||
@include mat.all-component-themes($candy-app-theme);
|
||||
|
||||
|
||||
@@ -97,6 +91,10 @@ h2 {
|
||||
margin-block-end: 0.83rem;
|
||||
}
|
||||
|
||||
.hidden {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.icon-inline {
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
@@ -178,6 +176,9 @@ a.external-link:after {
|
||||
mat-form-field.pdb-form-full-width {
|
||||
width: 100%;
|
||||
}
|
||||
mat-form-field.pdb-form-number-small {
|
||||
width: 4.5em;
|
||||
}
|
||||
mat-form-field.pdb-form-number {
|
||||
width: 5.5em;
|
||||
}
|
||||
@@ -190,13 +191,14 @@ mat-form-field.pdb-form-mid {
|
||||
mat-form-field.pdb-form-wide {
|
||||
width: 10em;
|
||||
}
|
||||
.mat-mdc-form-field-subscript-wrapper {
|
||||
display: none;
|
||||
pdb-visualization-page .mat-mdc-form-field-subscript-wrapper,
|
||||
app-add-text-dialog .mat-mdc-form-field-subscript-wrapper {
|
||||
display: none;/**/
|
||||
}
|
||||
|
||||
.errorPanel {
|
||||
padding: 1ex;
|
||||
background-color: map-get(mat.$red-palette, 100);
|
||||
background-color: map-get(mat.$m2-red-palette, 100);
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
@@ -207,3 +209,73 @@ mat-form-field.pdb-form-wide {
|
||||
top: 0.2em;
|
||||
line-height: 1em;
|
||||
}
|
||||
|
||||
a.external-link:after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
background: url("assets/img/external-link.svg") no-repeat;
|
||||
background-size: 1em;
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
margin-left: 0.3em;
|
||||
vertical-align: text-top;
|
||||
}
|
||||
|
||||
|
||||
/* styles for markdown*/
|
||||
markdown blockquote {
|
||||
border-left: 3px grey solid;
|
||||
display: block;
|
||||
margin: 1em 0 1em 2em;
|
||||
padding: 0.5em 0 0.5em 0.5em;
|
||||
}
|
||||
|
||||
markdown table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
markdown table th, markdown table td {
|
||||
border: solid 1px black;
|
||||
padding: 0.4em;
|
||||
}
|
||||
markdown thead {
|
||||
border-bottom: 2px black solid;
|
||||
}
|
||||
markdown tfoot {
|
||||
border-top: 2px black solid;
|
||||
}
|
||||
|
||||
markdown pre {
|
||||
font-family: monospace;
|
||||
}
|
||||
|
||||
|
||||
.plot-details-plotType {
|
||||
background-image: url(/assets/img/pointTypes.png);
|
||||
width: 9px;
|
||||
height: 7px;
|
||||
transform: scale(1.5);
|
||||
}
|
||||
|
||||
.plot-details-plotType_0 {background-position-x: 0px;}
|
||||
.plot-details-plotType_1 {background-position-x: -10px;}
|
||||
.plot-details-plotType_2 {background-position-x: -20px;}
|
||||
.plot-details-plotType_3 {background-position-x: -30px;}
|
||||
.plot-details-plotType_4 {background-position-x: -40px;}
|
||||
.plot-details-plotType_5 {background-position-x: -50px;}
|
||||
.plot-details-plotType_6 {background-position-x: -60px;}
|
||||
.plot-details-plotType_7 {background-position-x: -70px;}
|
||||
.plot-details-plotType_8 {background-position-x: -80px;}
|
||||
.plot-details-plotType_9 {background-position-x: -90px;}
|
||||
.plot-details-plotType_10 {background-position-x:-100px;}
|
||||
.plot-details-plotType_11 {background-position-x:-110px;}
|
||||
.plot-details-plotType_12 {background-position-x:-120px;}
|
||||
|
||||
.plot-details-plotType_0051c2 {background-position-y: 0px;}
|
||||
.plot-details-plotType_bf8300 {background-position-y: -8px;}
|
||||
.plot-details-plotType_9400d3 {background-position-y: -16px;}
|
||||
.plot-details-plotType_00c254 {background-position-y: -24px;}
|
||||
.plot-details-plotType_e6e600 {background-position-y: -32px;}
|
||||
.plot-details-plotType_e51e10 {background-position-y: -40px;}
|
||||
.plot-details-plotType_57a1c2 {background-position-y: -48px;}
|
||||
.plot-details-plotType_bd36c2 {background-position-y: -56px;}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
"baseUrl": "./",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"esModuleInterop": true,
|
||||
"strict": true,
|
||||
"noImplicitOverride": true,
|
||||
"noPropertyAccessFromIndexSignature": true,
|
||||
@@ -12,7 +13,6 @@
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"downlevelIteration": true,
|
||||
"experimentalDecorators": true,
|
||||
"moduleResolution": "node",
|
||||
"importHelpers": true,
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
package org.lucares.pdb.plot.api;
|
||||
|
||||
import java.time.DayOfWeek;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.time.temporal.TemporalAdjusters;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.lucares.pdb.api.DateTimeRange;
|
||||
import org.lucares.utils.Preconditions;
|
||||
|
||||
public class DateTimeRangeParser {
|
||||
|
||||
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
public static DateTimeRange parse(final OffsetDateTime offsetTime, final String datePeriod) {
|
||||
|
||||
final String[] startEnd = datePeriod.split(Pattern.quote("/"));
|
||||
final String start = startEnd[0];
|
||||
final String end = startEnd[1];
|
||||
|
||||
final OffsetDateTime startTime = parseInternal(offsetTime, start);
|
||||
final OffsetDateTime endTime = parseInternal(offsetTime, end);
|
||||
|
||||
return new DateTimeRange(startTime, endTime);
|
||||
}
|
||||
|
||||
private static OffsetDateTime parseInternal(final OffsetDateTime offsetTime, final String timeDefinition) {
|
||||
|
||||
final Pattern regex = Pattern.compile("(?<beginEnd>[BE])(?<amountUnit>(\\-?[0-9]*[mHDWMY])+)",
|
||||
Pattern.MULTILINE);
|
||||
|
||||
final Matcher matcher = regex.matcher(timeDefinition);
|
||||
|
||||
if (matcher.matches()) {
|
||||
|
||||
final String beginEnd = matcher.group("beginEnd");
|
||||
final boolean begin = "B".equals(beginEnd);
|
||||
|
||||
OffsetDateTime result = offsetTime;
|
||||
|
||||
final String amountUnitString = matcher.group("amountUnit");
|
||||
final Pattern regexAmountUnit = Pattern.compile("(?<amount>\\-?[0-9]*)(?<unit>[mHDWMY])");
|
||||
final Matcher m = regexAmountUnit.matcher(amountUnitString);
|
||||
while (m.find()) {
|
||||
final String amountString = m.group("amount");
|
||||
final String unitString = m.group("unit");
|
||||
final int amount = amountString.equals("") ? 0 : Integer.parseInt(amountString);
|
||||
|
||||
switch (unitString) {
|
||||
case "m": {
|
||||
final ChronoUnit unit = ChronoUnit.MINUTES;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).truncatedTo(unit);
|
||||
} else {
|
||||
result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "H": {
|
||||
final ChronoUnit unit = ChronoUnit.HOURS;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).truncatedTo(unit);
|
||||
} else {
|
||||
result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "D": {
|
||||
final ChronoUnit unit = ChronoUnit.DAYS;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).truncatedTo(unit);
|
||||
} else {
|
||||
result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "W": {
|
||||
final DayOfWeek firstDayOfWeek = DayOfWeek.MONDAY;
|
||||
final DayOfWeek lastDayOfWeek = DayOfWeek
|
||||
.of(((firstDayOfWeek.getValue() - 1 + 6) % DayOfWeek.values().length) + 1); // weird
|
||||
// computation,
|
||||
// because
|
||||
// DayOfWeek
|
||||
// goes from 1
|
||||
// to 7
|
||||
final ChronoUnit unit = ChronoUnit.WEEKS;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).with(TemporalAdjusters.previousOrSame(firstDayOfWeek))
|
||||
.truncatedTo(ChronoUnit.DAYS);
|
||||
} else {
|
||||
result = result.plus(amount, unit).with(TemporalAdjusters.nextOrSame(lastDayOfWeek))
|
||||
.plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "M": {
|
||||
final ChronoUnit unit = ChronoUnit.MONTHS;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfMonth(1);
|
||||
} else {
|
||||
result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfMonth(1)
|
||||
.plus(1, ChronoUnit.MONTHS).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "Y": {
|
||||
final ChronoUnit unit = ChronoUnit.YEARS;
|
||||
if (begin) {
|
||||
result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfYear(1);
|
||||
} else {
|
||||
result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfYear(1)
|
||||
.plus(1, ChronoUnit.YEARS).minusSeconds(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
throw new IllegalArgumentException("Unexpected value: " + unitString);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("invalid input: " + timeDefinition);
|
||||
}
|
||||
|
||||
public static DateTimeRange parseAbsolute(final String dateRangeAsString) {
|
||||
final String[] startEnd = dateRangeAsString.split(Pattern.quote(" - "));
|
||||
Preconditions.checkEqual(startEnd.length, 2, "invalid date range: ''{0}''", dateRangeAsString);
|
||||
|
||||
final String startString = startEnd[0];
|
||||
final String endString = startEnd[1];
|
||||
|
||||
final OffsetDateTime start = LocalDateTime.parse(startString, DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
final OffsetDateTime end = LocalDateTime.parse(endString, DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
|
||||
return new DateTimeRange(start, end);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package org.lucares.pdb.plot.api;
|
||||
|
||||
public class DateValue {
|
||||
public enum DateType {
|
||||
QUICK, RELATIVE, ABSOLUTE
|
||||
}
|
||||
|
||||
private DateType type;
|
||||
|
||||
private String display;
|
||||
|
||||
private String value;
|
||||
|
||||
public DateType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(final DateType type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getDisplay() {
|
||||
return display;
|
||||
}
|
||||
|
||||
public void setDisplay(final String display) {
|
||||
this.display = display;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,23 +1,19 @@
|
||||
package org.lucares.pdb.plot.api;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.TreeMap;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.lucares.pdb.api.DateTimeRange;
|
||||
import org.lucares.recommind.logs.GnuplotAxis;
|
||||
import org.lucares.recommind.logs.GnuplotSettings;
|
||||
import org.lucares.utils.Preconditions;
|
||||
|
||||
public class PlotSettings {
|
||||
|
||||
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
private String query;
|
||||
|
||||
@@ -27,7 +23,7 @@ public class PlotSettings {
|
||||
|
||||
private int limit;
|
||||
|
||||
private String dateRangeAsString;
|
||||
private DateValue dateValue;
|
||||
|
||||
private YAxisDefinition y1;
|
||||
private YAxisDefinition y2;
|
||||
@@ -80,30 +76,32 @@ public class PlotSettings {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public String getDateRange() {
|
||||
return dateRangeAsString;
|
||||
public DateValue getDateRange() {
|
||||
return dateValue;
|
||||
}
|
||||
|
||||
public void setDateRange(final String dateRangeAsString) {
|
||||
this.dateRangeAsString = dateRangeAsString;
|
||||
public void setDateRange(final DateValue dateValue) {
|
||||
this.dateValue = dateValue;
|
||||
}
|
||||
|
||||
public DateTimeRange dateRange() {
|
||||
|
||||
final String[] startEnd = dateRangeAsString.split(Pattern.quote(" - "));
|
||||
Preconditions.checkEqual(startEnd.length, 2, "invalid date range: ''{0}''", dateRangeAsString);
|
||||
|
||||
final OffsetDateTime startDate = LocalDateTime.parse(startEnd[0], DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
final OffsetDateTime endDate = LocalDateTime.parse(startEnd[1], DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
|
||||
return new DateTimeRange(startDate, endDate);
|
||||
switch (this.dateValue.getType()) {
|
||||
case RELATIVE:
|
||||
case QUICK:
|
||||
final DateTimeRange dateTimeRange = DateTimeRangeParser.parse(OffsetDateTime.now(), dateValue.getValue());
|
||||
return dateTimeRange;
|
||||
case ABSOLUTE:
|
||||
return DateTimeRangeParser.parseAbsolute(dateValue.getValue());
|
||||
}
|
||||
throw new UnsupportedOperationException();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "PlotSettings [query=" + query + ", groupBy=" + groupBy + ", limitBy=" + limitBy + ", limit=" + limit
|
||||
+ ", dateRangeAsString=" + dateRangeAsString + ", y1=" + y1 + " y2=" + y2 + ", aggregates=" + aggregates
|
||||
+ ", dateRangeAsString=" + dateValue + ", y1=" + y1 + " y2=" + y2 + ", aggregates=" + aggregates
|
||||
+ ", renders=" + renders + "]";
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ public enum RangeUnit {
|
||||
|
||||
NO_UNIT(false, Type.Number, "Value"),
|
||||
|
||||
AUTOMATIC_BYTES(true, Type.Number, "Value"),
|
||||
|
||||
BYTES(false, Type.Number, "Value"),
|
||||
|
||||
AUTOMATIC_TIME(true, Type.Duration, "Duration"),
|
||||
@@ -43,6 +45,10 @@ public enum RangeUnit {
|
||||
return type == Type.Number || type == Type.HistogramCount;
|
||||
}
|
||||
|
||||
public boolean isBytes() {
|
||||
return this == BYTES || this == AUTOMATIC_BYTES;
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return axisLabel;
|
||||
}
|
||||
@@ -51,11 +57,9 @@ public enum RangeUnit {
|
||||
return type;
|
||||
}
|
||||
|
||||
public int valueForUnit(final int value) {
|
||||
public long valueForUnit(final long value) {
|
||||
|
||||
switch (this) {
|
||||
case AUTOMATIC_NUMBER:
|
||||
return Integer.MAX_VALUE;
|
||||
case NO_UNIT:
|
||||
case BYTES:
|
||||
return value;
|
||||
@@ -69,10 +73,12 @@ public enum RangeUnit {
|
||||
return value * 60 * 60 * 1000;
|
||||
case DAYS:
|
||||
return value * 24 * 60 * 60 * 1000;
|
||||
case AUTOMATIC_NUMBER:
|
||||
case AUTOMATIC_TIME:
|
||||
return Integer.MAX_VALUE;
|
||||
case AUTOMATIC_BYTES:
|
||||
return Long.MAX_VALUE;
|
||||
}
|
||||
return Integer.MAX_VALUE;
|
||||
return Long.MAX_VALUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.lucares.pdb.plot.api;
|
||||
public class RenderOptions {
|
||||
private int height;
|
||||
private int width;
|
||||
private boolean keyOutside;
|
||||
private boolean showKey;
|
||||
private boolean renderLabels;
|
||||
|
||||
public int getHeight() {
|
||||
@@ -22,12 +22,12 @@ public class RenderOptions {
|
||||
this.width = width;
|
||||
}
|
||||
|
||||
public boolean isKeyOutside() {
|
||||
return keyOutside;
|
||||
public boolean isShowKey() {
|
||||
return showKey;
|
||||
}
|
||||
|
||||
public void setKeyOutside(final boolean keyOutside) {
|
||||
this.keyOutside = keyOutside;
|
||||
public void setShowKey(final boolean showKey) {
|
||||
this.showKey = showKey;
|
||||
}
|
||||
|
||||
public boolean isRenderLabels() {
|
||||
|
||||
@@ -3,8 +3,8 @@ package org.lucares.pdb.plot.api;
|
||||
public class YAxisDefinition {
|
||||
private AxisScale axisScale = AxisScale.LINEAR;
|
||||
|
||||
private int rangeMin = 0;
|
||||
private int rangeMax = 300;
|
||||
private long rangeMin = 0;
|
||||
private long rangeMax = 300;
|
||||
private RangeUnit rangeUnit = RangeUnit.AUTOMATIC_TIME;
|
||||
|
||||
public AxisScale getAxisScale() {
|
||||
@@ -23,7 +23,7 @@ public class YAxisDefinition {
|
||||
return rangeUnit.valueForUnit(rangeMax);
|
||||
}
|
||||
|
||||
public int getRangeMin() {
|
||||
public long getRangeMin() {
|
||||
return rangeMin;
|
||||
}
|
||||
|
||||
@@ -31,15 +31,15 @@ public class YAxisDefinition {
|
||||
return !rangeUnit.isAutomatic() && rangeMin >= 0 && rangeMax >= 0 && rangeMin < rangeMax;
|
||||
}
|
||||
|
||||
public void setRangeMin(final int rangeMin) {
|
||||
public void setRangeMin(final long rangeMin) {
|
||||
this.rangeMin = rangeMin;
|
||||
}
|
||||
|
||||
public int getRangeMax() {
|
||||
public long getRangeMax() {
|
||||
return rangeMax;
|
||||
}
|
||||
|
||||
public void setRangeMax(final int rangeMax) {
|
||||
public void setRangeMax(final long rangeMax) {
|
||||
this.rangeMax = rangeMax;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,18 +50,16 @@ public class GnuplotFileGenerator implements Appender {
|
||||
|
||||
appendln(result, "set nokey");
|
||||
} else {
|
||||
if (settings.isKeyOutside()) {
|
||||
appendfln(result, "set key outside");
|
||||
} else {
|
||||
|
||||
// make sure left and right margins are always the same
|
||||
// this is need to be able to zoom in by selecting a region
|
||||
// (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
|
||||
appendln(result, "set lmargin 11"); // margin 11 -> 110px
|
||||
appendln(result, "set rmargin 11"); // margin 11 -> 110px
|
||||
appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
|
||||
appendln(result, "set bmargin 4"); // margin 4 -> 76
|
||||
if (!settings.isShowKey()) {
|
||||
appendfln(result, "set nokey");
|
||||
}
|
||||
// make sure left and right margins are always the same
|
||||
// this is need to be able to zoom in by selecting a region
|
||||
// (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
|
||||
appendln(result, "set lmargin 11"); // margin 11 -> 110px
|
||||
appendln(result, "set rmargin 11"); // margin 11 -> 110px
|
||||
appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
|
||||
appendln(result, "set bmargin 4"); // margin 4 -> 76
|
||||
}
|
||||
|
||||
// appendfln(result, "set xrange [-1:1]");
|
||||
|
||||
@@ -30,7 +30,7 @@ public class GnuplotSettings {
|
||||
private YAxisDefinition y1;
|
||||
private YAxisDefinition y2;
|
||||
private AggregateHandlerCollection aggregates;
|
||||
private boolean keyOutside = false;
|
||||
private boolean showKey = false;
|
||||
|
||||
private AxisSettings xAxisSettings = new AxisSettings();
|
||||
private boolean renderLabels = true;
|
||||
@@ -101,12 +101,12 @@ public class GnuplotSettings {
|
||||
return aggregates;
|
||||
}
|
||||
|
||||
public void setKeyOutside(final boolean keyOutside) {
|
||||
this.keyOutside = keyOutside;
|
||||
public void setShowKey(final boolean showKey) {
|
||||
this.showKey = showKey;
|
||||
}
|
||||
|
||||
public boolean isKeyOutside() {
|
||||
return keyOutside;
|
||||
public boolean isShowKey() {
|
||||
return showKey;
|
||||
}
|
||||
|
||||
public void renderLabels(final boolean renderLabels) {
|
||||
|
||||
@@ -126,7 +126,7 @@ public class Plotter {
|
||||
gnuplotSettings.setY1(plotSettings.getY1());
|
||||
gnuplotSettings.setY2(plotSettings.getY2());
|
||||
gnuplotSettings.setAggregates(plotSettings.getAggregates());
|
||||
gnuplotSettings.setKeyOutside(renderOptions.isKeyOutside());
|
||||
gnuplotSettings.setShowKey(renderOptions.isShowKey());
|
||||
gnuplotSettings.renderLabels(renderOptions.isRenderLabels());
|
||||
gnuplot.plot(gnuplotSettings, dataSeries);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import java.util.Locale;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.lucares.pdb.plot.api.YAxisDefinition;
|
||||
import org.lucares.utils.HumanBytes;
|
||||
|
||||
class YAxisTicks {
|
||||
|
||||
@@ -45,9 +46,21 @@ class YAxisTicks {
|
||||
default:
|
||||
throw new IllegalStateException("unhandled value: " + yAxisDefinition.getRangeUnit());
|
||||
}
|
||||
} else if (yAxisDefinition.getRangeUnit().isBytes()) {
|
||||
switch (yAxisDefinition.getAxisScale()) {
|
||||
case LINEAR:
|
||||
result = computeLinearYTicksByte(height, yRangeMin, yRangeMax);
|
||||
break;
|
||||
case LOG10:
|
||||
result = computeLog10YTicksByte(height, yRangeMin, yRangeMax);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalArgumentException("Unexpected value: " + yAxisDefinition.getAxisScale());
|
||||
}
|
||||
} else {
|
||||
switch (yAxisDefinition.getAxisScale()) {
|
||||
case LINEAR:
|
||||
result = computeLinearYTicksNoUnit(height, yRangeMin, yRangeMax);
|
||||
break;
|
||||
case LOG10:
|
||||
result = computeLog10YTicksNoUnit(height, yRangeMin, yRangeMax);
|
||||
@@ -59,6 +72,33 @@ class YAxisTicks {
|
||||
return result;
|
||||
}
|
||||
|
||||
private static double log2(final double d) {
|
||||
return Math.log10(d) / Math.log10(2);
|
||||
}
|
||||
|
||||
private static List<String> computeLog10YTicksByte(final int height, final long yRangeMin, final long yRangeMax) {
|
||||
|
||||
final int fontHeight = GnuplotSettings.TICKS_FONT_SIZE * 2;
|
||||
final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
|
||||
final int heightPerPowerOf2 = (int) Math.ceil(plotHeight / log2(yRangeMax));
|
||||
|
||||
final List<String> ticsLabels = new ArrayList<>();
|
||||
|
||||
long nextFreePositionOnYAxis = 0;
|
||||
int count = 1;
|
||||
for (long v = 1; v <= yRangeMax * 10; v *= 2) // increase yRangeMax by factor 10, because Gnuplot uses the next
|
||||
// log10 value when scaling the y-axis
|
||||
{
|
||||
if (nextFreePositionOnYAxis < count * heightPerPowerOf2) {
|
||||
ticsLabels.add("\"" + HumanBytes.toHumanBytes(v) + "\" " + v);
|
||||
nextFreePositionOnYAxis = count * heightPerPowerOf2 + fontHeight;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
||||
return ticsLabels;
|
||||
}
|
||||
|
||||
private static List<String> computeLog10YTicksTime(final int height, final long yRangeMin, final long yRangeMax) {
|
||||
|
||||
final List<String> ticsLabels = Arrays.asList(//
|
||||
@@ -100,6 +140,52 @@ class YAxisTicks {
|
||||
return ticsLabels;
|
||||
}
|
||||
|
||||
private static List<String> computeLinearYTicksByte(final long height, final long yRangeMinInMs,
|
||||
final long yRangeMaxInMs) {
|
||||
final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
|
||||
final long maxLabels = plotHeight / (GnuplotSettings.TICKS_FONT_SIZE * 2);
|
||||
|
||||
final long range = yRangeMaxInMs - yRangeMinInMs;
|
||||
final long rangePerLabel = roundToNextLinearByteStep(range / maxLabels);
|
||||
|
||||
final List<String> ticsLabels = new ArrayList<>();
|
||||
for (long i = yRangeMinInMs; i <= yRangeMaxInMs; i += rangePerLabel) {
|
||||
ticsLabels.add("\"" + byteToTic(i, rangePerLabel) + "\" " + i);
|
||||
}
|
||||
|
||||
return ticsLabels;
|
||||
}
|
||||
|
||||
private static long roundToNextLinearByteStep(final long stepSize) {
|
||||
final List<Long> steps = Arrays.asList(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L,
|
||||
|
||||
HumanBytes.KB, HumanBytes.KB * 5, HumanBytes.KB * 10, HumanBytes.KB * 50, HumanBytes.KB * 100,
|
||||
HumanBytes.KB * 128, HumanBytes.KB * 256, HumanBytes.KB * 512,
|
||||
|
||||
HumanBytes.MB, HumanBytes.MB * 5, HumanBytes.MB * 10, HumanBytes.MB * 50, HumanBytes.MB * 100,
|
||||
HumanBytes.MB * 128, HumanBytes.MB * 256, HumanBytes.MB * 512,
|
||||
|
||||
HumanBytes.GB, HumanBytes.GB * 5, HumanBytes.GB * 10, HumanBytes.GB * 50, HumanBytes.GB * 100,
|
||||
HumanBytes.GB * 128, HumanBytes.GB * 256, HumanBytes.GB * 512,
|
||||
|
||||
HumanBytes.TB, HumanBytes.TB * 5, HumanBytes.TB * 10, HumanBytes.TB * 50, HumanBytes.TB * 100,
|
||||
HumanBytes.TB * 128, HumanBytes.TB * 256, HumanBytes.TB * 512,
|
||||
|
||||
HumanBytes.PB, HumanBytes.PB * 5, HumanBytes.PB * 10, HumanBytes.PB * 50, HumanBytes.PB * 100,
|
||||
HumanBytes.PB * 128, HumanBytes.PB * 256, HumanBytes.PB * 512,
|
||||
|
||||
HumanBytes.EB, HumanBytes.EB * 5, HumanBytes.EB * 10, HumanBytes.EB * 50, HumanBytes.EB * 100,
|
||||
HumanBytes.EB * 128, HumanBytes.EB * 256, HumanBytes.EB * 512);
|
||||
|
||||
for (final Long step : steps) {
|
||||
if (stepSize < step) {
|
||||
return step;
|
||||
}
|
||||
}
|
||||
|
||||
return stepSize;
|
||||
}
|
||||
|
||||
private static List<String> computeLinearYTicksTime(final long height, final long yRangeMinInMs,
|
||||
final long yRangeMaxInMs) {
|
||||
|
||||
@@ -121,21 +207,103 @@ class YAxisTicks {
|
||||
|
||||
final List<String> ticsLabels = Arrays.asList(//
|
||||
"\"1\" 1", //
|
||||
"\"2\" 2", //
|
||||
"\"5\" 5", //
|
||||
"\"10\" 10", //
|
||||
"\"20\" 20", //
|
||||
"\"50\" 50", //
|
||||
"\"100\" 100", //
|
||||
"\"200\" 200", //
|
||||
"\"500\" 500", //
|
||||
"\"1000\" 1000", //
|
||||
"\"2000\" 2000", //
|
||||
"\"5000\" 5000", //
|
||||
"\"10k\" 10000", //
|
||||
"\"20k\" 20000", //
|
||||
"\"50k\" 50000", //
|
||||
"\"100k\" 100000", //
|
||||
"\"200k\" 200000", //
|
||||
"\"500k\" 500000", //
|
||||
"\"1m\" 1000000", //
|
||||
"\"2m\" 2000000", //
|
||||
"\"5m\" 5000000", //
|
||||
"\"10m\" 10000000", //
|
||||
"\"20m\" 20000000", //
|
||||
"\"50m\" 50000000", //
|
||||
"\"100m\" 100000000", //
|
||||
"\"200m\" 200000000", //
|
||||
"\"500m\" 500000000", //
|
||||
"\"1b\" 1000000000.0", //
|
||||
"\"10b\" 10000000000.0" //
|
||||
"\"2b\" 2000000000.0", //
|
||||
"\"5b\" 5000000000.0", //
|
||||
"\"10b\" 10000000000.0", //
|
||||
"\"20b\" 20000000000.0", //
|
||||
"\"50b\" 50000000000.0", //
|
||||
"\"100b\" 100000000000.0", //
|
||||
"\"200b\" 200000000000.0", //
|
||||
"\"500b\" 500000000000.0", //
|
||||
"\"1t\" 1000000000000.0", //
|
||||
"\"2t\" 2000000000000.0", //
|
||||
"\"5t\" 5000000000000.0", //
|
||||
"\"10t\" 10000000000000.0", //
|
||||
"\"20t\" 20000000000000.0", //
|
||||
"\"50t\" 50000000000000.0", //
|
||||
"\"100t\" 100000000000000.0", //
|
||||
"\"200t\" 2000000000000000.0", //
|
||||
"\"500t\" 5000000000000000.0", //
|
||||
"\"1q\" 10000000000000000.0", //
|
||||
"\"2q\" 20000000000000000.0", //
|
||||
"\"5q\" 50000000000000000.0" //
|
||||
);
|
||||
|
||||
return ticsLabels;
|
||||
}
|
||||
|
||||
private static List<String> computeLinearYTicksNoUnit(final long height, final long yRangeMinInMs,
|
||||
final long yRangeMaxInMs) {
|
||||
final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
|
||||
final long maxLabels = plotHeight / (GnuplotSettings.TICKS_FONT_SIZE * 2);
|
||||
|
||||
final long range = yRangeMaxInMs - yRangeMinInMs;
|
||||
final long rangePerLabel = roundToNextLinearNoUnitStep(range / maxLabels);
|
||||
|
||||
final List<String> ticsLabels = new ArrayList<>();
|
||||
for (long i = yRangeMinInMs; i <= yRangeMaxInMs; i += rangePerLabel) {
|
||||
ticsLabels.add("\"" + valueToTic(i, rangePerLabel) + "\" " + i);
|
||||
}
|
||||
|
||||
return ticsLabels;
|
||||
}
|
||||
|
||||
private static String valueToTic(final long val, final double rangePerLabel) {
|
||||
final List<String> powers = List.of("", "k", "m", "b", "t", "q");
|
||||
|
||||
int power = 1;
|
||||
String result = String.format("%d", val);
|
||||
while (val >= Math.pow(1000, power) && power < powers.size()) {
|
||||
result = String.format("%.3f", val / Math.pow(1000, power));
|
||||
result = result.replaceAll("\\.?0*$", "");
|
||||
result = result + powers.get(power);
|
||||
power = power + 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static long roundToNextLinearNoUnitStep(final long stepSize) {
|
||||
final List<Long> steps = Arrays.asList(1L, 5L, 10L, 20L, 25L, 50L, 100L, 200L, 250L, 500L, 1000L, 2000L, 2500L,
|
||||
5000L, 10_000L, 20_000L, 25_000L, 50_000L, 100_000L, 200_000L, 250_000L, 500_000L, 1_000_000L,
|
||||
2_000_000L, 2_500_000L, 5_000_000L, 10_000_000L, 20_000_000L, 25_000_000L, 100_000_000L, 200_000_000L,
|
||||
250_000_000L, 500_000_000L, 1_000_000_000L, 2_000_000_000L, 2_500_000_000L, 5_000_000_000L);
|
||||
|
||||
for (final Long step : steps) {
|
||||
if (stepSize < step) {
|
||||
return step;
|
||||
}
|
||||
}
|
||||
|
||||
return stepSize;
|
||||
}
|
||||
|
||||
private static long roundToLinearLabelSteps(final long msPerLabel) {
|
||||
final List<Long> steps = Arrays.asList(2L, 5L, 10L, 20L, 50L, 100L, 200L, 500L, 1000L, 2000L, 5000L, 10_000L,
|
||||
20_000L, MINUTES.toMillis(1), MINUTES.toMillis(2), MINUTES.toMillis(5), MINUTES.toMillis(10),
|
||||
@@ -152,6 +320,10 @@ class YAxisTicks {
|
||||
return msPerLabel;
|
||||
}
|
||||
|
||||
private static String byteToTic(final long val, final double rangePerLabel) {
|
||||
return HumanBytes.toHumanBytes(val);
|
||||
}
|
||||
|
||||
private static String msToTic(final long ms, final double msPerLabel) {
|
||||
|
||||
if (ms < 1000) {
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
package org.lucares.pdb.plot.api;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import org.lucares.pdb.api.DateTimeRange;
|
||||
|
||||
public class DateTimeRangeParserTest {
|
||||
|
||||
@Test
|
||||
public void test() {
|
||||
|
||||
}
|
||||
|
||||
public static Stream<Arguments> providerDatePeriods() {
|
||||
|
||||
return Stream.of(//
|
||||
|
||||
// last 15 minutes
|
||||
Arguments.of("2000-01-02 12:59:59", "B-14m/Em", "2000-01-02 12:45:00", "2000-01-02 12:59:59"),
|
||||
|
||||
// this hour
|
||||
Arguments.of("2000-01-02 12:00:00", "BH/EH", "2000-01-02 12:00:00", "2000-01-02 12:59:59"),
|
||||
Arguments.of("2000-01-02 12:59:59", "BH/EH", "2000-01-02 12:00:00", "2000-01-02 12:59:59"),
|
||||
|
||||
// previous hour
|
||||
Arguments.of("2000-01-02 12:00:00", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
|
||||
Arguments.of("2000-01-02 12:59:58", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
|
||||
Arguments.of("2000-01-02 12:59:59", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
|
||||
|
||||
// today
|
||||
Arguments.of("2000-01-02 12:00:00", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
|
||||
Arguments.of("2000-01-02 00:00:00", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
|
||||
Arguments.of("2000-01-02 23:59:59", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
|
||||
Arguments.of("2000-01-02 12:00:00", "B0D/E0D", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
|
||||
|
||||
// tomorrow
|
||||
Arguments.of("2000-01-02 12:00:00", "B1D/E1D", "2000-01-03 00:00:00", "2000-01-03 23:59:59"),
|
||||
|
||||
// yesterday
|
||||
Arguments.of("2000-01-02 12:00:00", "B-1D/E-1D", "2000-01-01 00:00:00", "2000-01-01 23:59:59"),
|
||||
|
||||
// this week
|
||||
Arguments.of("2024-04-22 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-23 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-24 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-25 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-26 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-27 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
Arguments.of("2024-04-28 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
|
||||
// previous week
|
||||
Arguments.of("2024-04-29 12:00:00", "B-1W/E-1W", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
|
||||
|
||||
// last 4 week (including this one
|
||||
Arguments.of("2024-04-28 12:00:00", "B-3W/EW", "2024-04-01 00:00:00", "2024-04-28 23:59:59"),
|
||||
|
||||
// this month
|
||||
Arguments.of("2024-04-29 12:00:00", "BM/EM", "2024-04-01 00:00:00", "2024-04-30 23:59:59"),
|
||||
|
||||
// previous month (in a leap year)
|
||||
Arguments.of("2023-03-29 12:00:00", "B-1M/E-1M", "2023-02-01 00:00:00", "2023-02-28 23:59:59"),
|
||||
|
||||
// previous month (in a leap year)
|
||||
Arguments.of("2024-03-29 12:00:00", "B-1M/E-1M", "2024-02-01 00:00:00", "2024-02-29 23:59:59"),
|
||||
|
||||
// last 3 months
|
||||
Arguments.of("2024-03-29 12:00:00", "B-2M/EM", "2024-01-01 00:00:00", "2024-03-31 23:59:59"),
|
||||
|
||||
// previous 3 months (in a leap year)
|
||||
Arguments.of("2024-03-29 12:00:00", "B-3M/E-1M", "2023-12-01 00:00:00", "2024-02-29 23:59:59"),
|
||||
|
||||
// this year
|
||||
Arguments.of("2024-03-29 12:00:00", "BY/EY", "2024-01-01 00:00:00", "2024-12-31 23:59:59"),
|
||||
|
||||
// previous year
|
||||
Arguments.of("2024-03-29 12:00:00", "B-1Y/E-1Y", "2023-01-01 00:00:00", "2023-12-31 23:59:59"),
|
||||
|
||||
//
|
||||
Arguments.of("2024-03-29 12:00:00", "B-1H-15m/Bm", "2024-03-29 10:45:00", "2024-03-29 12:00:00")
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("providerDatePeriods")
|
||||
public void testDatePeriods(final String now, final String datePeriod, final String expectedStart,
|
||||
final String expectedEnd) throws Exception {
|
||||
final OffsetDateTime offsetTime = LocalDateTime.parse(now, PlotSettings.DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
|
||||
final DateTimeRange actual = DateTimeRangeParser.parse(offsetTime, datePeriod);
|
||||
|
||||
final String actualStart = PlotSettings.DATE_FORMAT.format(actual.getStart());
|
||||
final String actualEnd = PlotSettings.DATE_FORMAT.format(actual.getEnd());
|
||||
System.out.println("at " + now + " " + datePeriod + " -> " + actualStart + " - " + actualEnd);
|
||||
Assertions.assertEquals(expectedStart, actualStart, "start");
|
||||
Assertions.assertEquals(expectedEnd, actualEnd, "end");
|
||||
}
|
||||
|
||||
public static Stream<Arguments> providerDatePeriods_multiple() {
|
||||
|
||||
return Stream.of(//
|
||||
|
||||
//
|
||||
Arguments.of("2024-03-29 12:00:00", "B-1H-15m/Bm", "2024-03-29 10:45:00", "2024-03-29 12:00:00"),
|
||||
|
||||
Arguments.of("2024-03-29 12:00:00", "B-1H-15m/EH15m", "2024-03-29 10:45:00", "2024-03-29 13:14:59")
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("providerDatePeriods_multiple")
|
||||
public void testDatePeriods_multiple(final String now, final String datePeriod, final String expectedStart,
|
||||
final String expectedEnd) throws Exception {
|
||||
final OffsetDateTime offsetTime = LocalDateTime.parse(now, PlotSettings.DATE_FORMAT).atOffset(ZoneOffset.UTC);
|
||||
|
||||
final DateTimeRange actual = DateTimeRangeParser.parse(offsetTime, datePeriod);
|
||||
|
||||
final String actualStart = PlotSettings.DATE_FORMAT.format(actual.getStart());
|
||||
final String actualEnd = PlotSettings.DATE_FORMAT.format(actual.getEnd());
|
||||
System.out.println("at " + now + " " + datePeriod + " -> " + actualStart + " - " + actualEnd);
|
||||
Assertions.assertEquals(expectedStart, actualStart, "start");
|
||||
Assertions.assertEquals(expectedEnd, actualEnd, "end");
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,8 @@ package org.lucares.pdbui;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.text.Collator;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
@@ -26,6 +28,9 @@ import org.lucares.pdb.api.DateTimeRange;
|
||||
import org.lucares.pdb.api.QueryWithCaretMarker;
|
||||
import org.lucares.pdb.api.QueryWithCaretMarker.ResultMode;
|
||||
import org.lucares.pdb.datastore.Proposal;
|
||||
import org.lucares.pdb.plot.api.DateTimeRangeParser;
|
||||
import org.lucares.pdb.plot.api.DateValue;
|
||||
import org.lucares.pdb.plot.api.DateValue.DateType;
|
||||
import org.lucares.pdb.plot.api.PlotSettings;
|
||||
import org.lucares.pdbui.domain.AutocompleteProposal;
|
||||
import org.lucares.pdbui.domain.AutocompleteProposalByValue;
|
||||
@@ -345,6 +350,22 @@ public class PdbController implements HardcodedValues, PropertyKeys {
|
||||
return result;
|
||||
}
|
||||
|
||||
@RequestMapping(path = "/dates", //
|
||||
method = RequestMethod.POST, //
|
||||
consumes = MediaType.APPLICATION_JSON_VALUE, //
|
||||
produces = MediaType.APPLICATION_JSON_VALUE //
|
||||
)
|
||||
@ResponseBody
|
||||
public DateTimeRange dates(@RequestBody final DateValue dateValue) {
|
||||
final DateType type = dateValue.getType();
|
||||
final DateTimeRange result = switch (type) {
|
||||
case RELATIVE -> DateTimeRangeParser.parse(OffsetDateTime.now(ZoneId.of("UTC")), dateValue.getValue());
|
||||
case QUICK -> DateTimeRangeParser.parse(OffsetDateTime.now(ZoneId.of("UTC")), dateValue.getValue());
|
||||
case ABSOLUTE -> DateTimeRangeParser.parseAbsolute(dateValue.getValue());
|
||||
};
|
||||
return result;
|
||||
}
|
||||
|
||||
@PostMapping(path = "/data", consumes = MediaType.MULTIPART_MIXED_VALUE)
|
||||
@ResponseBody
|
||||
@ResponseStatus(code = HttpStatus.CREATED)
|
||||
|
||||
@@ -26,7 +26,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
|
||||
|
||||
addResourceHandlerForPlottedImages(registry);
|
||||
|
||||
// addResourceHandlerForAngular(registry);
|
||||
addResourceHandlerForAngular(registry);
|
||||
}
|
||||
|
||||
private void addResourceHandlerForPlottedImages(final ResourceHandlerRegistry registry) {
|
||||
@@ -57,7 +57,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
|
||||
// to determine which sub-page to show.
|
||||
//
|
||||
// This makes Angular also responsible for all 404 pages.
|
||||
registry.addResourceHandler("/**").addResourceLocations("classpath:/resources/").resourceChain(true)
|
||||
registry.addResourceHandler("/**").addResourceLocations("classpath:/resources/browser/").resourceChain(true)
|
||||
.addResolver(new PathResourceResolver() {
|
||||
@Override
|
||||
protected Resource getResource(final String resourcePath, final Resource location)
|
||||
@@ -65,7 +65,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
|
||||
final Resource requestedResource = location.createRelative(resourcePath);
|
||||
|
||||
return requestedResource.exists() && requestedResource.isReadable() ? requestedResource
|
||||
: new ClassPathResource("/resources/index.html");
|
||||
: new ClassPathResource("/resources/browser/index.html");
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -88,6 +88,8 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
|
||||
|
||||
registry.addViewController("/").setViewName("forward:/index.html");
|
||||
registry.addViewController("/vis").setViewName("forward:/index.html");
|
||||
registry.addViewController("/dashboard").setViewName("forward:/index.html");
|
||||
registry.addViewController("/dashboard/**").setViewName("forward:/index.html");
|
||||
registry.addViewController("/upload").setViewName("forward:/index.html");
|
||||
registry.addViewController("/help").setViewName("forward:/index.html");
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.lucares.pdb.plot.api.Aggregate;
|
||||
import org.lucares.pdb.plot.api.DateValue;
|
||||
import org.lucares.pdb.plot.api.Limit;
|
||||
import org.lucares.pdb.plot.api.YAxisDefinition;
|
||||
|
||||
@@ -25,7 +26,7 @@ public class PlotConfig {
|
||||
private YAxisDefinition y1 = new YAxisDefinition();
|
||||
private YAxisDefinition y2 = new YAxisDefinition();
|
||||
|
||||
private String dateRange;
|
||||
private DateValue dateRange;
|
||||
|
||||
private List<Aggregate> aggregates = new ArrayList<>();
|
||||
|
||||
@@ -66,11 +67,11 @@ public class PlotConfig {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public String getDateRange() {
|
||||
public DateValue getDateRange() {
|
||||
return dateRange;
|
||||
}
|
||||
|
||||
public void setDateRange(final String dateRange) {
|
||||
public void setDateRange(final DateValue dateRange) {
|
||||
this.dateRange = dateRange;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#db.base=D:/ws/pdb/dataNew
|
||||
#db.base=D:/ws/pdb2/databases/prod
|
||||
db.base=D:/ws/pdb/databases/prod
|
||||
db.base=c:/ws/pdb/databases/prod
|
||||
server.port=17333
|
||||
gnuplot.home=D:/ws/pdb/gnuplot-5.2
|
||||
cache.images.duration.seconds=86400
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
db.base=D:/ws/pdb/databases/test
|
||||
db.base=c:/ws/pdb/databases/test
|
||||
server.port=17333
|
||||
gnuplot.home=D:/ws/pdb/gnuplot-5.2
|
||||
cache.images.duration.seconds=86400
|
||||
defaults.groupBy=pod,method,metric
|
||||
defaults.splitBy=method
|
||||
defaults.query.examples=pod=vapfinra01 and method=ViewService.findFieldView,ViewService.findFieldViewGroup;pod=vappilby01 and method=ReviewInContextController.index;pod=vapnyse001 and method=ReviewInContextController.index,ReviewController.index
|
||||
defaults.query.examples=pod=vadperfo01 and method=ViewService.findFieldView,ViewService.findFieldViewGroup;pod=vadperfo01 and method=ReviewInContextController.index;pod=vadperfo01 and method=ReviewInContextController.index,ReviewController.index
|
||||
|
||||
32
pdb-utils/src/main/java/org/lucares/utils/HumanBytes.java
Normal file
@@ -0,0 +1,32 @@
|
||||
package org.lucares.utils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class HumanBytes {
|
||||
|
||||
public static final long KB = 1024;
|
||||
|
||||
public static final long MB = KB * 1024;
|
||||
|
||||
public static final long GB = MB * 1024;
|
||||
|
||||
public static final long TB = GB * 1024;
|
||||
|
||||
public static final long PB = TB * 1024;
|
||||
|
||||
public static final long EB = TB * 1024;
|
||||
|
||||
public static String toHumanBytes(final long bytes) {
|
||||
final List<String> powers = List.of("bytes", "KB", "MB", "GB", "TB", "PB", "EB");
|
||||
|
||||
int power = 1;
|
||||
String result = String.format("%d bytes", bytes);
|
||||
while (bytes >= Math.pow(1024, power) && power < powers.size()) {
|
||||
result = String.format("%.3f", bytes / Math.pow(1024, power));
|
||||
result = result.replaceAll("\\.?0*$", "");
|
||||
result = result + " " + powers.get(power);
|
||||
power = power + 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -28,15 +28,10 @@ public class VariableByteEncoder {
|
||||
public static final long MIN_VALUE = Long.MIN_VALUE / 2 + 1;
|
||||
public static final long MAX_VALUE = Long.MAX_VALUE / 2;
|
||||
|
||||
private static final int MAX_BYTES_PER_VALUE = 10;
|
||||
|
||||
private static final int CONTINUATION_BYTE_FLAG = 1 << 7; // 10000000
|
||||
|
||||
private static final long DATA_BITS = (1 << 7) - 1; // 01111111
|
||||
|
||||
private static final ThreadLocal<byte[]> SINGLE_VALUE_BUFFER = ThreadLocal
|
||||
.withInitial(() -> new byte[MAX_BYTES_PER_VALUE]);
|
||||
|
||||
/**
|
||||
* Encodes time and value into the given buffer.
|
||||
* <p>
|
||||
@@ -137,8 +132,18 @@ public class VariableByteEncoder {
|
||||
* input: 0 1 -1 2 -2 3 -3
|
||||
* encoded: 1 2 3 4 5 6 7
|
||||
* </pre>
|
||||
*
|
||||
* Note: 1. I tried to replace this ternary operator with a branchfree
|
||||
* alternative, but it was slower:
|
||||
*
|
||||
* <pre>
|
||||
* final long sign = (x - 1) >> 63; // will be 111...1 if first bit was 1 (x was negative) and 000..0
|
||||
* // otherwise
|
||||
* final long signBit = sign & 0x1; // will be 1 for negative x and 0 otherwise
|
||||
* return (((x * 2) ^ (sign))) + (signBit * 2); // same as above, but branchless
|
||||
* </pre>
|
||||
*/
|
||||
private static long encodeIntoPositiveValue(final long value) {
|
||||
static long encodeIntoPositiveValue(final long value) {
|
||||
return value > 0 ? value * 2 : (value * -2) + 1;
|
||||
}
|
||||
|
||||
@@ -234,9 +239,9 @@ public class VariableByteEncoder {
|
||||
}
|
||||
|
||||
public static int neededBytes(final long value) {
|
||||
final byte[] buffer = SINGLE_VALUE_BUFFER.get();
|
||||
final int usedBytes = encodeInto(value, buffer, 0);
|
||||
return usedBytes;
|
||||
final long val = encodeIntoPositiveValue(value);
|
||||
final int numberOfOnes = 64 - Long.numberOfLeadingZeros(val);
|
||||
return numberOfOnes / 7 + (numberOfOnes % 7 == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ public class VariableByteEncoderTest {
|
||||
Assertions.assertEquals(originalValues, decodedValues);
|
||||
}
|
||||
|
||||
public static Stream<Arguments> providerNededBytes() {
|
||||
public static Stream<Arguments> providerNeededBytes() {
|
||||
return Stream.of( //
|
||||
Arguments.of(0, 1), //
|
||||
Arguments.of(-10, 1), //
|
||||
@@ -98,7 +98,7 @@ public class VariableByteEncoderTest {
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("providerNededBytes")
|
||||
@MethodSource("providerNeededBytes")
|
||||
public void testNeededBytes(final long value, final int expectedNeededBytes) {
|
||||
|
||||
final int neededBytes = VariableByteEncoder.neededBytes(value);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// include all projects with a build.gradle
|
||||
// (this does not support nested projects)
|
||||
File srcDir = new File(".")
|
||||
FileCollection collection = files { srcDir.listFiles() }
|
||||
collection.filter{ new File(it, "build.gradle").isFile() }.each{ include it.getName() }
|
||||
|
||||
|
||||
include("block-storage")
|
||||
include("data-store")
|
||||
include("pdb-api")
|
||||
include("pdb-js")
|
||||
include("pdb-plotting")
|
||||
include("pdb-ui")
|
||||
include("pdb-utils")
|
||||
include("performanceDb")
|
||||
|
||||