From bbcf6036c13fb32572e2e388701c948d0003356b Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Tue, 26 Aug 2014 09:36:49 +0200 Subject: Start und Enddatum der Lectures sind nun im 24H Format verfügbar --- .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10564 -> 10564 bytes .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 2 +- .../src/gui/lecture/DeleteLecture_GUI.java | 8 ++++---- .../src/gui/lecture/EditLectureSearch_GUI.java | 10 ++++++---- .../src/gui/lecture/SearchLecture_GUI.java | 8 ++++---- Dozentenmodulserver/bin/sql/SQL.class | Bin 29074 -> 29092 bytes Dozentenmodulserver/src/sql/SQL.java | 3 ++- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 018c50f4..7812fdd2 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 54e6d8c8..9c30cce7 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -282,7 +282,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // already defined from last visit on this page dateChooserend.setDate(Lecture.lecture.getEnddate()); } - dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserend.setDateFormatString("yyyy-MM-dd HH:mm:ss"); dateChooserend.setBounds(404, 188, 143, 20); panel_2.add(dateChooserend); @@ -298,7 +298,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // already defined from last visit on this page dateChooserstart.setDate(Lecture.lecture.getStartdate()); } - dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserstart.setDateFormatString("yyyy-MM-dd HH:mm:ss"); dateChooserstart.setBounds(226, 188, 143, 20); panel_2.add(dateChooserstart); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 6118ae1e..a388d30d 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -553,7 +553,7 @@ public class CreateLectureLink_GUI extends JFrame { .toString(); try { DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); + "yyyy-MM-dd HH:mm:ss"); client.writeLecturedata( Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index ac3317a8..ed6816ed 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -646,8 +646,8 @@ public class DeleteLecture_GUI extends JFrame { // Hole eine Liste der Images lectures = client.getLectureList(); Iterator i = lectures.iterator(); - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + 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()) { @@ -676,8 +676,8 @@ public class DeleteLecture_GUI extends JFrame { } public void writeLectureData(String id) throws TException, ParseException{ - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res=client.getLectureData(id); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 5a89ea48..ff35ad43 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -760,12 +760,13 @@ public class EditLectureSearch_GUI extends JFrame { // Hole eine Liste der Images lectures = client.getLectureList(); Iterator i = lectures.iterator(); - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + 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 = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -776,6 +777,7 @@ public class EditLectureSearch_GUI extends JFrame { lectures.get(x).imagename," " ,lectures.get(x).id }; // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); + x++; i.next(); @@ -790,8 +792,8 @@ public class EditLectureSearch_GUI extends JFrame { } public void writeLectureData(String id) throws TException, ParseException{ - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res=client.getLectureData(id); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 707534f4..bbe50b3f 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -569,8 +569,8 @@ public class SearchLecture_GUI extends JFrame { // Hole eine Liste der Images lectures = client.getLectureList(); Iterator i = lectures.iterator(); - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + 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()) { @@ -599,8 +599,8 @@ public class SearchLecture_GUI extends JFrame { } public void writeLectureData(String id) throws TException, ParseException{ - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res=client.getLectureData(id); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 71e46b3c..e71c7803 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 8a4e9ae2..cf1da45c 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -658,8 +658,9 @@ public class SQL { ResultSet rs = stm.executeQuery("SELECT lectureID FROM " + "bwLehrpool.m_VLData_lecture WHERE imageID = '" + id + "' AND imageVersion = '" + version + "';"); + boolean ret=rs.first(); con.close(); - return rs.first(); + return ret; } catch (SQLException e) { // TODO Auto-generated catch block -- cgit v1.2.3-55-g7522