tmis 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b16bdbc21c0f9d4b63fe41cdf1e9d9231adadf88
-  data.tar.gz: 1fb3cc43905e908ba366d553d6c2ca0bf6315b29
+  metadata.gz: e4cc7538f20247e8ad56a375fd38dab9cc0d77b0
+  data.tar.gz: 938a8e400a59287bdba3b68b48c871fc0625c9c8
 SHA512:
-  metadata.gz: 96eedca7b13c1e27f563ed760661526465f1cfe8d8dbf86bc693f6174a030f94d928379b0eea83ed2458335fd5b53eaf92ce247d486838eaf467ad168e332adc
-  data.tar.gz: b8e954ac87b95fc06da55a7ae0be693292db0ae792cb3ca01075f852a44418146bb24c8801216906acba9468dbedac9869057801780999efacbcb5c1a1e3c59d
+  metadata.gz: 3e6889c713b4c4a2fe7b7b9a62338c63a25a17bb103b1084ae7b93ae41cb09b94fdceee53c716d2b61dc5a81034b58eb0e39bbb7d78059c935c13070a0f825ba
+  data.tar.gz: 7c5111415e6295849d839d5ff20cf533e1d223dafcaa1b044e3b6bc2955c9b7442f794638de40c877e8ef68c37b17f66365482f4678bc54e2f4ce1abc4ada508

data/lib/tmis/engine/import/spreadsheet_roo.rb

@@ -14,8 +14,8 @@ class SpreadsheetRoo < AbstractSpreadsheet
 
   ##Contract String => Any
   def initialize(filepath)
-    @filepath = filepath
-    @sheet = Roo::Spreadsheet.open(filepath)
+    @filepath = filepath.force_encoding("UTF-8")
+    @sheet = Roo::Spreadsheet.open(@filepath)
     @sheet.default_sheet = 0
   end
 
@@ -57,7 +57,7 @@ class SpreadsheetSpreadsheet < AbstractSpreadsheet
 
   #Contract String => Any
   def initialize(filepath)
-    @filepath = filepath
+    @filepath = filepath.force_encoding("UTF-8")
     Spreadsheet.client_encoding = 'UTF-8'
     if File.file?(@filepath)
       @book = Spreadsheet.open(@filepath)
@@ -127,6 +127,7 @@ end
 class SpreadsheetCreater
   #Contract String => Or[IsA[AbstractSpreadsheet], IsA[WritableSpreadsheet]]
   def self.create(filename)
+    filename = filename.force_encoding("UTF-8")
     if filename =~ /.*.csv/
       SpreadsheetRoo.new(File.expand_path(filename))
     else

data/lib/tmis/engine/import/timetable_reader.rb

@@ -28,7 +28,6 @@ private
   #Contract [Pos, Pos] => Array
   def get_days(cols)
     (7..84).each_slice(13).map{ |i| [i[1], i.last] }.map do |rows|
-      p @table[rows.first, 1]
       { name: @table[rows.first, 1], studies: get_studies(rows, cols) }
     end
   end

data/lib/tmis/interface/forms/export_general_timetable.rb

@@ -23,7 +23,7 @@ class ExportGeneralTimetableDialog < Qt::Dialog
   end
 
   def on_browsePushButton_clicked
-    @ui.pathLineEdit.text = Qt::FileDialog::getSaveFileName(self, 'Save File', 'NewTimetable', 'XLS Spreadsheet(*.xls)')
+    @ui.pathLineEdit.text = Qt::FileDialog::getSaveFileName(self, 'Save File', "#{Dir.home}/NewTimetable", 'XLS Spreadsheet(*.xls)')
   end
 
   def on_exportButtonBox_accepted

data/lib/tmis/interface/forms/export_group_timetable.rb

@@ -38,7 +38,7 @@ class ExportGroupTimetableDialog < Qt::Dialog
 
   def on_saveCheckBox_toggled(checked)
     if checked
-      if (path = Qt::FileDialog::getExistingDirectory(self, 'Open Directory', '/home', Qt::FileDialog::ShowDirsOnly | Qt::FileDialog::DontResolveSymlinks))
+      if (path = Qt::FileDialog::getExistingDirectory(self, 'Open Directory', Dir.home, Qt::FileDialog::ShowDirsOnly | Qt::FileDialog::DontResolveSymlinks))
         @ui.folderPathLineEdit.text = path # force_encoding doesn't help because Qt changes the encoding to ASCII anyway
       else
         @ui.folderPathLineEdit.text = Dir.home

data/lib/tmis/interface/forms/export_lecturer_timetable.rb

@@ -38,7 +38,7 @@ class ExportLecturerTimetableDialog < Qt::Dialog
 
   def on_saveCheckBox_toggled(checked)
     if checked
-      if (path = Qt::FileDialog::getExistingDirectory(self, 'Open Directory', '/home', Qt::FileDialog::ShowDirsOnly | Qt::FileDialog::DontResolveSymlinks))
+      if (path = Qt::FileDialog::getExistingDirectory(self, 'Open Directory', Dir.home, Qt::FileDialog::ShowDirsOnly | Qt::FileDialog::DontResolveSymlinks))
         @ui.folderPathLineEdit.text = path # force_encoding doesn't help because Qt changes the encoding to ASCII anyway
       else
         @ui.folderPathLineEdit.text = Dir.home

data/lib/tmis/interface/forms/ui_about.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'about.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_console.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'console.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_debug_console.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'debug_console.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_edit_study.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'edit_study.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_expand_changes.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'expand_changes.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_export_general_timetable.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'export_general_timetable.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:24 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_export_group_timetable.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'export_group_timetable.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_export_lecturer_timetable.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'export_lecturer_timetable.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_find.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'find.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:25 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_import.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'import.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:24 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/forms/ui_settings.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'settings.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:24 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/tmis/interface/mainwindow.rb

@@ -221,7 +221,8 @@ class MainWindow < Qt::MainWindow
   end
 
   def on_openAction_triggered
-    if (filename = Qt::FileDialog::getOpenFileName(self, 'Open File', '', 'TMIS databases (SQLite3)(*.sqlite)'))
+    if (filename = Qt::FileDialog::getOpenFileName(self, 'Open File', Dir.home, 'TMIS databases (SQLite3)(*.sqlite)'))
+      filename = filename.force_encoding("UTF-8")
       Database.instance.connect_to filename
       update_recent filename
       show_tables
@@ -232,7 +233,7 @@ class MainWindow < Qt::MainWindow
   end
 
   def on_saveAsAction_triggered
-    if (filename = Qt::FileDialog::getSaveFileName(self, 'Save File', 'NewTimetable.sqlite', 'TMIS databases (SQLite3)(*.sqlite)'))
+    if (filename = Qt::FileDialog::getSaveFileName(self, 'Save File', "#{Dir.home}/NewTimetable.sqlite", 'TMIS databases (SQLite3)(*.sqlite)'))
       filename.force_encoding('UTF-8')
       FileUtils.cp(Database.instance.path, filename) unless Database.instance.path == filename
       Database.instance.connect_to filename
@@ -243,7 +244,8 @@ class MainWindow < Qt::MainWindow
 
   def on_importAction_triggered
     please_wait do
-      if (filename = Qt::FileDialog::getOpenFileName(self, 'Open File', '', 'Spreadsheets(*.xls *.xlsx *.ods *.csv)'))
+      if (filename = Qt::FileDialog::getOpenFileName(self, 'Open File', Dir.home, 'Spreadsheets(*.xls *.xlsx *.ods *.csv)'))
+        filename = filename.force_encoding('UTF-8')
         if Database.instance.connected?
           (id = ImportDialog.new(Date.parse(@ui.dateDateEdit.date.toString(Qt::ISODate)))).exec
         else

data/lib/tmis/interface/models/speciality_subject_table_model.rb

@@ -58,7 +58,10 @@ class SpecialitySubjectTableModel < Qt::AbstractTableModel
       when 6
         speciality_subject.consultations_hours
       when 7
-        speciality_subject.lecture_hours.try(:+, speciality_subject.practical_hours || 0)
+        [speciality_subject.lecture_hours,
+         speciality_subject.practical_hours,
+         speciality_subject.consultations_hours ].
+        keep_if{|x| x.respond_to?(:+) }.inject(:+)
       when 8
         speciality_subject.preffered_days
       when 9
@@ -83,7 +86,10 @@ class SpecialitySubjectTableModel < Qt::AbstractTableModel
       when 6
         speciality_subject.consultations_hours
       when 7
-        speciality_subject.lecture_hours.try(:+, speciality_subject.practical_hours || 0)
+        [speciality_subject.lecture_hours,
+         speciality_subject.practical_hours,
+         speciality_subject.consultations_hours ].
+        keep_if{|x| x.respond_to?(:+) }.inject(:+)
       when 8
         speciality_subject.preffered_days
       when 9

data/lib/tmis/interface/ui_mainwindow.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'mainwindow.ui'
 **
-** Created: Wed Sep 4 00:30:33 2013
+** Created: Wed Sep 4 12:32:24 2013
 **      by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmis
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vladislav Mileshkin