Skip to content

Commit 7065255

Browse files
StrongerProgrammer7StrongerProgrammer7
committed
'#TDP - IW Realise CRUD for auto
1 parent e9b53ef commit 7065255

File tree

15 files changed

+276
-318
lines changed

15 files changed

+276
-318
lines changed

‎IndividualWork/controller/controller.rb‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ def delete_entities()
8484
self.logger.error("Error while deleting entity :#{e}")
8585
end
8686

87+
def get_model(id)
88+
@model_list.get_element_by_id(id)
89+
end
90+
91+
def get_owner(id)
92+
@owners_list.get_element_by_id(id)
93+
end
94+
8795
private
8896
attr_reader :view
8997
attr_writer :entity_list

‎IndividualWork/controller/controller_action.rb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ def initialize(parent_controller,log_mode = :all,log_file)
1515
end
1616
@controller = parent_controller
1717
end
18+
19+
def get_element_by_id(id)
20+
@controller.entity_list.get_element_by_id(id)
21+
end
22+
23+
def get_model(id)
24+
@controller.get_model(id)
25+
end
26+
27+
def get_owner(id)
28+
@controller.get_owner(id)
29+
end
1830

1931
private
2032
attr_reader :view

‎IndividualWork/controller/controller_update.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ def initialize(parent_controller,log_mode = :all)
66
super(parent_controller,log_mode,"logger/log_update.txt")
77
end
88

9-
def get_element_by_id(id)
10-
@controller.entity_list.get_element_by_id(id)
11-
end
129

1310
def update_entity(element)
1411
self.logger.debug("Updating element with ID #{element["id"]} and params #{element}")

‎IndividualWork/log.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ I, [2023-05-16T12:09:58.474598 #13289] INFO -- : Deleting entity with ID {[4]
2828
I, [2023-05-16T22:54:24.218356 #20469] INFO -- : Deleting entity with ID {[6]
2929
I, [2023-05-16T23:28:07.838345 #23257] INFO -- : Deleting entity with ID {[7]
3030
I, [2023-05-17T14:38:42.241666 #2073] INFO -- : Deleting entity with ID {[21]
31+
I, [2023-05-18T20:44:55.531460 #52941] INFO -- : Deleting entity with ID {[4]

‎IndividualWork/logger/log_create.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,6 @@ I, [2023-05-16T22:53:43.785976 #20469] INFO -- : Creating element with params {
239239
I, [2023-05-16T22:54:19.338994 #20469] INFO -- : Creating element with params {"name"=>"Guarding", "surname"=>"Surnaming", "lastname"=>"", "phone"=>"+78569586525", "mail"=>nil, "exp_year"=>15}
240240
I, [2023-05-16T23:27:57.053921 #23257] INFO -- : Creating element with params {"name"=>"Gardin", "surname"=>"Sur", "lastname"=>"Lasd", "phone"=>"+7956856952", "mail"=>nil, "exp_year"=>15}
241241
I, [2023-05-17T14:38:33.145637 #2073] INFO -- : Creating element with params {"name"=>"Name", "surname"=>"Surname", "lastname"=>"Las", "phone"=>"89562563225", "mail"=>nil}
242+
I, [2023-05-18T20:40:47.094538 #52713] INFO -- : Creating element with params {"id_owner"=>"3", "model"=>"X6", "color"=>"white", "surname_owner"=>"Бирюков", "mark"=>"BMW"}
243+
I, [2023-05-18T20:42:13.112478 #52795] INFO -- : Creating element with params {"id_owner"=>"3", "model"=>"X6", "color"=>"white", "surname_owner"=>"Бирюков", "mark"=>"BMW"}
244+
I, [2023-05-18T21:22:35.953615 #54330] INFO -- : Creating element with params {"id_owner"=>"6", "model"=>"X6", "color"=>"white", "surname_owner"=>"Kocpit", "mark"=>"BMW"}

‎IndividualWork/logger/log_update.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ I, [2023-05-14T17:54:25.504969 #5242] INFO -- : Updating element with ID 5 and
3838
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}
3939
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}
4040
I, [2023-05-16T23:28:04.960579 #23257] INFO -- : Updating element with ID 7 and params {"name"=>"Gardin", "surname"=>"Sur", "lastname"=>"Lasd", "phone"=>"+7956856952", "mail"=>"ama@mail.ru", "exp_year"=>15, "id"=>7}
41+
I, [2023-05-18T21:24:51.071250 #54515] INFO -- : Updating element with ID 5 and params {"id"=>5, "id_owner"=>6, "model"=>"GL-3", "color"=>"white", "surname_owner"=>"Kocpit", "mark"=>"Mersedes-Benz"}

‎IndividualWork/main.rb‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
load './views/modal_window_guards/modal_window_change_guard.rb'
2525
#--------------------------------------
2626
#-------------------Auto---------------
27-
#load './views/modal_window_labs/modal_window_create_labs.rb'
28-
#load './views/modal_window_labs/modal_window_change_labs.rb'
27+
load './views/modal_window_auto/modal_window_create_auto.rb'
28+
load './views/modal_window_auto/modal_window_change_auto.rb'
2929
#--------------------------------------
3030

3131
class Factory
@@ -52,12 +52,16 @@ def self.build_main_window(application,
5252
modal_create_ent1:nil,
5353
modal_change_ent1:nil,
5454
modal_create_ent2:nil,
55-
modal_change_ent2:nil)
55+
modal_change_ent2:nil,
56+
modal_create_ent3:nil,
57+
modal_change_ent3:nil)
5658
Parking_view.new(application,
5759
modal_create_owner:modal_create_ent1,
5860
modal_change_owner:modal_change_ent1,
5961
modal_create_guard:modal_create_ent2,
60-
modal_change_guard:modal_change_ent2)
62+
modal_change_guard:modal_change_ent2,
63+
modal_create_auto:modal_create_ent3,
64+
modal_change_auto:modal_change_ent3)
6165
end
6266

6367
def self.build_controllers(controller_type,main_controller)
@@ -81,6 +85,10 @@ def self.build_modals(application,window_type)
8185
Modal_create_guard.new(application)
8286
when :change_guard
8387
Modal_change_guard.new(application)
88+
when :add_auto
89+
Modal_create_auto.new(application)
90+
when :change_auto
91+
Modal_change_auto.new(application)
8492
else
8593
raise ArgumentError, "Invalid window type: #{window_type}"
8694
end
@@ -112,18 +120,24 @@ def self.connection_window_controller(controller,window)
112120

113121
modalWindow_create_owner = Factory.build_modals(application,:add_owner)
114122
modalWindow_create_guard = Factory.build_modals(application,:add_guard)
123+
modalWindow_create_auto= Factory.build_modals(application,:add_auto)
115124
modalWindow_change_owner = Factory.build_modals(application,:change_owner)
116125
modalWindow_change_guard = Factory.build_modals(application,:change_guard)
126+
modalWindow_change_auto= Factory.build_modals(application,:change_auto)
117127
Factory.connection_window_controller(contoller_modal_create,modalWindow_create_owner)
118128
Factory.connection_window_controller(contoller_modal_create,modalWindow_create_guard)
129+
Factory.connection_window_controller(contoller_modal_create,modalWindow_create_auto)
119130
Factory.connection_window_controller(controller_modal_change,modalWindow_change_owner)
120131
Factory.connection_window_controller(controller_modal_change,modalWindow_change_guard)
132+
Factory.connection_window_controller(controller_modal_change,modalWindow_change_auto)
121133

122134
view = Factory.build_main_window(application,
123135
modal_create_ent1:modalWindow_create_owner,
124136
modal_change_ent1:modalWindow_change_owner,
125137
modal_create_ent2:modalWindow_create_guard,
126-
modal_change_ent2:modalWindow_change_guard)
138+
modal_change_ent2:modalWindow_change_guard,
139+
modal_create_ent3:modalWindow_create_auto,
140+
modal_change_ent3:modalWindow_change_auto)
127141

128142
Factory.connection_controller_window(controller,view)
129143
Factory.connection_controller_window(contoller_modal_create,view)

‎IndividualWork/model_auto/auto_DB/auto_list_DB.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def get_k_n_elements_list(k,n,data_list:nil,filter_initials:nil,filter_phone:nil
4141
def push_element(element)
4242
auto = create_auto(element:element,id:0)
4343
@dbcon.crud_by_db("INSERT INTO Auto
44-
(owner_id,name, model, color)
44+
(owner_id, model, color)
4545
VALUES
4646
('#{auto.id_owner}','#{auto.model}','#{auto.color}');")
4747
end
@@ -63,7 +63,7 @@ def get_elements_count()
6363
private
6464
def create_auto(element:,id:nil)
6565
Auto.new(id:id,
66-
id_owner:Integer(element["owner_id"]),
66+
id_owner:Integer(element["id_owner"]),
6767
surname_owner:element["surname_owner"],
6868
model:element["model"],
6969
mark:element["mark"],

‎IndividualWork/model_auto/auto_DB/mark_list_DB.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def get_k_n_elements_list(k,n,data_list:nil,filter_initials:nil,filter_phone:nil
1818
limit = n
1919

2020
list_mark = []
21-
@dbcon.crud_by_db("Select * FROM Mark LIMIT #{limit} OFFSET #{offset};").to_a.each do |elem|
21+
@dbcon.crud_by_db("Select * FROM Mark;").to_a.each do |elem|
2222
mark = Mark.new(mark:elem["mark"])
2323
list_mark.push(mark)
2424
end

‎IndividualWork/model_auto/auto_DB/model_list_DB.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def get_k_n_elements_list(k,n,data_list:nil,filter_initials:nil,filter_phone:nil
1818
limit = n
1919

2020
list_model = []
21-
@dbcon.crud_by_db("Select * FROM Model LIMIT #{limit} OFFSET #{offset};").to_a.each do |elem|
21+
@dbcon.crud_by_db("Select * FROM Model;").to_a.each do |elem|
2222
model = Model.new(model:elem["model"],mark:elem["mark"])
2323
list_model.push(model)
2424
end

0 commit comments

Comments
 (0)