From 175aa16a7df0d1dfdbd9931d4c2c3aa8066191cc Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Thu, 14 Sep 2017 15:52:44 +0200 Subject: [PATCH] Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this --- ...mport_json_protocol_preview_modal.html.erb | 169 +++++++++++++++++- 1 file changed, 166 insertions(+), 3 deletions(-) diff --git a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb index 2d4cffa26..4df35d2e0 100644 --- a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb @@ -39,7 +39,7 @@
- <%= f.text_field :doesnt_exist, :value => json_object['created_on']+" (Protocols.io value)", class: "form-control" %> + <%= f.text_field :doesnt_exist, :value => json_object['created_on']+" (Protocols.io value)", class: "form-control" %>
@@ -58,16 +58,179 @@
+ + + + + <% counter=0 + whitelist_simple=["1","6","17"] + whitelist_complex=["8","9","15","18","19","20"]%> + <% #byebug %> + + <% json_object["steps"].each do |step| %> + + + + + + + + <% end #posamezni koraki%> + +
Step <%= (counter+=1).to_s %> Step guid (Protocols.io) :<%= step["guid"] %> + <% #byebug %> + <% if counter>1 %> +
Guid of previous step (Protocols.io) :<%= step["previous_guid"] %> + <% end #counter, prvi step nima previous guid%> + <% step["components"].each do |key,value| %> + <% #byebug %> + + <% if counter>1 #nevem zaka ampak v vseh njihovih izvoženih jsonih ima prvi korak čudno strukturo + #elementov, v kateri so shranjeni kot hash, katerega ključ je "0", vrednost pa komponenta, to zruši iteriranje v enem stavku + #trenutno sem porabil {5} ur da bi našel rešitev, tako da bi ena zanka naredila oboje. + # to je samo v prvem koraku, naprej so vsi shranjeni brez tega arraya, in se po njih da normalno iterirat + %> + <% #byebug %> + <% if whitelist_simple.include?(key["component_type_id"]) && key["data"]!="" && key["name"] && key["data"]%> +
+ <%= key["name"]+" : "+key["data"] %> + <% #byebug + #debug + #comp[counter];counter;@json.file_contents["steps"][3]["components"][0]["name"] + #@json.file_contents["steps"][0]["components"] + %> + + <% elsif key && whitelist_complex.include?(key["component_type_id"]) %> + <% case key["component_type_id"]%> + <% when "8"%> +
+ <%= "-"+key["name"]+" : "+key["source_data"]["name"] %> +
+ Developer : <%= key["source_data"]["developer"] %> +
+ Version : <%= key["source_data"]["version"] %> +
+ Link : <%= key["source_data"]["link"] %> +
+ Repository : <%= key["source_data"]["repository"] %> +
+ OS name , OS version : <%= key["source_data"]["os_name"]+" , "+key["source_data"]["os_version"] %> + + <% when "9"%> +
+ <%= "-"+key["name"]+" : "+key["source_data"]["name"] %> +
+ Link : <%= key["source_data"]["link"] %> + + + <% when "15"%> +
+ <%= "-"+key["name"]+" : "+key["source_data"]["name"] %> +
+ Description : <%= key["source_data"]["description"] %> +
+ OS name , OS version : <%= key["source_data"]["os_name"]+" , "+key["source_data"]["os_version"] %> + + <% when "18"%> + + <% when "19"%> +
+ <%= "-"+key["name"]+" : "+key["source_data"]["body"] %> +
+ Link : <%= key["source_data"]["link"] %> + + + <% when "20"%> + + <% else %> + + <% end %> + + + <% end #notranji if št 1%> + + + <% else #če ni prvi korak %> + + <% unless value %> + <% value=key #json format ima random arraye namest hashov, ta problem je opisan pri if counter > 1 stavku %> + <% end %> + <% #byebug %> + <% if whitelist_simple.include?(value["component_type_id"])&& value["data"]!="" && value["name"] && value["data"] %> +
+ <%= value["name"]+" : "+value["data"] %> + <% #byebug + #debug + #comp[counter];counter;@json.file_contents["steps"][3]["components"][0]["name"] + #@json.file_contents["steps"][0]["components"] + %> + + <% elsif value && whitelist_complex.include?(value["component_type_id"]) %> + <% case value["component_type_id"]%> + <% when "8"%> +
+ <%= "-"+value["name"]+" : "+value["source_data"]["name"] %> +
+ Developer : <%= value["source_data"]["developer"] %> +
+ Version : <%= value["source_data"]["version"] %> +
+ Link : <%= value["source_data"]["link"] %> +
+ Repository : <%= value["source_data"]["repository"] %> +
+ OS name , OS version : <%= value["source_data"]["os_name"]+" , "+value["source_data"]["os_version"] %> + + <% when "9"%> +
+ <%= "-"+value["name"]+" : "+value["source_data"]["name"] %> +
+ Link : <%= value["source_data"]["link"] %> + + + <% when "15"%> +
+ <%= "-"+value["name"]+" : "+value["source_data"]["name"] %> +
+ Description : <%= value["source_data"]["description"] %> +
+ OS name , OS version : <%= value["source_data"]["os_name"]+" , "+value["source_data"]["os_version"] %> + + <% when "18"%> + + <% when "19"%> +
+ <%= "-"+value["name"]+" : "+value["source_data"]["body"] %> +
+ Link : <%= value["source_data"]["link"] %> + + + <% when "20"%> + + <% else %> + + <% end %> + + <% end #notranji if št 2%> + + <% end #zunanji if %> + + + <% end #komponente koraka %> + 		WIP
+ +
- <% end %> +
- + + <%= f.submit t("protocols.import_export.import_modal.import"),class: "btn btn-primary" %> <% end %>