rubbish_code 0.1.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704e3897e8f44aebbccd201679e9ecf8188969a0fa0e2e9df5e025dce7bf8cd5
-  data.tar.gz: 6fd1c258b63ba5079253bb0849f8ad66d689008691ac2a0b9da690abb51c95b5
+  metadata.gz: f803ff1bc99784c9ba272d7b7d392d37306ed4105495b9b615744eec533c6f1e
+  data.tar.gz: 744341824cbf7b0d0ec029697e2613f5a0388c330afec879170a90167fefccf7
 SHA512:
-  metadata.gz: 7c4dbf4065b011aaf46803956e843295f675e6851c2f834417effaf0dd244a6b4cf3045cecb6d27d0bbbd2d632710d676f186c2fe3227ac359e581dfb8c8ba24
-  data.tar.gz: 953b81ec8a65ff9d03fab491b798975a1749a10fbc3b988ab13e893b1d4c7d8d0cfac1ce6bc4405762de19b767d49eea544764afb629367049ec2bddc390e13a
+  metadata.gz: 652f89913823bcf31ab9ae1eac5720d2f766f982385f059ce43693c9c4b13ac5831d9abc6b58e5e0318898f2f65035dab7efec104decd9dfb47c972e4ea6f5be
+  data.tar.gz: 979143719ca13ac31daa84dcefa2419950c7e3254904c300ae38b50e34c8ac89b1dee20549e7847927da754ab2be56464377a28a4245712b72f34ddbda3398a0

data/lib/rubbish_code/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubbishCode
-  VERSION = "0.1.4"
+  VERSION = "1.1.0"
 end

data/lib/source/controllers/student_input_form/student_input_form_controller_create.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require './LabStudents/util/logger_holder'
+require 'source/util/logger_holder'
 require 'win32api'
 
 class StudentInputFormControllerCreate

data/lib/source/controllers/student_input_form/student_input_form_controller_edit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require './LabStudents/util/logger_holder'
+require 'source/util/logger_holder'
 require 'win32api'
 
 class StudentInputFormControllerEdit

data/lib/source/controllers/tab_students_controller.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require './LabStudents/views/main_window'
-require './LabStudents/repositories/student_repository'
-require './LabStudents/repositories/adapters/db_source_adapter'
-require './LabStudents/repositories/containers/data_list_student_short'
-require './LabStudents/views/student_input_form'
-require './LabStudents/controllers/student_input_form/student_input_form_controller_create'
-require './LabStudents/controllers/student_input_form/student_input_form_controller_edit'
-require './LabStudents/util/logger_holder'
+require 'source/views/main_window'
+require 'source/repositories/student_repository'
+require 'source/repositories/adapters/db_source_adapter'
+require 'source/repositories/containers/data_list_student_short'
+require 'source/views/student_input_form'
+require 'source/controllers/student_input_form/student_input_form_controller_create'
+require 'source/controllers/student_input_form/student_input_form_controller_edit'
+require 'source/util/logger_holder'
 require 'win32api'
 
 class TabStudentsController

data/lib/source/repositories/adapters/db_source_adapter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require './LabStudents/repositories/data_sources/db_data_source'
-require './LabStudents/models/student'
-require './LabStudents/models/student_short'
-require './LabStudents/repositories/containers/data_list_student_short'
+require 'source/repositories/data_sources/db_data_source'
+require 'source/models/student'
+require 'source/models/student_short'
+require 'source/repositories/containers/data_list_student_short'
 
 class DBSourceAdapter
   def initialize

data/lib/source/repositories/containers/data_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require './LabStudents/repositories/containers/data_table'
+require 'source/repositories/containers/data_table'
 
 class DataList
   # Это "абстрактный" класс

data/lib/source/repositories/data_sources/db_data_source.rb

@@ -7,7 +7,8 @@ class DBDataSource
   @instance_mutex = Mutex.new
 
   def initialize
-    db_config = YAML.load_file('./LabStudents/db_config/config.yaml').transform_keys(&:to_sym)
+    #тут изменить путь к своему конфигу
+    db_config = YAML.load_file('C:/Users/jakep/GitHub/Ruby_Moment/LabStudents/db_config/config.yaml').transform_keys(&:to_sym)
     @client = Mysql2::Client.new(db_config)
     @client.query_options.merge!(symbolize_keys: true)
   end

data/lib/source/repositories/data_sources/file_data_source.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require './LabStudents/models/student'
-require './LabStudents/models/student_short'
-require './LabStudents/repositories/containers/data_list_student_short'
+require 'source/models/student'
+require 'source/models/student_short'
+require 'source/repositories/containers/data_list_student_short'
 
 class FileDataSource
   attr_writer :data_transformer

data/lib/source/views/main_window.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require_relative 'tab_students'
+
+class MainWindow
+  include Glimmer
+
+  def initialize
+    @view_tab_students = TabStudents.new
+  end
+
+  def create
+    window('Универ', 900, 200) {
+      tab {
+        tab_item('Студенты') {
+          @view_tab_students.create
+        }
+
+        tab_item('Вкладка 2') { }
+        tab_item('Вкладка 3') { }
+      }
+    }
+  end
+end

data/lib/source/views/student_input_form.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'source/controllers/student_input_form/student_input_form_controller_create'
+require 'source/models/student_base'
+require 'source/controllers/tab_students_controller'
+require 'win32api'
+
+class StudentInputForm
+  include Glimmer
+
+  def initialize(controller, existing_student = nil)
+    @existing_student = existing_student.to_hash unless existing_student.nil?
+    @controller = controller
+    @entries = {}
+  end
+
+  def on_create
+    @controller.on_view_created
+  end
+
+  def create
+    @root_container = window('Универ', 300, 150) {
+      resizable false
+
+      vertical_box {
+        @student_form = form {
+          stretchy false
+
+          fields = [[:last_name, 'Фамилия', false], [:first_name, 'Имя', false], [:father_name, 'Отчество', false], [:git, 'Гит', true], [:telegram, 'Телеграм', true], [:email, 'Почта', true], [:phone, 'Телефон', true]]
+
+          fields.each do |field|
+            @entries[field[0]] = entry {
+              label field[1]
+            }
+          end
+        }
+
+        button('Сохранить') {
+          stretchy false
+
+          on_clicked {
+            values = @entries.transform_values { |v| v.text.force_encoding("utf-8").strip }
+            values.transform_values! { |v| v.empty? ? nil : v}
+
+            @controller.process_fields(values)
+            @controller.refresh()
+          }
+        }
+      }
+    }
+    on_create
+    @root_container
+  end
+
+  def set_value(field, value)
+    return unless @entries.include?(field)
+
+    @entries[field].text = value
+  end
+
+  def make_readonly(*fields)
+    fields.each do |field|
+      @entries[field].read_only = true
+    end
+  end
+
+  def close
+    @root_container.destroy
+  end
+end

data/lib/source/views/tab_students.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'source/controllers/tab_students_controller'
+require 'source/views/student_input_form'
+
+class TabStudents
+  include Glimmer
+
+  STUDENTS_PER_PAGE = 20
+
+  def initialize
+    @controller = TabStudentsController.new(self)
+    @current_page = 1
+    @total_count = 0
+  end
+
+  def on_create
+    @controller.on_view_created
+    @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+  end
+
+  # Метод наблюдателя datalist
+  def on_datalist_changed(new_table)
+    arr = new_table.to_2d_array
+    arr.map do |row|
+      row[3] = [row[3][:value], contact_color(row[3][:type])] unless row[3].nil?
+    end
+    @table.model_array = arr
+  end
+
+  def update_student_count(new_cnt)
+    @total_count = new_cnt
+    @page_label.text = "#{@current_page} / #{(@total_count / STUDENTS_PER_PAGE.to_f).ceil}"
+  end
+
+  def contact_color(type)
+    case type
+    when 'telegram'
+      '#00ADB5'
+    when 'email'
+      '#F08A5D'
+    when 'phone'
+      '#B83B5E'
+    else
+      '#000000'
+    end
+  end
+
+  def create
+    root_container = horizontal_box {
+      # Секция 1
+      vertical_box {
+        stretchy false
+
+        form {
+          stretchy false
+
+          @filter_last_name_initials = entry {
+            label 'Фамилия И. О.'
+          }
+
+          @filters = {}
+          fields = [[:git, 'Гит'], [:email, 'Почта'], [:phone, 'Телефон'], [:telegram, 'Телеграм']]
+
+          fields.each do |field|
+            @filters[field[0]] = {}
+
+            @filters[field[0]][:combobox] = combobox {
+              label "#{field[1]} имеется?"
+              items ['Не важно', 'Есть', 'Нет']
+              selected 0
+
+              on_selected do
+                if @filters[field[0]][:combobox].selected == 1
+                  @filters[field[0]][:entry].read_only = false
+                else
+                  @filters[field[0]][:entry].text = ''
+                  @filters[field[0]][:entry].read_only = true
+                end
+              end
+            }
+
+            @filters[field[0]][:entry] = entry {
+              label field[1]
+              read_only true
+            }
+          end
+        }
+      }
+
+      # Секция 2
+      vertical_box {
+        @table = refined_table(
+          table_editable: false,
+          filter: lambda do |row_hash, query|
+            utf8_query = query.force_encoding("utf-8")
+            row_hash['Фамилия И. О'].include?(utf8_query)
+          end,
+          table_columns: {
+            '#' => :text,
+            'Фамилия И. О' => :text,
+            'Гит' => :text,
+            'Контакт' => :text_color
+          },
+          per_page: STUDENTS_PER_PAGE
+        )
+
+        @pages = horizontal_box {
+          stretchy false
+
+          button("<") {
+            stretchy true
+
+            on_clicked do
+              @current_page = [@current_page - 1, 1].max
+              @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+            end
+
+          }
+          @page_label = label("...") { stretchy false }
+          button(">") {
+            stretchy true
+
+            on_clicked do
+              @current_page = [@current_page + 1, (@total_count / STUDENTS_PER_PAGE.to_f).ceil].min
+              @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+            end
+          }
+        }
+      }
+
+      # Секция 3
+      vertical_box {
+        stretchy false
+
+        button('Добавить') {
+          stretchy false
+
+          on_clicked {
+            @controller.show_modal_add
+          }
+        }
+        button('Изменить') {
+          stretchy false
+
+          on_clicked {
+            @controller.show_modal_edit(@current_page, STUDENTS_PER_PAGE, @table.selection) unless @table.selection.nil?
+          }
+        }
+        button('Удалить') {
+          stretchy false
+
+          on_clicked {
+            @controller.delete_selected(@current_page, STUDENTS_PER_PAGE, @table.selection) unless @table.selection.nil?
+            @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+          }
+        }
+        button('Обновить') {
+          stretchy false
+
+          on_clicked {
+            @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+          }
+        }
+      }
+    }
+    on_create
+    root_container
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubbish_code
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Jake Epps
@@ -61,6 +61,9 @@ files:
 - lib/source/repositories/data_sources/transformers/data_transformer_yaml.rb
 - lib/source/repositories/student_repository.rb
 - lib/source/util/logger_holder.rb
+- lib/source/views/main_window.rb
+- lib/source/views/student_input_form.rb
+- lib/source/views/tab_students.rb
 - rubbish_code.gemspec
 - sig/ribbish_code.rbs
 homepage: https://github.com/Jakepps/Ruby_Moment