Erste Tabelle und Datum angepasst

6 files changed, 75 insertions, 20 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 83b33784..ef88fe83 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index ae51b2f1..bb7fadf3 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 38c16214..21bbf00a 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -18,6 +18,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
 
@@ -115,7 +117,45 @@ public class DeleteImage_GUI extends JFrame {
 				initTableModel(modelAll);
 				initTableModel(modelMyImages);
 				initTableModel(modelPublicVorlagen);
-				tableAllImages.getColumnModel().getColumn(1).setPreferredWidth(0);
+				
+				//Übernehmen in aandere
+				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				//bis hier
 				textFieldName.requestFocusInWindow();
 			}
 		});
@@ -794,17 +834,22 @@ public class DeleteImage_GUI extends JFrame {
 			images = client.getImageList();
 
 			Iterator<server.Image> i = images.iterator();
-
+			
 			int x = 0;
-
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			while (i.hasNext()) {
+				
+				//System.out.println(out.format(in.parse(images.get(x).updateTime)));
+				
 				// 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(),
-						images.get(x).getUpdateTime(), images.get(x).id,
+						out.format(in.parse(images.get(x).updateTime)),
+						images.get(x).id,
 						images.get(x).getVersion(),
 						images.get(x).getIsTemplate()};
 				// Fuege diese Objekte der Tabelle hinzu
@@ -815,7 +860,7 @@ public class DeleteImage_GUI extends JFrame {
 			}
 
 			return model;
-		} catch (TException e1) {
+		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(null,
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 3e47fc1b..622d25c9 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -10,6 +10,7 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -117,6 +118,8 @@ public class Login_GUI extends JFrame {
 		setBounds(0, 0, 603, 400);
 		GuiOrganizer.centerGUI(this);
 		
+		
+		
 		// Erzeugen eines Panels
 		contentPane = new JPanel();
 		// Hintergrund Farbe des Panels setzen
@@ -148,6 +151,17 @@ public class Login_GUI extends JFrame {
 		JLabel LabelUser = new JLabel("bwIDM-Benutzername:");
 		LabelUser.setBounds(111, 164, 134, 20);
 		contentPane.add(LabelUser);
+		
+		// Erzeugen und Hinzufuegen des Passwortfeldes
+		lblpass = new JPasswordField();
+		lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
+		lblpass.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				performLogin();
+			}
+		});
+		lblpass.setBounds(292, 195, 237, 20);
+		contentPane.add(lblpass);
 
 		// Erzeugen und Hinzufuegen des Textfeldes
 		lblusername = new JTextField();
@@ -163,10 +177,12 @@ public class Login_GUI extends JFrame {
 				
 			}else{
 				lblusername.setText(ini.get("main", "Benutzername").toString());
+				
 			}
 			
 			if(ini.get("main", "Benutzername speichern", Boolean.class)==true){
 				chckbxBenutzernameSpeichern.setSelected(true);
+				
 			}
 		} catch (InvalidFileFormatException e1) {
 			// TODO Auto-generated catch block
@@ -201,21 +217,12 @@ public class Login_GUI extends JFrame {
 		BtnLogin.setBounds(292, 252, 237, 23);
 		contentPane.add(BtnLogin);
 
-		// Erzeugen und Hinzufuegen des Passwortfeldes
-		lblpass = new JPasswordField();
-		lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
-		lblpass.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				performLogin();
-			}
-		});
-		lblpass.setBounds(292, 195, 237, 20);
-		contentPane.add(lblpass);
+
 
 		lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT);
 		lblConnectionInfo.setBounds(292, 290, 237, 20);
 		contentPane.add(lblConnectionInfo);
-		
+
 
 		//GuiOrganizer.centerGUI(this);
 	}// end LoginGUI()
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index ee3cbbc7..a2be4265 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 8622b06b..a642dd22 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -3,8 +3,10 @@ package sql;
 import java.sql.*;

 

 import java.text.DateFormat;

+import java.text.ParseException;

 import java.text.SimpleDateFormat;

 import java.util.ArrayList;

+import java.util.Calendar;

 import java.util.Date;

 import java.util.HashMap;

 import java.util.List;

@@ -296,15 +298,16 @@ public class SQL {
 			Statement stm;

 			List<Image> list = new ArrayList<Image>();

 			try {

+

 				stm = con.createStatement();

 				ResultSet res=stm

 						.executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name,os.architecture, '' as lecture,vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name,os.architecture, lect.name as lecture,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

 				

-

-			

+				

 

 					while (res.next()) {

-

+						

+						

 						list.add(new Image(res.getString("GUID_imageID"), res

 								.getString("imageVersion"),

 								res.getString("image_name"), res

@@ -319,7 +322,7 @@ public class SQL {
 			} catch (SQLException e) {

 				// TODO Auto-generated catch block

 				e.printStackTrace();

-			}

+			} 

 

 		

 			return list;