\ No newline at end of file
diff --git a/app/views/olympiamanagements/_login.html.erb b/app/views/olympiamanagements/_login.html.erb
new file mode 100644
index 0000000..1954d3c
--- /dev/null
+++ b/app/views/olympiamanagements/_login.html.erb
@@ -0,0 +1,23 @@
+
+
+
+<%if !@error.nil?%>
+
+<%end%>
\ No newline at end of file
diff --git a/app/views/olympiamanagements/index.html.erb b/app/views/olympiamanagements/index.html.erb
index 648b75c..9524bde 100644
--- a/app/views/olympiamanagements/index.html.erb
+++ b/app/views/olympiamanagements/index.html.erb
@@ -1 +1,3 @@
+<% @@session = session %>
+<%#=render :partial=>'login'%>
<%= render_view %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4fc83ee..3a9a261 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,11 @@ en:
school_data_list: School data list
class_setting: Class setting
sign_up_setting: Sign up setting
+ logout: Logout
+ edit_password: Edit password
+ sign_up_student_data_list: Sign up student data list
+ add_sign_up_student_data: Add sign up student data
+ school_connection_data: School connection data
export_school_connection_data: Export school connection data
export_sign_up_student_data: Export sign up student data
download_scan_file_of_certificate: Download scan file of certificate
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 1d28b72..ee4efc5 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -6,6 +6,11 @@ zh_tw:
school_data_list: 學校資料列表
class_setting: 班級設定
sign_up_setting: 報名設定
+ logout: 登出
+ edit_password: 修改密碼
+ sign_up_student_data_list: 報名學生資料列表
+ add_sign_up_student_data: 新增報名學生資料
+ school_connection_data: 學校聯絡資料
export_school_connection_data: 匯出學校聯絡資料
export_sign_up_student_data: 匯出報名學生資料
download_scan_file_of_certificate: 下載獎狀掃描檔
diff --git a/config/routes.rb b/config/routes.rb
index 0f28d04..f6c6822 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,5 +22,20 @@ Rails.application.routes.draw do
get 'olympiamanagements/download_import_file' , to: 'olympiamanagements#download_import_file'
resources :olympiamanagements
end
+ resource 'olympiamanagements' do
+ get 'updata_school_data'
+ post 'updata_school_data'
+ patch 'updata_school_data'
+ get 'updata_student_data'
+ post 'updata_student_data'
+ patch 'updata_student_data'
+ get 'download_school_code'
+ get 'school_connection_data'
+ get 'add_sign_up_student_data'
+ get 'sign_up_student_data_list'
+ get 'edit_password'
+ get 'print_registration_form'
+ get 'logout'
+ end
end
end
diff --git a/extra_route.txt b/extra_route.txt
index 5c3b65f..3ed6e05 100644
--- a/extra_route.txt
+++ b/extra_route.txt
@@ -1,7 +1,15 @@
-get 'olympiamanagements/updata_school_data' , to: 'olympiamanagements#updata_school_data'
- post 'olympiamanagements/updata_school_data' , to: 'olympiamanagements#updata_school_data'
- patch 'olympiamanagements/updata_school_data' , to: 'olympiamanagements#updata_school_data'
- get 'olympiamanagements/updata_student_data' , to: 'olympiamanagements#updata_student_data'
- post 'olympiamanagements/updata_student_data' , to: 'olympiamanagements#updata_student_data'
- patch 'olympiamanagements/updata_student_data' , to: 'olympiamanagements#updata_student_data'
- get 'olympiamanagements/download_school_code' , to: 'olympiamanagements#download_school_code'
\ No newline at end of file
+resources :olympiamanagements do
+ get 'updata_school_data'
+ post 'updata_school_data'
+ patch 'updata_school_data'
+ get 'updata_student_data'
+ post 'updata_student_data'
+ patch 'updata_student_data'
+ get 'download_school_code'
+ get 'school_connection_data'
+ get 'add_sign_up_student_data'
+ get 'sign_up_student_data_list'
+ get 'edit_password'
+ get 'print_registration_form'
+ get 'logout'
+ end
\ No newline at end of file
diff --git a/olympiamanagement/olympia_managements_index.html.erb b/olympiamanagement/olympia_managements_index.html.erb
index 35f3164..19d2770 100644
--- a/olympiamanagement/olympia_managements_index.html.erb
+++ b/olympiamanagement/olympia_managements_index.html.erb
@@ -1,5 +1,5 @@
-{{instructions}}
+{{page_content}}
\ No newline at end of file