mc_gem2 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb0ce2125dea894f4713dccebb8e600ea036e2e0f9a709306acc3f3982022db
-  data.tar.gz: 31a4e3c9ac35a7ad5c4e4f9820346ea10eba2fc364f599e9e5ede3ac3c82b3f1
+  metadata.gz: e75f47bcad95e968d7708841cfb3850e30db97ebd5150c0a235b2bbac5082b4b
+  data.tar.gz: e12bf481d5c645ccceb462bfc11abb8d6174487ae54dbb92eb8fc92f3d74c7b9
 SHA512:
-  metadata.gz: 96381cb683307ef92e534b6de90cb680c155c75922a93b78add2967a8557256b2933e099df03e6b945dd615568babccbc1d5afd4e8a1c6a5d513d59f3f65b4c5
-  data.tar.gz: 2a80019eef3d84787f0e4436d31035b43c0cd4c0b8f1a962f6cddfe2357f9f773744c57882b823ccb98aecdc7856c42e3f1b90674781da2683a8b214bb8b8e32
+  metadata.gz: c8630a04ffe2a80ffd100d3d2f46707976d8aeb9deb9d614cae7563b9eb931fb59b5f8958ccf254ced541bbbd0f9a073877e62f53a7062a833b34031c2d56643
+  data.tar.gz: 578e34d8c52fba5ddd45c942fb70cdb87eab844434007b1fde63876a5aaa349623cbeff807bab66457c34493d90d106b7c59b2cd3625aecfac0b8fc79e4aa0d6

data/lib/mc_gem2/version.rb

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

data/lib/mc_gem2.rb

@@ -3,8 +3,11 @@
 require_relative "mc_gem2/version"
 
 module McGem2
-  Dir[File.dirname(__FILE__) + '/source/*.rb'].each { |file|
+  Dir[File.dirname(__FILE__) + 'source/*.rb'].each { |file|
     puts file
     require file
   }
+  Dir[File.dirname(__FILE__) + 'source/**/*.rb'].each { |file|
+    require file
+  }
 end

data/lib/source/student_input_form.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require_relative '../Gem_fuss/lib/source/roller'
+require_relative '../Gem_fuss/lib/source/StudentBase'
+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], [:parental_name, 'Отчество', false], [:git, 'Гит', true], [:telegram, 'Телеграм', true], [:email, 'Почта', true], [:phone, 'Телефон', true]]
+
+          fields.each do |field|
+            @entries[field[0]] = entry {
+              label field[1]
+              text @existing_student[field[0]] unless @existing_student.nil?
+
+              read_only field[2] unless @existing_student.nil?
+            }
+          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/student_list_controller.rb

@@ -3,13 +3,14 @@
 # frozen_string_literal: true
 require_relative 'student_list_adv'
 require_relative 'student_list_adapter'
-require_relative 'database/students_db'
+require_relative 'student_list_db'
 require_relative 'Converter_json'
 require_relative 'Converter'
 require_relative 'Student_list'
 require_relative 'student_edit_form_controller'
 require 'win32api'
 require 'mysql2'
+require 'mc_gem2'
 require_relative 'logger_holder'
 class StudentListController
   def initialize(view)

data/lib/source/{database/students_db.rb → students_db.rb}

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 # #encoding: UTF-8
 require 'mysql2'
-require_relative '../Data_list_student_short'
-require_relative '../Data_list'
-require_relative '../Student'
-require_relative '../Student_short'
+require 'mc_gem2'
 class StudentDB
 
   attr_accessor :db_connection
@@ -14,12 +11,12 @@ class StudentDB
     self.db_connection.query('CREATE DATABASE IF NOT EXISTS stud_db')
     self.db_connection.query('USE stud_db')
     self.db_connection.query('DROP TABLE IF EXISTS student')
-    self.db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/database/scripts/create_table.sql'))
+    self.db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/create_table.sql'))
     self.insert_data
   end
 
   def insert_data
-    db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/database/scripts/insert_data.sql'))
+    db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/insert_data.sql'))
   end
 
   def select_by_id(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mc_gem2
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - papaSquid
@@ -50,16 +50,18 @@ files:
 - lib/source/StudentBase.rb
 - lib/source/Student_list.rb
 - lib/source/Student_short.rb
-- lib/source/database/scripts/create_table.sql
-- lib/source/database/scripts/insert_data.sql
-- lib/source/database/student_list_db.rb
-- lib/source/database/students_db.rb
+- lib/source/create_table.sql
+- lib/source/insert_data.sql
 - lib/source/logger_holder.rb
 - lib/source/student_edit_form_controller.rb
+- lib/source/student_input_form.rb
 - lib/source/student_input_form_controller.rb
 - lib/source/student_list_adapter.rb
 - lib/source/student_list_adv.rb
 - lib/source/student_list_controller.rb
+- lib/source/student_list_db.rb
+- lib/source/students_db.rb
+- mc_gem2-1.1.4.gem
 - mc_gem2.gemspec
 - sig/mc_gem2.rbs
 homepage: https://github.com/KiTTeNqz/RubyLabs