From 6a93c393dff3937316de19bf53885b02341cafae Mon Sep 17 00:00:00 2001
From: BOHUNG <naruto0426@rulingcom.com>
Date: Tue, 4 Feb 2020 00:40:26 +0800
Subject: [PATCH] fix

---
 app/controllers/olympiamanagements_controller.rb        | 7 ++++---
 app/views/olympiamanagements/_add_student_data.html.erb | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/olympiamanagements_controller.rb b/app/controllers/olympiamanagements_controller.rb
index 8723af7..809afad 100644
--- a/app/controllers/olympiamanagements_controller.rb
+++ b/app/controllers/olympiamanagements_controller.rb
@@ -196,7 +196,7 @@ class OlympiamanagementsController < ApplicationController
 				render_contents_in_index_page(@breadcumb+"<p><a href=#{school_connection_data_olympiamanagements_path}>#{I18n.t('olympiamanagement.please_set_school_connect_data')}</a></p>".html_safe)
 			else
 				@student_data_field = StudentDataField.first
-				@olympia_student_data = OlympiaStudentDataFields.new
+				@olympia_student_data = (OlympiaStudentDataFields.find(params[:id]) rescue OlympiaStudentDataFields.new)
 				@page_content = render_to_string(:formats=> [:html] ,:partial=>'add_student_data.html',:locals=>{:@error=>(@@error rescue nil),:@student_data_field=>@student_data_field,:@olympia_student_data=>@olympia_student_data})
 				render_contents_in_index_page(@breadcumb+@page_content.html_safe)
 			end
@@ -529,8 +529,9 @@ class OlympiamanagementsController < ApplicationController
 	end
 	def updata_student_data
 		if params[:type] == 'add_student_data'
-			@olympia_student_data = OlympiaStudentDataFields.create(params.require(:add_student_data).permit(:StudentIdentity,:StudentName,:StudentSex,:StudentIDNO,
-				:StudentBirthMonth,:StudentBirthDay,:StudentClass,:StudentPhone,:StudentCode,:StudentAddress,:StudentArea,:StudentFile))
+			@student_params = params.require(:add_student_data).permit(:StudentIdentity,:StudentName,:StudentSex,:StudentIDNO,:StudentBirthMonth,:StudentBirthDay,:StudentClass,:StudentPhone,:StudentCode,:StudentAddress,:StudentArea,:StudentFile)
+			@olympia_student_data = OlympiaStudentDataFields.find(params[:id]) rescue nil
+			@olympia_student_data.nil? ? OlympiaStudentDataFields.create(@student_params) : @olympia_student_data.update_attributes(@student_params)
 			redirect_to sign_up_student_data_list_olympiamanagements_path
 		else
 			render :html => '404'
diff --git a/app/views/olympiamanagements/_add_student_data.html.erb b/app/views/olympiamanagements/_add_student_data.html.erb
index 0a9f3d6..a1bd406 100644
--- a/app/views/olympiamanagements/_add_student_data.html.erb
+++ b/app/views/olympiamanagements/_add_student_data.html.erb
@@ -15,7 +15,7 @@
 				<%end%>
 				<li class="col_r">
 				<% if field.values[0][:type] == 'String' %>
-					<input type="text" name="<%="[add_student_data][#{field.keys[0]}]"%>" value="<%= (field.keys[0]=="enrollment_limited"&&(@olympia_student_data[field.keys[0]].nil? || @olympia_school_data_field[field.keys[0]] == 0) ) ? "" : @olympia_school_data_field[field.keys[0]] %>" size="<%=field.values[0][:size]%>" id="<%= field.keys[0] %>" class="col_input<%= @extra_class%>"/>
+					<input type="text" name="<%="[add_student_data][#{field.keys[0]}]"%>" value="<%= @olympia_student_data[field.keys[0]].to_s %>" size="<%=field.values[0][:size]%>" id="<%= field.keys[0] %>" class="col_input<%= @extra_class%>"/>
 				<% elsif field.values[0][:type] == 'select_num' %>
 					<% @please_choice = (I18n.locale.to_s == "zh_tw") ? "請選擇" : "Please select." %>
 					<select name="<%="[add_student_data][#{field.keys[0]}]"%>" id="<%=field.keys[0]%>" class="required" value="<%= @olympia_student_data[field.keys[0]] %>" style="width: auto;"><option value=""><%=@please_choice%></option>
@@ -44,11 +44,11 @@
 					</select>
 				<% elsif field.values[0][:type] == 'radio' %>
 					<%field.values[0][:choices].each_with_index do |choice,i|%>
-						<input type="radio" size="<%=field.values[0][:size]%>" name="<%="[add_student_data][#{field.keys[0]}]"%>" id="<%="#{field.keys[0]}_#{choice}"%>" class="required" value="<%=choice%>" "<%= (@olympia_student_data[field.keys[0]]== choice) ? 'checked' : '' %>">
+						<input type="radio" size="<%=field.values[0][:size]%>" name="<%="[add_student_data][#{field.keys[0]}]"%>" id="<%="#{field.keys[0]}_#{choice}"%>" class="required" value="<%=choice%>" <%= (@olympia_student_data[field.keys[0]].to_s== choice.to_s) ? 'checked=checked' : '' %>>
 						<label for="<%="#{field.keys[0]}_#{choice}"%>"><%=field.values[0][:values][I18n.locale.to_s][i]%></label>
 					<% end %>
 				<% elsif field.values[0][:type] == 'File' %>
-					<input type="file" name="<%="[add_student_data][#{field.keys[0]}]"%>" value="<%= (field.keys[0]=="enrollment_limited"&&(@olympia_student_data[field.keys[0]].nil? || @olympia_school_data_field[field.keys[0]] == 0) ) ? "" : @olympia_school_data_field[field.keys[0]] %>" size="<%=field.values[0][:size]%>" id="<%= field.keys[0] %>" style="margin-top: 1em;" class="col_input<%= @extra_class%>"/>
+					<input type="file" name="<%="[add_student_data][#{field.keys[0]}]"%>" value="<%= @olympia_student_data[field.keys[0]] %>" size="<%=field.values[0][:size]%>" id="<%= field.keys[0] %>" style="margin-top: 1em;" class="col_input<%= @extra_class%>"/>
 				<% end %>
 				</li>
 				<% if !field.values[0][:hint][I18n.locale.to_s].blank? %>