Fix Sync auto rescue timeout and filter user email for ntu only

Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
	app/controllers/admin/import_data_controller.rb

Conflicts:
	vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb
	vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
	vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
	vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb

Gemfile

@@ -20,6 +20,7 @@ gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 gem "geocoder"
+gem 'whenever', :require => false
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -43,7 +44,6 @@ gem 'resque', :require => 'resque/server' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
-gem 'roo'
 # gem 'ruby-debug19'
 gem 'rubyzip', '< 1.0.0'
 

app/assets/javascripts/desktop/orbitdesktop.js

@@ -289,13 +289,14 @@ var orbitDesktop = function(dom){
         return false;
       }
       var ca = $e.attr("content-holder");
+
       var a = function(){
         $.ajax({
             type : t,
             dataType : responsetype,
             url : $e.attr("href"),
             success : function(data){
-              if(typeof data == "string"){
+              if(typeof data == "string" && t != "delete"){
                 if(ca)
                   $(ca).html(data);
                 else{
@@ -308,10 +309,12 @@ var orbitDesktop = function(dom){
                 window.o[o.data_method][exe](data,$e);
               if(t == "delete"){
                 if($e.attr("delete-item")=="true"){
-                  var li_to_delete = $e.parentsUntil("li[item=true]").find("li[item=true]");
+                  var li_to_delete = $e.parentsUntil("li[item=true]");
                   li_to_delete.slideUp();
                 }
               }
+            },
+            error : function(x){
             }
         });
       }

app/assets/javascripts/lib/social-share-button.coffee

@@ -1,33 +0,0 @@
-window.SocialShareButton =
-  openUrl : (url) ->
-    window.open(url)
-    false
-
-  share : (el) ->
-    site = $(el).data('site')
-    title = encodeURIComponent($(el).parent().data('title'))
-    img = encodeURIComponent($(el).parent().data("img"))
-    fb_url = encodeURIComponent($(el).parent().data("fb_url"))
-    url = encodeURIComponent(location.href)
-    switch site
-      when "weibo"
-        SocialShareButton.openUrl("http://v.t.sina.com.cn/share/share.php?url=#{url}&pic=#{img}&title=#{title}&content=utf-8")
-      when "twitter"
-        SocialShareButton.openUrl("https://twitter.com/home?status=#{title}: #{url}")
-      when "douban"
-        SocialShareButton.openUrl("http://www.douban.com/recommend/?url=#{url}&title=#{title}&image=#{img}")
-      when "facebook"
-        SocialShareButton.openUrl("http://www.facebook.com/sharer.php?t=#{title}&u=#{fb_url}")
-      when "qq"
-        SocialShareButton.openUrl("http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=#{url}&title=#{title}&pics=#{img}")
-      when "tqq"
-        SocialShareButton.openUrl("http://share.v.t.qq.com/index.php?c=share&a=index&url=#{url}&title=#{title}&pic=#{img}")
-      when "baidu"
-        SocialShareButton.openUrl("http://apps.hi.baidu.com/share/?url=#{url}&title=#{title}&content=")
-      when "kaixin001"
-        SocialShareButton.openUrl("http://www.kaixin001.com/rest/records.php?url=#{url}&content=#{title}&style=11&pic=#{img}")
-      when "renren"
-        SocialShareButton.openUrl("http://widget.renren.com/dialog/share?resourceUrl=#{url}&title=#{title}&description=")
-      when "google_plus"
-        SocialShareButton.openUrl("https://plus.google.com/share?url=#{url}&t=#{title}")
-    false

app/assets/javascripts/member-selection.js

@@ -10,7 +10,7 @@ $(document).ready(function() {
       type: 'GET',
       url: $(this).attr("rel"),
       dataType: 'script',
-      data: {field: $(this).attr("field"), ids: ids},
+      data: {ids: ids},
       success: function (msg) {
         $("#member-filter").modal('show'); },
       error: function(){
@@ -20,11 +20,6 @@ $(document).ready(function() {
     });  
     return false;
   });
-
-  $(document).on('click', ".remove_user", function(){
-    $(this).parent().remove();
-  });
-
   $("#remove_users").on('click', function(){
     var ids = [];
     var users = $('.selected_user input[type="checkbox"]:checked');

app/assets/javascripts/orbit-bar-search.js

@@ -1,10 +0,0 @@
-$(document).ajaxStop(function() {
-  $('.nav').find('.dropdown').on({
-    mouseleave: function() {
-      $(this).removeClass("open");
-    },
-    mouseenter: function() {
-      $(this).addClass("open")
-    }
-  });
-});

app/assets/stylesheets/member_select.css

@@ -1,230 +0,0 @@
-/* Member Filter */
-#select_user #select_user_modal.modal {
-  width: 80%;
-  margin-left: -40%;
-}
-#select_user #select_user_modal .modal-body {
-  max-height: 425px;
-}
-#select_user #select_user_modal .modal-body form {
-  margin-bottom: 0px;
-}
-#select_user #select_user_modal .modal-body form fieldset {
-  min-height: 360px;
-}
-#select_user #select_user_modal .modal-body .radio.inline,
-#select_user #select_user_modal .modal-body .checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-  min-width: 100px;
-  margin-left: 0;
-}
-#select_user #select_user_modal .modal-body .form-actions {
-  margin: 20px 0 0;
-  padding: 10px 0 0;
-  background-color: transparent;
-  text-align: right;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano {
-  width: 160px;
-  min-height: 425px;
-  float: left;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano .pane {
-  right: 6px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs {
-  width: 140px;
-  float: left;
-  margin-bottom: 0;
-  margin-right: 0;
-  border-right: 1px solid #ddd;
-  border-bottom: none;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li {
-  float: none;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs .active > a,
-#select_user #select_user_modal .modal-body .tabs-left > .nano > .content > .nav-tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-#select_user #select_user_modal .member-filter-options {
-  float: left;
-  display: inline-block;
-  width: 175px;
-  min-height: 425px;
-  margin-right: 10px;
-  padding: 0 10px 0 0;
-}
-#select_user #select_user_modal .member-filter-options select {
-  width: 165px; 
-}
-#select_user #select_user_modal .member-filter-options .btn {
-  display: block;
-}
-#select_user #select_user_modal .member-filter-result {
-  padding-left: 15px;
-  min-height: 360px;
-  width: auto;
-}
-
-
-/* Check Box Card */
-.checkbox-card {
-  margin: 0;
-}
-.checkbox-card li {
-  position: relative;
-  list-style: none;
-  color: #FFFFFF;
-  width: 180px;
-  height: 40px;
-  margin: 0 10px 10px 0;
-  float: left;
-  display: inline-block;
-  background-color: #cccccc;
-  overflow: hidden;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-      border-radius: 3px;
-  -webkit-transition: all .2s linear;
-     -moz-transition: all .2s linear;
-     -o-transition: all .2s linear;
-      transition: all .2s linear;
-}
-.checkbox-card li.mark {
-  width: 0;
-  height: 0;
-  padding: 0;
-  margin: 0;
-  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  opacity: 0;
-  visibility: hidden;
-}
-.checkbox-card li:hover {
-  background-color: #0088cc;
-}
-.checkbox-card li:after {
-  content: "";
-  display: block;
-  clear: both;
-  height: 0;
-  visibility: hidden;
-}
-.checkbox-card li.active:before {
-  -webkit-text-size-adjust : none;
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  color: #FFF;
-  text-decoration: inherit;
-  content: "\f00c";
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  line-height: 14px;
-  text-indent: 10px;
-  font-size: 10px;
-  width: 0px;
-  height: 0px;
-  border-style: solid;
-  border-width: 0 22px 22px 0;
-  border-color: transparent #51a351 transparent transparent;
-}
-.checkbox-card li.active label {
-}
-.checkbox-card li label {
-  margin-bottom: 0px;
-  overflow: hidden;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-      border-radius: 3px;
-}
-.checkbox-card li input {
-  opacity: 0;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: 0;
-  z-index: 10;
-}
-.checkbox-card li label span {
-  -webkit-text-size-adjust : none;
-  font-size: 10px;
-  display: block;
-  width: 130px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #666666;
-  margin-top: -3px;
-}
-.checkbox-card li:hover label span,
-.checkbox-card li:hover label span.user-name {
-  color: #FFFFFF;
-}
-.checkbox-card li label span.user-name {
-  font-size: 12px;
-  color: #363636;
-  padding: 2px 0 0;
-  margin-top: 0;
-}
-.checkbox-card li .user-pic {
-  float: left;
-  margin-right: 5px;
-  width: 40px;
-  height: 40px;
-}
-#selected_users .selected_user {
-  display: block;
-  margin-bottom: 5px;
-}
-#selected_users .selected_user .remove_user {
-  font-size: 15px;
-}
-/*
-.promoter {
-  border-color: #CCCCCC;
-  border-style: solid;
-  border-width: 0 1px;
-  padding: 0 10px 5px 10px;
-}
-.promoter > div {
-  border-bottom: 1px solid #CCCCCC;
-}
-.promoter > div:after {
-  content: "";
-  clear: both;
-  display: block;
-  visibility: hidden;
-}
-.promoter > div > span {
-  display: block;
-  margin-left: 70px;
-  padding-bottom: 5px;
-}
-.promoter p {
-  width: 70px;
-  float: left;
-  text-align:right;
-}*/

app/assets/stylesheets/social-share-button.css

@@ -1,90 +0,0 @@
-.social-share-button-baidu {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px 0px no-repeat;
-}
-.social-share-button-delicious {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px 0px no-repeat;
-}
-.social-share-button-douban {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -16px no-repeat;
-}
-.social-share-button-email {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -16px no-repeat;
-}
-.social-share-button-facebook {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px 0px no-repeat;
-}
-.social-share-button-flickr {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -16px no-repeat;
-}
-.social-share-button-google {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -32px no-repeat;
-}
-.social-share-button-google_plus {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -32px no-repeat;
-}
-.social-share-button-kaixin001 {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -32px no-repeat;
-}
-.social-share-button-qq {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px 0px no-repeat;
-}
-.social-share-button-renren {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px -16px no-repeat;
-}
-.social-share-button-tqq {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -48px -32px no-repeat;
-}
-.social-share-button-twitter {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") 0px -48px no-repeat;
-}
-.social-share-button-weibo {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -16px -48px no-repeat;
-}
-.social-share-button-rss {
-	display:inline-block;
-	width:16px;
-	height:16px;
-	background:url("/assets/social-share-button.png") -32px -48px no-repeat;
-}

app/controllers/admin/import_data_controller.rb

@@ -0,0 +1,734 @@
+# encoding: utf-8
+
+require 'net/http'
+require 'open-uri'
+require 'timeout'
+
+class Admin::ImportDataController < OrbitBackendController
+    # helper Admin::PagePartsHelper
+    # include Admin::FrontendWidgetInterface
+
+  def get_teacher_data
+    uri = URI("https://localhost:8000/teachers.xml")
+
+    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
+    #uri.query = URI.encode_www_form(params)
+    res = Net::HTTP.get_response(uri)
+    
+    @teacher_data = Hash.from_xml(res.body)
+    @teachers = @teacher_data["objects"]   
+    @i = 5000
+    @teachers.each do |hash|
+          # @roles = Role.skip(1).first
+          @roles =  Role.all
+          @teacher = User.new
+          I18n.locale = :zh_tw
+          if !hash['teacher_zh_tw'].blank?
+            @teacher.first_name = hash['teacher_zh_tw']
+          elsif hash['teacher_zh_tw'].blank? && !hash['teacher_en'].blank?
+            @teacher.first_name = hash['teacher_en']
+          elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
+            @teacher.first_name = "Please Fill the Name"
+          end
+      
+          I18n.locale = :en
+          if !hash['teacher_en'].blank?
+            @teacher.first_name = hash['teacher_en']
+          elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank?
+            @teacher.first_name = hash['teacher_zh_tw']
+          elsif hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank?
+            @teacher.first_name = "Please Fill the Name"
+          end
+            
+          #@teacher.first_name = hash['teacher_en']      
+          @teacher.ntu_seq = hash['ntu_seq']
+          @teacher.sid = hash['ntu_seq']
+          @teacher.role_ids = ["#{@roles.skip(1).first.id}"]
+          @teacher.password = "testpass"
+          @i += 10
+          if !hash['email'].blank?
+             @user = User.where(email: "#{hash['email']}")
+            if @user.length == 0
+             @teacher.email = hash['email']
+            elsif @user.length > 0
+              @teacher.email = "#{@i}duplicate@ntu.edu.tw"            
+            end
+          else 
+            @teacher.email = "#{@i}@ntu.edu.tw"
+          end
+
+          if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank?
+           @teacher.user_id = "defaultuser"
+          elsif hash['teacher_en'].blank?
+            @teacher.user_id = hash['teacher_zh_tw']
+          elsif hash['teacher_zh_tw'] 
+            @teacher.user_id = hash['teacher_en']
+          end
+          @teacher.save!
+      end
+  end
+
+  def get_book_data
+    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
+    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
+    uri.query = URI.encode_www_form(params)
+    res = Net::HTTP.get_response(uri)
+    
+    teachers = User.all
+
+    teachers.each do |hash|
+    # if hash.ntu_seq.present?
+    if hash.user_id.present?
+      # ntu_seq = hash.ntu_seq
+      u_account = hash.user_id
+    books_xml = Nokogiri::XML( \
+    # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
+    @books = books_xml.xpath("//Book").map do |book_node|
+          {
+            author: (book_node>"Authors").text,
+            year: (book_node>"PublishYear").text,
+            title: (book_node>"DocTitle").text,
+            remarks: (book_node>"Remarks").text,
+            publisher: (book_node>"Publisher").text,
+            book_title: (book_node>"BookTitle").text
+          }
+      end
+    if @books.present? 
+    @books.each do |b|
+     @book = WritingBook.new
+     I18n.locale = :zh_tw
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     I18n.locale = :en
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     @book.year = b[:year]
+     @book.create_user_id = hash.id
+     @book.save
+     end
+      else
+    puts "No books by Teacher"
+      end
+     end
+    end
+  end
+
+  def get_conference_data
+    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
+    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
+    uri.query = URI.encode_www_form(params)
+    res = Net::HTTP.get_response(uri)
+    
+    teachers = User.all
+
+    teachers.each do |hash|
+    # if hash.ntu_seq.present?
+    if hash.user_id.present?
+    # ntu_seq = hash.ntu_seq
+    u_account = hash.user_id
+    conference_xml = Nokogiri::XML( \
+    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
+        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
+    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
+                            {
+                              author: (cp_node>"Authors").text,
+                              year: (cp_node>"PublishYear").text,
+                              title: (cp_node>"PaperTitle").text,
+                              conference: (cp_node>"PublishOn").text,
+                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
+                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
+                              conference_title: (cp_node>"PublishOn").text,
+                              remarks: (cp_node>"Remarks").text
+                            }
+                          end
+     if @conference_papers.present? 
+       @conference_papers.each do |b|
+       @conference_paper = WritingConference.new
+       I18n.locale = :zh_tw
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+
+       @conference_paper.note = b[:remarks]
+       I18n.locale = :en
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+       @conference_paper.note = b[:remarks]
+
+       @conference_paper.location = b[:location]
+       @conference_paper.year = b[:year]
+       @conference_paper.create_user_id = hash.id
+
+       @conference_paper.save!
+     end
+      else
+    puts "No conference by Teacher"
+      end
+      end
+    end
+  end
+
+
+  def get_journal_paper_data
+    uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp")
+    params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
+    uri.query = URI.encode_www_form(params)
+    res = Net::HTTP.get_response(uri)
+    
+    teachers = User.all
+
+    teachers.each do |hash|
+    # if hash.ntu_seq.present?
+    if hash.user_id.present?
+    # ntu_seq = hash.ntu_seq
+    u_account = hash.user_id
+    paper_xml = Nokogiri::XML( \
+        #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
+    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
+    @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
+                  {
+                    author: (paper_node>"Authors").text,
+                    year: (paper_node>"PublishYear").text,
+                    title: (paper_node>"PaperTitle").text,
+                    journal: (paper_node>"PublishOn").text,
+                    volume:(paper_node>"Volume").text,
+                    volumeno:(paper_node>"VolumeNo").text,
+                    beginpage:(paper_node>"BeginPage").text,
+                    endpage:(paper_node>"EndPage").text,
+                    subgroup:(paper_node>"subgroup").text,
+                    remarks: (paper_node>"Remarks").text,
+                    cate: ((paper_node>"subgroup")>"Group").text
+                  }
+                end
+     if @journal_papers.present? 
+       @journal_papers.each do |b|
+       @journal_paper = WritingJournal.new
+       I18n.locale = :zh_tw
+       @journal_paper.authors = b[:author]
+       if b[:title].blank?
+          @journal_paper.paper_title = "No Title Present"
+       else 
+          @journal_paper.paper_title = b[:title]
+       end
+       @journal_paper.journal_title = b[:journal]
+       @journal_paper.note = b[:remarks]
+       I18n.locale = :en
+       @journal_paper.authors = b[:author]
+       if b[:title].blank?
+          @journal_paper.paper_title = "No Title Present"
+       else 
+          @journal_paper.paper_title = b[:title]
+       end
+       @journal_paper.journal_title = b[:journal]
+       @journal_paper.note = b[:remarks]
+       @journal_paper.year = b[:year]
+       @journal_paper.vol_no = b[:volumeno]
+       @journal_paper.form_to_start = b[:beginpage]
+       @journal_paper.form_to_end = b[:endpage]
+       if !b[:cate].blank?
+        @level_type = JournalLevelType.where(:key => b[:cate])
+        if @level_type.present?
+          @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
+        end
+       end
+
+       @journal_paper.create_user_id = hash.id
+       @journal_paper.save!
+
+     end
+      else
+    puts "No journal paper by Teacher"
+      end
+      end
+    end
+  end
+
+def sync_conference_data
+    @conference_data = WritingConference.where(create_user_id: "#{params[:user_id]}")
+    @conference_data.delete_all
+    @user = User.find("#{params[:user_id]}")
+
+    # teachers.each do |hash|
+     # if @user.sid.present?
+     if @user.user_id.present?
+    # ntu_seq = @user.sid
+      u_account = @user.user_id
+    conference_xml = Nokogiri::XML( \
+    # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C"))
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
+        #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml"))
+    @conference_papers = conference_xml.xpath("//Paper").map do |cp_node|
+                            {
+                              author: (cp_node>"Authors").text,
+                              year: (cp_node>"PublishYear").text,
+                              title: (cp_node>"PaperTitle").text,
+                              conference: (cp_node>"PublishOn").text,
+                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
+                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
+                              conference_title: (cp_node>"PublishOn").text,
+                              remarks: (cp_node>"Remarks").text
+                            }
+                          end
+     if @conference_papers.present? 
+       @conference_papers.each do |b|
+       @conference_paper = WritingConference.new
+       I18n.locale = :zh_tw
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+
+       @conference_paper.note = b[:remarks]
+       I18n.locale = :en
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+       @conference_paper.note = b[:remarks]
+
+       @conference_paper.location = b[:location]
+       @conference_paper.year = b[:year]
+       @conference_paper.create_user_id = @user.id
+
+       @conference_paper.save!
+     end
+      else
+    puts "No conference by Teacher"
+      end
+      end
+       respond_to do |format|
+    
+        format.html { redirect_to request.referer }
+        format.json { render json: {"success"=>true}.to_json}
+      
+      end
+  end
+
+
+  def sync_journal_paper_data
+    
+    @journal_data = WritingJournal.where(create_user_id: "#{params[:user_id]}")
+    @journal_data.delete_all
+    @user = User.find("#{params[:user_id]}")
+
+    # teachers.each do |hash|
+    # if @user.sid.present?
+    if @user.user_id.present?
+      # ntu_seq = @user.sid
+      u_account = @user.user_id
+      paper_xml = Nokogiri::XML( \
+          #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml"))
+      # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J"))
+      open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
+      @journal_papers = paper_xml.xpath("//Paper").map do |paper_node|
+                    {
+                      author: (paper_node>"Authors").text,
+                      year: (paper_node>"PublishYear").text,
+                      title: (paper_node>"PaperTitle").text,
+                      journal: (paper_node>"PublishOn").text,
+                      volume:(paper_node>"Volume").text,
+                      volumeno:(paper_node>"VolumeNo").text,
+                      beginpage:(paper_node>"BeginPage").text,
+                      endpage:(paper_node>"EndPage").text,
+                      subgroup:(paper_node>"subgroup").text,
+                      remarks: (paper_node>"Remarks").text,
+                      cate: ((paper_node>"subgroup")>"Group").text
+                    }
+                  end
+      if @journal_papers.present? 
+        @journal_papers.each do |b|
+           @journal_paper = WritingJournal.new
+           I18n.locale = :zh_tw
+           @journal_paper.authors = b[:author]
+
+           if b[:title].blank?
+              @journal_paper.paper_title = "No Title Present"
+           else 
+              @journal_paper.paper_title = b[:title]
+           end
+
+           @journal_paper.journal_title = b[:journal]
+           @journal_paper.note = b[:remarks]
+           I18n.locale = :en
+           @journal_paper.authors = b[:author]
+
+           if b[:title].blank?
+              @journal_paper.paper_title = "No Title Present"
+           else 
+              @journal_paper.paper_title = b[:title]
+           end
+
+           @journal_paper.journal_title = b[:journal]
+           @journal_paper.note = b[:remarks]
+           @journal_paper.year = b[:year]
+           @journal_paper.vol_no = b[:volumeno]
+           @journal_paper.form_to_start = b[:beginpage]
+           @journal_paper.form_to_end = b[:endpage]
+
+           if !b[:cate].blank?
+            @level_type = JournalLevelType.where(:key => b[:cate])
+            if @level_type.present?
+              @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
+            end
+           end
+
+           @journal_paper.create_user_id = @user.id
+           @journal_paper.save!
+        end
+      end
+     
+    end
+    
+    respond_to do |format|
+        
+      format.html { redirect_to request.referer }
+      format.json { render json: {"success"=>true}.to_json}
+    
+    end
+  end
+
+def sync_book_data
+    @books_data = WritingBook.where(create_user_id: "#{params[:user_id]}")
+    @books_data.delete_all
+    @user = User.find("#{params[:user_id]}")
+
+    # teachers.each do |hash|
+     # if @user.sid.present?
+     if @user.user_id.present?
+    # ntu_seq = @user.sid
+      u_account = @user.user_id
+    books_xml = Nokogiri::XML( \
+    # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}"))
+    open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
+    @books = books_xml.xpath("//Book").map do |book_node|
+          {
+            author: (book_node>"Authors").text,
+            year: (book_node>"PublishYear").text,
+            title: (book_node>"DocTitle").text,
+            remarks: (book_node>"Remarks").text,
+            publisher: (book_node>"Publisher").text,
+            book_title: (book_node>"BookTitle").text
+          }
+      end
+    if @books.present? 
+     @books.each do |b|
+     @book = WritingBook.new
+     I18n.locale = :zh_tw
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     I18n.locale = :en
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     @book.year = b[:year]
+     @book.create_user_id = @user.id
+     @book.save
+     end
+    end
+     end
+     
+     respond_to do |format|
+    
+        format.html { redirect_to request.referer }
+        format.json { render json: {"success"=>true}.to_json}
+      
+      end
+end
+
+
+ def sync_conference_data_auto
+  @user = User.all
+  @user.each do |user|
+    if user.user_id.present?
+      next if !user.email.include? "ntu.edu.tw"
+      u_account = user.user_id
+      @conference_xml = nil
+      begin
+        timeout(60) do
+          @conference_xml = Nokogiri::XML( \
+          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C"))
+         end
+      rescue Timeout::Error
+        next
+      end
+    @conference_papers = @conference_xml.xpath("//Paper").map do |cp_node|
+                            {
+                              author: (cp_node>"Authors").text,
+                              year: (cp_node>"PublishYear").text,
+                              title: (cp_node>"PaperTitle").text,
+                              conference: (cp_node>"PublishOn").text,
+                              date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i],
+                              location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}",
+                              conference_title: (cp_node>"PublishOn").text,
+                              remarks: (cp_node>"Remarks").text
+                            }
+                          end
+     if @conference_papers.present? 
+       WritingConference.delete_all(conditions:{create_user_id: user.id})
+
+       @conference_papers.each do |b|
+       @conference_paper = WritingConference.new
+       I18n.locale = :zh_tw
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+
+       @conference_paper.note = b[:remarks]
+       I18n.locale = :en
+       @conference_paper.authors = b[:author]
+       if b[:title].blank?
+        @conference_paper.paper_title = "No Title Present"
+       else 
+        @conference_paper.paper_title = b[:title]
+       end
+       if b[:conference_title].blank?
+         @conference_paper.conference_title = "No Title Present"
+       else
+          @conference_paper.conference_title = b[:conference_title]
+       end
+       @conference_paper.note = b[:remarks]
+
+       @conference_paper.location = b[:location]
+       @conference_paper.year = b[:year]
+       @conference_paper.create_user_id = user.id
+
+       @conference_paper.save!
+     end
+      else
+      end
+    end
+    end
+  end
+
+
+def sync_journal_paper_data_auto
+  @user = User.all
+  @user.each do |user|
+    if user.user_id.present?
+      next if !user.email.include? "ntu.edu.tw"
+      u_account = user.user_id
+      @paper_xml = nil
+      begin
+        timeout(60) do
+          @paper_xml = Nokogiri::XML( \
+          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J"))
+        end
+      rescue Timeout::Error
+        next
+      end
+      @journal_papers = @paper_xml.xpath("//Paper").map do |paper_node|
+                    {
+                      author: (paper_node>"Authors").text,
+                      year: (paper_node>"PublishYear").text,
+                      title: (paper_node>"PaperTitle").text,
+                      journal: (paper_node>"PublishOn").text,
+                      volume:(paper_node>"Volume").text,
+                      volumeno:(paper_node>"VolumeNo").text,
+                      beginpage:(paper_node>"BeginPage").text,
+                      endpage:(paper_node>"EndPage").text,
+                      subgroup:(paper_node>"subgroup").text,
+                      remarks: (paper_node>"Remarks").text,
+                      cate: ((paper_node>"subgroup")>"Group").text
+                    }
+                  end
+      if @journal_papers.present? 
+
+        WritingJournal.delete_all(conditions:{create_user_id: user.id})
+        
+        @journal_papers.each do |b|
+           @journal_paper = WritingJournal.new
+           I18n.locale = :zh_tw
+           @journal_paper.authors = b[:author]
+
+           if b[:title].blank?
+              @journal_paper.paper_title = "No Title Present"
+           else 
+              @journal_paper.paper_title = b[:title]
+           end
+
+           @journal_paper.journal_title = b[:journal]
+           @journal_paper.note = b[:remarks]
+           I18n.locale = :en
+           @journal_paper.authors = b[:author]
+
+           if b[:title].blank?
+              @journal_paper.paper_title = "No Title Present"
+           else 
+              @journal_paper.paper_title = b[:title]
+           end
+
+           @journal_paper.journal_title = b[:journal]
+           @journal_paper.note = b[:remarks]
+           @journal_paper.year = b[:year]
+           @journal_paper.vol_no = b[:volumeno]
+           @journal_paper.form_to_start = b[:beginpage]
+           @journal_paper.form_to_end = b[:endpage]
+
+           if !b[:cate].blank?
+            @level_type = JournalLevelType.where(:key => b[:cate])
+            if @level_type.present?
+              @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"]
+            end
+           end
+
+           @journal_paper.create_user_id = user.id
+           @journal_paper.save!
+        end
+      end
+      puts "Sync "+u_account+"\r\n"
+    end
+  end   
+end
+
+def sync_book_data_auto
+  @user = User.all
+  @user.each do |user|
+    if user.user_id.present?
+      next if !user.email.include? "ntu.edu.tw"
+      u_account = user.user_id
+      @books_xml = nil
+      begin
+        timeout(60) do
+          @books_xml = Nokogiri::XML( \
+          open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}"))
+        end
+      rescue Timeout::Error
+        next
+      end
+      
+    @books = @books_xml.xpath("//Book").map do |book_node|
+          {
+            author: (book_node>"Authors").text,
+            year: (book_node>"PublishYear").text,
+            title: (book_node>"DocTitle").text,
+            remarks: (book_node>"Remarks").text,
+            publisher: (book_node>"Publisher").text,
+            book_title: (book_node>"BookTitle").text
+          }
+      end
+
+    if @books.present? 
+
+      WritingBook.delete_all(conditions:{create_user_id: user.id})
+
+     @books.each do |b|
+     @book = WritingBook.new
+     I18n.locale = :zh_tw
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     I18n.locale = :en
+     @book.authors = b[:author]
+     @book.paper_title = b[:title]
+     @book.book_title = b[:book_title]
+     @book.note = b[:remarks]
+     @book.publisher = b[:publisher]
+     @book.year = b[:year]
+     @book.create_user_id = user.id
+     @book.save
+     end
+    end
+     end
+  end
+end
+
+
+  def get_announcement_data
+  uri = URI("https://localhost:8000/announcements.xml")
+
+    #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"}
+    #uri.query = URI.encode_www_form(params)
+    res = Net::HTTP.get_response(uri)
+    
+    @announcement_data = Hash.from_xml(res.body)
+    @announcements = @announcement_data["objects"]   
+    @announcements.each do |hash|
+          @bulletin = Bulletin.new
+
+          I18n.locale = :zh_tw
+          if hash['announcement_title_zh_tw'].blank?
+           @bulletin.title = hash['announcement_title_en']
+           @bulletin.text = hash['announcement_content_zh_tw']
+          elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
+           @bulletin.title = "Please Fill the Name"
+           @bulletin.text = hash['announcement_content_zh_tw']
+          else
+           @bulletin.title = hash['announcement_title_zh_tw']
+           @bulletin.text = hash['announcement_content_zh_tw']
+          end
+
+          I18n.locale = :en
+          if hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank?
+            @bulletin.title = "Please Fill the Name"
+            @bulletin.text = hash['announcement_content_en']
+
+          elsif hash['announcement_title_en'].blank?
+            @bulletin.title = hash['announcement_zh_tw']
+            @bulletin.text = hash['announcement_content_en']
+
+          elsif hash['announcement_title_zh_tw'].blank?
+            @bulletin.title = hash['announcement_title_en']
+            @bulletin.text = hash['announcement_content_en']
+          end
+          @bulletin.category_id = "51d2a16438178423c2000001"
+          @bulletin.is_pending = true
+
+          @bulletin.save!
+      end
+  end
+end

app/controllers/sessions_controller.rb

@@ -19,7 +19,7 @@ class SessionsController < Devise::SessionsController
 	  if !resource.blank?
 	     resource_name = resource.class.to_s.downcase
 	     sign_in(resource_name, resource)
-	     session[:user_id_type] = "myntu"
+	     session[:user_id_type] = "myntucoph"
 	     redirect_to after_sign_in_path_for(resource)
 	  else
 	     flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
@@ -30,8 +30,8 @@ class SessionsController < Devise::SessionsController
   def destroy
   	@user_id_type = session[:user_id_type]
     sign_out
-    if @user_id_type == "myntu"
+    if @user_id_type == "myntucoph"
-      redirect_to "https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignout1.0&wreply=https://galogin.ntu.edu.tw"
+      redirect_to "https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignout1.0&wreply=https://cophlogin.ntu.edu.tw"
     else
       redirect_to root_path
     end

app/helpers/application_helper.rb

@@ -194,8 +194,7 @@ module ApplicationHelper
     stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
     # stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n" 
-    # stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
+    # stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n" 
-    stylesheets << "<link href='/assets/social-share-button.css' rel='stylesheet' type='text/css' />\n" 
     stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default
     theme = page.design.themes.detect{ |d| d.id == page.theme_id }
     stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme
@@ -204,12 +203,8 @@ module ApplicationHelper
 
   def page_javascripts(page, edit=nil)
     javascripts = ''
-    unless edit
-      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
-    end
     # javascripts << "<script type='text/javascript' src='/assets/lib/jquery.preload-min.js'></script>\n"
     # javascripts << "<script type='text/javascript' src='/assets/jquery.cycle.all.latest.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/assets/lib/social-share-button.js'></script>\n"
     page.design.javascripts.each do |js|
       javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
     end
@@ -306,7 +301,7 @@ module ApplicationHelper
 
   # NTU link
   def get_link(site_number)
-    "http://#{site_number}.#{request.domain(3)}"
+    "http://#{request.host}:2#{site_number}00"
   end
 
   def sortable(column, title = nil, options = {})

app/helpers/orbit_backend_helper.rb

@@ -345,7 +345,7 @@ module OrbitBackendHelper
       if object.is_a?(klass.constantize)
         autorized ||= object.user_can_sub_manage?(current_user)
       else
-        autorized ||= object.send(klass.underscore).user_can_sub_manage?(current_user) rescue nil
+        autorized ||= object.send(klass.underscore).user_can_sub_manage?(current_user)
       end
       autorized
     end
@@ -444,4 +444,4 @@ module OrbitBackendHelper
     res.html_safe
   end
 
-end
+end

app/views/admin/import_data/get_announcement_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Imported Announcement Data!</p>

app/views/admin/import_data/get_book_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Book Data!</p>

app/views/admin/import_data/get_conference_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Conference Data!</p>

app/views/admin/import_data/get_journal_paper_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Journal Paper Data!</p>

app/views/admin/import_data/get_page_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Imported Page Data!</p>

app/views/admin/import_data/get_teacher_data.html.erb

@@ -0,0 +1 @@
+<p>Successfully Imported Teacher Data!</p>

app/views/admin/import_data/sync_book_data.html.erb

@@ -0,0 +1 @@
+<p>Book Data Synced Successfully!</p>

app/views/admin/import_data/sync_conference_data.html.erb

@@ -0,0 +1 @@
+<p>Conference Paper Data Synced Successfully!</p>

app/views/admin/import_data/sync_journal_paper_data.html.erb

@@ -0,0 +1 @@
+<p>Journal Paper Data Synced Successfully!</p>

app/views/admin/member_selects/_modal_select.html.erb

@@ -28,7 +28,6 @@
             <div class="form-actions">
               <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
               <%= submit_tag t(:submit), class: "btn btn-primary" %>
-              <%= hidden_field_tag field, @field %>
             </div>
           <% end %>
         </div>
@@ -54,7 +53,6 @@
                 <div class="form-actions condition">
                   <button type="button" class="btn" data-dismiss="modal"><%= t(:cancel) %></button>
                   <%= submit_tag t(:submit), class: "btn btn-primary" %>
-                  <%= hidden_field_tag field, @field %>
                 </div>
               </fieldset>
             <% end %>

app/views/admin/member_selects/_promoter_front.html.erb

@@ -1,14 +0,0 @@
-<% unless users.blank? %>
-  <div class="promoter-block">
-    <p class="promoter-title"><%= t(:promoter) %>：</p>
-    <ul>
-      <% users.each do |user| %>
-        <li class="promoter">
-          <p>
-              <%= link_to user.name, "mailto:#{user.email}", class: "promoter-name" %> / <span class="promoter-phone"><%= user.office_tel %></span>
-          </p>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>

app/views/admin/member_selects/_selection_box.html.erb

@@ -1,16 +0,0 @@
-<% content_for :page_specific_javascript do -%>
-  <%= javascript_include_tag "member-selection" %>
-  <%= javascript_include_tag "lib/jquery.nanoscroller" %>
-  <%= javascript_include_tag "lib/checkbox.card" %>
-<% end -%>
-<% content_for :page_specific_css do -%>
-  <%= stylesheet_link_tag "member_select" %>
-<% end %>
-
-<div>
-  <div id="selected_users">
-    <%= render partial: 'admin/member_selects/user', collection: users, locals: {field: field} %>
-    <%= hidden_field_tag field %>
-  </div>
-  <%= link_to t(:add), '#', class: 'btn btn-primary btn-small select_user_modal', rel: select_members_admin_member_selects_path, field: field %>
-</div>

app/views/devise/sessions/new.html.erb

@@ -1,60 +1,62 @@
-    <section id="main-wrap">
+
+
       <div class="sign-in have-other-sign-in">
-<!--         <p class="alert alert-error in fade">You need to sign in.</p>
+
- -->    
+		<% flash.each do |key, msg| %>
-        <% flash.each do |key, msg| %>
+			<%= content_tag :p, msg, :class => [key, "alert alert-error"] %>
-		    <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
 		<% end %>
 
- 		<div class="form">
+        
-          <h3 class="login-logo">Log In to Orbit</h3>
+        <div class="form">
-          <div>
+          <h3 class="login-logo"><%= t(:login) %></h3>
-            <input name="utf8" type="hidden" value="" />
-            <input name="authenticity_token" type="hidden" value="" />
-          </div>
           <div class="other-sign-in">
             <% @request_hosts = request.host_with_port.split(".") %>
-            <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
+              <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://cophlogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
             <p>or</p>
           </div>
           <div class="form-block">
             <div class="form-list clearfix">
-              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+              <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
-               <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
-
                 <div class="control-group clear">
                   <label for="user_email">
                     <i class="icon-user"></i>
                   </label>
-                 	<%= f.text_field :user_id, :placeholder => t("users.user_id"), :id=>"user_email" %>
+				  <%= f.text_field :user_id, :placeholder => t("users.user_id") %>
                 </div>
                 <div class="control-group clear">
                   <label for="user_password">
                     <i class="icon-lock"></i>
                   </label>
-                  <%= f.password_field :password, :placeholder => t(:dots), :id=>"user_password" %>
+                  <%= f.password_field :password, :placeholder => t(:dots) %>
                 </div>
-                <br/>
+                <!-- <label class="checkbox">
-                <label class="checkbox">
+                  <input type="checkbox" value="">
-                <% if devise_mapping.rememberable? -%>
+                  <small>Remember me</small>
-                  <%= f.check_box :remember_me %> <small><%= f.label :remember_me %></small>
+                </label> -->
-                <% end -%>
-                </label>
-                
                 <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
-              </form>
+              <% end %>
-              
+
+              <!-- <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+                <div class="control-group clear">
+                  <label for="user_email">
+                    <i class="icon-user"></i>
+                  </label>
+                  <input type="text" id="user_id" name="user[id]" placeholder="帳號" />
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icons-mail"></i>
+                  </label>
+                  <input type="text" id="user_email" name="user[email]" placeholder="電子郵件" />
+                </div>
+                <button class="btn btn-primary" type="submit">Submit</button>
+              </form> -->
             </div>
+            <!-- <div class="switchboard"><span>Forgot Password ?</span> <i class="icons-arrow-left-2"></i></div> -->
           </div>
-          <div class="pull-right">
+          <!-- <div class="register">
-            <%= link_to content_tag(:small, t(:forgot_password)), new_user_password_path %>
-          </div>
-          <br/>
-         <!--  <div class="register">
             <button class="btn btn-inverse" type="submit">Register</button>
           </div> -->
-        <% end %>
 
         </div>
       </div>
-    </section>

app/views/layouts/_right_menu.html.erb

@@ -13,16 +13,6 @@
       </form>
     </li>
 
-    <!-- ntu sites -->
-    <li id="orbit-tag" class="dropdown">
-      <a class="dropdown-toggle orbit-bar-language" data-icons="&#xe02d;" href="#" data-toggle="dropdown"></a>
-      <ul class="dropdown-menu language-menu">
-        <% t('ntu.site_names').each do |site| %>
-          <li><%= link_to site[1], get_link(site[0]) %></li>
-        <% end %>
-      </ul>
-    </li>
-
     <!-- Language -->
     <li id="orbit-language" class="dropdown">
       <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"><%= t(:_locale, :locale => I18n.locale) %></a>
@@ -46,7 +36,7 @@
           <% if @site.desktop_closed %>
           <li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' +  t(:desktop), desktop_path, tabindex: '-1' %></li>
           <% end %>
-          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), user_logout_path, tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
           <li class="divider"></li>
           <li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
         </ul>
@@ -66,10 +56,9 @@
           </div>
           <div class="modal-body">
             <%= form_for :user, url: user_session_path, html: {class: 'container'} do |f| %>
-
               <div class="other-sign-in">
                 <% @request_hosts = request.host_with_port.split(".") %>
-                <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://galogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
+                <a class="btn btn-primary" type="submit" href="https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignin1.0&wtrealm=https://cophlogin.ntu.edu.tw/saml_login&wctx=<%= @request_hosts[0] %>">使用計中帳號登入</a>
                 <p>or</p>
               </div>
               <div class="input-prepend">
@@ -100,4 +89,4 @@
           </div>
         </div>
     <% end %>
-</ul>
+</ul>

config/locales/en.yml

@@ -351,7 +351,8 @@ en:
     brief_intro : "Brief Intro."
     complete_list : "Complete List"
     frontend_page : "Frontend Page"
-  phone_number: "Phone Number"
+    phone_number: "Phone Number"
+    sync_data: "Synchronize"
   picture: Picture
   placeholder: Field Hint
   plugins: Plugins
@@ -378,7 +379,6 @@ en:
     system_email: System Email
   preview: Preview
   profile: Profile
-  promoter: Promoter
   publications: Publications
   purchase: Purchase
   quantity: Quantity

config/locales/ntu.en.yml

@@ -1,17 +0,0 @@
-en: 
-
-  ntu:
-    rss_origin: Back to NTU Announcements
-    site_names:
-      "www": "Dean of General Affairs"
-      "sec": "Office of the Dean and Secretariat"
-      "doc": "Documentation Division"
-      "general": "General Service Division"
-      "property": "Property Management Division"
-      "construction": "Construction and Maintenance Division"
-      "cashier": "Cashier Division"
-      "procurement": "Procurement Division"
-      "fss": "Facilities Service Division"
-      "police": "Campus Security"
-      "social": "General Affairs Division, College of Social Science"
-      "medicine": "General Service Division, College of Medicine"

config/locales/ntu.zh_tw.yml

@@ -1,17 +0,0 @@
-zh_tw: 
-
-  ntu:
-    rss_origin: 回臺大校園公佈欄
-    site_names:
-      "www": "總務處"
-      "sec": "總務長室暨總務處秘書室"
-      "doc": "文書組"
-      "general": "事務組"
-      "property": "保管組"
-      "construction": "營繕組"
-      "cashier": "出納組"
-      "procurement": "採購組"
-      "fss": "經營管理組"
-      "police": "駐警隊"
-      "social": "社科院總務分處"
-      "medicine": "醫學院總務分處"

config/locales/zh_tw.yml

@@ -354,7 +354,8 @@ zh_tw:
     brief_intro : "摘要"
     complete_list : "完整列表"
     frontend_page : "前台呈現"
-  phone_number: "電話"
+    phone_number: "電話"
+    sync_data: "同步資料"
   picture: 圖片
   placeholder: 欄位提示文字
   plugins: 學術資訊
@@ -380,7 +381,6 @@ zh_tw:
     sidebar_nav: 側欄導引
     system_email: 系統信箱
   profile: 基本資料
-  promoter: 承辦人
   publications: 著作
   purchase: 購買
   quantity: 數量

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: orbit_site_new
+  database: ntu_mb_orbit_2_new
 
 
 
 test:
   <<: *defaults
-  database: orbit_site_new
+  database: ntu_mb_orbit_2_new
 
 # set these environment variables on your prod server
 production:
@@ -24,4 +24,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: orbit_site_new
+  database: ntu_mb_orbit_2_new

config/routes.rb

@@ -7,7 +7,7 @@ Orbit::Application.routes.draw do
     resources :passwords, :except => [:index, :show, :destroy]
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end
-
+  
   devise_scope :user do
     get 'user_login' => 'sessions#create'
     match 'user_logout' => 'sessions#destroy'
@@ -223,6 +223,19 @@ Orbit::Application.routes.draw do
       get 'update_orbit'
       get 'restart_server'
     end
+    
+    get "import_data/get_teacher_data"
+    get "import_data/get_book_data"
+    get "import_data/get_conference_data"
+    get "import_data/get_journal_paper_data"
+    get "import_data/get_announcement_data"
+    get "import_data/get_page_data"
+    get "import_data/sync_book_data"
+    get "import_data/sync_journal_paper_data"
+    get "import_data/sync_conference_data"
+    get "import_data/sync_book_data_auto"
+    get "import_data/sync_journal_paper_data_auto"
+    get "import_data/sync_conference_data_auto"
 
     resources :tags do
       collection do

config/schedule.rb

@@ -0,0 +1,20 @@
+# Use this file to easily define all of your cron jobs.
+#
+# It's helpful, but not entirely necessary to understand cron before proceeding.
+# http://en.wikipedia.org/wiki/Cron
+
+# Example:
+#
+# set :output, "/path/to/my/cron_log.log"
+#
+ every 1.day, :at => '11:00 pm' do
+#   command "/usr/bin/some_great_command"
+#   runner "MyModel.some_method"
+   	rake "rake synchronize:data"
+ end
+#
+# every 4.days do
+#   runner "AnotherModel.prune_old_records"
+# end
+
+# Learn more: http://github.com/javan/whenever

lib/tasks/import_teachers.rake

@@ -0,0 +1,58 @@
+#encoding: utf-8
+namespace :teacher do
+	task :import, [:department,:category] => :environment do |t, args|
+		department = "#{args.department}"
+		teacher_role = Role.where(:key=>"teacher").first
+		role_fulltime = RoleStatus.where(:key=>"1.fulltime").first
+		role_adjunct = RoleStatus.where(:key=>"2.adjunct").first
+		role_category = RoleCategory.where(:key=>"#{args.category}").first
+		@teacher = []
+		CSV.foreach("#{Rails.root}/#{department}.csv") do |row|
+			@teacher.push(row)
+		end
+		@teacher.each do |teacher|
+			sex = "unknown"
+			if teacher[2]=="男"
+				sex = "male"
+			elsif teacher[2]=="女"
+				sex = "female"
+			end
+
+			role_status = ""
+			if teacher[3].include? "兼任"
+				role_status = role_adjunct
+			else
+				role_status = role_fulltime
+			end
+					
+			if teacher[1].blank?
+				teacher[1] = " "
+			end
+
+			user_data = {
+				:user_id => teacher[5].split("@")[0],
+				:password => "password",
+				:first_name_translations =>{"zh_tw"=>teacher[0].split(teacher[0][0])[1],"en"=>teacher[1].split(" ")[1]},
+				:last_name_translations => {"zh_tw"=>teacher[0][0],"en"=>teacher[1].split(" ")[0]},
+				:roles => [teacher_role],
+				:role_statuses => [role_status],
+				:role_categorys => [role_category],
+				:office_tel => teacher[4],
+				:email => teacher[5],
+				:confirmation_token => nil,
+				:confirmed_at => Time.now,
+				:approved => true,
+				:sex => sex
+			}
+
+			if User.where(:email=>teacher[5]).count == 0
+				user = User.new(user_data)
+				user.save
+			else
+				user = User.where(:email=>teacher[5]).first
+				user.update_attributes(user_data)
+
+			end
+		end
+	end
+end

lib/tasks/synchronize.rake

@@ -0,0 +1,12 @@
+# encoding: utf-8 
+namespace :synchronize do
+ desc "synchronize tasks"
+ task :data => :environment do
+   	p Admin::ImportDataController.new.sync_book_data_auto
+   	puts "Book Data Synchronization Complete"
+   	p Admin::ImportDataController.new.sync_journal_paper_data_auto
+   	puts "Journal Paper Data Synchronization Complete"
+   	p Admin::ImportDataController.new.sync_conference_data_auto
+   	puts "Conference Data Synchronization Complete"
+ end
+end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -64,7 +64,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1/edit
   def edit
     @bulletin = Bulletin.find(params[:id])
-    @users = @bulletin.get_users
     @tags = get_tags
     is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil
 

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -24,13 +24,10 @@ class Bulletin
 
   field :create_user_id
   field :update_user_id, :class_name => "User"
-  field :user_ids
   
   field :view_count, :type => Integer, :default => 0
   
   field :public, :type => Boolean, :default => true
-  field :rss_link
-
 
   mount_uploader :image, ImageUploader
 
@@ -152,9 +149,6 @@ class Bulletin
     preview_object
   end
 
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
 
   protected
 

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -64,14 +64,6 @@
           <%= f.datetime_picker :deadline, :no_label => true %>
         </div>
       </div>
-      
-      <!-- Promoter -->
-      <div class="control-group">
-        <label class="control-label muted"><%= t(:promoter) %></label>
-        <div class="controls">
-          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'bulletin[user_ids][]', users: @users} %>
-        </div>
-      </div>
 
     </div>
 

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -36,21 +36,6 @@
 			</div>
 		</div>
 	<% end %>
-	<% unless @bulletin.rss_link.blank? %>
-		<div>
-			<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
-		</div>
-	<% end %>
 </div>
 
-<% unless @bulletin.user_ids.blank? %>
-	<div class="promoter">
-		<div>
-			<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @bulletin.get_users} %>
-		</div>
-	</div>
-<% end %>
-
 <%= share_links(@bulletin, 'announcement') %>
-
-

vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb

@@ -87,7 +87,6 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
   # GET /archive_files/1/edit
   def edit
     @archive_file = ArchiveFile.find(params[:id])
-    @users = @archive_file.get_users
     if !current_user.admin?
       redirect_to :action => :index
     else

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -22,8 +22,6 @@ class ArchiveFile
   field :title, localize: true
   field :create_user_id
   field :update_user_id, :class_name => "User"
-  field :user_ids
-
   
   scope :can_display,where(is_hidden: false)
 
@@ -75,10 +73,6 @@ class ArchiveFile
 
   end
 
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
-
 
   def get_file_icon( file_data )
     file_icon = "<span class=\"o-archives-file-type\">#{file_data.split('.')[-1]}</span>".html_safe

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -54,14 +54,6 @@
         </div>
       </div> 
 
-      <!-- Promoter -->
-      <div class="control-group">
-        <label class="control-label muted"><%= t(:promoter) %></label>
-        <div class="controls">
-          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'archive_file[user_ids][]', users: @users} %>
-        </div>
-      </div>
-
     </div>
 
     <!-- Status Module -->

vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb

@@ -9,19 +9,19 @@
 				<tr>
 					<th class="column-ctrl col-title"><%= sortable(:title, t("archive.Title"))%></th>
 					<th class="column-ctrl col-file"><%= t("archive.Files")%></th>
-					<th class="column-ctrl col-promoter"><%= t(:promoter)%></th>
+					<th class="column-ctrl col-category"><%= sortable(:archive_file_category, t("archive.Category"))%></th>
 				</tr>
 			</thead>
 			<tbody>
 
 				<% @archive_files.each_with_index do |post,i| %>
 				<tr <% if ( (i + 1) % 2 ) == 0 %> class="even" <% end %>>
-					<td class="col-title">
+					<td>
 						<div class="o-archives-title"><%= post.title %>
 						<% if !post.is_hot.blank? %><span class="o-archives-hot"><%= t('hot')%></span><% end %>
 						</div>
 					</td>
-					<td class="col-file">
+					<td>
 						<div class="o-archives-list-item">
 							<% if !post.archive_file_multiples.blank? %>
 							<ol>
@@ -37,21 +37,9 @@
 							<% end %>
 						</div>
 					</td>
-					<td class="col-promoter">
+					<td><div class="o-archives-category">
-						<% unless post.get_users.blank? %>
+						<%= post.category.title if !post.category.blank? %>
-							<div class="promoter-block">
+					</div></td>
-						    <ul>
-						      <% post.get_users.each do |user| %>
-						        <li class="promoter">
-						          <p>
-						              <%= link_to user.name, "mailto:#{user.email}", class: "promoter-name" %> / <span class="promoter-phone"><%= user.office_tel %></span>
-						          </p>
-						        </li>
-						      <% end %>
-						    </ul>
-						  </div>
-					  <% end %>
-					</td>
 				</tr>
 				<% end %>
 

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/asK_requests_controller.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-class Panel::Ask::BackEnd::AskRequestsController < OrbitBackendController
-  include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
-
-  #before_filter :for_app_manager
-  skip_before_filter :verify_authenticity_token
-  open_for_visitor :only => [:transferred_request]
-
-  def transferred_request
-    app_title = request.fullpath.split('/')[2]
-    module_app ||= ModuleApp.first(conditions: {:key => app_title} )
-
-    if request.headers["HTTP_X_AUTH_TOKEN"] == '3kjlfksjDFJ' 
-      if !module_app.categories.where("title.en" => "Transferred Question").any?
-        ask_category = module_app.categories.build
-        ask_category.title_translations = { "zh_tw" => "轉介的問題", "en" => "Transferred Question" }
-        ask_category.save!
-      end
-
-      module_app.categories.enabled
-      category = module_app.categories.where("title.en" => "Transferred Question").first
-
-      @transferred_question = AskQuestion.new(
-        name:     params['name'],
-        identity: params['identity'],
-        email:    params['email'],
-        phone:    params['phone'],
-        tax:      params['tax'],
-        title:    params['title'],
-        content:  params['content'],
-        category_id: category.id)
-
-      @transferred_question.ask_reply = AskReply.new
-      @transferred_question.ask_reply.update_attributes(status: "待處理 (轉)")
-      @transferred_question.save
-
-      render :nothing => true
-    else
-      render :status => 500 
-    end
-  end
-end
-

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_acknowledgements_controller.rb

@@ -1,14 +1,13 @@
 class Panel::Ask::BackEnd::AskAcknowledgementsController < OrbitBackendController
-  #include AdminHelper
+  include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
+  include OrbitControllerLib::DivisionForDisable
 
-  #before_filter :for_app_manager
+  before_filter :for_app_manager
-  open_for_manager
 
-  #def initialize
+  def initialize
-  #  super
+    super
-  #  @app_title = 'ask_acknowledgement'
+    @app_title = 'ask_acknowledgement'
-  #end
+  end
 
   def index
     @ask_acknowledgement = AskAcknowledgement.first || AskAcknowledgement.create

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_admins_controller.rb

@@ -1,15 +1,14 @@
 class Panel::Ask::BackEnd::AskAdminsController < OrbitBackendController
 
-  #include AdminHelper
+  include AdminHelper
-  #include OrbitControllerLib::DivisionForDisable
+  include OrbitControllerLib::DivisionForDisable
 
-  #before_filter :for_app_manager
+  before_filter :for_app_manager
-  open_for_manager
 
-  #def initialize
+  def initialize
-  #  super
+    super
-  #  @app_title = 'ask_admins'
+    @app_title = 'ask_admins'
-  #end
+  end
 
   def index
     @ask_admins = AskAdmin.all

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_questions_controller.rb

@@ -1,11 +1,11 @@
-class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
+require 'csv'
-  
-  require 'csv'
 
-  # def initialize
+class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
-  #   super
+
-  #   @app_title = 'ask_questions'
+  def initialize
-  # end
+    super
+    @app_title = 'ask_questions'
+  end
 
   def index
     @ask_questions = AskQuestion.all
@@ -53,12 +53,10 @@ class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
     Rails.application.config.mongoid.use_activesupport_time_zone = true
     date_start = "#{params[:export]['start(1i)']}-#{params[:export]['start(2i)']}-#{params[:export]['start(3i)']}"
     date_end = "#{params[:export]['end(1i)']}-#{params[:export]['end(2i)']}-#{params[:export]['end(3i)']}"
-    #@ask_questions = AskQuestion.includes(:ask_category).includes(:ask_reply).where(:created_at.gte => date_start, :created_at.lte => date_end)
+    @ask_questions = AskQuestion.includes(:ask_category).includes(:ask_reply).where(:created_at.gte => date_start, :created_at.lte => date_end)
-	@ask_questions = AskQuestion.where(:created_at.gte => date_start, :created_at.lte => date_end)
 
     csv = CSV.generate do |csv|
-      csv << [ t('status'),
+      csv << [ t('category'),
-               t('category'),
                AskQuestion.human_attribute_name(:name),
                AskQuestion.human_attribute_name(:identity),
                AskQuestion.human_attribute_name(:email),
@@ -70,8 +68,7 @@ class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
                AskReply.human_attribute_name(:comment)]
       @ask_questions.each do |ask_question|
         ask_question.ask_reply ||= AskReply.new
-        csv << [ ask_question.ask_reply.status,
+        csv << [ ask_question.ask_category.name,
-                 ask_question.category.title,
                  ask_question.name,
                  ask_question.identity,
                  ask_question.email,

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_replies_controller.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
 
   include AdminHelper
@@ -14,122 +13,19 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
   def create
     @ask_question = AskQuestion.find(params[:ask_question_id])
     @ask_question.ask_reply = AskReply.new(params[:ask_reply])
-    @ask_reply = @ask_question.ask_reply
     @ask_question.save
-
     if @ask_question.ask_reply.send_email?
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
-
-    status_stack = []
-    new_status = ""
-    params[:ask_reply][:depts].each do |dns|
-      # host = dns.split(":").first # local test
-
-      begin
-        status_stack << send_request(dns, @ask_reply.ask_question, @ask_reply) # local test, switch host to dns if on server
-      rescue
-        status_stack << "fail"
-      end
-    end if params[:ask_reply][:status] == "轉介其他單位"
-
-    success_count   = status_stack.count("success")
-    failed_count    = status_stack.count("fail")
-
-    if failed_count == 0 && success_count > 0
-      new_status = "轉介其他單位"
-    elsif failed_count > 0 && success_count > 0
-      new_status = "部份轉介失敗"
-    elsif failed_count > 0 && success_count == 0
-      new_status = "轉介失敗"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
-      new_status = "待處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
-      new_status = "已處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
-      new_status = "轉介失敗"
-    end
-
-    @ask_reply.update_attributes(status: new_status)
-
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
 
   def update
-
     @ask_reply = AskReply.find(params[:id])
     @ask_reply.update_attributes(params[:ask_reply])
-
     if @ask_reply.send_email?
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
-
-    status_stack = []
-    new_status = ""
-    params[:ask_reply][:depts].each do |dns|
-      # host = dns.split(":").first # local test
-
-      begin
-        status_stack << send_request(dns, @ask_reply.ask_question, @ask_reply) # local test, switch host to dns if on server
-      rescue
-        status_stack << "fail"
-      end
-    end if params[:ask_reply][:status] == "轉介其他單位"
-
-    success_count   = status_stack.count("success")
-    failed_count    = status_stack.count("fail")
-
-    if failed_count == 0 && success_count > 0
-      new_status = "轉介其他單位"
-    elsif failed_count > 0 && success_count > 0
-      new_status = "部份轉介失敗"
-    elsif failed_count > 0 && success_count == 0
-      new_status = "轉介失敗"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
-      new_status = "待處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
-      new_status = "已處理"
-    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
-      new_status = "轉介失敗"
-    end
-
-    @ask_reply.update_attributes(status: new_status)
-
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
-
-  private
-
-  def send_request(dep_dns, current_question, current_reply)
-    require 'net/http'
-    require 'uri'
-    require 'json'
-
-    uri_path = "/panel/ask/back_end/ask_requests/transferred_request"
-    http = Net::HTTP.new(dep_dns, 80) # port 4000 for local test, switch to port 80 for deployment
-    req = Net::HTTP::Post.new(uri_path)
-
-    body = {
-      'name' => current_question.name,
-      'title' => current_question.title,
-      'identity' => current_question.identity,
-      'email' => current_question.email,
-      'phone' => current_question.phone,
-      'tax' => current_question.tax,
-      'content' => current_question.content
-    }
-
-    status = ""
-    req.set_form_data(body)
-    req.add_field 'X-Auth-Token', '3kjlfksjDFJ'
-    response = http.request(req)
-
-    if response.code == "200" 
-      status = "success" 
-    else
-      status = "fail"
-    end 
-
-    return status
-  end
 end

vendor/built_in_modules/ask/app/models/ask_reply.rb

@@ -6,7 +6,6 @@ class AskReply
   field :comment, type: String
   field :status, type: String
   field :send_email, type: Boolean, detault: false
-  field :depts, :type => Array
 
   belongs_to :ask_question
 end

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_questions/edit.html.erb

@@ -1,45 +1,3 @@
-<script type="text/javascript">
-var local_host = "<%= request.host %>";
-
-// var local_host = "<%= request.host_with_port %>"; // local test
-
-if (local_host[0] == "g" && local_host[1] == "a") {
-    local_host = "www." + local_host;
-}
-
-function hide_current_host_name(localhost) {
-  $('input[type=checkbox]').each(function() {
-    if ($(this).val() == local_host) {
-      $(this).addClass("hide");
-      $(this).next().addClass("hide");
-    }
-  });
-}
-
-$(document).ready(function() {
-
-  $('.dept_options').hide();
-
-  if ($("#ask_reply_status").val() == '轉介其他單位') {
-
-    hide_current_host_name(local_host);
-
-    $('.dept_options').show();
-  }
-
-  $("#ask_reply_status").change(function() {
-
-    hide_current_host_name(local_host);
-
-    $('.dept_options').slideUp();
-    if ($(this).find('option:selected').attr('value') == '轉介其他單位') {
-      $('.dept_options').slideDown();
-    }
-  });
-});
-
-</script>
-
 <div id="ask_question_reply">
   <%= form_for @ask_reply, url: @url, method: @method do |f| %>
     <table class="table">
@@ -74,26 +32,6 @@ $(document).ready(function() {
           ['轉介其他單位', '轉介其他單位']
         ] %></td>
       </tr>
-      <tr>
-        <td colspan="5" class="dept_options">
-          <div class="checkbox">
-<!--             <%= check_box("school", "depts", {:multiple => true}, (request.host + ":3000"), nil) %><%= label_tag((request.host + ":3000"), "測試站 3000") %>
-            <%= check_box("school", "depts", {:multiple => true}, (request.host + ":4000"), nil) %><%= label_tag((request.host + ":4000"), "測試站 4000") %> -->
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "www.ga.ntu.edu.tw", nil) %><%= label_tag("www.ga.ntu.edu.tw", "總務處") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "sec.ga.ntu.edu.tw", nil) %><%= label_tag("sec.ga.ntu.edu.tw", "總務長室暨總務處秘書室") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "doc.ga.ntu.edu.tw", nil) %><%= label_tag("doc.ga.ntu.edu.tw", "文書組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "general.ga.ntu.edu.tw", nil) %><%= label_tag("general.ga.ntu.edu.tw", "事務組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "property.ga.ntu.edu.tw", nil) %><%= label_tag("property.ga.ntu.edu.tw", "保管組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "construction.ga.ntu.edu.tw", nil) %><%= label_tag("construction.ga.ntu.edu.tw", "營繕組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "cashier.ga.ntu.edu.tw", nil) %><%= label_tag("cashier.ga.ntu.edu.tw", "出納組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "procurement.ga.ntu.edu.tw", nil) %><%= label_tag("procurement.ga.ntu.edu.tw", "採購組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "fss.ga.ntu.edu.tw", nil) %><%= label_tag("fss.ga.ntu.edu.tw", "經營管理組") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "police.ga.ntu.edu.tw", nil) %><%= label_tag("police.ga.ntu.edu.tw", "駐警隊") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "social.ga.ntu.edu.tw", nil) %><%= label_tag("social.ga.ntu.edu.tw", "社科院總務分處") %>
-            <%= check_box("ask_reply", "depts", {:multiple => true}, "medicine.ga.ntu.edu.tw", nil) %><%= label_tag("medicine.ga.ntu.edu.tw", "醫學院總務分處") %>
-          </div>
-        </td>
-      </tr>  
       <tr>
         <td colspan="5">
           <%= f.label :send_email %><%= f.radio_button :send_email, 1, checked: @ask_reply.send_email? %><%= t('ask.yes') %>

vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb

@@ -84,11 +84,8 @@ $(document).ready(function(){
         <%= f.text_area :content, rows: 8, class: 'input-xlarge' %>
       </div>
     </div>
-
    <div class="control-group">
-      <%= f.label t('ask.validate_code'), class: 'control-label required' %>
       <div class="controls">
-        <label><%= t('ask.validate_code_note') %></label>
         <%= gotcha_error %>
         <%= gotcha%>
       </div>

vendor/built_in_modules/ask/config/locales/en.yml

@@ -17,8 +17,6 @@ en:
     admin: Administrator
     new_question: New question
     pending: Pending
-    validate_code: Verification code
-    validate_code_note: Please answer the following verification questions.
   mongoid:
     attributes:
       ask_question:

vendor/built_in_modules/ask/config/locales/zh_tw.yml

@@ -22,8 +22,6 @@ zh_tw:
     admin: 管理者
     new_question: 新的發問
     pending: 待處理
-    validate_code: 驗證碼
-    validate_code_note: 請回答下列驗證問句。
   mongoid:
     attributes:
       ask_question:

vendor/built_in_modules/ask/config/routes.rb

@@ -15,8 +15,6 @@ Rails.application.routes.draw do
         resources :ask_categories
         resources :ask_acknowledgements
         resources :ask_admins
-
-	match "ask_requests/transferred_request" => "ask_requests#transferred_request", :as => 'transferred_request', :via => :post
       end
 
       namespace :front_end do

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb

@@ -80,7 +80,7 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale) rescue ""
 									   if @job_title != 'NoData' and !@job_title.blank?
 									%>
 									<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>

vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb

@@ -4,7 +4,6 @@
 
 <% @job_title_field = @member_lists.get_member_list_attribute_field("staff","job_title") %>
 <% @job_business_field = @member_lists.get_member_list_attribute_field("staff","business") %>
-<% @job_agent_field = @member_lists.get_member_list_attribute_field("staff","agent") %>
 		
 		<% if @item.frontend_style == 'Single' or @item.frontend_style == 'Two' %>
 
@@ -59,15 +58,6 @@
 										<%= @job_business %>
 									</li>
 									<% end %>
-									
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<li><b class="o-members-label">
-										<%= @job_agent_field.title %></b>
-										<%= @job_agent %>
-									</li>
-									<% end %>
 								</ul>
 							</li>
 
@@ -120,15 +110,6 @@
 										<%= @job_business %>
 									</li>
 									<% end %>
-									
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<li><b class="o-members-label">
-										<%= @job_agent_field.title %></b>
-										<%= @job_agent %>
-									</li>
-									<% end %>
 								</ul>
 							</li>
 
@@ -172,7 +153,6 @@
 									<td><span class="name"><%= t("users.name")%></span></td>
 									<td><span class="tel"><%= t("users.office_tel")%></span></td>
 									<td><span class="business"><%= @job_business_field.title %></span></td>
-									<td><span class="agent"><%= @job_agent_field.title %></span></td>
 								</tr>
 							</thead>
 
@@ -201,15 +181,6 @@
 									<% end %>
 									</span>
 								</td>
-								<td>
-									<span class="agent">
-									<% @job_agent = @member_lists.get_member_list_attribute_value(member.id,@job_agent_field.id).get_value_by_locale(I18n.locale)
-									   if @job_agent != 'NoData' and !@job_agent.blank?
-									%>
-									<%= @job_agent %>
-									<% end %>
-									</span>
-								</td>
 							</tr>
 							
 							<% end %>

vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb

@@ -48,7 +48,6 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
   # GET /page_contexts/1/edit
   def edit
     @page_context = PageContext.find(params[:id])
-    @users = @page_context.get_users
   end
 
   # POST /page_contexts

vendor/built_in_modules/page_content/app/models/page_context.rb

@@ -15,7 +15,6 @@ class PageContext
   field :update_user_id
   field :version, :type => Integer , :default => 0
   field :view_count, :type => Integer, :default => 0
-  field :user_ids
   
   field :archived, :type => Boolean, :default => false
   # field :current, :type => Boolean, :default => false
@@ -37,9 +36,5 @@ class PageContext
   def title
     self.page.title
   end
-
-  def get_users
-    User.find(self.user_ids) rescue []
-  end
   
 end

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb

@@ -4,33 +4,6 @@
 
 <fieldset>
 	<div class="input-area">
-
-	  <!-- Module Tabs -->
-	  <div class="nav-name"><strong><%= t(:module) %></strong></div>
-	  <ul class="nav nav-pills module-nav">
-	    <li class="active">
-	      <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
-	    </li>
-	  </ul>
-
-	  <!-- Module -->
-	  <div class="tab-content module-area">
-
-	    <!-- Basic Module -->
-	    <div class="tab-pane fade in active" id="basic">
-
-	      <!-- Promoter -->
-	      <div class="control-group">
-	        <label class="control-label muted"><%= t(:promoter) %></label>
-	        <div class="controls">
-	          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'page_context[user_ids][]', users: @users} %>
-	        </div>
-	      </div>
-
-	    </div>
-
-	  </div>
-
 	  <!-- Language Tabs -->
 	  <div class="nav-name"><strong><%= t(:language) %></strong></div>
 	  <ul class="nav nav-pills language-nav">

vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb

@@ -8,4 +8,4 @@
 
 <div class="page_content"><%= @page_context.context.html_safe rescue '' %></div>
 
-<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @page_context.get_users} %>
+

vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js

@@ -92,6 +92,16 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
         width: $(".overview").width() - 20
       });
   }
+  
+  this.initializePersonalBook.syncComplete = function(){
+      o.notify("Sync Complete","success");
+      o.sub_menu_item($("div[content-type=menu] a").eq(0));
+  } 
+
+  this.initializePersonalBook.syncComplete = function(){
+      o.notify("Sync Complete","success");
+      o.sub_menu_item($("div[content-type=menu] a").eq(0));
+  }
 
   this.initializePersonalBook.coAuthorformCallback = function(data){
     if(data.success){

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb

@@ -7,7 +7,7 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl
     page ||= 1
 
     @per_column = 5
-
+    @userid = current_user.id
     case @view_by
     when "abstract"
       @per_column = 1
@@ -70,4 +70,4 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl
   def books_window
     render :layout => false
   end
-end
+end

vendor/built_in_modules/personal_book/app/models/writing_book.rb

@@ -84,20 +84,13 @@ class WritingBook
   
   def create_link
     title = []
-    title << self.authors if self.authors.present?
+    # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present?
-
+    title << self.paper_title if self.paper_title.present?
-    # title << self.paper_title if self.paper_title.present?
     title << self.book_title if self.book_title.present?
     title << self.publisher if self.publisher.present?
-    title << self.isbn if self.isbn.present?
+    title << self.pages if self.pages.present?
-
-    if !self.publish_date.nil?
-      pd = self.publish_date.strftime("%Y-%m-%d").split('-')
-      title << pd[0]+"/"+pd[1]
-    end
-
     # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})"
-    title.join(', ') 
+    title.join(', ')
   end
 
   protected

vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb

@@ -57,6 +57,9 @@
       </ul>
     </div>
   </div>
+    <div class="hh1 hp sdm">
+      <div class="sdm_t hh1"><a href="<%= admin_import_data_sync_book_data_path(:user_id=>@userid) %>" class="icons-cycle" ajax-remote="get" response-type="json" callback-method="syncComplete" > Sync Books</a></div>
+    </div>
   <div class="hh1 hp sdm">
     <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>
@@ -67,4 +70,4 @@
           <%= publication_record w, @view_by%>
         <% end %>
       </ul>
-    </div>
+    </div>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb

@@ -75,8 +75,9 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_book_back_end_personal_book_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_book_data_path(:user_id => @user.id), :class => 'btn btn-primary' %>
-		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_book_back_end_personal_book_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js

@@ -42,7 +42,10 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
   this.initializeConferencePapers.cancelpaper = function(){
     o.highlight_sub_menu_item(0);
   }
-
+  this.initializeConferencePapers.syncComplete = function(){
+      o.notify("Sync Complete","success");
+      o.sub_menu_item($("div[content-type=menu] a").eq(0));
+  }
   var uploadFiles = function(){
     $('#add_plugin_file a.add').click(function(){
       var new_id = $(this).prev().attr('value');

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb

@@ -4,7 +4,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
     @writing_conferences = WritingConference.where(create_user_id: current_user.id)
     page = params[:page]
     page ||= 1
-
+    @userid = current_user.id
     if @view_by.nil?
       @writing_conferences = @writing_conferences.asc(:paper_title)
     else

vendor/built_in_modules/personal_conference/app/models/writing_conference.rb

@@ -84,21 +84,13 @@ class WritingConference
   end
 
   def create_link
-    title = []
+    title = ["#{self.paper_title}"]
-
-    title << self.authors if self.authors.present?
-
-    if !self.publication_date.nil?
-      pd = self.publication_date.strftime("%Y-%m-%d").split('-')
-      title << pd[0]
-    end
-
-    title << self.paper_title if self.paper_title.present?
     title << self.conference_title if self.conference_title.present?
+    title << self.sponsor if self.sponsor.present?
     title << self.location if self.location.present?
     title << "#{period_start_date}-#{period_end_date}" if (self.period_start_date.present? && self.period_end_date.present?)
     # title << "(#{self.conference_paper_types.collect{|x| x.title}.join(', ')})"
-    title.join(', ') 
+    title.join(', ')
   end
 
   protected

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb

@@ -58,6 +58,10 @@
       </ul>
     </div>
   </div>
+  
+  <div class="hh1 hp sdm">
+      <div class="sdm_t hh1"><a href="<%= admin_import_data_sync_conference_data_path(:user_id => @userid) %>" class="icons-cycle" ajax-remote="get" response-type="json" callback-method="syncComplete" > Sync Conference Papers</a></div>
+    </div>
   <div class="hh1 hp sdm">
     <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb

@@ -75,8 +75,9 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_conference_data_path(:user_id => @user.id), :class => 'btn btn-primary' %>
-		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js

@@ -33,6 +33,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   }
   this.initializeJournalPapers.paperDelete = function(data,dom){
     var parent = dom.parent().parent().parent();
+    // console.log(parent);    
     if(data.success){
       parent.hide("slide",function(){parent.remove();});
       o.notify(data.msg,"success");
@@ -42,6 +43,10 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   this.initializeJournalPapers.cancelpaper = function(){
     o.highlight_sub_menu_item(0);
   }
+   this.initializeJournalPapers.syncComplete = function(){
+      o.notify("Sync Complete","success");
+      o.sub_menu_item($("div[content-type=menu] a").eq(0));
+  }
 
   var uploadFiles = function(){
     $('#add_plugin_file a.add').click(function(){

vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb

@@ -7,7 +7,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
     page ||= 1
 
     @per_column = 5
-
+    @userid = current_user.id
     case @view_by
     when "abstract"
       @per_column = 1

vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb

@@ -81,6 +81,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
         "ajax-remote" => "delete",
         "confirm-message" => t("sure?"),
         "callback-method" => "paperDelete",
+        "response-type" => "json",
         "delete-item" => "true",
         :class => "journal_paper_delete admbg2 admtxt",
         :href => panel_personal_journal_desktop_journal_page_path(publication))

vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

@@ -90,21 +90,13 @@ class WritingJournal
   end
 
   def create_link
-    title = []
+    title = ["#{self.paper_title}"]
-
-    title << self.authors if self.authors.present?
-
-    if !self.publication_date.nil?
-      pd = self.publication_date.strftime("%Y-%m-%d").split('-')
-      title << pd[0]
-    end
-    title << self.paper_title if self.paper_title.present?
     title << self.journal_title if self.journal_title.present?
-    title << self.vol_no if (self.vol_no.present? && self.vol_no != "0")
-    title << self.issue_no if (self.issue_no.present? && self.issue_no != "0")
-    title << "pp"+self.form_to_start+"-"+self.form_to_end if (self.form_to_start.present? && self.form_to_start != "0")
     title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil)
-    title.join(', ') 
+    title << "Volume No: "+self.vol_no if (self.vol_no.present? && self.vol_no != "0")
+    title << "From Page: "+self.form_to_start if (self.form_to_start.present? && self.form_to_start != "0")
+    title << "To Page: "+self.form_to_end if (self.form_to_end.present? && self.form_to_end != "0")
+    title.join(', ')
   end
 
   def new_writing_journal_files=(var)

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb

@@ -58,6 +58,9 @@
       </ul>
     </div>
   </div>
+  <div class="hh1 hp sdm">
+      <div class="sdm_t hh1"><a href="<%= admin_import_data_sync_journal_paper_data_path(:user_id => @userid) %>" class="icons-cycle" ajax-remote="get" response-type="json" callback-method="syncComplete" > Sync Journal Papers</a></div>
+    </div>
   <div class="hh1 hp sdm">
     <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
   </div>
@@ -68,4 +71,4 @@
         <%= publication_record w, @view_by%>
       <% end %>
     </ul>
-    </div>
+    </div>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb

@@ -80,8 +80,9 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_journal_paper_data_path(:user_id => @user.id), :class => 'btn btn-primary' %>
-		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

@@ -1,8 +1,6 @@
-class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
+require 'csv'
 
-  require 'csv'
+class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
-  require 'iconv'
-  require 'roo'
 
   include AdminHelper
   include OrbitControllerLib::DivisionForDisable
@@ -107,145 +105,6 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
     redirect_to panel_survey_back_end_surveys_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
 
-  def set_import
-    @survey = ::Survey.find(params[:id])
-  end
-
-  def import
-    @survey = ::Survey.find(params[:id])
-    @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data
-    @file = params[:file]
-
-    case File.extname(@file.original_filename)
-      when ".csv" then @spreadsheet = Roo::CSV.new(@file.path, csv_options: {encoding: Encoding::Big5})
-      # when ".xls" then Excel.new(file.path, nil, :ignore)
-      # when ".xlsx" then Excelx.new(file.path, nil, :ignore)
-      else raise "Unknown file type: #{file.original_filename}"
-    end
-
-    # Modify titles if changed
-    titles = @spreadsheet.row(1) - [" "]
-    @survey_questions.each_with_index do |question, index|
-      question.update_attributes(title: titles[index])
-    end
-    
-    @survey_answers.destroy
-    
-    # Start and end of speadsheet
-    @end_row = @spreadsheet.count
-
-    @max_row_start = 0
-    @survey_questions.each do |question|
-      case question.type
-      when ::SurveyQuestion::Radio, ::SurveyQuestion::Select, ::SurveyQuestion::Check
-        if question.survey_question_options.count > @max_row_start
-          @max_row_start = question.survey_question_options.count
-        end  
-      when ::SurveyQuestion::Radiogroup
-        if question.survey_question_options.count * question.survey_question_radiogroups.count > @max_row_start
-          @max_row_start = question.survey_question_options.count * question.survey_question_radiogroups.count
-        end
-      end  
-    end  
-    @start_row = @max_row_start + 2
-
-    # Modify multiline options if changed
-    (@start_row..@end_row).each do |row|
-      @answer_model = @survey.survey_answers.new
-      @survey_questions.each_with_index do |question, index|
-        case question.type
-
-        when ::SurveyQuestion::Oneline, ::SurveyQuestion::Multiline
-          @answer_model[question.id.to_s] = @spreadsheet.row(row)[index * 2]
-
-        when ::SurveyQuestion::Radio, ::SurveyQuestion::Select
-          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
-            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2]
-          end
-
-        when ::SurveyQuestion::Check
-          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
-            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2].split("\"").select.each_with_index { |str, i| i.odd? }
-          end
-
-        when ::SurveyQuestion::Radiogroup
-          radio_groups = []
-          spreadsheet_radiogroups_lines = 
-            question.survey_question_options.count * question.survey_question_radiogroups.count + 2
-          
-          # Grab each radiogroups line for update
-          (2...spreadsheet_radiogroups_lines).each do |line|
-            radio_groups << @spreadsheet.row(line)[index * 2]
-          end
-
-          # Grab answers info
-          answers = []
-          if not @spreadsheet.row(row)[index * 2].blank?
-            answers << eval(@spreadsheet.row(row)[index * 2])
-          end
-
-          # Save the answers
-          answers.each do |answer|
-            options = Hash[question.survey_question_options.collect { |o| [ o.id.to_s, o.name ] }]
-            # @answer_model = @survey.survey_answers.new
-            @answer_model[question.id.to_s] = {}
-
-            answer.each do |option, value|
-              @answer_model[question.id.to_s][options.invert[option]] = value
-            end
-
-            # @answer_model.save!
-          end
-
-          # Parse the needed info in the array
-          radio_titles = []
-          radio_options = []
-          radio_groups.each do |group|
-            option_with_radio = group.split(' - ')
-            radio_titles << option_with_radio[0]
-            radio_options << option_with_radio[1]
-          end
-
-          # Update the spreadsheet info to the DB
-          groups_of_options = []
-          groups_of_radios  = []
-          radio_titles.each_slice(question.survey_question_radiogroups.count) do |options|
-            groups_of_options << options
-          end
-
-          radio_options.each_slice(question.survey_question_radiogroups.count) do |options|
-            groups_of_radios << options
-          end
-
-          # Update option names
-          question.survey_question_options.each_with_index do |option, index|
-            groups_of_options[index].each do |modified_option|
-              if option.name_translations["zh_tw"] != modified_option
-                option.update_attributes(name: modified_option)
-                break
-              end
-            end
-          end
-
-          # Update radio names
-          question.survey_question_radiogroups.each_with_index do |option, index|
-            groups_of_radios.each do |radios|
-              if radios[index] != option.name_translations["zh_tw"]
-                option.update_attributes(name: radios[index])
-                break
-              end
-            end
-          end        
-        end
-      end
-      
-      @answer_model.save!
-
-    end #end row 
-
-    redirect_to panel_survey_back_end_surveys_url, :notice => :success
-  end
-
   def export
     @survey = ::Survey.find(params[:id])
     @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb

@@ -13,8 +13,7 @@
           <li><%= link_to t('survey.duplicate_it'), duplicate_it_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.jump'), jump_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.set_answers'), set_answers_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
-          <li><%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv) %></li>
+          <li><%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv), :target => '_blank' %></li>
-          <li><%= link_to t('survey.import_csv'), set_import_panel_survey_back_end_survey_path(survey) %></li>
           <li><%= link_to t('survey.chart'), result_panel_survey_front_end_survey_path(survey, :force_chart => true, :standalone => true), :target => '_blank' %></li>
           <li><%= link_to t(:delete_), panel_survey_back_end_survey_path(survey), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
         <% end -%>

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb

@@ -1,18 +0,0 @@
-<%= form_tag import_panel_survey_back_end_survey_path(@survey), multipart: true do %>
-<table class="table main-list">
-  <thead>
-    <tr>
-      <th class="span2"><%= t('survey.title') %></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-    </tr>
-  </thead>
-  <tbody id="tbody_surveys" class="sort-holder">
-    <tr>
-      <td><%= @survey.title %></td>
-      <td><%= file_field_tag :file %></td>
-      <td><%= submit_tag t("survey.import_csv"), :class => 'btn' %></td>
-    </tr>
-  </tbody>
-</table>
-<% end %>

vendor/built_in_modules/survey/config/locales/en.yml

@@ -24,7 +24,6 @@ en:
     answer_error: Unsuccessful answer
 
     answers_list: Answers List
-    import_csv: Import CSV
     export_csv: Export CSV
     chart: Chart
     set_answers: Set Answers

vendor/built_in_modules/survey/config/locales/zh_tw.yml

@@ -25,7 +25,6 @@ zh_tw:
     answer_error: 問卷填寫錯誤
 
     answers_list: 結果清單
-    import_csv: 匯入CSV
     export_csv: 匯出CSV
     chart: 結果圖表
     set_answers: 設定結果
@@ -81,4 +80,4 @@ zh_tw:
     have_not_chart: 此種類型問題不含結果圖表
 
     move_up: 上移
-    move_down: 下移
+    move_down: 下移

vendor/built_in_modules/survey/config/routes.rb

@@ -9,8 +9,6 @@ Rails.application.routes.draw do
           end
           member do
             get 'export'
-            get 'set_import'
-            post 'import'
             get 'set_answers'
             get 'jump'
             get 'duplicate_it'
@@ -32,4 +30,4 @@ Rails.application.routes.draw do
     end
   end
  match "/appfront/*path" => redirect("/panel/*path")
-end
+end