diff options
| author | unknown | 2014-04-10 13:13:21 +0200 |
|---|---|---|
| committer | unknown | 2014-04-10 13:13:21 +0200 |
| commit | 0fbe8c2ce5354de8a2725003e9d259a7d722c184 (patch) | |
| tree | ef24e99feda4125269f3689a10079f653f6c9a9c | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff) | |
| download | tutor-module-0fbe8c2ce5354de8a2725003e9d259a7d722c184.tar.gz tutor-module-0fbe8c2ce5354de8a2725003e9d259a7d722c184.tar.xz tutor-module-0fbe8c2ce5354de8a2725003e9d259a7d722c184.zip | |
Update der Datenbank beim Update der Veranstaltung funktioniert nun
39 files changed, 83 insertions, 53 deletions
diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class Binary files differindex 7c968cd1..a0cb753d 100644 --- a/Dozentenmodul/bin/Models/Lecture.class +++ b/Dozentenmodul/bin/Models/Lecture.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class Binary files differindex 8a14b449..3eded544 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class Binary files differindex 8a5194f2..aac75f6d 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class Binary files differindex a788e377..4adde720 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class Binary files differindex 8dcb0f90..03aeea73 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class Binary files differindex 70962f9c..7ffa5033 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class Binary files differindex c02959c2..720ce3cd 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class Binary files differindex f5009ce3..496f2158 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class Binary files differindex e3beaa57..29269bbd 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex cec2cfad..bf24ef25 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class Binary files differindex 28596b7f..3be2f5f1 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class Binary files differindex 8b17dab5..217b987a 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class Binary files differindex 0b03bc49..0b7106e2 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class Binary files differindex 75c93b92..9b5b4107 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class Binary files differindex 0c97260a..847b6416 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class Binary files differindex 842bbb87..cb5888ae 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Binary files differindex 0f9f8a09..97b76e5c 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class Binary files differindex 5df62ad7..a25d7157 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class Binary files differindex 4a933e6e..55d72ee9 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class Binary files differindex b790203f..23f71ee1 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class Binary files differindex 44bbface..dfb69143 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class Binary files differindex cadf961a..87c0067c 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class Binary files differindex cd7f2b25..8d99419a 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex 5a6ea8fa..71d93a4a 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class Binary files differindex 57e66269..c412ac7b 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class Binary files differindex 05c6ac16..83d7cf3e 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class Binary files differindex 7c968cd1..a0cb753d 100644 --- a/Dozentenmodul/bin/models/Lecture.class +++ b/Dozentenmodul/bin/models/Lecture.class diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 069946b3..6b7e6fa1 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -6,6 +6,7 @@ public class Lecture { private String name; + private String newName; private String shortDesc; private String desc; private Date startdate; @@ -18,6 +19,14 @@ public class Lecture { public static Lecture lecture =new Lecture(); + public String getNewName() { + return newName; + } + + public void setNewName(String newName) { + this.newName = newName; + } + public String getLinkedImagename() { return linkedImagename; } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 1bf8cc3a..cd952d0f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -50,8 +50,8 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index d0f789f4..2ace42c6 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -45,8 +45,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; String downloadFile = ""; static String arg = ""; diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index b184c96c..a23e85d2 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -49,8 +49,8 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index a9125829..2243fd43 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -476,8 +476,9 @@ public class CreateLectureLink_GUI extends JFrame { images.get(x).getLicenseRestriction(), images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; + images.get(x).getUserData(), + images.get(x).getUpdateTime() + }; ListObj.add(obj); model.addRow(ListObj.get(x)); x++; diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 40b3ce84..115a9f1f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -361,13 +361,14 @@ public class EditLectureAllgemein_GUI extends JFrame { } Lecture.lecture.setName(textFieldLaborname.getText()); + Lecture.lecture.setNewName(textFieldLaborname.getText()); Lecture.lecture.setDesc(description.getText()); Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); Image.image.setImagename(textFieldLaborname.getText()); - CreateLectureLink_GUI ev=new CreateLectureLink_GUI(); + EditLectureLink_GUI ev=new EditLectureLink_GUI(); ev.setVisible(true); dispose(); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index c245ce79..c1fdec80 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -63,7 +63,7 @@ public class EditLectureLink_GUI extends JFrame { JTable tablePublicVorlagen = new JTable(); private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; + "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); @@ -355,7 +355,7 @@ public class EditLectureLink_GUI extends JFrame { } { JButton cancelButton = new JButton( - "Veranstaltung erzeugen und abschlie\u00DFen"); + "Veranstaltung ändern und abschlie\u00DFen"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -370,14 +370,16 @@ public class EditLectureLink_GUI extends JFrame { String imagename = tableAllImages.getValueAt( tableAllImages.getSelectedRow(), 0) .toString(); + System.out.println("ID: "+Lecture.lecture.getid()); + try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - System.out.println(formatter.format( - Lecture.lecture.getStartdate()) + + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + System.out.println( formatter.format( + Lecture.lecture.getEnddate()) .toString()); - client.writeLecturedata( - Lecture.lecture.getName(), + client.updateLecturedata(Lecture.lecture.getName(), + Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format( @@ -393,7 +395,9 @@ public class EditLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); + person.verantwortlicher.getFakultät(), + Lecture.lecture.getid()); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -407,6 +411,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } + MainMenue_GUI m = new MainMenue_GUI(); + m.setVisible(true); dispose(); } @@ -459,8 +465,9 @@ public class EditLectureLink_GUI extends JFrame { images.get(x).getLicenseRestriction(), images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; + images.get(x).getUserData(), + images.get(x).getUpdateTime(), "", images.get(x).id, + images.get(x).getVersion() }; ListObj.add(obj); model.addRow(ListObj.get(x)); x++; diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 069946b3..6b7e6fa1 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -6,6 +6,7 @@ public class Lecture { private String name; + private String newName; private String shortDesc; private String desc; private Date startdate; @@ -18,6 +19,14 @@ public class Lecture { public static Lecture lecture =new Lecture(); + public String getNewName() { + return newName; + } + + public void setNewName(String newName) { + this.newName = newName; + } + public String getLinkedImagename() { return linkedImagename; } diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differindex d14b9ee1..76357894 100644 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ b/Dozentenmodulserver/bin/server/ServerHandler.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex ea2ae3c3..6a4524b7 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index c7ab500b..9474d942 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -311,7 +311,21 @@ public class ServerHandler implements Server.Iface { boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws TException { - // TODO Auto-generated method stub + int pk_image=0; + int imageversion=0; + ResultSet image=sql.getImageIDandVersion(con, imagename); + + try { + while(image.next()) + { + pk_image=image.getInt("GUID_imageID"); + imageversion=image.getInt("imageVersion"); + } + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id); return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index ec1ea11f..27bdc17c 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -6,6 +6,7 @@ import java.sql.ResultSet; import java.sql.SQLException;
import java.sql.Statement;
import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
@@ -447,8 +448,8 @@ public class SQL { return -1;
}
- public int updateLectureData(Connection con, int pk_person, int pk_image,
- int imageversion, String name, String desc, String shortdesc,
+ public int updateLectureData(Connection con, int pk_image,
+ int imageversion, String name, String newName ,String desc, String shortdesc,
String start, String end, boolean isactive, String id) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -459,36 +460,24 @@ public class SQL { }
try {
Statement stm = con.createStatement();
- Random random = new Random();
- int uid = random.nextInt();
- stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('"
- + uid
- + "','"
- + name
- + "','"
- + active_bol
- + "','"
- + start
- + "','"
- + end
- + "','"
- + formatter.format(new Date())
- + "','"
- + shortdesc
- + "','"
- + desc
- + "','"
- + pk_image
- + "','"
- + imageversion
- + "','"
- + formatter.format(new Date())
- + "','"
- + formatter.format(new Date())
- + "','"
- + pk_person
- + "','"
- + pk_person + "');");
+ stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '"
+ +newName
+ +"',`isActive` = '"
+ +active_bol
+ +"',`startTime` = '"
+ +start
+ +"',`endTime` = '"
+ +end
+ +"',`description` = '"
+ +desc
+ +"',`imageID` = '"
+ +pk_image
+ +"',`imageVersion` = '"
+ +imageversion
+ +"',`admin_changeTime` = '"
+ +formatter.format(new Date())
+ +"'WHERE `lectureID` = '"
+ +id+"';" );
con.commit();
} catch (SQLException e) {
|
