Import Data, Sync Data

Conflicts: vendor/built_in_modules/personal_book/app/models/writing_book.rb vendor/built_in_modules/personal_conference/app/models/writing_conference.rb vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
2013-11-15 17:36:35 +08:00
1 parent 7ed2afb405
commit f8ad13a9f5
@@ -92,6 +92,11 @@ 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.coAuthorformCallback = function(data){
    if(data.success){
@@ -8,6 +8,7 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl

    @per_column = 5

+    @userid = current_user.id
    case @view_by
    when "abstract"
      @per_column = 1
@@ -90,7 +90,7 @@ class WritingBook
    title << self.publisher if self.publisher.present?
    title << self.pages if self.pages.present?
    # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})"
-    title.join(', ') 
+    title.join(', ')
  end

  protected
@@ -57,6 +57,11 @@
      </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>
@@ -75,6 +75,8 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
+    <%= 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('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>
@@ -42,6 +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(){
@@ -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
@@ -90,7 +90,7 @@ class WritingConference
    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
@@ -58,7 +58,12 @@
      </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>
 </div>
@@ -75,7 +75,11 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
+
+     <%= 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('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">
@@ -42,6 +42,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(){
@@ -7,7 +7,8 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
    page ||= 1

    @per_column = 5
-
+    
+    @userid = current_user.id
    case @view_by
    when "abstract"
      @per_column = 1
@@ -96,7 +96,7 @@ class WritingJournal
    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(', ') 
+    title.join(', ')
  end

  def new_writing_journal_files=(var)
@@ -58,6 +58,10 @@
      </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 Books</a></div>
+  </div>
+
  <div class="hh1 hp sdm">
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
@@ -80,6 +80,8 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
+    <%= 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('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>