From 68558c166b55daaa7bbaf8360bf3cde33f38cd0e Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Thu, 21 Sep 2017 21:49:01 +0800
Subject: [PATCH] added courses and changed name and check for login

---
 .../international_recruits_controller.rb      | 11 ++++++++++
 .../international_recruits_controller.rb      |  6 +++--
 .../international_recruits/courses.html.erb   | 22 +++++++++++++++++++
 .../international_recruits/index.html.erb     |  7 +++++-
 .../international_recruits/index.html.erb     | 13 +++++++----
 config/locales/en.yml                         |  3 ++-
 config/locales/zh_tw.yml                      |  3 ++-
 7 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 app/views/admin/international_recruits/courses.html.erb

diff --git a/app/controllers/admin/international_recruits_controller.rb b/app/controllers/admin/international_recruits_controller.rb
index fd0dcee..52e5679 100644
--- a/app/controllers/admin/international_recruits_controller.rb
+++ b/app/controllers/admin/international_recruits_controller.rb
@@ -5,4 +5,15 @@ class Admin::InternationalRecruitsController < OrbitAdminController
     @applications = RecruitApplication.all.desc(:created_at).page(params[:page]).per(10)
   end
 
+  def destroy
+    ra = RecruitApplication.find(params[:id])
+    ra.destroy
+    redirect_to admin_international_recruits_path
+  end
+
+  def courses
+    @table_fields = ["international_recruit.course_name", "international_recruit.actions"]
+    @courses = UniversityCourse.all.asc(:created_at)
+  end
+
 end
\ No newline at end of file
diff --git a/app/controllers/international_recruits_controller.rb b/app/controllers/international_recruits_controller.rb
index 4c627a4..fd29c95 100644
--- a/app/controllers/international_recruits_controller.rb
+++ b/app/controllers/international_recruits_controller.rb
@@ -6,14 +6,16 @@ class InternationalRecruitsController < ApplicationController
       countries << [InternationalCountry::LIST[countrykey], countrykey]
     end
     years = (0..10).collect do |x|
-      t = x == 10 ? x.to_s + " more years" : x.to_s
+      t = x == 10 ? x.to_s + " plus years" : x.to_s
       [t, x]
     end
+    login_url = "/#{I18n.locale.to_s}" + (Page.where(:module => "pseudo_member").first.url rescue "")
     {
       "application" => RecruitApplication.new,
       "countries" => countries,
       "years" => years,
-      "member" => session["current_pseudo_user_id"]
+      "member" => session["current_pseudo_user_id"],
+      "login_url" => login_url
     }
   end
 
diff --git a/app/views/admin/international_recruits/courses.html.erb b/app/views/admin/international_recruits/courses.html.erb
new file mode 100644
index 0000000..81bf936
--- /dev/null
+++ b/app/views/admin/international_recruits/courses.html.erb
@@ -0,0 +1,22 @@
+<table class="table main-list">
+  <thead>
+    <tr class="sort-header">
+      <% @table_fields.each do |f| %>
+      	<%= thead(f) %>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+  	<% @courses.each do |course| %>
+  		<tr>
+  			<td><%= course.course_name %></td>
+  			<td></td>
+  		</tr>
+  	<% end %>
+  </tbody>
+</table>
+<div class="bottomnav clearfix">
+	<div class="pull-right">
+		<a href="" class="btn btn-primary">Add</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/international_recruits/index.html.erb b/app/views/admin/international_recruits/index.html.erb
index ac02728..f49f070 100644
--- a/app/views/admin/international_recruits/index.html.erb
+++ b/app/views/admin/international_recruits/index.html.erb
@@ -17,4 +17,9 @@
   		</tr>
   	<% end %>
   </tbody>
-</table>
\ No newline at end of file
+</table>
+<%=
+  content_tag :div, class: "bottomnav clearfix" do
+    content_tag :div, paginate(@applications), class: "pagination pagination-centered"
+  end
+%>
\ No newline at end of file
diff --git a/app/views/international_recruits/index.html.erb b/app/views/international_recruits/index.html.erb
index 95628c3..4c45411 100644
--- a/app/views/international_recruits/index.html.erb
+++ b/app/views/international_recruits/index.html.erb
@@ -4,6 +4,11 @@
 	data = action_data 
 	application = data["application"]
 %>
+<% if data["member"].nil? %>
+	<script type="text/javascript">
+		window.location.href = "<%= data["login_url"] %>";
+	</script>
+<% end %>
 <style media="screen">
     table,tr,td,th{
       border: 1px black solid;
@@ -244,7 +249,7 @@
         <tr>
         </tr>
         <tr>
-          <th>擬申請就讀之系（所）組及擬攻讀何種學位<br>Department or graduate program do you expect to enroll in at NKUHT? And What program do you plan pursue</th>
+          <th>擬申請就讀之系（所）組及擬攻讀何種學位<br>Department or graduate program do you expect to enroll in at TKU? And What program do you plan pursue</th>
         </tr>
         <tr>
           <td>
@@ -254,7 +259,7 @@
         <tr>
   			</tr>
         <tr>
-          <th>擬申請就讀之系（所）組及擬攻讀何種學位(第二志願)<br>Department or graduate program do you expect to enroll in at NKUHT? And What program do you plan pursue</th>
+          <th>擬申請就讀之系（所）組及擬攻讀何種學位(第二志願)<br>Department or graduate program do you expect to enroll in at TKU? And What program do you plan pursue</th>
         </tr>
   			<tr>
           <td>
@@ -266,7 +271,7 @@
       <tbody>
         <tr></tr>
         <tr>
-          <th>擬申請就讀之系（所）組及擬攻讀何種學位(第三志願)<br>Department or graduate program do you expect to enroll in at NKUHT? And What program do you plan pursue</th>
+          <th>擬申請就讀之系（所）組及擬攻讀何種學位(第三志願)<br>Department or graduate program do you expect to enroll in at TKU? And What program do you plan pursue</th>
         </tr>
 			  <tr>
           <td>
@@ -279,7 +284,7 @@
     <table class="apply_form_table" cellpadding="5" cellspacing="0" border="0" width="800">
       <tbody>
         <tr>
-          <th>在台研習期間各項費用來源<br>What are your major financial<br>resources during your study at NKUHT?</th>
+          <th>在台研習期間各項費用來源<br>What are your major financial<br>resources during your study at TKU?</th>
           <td colspan="3">
             <table width="100%" cellpadding="5" cellspacing="0" border="0" style="margin:0 auto;">
               <tbody>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96d07a0..ee8ddd7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,4 +6,5 @@ en:
     courses: Courses
     member_name: Member Name
     submited_date: Submitted Date
-    actions: Actions
\ No newline at end of file
+    actions: Actions
+    course_name: Course Name
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 93366f9..3a14412 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -6,4 +6,5 @@ zh_tw:
     courses: Courses
     member_name: Member Name
     submited_date: Submitted Date
-    actions: Actions
\ No newline at end of file
+    actions: Actions
+    course_name: Course Name
\ No newline at end of file