'#TDP - IW Realise table auto

Realise filter for auto

Author: StrongerProgrammer7

IndividualWork/Unit_tests/tests_db/test_auto.rb

@@ -22,7 +22,7 @@ def test_get_k_n
 	model = table.get_element(0,1)
 	highlander = table.get_element(1,1)
 	surname = table.get_element(1,0)
-	color = table.get_element(1,2)
+	color = table.get_element(1,3)
 	assert_equal("model", model)
 	assert_equal("Яковлев", surname)
 	assert_equal("Higlander", highlander)
@@ -40,7 +40,7 @@ def test_after_db_files_json
 	table = data_list_auto.getDataFromTable()
 	model = table.get_element(0,1)
 	model_name = table.get_element(1,1)
-	id_owner = table.get_element(1,4)
+	id_owner = table.get_element(1,5)
 	assert_equal("model", model)
 	assert_equal("X6", model_name)
 	assert_equal(1, id_owner)

IndividualWork/Unit_tests/tests_db/test_model.rb

@@ -11,6 +11,7 @@ def setup
 
   def test_initialize
 		elem = @model.get_element_by_id("X6")
+		print elem,"\n"
     assert_equal("BMW", elem["mark"])
     assert_equal("X6", elem["model"])
   end

IndividualWork/Unit_tests/tests_entity/test_auto.rb

@@ -8,23 +8,26 @@ def setup
     @auto1 = Auto.new(id:0,
       id_owner:1,
       surname_owner:"Goblin",
+      mark:"BMW",
       model:"Wolf",
       color:"black")
 
-	  @auto2 = Auto.initialization("1,2,Kupit,Highlander,gray")
+	  @auto2 = Auto.initialization("1,2,Kupit,Highlander,Toyota,gray")
   end
 
   def test_initialize_auto1
     assert_equal(1, @auto1.id_owner)
     assert_equal("Goblin", @auto1.surname_owner)
     assert_equal("Wolf", @auto1.model)
+    assert_equal("BMW", @auto1.mark)
     assert_equal("black", @auto1.color)
   end
 
   def test_initialize_auto2
     assert_equal(2, @auto2.id_owner)
     assert_equal("Kupit", @auto2.surname_owner)
     assert_equal("Highlander", @auto2.model)
+    assert_equal("Toyota", @auto2.mark)
     assert_equal("gray", @auto2.color)
   end
 

IndividualWork/Unit_tests/tests_files/test_auto_json.rb

@@ -24,7 +24,7 @@ def test_get_k_n
 	table = data_list_auto.getDataFromTable()
 	model = table.get_element(0,1)
 	model_name = table.get_element(1,1)
-	id_owner = table.get_element(1,4)
+	id_owner = table.get_element(1,5)
 	assert_equal("model", model)
 	assert_equal("X6", model_name)
 	assert_equal(1, id_owner)
@@ -42,24 +42,27 @@ def test_write_files
       id_owner:1,
       surname_owner:"Goblin",
       model:"X6",
+      mark:"BMW",
 	  color:"black"),
 	  Auto.new(id:2,
       id_owner:2,
       surname_owner: "Kupit",
       model:"Highlander",
+      mark:"Toyota",
 	  color:"gray"),
 	  Auto.new(id:3,
       id_owner:3,
       surname_owner: "Pisa",
-      model:"Skoda",
+      model:"Rapid",
+      mark:"Skoda",
 	  color:"black")]
 
 	  @auto_file.write_to_file("/../../testfile/testfile_auto/","test",elements)
 
 		data_list_auto = @auto_file.get_k_n_elements_list(1,3,data_list:nil)
 		table = data_list_auto.getDataFromTable()
 		assert_equal("Pisa",  table.get_element(3,0))
-		assert_equal("Skoda", table.get_element(3,1))
+		assert_equal("Rapid", table.get_element(3,1))
 
   end
 

IndividualWork/controller/controller.rb

@@ -5,7 +5,7 @@ class Controller
 	attr_writer :view
 	attr_reader :entity_list
 
-	def initialize(owners_list,guard_list,auto_list,log_mode = :all)
+	def initialize(owners_list,guard_list,auto_list,mark_list,model_list,log_mode = :all)
 		self.logger = Logger.new("log.txt")
     	case log_mode
     		when :errors
@@ -19,6 +19,8 @@ def initialize(owners_list,guard_list,auto_list,log_mode = :all)
 		@owners_list = owners_list
 		@guard_list = guard_list
 		@auto_list = auto_list
+		@mark_list = mark_list
+		@model_list = model_list
 	end
 
 	def change_entity(num_tab)
@@ -27,6 +29,8 @@ def change_entity(num_tab)
       			@entity_list = @owners_list
     		when 1
       			@entity_list = @guard_list
+      		when 2
+      			@entity_list = @auto_list
     		else
       			@entity_list = @owners_list
     	end

IndividualWork/main.rb

@@ -5,14 +5,15 @@
 load './model_entity/entity_list/Parking_list.rb'
 load './model_person/list_file/owner_list.rb'
 load './model_person/list_file/guard_list.rb'
-load './model_auto/datatable/auto_list.rb'
-load './model_auto/datatable/mark_list.rb'
-load './model_auto/datatable/model_list.rb'
+load './model_auto/list_file/auto_list_json.rb'
+load './model_auto/list_file/mark/mark_list_json.rb'
+load './model_auto/list_file/model/model_list_json.rb'
 #--------------------Controller-----------
 load './controller/controller.rb'
 load './controller/controller_insert.rb'
 load './controller/controller_update.rb'
 
+#--------------------View-----------
 load './views/view.rb'
 #------------------Owner---------------
 load './views/modal_window_owners/modal_window_create_owner.rb'
@@ -43,8 +44,8 @@ def self.actions(type_action,enitity,files:nil)
   	end
   end
 
-  def self.build_main_controller(owner:nil,guard:nil,auto:nil)
-	   Controller.new(owner,guard,auto,:hybrid)
+  def self.build_main_controller(owner:nil,guard:nil,auto:nil,mark:nil,model:nil)
+	   Controller.new(owner,guard,auto,mark,model,:hybrid)
   end
 
   def self.build_main_window(application,
@@ -97,11 +98,14 @@ def self.connection_window_controller(controller,window)
 mysql_owner = Factory.actions(:mysql,:owner)
 mysql_guard = Factory.actions(:mysql,:guard)
 mysql_auto = Factory.actions(:mysql,:auto)
+mysql_model = Factory.actions(:mysql,:model)
+mysql_mark = Factory.actions(:mysql,:mark)
 json_owner = Factory.actions(:json,:owner,files:Persons_list_json.new(person:Owner_list.new(:json)))
 json_guard = Factory.actions(:json,:guard,files:Persons_list_json.new(person:Guard_list.new(:json))) 
+json_auto= Factory.actions(:json,:auto,files:Auto_list_json.new()) 
 
 
-controller = Factory.build_main_controller(owner:mysql_owner,guard:mysql_guard,auto:mysql_auto)
+controller = Factory.build_main_controller(owner:mysql_owner,guard:mysql_guard,auto:mysql_auto,mark:mysql_mark,model:mysql_model)
 contoller_modal_create = Factory.build_controllers(:insert,controller)
 controller_modal_change = Factory.build_controllers(:update,controller)
 application = FXApp.new

IndividualWork/model_auto/auto.rb

@@ -1,5 +1,5 @@
 class Auto
-	attr_reader :id_owner,:model, :color,:surname_owner
+	attr_reader :id_owner,:model, :color,:surname_owner,:mark
 	attr_accessor :id
 
 	define_singleton_method :check_word do |word|
@@ -14,25 +14,26 @@ class Auto
 		/^[\-A-z0-9]+$/.match(word)
 	end
 
-	def initialize(id:,id_owner:,surname_owner:,model:,color:)
-		set_baseInfo(id_owner:id_owner,surname_owner:surname_owner,model:model,color:color) 
+	def initialize(id:,id_owner:,surname_owner:,model:,color:,mark:)
+		set_baseInfo(id_owner:id_owner,surname_owner:surname_owner,model:model,color:color,mark:mark) 
 		self.id = id
 	end
 
 	def self.initialization(information)
-		raise "Not enough data or exists unnecessary data!(split [,])" if(information.count(",") > 5 || information.count(",") == 0)
+		raise "Not enough data or exists unnecessary data!(split [,])" if(information.count(",") > 6 || information.count(",") == 0)
 		hash_data = Auto.string_to_hash(information.delete(' ').split(","))
-		Auto.new(id:hash_data["id"],id_owner:Integer(hash_data["id_owner"]),surname_owner:hash_data["surname_owner"],model:hash_data["model"],color:hash_data["color"])
+		Auto.new(id:hash_data["id"],id_owner:Integer(hash_data["id_owner"]),surname_owner:hash_data["surname_owner"],model:hash_data["model"],color:hash_data["color"],mark:hash_data["mark"])
 	end
 
 	def to_s()
 		"#{self.model} #{self.color}"
 	end
-	def set_baseInfo(id_owner:nil,surname_owner:nil,model:nil,color:nil)
-		valid_baseField_onCorrect(id_owner:id_owner,surname_owner:surname_owner,model:model,color:color)
+	def set_baseInfo(id_owner:nil,surname_owner:nil,model:nil,color:nil,mark:nil)
+		valid_baseField_onCorrect(id_owner:id_owner,surname_owner:surname_owner,model:model,color:color,mark:mark)
 		self.id_owner = id_owner if(id_owner!=nil)
 		self.surname_owner = surname_owner if(surname_owner != nil)
 		self.model = model if (model!=nil)
+		self.mark = mark if (mark!=nil)
 		self.color = color if(color !=nil)
 	end
 
@@ -42,19 +43,20 @@ def get_info()
 
 
 	private
-		attr_writer :id_owner,:model, :color,:surname_owner
+		attr_writer :id_owner,:model, :color,:surname_owner,:mark
 
 		def self.string_to_hash(data)
 			hash_data = Hash.new
 			hash_data["id"] = data[0]
 			hash_data["id_owner"] = data[1]
 			hash_data["surname_owner"] = data[2]
-			hash_data["model"] = data[3]	
-			hash_data["color"] = data[4]
+			hash_data["model"] = data[3]
+			hash_data["mark"] = data[4]	
+			hash_data["color"] = data[5]
 			hash_data
 		end
 
-		def valid_baseField_onCorrect(id_owner:,model:,color:,surname_owner:)
+		def valid_baseField_onCorrect(id_owner:,model:,color:,surname_owner:,mark:)
 			if(color!=nil) then
 				raise "Not valid color [A-Z][a-z]+ #{color}"  if(Auto.check_word(color) == nil || color.length > 50)
 			end
@@ -67,6 +69,9 @@ def valid_baseField_onCorrect(id_owner:,model:,color:,surname_owner:)
 			if(model!=nil) then
 				raise "Not valid model #{model}"  if(Auto.check_no_special_symbol(model) == nil)
 			end
+			if(mark!=nil) then
+				raise "Not valid mark #{mark}"  if(Auto.check_no_special_symbol(mark) == nil)
+			end
 		end
 
 

IndividualWork/model_auto/auto_DB/auto_list_DB.rb

@@ -20,11 +20,13 @@ def get_k_n_elements_list(k,n,data_list:nil,filter_initials:nil,filter_phone:nil
 		list_auto = []
 		@dbcon.crud_by_db("Select * FROM Auto LIMIT #{limit} OFFSET #{offset};").to_a.each do |elem|
 			surname_owner = @dbcon.crud_by_db("Select surname FROM Owner WHERE id = #{elem["owner_id"]};").to_a
+			mark = @dbcon.crud_by_db("Select mark FROM Model WHERE model = '#{elem["model"]}';").to_a
 			auto = Auto.new(
 					id:elem["id"],
 					id_owner:Integer(elem["owner_id"]),
 					surname_owner: surname_owner[0]["surname"],
       				model:elem["model"],
+      				mark:mark[0]["mark"],
       				color:elem["color"])
 			list_auto.push(auto)
 		end
@@ -62,7 +64,9 @@ def get_elements_count()
 	def create_auto(element:,id:nil)
 		 Auto.new(id:id,
 					id_owner:Integer(element["owner_id"]),
+					surname_owner:element["surname_owner"],
       				model:element["model"],
+      				mark:element["mark"],
       				color:element["color"])
 	end
 

IndividualWork/model_auto/datatable/auto_list.rb

@@ -54,6 +54,7 @@ def create_auto(element:,id:nil)
 			id_owner:element["id_owner"],
 			surname_owner: element["surname_owner"],
       				model:element["model"],
+      				mark:element["mark"],
       				color:element["color"])
 	end
 

IndividualWork/model_auto/datatable/data_list_auto.rb

@@ -11,13 +11,15 @@ def notify(whole_entities_count)
 
 	private
 		def get_names()
-			arr_attr= ["surname_owner","model","color"] 
+			arr_attr= ["num","surname_owner","model","mark","color"] 
 		end
 
 		def get_data()
 			matrix = []
+			count = 1
 			@list_entities.each  do |elem|
-				matrix.push([elem.surname_owner,elem.model,elem.color,elem.id,elem.id_owner])
+				matrix.push([count,elem.surname_owner,elem.model,elem.mark,elem.color,elem.id,elem.id_owner])
+				count +=1
 			end
 			matrix
 		end