diff --git a/docker/getversion.sh b/docker/getversion.sh index 57d281b2b..7b1f3ad88 100755 --- a/docker/getversion.sh +++ b/docker/getversion.sh @@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .` # tadaaa! # echo $jlversion -echo 2.6.0.17 +echo 2.6.1.0 diff --git a/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar b/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar index 74745a0ed..ecb5f3b25 100644 Binary files a/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar and b/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar differ diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/addresses/AddressPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/addresses/AddressPanel.java index 795ad11fd..49321d9f7 100755 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/addresses/AddressPanel.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/addresses/AddressPanel.java @@ -721,6 +721,8 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.Hashtable; @@ -995,7 +997,6 @@ public void setAddressDTO(AddressBean dto) { this.txtStreet.setText(dto.getStreet()); this.txtWebsite.setText(dto.getWebsite()); this.txtZipCode.setText(dto.getZipCode()); - //this.lblArchiveFilesForAddress.setText(""); this.pnlCasesForContact.removeAll(); this.txtCustom1.setText(dto.getCustom1()); @@ -1091,7 +1092,7 @@ public void setAddressDTO(AddressBean dto) { } } - this.jTabbedPane1StateChanged(null); + this.jTabbedPane1.setSelectedIndex(0); List invoices = new ArrayList<>(); try { @@ -3090,18 +3091,19 @@ private void jTabbedPane1StateChanged(javax.swing.event.ChangeEvent evt) {//GEN- JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(settings.getLookupProperties()); ArchiveFileServiceRemote afRem = locator.lookupArchiveFileServiceRemote(); Collection col = afRem.getArchiveFileAddressesForAddress(this.dto.getId()); - Hashtable> casesByPartyType = new Hashtable<>(); +// Hashtable> casesByPartyType = new Hashtable<>(); Hashtable partyTypes = locator.lookupSystemManagementRemote().getPartyTypesTable(); - for (Object o : col) { - ArchiveFileAddressesBean afb = (ArchiveFileAddressesBean) o; - if (!casesByPartyType.containsKey(afb.getReferenceType().getName())) { - ArrayList cases = new ArrayList<>(); - casesByPartyType.put(afb.getReferenceType().getName(), cases); - } - casesByPartyType.get(afb.getReferenceType().getName()).add(afb); - - } - this.fillCasesForContactPanel(casesByPartyType, partyTypes); +// for (Object o : col) { +// ArchiveFileAddressesBean afb = (ArchiveFileAddressesBean) o; +// if (!casesByPartyType.containsKey(afb.getReferenceType().getName())) { +// ArrayList cases = new ArrayList<>(); +// casesByPartyType.put(afb.getReferenceType().getName(), cases); +// } +// casesByPartyType.get(afb.getReferenceType().getName()).add(afb); +// +// } +// this.fillCasesForContactPanel(casesByPartyType, partyTypes); + this.fillCasesForContactPanel(col, partyTypes); } catch (Exception ex) { log.error("Error getting archive files for address", ex); JOptionPane.showMessageDialog(this, "Fehler beim Laden der Akten zur Adresse: " + ex.getMessage(), com.jdimension.jlawyer.client.utils.DesktopUtils.POPUP_TITLE_ERROR, JOptionPane.ERROR_MESSAGE); @@ -3559,30 +3561,38 @@ private void enableEmailButton() { } } - private void fillCasesForContactPanel(Hashtable> casesByPartyType, Hashtable partyTypes) { + private void fillCasesForContactPanel(Collection allCases, Hashtable partyTypes) { this.pnlCasesForContact.removeAll(); + + List allCasesList=new ArrayList<>(allCases); + Collections.sort(allCasesList, (ArchiveFileAddressesBean o1, ArchiveFileAddressesBean o2) -> { + ArchiveFileBean c1=o1.getArchiveFileKey(); + ArchiveFileBean c2=o2.getArchiveFileKey(); + if(c1!=null && c2!=null) { + Date d1=c1.getDateCreated(); + Date d2=c2.getDateCreated(); + if(d1!=null && d2!=null) { + return d2.compareTo(d1); + } + } + return 1; + }); - int totalSize = 0; - for (ArrayList list : casesByPartyType.values()) { - totalSize = totalSize + list.size(); - } - - GridLayout layout = new GridLayout(totalSize, 1); + GridLayout layout = new GridLayout(allCases.size(), 1); this.pnlCasesForContact.setLayout(layout); int i = 0; - for (String key : casesByPartyType.keySet()) { + for (ArchiveFileAddressesBean aFile: allCasesList) { - ArrayList partyFiles = casesByPartyType.get(key); - for (ArchiveFileAddressesBean aFile : partyFiles) { + CaseForContactEntryPanel ep = new CaseForContactEntryPanel(this.getClass().getName()); if (i % 2 == 0) { ep.setBackground(ep.getBackground().brighter()); } CaseForContactEntry lce = new CaseForContactEntry(); - lce.setRoleForeground(new Color(partyTypes.get(key).getColor())); + lce.setRoleForeground(new Color(partyTypes.get(aFile.getReferenceType().getName()).getColor())); lce.setFileNumber(aFile.getArchiveFileKey().getFileNumber()); lce.setId(aFile.getArchiveFileKey().getId()); - lce.setRole(key); + lce.setRole(aFile.getReferenceType().getName()); lce.setName(aFile.getArchiveFileKey().getName()); lce.setReason(StringUtils.nonEmpty(aFile.getArchiveFileKey().getReason())); lce.setArchived(aFile.getArchiveFileKey().isArchived()); @@ -3597,7 +3607,7 @@ private void fillCasesForContactPanel(HashtableUmsatzrelevante Werte gesamt: ").append(df.format(total)).append("
"); sb.append(""); sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); sb.append(""); sb.append("
neu:").append(df.format(invoices.get(Invoice.STATUS_NEW))).append("
offen:").append(df.format(invoices.get(Invoice.STATUS_OPEN))).append("
offen - 1. Mahnstufe:").append(df.format(invoices.get(Invoice.STATUS_OPEN_REMINDER1))).append("
offen - 2. Mahnstufe:").append(df.format(invoices.get(Invoice.STATUS_OPEN_REMINDER2))).append("
offen - 3. Mahnstufe:").append(df.format(invoices.get(Invoice.STATUS_OPEN_REMINDER3))).append("
offen - nicht vollstreckbar:").append(df.format(invoices.get(Invoice.STATUS_OPEN_NONENFORCEABLE))).append("
bezahlt:").append(df.format(invoices.get(Invoice.STATUS_PAID))).append("
storniert:").append(df.format(invoices.get(Invoice.STATUS_CANCELLED))).append("
"); this.lblTotal.setText(df.format(total)); - if(invoices.get(Invoice.STATUS_OPEN)>0) + if(total>0) this.lblTotal.setForeground(DefaultColorTheme.COLOR_LOGO_RED); else this.lblTotal.setForeground(DefaultColorTheme.COLOR_LOGO_GREEN); diff --git a/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar b/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar index 74745a0ed..ecb5f3b25 100644 Binary files a/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar and b/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar differ