chris/Workbench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Konflikte gelöst und synchronisiert

Browse Source
This commit is contained in:
Chris 2026-03-18 22:26:52 +01:00
parent 77f814bc2b
commit 8aefe6efcd
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/workbenchclassic/ImportUser.java
View File

@ -82,8 +82,8 @@ private int getInt(JSONObject obj, UserField field) {
String CLIENT_NO = null; String CLIENT_NO = null;
if (werkArr.length() > 0) { if (werkArr.length() > 0) {
JSONObject row = werkArr.getJSONObject(0); JSONObject row = werkArr.getJSONObject(0);
WERK_NR = row.optString("ext_company_nr", null); WERK_NR = row.optString("werk_nr", null);
COMPANY_NO = row.optString("werk_nr", null); COMPANY_NO = row.optString("ext_company_nr", null);
CLIENT_NO = row.optString("client_nr", null); CLIENT_NO = row.optString("client_nr", null);
} }

BIN
backend/target/backend-1.war
View File

Binary file not shown.

BIN
backend/target/backend-1/WEB-INF/classes/com/workbenchclassic/ImportUser.class
View File

Binary file not shown.

BIN
backend/target/classes/com/workbenchclassic/ImportUser.class
View File

Binary file not shown.

BIN
backend/target/jacoco.exec
View File

Binary file not shown.

4
backend/target/site/jacoco/com.workbenchclassic/ImportUser.java.html
View File

@ -82,8 +82,8 @@ private int getInt(JSONObject obj, UserField field) {
<span class="nc" id="L82"> String CLIENT_NO = null;</span> <span class="nc" id="L82"> String CLIENT_NO = null;</span>
<span class="nc bnc" id="L83" title="All 2 branches missed."> if (werkArr.length() &gt; 0) {</span> <span class="nc bnc" id="L83" title="All 2 branches missed."> if (werkArr.length() &gt; 0) {</span>
<span class="nc" id="L84"> JSONObject row = werkArr.getJSONObject(0);</span> <span class="nc" id="L84"> JSONObject row = werkArr.getJSONObject(0);</span>
<span class="nc" id="L85"> WERK_NR = row.optString(&quot;ext_company_nr&quot;, null);</span> <span class="nc" id="L85"> WERK_NR = row.optString(&quot;werk_nr&quot;, null);</span>
<span class="nc" id="L86"> COMPANY_NO = row.optString(&quot;werk_nr&quot;, null);</span> <span class="nc" id="L86"> COMPANY_NO = row.optString(&quot;ext_company_nr&quot;, null);</span>
<span class="nc" id="L87"> CLIENT_NO = row.optString(&quot;client_nr&quot;, null);</span> <span class="nc" id="L87"> CLIENT_NO = row.optString(&quot;client_nr&quot;, null);</span>
} }

2
backend/target/site/jacoco/jacoco-sessions.html
View File

File diff suppressed because one or more lines are too long

2
backend/target/site/jacoco/jacoco.xml
View File

File diff suppressed because one or more lines are too long

8
backend/target/surefire-reports/TEST-com.workbenchclassic.AppTest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="com.workbenchclassic.AppTest" time="0.017" tests="1" errors="0" skipped="0" failures="0"> <testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="com.workbenchclassic.AppTest" time="0.02" tests="1" errors="0" skipped="0" failures="0">
<properties> <properties>
<property name="gopherProxySet" value="false"/> <property name="gopherProxySet" value="false"/>
<property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/> <property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/>
@ -16,7 +16,7 @@
<property name="sun.java.launcher" value="SUN_STANDARD"/> <property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="user.country" value="DE"/> <property name="user.country" value="DE"/>
<property name="sun.boot.library.path" value="/opt/homebrew/Cellar/openjdk@11/11.0.30/libexec/openjdk.jdk/Contents/Home/lib"/> <property name="sun.boot.library.path" value="/opt/homebrew/Cellar/openjdk@11/11.0.30/libexec/openjdk.jdk/Contents/Home/lib"/>
<property name="sun.java.command" value="/Users/chris/DevJava/workbenchclassic/backend/target/surefire/surefirebooter16563416724971400598.jar /Users/chris/DevJava/workbenchclassic/backend/target/surefire 2026-03-18T22-21-28_512-jvmRun1 surefire18183175683491504828tmp surefire_06716252282191866266tmp"/> <property name="sun.java.command" value="/Users/chris/DevJava/workbenchclassic/backend/target/surefire/surefirebooter7758320561298146095.jar /Users/chris/DevJava/workbenchclassic/backend/target/surefire 2026-03-18T22-24-16_767-jvmRun1 surefire16834169660253601090tmp surefire_011784492562677827805tmp"/>
<property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/> <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<property name="jdk.debug" value="release"/> <property name="jdk.debug" value="release"/>
<property name="surefire.test.class.path" value="/Users/chris/DevJava/workbenchclassic/backend/target/test-classes:/Users/chris/DevJava/workbenchclassic/backend/target/classes:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-common/2.35/jersey-common-2.35.jar:/Users/chris/.m2/repository/jakarta/ws/rs/jakarta.ws.rs-api/2.1.6/jakarta.ws.rs-api-2.1.6.jar:/Users/chris/.m2/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar:/Users/chris/.m2/repository/org/glassfish/hk2/external/jakarta.inject/2.6.1/jakarta.inject-2.6.1.jar:/Users/chris/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.3/osgi-resource-locator-1.0.3.jar:/Users/chris/.m2/repository/org/glassfish/jersey/containers/jersey-container-servlet/2.35/jersey-container-servlet-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/containers/jersey-container-servlet-core/2.35/jersey-container-servlet-core-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-server/2.35/jersey-server-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-client/2.35/jersey-client-2.35.jar:/Users/chris/.m2/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar:/Users/chris/.m2/repository/org/glassfish/jersey/media/jersey-media-json-jackson/2.35/jersey-media-json-jackson-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/ext/jersey-entity-filtering/2.35/jersey-entity-filtering-2.35.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.2/jackson-annotations-2.12.2.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.12.2/jackson-module-jaxb-annotations-2.12.2.jar:/Users/chris/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar:/Users/chris/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar:/Users/chris/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.6.0/junit-jupiter-engine-5.6.0.jar:/Users/chris/.m2/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar:/Users/chris/.m2/repository/org/junit/platform/junit-platform-engine/1.6.0/junit-platform-engine-1.6.0.jar:/Users/chris/.m2/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar:/Users/chris/.m2/repository/org/junit/platform/junit-platform-commons/1.6.0/junit-platform-commons-1.6.0.jar:/Users/chris/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.6.0/junit-jupiter-api-5.6.0.jar:/Users/chris/.m2/repository/javax/javaee-api/8.0/javaee-api-8.0.jar:/Users/chris/.m2/repository/com/sun/mail/javax.mail/1.6.0/javax.mail-1.6.0.jar:/Users/chris/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar:/Users/chris/.m2/repository/org/json/json/20250107/json-20250107.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar:"/> <property name="surefire.test.class.path" value="/Users/chris/DevJava/workbenchclassic/backend/target/test-classes:/Users/chris/DevJava/workbenchclassic/backend/target/classes:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-common/2.35/jersey-common-2.35.jar:/Users/chris/.m2/repository/jakarta/ws/rs/jakarta.ws.rs-api/2.1.6/jakarta.ws.rs-api-2.1.6.jar:/Users/chris/.m2/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar:/Users/chris/.m2/repository/org/glassfish/hk2/external/jakarta.inject/2.6.1/jakarta.inject-2.6.1.jar:/Users/chris/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.3/osgi-resource-locator-1.0.3.jar:/Users/chris/.m2/repository/org/glassfish/jersey/containers/jersey-container-servlet/2.35/jersey-container-servlet-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/containers/jersey-container-servlet-core/2.35/jersey-container-servlet-core-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-server/2.35/jersey-server-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/core/jersey-client/2.35/jersey-client-2.35.jar:/Users/chris/.m2/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar:/Users/chris/.m2/repository/org/glassfish/jersey/media/jersey-media-json-jackson/2.35/jersey-media-json-jackson-2.35.jar:/Users/chris/.m2/repository/org/glassfish/jersey/ext/jersey-entity-filtering/2.35/jersey-entity-filtering-2.35.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.2/jackson-annotations-2.12.2.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.12.2/jackson-module-jaxb-annotations-2.12.2.jar:/Users/chris/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar:/Users/chris/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar:/Users/chris/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.6.0/junit-jupiter-engine-5.6.0.jar:/Users/chris/.m2/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar:/Users/chris/.m2/repository/org/junit/platform/junit-platform-engine/1.6.0/junit-platform-engine-1.6.0.jar:/Users/chris/.m2/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar:/Users/chris/.m2/repository/org/junit/platform/junit-platform-commons/1.6.0/junit-platform-commons-1.6.0.jar:/Users/chris/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.6.0/junit-jupiter-api-5.6.0.jar:/Users/chris/.m2/repository/javax/javaee-api/8.0/javaee-api-8.0.jar:/Users/chris/.m2/repository/com/sun/mail/javax.mail/1.6.0/javax.mail-1.6.0.jar:/Users/chris/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar:/Users/chris/.m2/repository/org/json/json/20250107/json-20250107.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar:/Users/chris/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar:"/>
@ -33,7 +33,7 @@
<property name="java.specification.name" value="Java Platform API Specification"/> <property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/> <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/> <property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/>
<property name="surefire.real.class.path" value="/Users/chris/DevJava/workbenchclassic/backend/target/surefire/surefirebooter16563416724971400598.jar"/> <property name="surefire.real.class.path" value="/Users/chris/DevJava/workbenchclassic/backend/target/surefire/surefirebooter7758320561298146095.jar"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/> <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/> <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<property name="java.runtime.version" value="11.0.30+0"/> <property name="java.runtime.version" value="11.0.30+0"/>
@ -62,5 +62,5 @@
<property name="java.class.version" value="55.0"/> <property name="java.class.version" value="55.0"/>
<property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/> <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
</properties> </properties>
<testcase name="testApp" classname="com.workbenchclassic.AppTest" time="0.011"/> <testcase name="testApp" classname="com.workbenchclassic.AppTest" time="0.01"/>
</testsuite> </testsuite>

2
backend/target/surefire-reports/com.workbenchclassic.AppTest.txt
View File

@ -1,4 +1,4 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Test set: com.workbenchclassic.AppTest Test set: com.workbenchclassic.AppTest
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 s - in com.workbenchclassic.AppTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.02 s - in com.workbenchclassic.AppTest