From ff76f0557f7007580d1552551c95285112cfdd5e Mon Sep 17 00:00:00 2001 From: Servicepoint Date: Wed, 3 Dec 2014 16:49:55 +0100 Subject: [PATCH] =?UTF-8?q?Einen=20Fehler=20korrigiert,=20der=20verhindert?= =?UTF-8?q?,=20dass=20das=20ArticleTableModel=20aktualisiert=20wird,=20wen?= =?UTF-8?q?n=20neue=20Ausleihen=20erzeugt=20oder=20bestehende=20Ausleihen?= =?UTF-8?q?=20zur=C3=BCckgegeben=20werden.=20fixed=20#5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/de/katho/kBorrow/controller/ManageLendingsController.java | 4 ++++ src/de/katho/kBorrow/controller/NewLendingController.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/de/katho/kBorrow/controller/ManageLendingsController.java b/src/de/katho/kBorrow/controller/ManageLendingsController.java index 63b2f3c..7a585b2 100644 --- a/src/de/katho/kBorrow/controller/ManageLendingsController.java +++ b/src/de/katho/kBorrow/controller/ManageLendingsController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import de.katho.kBorrow.Util; import de.katho.kBorrow.data.KLending; import de.katho.kBorrow.db.DbConnector; +import de.katho.kBorrow.models.ArticleTableModel; import de.katho.kBorrow.models.FreeArticleTableModel; import de.katho.kBorrow.models.LendingTableModel; @@ -12,12 +13,14 @@ public class ManageLendingsController { private DbConnector dbCon; private FreeArticleTableModel freeArticleTableModel; + private ArticleTableModel articleTableModel; private LendingTableModel lendingTableModel; public ManageLendingsController(DbConnector pDbCon, HashMap pModels){ dbCon = pDbCon; freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticletablemodel"); + articleTableModel = (ArticleTableModel)pModels.get("articletablemodel"); lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel"); } @@ -30,6 +33,7 @@ public class ManageLendingsController { dbCon.returnLending(lendingId, artId, Util.getCurrentDate()); freeArticleTableModel.updateModel(); + articleTableModel.updateModel(); lendingTableModel.updateModel(); } diff --git a/src/de/katho/kBorrow/controller/NewLendingController.java b/src/de/katho/kBorrow/controller/NewLendingController.java index 94a31ec..7899dae 100644 --- a/src/de/katho/kBorrow/controller/NewLendingController.java +++ b/src/de/katho/kBorrow/controller/NewLendingController.java @@ -8,6 +8,7 @@ import java.util.HashMap; import de.katho.kBorrow.data.KLender; import de.katho.kBorrow.db.DbConnector; +import de.katho.kBorrow.models.ArticleTableModel; import de.katho.kBorrow.models.FreeArticleTableModel; import de.katho.kBorrow.models.LenderModel; import de.katho.kBorrow.models.LendingTableModel; @@ -19,12 +20,14 @@ public class NewLendingController { private LenderModel lenderModel; private FreeArticleTableModel freeArticleModel; private LendingTableModel lendingTableModel; + private ArticleTableModel articleTableModel; public NewLendingController(DbConnector pDbCon, HashMap pModels){ dbCon = pDbCon; userListModel = (UserListModel)pModels.get("userlistmodel"); lenderModel = (LenderModel)pModels.get("lendermodel"); freeArticleModel = (FreeArticleTableModel)pModels.get("freearticletablemodel"); + articleTableModel = (ArticleTableModel)pModels.get("articletablemodel"); lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel"); } @@ -63,6 +66,7 @@ public class NewLendingController { if(result == 0){ freeArticleModel.updateModel(); + articleTableModel.updateModel(); lendingTableModel.updateModel(); return result; }