Skip to content

Fix issue #55 (add CAD platform & drawing links) #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brettle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #55 (add CAD platform & drawing links) #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions db/migrations/019_add_cad_platform_to_projects.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Sequel.migration do
change do
alter_table(:projects) do
add_column :cad_platform, String, :default => "SOLIDWORKS", :null => false
end
end
end
7 changes: 7 additions & 0 deletions db/migrations/020_add_drawing_link_to_parts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Sequel.migration do
change do
alter_table(:parts) do
add_column :drawing_link, String, :default => "", :null => false
end
end
end
5 changes: 5 additions & 0 deletions models/project.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
class Project < Sequel::Model
one_to_many :parts
one_to_many :orders

CAD_PLATFORM_MAP = {
"Onshape" => "Onshape",
"SOLIDWORKS" => "SOLIDWORKS"
}
end
15 changes: 14 additions & 1 deletion parts_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,11 @@ def send_email(to, subject, body)
# Check parameter existence and format.
halt(400, "Missing project name.") if params[:name].nil?
halt(400, "Missing part number prefix.") if params[:part_number_prefix].nil?
halt(400, "Missing CAD platform.") if params[:cad_platform].nil?
halt(400, "Invalid CAD platform.") unless Project::CAD_PLATFORM_MAP.include?(params[:cad_platform])

project = Project.create(:name => params[:name], :part_number_prefix => params[:part_number_prefix], :hide_dashboards => 0)
project = Project.create(:name => params[:name], :part_number_prefix => params[:part_number_prefix], :hide_dashboards => 0,
:cad_platform => params[:cad_platform])

redirect "/projects/#{project.id}"
end
Expand Down Expand Up @@ -210,6 +213,11 @@ def send_email(to, subject, body)
@project.part_number_prefix = params[:part_number_prefix]
end

if params[:cad_platform]
halt(400, "Invalid CAD platform.") unless Project::CAD_PLATFORM_MAP.include?(params[:cad_platform])
@project.cad_platform = params[:cad_platform]
end

if params[:avatar]
file = params[:avatar][:tempfile]
Dir.mkdir("./uploads/projects/#{@project.id}") unless Dir.exist?("./uploads/projects/#{@project.id}")
Expand Down Expand Up @@ -423,6 +431,11 @@ def send_email(to, subject, body)
@part.drawing_created = 1
end

if params[:drawing_link]
@part.drawing_link = params[:drawing_link].strip
@part.drawing_created = 1
end

if params[:toolpath]
file = params[:toolpath][:tempfile]
# Create directories if they do not exist already
Expand Down
14 changes: 14 additions & 0 deletions views/new_project.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@
<input type="text" name="name" />
</div>
</div>
<div class="row">
<div class="col-2">
<label class="float-right">CAD Platform</label>
</div>
<div class="col-4">
<select name="cad_platform">
<% Project::CAD_PLATFORM_MAP.each_pair do |key, value| %>
<option value="<%= key %>"<% if "Onshape" == key %> selected<% end %>>
<%= value %>
</option>
<% end %>
</select>
</div>
</div>
<div class="row">
<div class="col-2">
<label class="float-right">Part Prefix</label>
Expand Down
14 changes: 10 additions & 4 deletions views/part.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@
</tr>
<tr>
<td><b>Part Number</b></td>
<% if @part.drawing_created == 1 && @part.project.cad_platform == "Onshape" %>
<td><a href="<%= @part.drawing_link %>"><%= @part.full_part_number %></a></td>
<% else %>
<td><%= @part.full_part_number %></td>
<% end %>
</tr>
<% if @part.type != "cots" %>
<tr>
Expand All @@ -87,23 +91,25 @@
<tr>
<td><b>Quantity Required</b></td><td><%= @part.quantity %></td>
</tr>
<% if @part.type != "cots" %>
<% if @part.type != "cots" %>

<tr>

<td><b>Drawing Created?</b></td>
<td><%= (@part.drawing_created == 1) ? "Yes" : "No" %></td>
</tr>
<%if @part.project.cad_platform == "SOLIDWORKS" %>
<tr>
<td><b>Revision Letter</b></td>
<td><%= @part.rev %></td>
</tr>
<% end %>
<%if @part.drawing_created == 1 %>
<%if @part.drawing_created == 1 %>
<tr>
<td><b>Drawing Link</b></td>
<td><a href="<%= "/uploads/" + @part.full_part_number + "/drawing/" + @part.full_part_number + "_" + @part.rev + ".pdf" %>">Revision <%= @part.rev %></a></td>
</tr>
<% end %>
<% end %>
<% end %>
<%if File.file?("./uploads/"+ @part.full_part_number + "/docs/" + @part.full_part_number + ".pdf") %>
<tr>
Expand Down Expand Up @@ -158,7 +164,7 @@
<% end %>
</div><!-- /col-4 -->
<div class="col-8 float-right">
<%if @part.drawing_created == 1 %>
<%if @part.drawing_created == 1 && @part.project.cad_platform == "SOLIDWORKS" %>
<div class="embed-responsive embed-responsive-4by3">
<object class="embed-responsive-item" data="<%= "/uploads/" + @part.full_part_number + "/drawing/" + @part.full_part_number + "_" + @part.rev + ".pdf" %>" type="application/pdf"></object>
</div>
Expand Down
12 changes: 11 additions & 1 deletion views/part_edit.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@
<input type="text" name="quantity" value="<%= @part.quantity %>" />
</div>
<% if @part.type != "cots" %>

<% if @part.project.cad_platform == "Onshape" %>
<div class="col">
<label class="float-right">Drawing Link</label>
</div>
<div class="col">
<input type="url" name="drawing_link" value="<%= @part.drawing_link %>" onblur="reportValidity(this)" />
</div>
<% else %>
<div class="col">
<label class="float-right">Reset Current Revision</label>
</div>
Expand All @@ -58,6 +65,7 @@
</select>
</div>
<% end %>
<% end %>
</div>
<hr>
<% end %>
Expand Down Expand Up @@ -106,6 +114,7 @@
<hr>
<fieldset>
<div class="row">
<% if @part.project.cad_platform == "SOLIDWORKS" %>
<div class="col">
<div class="row">
<i class="mx-auto fas fa-ruler-combined fa-4x"></i>
Expand All @@ -116,6 +125,7 @@
</label>
</div>
</div>
<% end %>
<div class="col">
<div class="row">
<i class="mx-auto far fa-file-alt fa-4x"></i>
Expand Down
14 changes: 14 additions & 0 deletions views/project_edit.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@
<input type="text" name="name" value="<%= @project.name %>" />
</div>
</div>
<div class="row">
<div class="col-2">
<label class="float-right">CAD Platform</label>
</div>
<div class="col-4">
<select name="cad_platform">
<% Project::CAD_PLATFORM_MAP.each_pair do |key, value| %>
<option value="<%= key %>"<% if @project.cad_platform == key %> selected<% end %>>
<%= value %>
</option>
<% end %>
</select>
</div>
</div>
<div class="row">
<div class="col-2">
<label class="float-right">Part Prefix</label>
Expand Down