Einen Fehler korrigiert, der verhindert, dass das ArticleTableModel
aktualisiert wird, wenn neue Ausleihen erzeugt oder bestehende Ausleihen zurückgegeben werden. fixed #5.
This commit is contained in:
@@ -5,6 +5,7 @@ import java.util.HashMap;
|
|||||||
import de.katho.kBorrow.Util;
|
import de.katho.kBorrow.Util;
|
||||||
import de.katho.kBorrow.data.KLending;
|
import de.katho.kBorrow.data.KLending;
|
||||||
import de.katho.kBorrow.db.DbConnector;
|
import de.katho.kBorrow.db.DbConnector;
|
||||||
|
import de.katho.kBorrow.models.ArticleTableModel;
|
||||||
import de.katho.kBorrow.models.FreeArticleTableModel;
|
import de.katho.kBorrow.models.FreeArticleTableModel;
|
||||||
import de.katho.kBorrow.models.LendingTableModel;
|
import de.katho.kBorrow.models.LendingTableModel;
|
||||||
|
|
||||||
@@ -12,12 +13,14 @@ public class ManageLendingsController {
|
|||||||
|
|
||||||
private DbConnector dbCon;
|
private DbConnector dbCon;
|
||||||
private FreeArticleTableModel freeArticleTableModel;
|
private FreeArticleTableModel freeArticleTableModel;
|
||||||
|
private ArticleTableModel articleTableModel;
|
||||||
private LendingTableModel lendingTableModel;
|
private LendingTableModel lendingTableModel;
|
||||||
|
|
||||||
public ManageLendingsController(DbConnector pDbCon, HashMap<String, Object> pModels){
|
public ManageLendingsController(DbConnector pDbCon, HashMap<String, Object> pModels){
|
||||||
dbCon = pDbCon;
|
dbCon = pDbCon;
|
||||||
|
|
||||||
freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
|
freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
|
||||||
|
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
|
||||||
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
|
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,6 +33,7 @@ public class ManageLendingsController {
|
|||||||
dbCon.returnLending(lendingId, artId, Util.getCurrentDate());
|
dbCon.returnLending(lendingId, artId, Util.getCurrentDate());
|
||||||
|
|
||||||
freeArticleTableModel.updateModel();
|
freeArticleTableModel.updateModel();
|
||||||
|
articleTableModel.updateModel();
|
||||||
lendingTableModel.updateModel();
|
lendingTableModel.updateModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import java.util.HashMap;
|
|||||||
|
|
||||||
import de.katho.kBorrow.data.KLender;
|
import de.katho.kBorrow.data.KLender;
|
||||||
import de.katho.kBorrow.db.DbConnector;
|
import de.katho.kBorrow.db.DbConnector;
|
||||||
|
import de.katho.kBorrow.models.ArticleTableModel;
|
||||||
import de.katho.kBorrow.models.FreeArticleTableModel;
|
import de.katho.kBorrow.models.FreeArticleTableModel;
|
||||||
import de.katho.kBorrow.models.LenderModel;
|
import de.katho.kBorrow.models.LenderModel;
|
||||||
import de.katho.kBorrow.models.LendingTableModel;
|
import de.katho.kBorrow.models.LendingTableModel;
|
||||||
@@ -19,12 +20,14 @@ public class NewLendingController {
|
|||||||
private LenderModel lenderModel;
|
private LenderModel lenderModel;
|
||||||
private FreeArticleTableModel freeArticleModel;
|
private FreeArticleTableModel freeArticleModel;
|
||||||
private LendingTableModel lendingTableModel;
|
private LendingTableModel lendingTableModel;
|
||||||
|
private ArticleTableModel articleTableModel;
|
||||||
|
|
||||||
public NewLendingController(DbConnector pDbCon, HashMap<String, Object> pModels){
|
public NewLendingController(DbConnector pDbCon, HashMap<String, Object> pModels){
|
||||||
dbCon = pDbCon;
|
dbCon = pDbCon;
|
||||||
userListModel = (UserListModel)pModels.get("userlistmodel");
|
userListModel = (UserListModel)pModels.get("userlistmodel");
|
||||||
lenderModel = (LenderModel)pModels.get("lendermodel");
|
lenderModel = (LenderModel)pModels.get("lendermodel");
|
||||||
freeArticleModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
|
freeArticleModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
|
||||||
|
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
|
||||||
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
|
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,6 +66,7 @@ public class NewLendingController {
|
|||||||
|
|
||||||
if(result == 0){
|
if(result == 0){
|
||||||
freeArticleModel.updateModel();
|
freeArticleModel.updateModel();
|
||||||
|
articleTableModel.updateModel();
|
||||||
lendingTableModel.updateModel();
|
lendingTableModel.updateModel();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user