Updated the newer csv Presentation constructor to use the QTime forma…

…t instead of the modified isodate format.
Freeseer · Dec 19, 2014 · 863e6bb · 863e6bb
1 parent 7b15556
commit 863e6bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/freeseer/framework/database.py b/src/freeseer/framework/database.py
@@ -508,9 +508,9 @@ def add_talks_from_csv(self, fname):
                                         presentation["Level"],
                                         presentation["Event"],
                                         presentation["Room"],
-                                        QtCore.QDate.fromString(presentation["Time"], QtCore.Qt.ISODate),
-                                        self.isodate_string_to_qtime(presentation["StartTime"]),
-                                        self.isodate_string_to_qtime(presentation["EndTime"]))
+                                        QtCore.QDate.fromString(presentation["Date"], QtCore.Qt.ISODate),
+                                        QtCore.QTime.fromString(presentation["StartTime"]),
+                                        QtCore.QTime.fromString(presentation["EndTime"]))
                 self.insert_presentation(talk)
 
         else:
@@ -542,8 +542,8 @@ def export_talks_to_csv(self, fname):
                                  'Event': unicode(result.value(5).toString()),
                                  'Room': unicode(result.value(6).toString()),
                                  'Date': unicode(result.value(7).toDate().toString(QtCore.Qt.ISODate)),
-                                 'StartTime': unicode(result.value(8).toDateTime().toString(QtCore.Qt.ISODate)),
-                                 'EndTime': unicode(result.value(9).toDateTime().toString(QtCore.Qt.ISODate))})
+                                 'StartTime': unicode(result.value(8).toTime().toString()),
+                                 'EndTime': unicode(result.value(9).toTime().toString())})
 
     def export_reports_to_csv(self, fname):
         fieldNames = ('Title',

diff --git a/src/freeseer/frontend/talkeditor/talkeditor.py b/src/freeseer/frontend/talkeditor/talkeditor.py
@@ -409,8 +409,8 @@ def create_presentation(self, talkDetailsWidget):
                 unicode(talkDetailsWidget.eventLineEdit.text()).strip(),
                 unicode(talkDetailsWidget.roomLineEdit.text()).strip(),
                 talkDetailsWidget.dateEdit.date(),
-                talkDetailsWidget.startTimeEdit.time().toString('hh:mm ap'),
-                talkDetailsWidget.endTimeEdit.time().toString('hh:mm ap'))
+                talkDetailsWidget.startTimeEdit.time().toString(),
+                talkDetailsWidget.endTimeEdit.time().toString())
 
     def show_new_talk_popup(self):
         """Displays a modal dialog with a talk details view