mvcStudentXD 0.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c85e24e0f4472cee6a1a943cd1a2f823ec331950b233a8f0a8e215c6abe0446
-  data.tar.gz: 3b5c12e96488be86df0f2a3e2bd1b3c623db04763b579c59d013d0c2fae9a326
+  metadata.gz: 5edf4f3f16bbfe82ed1302ffd8ec980a7cc0531faac61609e3cd2ae2b8abbeeb
+  data.tar.gz: d621edb76de6e5c4b7b3f27798e428fa8ba571f25a6e90408d27a8eef24923c4
 SHA512:
-  metadata.gz: 84c75d83870ef1e21e9595f6592d7c73d6d96ae2a56b9050ee09a9d2801af0015373897e0915117d6527c6f1fb2d9a5b289248d4e23fba788d89ad4376983404
-  data.tar.gz: 560303d9b1ea449470212b9f583fd2d7b7ad5ad0e63471dcf3ee4d3ff851e8e71e37098f52dc2ff6377e2e46c5247c14e3fb9ce54ce5aa88e6c3867e79353735
+  metadata.gz: c59b1615e8e6f6255f071690609df5ccb14ab45b18c42a75fc656a2fac4df5314de05bb1e2fd0eb4efc998a3973e554cb680610125b675801f46d4ff1abd3f0a
+  data.tar.gz: 710895761936a9a5c215a39931872661ca8ddfb9537565ba8ef63736f8d3548b1a5691539d528b1789def5abb93157b806b114e08b51dbee1fa375a56de390ba

data/Gemfile

@@ -15,4 +15,8 @@ gem "mysql2"
 
 gem "glimmer-dsl-libui", '~> 0.7.4'
 
-gem 'win32api'
+gem 'win32api'
+
+gem 'sinatra', '~> 3.0', '>= 3.0.6'
+
+gem 'thin', '~> 1.8', '>= 1.8.2'

data/lib/Student_list.rb

@@ -0,0 +1,65 @@
+class StudentList
+  private
+	attr_accessor :students, :gen_id, :typer
+
+  public
+	def initialize(typer)
+		self.students = []
+		self.gen_id = students.count + 1
+		self.typer = typer
+	end
+
+	def read_file(file_path)
+		raise ArgumentError.new("File not found #{file_path}") unless File.file?(file_path)
+		hash_students = typer.read_file(File.read(file_path))
+		self.students = hash_students.map{|h| Student.from_hash(h)}
+		nextId
+	end
+
+	def write_file(file_path)
+		hash_students = students.map(&:to_hash)
+		File.write(file_path, typer.write_file(hash_students))
+	end
+
+	def get_student(stud_id)
+		students.find{|s| s.id == stud_id}
+	end
+
+	def sorted
+		students.sort_by(&:fio)
+	end
+
+	def add_student(student)
+		students << student
+		student.id = gen_id
+		nextId
+	end
+
+	def get_students_pag(k,n,existing_data = nil)
+		skip = (k-1) * n
+		new_data = students[skip, n].map{|s| StudentShort.from_student_class(s)}
+
+		return DataListStudentShort.new(new_data) if existing_data.nil?
+
+		existing_data.replace_objects(new_data)
+		existing_data
+	end
+
+	def replace_student(student_id, student)
+		idx = student.find{|s| s.id==student.id}
+		self.students[idx]=student
+	end
+
+	def remove_student(student_id)
+		self.students.reject! {|s| s.id==student_id}
+	end
+
+  def count
+		self.students.count
+	end
+
+	def nextId
+		self.gen_id=students.max_by(&:id).id + 1
+	end
+
+end

data/lib/adapters/student_list_adapter.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+require_relative '../Student_list'
+class StudentsListAdapter
+  private_class_method :new
+  def get_student(id)
+  end
+
+  def remove_student(id)
+  end
+
+  def replace_student(id, student)
+  end
+
+  def get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+  end
+
+  def count
+  end
+end
+
+class StudentsListDBAdapter < StudentsListAdapter
+  private
+  attr_accessor :database_list
+
+  public_class_method :new
+  
+  public
+  def initialize(database_list)
+    self.database_list = database_list
+  end
+
+  def get_student(id)
+    database_list.get_student(id)
+  end
+
+  def remove_student(id)
+    database_list.remove_student(id)
+  end
+
+  def replace_student(id, student)
+    database_list.replace_student(id, student)
+  end
+
+  def get_students_pag(from, to, data)
+    database_list.get_students_pag(from, to, data)
+  end
+
+  def add_student(student)
+    database_list.add_student(student)
+  end
+
+  def count
+    database_list.count
+  end
+end
+
+class StudentsListConverterAdapter < StudentsListAdapter
+  private
+  attr_accessor :file_list
+
+  public_class_method :new
+  
+  public
+  def initialize(file_list, filename)
+    self.file_list = file_list
+    self.file_list.read_file(filename)
+  end
+
+  def get_student(id)
+    file_list.get_student(id)
+  end
+
+  def remove_student(id)
+    file_list.remove_student(id)
+  end
+
+  def replace_student(id, student)
+    file_list.replace_student(id, student)
+  end
+
+  def get_students_pag(k, n, data=nil)
+    file_list.get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+    file_list.add_student(student)
+  end
+
+  def count
+    file_list.count
+  end
+end

data/lib/containers/Data_list.rb

@@ -0,0 +1,66 @@
+class DataList
+	private_class_method :new
+
+	attr_accessor :selected_num, :objects
+
+	def initialize(*elems)
+		self.objects = elems
+		@listeners = []
+	end
+
+	def add_listener(listener)
+		@listeners << listener
+	end
+
+	def remove_listener(listener)
+		@listeners.delete(listener)
+	end
+
+	def notify
+		@listeners.each { |lst| lst.on_datalist_changed(data_table) }
+	end
+
+	def select_element(number)
+		self.selected_num = number < objects.size ? number : nil
+	end
+
+	def selected_id
+		objects[selected_num].id
+	end
+
+	def get_names
+		self.objects.first.instance_variables.map{|v| v.to_s[1..-1]}
+	end
+
+	def table_fields(_obj)
+		[]
+	end
+
+	def data_table
+		result = []
+		counter = 0
+		objects.each do |obj|
+			row = []
+			row << counter
+			row.push(*table_fields(obj))
+			result << row
+			counter += 1
+		end
+		DataTable.new(result)
+	end
+
+	def append(new_data)
+		self.objects.append(new_data)
+	end
+
+	def replace_objects(objects)
+		self.objects = objects.dup
+		notify
+	end
+
+	private
+	def instance_variables_wout_id(object)
+		object.instance_variables.reject{|v| v.to_sym ==:@id}.map{|v| object.instance_variable_get(v)}
+	end
+
+end

data/lib/containers/Data_list_student_short.rb

@@ -0,0 +1,17 @@
+require_relative '../model/Student_short'
+require_relative '../containers/Data_table'
+require_relative 'Data_list'
+class  DataListStudentShort < DataList
+
+	public_class_method :new
+
+	def get_names
+		['Фамилия И.О.','Гит','Контакт']
+	end
+
+
+	def table_fields(obj)
+		[obj.fio, obj.git, obj.contact]
+	end
+
+end

data/lib/containers/Data_table.rb

@@ -0,0 +1,25 @@
+class DataTable
+
+	attr_accessor :data
+
+	def initialize(data)
+		self.data = data
+	end
+
+	def get_cell(row,col)
+		self.data[row][col]
+	end
+
+	def num_columns
+		self.data[0].length
+	end
+
+	def num_rows
+		self.data.length
+	end
+
+	def to_2d_array
+		data.dup
+	end
+
+end

data/lib/converters/Converter.rb

@@ -0,0 +1,11 @@
+class Converter
+	private_class_method :new
+
+	def read_file(file_content)
+		raise NotImplementedError, 'Abstract class!'
+	end
+
+	def write_file(hash_students)
+		raise NotImplementedError, 'Abstract class!'
+	end
+end

data/lib/converters/Converter_json.rb

@@ -0,0 +1,14 @@
+require 'json'
+require_relative '../converters/Converter'
+class ConverterJSON < Converter
+	public_class_method :new
+
+	def read_file(file_content)
+		JSON.parse(file_content, {symbolize_names: true})
+	end
+
+	def write_file(hash_students)
+		JSON.pretty_generate(hash_students)
+	end
+
+end

data/lib/converters/Converter_txt.rb

@@ -0,0 +1,26 @@
+require_relative '../verter'
+class ConverterTxt < Converter
+	public_class_method :new
+
+	def read_file(data)
+		result = []
+		file_content = data.split("\n")
+		file_content.each do |line|
+			hash = {}
+			puts(line)
+			pairs = line.split(',').map{|pair| pair.gsub(/\s+/, '').split(':')}
+			pairs.each do |pair|
+				hash[pair[0].to_sym]=(pair[0]=="id") ? pair[1].to_i : pair[1]
+			end
+			result << hash
+		end
+		result
+	end
+
+	def write_file(hash_students)
+		string_arr = hash_students.map do |hash|
+			hash.map{|k,v| "#{k}:#{v}"}.join(',')
+		end.join("\n")
+	end
+
+end

data/lib/converters/Converter_yaml.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+require_relative '../verter'
+class ConverterYAML < Converter
+	public_class_method :new
+	
+	def read_file(file_content)
+		YAML.safe_load(file_content).map{ |h| h.transform_keys(&:to_sym)}
+	end
+
+	def write_file(hash_students)
+		YAML.dump(hash_students.map{ |h| h.transform_keys(&:to_s)})
+	end
+
+end

data/lib/database/scripts/create_table.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS student(
+    id INT NOT NULL auto_increment PRIMARY KEY,
+    last_name CHAR(255) NOT NULL,
+    first_name CHAR(255) NOT NULL,
+    parental_name CHAR(255) NOT NULL,
+    git CHAR(255),
+    phone CHAR(255),
+    email CHAR(255),
+    telegram CHAR(255)
+);

data/lib/database/scripts/insert_data.sql

@@ -0,0 +1,4 @@
+INSERT INTO student (last_name, first_name, parental_name, git, phone, email, telegram) VALUES
+    ROW("Худокормов", "Дмитрий", "Александрович", "@KiTTeNqz", NULL, NULL, "@KiTTeNqzi"),
+    ROW("Александров", "Александр", "Александрович", "@AleXxx", "89094494499", NULL, NULL),
+    ROW("Ермаков", "Ермак", "Ермакович", "@yaErmak1", NULL, "ERMAK@yandex.ru", NULL)

data/lib/database/student_list_db.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require_relative './students_db.rb'
+
+class StudentListDB
+  attr_accessor :database
+
+  @@instance = nil
+
+  def self.instance
+    @@instance ||= StudentListDB.new
+  end
+
+
+  def initialize
+    self.database = StudentDB.new()
+  end
+
+  def get_student(id)
+    Student.from_hash(database.select_by_id(id).transform_keys(&:to_sym))
+  end
+
+  def remove_student(id)
+    database.remove_by_id(id)
+  end
+
+  def replace_student(id, student)
+    database.replace_by_id(id, student)
+  end
+
+  def add_student(student)
+    database.add_student(student.to_hash)
+  end
+
+  def get_students_pag(k, n, data)
+    database.get_students_pag(k, n, data)
+  end
+
+  def count
+    database.count
+  end
+end

data/lib/database/students_db.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+# #encoding: UTF-8
+require 'mysql2'
+require_relative '../containers/Data_list_student_short'
+require_relative '../containers/Data_list'
+require_relative '../model/Student'
+require_relative '../model/Student_short'
+class StudentDB
+
+  attr_accessor :db_connection
+
+  def initialize
+    self.db_connection = Mysql2::Client.new(:host => "localhost", :username => "dimas", :password => "qwe123")
+    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('C:/Users/Dmitry/RubymineProjects/RubyLabs/mvcStudentXD/lib/database/scripts/create_table.sql'))
+    self.insert_data
+  end
+
+  def insert_data
+    db_connection.query(File.read('C:/Users/Dmitry/RubymineProjects/RubyLabs/mvcStudentXD/lib/database/scripts/insert_data.sql'))
+  end
+
+  def select_by_id(id)
+    db_connection.query("SELECT * FROM student WHERE id = #{id}").map{|x| x}[0]
+  end
+
+  def remove_by_id(id)
+    db_connection.query("DELETE FROM student WHERE id = #{id}")
+  end
+
+ def parseNil(attr)
+    if attr == nil
+      "NULL"
+    else
+      attr
+    end
+  end
+
+  def add_student(student_data)
+
+    db_connection.query("""
+        INSERT INTO student (last_name, first_name, parental_name, git, phone, email, telegram) VALUES
+        ROW(
+            \"#{parseNil(student_data[:last_name])}\",
+            \"#{parseNil(student_data[:first_name])}\",
+            \"#{parseNil(student_data[:parental_name])}\",
+            \"#{parseNil(student_data[:git])}\",
+            \"#{parseNil(student_data[:phone])}\",
+            \"#{parseNil(student_data[:email])}\",
+            \"#{parseNil(student_data[:telegram])}\"
+        )
+        """)
+  end
+
+  def replace_by_id(id, student_data)
+    self.remove_by_id(id)
+    self.add_student(student_data.to_hash)
+  end
+
+  def get_students_pag(k, n, existing_data = nil)
+    rows = db_connection.query("SELECT * FROM student ORDER BY id LIMIT #{n} OFFSET #{(k-1)*n}")
+    data_list = DataListStudentShort.new
+    rows.each do |row|
+      row_sym = row.transform_keys{|key| key.to_sym}
+      data_list.append(StudentShort.from_student_class(Student.from_hash(row_sym)))
+    end
+    return data_list if existing_data.nil?
+    existing_data.replace_objects(data_list.objects)
+    existing_data
+  end
+
+  def count
+    result = db_connection.query("SELECT count(*) FROM student")
+    result.first.values.first
+  end
+
+end

data/lib/model/Student.rb

@@ -0,0 +1,106 @@
+require 'json'
+require_relative '../model/StudentBase'
+class Student < StudentBase
+
+	public_class_method :new
+	attr_writer :id
+	public
+	attr_reader :last_name, :first_name, :parental_name, :id, :phone, :git, :telegram, :email
+
+	def initialize(last_name, first_name, parental_name, options = {})
+		super(last_name, first_name, parental_name)
+		self.id = options[:id]
+		self.phone = options[:phone]
+		self.git = options[:git]
+		self.telegram = options[:telegram]
+		self.email = options[:email]
+	end
+
+	def to_s
+		[
+			"#{last_name} #{first_name} #{parental_name}",
+			id ? "id: #{id}" : nil,
+			git ? "git: #{git}" : nil,
+			phone ? "phone: #{phone}" : nil,
+			telegram ? "telegram: #{telegram}" : nil,
+			email ? "email: #{email}" : nil
+		].compact.join(' ')
+	end
+
+	#Setters
+	def phone=(phone)
+		raise ArgumentError, "ERROR phone=#{phone}" unless phone.nil? || StudentBase.validate_phone?(phone)
+		@phone = phone
+	end
+
+	def telegram=(tg_name)
+		raise ArgumentError, "ERROR telegram=#{tg_name}" unless telegram.nil? || StudentBase.validate_git_tg?(tg_name)
+		@telegram=tg_name
+	end
+
+	def git=(git_name)
+		raise ArgumentError, "ERROR git=#{git_name}" unless git.nil? || StudentBase.validate_git_tg?(git_name)
+		@git=git_name
+	end
+
+	def email=(email1)
+		raise ArgumentError, "ERROR email=#{email1}" unless email.nil? || StudentBase.validate_email?(email1)
+		@email=email1
+	end
+
+	def set_contacts(contacts={})
+		self.phone=contacts[:phone]
+		self.telegram=contacts[:telegram]
+		self.email=contacts[:email]
+	end
+
+	def self.from_str(string)
+		stud = string.split(',')
+				.map{|v| v.split(':')}
+				.map{|v| [v[0].to_sym, v[1]]}
+				.to_h
+		last_name, first_name, parental_name = stud[:fio].split(' ')
+		Student.new(last_name, first_name, parental_name, stud)
+	end
+
+	def self.from_hash(hash)
+		raise ArgumentError,"Missing req fields" unless hash.key?(:last_name) && hash.key?(:first_name) && hash.key?(:parental_name)
+		#переделал этот метод после тестов. Теперь вынимаю обязательные параметры из хэша, не удаляя из него
+		Student.new(hash[:last_name], hash[:first_name], hash[:parental_name], hash)
+	end
+
+	def get_short_fio
+		"fio:#{last_name} #{first_name[0]}. #{parental_name[0]}."
+	end
+
+
+	def get_short_contact
+		contact = %i[telegram phone email].find{|cont| send(cont)}
+		{type: contact, val: send(contact)} if contact
+	end
+
+	def get_git
+		"git:#{git}"
+	end
+
+	def get_info
+		"#{get_short_fio},#{get_short_contact[:type]}:#{get_short_contact[:val]},#{get_git}"
+	end
+
+	def get_info_hash
+		info={}
+		info[:fio] = get_short_fio
+		info[:contact] = get_short_contact
+		info[:git] = git
+		info
+	end
+
+	def to_hash
+		fields = {}
+		%i[last_name first_name parental_name id phone git telegram email].each do |field|
+			field_val = send(field)
+			fields[field] = field_val unless field_val.nil?
+		end
+		fields
+	end
+end

data/lib/model/StudentBase.rb

@@ -0,0 +1,50 @@
+require 'json'
+class StudentBase
+	private_class_method :new
+
+	def self.validate_phone?(phone)
+		return phone.match(/^\+?[7,8] ?\(?\d{3}\)? ?\d{3}-?\d{2}-?\d{2}$/)
+	end
+
+	def self.validate_email?(email)
+		return email.match(/^[A-Za-z0-9\-_]+@[A-Za-z]+(\.[A-Za-z]+)?\.[A-Za-z]+$/)
+	end
+
+	def self.validate_git_tg?(acc_name)
+		return acc_name.match(/^@[A-Za-z0-9\-_]+$/)
+	end
+
+	def self.validate_name?(prof_name)
+		return prof_name.match(/(^[А-Я][а-я]+$)|(^[A-Z][a-z]+$)/)
+	end
+
+	def valid_cont?
+		!email.nil? || !telegram.nil? || !phone.nil?
+	end
+
+	def validate?
+		!git.nil? && valid_cont?
+	end
+
+	def initialize(last_name, first_name, parental_name)
+		self.last_name = last_name
+		self.first_name = first_name
+		self.parental_name = parental_name
+	end
+
+	def first_name=(first_name1)
+		raise ArgumentError, "ERROR first_name=#{first_name1}" unless StudentBase.validate_name?(first_name1)
+		@first_name=first_name1
+	end
+
+	def last_name=(last_name1)
+		raise ArgumentError, "ERROR last_name=#{last_name1}" unless StudentBase.validate_name?(last_name1)
+		@last_name=last_name1
+	end
+
+	def parental_name=(parental_name1)
+		raise ArgumentError, "ERROR parental_name=#{parental_name1}" unless StudentBase.validate_name?(parental_name1)
+		@parental_name=parental_name1
+	end
+
+end

data/lib/model/Student_short.rb

@@ -0,0 +1,39 @@
+require_relative '../model/StudentBase'
+class StudentShort < StudentBase
+
+	public_class_method :new
+
+	#У нас уже есть некоторые гет\сет в базе, зачем же ещё?
+	private
+	attr_writer :fio, :contact, :git, :id
+
+	public
+	attr_reader :fio, :contact, :git, :id
+
+	def self.from_student_class(student)
+		StudentShort.new(student.id, student.get_info)
+	end
+
+	def initialize(id, str)
+		info_short = str.split(',')
+						.map{|x| x.split(':')}
+						.map{|x| [x[0].to_sym, x[1]]}
+						.to_h
+		raise ArgumentError, 'Missing fields: fio' if info_short[:fio].nil?
+		print(info_short)
+		self.id=id
+		self.fio = info_short[:fio]
+		self.git = info_short[:git]
+		info_short.delete_if{|k,v| k==:fio||k==:git}
+		self.contact = info_short.values.first
+	end
+
+
+	def to_s
+
+		[
+			"#{id}, #{fio}, #{git}, #{contact}"
+		].compact.join(' ')
+	end
+	
+end

data/lib/mvcStudentXD/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MvcStudentXD
-  VERSION = "0.1.0"
+  VERSION = "1.1.1"
 end

data/lib/student_edit_form_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
+class StudentEditFormController
+  def initialize(parent_controller, existing_student_id)
+    @parent_controller = parent_controller
+    @existing_student_id = existing_student_id
+    LoggerHolder.instance.debug('StudentEditFormController: initialized')
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+  def refresh
+    @parent_controller.refresh_data(1,20)
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
+    end
+    @existing_student = @student_list.get_student(@existing_student_id)
+
+    @view.make_readonly(:git, :telegram, :email, :phone)
+    populate_fields(@existing_student)
+  end
+
+  def populate_fields(student)
+    @view.set_value(:last_name, student.last_name)
+    @view.set_value(:first_name, student.first_name)
+    @view.set_value(:parental_name, student.parental_name)
+    @view.set_value(:git, student.git)
+    @view.set_value(:telegram, student.telegram)
+    @view.set_value(:email, student.email)
+    @view.set_value(:phone, student.phone)
+    print("IM IN Populate EDIT")
+  end
+
+  def process_fields(fields)
+    begin
+      new_student = Student.from_hash(fields)
+      @student_list.replace_student(@existing_student_id, new_student)
+      LoggerHolder.instance.debug('StudentEditFormController: replacing student in DB')
+      @view.close
+    rescue ArgumentError => e
+      LoggerHolder.instance.debug("StudentEditFormController: wrong fields: #{e.message}")
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      api.call(0, e.message, 'Error', 0)
+    end
+  end
+
+  private
+
+  def on_db_conn_error(error)
+    LoggerHolder.instance.debug('StudentEditFormController: DB connection error:')
+    LoggerHolder.instance.error(error.message)
+    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+    api.call(0, "No connection to DB", "Error", 0)
+    @view.close
+  end
+end

data/lib/student_input_form.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require_relative 'student_input_form_controller'
+require_relative 'model/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/student_input_form_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'win32api'
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
+class StudentInputFormController
+  def initialize(parent_controller)
+    @parent_controller = parent_controller
+    LoggerHolder.instance.debug('StudentInputFormController: initialized')
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+
+  def refresh
+    @parent_controller.refresh_data(1,20)
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
+    end
+  end
+
+  def process_fields(fields)
+    begin
+      last_name = fields.delete(:last_name)
+      first_name = fields.delete(:first_name)
+      parental_name = fields.delete(:parental_name)
+
+      return if last_name.nil? || first_name.nil? || parental_name.nil?
+
+      student = Student.new(last_name, first_name, parental_name, **fields)
+
+      @student_list.add_student(student)
+      LoggerHolder.instance.debug('StudentInputFormController: adding student to DB')
+      @view.close
+    rescue ArgumentError => e
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      LoggerHolder.instance.debug("StudentInputFormController: wrong fields: #{e.message}")
+      api.call(0, e.message, 'Error', 0)
+    end
+  end
+
+
+  def on_db_conn_error(error)
+    LoggerHolder.instance.debug('StudentInputFormController: DB connection error:')
+    LoggerHolder.instance.error(error.message)
+    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+    api.call(0, "No connection to DB", "Error", 0)
+    @view.close
+  end
+end

data/lib/student_list_adv.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class StudentListAdv
+  private
+  attr_accessor :students_list_adapter
+  public
+  def initialize(students_list_adapter)
+    self.students_list_adapter = students_list_adapter
+  end
+
+  def get_student(id)
+    students_list_adapter.get_student(id)
+  end
+
+  def remove_student(id)
+    students_list_adapter.remove_student(id)
+  end
+
+  def replace_student(id, student)
+    students_list_adapter.replace_student(id, student)
+  end
+
+  def get_students_pag(k, n, data)
+    students_list_adapter.get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+    students_list_adapter.add_student(student)
+  end
+
+  def count
+    students_list_adapter.count
+  end
+
+end

data/lib/student_list_controller.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+# frozen_string_literal: true
+require_relative 'student_list_adv'
+require_relative 'adapters/student_list_adapter'
+require_relative 'database/student_list_db'
+require_relative 'converters/Converter_json'
+require_relative 'converters/Converter'
+require_relative 'Student_list'
+require_relative 'student_edit_form_controller'
+require 'win32api'
+require 'mysql2'
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
+class StudentListController
+  def initialize(view)
+    LoggerHolder.instance.debug('StudentListController: init start')
+    @view = view
+    @data_list = DataListStudentShort.new
+    @data_list.add_listener(@view)
+    LoggerHolder.instance.debug('StudentListController: init done')
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+      LoggerHolder.instance.debug('StudentListController: created student repository')
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
+    end
+  end
+
+  def delete_selected(current_page, per_page, selected_row)
+    begin
+      LoggerHolder.instance.debug('StudentListController: deleting selected student')
+      student_num = (current_page - 1) * per_page + selected_row
+      @data_list.select_element(student_num)
+      student_id = @data_list.selected_id
+      @student_list.remove_student(student_id)
+    rescue => e
+      on_db_conn_error(e)
+    end
+  end
+
+  def show_modal_add
+    LoggerHolder.instance.debug('StudentListController: showing modal (add)')
+    controller = StudentInputFormController.new(self)
+    view = StudentInputForm.new(controller)
+    controller.set_view(view)
+    view.create.show
+  end
+
+  def show_modal_edit(current_page, per_page, selected_row)
+    LoggerHolder.instance.debug('StudentListController: showing modal (edit)')
+    student_num = (current_page - 1) * per_page + selected_row
+    @data_list.select_element(student_num)
+    student_id = @data_list.selected_id
+    controller = StudentEditFormController.new(self, student_id)
+    view = StudentInputForm.new(controller)
+    controller.set_view(view)
+    view.create.show
+  end
+
+  def refresh_data(page, per_page)
+    begin
+      @data_list = @student_list.get_students_pag(page, per_page, @data_list)
+      @view.update_student_count(@student_list.count)
+    rescue => e
+      on_db_conn_error(e)
+    end
+  end
+
+  private
+  def on_db_conn_error(error)
+    LoggerHolder.instance.error('TabStudentsController: DB connection error:')
+    LoggerHolder.instance.error(error.message)
+    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+    api.call(0, "No connection to DB", "Error", 0)
+    # TODO: Возможность переключения на JSON помимо exit
+    exit(false)
+  end
+end

data/mvcStudentXD.gemspec

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative "lib/mvcStudentXD/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mvcStudentXD"
+  spec.version = MvcStudentXD::VERSION
+  spec.authors = ["papaSquid"]
+  spec.email = ["mrxameleonx@mail.ru"]
+  spec.license       = "MIT"
+  spec.summary = "Gem with Student MC"
+  spec.description = "models and controllers"
+  spec.homepage = "https://github.com/KiTTeNqz/mvcStudentXD"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/KiTTeNqz/mvcStudentXD"
+  spec.metadata["changelog_uri"] = "https://github.com/KiTTeNqz/mvcStudentXD/blob/master/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - papaSquid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies: []
 description: models and controllers
 email:
@@ -23,8 +23,30 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/Student_list.rb
+- lib/adapters/student_list_adapter.rb
+- lib/containers/Data_list.rb
+- lib/containers/Data_list_student_short.rb
+- lib/containers/Data_table.rb
+- lib/converters/Converter.rb
+- lib/converters/Converter_json.rb
+- lib/converters/Converter_txt.rb
+- lib/converters/Converter_yaml.rb
+- lib/database/scripts/create_table.sql
+- lib/database/scripts/insert_data.sql
+- lib/database/student_list_db.rb
+- lib/database/students_db.rb
+- lib/model/Student.rb
+- lib/model/StudentBase.rb
+- lib/model/Student_short.rb
 - lib/mvcStudentXD.rb
 - lib/mvcStudentXD/version.rb
+- lib/student_edit_form_controller.rb
+- lib/student_input_form.rb
+- lib/student_input_form_controller.rb
+- lib/student_list_adv.rb
+- lib/student_list_controller.rb
+- mvcStudentXD.gemspec
 - sig/mvcStudentXD.rbs
 homepage: https://github.com/KiTTeNqz/mvcStudentXD
 licenses: