auto-populate review assignee. close #2065

jlawyerorg · Oct 29, 2023 · 49bf02a · 49bf02a
1 parent f088378
commit 49bf02a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
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
diff --git a/j-lawyer-client/src/de/costache/calendar/CalendarPanel.java b/j-lawyer-client/src/de/costache/calendar/CalendarPanel.java
@@ -1155,30 +1155,13 @@ public void eventAdded(final ModelChangedEvent event) {
             dlg2.setEventType(ArchiveFileReviewsBean.EVENTTYPE_EVENT);
             dlg2.setBeginDate(event.getIntervalStart());
             dlg2.setEndDate(event.getIntervalEnd());
+            dlg2.setReviewAssignee(sel.getAssistant());
+
             FrameUtils.centerDialog(dlg2, EditorsRegistry.getInstance().getMainWindow());
             dlg2.setVisible(true);
 
         });
 
-//        popup.addPopupMenuListener(new PopupMenuListener() {
-//
-//            @Override
-//            public void popupMenuWillBecomeVisible(PopupMenuEvent arg0) {
-////				mnuOpenCase.setEnabled(jCalendar.getSelectedEvents().size() > 0);
-//            }
-//
-//            @Override
-//            public void popupMenuWillBecomeInvisible(PopupMenuEvent arg0) {
-//
-//
-//            }
-//
-//            @Override
-//            public void popupMenuCanceled(PopupMenuEvent arg0) {
-//
-//
-//            }
-//        });
     }
 
     /**

diff --git a/j-lawyer-client/src/de/costache/calendar/NewEventEntryDialog.java b/j-lawyer-client/src/de/costache/calendar/NewEventEntryDialog.java
@@ -709,6 +709,10 @@ public void setEndDate(Date d) {
     public void setEventType(int eventType) {
         this.newEventPanel.setEventType(eventType);
     }
+
+    public void setReviewAssignee(String assignee) {
+        this.newEventPanel.setReviewAssignee(assignee);
+    }
 
     /**
      * This method is called from within the constructor to initialize the form.

diff --git a/j-lawyer-server-api/src/com/jdimension/jlawyer/services/ArchiveFileServiceRemote.java b/j-lawyer-server-api/src/com/jdimension/jlawyer/services/ArchiveFileServiceRemote.java
@@ -911,4 +911,6 @@ public interface ArchiveFileServiceRemote {
     List<TimesheetPosition> getTimesheetPositionsForInvoice(String invoiceId) throws Exception;
 
     TimesheetPosition timesheetPositionAdd(String timesheetId, TimesheetPosition position) throws Exception;
+
+    ArrayList<String> getAllArchiveFileNumbers() throws Exception;
 }
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
diff --git a/...rver/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java b/...rver/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java
@@ -2881,6 +2881,8 @@ public DataBucket loadHtmlCaseExport(String caseId) throws Exception {
 
     }
 
+
+
     @Override
     //@RolesAllowed({"readArchiveFileRole"})
     public ArrayList<String> getAllArchiveFileIds() {
@@ -5953,4 +5955,23 @@ public TimesheetPosition timesheetPositionAdd(String timesheetId, TimesheetPosit
 
     }
 
+    @Override
+    @RolesAllowed({"loginRole"})
+    public ArrayList<String> getAllArchiveFileNumbers() throws Exception {
+        JDBCUtils utils = new JDBCUtils();
+        ArrayList<String> list = new ArrayList<>();
+        try ( Connection con = utils.getConnection();  PreparedStatement st = con.prepareStatement("select fileNumber from cases");  ResultSet rs = st.executeQuery()) {
+
+            while (rs.next()) {
+                String fileNumber = rs.getString(1);
+                list.add(fileNumber);
+            }
+        } catch (SQLException sqle) {
+            log.error("Error finding archive files", sqle);
+            throw new EJBException("Aktensuche konnte nicht ausgeführt werden.", sqle);
+        }
+
+        return list;
+    }
+
 }