socrates/kBorrow
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Unnötige Spalte aus ManageLendingTable entfernt.

Browse Source
This commit is contained in:
Servicepoint
2014-11-26 16:33:55 +01:00
parent 1289d2d58d
commit 1c529c5823
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/de/katho/kBorrow/gui/ManageLendingsPanel.java
View File

@@ -1,5 +1,4 @@
package de.katho.kBorrow.gui; package de.katho.kBorrow.gui;
import java.awt.Color;
import java.util.HashMap; import java.util.HashMap;
import javax.swing.JPanel; import javax.swing.JPanel;
@@ -14,7 +13,6 @@ import de.katho.kBorrow.models.LendingTableModel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.UIManager;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@@ -38,26 +36,37 @@ public class ManageLendingsPanel extends JPanel {
// Lending-Table // Lending-Table
JTable lendingTable = new JTable(lendingTableModel); JTable lendingTable = new JTable(lendingTableModel);
lendingTable.setFillsViewportHeight(true);
lendingTable.setRowHeight(30);
LendingReturnTableButton lrtb = new LendingReturnTableButton("Ausleihe beenden", lendingTable, manageLendingsController); LendingReturnTableButton lrtb = new LendingReturnTableButton("Ausleihe beenden", lendingTable, manageLendingsController);
for(int i = 5; i <= 6; i++){
lendingTable.getColumnModel().getColumn(i).setCellEditor(i == 5 ? null : lrtb);
lendingTable.getColumnModel().getColumn(i).setCellRenderer(i == 5 ? null : lrtb);
lendingTable.getColumnModel().getColumn(i).setMinWidth(30);
lendingTable.getColumnModel().getColumn(i).setMaxWidth(30);
lendingTable.getColumnModel().getColumn(i).setPreferredWidth(30);
}
lendingTable.getColumnModel().getColumn(0).setMinWidth(30); lendingTable.getColumnModel().getColumn(0).setMinWidth(30);
lendingTable.getColumnModel().getColumn(0).setMaxWidth(30); lendingTable.getColumnModel().getColumn(0).setMaxWidth(30);
lendingTable.getColumnModel().getColumn(0).setPreferredWidth(30); lendingTable.getColumnModel().getColumn(0).setPreferredWidth(30);
lendingTable.setFillsViewportHeight(true);
lendingTable.setRowHeight(30);
setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Aktive Ausleihen", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
setLayout(new BorderLayout(0, 0)); lendingTable.getColumnModel().getColumn(6).setCellEditor(lrtb);
add(new JScrollPane(lendingTable)); lendingTable.getColumnModel().getColumn(6).setCellRenderer(lrtb);
lendingTable.getColumnModel().getColumn(6).setMinWidth(30);
lendingTable.getColumnModel().getColumn(6).setMaxWidth(30);
lendingTable.getColumnModel().getColumn(6).setPreferredWidth(30);
setBorder(null);
setLayout(null);
JPanel panelActiveLendings = new JPanel();
panelActiveLendings.setBorder(new TitledBorder(null, "Aktive Ausleihen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panelActiveLendings.setBounds(0, 0, 595, 296);
add(panelActiveLendings);
panelActiveLendings.setLayout(new BorderLayout(0, 0));
JScrollPane scrollPane = new JScrollPane(lendingTable);
panelActiveLendings.add(scrollPane);
JPanel panelManageLendings = new JPanel();
panelManageLendings.setBounds(0, 293, 595, 189);
add(panelManageLendings);
} }
} }

15
src/de/katho/kBorrow/models/LendingTableModel.java
View File

@@ -8,6 +8,7 @@ import javax.swing.table.AbstractTableModel;
import de.katho.kBorrow.data.KArticle; import de.katho.kBorrow.data.KArticle;
import de.katho.kBorrow.data.KLender; import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.data.KLending; import de.katho.kBorrow.data.KLending;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.db.DbConnector;
public class LendingTableModel extends AbstractTableModel { public class LendingTableModel extends AbstractTableModel {
@@ -17,15 +18,17 @@ public class LendingTableModel extends AbstractTableModel {
*/ */
private static final long serialVersionUID = 1375465648631587292L; private static final long serialVersionUID = 1375465648631587292L;
private DbConnector dbCon; private DbConnector dbCon;
private String[] header = {"ID", "Artikel", "Ausleiher", "Ausleihdatum", "Vor. R<>ckgabe", "", ""}; private String[] header = {"ID", "Artikel", "Verliehen von:", "Ausgeliehen an:", "Ausleihdatum", "Vor. R<>ckgabe", ""};
private ArrayList<KLending> data = new ArrayList<KLending>(); private ArrayList<KLending> data = new ArrayList<KLending>();
private ArticleTableModel articleModel; private ArticleTableModel articleModel;
private LenderModel lenderModel; private LenderModel lenderModel;
private UserTableModel userTableModel;
public LendingTableModel(DbConnector pDbCon, HashMap<String, Object> pModels ) { public LendingTableModel(DbConnector pDbCon, HashMap<String, Object> pModels ) {
dbCon = pDbCon; dbCon = pDbCon;
articleModel = (ArticleTableModel)pModels.get("articletablemodel"); articleModel = (ArticleTableModel)pModels.get("articletablemodel");
lenderModel = (LenderModel)pModels.get("lendermodel"); lenderModel = (LenderModel)pModels.get("lendermodel");
userTableModel = (UserTableModel)pModels.get("usertablemodel");
updateModel(); updateModel();
} }
@@ -54,15 +57,21 @@ public class LendingTableModel extends AbstractTableModel {
return art.getName(); return art.getName();
case 2: case 2:
int uId = data.get(row).getUserId();
KUser user = userTableModel.getUserById(uId);
return user.getName()+" "+user.getSurname();
case 3:
int lenderId = data.get(row).getLenderId(); int lenderId = data.get(row).getLenderId();
KLender lender = lenderModel.getLenderById(lenderId); KLender lender = lenderModel.getLenderById(lenderId);
return lender.getName()+" "+lender.getSurname()+" ("+lender.getStudentnumber()+")"; return lender.getName()+" "+lender.getSurname()+" ("+lender.getStudentnumber()+")";
case 3: case 4:
return data.get(row).getStartDate(); return data.get(row).getStartDate();
case 4: case 5:
return data.get(row).getExpectedEndDate(); return data.get(row).getExpectedEndDate();
default: default: