Tabs have show number of rows contained

3 files changed, 63 insertions, 27 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 68827f42..40434153 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -172,7 +172,6 @@ public class SearchImage_GUI extends JFrame {
 		try {

 			client.setTokenForSession(SessionData.session.getAuthToken());

 		} catch (TException e1) {

-			// TODO Auto-generated catch block

 			e1.printStackTrace();

 		}

 		

@@ -506,29 +505,6 @@ public class SearchImage_GUI extends JFrame {
 

 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

 		

-		//not needed anymore, as the filters are set by the full text search completely

-		/*

-		tabbedPane.addChangeListener(new ChangeListener() {

-			public void stateChanged(ChangeEvent arg0) {

-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) 

-				{

-

-					String username = person.verantwortlicher.getName() + " "

-							+ person.verantwortlicher.getVorname();

-					//rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));

-				} 

-				else if (tabbedPane.getSelectedIndex() == 1&& activeSearch == false) 

-				{

-					//rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8)); //--> caused bug: no initial list in public images

-				}

-				else if (tabbedPane.getSelectedIndex() == 2 && activeSearch == false) 

-				{

-					//rowSorterAll.setRowFilter(null);

-				}

-

-			}

-		});

-		*/

 		tabbedPane.setBounds(10, 158, 557, 339);

 		contentPanel.add(tabbedPane);

 

@@ -788,6 +764,8 @@ public class SearchImage_GUI extends JFrame {
 		});

 		btnDownload.setBounds(449, 508, 118, 23);

 		contentPanel.add(btnDownload);

+		

+

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBounds(0, 640, 902, 33);

@@ -1009,7 +987,7 @@ public class SearchImage_GUI extends JFrame {
 			}

 		});

 		menuBar.add(mnNewMenu_Info);

-		

+

 		c = this;

 

 	}

@@ -1053,6 +1031,9 @@ public class SearchImage_GUI extends JFrame {
 				i.next();

 

 			}

+			

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException | ParseException e1) {

@@ -1099,6 +1080,8 @@ public class SearchImage_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException | ParseException e1) {

@@ -1144,6 +1127,8 @@ public class SearchImage_GUI extends JFrame {
 					i.next();

 

 				}

+				//show number of rows in GUI

+				tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");

 

 				return model;

 			} catch (TException | ParseException e1) {

diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index a7953dec..1633cb15 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -167,9 +167,8 @@ public class EditLectureLink_GUI extends JFrame {
 			@Override
 			public void windowOpened(WindowEvent arg0) {
 				try {
-					initTableModel(modelAll);
+					initTableModelAll(modelAll);
 					initTableModel(modelMyImages);
-					//initTableModel(modelPublicVorlagen);
 					initTableModelTemplates(modelPublicVorlagen);
 				} catch (TException e) {
 					
@@ -1248,6 +1247,52 @@ public class EditLectureLink_GUI extends JFrame {
 			x++;
 			i.next();
 		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");
+
+		return model;
+
+	}
+	
+	
+	public DefaultTableModel initTableModelAll(DefaultTableModel model)
+			throws TException, ParseException {
+		List<server.generated.Image> images;
+
+		// Hole eine Liste der Images
+		if(person.verantwortlicher.getRole()=="Admin"){
+			//get complete list
+			images = client.getImageList(person.verantwortlicher.getUserID());
+		} else {
+			//get permitted list
+			images = client.getImageListPermissionLink(person.verantwortlicher
+				.getUserID());
+		}
+
+		Iterator<server.generated.Image> i = images.iterator();
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+		int x = 0;
+
+		while (i.hasNext()) {
+			// erzeuge Objekte fuer die Tabelle
+			Object[] obj = { images.get(x).getImageName(),
+					images.get(x).getLicenseRestriction(),
+					images.get(x).getOsName(), images.get(x).getLectureName(),
+					images.get(x).getUserData(),
+					out.format(in.parse(images.get(x).updateTime)),
+					images.get(x).id, images.get(x).getVersion(),
+					images.get(x).getIsTemplate(),
+					images.get(x).getDescription()};
+			// Fuege diese Objekte der Tabelle hinzu
+			model.addRow(obj);
+			x++;
+			i.next();
+		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") ");
 
 		return model;
 
@@ -1284,6 +1329,8 @@ public class EditLectureLink_GUI extends JFrame {
 				i.next();
 
 			}
+			//show number of rows in GUI
+			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");
 
 			return model;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index d44f2908..7180650e 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -660,6 +660,8 @@ public class SearchLecture_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException e1) {

@@ -697,6 +699,8 @@ public class SearchLecture_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException e1) {