Skip to content

Commit

Permalink
enhanced data model for electronic invoice. enhanced user administrat…
Browse files Browse the repository at this point in the history
…ion dialog. enhanced REST API. added country codes for XRrechnung. issue #2165
  • Loading branch information
j-dimension committed Aug 16, 2024
1 parent 6ec4dbf commit 429949d
Show file tree
Hide file tree
Showing 13 changed files with 2,601 additions and 203 deletions.
Binary file not shown.
4 changes: 3 additions & 1 deletion j-lawyer-client/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ file.reference.hibernate-core-5.3.28.Final.jar=lib/hibernate-core-5.3.28.Final.j
file.reference.http-core-2.4.0.19.jar=lib/bea/http-core-2.4.0.19.jar
file.reference.ISOCountryCodeType-V2006-1.0.7-Streaming.jar=lib/bea/ISOCountryCodeType-V2006-1.0.7-Streaming.jar
file.reference.istack-commons-runtime-3.0.11.jar=lib/bea/istack-commons-runtime-3.0.11.jar
file.reference.j-lawyer-invoicing.jar=lib/j-lawyer-invoicing/j-lawyer-invoicing.jar
file.reference.jackson-annotations-2.16.1.jar=lib/bea/jackson-annotations-2.16.1.jar
file.reference.jackson-core-2.16.1.jar=lib/bea/jackson-core-2.16.1.jar
file.reference.jackson-databind-2.16.1.jar=lib/bea/jackson-databind-2.16.1.jar
Expand Down Expand Up @@ -450,7 +451,8 @@ javac.classpath=\
${file.reference.xmldsig-core-schema-1.0.6-Streaming.jar}:\
${file.reference.xmlers-schema-draft-v0.3-1.0.6-Streaming.jar}:\
${file.reference.xmlsec-2.2.6.jar}:\
${file.reference.jackson-core-2.16.1.jar}
${file.reference.jackson-core-2.16.1.jar}:\
${file.reference.j-lawyer-invoicing.jar}
file.reference.j-lawyer-server-entities.jar=../j-lawyer-server-entities/dist/j-lawyer-server-entities.jar
file.reference.novaworx-syntax-0.0.7.jar=lib/novaworx-syntax-0.0.7.jar
file.reference.ical4j-0.9.18.jar=lib/bizcal/ical4j-0.9.18.jar
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,41 @@ public void setCurrentUser(AppUserBean currentUser) {
public AppUserBean[] getAllUsers() {
return allUsers;
}

// updates any cached objects for this user
public void applyChangedUser(AppUserBean user) {

if(currentUser!=null && currentUser.equals(user))
currentUser=user;

if(loginEnabledUsers.indexOf(user)>-1)
loginEnabledUsers.set(loginEnabledUsers.indexOf(user), user);

if(messagingEnabledUsers.indexOf(user)>-1)
messagingEnabledUsers.set(messagingEnabledUsers.indexOf(user), user);

for(int i=0;i<lawyerUsers.length;i++) {
if(lawyerUsers[i].equals(user)) {
lawyerUsers[i]=user;
break;
}
}

for(int i=0;i<assistantUsers.length;i++) {
if(assistantUsers[i].equals(user)) {
assistantUsers[i]=user;
break;
}
}

for(int i=0;i<allUsers.length;i++) {
if(allUsers[i].equals(user)) {
allUsers[i]=user;
break;
}
}

}

/**
* @param allUsers the allUsers to set
Expand Down
4 changes: 3 additions & 1 deletion j-lawyer-invoicing/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<goal>run</goal>
</goals>
<configuration>
<target />
<target>
<copy />
</target>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion j-lawyer-invoicing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<configuration>
<target>

<!-- copy file="${project.build.directory}/j-lawyer-invoicing-${project.version}.jar" tofile="${project.basedir}/../j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-invoicing.jar"/ -->
<copy file="${project.build.directory}/j-lawyer-invoicing-${project.version}.jar" tofile="${project.basedir}/../j-lawyer-client/lib/j-lawyer-invoicing/j-lawyer-invoicing.jar"/>
<!-- copy file="${project.build.directory}/j-lawyer-invoicing-${project.version}.jar" tofile="${project.basedir}/../j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-invoicing.jar"/ -->

</target>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit 429949d

Please sign in to comment.