shanti555890 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f46caa37cfa400f1ba3b8e7b1b413480c0ea4461f8ae973c427de8e48d1fe6e1
-  data.tar.gz: 4d9f0741be3f817093b3f36325f513d978dda403c383fe365cf68ff3c1dc0816
+  metadata.gz: d1558d6e55b64d53eaa5b7a1685c5be1dd961488d13958f7bc061aef9770f6a8
+  data.tar.gz: 57949792a2029a2f99ee05842c2cab4979d0c9063a7897cd6c738666ffb0a5ff
 SHA512:
-  metadata.gz: db0a4fa5b05210cb613e3939cc54879204e4242196f4eb99a74fd4138447eb6f6828f6877710771734c921bb90f6c0b5353e049a16942f58df8713111af5bf76
-  data.tar.gz: 9784bf80e8789988c4e56d86311bcd2f0eab3bdaab7555b38c95d4b94b276938e1f2e11121027afe9c971cb253176d77f3fa05d6926d7d33d36075571b96079d
+  metadata.gz: 2d19c00704be66e51888b05d6fc4accd23684971e9200cf2569d0ba09270f4cac07573a8fc848c8333901c1db86a51da45a2cbd071f6ea4f0e4ed2e95f386390
+  data.tar.gz: 611f503e8ccde5aa1b0ff10cf24944a01fdc9bd7c256570d6a31ec3bf0262e74e60f334fbca4efbdbcb432a2544a58701c57df4120cf7ee8ba95183718642f11

data/lib/shanti555890/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shanti555890
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/source/add_controller.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative '../student/student'
+require_relative './student/student'
 require 'logger'
 class AddStudentController
 

data/lib/source/controller.rb

@@ -3,13 +3,13 @@ require_relative 'window'
 require_relative 'student_list'
 require_relative 'student_list_db'
 require 'win32api'
-require_relative '../student/student'
+require_relative './student/student'
 require_relative 'student_file_adapter'
 require_relative 'add_controller'
-require_relative '../strategy/student_list_json'
-require_relative '../strategy/student_list_txt'
-require_relative '../strategy/student_list_yaml'
-require_relative '../all_data/data_list_student_short'
+require_relative './strategy/student_list_json'
+require_relative './strategy/student_list_txt'
+require_relative './strategy/student_list_yaml'
+require_relative './all_data/data_list_student_short'
 require_relative 'update_controller'
 require 'fox16'
 include Fox

data/lib/source/database/add_controller.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative '../student/student'
+require_relative './student/student'
 require 'logger'
 class AddStudentController
 

data/lib/source/database/controller.rb

@@ -3,13 +3,13 @@ require_relative 'window'
 require_relative 'student_list'
 require_relative 'student_list_db'
 require 'win32api'
-require_relative '../student/student'
+require_relative './student/student'
 require_relative 'student_file_adapter'
 require_relative 'add_controller'
-require_relative '../strategy/student_list_json'
-require_relative '../strategy/student_list_txt'
-require_relative '../strategy/student_list_yaml'
-require_relative '../all_data/data_list_student_short'
+require_relative './strategy/student_list_json'
+require_relative './strategy/student_list_txt'
+require_relative './strategy/student_list_yaml'
+require_relative './all_data/data_list_student_short'
 require_relative 'update_controller'
 require 'fox16'
 include Fox

data/lib/source/database/student_file_adapter.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative '../strategy/student_list_base'
+require_relative './strategy/student_list_base'
 class StudentFileAdapter
   def initialize(type_file,file_address)
     @file = StudentListBase.new(type_file)

data/lib/source/database/window.rb

@@ -2,8 +2,8 @@ require 'fox16'
 include Fox
 require_relative 'controller'
 require_relative 'dialog_create_student'
-require_relative '../database_labs/tab_lab'
-require_relative '../database_labs/tab_student'
+require_relative './database_labs/tab_lab'
+require_relative './database_labs/tab_student'
 class Window < FXMainWindow
   def initialize(app)
     super(app, "Students", width: 1100, height: 800) # увеличиваем размер главного окна

data/lib/source/database_labs/data_list_student_lab.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require_relative '../all_data/data_list'
+require_relative '../all_data/data_table'
+
+class DataListStudentLab<DataList
+  public_class_method :new
+
+  protected
+  def get_fields(object)
+    [object.number, object.name, object.date_load]
+  end
+
+end

data/lib/source/database_labs/lab.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+class Lab
+  def initialize(number: nil, name: nil, date_load: nil)
+    raise ArgumentError, "Required fields: name, number and date!" if number.nil? || name.nil?|| date_load.nil?
+    @number = number
+    @name = name
+    @date_load = date_load
+  end
+
+  attr_reader :number, :name, :date_load
+
+  #добавить валидацию!!!!
+  # дата - чтобы предыдущая дата была либо нил, либо раньше
+  # название - все что угодно
+  # id - генерится программно
+
+  def to_s
+    res = "Lab#{number} #{name} #{date_load}"
+  end
+
+  def to_hash
+    info_hash = {}
+    %i[number name date_load].each do |field|
+      info_hash[field] = send(field)
+    end
+    info_hash
+  end
+
+  def self.validate_is_date(); end
+
+
+
+end

data/lib/source/database_labs/lab_list.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class LabList
+  def initialize(data_adapter)
+    @data_adapter = data_adapter
+  end
+
+  def get_lab_by_id(id_lab); end
+  def add_lab(lab); end
+  def remove_lab(id_lab);end
+  def replace_lab(id_lab, lab); end
+  def get_lab_list; end #получение все лаб в базе
+end

data/lib/source/database_labs/student_lab.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require_relative 'lab'
+require_relative 'data_list_student_lab'
+class StudentLab
+  def initialize
+    self.db = DBUniversity.instance
+  end
+
+  def get_lab_by_number(id_lab)
+    hash = db.execute('SELECT * FROM labs WHERE number = ?', id_lab).first
+    return nil if hash.nil?
+    Lab.new(**hash.transform_keys(&:to_sym))
+  end
+  def add_lab(lab)
+    db.execute('insert into labs (number, name, date_load) VALUES (?, ?, ?)', *lab_fields(lab)).first
+  end
+  def remove_lab(id_lab)
+    db.execute('DELETE FROM labs WHERE number = ?', id_lab)
+  end
+  def replace_lab(id_lab, lab)
+    db.execute('UPDATE labs SET name=?, date_load=? WHERE number=?',*lab_fields(lab), id_lab)
+  end
+  def get_lab_list(data_list=nil) #получение все лаб в базе
+    labs_hash = db.prepare_exec('SELECT * FROM labs')
+    labs = labs_hash.map{|lab| Lab.new(**lab.transform_keys(&:to_sym))}
+
+    return DataListStudentLab.new(labs) if data_list.nil?
+    data_list.replace_objects(labs)
+    data_list
+  end
+
+  def get_next_number
+    lab_count+1
+  end
+
+  def lab_count
+    db.results_as_hash=false
+    res=db.execute("Select COUNT(*) from labs").first[0]
+    db.results_as_hash=true
+    res
+  end
+
+  private
+  attr_accessor :db
+  def lab_fields(lab)
+    [lab.number, lab.name, lab.date_load]
+  end
+end

data/lib/source/database_labs/student_lab_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require_relative 'student_lab'
+require_relative 'data_list_student_lab'
+class StudentLabController
+  def initialize(view)
+    @view = view
+    @data_list  = DataListStudentLab.new([])
+    @data_list.add_observer(@view)
+    @student_lab = StudentLab.new
+  end
+
+  def refresh_data
+    begin
+      @data_list = @student_lab.get_lab_list(@data_list)
+    rescue SQLite3::SQLException
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      api.call(0, "No connection to DB", "Error", 0)
+      exit(false)
+    end
+  end
+end

data/lib/source/database_labs/student_lab_db_adapter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class StudentLabDbAdapter
+  def initialize
+    self.client = DBUniversity.instance
+  end
+
+  def get_lab_by_id(id_lab); end
+  def add_lab(lab); end
+  def remove_lab(id_lab);end
+  def replace_lab(id_lab, lab); end
+  def get_lab_list; end #получение все лаб в базе
+end

data/lib/source/database_labs/tab_lab.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+require 'fox16'
+include Fox
+require_relative 'student_lab_controller'
+require_relative 'tab_student'
+class TabLab<FXVerticalFrame
+  def initialize(parent, *args, &blk)
+    super
+    @controller= StudentLabController.new(self)
+    add_table
+  end
+
+  def add_table
+    table_frame = FXVerticalFrame.new(self, :padLeft=>20)
+    # page_change_buttons(table_frame)
+    # Создаем таблицу
+    @table = FXTable.new(table_frame, :opts =>  TABLE_READONLY|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|TABLE_COL_SIZABLE|TABLE_ROW_RENUMBER, :width=>600, :height=>350)
+    @table.setTableSize(16, 3)
+
+    @table.setColumnText(0, "Номер")
+    @table.setColumnText(1, "Наименование")
+    @table.setColumnText(2, "Дата выдачи")
+
+    # Масштабируем таблицу
+    @table.setRowHeaderWidth(30)
+    # @table.setColumnWidth(0, 150)
+    @table.setColumnWidth(1, 300)
+    @table.setColumnWidth(2, 150)
+    add_crud(self)
+
+  end
+
+  def add_crud(parent)
+    #добавление кнопок
+    btn_list = FXHorizontalFrame.new(parent)
+    btn_add = FXButton.new(btn_list, "Добавить", :opts=>BUTTON_NORMAL)
+    btn_update = FXButton.new(btn_list, "Обновить", :opts=>BUTTON_NORMAL)
+    btn_change = FXButton.new(btn_list, "Изменить", :opts=>BUTTON_NORMAL)
+    btn_delete = FXButton.new(btn_list, "Удалить", :opts=>BUTTON_NORMAL)
+
+    btn_change.disable
+    btn_delete.disable
+
+    # Устанавливаем обработчик события SEL_CHANGED для таблицы
+    @table.connect(SEL_CHANGED) do
+      num_selected_rows = 0
+      (0...@table.getNumRows()).each { |row_index| num_selected_rows+=1 if @table.rowSelected?(row_index)}
+
+      # Если выделена только одна строка, кнопка должна быть неактивной
+      if num_selected_rows == 1
+        btn_change.enable
+        btn_delete.enable
+        # Если выделено несколько строк, кнопка должна быть активной
+      elsif num_selected_rows >1
+        btn_change.disable
+        btn_delete.enable
+      end
+    end
+
+    @table.getRowHeader.connect(SEL_RIGHTBUTTONPRESS) do
+      @table.killSelection(true)
+      btn_change.disable
+      btn_delete.disable
+    end
+
+
+    btn_update.connect(SEL_COMMAND) do
+      refresh
+    end
+  end
+  def refresh
+    @controller.refresh_data
+  end
+  def on_datalist_changed(table)
+    TabStudent.update_data_table(@table, table)
+  end
+
+end

data/lib/source/database_labs/tab_student.rb

@@ -0,0 +1,241 @@
+# frozen_string_literal: true
+require 'fox16'
+include Fox
+require_relative '../database/controller'
+class TabStudent<FXHorizontalFrame
+
+  def initialize(p, *args, &blk)
+    super
+    @students_on_page=5
+    @current_page=1
+    @count_student=0
+    @controller = StudentListController.new(self)
+    first_tab
+  end
+
+  def update_count_students(count_students)
+    @count_student = count_students
+    update_page_label
+  end
+
+  def self.update_data_table(table_self, new_table)
+    row_number=0
+    (0...table_self.getNumRows).each do |row|
+      (0...table_self.getNumColumns).each do |col|
+        table_self.setItemText(row, col, "")
+      end
+    end
+    new_table.each do |row|
+      (1..3).each { |index_field| table_self.setItemText(row_number, index_field-1, row[index_field].to_s)  }
+      row_number+=1
+    end
+  end
+
+  def on_datalist_changed(table)
+    TabStudent.update_data_table(@table, table)
+  end
+  def refresh
+    @controller.refresh_data(@current_page, @students_on_page)
+  end
+
+  def first_tab
+    add_filters
+    add_table
+  end
+
+  def add_filters
+    #filter
+    frame_filter = FXVerticalFrame.new(self, :padTop=>50)
+    frame_filter.resize(500,300)
+
+    field_filter =[[:git, 'Гит'], [:mail, 'Почта'], [:phone_number, 'Телефон'], [:telegram, 'Телеграм']]
+
+    #ФИЛЬТР ИМЕНИ
+    nameLabel = FXLabel.new(frame_filter, "Фамилия и инициалы")
+    name_text_field = FXTextField.new(frame_filter, 40)
+    @filter = {short_name: name_text_field}
+
+    #фильтрация для остальных полей
+    field_filter.each do |field|
+      @filter[field[0]] = create_radio_group(field, frame_filter)
+    end
+
+    #кнопка очистить
+    btn_clear = FXButton.new(frame_filter, "Очистить", :opts=>BUTTON_NORMAL)
+  end
+
+  def add_table
+    table_frame = FXVerticalFrame.new(self, :padLeft=>20)
+    page_change_buttons(table_frame)
+    # Создаем таблицу
+    @table = FXTable.new(table_frame, :opts =>  TABLE_READONLY|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|TABLE_COL_SIZABLE|TABLE_ROW_RENUMBER, :width=>580, :height=>320)
+    @table.setTableSize(@students_on_page, 3)
+
+    @table.setColumnText(0, "ФИО")
+    @table.setColumnText(1, "Git")
+    @table.setColumnText(2, "Контакт")
+
+    # Масштабируем таблицу
+    @table.setRowHeaderWidth(30)
+    @table.setColumnWidth(0, 150)
+    @table.setColumnWidth(1, 150)
+    @table.setColumnWidth(2, 200)
+
+    @table.getColumnHeader.connect(SEL_COMMAND) do |a, b,col|
+      sort_table_by_column(@table,col)
+    end
+
+    add_crud(table_frame)
+  end
+
+
+  #добавление кнопок добавить, изменить, обновить, удалить
+  def add_crud(parent)
+    #добавление кнопок
+    btn_list = FXHorizontalFrame.new(parent)
+    btn_add = FXButton.new(btn_list, "Добавить", :opts=>BUTTON_NORMAL)
+    btn_update = FXButton.new(btn_list, "Обновить", :opts=>BUTTON_NORMAL)
+    combo_change = FXComboBox.new(btn_list, 20, :opts=>  FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    # btn_change = FXButton.new(btn_list, "Изменить", :opts=>BUTTON_NORMAL)
+    btn_delete = FXButton.new(btn_list, "Удалить", :opts=>BUTTON_NORMAL)
+
+    combo_change.disable
+    btn_delete.disable
+
+    combo_change.appendItem("Изменить ФИО")
+    combo_change.appendItem("Изменить Git")
+    combo_change.appendItem("Изменить контакт")
+
+
+    # Устанавливаем обработчик события SEL_CHANGED для таблицы
+    @table.connect(SEL_CHANGED) do
+      num_selected_rows = 0
+      (0...@table.getNumRows()).each { |row_index| num_selected_rows+=1 if @table.rowSelected?(row_index)}
+
+      # Если выделена только одна строка, кнопка должна быть неактивной
+      if num_selected_rows == 1
+        combo_change.enable
+        btn_delete.enable
+        # Если выделено несколько строк, кнопка должна быть активной
+      elsif num_selected_rows >1
+        combo_change.disable
+        btn_delete.enable
+      end
+    end
+
+    @table.getRowHeader.connect(SEL_RIGHTBUTTONPRESS) do
+      @table.killSelection(true)
+      combo_change.disable
+      btn_delete.disable
+    end
+
+    btn_add.connect(SEL_COMMAND) do
+      @controller.student_add
+    end
+
+    btn_update.connect(SEL_COMMAND) do
+      refresh
+    end
+
+    combo_change.connect(SEL_COMMAND) do
+      index = (0...@table.getNumRows).find {|row_index| @table.rowSelected?(row_index)}
+      case combo_change.currentItem
+      when 0
+        @controller.student_change_name(index)
+      when 1
+        @controller.student_change_git(index)
+      when 2
+        @controller.student_change_contact(index)
+      end
+    end
+
+    btn_delete.connect(SEL_COMMAND) do
+      indexes = (0...@table.getNumRows).select{|row_index| @table.rowSelected?(row_index)}
+      @controller.student_delete(indexes)
+    end
+  end
+
+  #отображение страниц
+  def page_change_buttons(parent)
+    change_page = FXHorizontalFrame.new(parent, :opts=> LAYOUT_CENTER_X)
+    btn_back=FXButton.new(change_page, "Назад", :opts=> BUTTON_INITIAL)
+    btn_back.textColor = Fox.FXRGB(0,23,175)
+    #добавить отображение со страницы, на которой мы сейчас
+    @page_label = FXLabel.new(change_page, '1')
+    btn_next=FXButton.new(change_page, "Далее", :opts=> BUTTON_INITIAL)
+    btn_next.textColor = Fox.FXRGB(0,23,175)
+
+    btn_back.connect(SEL_COMMAND) do
+      if @current_page!=1
+        @current_page-=1
+        refresh
+        update_page_label
+      end
+    end
+    btn_next.connect(SEL_COMMAND) do
+      if @current_page<(@count_student / @students_on_page.to_f).ceil
+        @current_page+=1
+        refresh
+        update_page_label
+      end
+    end
+  end
+
+  def sort_table_by_column(table, column_index)
+    table_data = []
+    (0...table.getNumRows()).each do |row_index|
+      if table.getItemText(row_index, column_index)!=''
+        row=[]
+        (0...table.getNumColumns()).each do |col_index|
+          row[col_index] = table.getItemText(row_index, col_index)
+        end
+        table_data<<row
+      end
+    end
+    sorted_table_data = table_data.sort_by { |row_data| row_data[column_index] }
+    sorted_table_data.each_with_index do |row_data, row_index|
+      row_data.each_with_index do |cell_data, col_index|
+        table.setItemText(row_index, col_index, cell_data)
+      end
+    end
+  end
+  def create_radio_group(field, parent)
+    #Фильтрация гита
+    frame_field = FXVerticalFrame.new(parent, LAYOUT_FILL_X||LAYOUT_SIDE_TOP)
+    label_field = FXLabel.new(frame_field, field[1])
+    line_radio = FXHorizontalFrame.new(frame_field, LAYOUT_FILL_X|LAYOUT_SIDE_TOP)
+    # Создаем radiobutton
+    radio_yes = FXRadioButton.new(line_radio, "Да")
+    radio_no = FXRadioButton.new(line_radio, "Нет")
+    radio_no_matter = FXRadioButton.new(line_radio, "Не важно")
+    #фильтр
+    text_field = FXTextField.new(line_radio, 40)
+    #прописываем доступность
+    text_field.setEnabled(false)
+    radio_yes.connect(SEL_COMMAND) do
+      radio_no.check=false
+      radio_no_matter.check=false
+      if radio_yes.checked?
+        text_field.setEnabled(true)
+      end
+    end
+    radio_no.connect(SEL_COMMAND) do
+      radio_no_matter.check=false
+      radio_yes.check=false
+      if radio_no.checked?
+        text_field.setEnabled(false)
+      end
+    end
+    radio_no_matter.connect(SEL_COMMAND) do
+      radio_no.check=false
+      radio_yes.check=false
+      if radio_no_matter.checked?
+        text_field.setEnabled(false)
+      end
+    end
+    frame_field
+  end
+  def update_page_label
+    @page_label.text = "#{@current_page} / #{(@count_student / @students_on_page.to_f).ceil}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shanti555890
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Yana Galagan
@@ -53,6 +53,14 @@ files:
 - lib/source/database/update_git_controller.rb
 - lib/source/database/update_name_controller.rb
 - lib/source/database/window.rb
+- lib/source/database_labs/data_list_student_lab.rb
+- lib/source/database_labs/lab.rb
+- lib/source/database_labs/lab_list.rb
+- lib/source/database_labs/student_lab.rb
+- lib/source/database_labs/student_lab_controller.rb
+- lib/source/database_labs/student_lab_db_adapter.rb
+- lib/source/database_labs/tab_lab.rb
+- lib/source/database_labs/tab_student.rb
 - lib/source/strategy/student_list_base.rb
 - lib/source/strategy/student_list_json.rb
 - lib/source/strategy/student_list_strat.rb
@@ -65,6 +73,7 @@ files:
 - lib/source/update_controller.rb
 - lib/source/update_git_controller.rb
 - lib/source/update_name_controller.rb
+- shanti555890-1.1.4.gem
 - shanti555890.gemspec
 - sig/shanti555890.rbs
 homepage: https://github.com/YanaGalagan