'#TDP - IW Realise CRUD

For guard and owner

Author: StrongerProgrammer7

IndividualWork/DIAGRAM/Diagram.mdj

@@ -21,9 +21,16 @@ def initialize(owners_list,guard_list,auto_list,log_mode = :all)
 		@auto_list = auto_list
 	end
 
-	def change_entity()
-		@entity_list = (self.view.current_table.to_s.include? "Table_guards")? @guard_list : @owners_list
-		self.data_list = @entity_list.get_k_n_elements_list(1,30,data_list:nil)
+	def change_entity(num_tab)
+		case num_tab
+    		when 0
+      			@entity_list = @owners_list
+    		when 1
+      			@entity_list = @guard_list
+    		else
+      			@entity_list = @owners_list
+    	end
+		self.data_list = nil
 	end
 
 	def refresh_data(k,n)
@@ -32,7 +39,7 @@ def refresh_data(k,n)
 		else
 			@entity_list.get_k_n_elements_list(k,n,data_list:self.data_list)
 		end
-		self.data_list.observer = self.view if self.data_list.view == nil
+		self.data_list.observer = self.view if self.data_list.observer == nil
 		self.data_list.notify(n)
 		self.view.show(PLACEMENT_SCREEN)
 	end
@@ -60,6 +67,7 @@ def delete_entities()
 		self.logger.info("Deleting entity with ID {#{list_entites}")
 		list_entites.each do |id_entity|
 			@entity_list.delete_element_by_id(id_entity)
+			#self.view.count_records -=1
 		end 
 		refresh_data(self.view.num_page,self.view.count_records)
 	rescue => e

IndividualWork/DIAGRAM/Main.png

@@ -9,9 +9,20 @@ def create_entity(element)
 		self.logger.debug("Creating element with params #{element}")
 		self.logger.info("Creating element with params #{element}")
 		@controller.entity_list.push_element(element)
+		calculate_count_records()
 		@controller.refresh_data(self.view.num_page,self.view.count_records)
 	rescue => e
-		self.logger.error("Error while creating student: #{e}")
+		self.logger.error("Error while creating element: #{e}")
+	end
+
+private
+	def calculate_count_records()
+		max_count = @controller.get_count_entities()
+		if (self.view.count_records + 1 < self.view.count_records_default)
+			self.view.count_records += 1 if self.view.count_records + 1 <= max_count
+		else
+			self.view.calculate_max_page(max_count)
+		end
 	end
 
 end

IndividualWork/Unit_tests/test_lab_work.rb

@@ -19,3 +19,9 @@ I, [2023-05-11T22:33:02.214789 #17799]  INFO -- : Deleting entity with ID {[10]
 I, [2023-05-13T12:45:41.856087 #2410]  INFO -- : Deleting entity with ID {[151]
 I, [2023-05-13T12:45:48.834753 #2410]  INFO -- : Deleting entity with ID {[101, 150]
 I, [2023-05-14T17:32:02.809508 #4063]  INFO -- : Deleting entity with ID {[152]
+I, [2023-05-16T10:12:29.460516 #6209]  INFO -- : Deleting entity with ID {[10]
+I, [2023-05-16T10:13:00.155991 #6209]  INFO -- : Deleting entity with ID {[14]
+I, [2023-05-16T10:16:23.515639 #6351]  INFO -- : Deleting entity with ID {[15]
+I, [2023-05-16T10:17:39.963983 #6379]  INFO -- : Deleting entity with ID {[16, 16, 17]
+I, [2023-05-16T10:22:05.966642 #6634]  INFO -- : Deleting entity with ID {[18]
+I, [2023-05-16T12:09:58.474598 #13289]  INFO -- : Deleting entity with ID {[4]

IndividualWork/controller/controller.rb

@@ -35,3 +35,5 @@ I, [2023-05-14T17:35:57.746734 #4219]  INFO -- : Updating element with ID 6 and
 I, [2023-05-14T17:43:51.811646 #4722]  INFO -- : Updating element with ID 6 and params {"number"=>3, "name"=>"Buisness", "topics"=>"Topic-Topic-45", "tasks"=>"Tasd task 3", "date_of_issue"=>"20.04.2022", "id"=>6}
 I, [2023-05-14T17:51:45.402904 #5136]  INFO -- : Updating element with ID 5 and params {"number"=>2, "name"=>"Managment", "topics"=>"Topics", "tasks"=>"Tasd task 3", "date_of_issue"=>"17.04.2022", "id"=>5}
 I, [2023-05-14T17:54:25.504969 #5242]  INFO -- : Updating element with ID 5 and params {"number"=>2, "name"=>"Managment", "topics"=>"Topics", "tasks"=>"Tasd task 3", "date_of_issue"=>"17.04.2022", "id"=>5}
+I, [2023-05-16T10:07:55.513020 #5853]  INFO -- : Updating element with ID 10 and params {"name"=>"Next", "surname"=>"Prev", "lastname"=>"Pup", "phone"=>"+78523654595", "mail"=>"swPis@mail.ru", "id"=>10}
+I, [2023-05-16T12:22:05.922161 #14154]  INFO -- : Updating element with ID 5 and params {"name"=>"Kiss", "surname"=>"Pussi", "lastname"=>"Nassi", "phone"=>"+78569568525", "mail"=>"swao_s2@mail.ru", "exp_year"=>5, "id"=>5}

IndividualWork/controller/controller_insert.rb

@@ -11,12 +11,17 @@
 load './controller/controller_update.rb'
 
 load './views/view.rb'
-load './views/modal_window_owners/modal_window_create_student.rb'
-load './views/modal_window_owners/modal_window_change_student.rb'
+#------------------Owner---------------
+load './views/modal_window_owners/modal_window_create_owner.rb'
+load './views/modal_window_owners/modal_window_change_owner.rb'
 #--------------------------------------
-#-------------------Labs---------------
-load './views/modal_window_labs/modal_window_create_labs.rb'
-load './views/modal_window_labs/modal_window_change_labs.rb'
+#------------------Guard---------------
+load './views/modal_window_guards/modal_window_create_guard.rb'
+load './views/modal_window_guards/modal_window_change_guard.rb'
+#--------------------------------------
+#-------------------Auto---------------
+#load './views/modal_window_labs/modal_window_create_labs.rb'
+#load './views/modal_window_labs/modal_window_change_labs.rb'
 #--------------------------------------
 
 class Factory
@@ -35,8 +40,8 @@ def self.actions(type_action,enitity,files:nil)
   	end
   end
 
-  def self.build_main_controller(entity_1,entity_2,entity_3)
-	Controller.new(entity_1,entity_2,entity_3,:hybrid)
+  def self.build_main_controller(owner:nil,guard:nil,auto:nil)
+	   Controller.new(owner,guard,auto,:hybrid)
   end
 
   def self.build_main_window(application,
@@ -64,14 +69,14 @@ def self.build_controllers(controller_type,main_controller)
 
   def self.build_modals(application,window_type)
     case window_type
-    when :add_student
-     	Modal_create_student.new(application)
-    when :change_student
-     	Modal_change_student.new(application)
-	when :add_lab
-     	Modal_create_lab.new(application)
-    when :change_lab
-     	Modal_change_lab.new(application)
+    when :add_owner
+     	Modal_create_owner.new(application)
+    when :change_owner
+     	Modal_change_owner.new(application)
+	  when :add_guard
+     	Modal_create_guard.new(application)
+    when :change_guard
+     	Modal_change_guard.new(application)
     else
       raise ArgumentError, "Invalid window type: #{window_type}"
     end
@@ -93,32 +98,31 @@ def self.connection_window_controller(controller,window)
 json_guard = Factory.actions(:json,:guard,files:Persons_list_json.new(person:Guard_list.new(:json))) 
 
 
-controller = Factory.build_main_controller(mysql_owner,mysql_guard,mysql_auto)
+controller = Factory.build_main_controller(owner:mysql_owner,guard:mysql_guard,auto:mysql_auto)
 contoller_modal_create = Factory.build_controllers(:insert,controller)
 controller_modal_change = Factory.build_controllers(:update,controller)
 application = FXApp.new
 
-#modalWindow_create = Factory.build_modals(application,:add_student)
-#modalWindow_create_lab = Factory.build_modals(application,:add_lab)
-#modalWindow_change = Factory.build_modals(application,:change_student)
-#modalWindow_change_lab = Factory.build_modals(application,:change_lab)
-#Factory.connection_window_controller(contoller_modal_create,modalWindow_create)
-#Factory.connection_window_controller(contoller_modal_create,modalWindow_create_lab)
-#Factory.connection_window_controller(controller_modal_change,modalWindow_change)
-#Factory.connection_window_controller(controller_modal_change,modalWindow_change_lab)
+modalWindow_create_owner = Factory.build_modals(application,:add_owner)
+modalWindow_create_guard = Factory.build_modals(application,:add_guard)
+modalWindow_change_owner = Factory.build_modals(application,:change_owner)
+modalWindow_change_guard = Factory.build_modals(application,:change_guard)
+Factory.connection_window_controller(contoller_modal_create,modalWindow_create_owner)
+Factory.connection_window_controller(contoller_modal_create,modalWindow_create_guard)
+Factory.connection_window_controller(controller_modal_change,modalWindow_change_owner)
+Factory.connection_window_controller(controller_modal_change,modalWindow_change_guard)
 
 view = Factory.build_main_window(application,
-  modal_create_ent1:nil,
-  modal_change_ent1:nil,
-  modal_create_ent2:nil,
-  modal_change_ent2:nil)
+  modal_create_ent1:modalWindow_create_owner,
+  modal_change_ent1:modalWindow_change_owner,
+  modal_create_ent2:modalWindow_create_guard,
+  modal_change_ent2:modalWindow_change_guard)
 
 Factory.connection_controller_window(controller,view)
 Factory.connection_controller_window(contoller_modal_create,view)
 Factory.connection_controller_window(controller_modal_change,view)
 Factory.connection_window_controller(controller,view)
 
-#view.showData(1,30)
-view.show(PLACEMENT_SCREEN)
+view.showData(1,8)
 application.create
 application.run

IndividualWork/log.txt

@@ -40,8 +40,8 @@ def get_k_n_elements_list(k,n,data_list:nil)
 		@strategy.get_k_n_elements_list(k,n,data_list:data_list)
 	end
 
-	def push_element(student)
-		@strategy.push_element(student)
+	def push_element(element)
+		@strategy.push_element(element)
 	end
 
 	def replace_element_by_id(id,element)