manabu-desktop 0.0.2 → 0.0.3

data/lib/screens/main_menu.rb

@@ -1,28 +1,51 @@
 require_relative 'base'
 require_relative 'login'
+require_relative '../sessions'
+require_relative '../windows'
 
 module ManabuDesktop
   module Screens
     class MainMenu < ManabuDesktop::Screens::Base
       def initialize()
-        super('main_menu')
+        if ManabuDesktop::Windows.set_main_menu(self) == false
+          # TODO: handle multiple main menus..
+          STDERR.puts 'Tried to initialize multiple Main Menus!'
+        end
+
+        super('main_menu', :c)
 
-        connect_button = @builder.get_object('connect.button')
+        connect_button = @builder.get_object('connect.Button')
         connect_button.set_label(I18n.t('main_menu.connect'))
-        connect_button.signal_connect('clicked') { ManabuDesktop::Screens::Login.new }
+        connect_button.signal_connect('clicked') { ManabuDesktop::Screens::Login.new() }
 
-        settings_button = @builder.get_object('settings.button')
+        settings_button = @builder.get_object('settings.Button')
         settings_button.set_label(I18n.t('main_menu.settings'))
         settings_button.signal_connect('clicked') { puts 'Settings coming soon' }
 
-        exit_button = @builder.get_object('exit.button')
+        exit_button = @builder.get_object('exit.Button')
         exit_button.set_label(I18n.t('main_menu.exit'))
         exit_button.signal_connect('clicked') do |_widget|
+          ManabuDesktop::Windows.destroy_all()
           Gtk.main_quit()
-          @window.destroy()
         end
+
+        @connections_list = @builder.get_object('connections.ListBox')
+
+        @status_bar = @builder.get_object('status.Statusbar')
+        @status_bar_context_id = @status_bar.get_context_id('Connection Status')
+
+        set_connections_status(ManabuDesktop::Sessions.session_count)
+
         _show()
       end
+
+      def set_status(status_text)
+        @status_bar.push(@status_bar_context_id, status_text)
+      end
+
+      def set_connections_status(num)
+        set_status("#{I18n.t('main_menu.num_connections')}: #{num}")
+      end
     end
   end
 end

data/lib/screens/roster.rb

@@ -7,31 +7,36 @@ module ManabuDesktop
   module Screens
     class Roster < ManabuDesktop::Screens::Base
 
-      COLUMN_SELECT   = 0
-      COLUMN_ID       = 1
-      COLUMN_SURNAME  = 2
-      COLUMN_NAME     = 3
-      COLUMN_DOB      = 4
-      COLUMN_SEX      = 5
+      attr_reader :column_order
 
       def initialize(client)
         @client = client
         super('roster')
 
-        treeview = @builder.get_object('roster.treeview')
-        toolbar = @builder.get_object('roster.toolbar')
+        setup_columns()
 
-        _create_model()
-        treeview.set_model(@model)
-        _create_columns(treeview)
-
-        _setup_toolbar(toolbar)
+        _setup_toolbar()
+        _setup_search_filters()
 
         @window.show_all
         _show()
       end
 
+      # Set the order of the columns
+      # Possible columns:
+      #   :id, :surname, :name, :middle_name, :surname_reading, :name_reading,
+      #   :middle_name_reading, :gender, :dob, :enrollment
+      def setup_columns(order = [:id, :surname, :name, :gender, :dob, :enrollment])
+        @column_order = {select: 0}
+        order.each do |item|
+          @column_order[item] = @column_order.count
+        end
+        # @column_order << :controls # TODO: setup control column
+        _create_columns()
+      end
+
       def _create_model()
+        # TODO: dynamically generate model based on selected columns/order
         @model = Gtk::ListStore.new(TrueClass, Integer, String, String, String, String)
 
         students = Manabu::Students.new(@client)
@@ -43,63 +48,98 @@ module ManabuDesktop
         end
       end
 
-      def _create_columns(treeview)
+      def _create_columns()
+        treeview = @builder.get_object('roster.TreeView')
+        _create_model()
+        treeview.set_model(@model)
         renderer = Gtk::CellRendererToggle.new
         renderer.signal_connect("toggled") { |_cell, path| _student_select(path) }
         column = Gtk::TreeViewColumn.new(I18n.t("g.select"), renderer,
-                                         "active" => COLUMN_SELECT)
-        column.sort_column_id = COLUMN_SELECT
+                                         "active" => @column_order[:select])
+        column.sort_column_id = @column_order[:select]
         treeview.append_column(column)
 
         renderer = Gtk::CellRendererText.new()
         column = Gtk::TreeViewColumn.new(I18n.t("student.id"), renderer,
-                                         "text" => COLUMN_ID)
-        column.sort_column_id = COLUMN_ID
+                                         "text" => @column_order[:id])
+        column.sort_column_id = @column_order[:id]
         treeview.append_column(column)
 
         renderer = Gtk::CellRendererText.new()
         column = Gtk::TreeViewColumn.new(I18n.t("student.surname"), renderer,
-                                         "text" => COLUMN_SURNAME)
-        column.sort_column_id = COLUMN_SURNAME
+                                         "text" => @column_order[:surname])
+        column.sort_column_id = @column_order[:surname]
         treeview.append_column(column)
 
         renderer = Gtk::CellRendererText.new()
         column = Gtk::TreeViewColumn.new(I18n.t("student.name"), renderer,
-                                         "text" => COLUMN_NAME)
-        column.sort_column_id = COLUMN_NAME
+                                         "text" => @column_order[:name])
+        column.sort_column_id = @column_order[:name]
         treeview.append_column(column)
 
         renderer = Gtk::CellRendererText.new()
         column = Gtk::TreeViewColumn.new(I18n.t("student.dob"), renderer,
-                                         "text" => COLUMN_DOB)
-        column.sort_column_id = COLUMN_DOB
+                                         "text" => @column_order[:dob])
+        column.sort_column_id = @column_order[:dob]
         treeview.append_column(column)
 
         renderer = Gtk::CellRendererText.new()
-        column = Gtk::TreeViewColumn.new(I18n.t("student.sex"), renderer,
-                                         "text" => COLUMN_SEX)
-        column.sort_column_id = COLUMN_SEX
+        column = Gtk::TreeViewColumn.new(I18n.t("student.gender"), renderer,
+                                         "text" => @column_order[:gender])
+        column.sort_column_id = @column_order[:gender]
         treeview.append_column(column)
       end
 
       def _student_select(path_str)
         path = Gtk::TreePath.new(path_str)
         iter = @model.get_iter(path)
-        fixed = iter[COLUMN_SELECT]
+        selected = iter[@column_order[:select]]
         # TODO: get student record and put in or remove from collection
-        fixed ^= 1
-        iter[COLUMN_SELECT] = fixed
+        selected ^= 1
+        iter[@column_order[:select]] = fixed
       end
 
-      def _setup_toolbar(toolbar)
+      def _setup_toolbar()
+        toolbar = @builder.get_object('roster.Toolbar')
+        # new button
         register_student_button = Gtk::ToolButton.new(:stock_id => Gtk::Stock::NEW)
         register_student_button.label = I18n.t('student.register')
-        register_student_button.signal_connect "clicked" do
+        register_student_button.signal_connect('clicked') do
           ManabuDesktop::Screens::Student::Registration.new(@client, self)
         end
-        sep = Gtk::SeparatorToolItem.new
+
+        # separator
+        sep = Gtk::SeparatorToolItem.new()
+
+        # search/filtering box
+       # search_container = Gtk::Box.new(:horizontal, 10)
+       # search_entry = Gtk::SearchEntry.new()
+       # search_bar = Gtk::SearchBar.new()
+       # search_bar.connect_entry(search_entry)
+       # search_bar.add(search_container)
+
         toolbar.insert(register_student_button, 0)
         toolbar.insert(sep, 1)
+        #toolbar.insert(search_container, 2)
+      end
+
+      def _setup_search_filters()
+        clear_filters_button = @builder.get_object('clear_filters.Button')
+        clear_filters_button.set_label(I18n.t('g.clear'))
+
+        enrollment_status_filters_toggleButton = \
+          @builder.get_object('enrollment_status_filters.ToggleButton')
+        enrollment_status_filters_toggleButton.set_label(I18n.t('enrollment.filter'))
+        enrollment_status_filters_popover = \
+          @builder.get_object('enrollment_status_filters.Popover')
+
+        enrollment_status_filters_popover.signal_connect('closed') {
+          enrollment_status_filters_toggleButton.active = false
+        }
+        enrollment_status_filters_toggleButton.signal_connect('toggled') {
+          enrollment_status_filters_popover.visible =
+            enrollment_status_filters_toggleButton.active?
+        }
       end
     end
   end

data/lib/screens/student/registration.rb

@@ -1,6 +1,8 @@
 require_relative '../base'
+require_relative '../../tools' 
 require 'manabu/client'
 require 'manabu/student'
+require 'manabu/students'
 
 module ManabuDesktop
   module Screens
@@ -12,30 +14,89 @@ module ManabuDesktop
           @parent = parent
 
           super('student_registration')
-          
-          @builder.get_object('surname.label').set_label(
+
+          # Name
+          @builder.get_object('surname.Label').set_label(
             I18n.t('student.surname'))
-          @builder.get_object('name.label').set_label(
+          @surname_entry = @builder.get_object('surname.Entry')
+          @builder.get_object('name.Label').set_label(
             I18n.t('student.name'))
-          @builder.get_object('middle_name.label').set_label(
+          @name_entry = @builder.get_object('name.Entry')
+          @builder.get_object('middle_name.Label').set_label(
             I18n.t('student.middle_name'))
+          @middle_name_entry = @builder.get_object('middle_name.Entry')
 
-          @builder.get_object('surname_reading.label').set_label(
+          # Name readings
+          @builder.get_object('surname_reading.Label').set_label(
             I18n.t('student.surname_reading'))
-          @builder.get_object('name_reading.label').set_label(
+          @surname_reading_entry = @builder.get_object('surname_reading.Entry')
+          @builder.get_object('name_reading.Label').set_label(
             I18n.t('student.name_reading'))
-          @builder.get_object('middle_name_reading.label').set_label(
+          @name_reading_entry = @builder.get_object('name_reading.Entry')
+          @builder.get_object('middle_name_reading.Label').set_label(
             I18n.t('student.middle_name_reading'))
+          @middle_name_reading_entry = @builder.get_object('middle_name_reading.Entry')
+
+          # Gender
+          @builder.get_object('gender.Label').set_label(I18n.t('student.gender'))
+          gender_comboBoxText = @builder.get_object('gender.ComboBoxText')
+          gender_comboBoxText.append_text(' ')
+          gender_comboBoxText.append_text(I18n.t('student.male'))
+          gender_comboBoxText.append_text(I18n.t('student.female'))
 
+          # Birth date
+          @builder.get_object('birth_date.Label').set_label(I18n.t('student.dob'))
+          birth_date_picker_toggleButton = @builder.get_object('birth_date_picker.ToggleButton')
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:calendar].paths[:png][:hdpi])
+          @builder.get_object('birth_date_picker.Image').set_pixbuf(pixbuf)
+          birth_date_picker_popover = @builder.get_object('birth_date_picker.Popover')
+          birth_date_picker_popover.signal_connect('closed') {
+            birth_date_picker_toggleButton.active = false
+          }
+          birth_date_picker_calendar = @builder.get_object('birth_date_picker.Calendar')
+          birth_date_picker_calendar.signal_connect('day-selected') {
+            puts birth_date_picker_calendar.date
+          }
+          birth_date_picker_toggleButton.signal_connect('toggled') {
+            birth_date_picker_popover.visible = birth_date_picker_toggleButton.active?
+          }
 
-          @builder.get_object('sex.label').set_label(I18n.t('student.sex'))
-          sex_comboboxtext = @builder.get_object('sex.comboboxtext')
-          sex_comboboxtext.append_text(I18n.t('student.male'))
-          sex_comboboxtext.append_text(I18n.t('student.female'))
-          @builder.get_object('birth_date.label').set_label(I18n.t('student.dob'))
+
+          # Registration
+          register_button = @builder.get_object('register.Button')
+          register_button.set_label(I18n.t('g.register'))
+          register_button.signal_connect('clicked') {
+            _register(@surname_entry.text, @name_entry.text, @middle_name_entry.text,
+                      @surname_reading_entry.text, @name_reading_entry.text,
+                      @middle_name_reading_entry.text,
+                      nil, nil, nil, nil)
+          }
 
           _show()
         end
+
+        # Compose and send a registration request
+        def _register(surname, name, middle_name,
+                      surname_reading, name_reading, middle_name_reading,
+                      gender, dob, enrollment_status, picture_path)
+          student = Manabu::Student.new(@client)
+          student.surname = surname
+          student.name = name
+          student.middle_name = middle_name
+          student.surname_reading = surname_reading
+          student.name_reading = name_reading
+          student.middle_name_reading = middle_name_reading
+          # TODO: gender
+          # TODO: DOB
+          # TODO: enrollment_status
+          # TODO: picture
+
+          students = Manabu::Students.new(@client)
+          students.register(student)
+
+          @window.destroy
+        end
       end
     end
   end

data/lib/screens/toolbox.rb

@@ -1,8 +1,7 @@
 require_relative 'base'
 require_relative 'roster'
+require_relative '../tools'
 require 'manabu/client'
-require 'emojidex-rasters'
-require 'emojidex/data/utf'
 
 module ManabuDesktop
   module Screens
@@ -19,7 +18,7 @@ module ManabuDesktop
 
         @activities = [:Roster, :Courses, :Exams, :Administration]
 
-        icon_view = @builder.get_object('tools.icons')
+        icon_view = @builder.get_object('tools.IconView')
         icon_view.set_pixbuf_column(ICON_COL)
         icon_view.set_text_column(LABEL_COL)
         list = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String, String)
@@ -41,18 +40,22 @@ module ManabuDesktop
       end
 
       def _create_ability_icon(ability, list, icon_view)
-        emojidex = Emojidex::Data::UTF.new
         case ability
         when :Roster
-          pixbuf = GdkPixbuf::Pixbuf.new(file: emojidex.emoji[:student].paths[:png][:px64])
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:student].paths[:png][:px64])
         when :Courses
-          pixbuf = GdkPixbuf::Pixbuf.new(file: emojidex.emoji[:notebook].paths[:png][:px64])
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:notebook].paths[:png][:px64])
         when :Exams
-          pixbuf = GdkPixbuf::Pixbuf.new(file: emojidex.emoji[:white_check_mark].paths[:png][:px64])
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:white_check_mark].paths[:png][:px64])
         when :Administration
-          pixbuf = GdkPixbuf::Pixbuf.new(file: emojidex.emoji[:wrench].paths[:png][:px64])
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:wrench].paths[:png][:px64])
         else
-          pixbuf = GdkPixbuf::Pixbuf.new(file: emojidex.emoji[:question].paths[:png][:px64])
+          pixbuf = GdkPixbuf::Pixbuf.new(
+            file: ManabuDesktop::Tools.emojidex.emoji[:question].paths[:png][:px64])
         end
 
         iter = list.append

data/lib/sessions.rb

@@ -1,4 +1,24 @@
+require_relative 'windows'
+
 module ManabuDesktop
   class Sessions
+    @@active_sessions = []
+
+    def self.get_sessions()
+      @@active_sessions
+    end
+
+    def self.session_count
+      @@active_sessions.length
+    end
+
+    def self.add_session(session_handle)
+      @@active_sessions << session_handle
+      main_menu = ManabuDesktop::Windows.get_main_menu()
+      main_menu.set_connections_status(session_count) unless main_menu == nil
+    end
+
+    def self.remove_session(session_identifier)
+    end
   end
 end

data/lib/tools.rb

@@ -1,12 +1,35 @@
 require 'i18n'
+require 'emojidex-rasters'
+require 'emojidex/data/utf'
 
-I18n.load_path = Dir["#{__dir__}/../locales/*.yml"]
+module ManabuDesktop
+  class Tools
+    @@_initialized = false
+    @@_emojidex = nil
 
-# TODO there must be a better way to determine language
-@lang = (ENV['LANG'][0..1]).to_sym
-if I18n.available_locales.include? @lang
-  I18n.locale = @lang
-else
-  I18n.locale = :en
-  @lang = :en
+    def self.init()
+      return if @@_initialized
+
+      I18n.load_path = Dir["#{__dir__}/../locales/*.yml"]
+
+      # TODO there must be a better way to determine language
+      @lang = (ENV['LANG'][0..1]).to_sym
+      if I18n.available_locales.include? @lang
+        I18n.locale = @lang
+      else
+        I18n.locale = :en
+        @lang = :en
+      end
+
+      @@_initialized = true
+    end
+
+    def self.emojidex()
+      return @@_emojidex if @@_emojidex
+      @@_emojidex = Emojidex::Data::UTF.new
+      @@_emojidex
+    end
+  end
 end
+
+ManabuDesktop::Tools.init()

data/lib/windows.rb

@@ -0,0 +1,26 @@
+module ManabuDesktop
+  class Windows
+    @@main_menu = nil
+    @@window_list = []
+
+    def self.set_main_menu(handle)
+      return false if @@main_menu != nil
+      @@main_menu = handle
+      true
+    end
+
+    def self.get_main_menu()
+      @@main_menu
+    end
+
+    def self.add_window(handle)
+      @@window_list << handle
+    end
+
+    def self.destroy_all()
+      @@window_list.each do |window|
+        window.destroy()
+      end
+    end
+  end
+end

data/manabu-desktop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = 'manabu-desktop'
-  s.version      = '0.0.2'
+  s.version      = '0.0.3'
   s.licenses     = ['GPL-3.0']
   s.summary      = 'GTK based GUI client for Manabu/GAKU Engine'
   s.description  = 'Manabu Desktop is a GTK front end for the Manabu client.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manabu-desktop
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manabu
@@ -106,6 +106,7 @@ files:
 - lib/sessions.rb
 - lib/tools.rb
 - lib/util/cache.rb
+- lib/windows.rb
 - manabu-desktop.gemspec
 homepage: http://www.gakuengine.com
 licenses: