Changeset 5761

Timestamp:

05/22/08 15:43:06 (2 years ago)

Author:

uta

Message:

2008/05/22 sync

Files:

• components/todo_list/trunk/todo_list/_install/db/001_todo_list_schema_001.rb (modified) (3 diffs)
• components/todo_list/trunk/todo_list/_install/db/002_todo_list_schema_002.rb (modified) (2 diffs)
• components/todo_list/trunk/todo_list/_install/db/003_todo_list_schema_003.rb (added)
• components/todo_list/trunk/todo_list/_install/db/004_todo_list_schema_004.rb (added)
• components/todo_list/trunk/todo_list/_install/images/progress_empty.gif (added)
• components/todo_list/trunk/todo_list/_install/images/progress_fill.gif (added)
• components/todo_list/trunk/todo_list/_install/images/progress_left.gif (added)
• components/todo_list/trunk/todo_list/_install/images/progress_left_active.gif (added)
• components/todo_list/trunk/todo_list/_install/images/progress_right.gif (added)
• components/todo_list/trunk/todo_list/_install/images/progress_right_active.gif (added)
• components/todo_list/trunk/todo_list/_install/javascripts/src_todo.js (modified) (7 diffs)
• components/todo_list/trunk/todo_list/_install/javascripts/todo.js (modified) (8 diffs)
• components/todo_list/trunk/todo_list/_install/stylesheets/todo.css (modified) (4 diffs)
• components/todo_list/trunk/todo_list/admin/_main_read_content.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/admin/main.rhtml (modified) (2 diffs)
• components/todo_list/trunk/todo_list/admin_controller.rb (modified) (2 diffs)
• components/todo_list/trunk/todo_list/block/list.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/block/update.rjs (modified) (1 diff)
• components/todo_list/trunk/todo_list/block_controller.rb (modified) (2 diffs)
• components/todo_list/trunk/todo_list/common/_todo_input_window.rhtml (modified) (5 diffs)
• components/todo_list/trunk/todo_list/common/allot_to_window.rhtml (added)
• components/todo_list/trunk/todo_list/common_controller.rb (modified) (1 diff)
• components/todo_list/trunk/todo_list/common_helper.rb (modified) (4 diffs)
• components/todo_list/trunk/todo_list/component_plugins/calendar/init.rb (modified) (1 diff)
• components/todo_list/trunk/todo_list/component_plugins/calendar/lib/todo_list_adapter.rb (modified) (1 diff)
• components/todo_list/trunk/todo_list/index/_todo.rhtml (modified) (3 diffs)
• components/todo_list/trunk/todo_list/index/category_update.rjs (added)
• components/todo_list/trunk/todo_list/index/category_window.rhtml (added)
• components/todo_list/trunk/todo_list/index/main.rhtml (modified) (2 diffs)
• components/todo_list/trunk/todo_list/index/show.rhtml (modified) (2 diffs)
• components/todo_list/trunk/todo_list/index/update.rjs (modified) (1 diff)
• components/todo_list/trunk/todo_list/index_controller.rb (modified) (5 diffs)
• components/todo_list/trunk/todo_list/languages/english.rb (modified) (3 diffs)
• components/todo_list/trunk/todo_list/languages/japanese.rb (modified) (4 diffs)
• components/todo_list/trunk/todo_list/list/_main_filter.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/_show_edit_content.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/_show_print_content.rhtml (modified) (2 diffs)
• components/todo_list/trunk/todo_list/list/delete.rjs (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/list.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/main.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/show.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/list/update.rjs (modified) (1 diff)
• components/todo_list/trunk/todo_list/list_controller.rb (modified) (7 diffs)
• components/todo_list/trunk/todo_list/preload/_preload.rhtml (modified) (1 diff)
• components/todo_list/trunk/todo_list/todo_list_category_box.rb (modified) (3 diffs)
• components/todo_list/trunk/todo_list/todo_list_config.rb (modified) (1 diff)
• components/todo_list/trunk/todo_list/todo_list_lib.rb (modified) (1 diff)
• components/todo_list/trunk/todo_list/todo_list_todo.rb (modified) (9 diffs)
• components/todo_list/trunk/todo_list/todo_list_todo_link.rb (added)

components/todo_list/trunk/todo_list/_install/db/001_todo_list_schema_001.rb

@@ -1 +1 @@
-class TodoListSchema001 < ActiveRecord::Migration
+  ######################################################################################################################
+  # Temp Class
+  ######################################################################################################################
+  class TodoList::TodoListConfig < ActiveRecord::Base
+    def self.instance
+      self.find(1)
+    end
+  end
+
-  def self.up
-    ####################################################################################################################
@@ -34 +43 @@
-      t.column :title,                                  :string,    :limit => 90,   :default => '',     :null => false
-    end
-
+
-    create_table :todo_list_configs, :force => true do |t|
-      t.column :site_reminder_flag,                     :integer,                   :default => 0,      :null => false
@@ -46 +55 @@
-    add_index(:todo_list_todos,             [:rubricks_user_id_owner, :closed_flag, :delete_flag, :reminder_flag, :close_on],  {:name => 'todo_list_todos_idx_1'})
-    add_index(:todo_list_category_boxes,    [:rubricks_user_id, :id],                                                          {:name => 'todo_list_category_boxes_idx_1'})
+
+    ####################################################################################################################
+    # Data
+    ####################################################################################################################
+    TodoList::TodoListConfig.create({:site_reminder_flag => 1, :site_remind_hour => 0, :site_remind_min => 0})
-  end
-  

components/todo_list/trunk/todo_list/_install/db/002_todo_list_schema_002.rb

@@ -15 +15 @@
-    ####################################################################################################################
-    TodoList::TodoListTodo.delete_all('delete_flag = 1')
+    TodoList::TodoListTodo.find(:all).each do |tlt|
+      if tlt.progress % 10 != 0
+        tlt.progress = (tlt.progress / 10).floor * 10
+        tlt.save
+      end
+    end
-    menu_icon = RubricksMenuIcon.find_by_title('[_TodoList_Title]')
-    menu_icon.update_attributes(:title => '[_TodoList_Info_DisplayName]') unless menu_icon.blank?
@@ -38 +44 @@
-    remove_column :todo_list_todos,     :category
-    change_column :todo_list_configs,   :site_reminder_flag,        :boolean,                   :default => false,  :null => false
-
-    ####################################################################################################################
-    # Indexes
-    ####################################################################################################################
-    remove_index(:todo_list_todos,      {:name => 'todo_list_todos_idx_1'})
-    add_index(:todo_list_todos,         [:todo_list_category_box_id, :closed_on], {:name => 'todo_list_todos_idx_1'})
-  end
-

components/todo_list/trunk/todo_list/_install/javascripts/src_todo.js

@@ -8 +8 @@
-    rubricks.common.FormEditor.readMode('todo_edit_area', 'todo_edit_form');
-    this.admin_toggle_reminder_flag();
+  },
+  admin_print: function() {
+    rubricks.common.fire_submit('todo_list_admin_print_form', 'print_button');
+    rubricks.common.rubricks_wait_message_close();
-  },
-  admin_toggle_reminder_flag: function() {
@@ -67 +71 @@
-    );
-  },
+  common_todo_allot_to_clear: function() {
+    var el;
+    el = $('todo_allot_to');
+    if(el) {
+      el.value = '';
+      $('todo_allot_to_display').value = '';
+    }
+    el = $('todo_edit_allot_to');
+    if(el) {
+      el.value = '';
+      $('todo_edit_allot_to_display').value = '';
+    }
+  },
+  common_todo_allot_to_set: function(data) {
+    if(data) {
+      var el;
+      el = $('todo_allot_to');
+      if(el) {
+        el.value = data.id;
+        $('todo_allot_to_display').value = data.name.unescapeHTML();
+      }
+      el = $('todo_edit_allot_to');
+      if(el) {
+        el.value = data.id;
+        $('todo_edit_allot_to_display').value = data.name.unescapeHTML();
+      }
+    } else {
+      this.common_todo_allot_to_clear();
+    }
+  },
+  common_todo_allot_to_window_close: function() {
+    this.todo_allot_to_window.close();
+  },
+  common_todo_allot_to_window_open: function() {
+    if(this.flg_todo_allot_to_window_loaded) {
+      this.rollover();
+      this.todo_allot_to_window.center();
+      this.todo_allot_to_window.open();
+    } else {
+      this.common_todo_allot_to_window_render();
+    }
+  },
+  common_todo_allot_to_window_render: function() {
+    new Ajax.Updater(
+      'todo_allot_to_window_frame',
+      rubricks.todo_list.url_common_allot_to_window,
+      {
+        asynchronous:   true,
+        evalScripts:    true,
+        onLoading:      function(request){rubricks.common.rubricks_wait_message_open();}
+      }
+    );
+  },
-  index_delete: function() {
-    new Ajax.Request(
-      this.url_index_delete,
-      {
-
-
-
-
-
+   
+    
+     
+       
+      
-      }
-    );
@@ -87 +144 @@
-      this.url_index_finish,
-      {
-
-
-
-
-
+   
+    
+     
+       
+      
-      }
-    );
@@ -102 +159 @@
-    rubricks.common.fire_submit('operationbar_button_print');
-    rubricks.common.rubricks_wait_message_close();
+  },
+  index_progress_arrow_act: function(el) {
+    el.src = el.src.replace(/progress_(left|right)\.gif/, 'progress_$1_active.gif');
+  },
+  index_progress_arrow_psv: function(el) {
+    el.src = el.src.replace(/progress_(left|right)_active\.gif/, 'progress_$1.gif');
+  },
+  index_progress_change: function(el, id, progress) {
+    var width = (progress / 2).toString() + 'px';
+    Element.setStyle(el, {'width':width});
+    progress = progress.toString();
+    Element.update('todo_progress_text_' + id, progress);
+    el.name = progress;
+    this.progress_params = {id:id, progress:progress};
+    this.index_progress_timer_set();
+  },
+  index_progress_decrease: function(id) {
+    var el = $('todo_progress_' + id);
+    var progress = parseInt(el.name, 10);
+    if(progress >= 10) {
+      this.index_progress_change(el, id, progress - 10);
+    }
+  },
+  index_progress_increase: function(id) {
+    var el = $('todo_progress_' + id);
+    var progress = parseInt(el.name, 10);
+    if(progress >= 90) {
+      this.index_finish_confirm(id);
+    } else {
+      this.index_progress_change(el, id, progress + 10);
+    }
+  },
+  index_progress_post: function() {
+    rubricks.todo_list.index_progress_timer_clear();
+    new Ajax.Request(
+      rubricks.todo_list.url_index_change_progress,
+      {
+        asynchronous:   true,
+        evalScripts:    true,
+        parameters:     rubricks.todo_list.progress_params
+      }
+    );
+  },
+  index_progress_timer_clear: function() {
+    if(this.progress_timer) {
+      clearTimeout(this.progress_timer);
+      this.progress_timer = null;
+    }
+  },
+  index_progress_timer_set: function() {
+    this.index_progress_timer_clear();
+    this.progress_timer = setTimeout(rubricks.todo_list.index_progress_post, 1000);
+  },
+  index_todo_category_edit_window_close: function() {
+    this.todo_category_edit_window.close();
+  },
+  index_todo_category_edit_window_open: function() {
+    this.todo_category_edit_window.center();
+    this.todo_category_edit_window.open();
+  },
+  index_todo_category_edit_window_render: function(id) {
+    new Ajax.Updater(
+      'todo_category_edit_window_frame',
+      this.url_index_category_window,
+      {
+        asynchronous:   true,
+        evalScripts:    true,
+        parameters:     {id:id},
+        onLoaded:       function(request){rubricks.common.rubricks_wait_message_close();},
+        onLoading:      function(request){rubricks.common.rubricks_wait_message_open();}
+      }
+    );
-  },
-  list_add_ajax_history: function(tlt_id) {
@@ -115 +244 @@
-      rubricks.todo_list.url_list_delete,
-      {
-
-
-
-
-
+   
+    
+     
+       
+      
-      }
-    );
@@ -143 +272 @@
-  },
-  list_detail_edit_mode: function() {
+    $('todo_edit_form').reset();
+    var el = $('todo_edit_allot_to');
+    if(el) {
+      el.value = this.list_todo_edit_allot_to_value;
+    }
-    rubricks.common.FormEditor.editMode('todo_info_management_area');
-    this.list_input_toggle_reminder();
@@ -259 +393 @@
-              rubricks.todo_list.url_list_show,
-              {
-
-
-
-
-
+   
+    
+     
+       
+      
-              }
-            );

components/todo_list/trunk/todo_list/_install/javascripts/todo.js

@@ -5 +5 @@
-rubricks.common.FormEditor.readMode("todo_edit_area","todo_edit_form");
-this.admin_toggle_reminder_flag();
+},admin_print:function(){
+rubricks.common.fire_submit("todo_list_admin_print_form","print_button");
+rubricks.common.rubricks_wait_message_close();
-},admin_toggle_reminder_flag:function(){
-if($("todo_config_site_reminder_flag_use").checked==true){
@@ -48 +51 @@
-rubricks.common.rubricks_wait_message_open();
-}});
+},common_todo_allot_to_clear:function(){
+var el;
+el=$("todo_allot_to");
+if(el){
+el.value="";
+$("todo_allot_to_display").value="";
+}
+el=$("todo_edit_allot_to");
+if(el){
+el.value="";
+$("todo_edit_allot_to_display").value="";
+}
+},common_todo_allot_to_set:function(_b){
+if(_b){
+var el;
+el=$("todo_allot_to");
+if(el){
+el.value=_b.id;
+$("todo_allot_to_display").value=_b.name.unescapeHTML();
+}
+el=$("todo_edit_allot_to");
+if(el){
+el.value=_b.id;
+$("todo_edit_allot_to_display").value=_b.name.unescapeHTML();
+}
+}else{
+this.common_todo_allot_to_clear();
+}
+},common_todo_allot_to_window_close:function(){
+this.todo_allot_to_window.close();
+},common_todo_allot_to_window_open:function(){
+if(this.flg_todo_allot_to_window_loaded){
+this.rollover();
+this.todo_allot_to_window.center();
+this.todo_allot_to_window.open();
+}else{
+this.common_todo_allot_to_window_render();
+}
+},common_todo_allot_to_window_render:function(){
+new Ajax.Updater("todo_allot_to_window_frame",rubricks.todo_list.url_common_allot_to_window,{asynchronous:true,evalScripts:true,onLoading:function(_d){
+rubricks.common.rubricks_wait_message_open();
+}});
-},index_delete:function(){
-a
-
-b
+e
+
+f
-rubricks.common.rubricks_wait_message_open();
-}});
@@ -60 +105 @@
-});
-},index_finish:function(){
-d
-
-e
+11
+
+12
-rubricks.common.rubricks_wait_message_open();
-}});
@@ -73 +118 @@
-rubricks.common.fire_submit("operationbar_button_print");
-rubricks.common.rubricks_wait_message_close();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-},list_delete:function(id){
-12
-12},onLoaded:function(_13
-
-14
-
-
-15
+25
+25},onLoaded:function(_26
+
+27
+
+
+28
-rubricks.common.rubricks_confirm_window_open(this.msg_delete_confirm,function(){
-15
+28
-});
-},list_delete_multiple:function(){
@@ -106 +199 @@
-Element.show("todo_info");
-},list_detail_edit_mode:function(){
+$("todo_edit_form").reset();
+var el=$("todo_edit_allot_to");
+if(el){
+el.value=this.list_todo_edit_allot_to_value;
+}
-rubricks.common.FormEditor.editMode("todo_info_management_area");
-this.list_input_toggle_reminder();
@@ -133 +231 @@
-rubricks.common.Validator.refresh_by_id("todo_edit_start_on");
-},list_input_toggle_reminder:function(){
-16
-16
-17
-18
-19
-1a
-17.value!=""&&_18
-16
-19.disabled=(!_16
-1a.disabled=(!_16
-
-16
-19
-1a
+2a
+2a
+2b
+2c
+2d
+2e
+2b.value!=""&&_2c
+2a
+2d.disabled=(!_2a
+2e.disabled=(!_2a
+
+2a
+2d
+2e
-}
-}
@@ -187 +285 @@
-}
-this.list_select_buttons_singular();
-1c
-1c
+30
+30
-rubricks.common.execute_if_loaded("todo_scripts",function(){
-1d
-1e
-1e
-1f=_1e
-1f[0]!=_1d
-1d
-
-1d
-1d},onLoaded:function(_20
-
-21
+31
+32
+32
+33=_32
+33[0]!=_31
+31
+
+31
+31},onLoaded:function(_34
+
+35
-rubricks.common.rubricks_wait_message_open();
-}});
@@ -209 +307 @@
-});
-}});
-22
-22
+36
+36
-},rubricks.todo_list._ajax_history_prefix);
-

components/todo_list/trunk/todo_list/_install/stylesheets/todo.css

@@ -23 +23 @@
-  width:                        100%;
-}
+th.todo_category_box_title {
+  height:                       16px;
+  padding:                      4px 0 3px;
+}
-div.todo_tile {
-  border-style:                 solid;
@@ -29 +33 @@
-  padding:                      3px;
-  text-align:                   left;
-  width:                        95%;
-}
-table.todo_tile {
@@ -44 +47 @@
-  width:                        75px;
-}
+div.todo_tile_bg_shared {
+  background-color:             #dbedf8;
+  background-image:             none;
+}
+.todo_tile_dummy {
+  border:                       none;
+  height:                       0px;
+}
-div.todo_tile_priority_1 {
-  border-right:                 5px solid #66cc00;
@@ -54 +65 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
-}
-.todo_progress_done
-background-color:             #3366ff
+dl.todo_block_list dd
+margin-left:                  18px
-}
-
-
+
+
+
+
+
-}
-.todo_progress_unfinishe
-background-color:             #bbbbff
+*html dl.todo_block_list d
+margin-left:                  24px
-}

components/todo_list/trunk/todo_list/admin/_main_read_content.rhtml

@@ -1 +1 @@
-<% render_detail('00', hl('[_TodoList_Common_TodoConfig]')) do %>
-
-
-
-
+
+
+
+
+
+
-  <% end %>
-  <table class="rubricks_general_table">

components/todo_list/trunk/todo_list/admin/main.rhtml

@@ -1 +1 @@
-<div class="rubricks_general_frame_borderless">
-  <% render_operation_bar do %>
+    <%= form_tag({:controller => '/todo_list/admin', :action => 'print', :print_action => 'print_content'}, {:id => 'todo_list_admin_print_form', :class => 'operationbar_button_right_inactive swap',  :target => "_blank"}) %>
+      <span id="print_button" class="buttons darkicon_print textcolor_white" onclick="rubricks.todo_list.admin_print();"><%= hl('[_Common_Print]') %></span>
+    </form>
-  <% end %>
-  <% render_content_body do %>
@@ -19 +22 @@
-  rubricks.todo_list.admin_toggle_reminder_flag();
-</script>
-common
+message

components/todo_list/trunk/todo_list/admin_controller.rb

@@ -8 +8 @@
-  end
-
+  def print_content
+    @tlc = TodoList::TodoListConfig.instance
+    render :partial => '/todo_list/admin/main_read_content'
+  end
+
-  def update
-    begin
-      ActiveRecord::Base.transaction do
-        @tlc = TodoList::TodoListConfig.instance
-
+!
-          :site_reminder_flag   => params[:todo_config][:site_reminder_flag],
-          :site_remind_hour     => params[:todo_config][:site_remind_hour],
@@ -22 +27 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-flash[:todo_update_error] =
+raise RubricksError::Common::AjaxError,
-    end
-update_
+
-    rubricks_logger(:action_type => :update, :data => @tlc)
-    redirect_to :action => 'main'

components/todo_list/trunk/todo_list/block/list.rhtml

@@ -1 +1 @@
-<% if @tlt_list.blank? %>
+  <div>
+    <%= hl('[_Common_ListMessage]', hl('[_TodoList_Common_Todo]')) %>
+  </div>
-<% else %>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  <%= pagination_remote_links(@pages, {:params => {:update => 'todo_block_list_frame', :url => {:controller => '/todo_list/block', :action => 'list'}}, :window_size => 3}, {:id => 'todo_list_block_list_navigation_bottom'}) %>
-<% end %>

components/todo_list/trunk/todo_list/block/update.rjs

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

components/todo_list/trunk/todo_list/block_controller.rb

@@ -8 +8 @@
-  def list
-    tlcb_id_list = TodoList::TodoListCategoryBox.find_or_create_boxes(current_user.id).map{|tlcb| tlcb.id}
-_id in (?) and closed_on is null', tlcb_id_list], :per_page => RubricksLib::LIST_PER_PAGE_IN_WINDOW, :order => '
+es.id in (?) and todo_list_todos.closed_on is null', tlcb_id_list], :include => :todo_list_category_boxes, :per_page => RubricksLib::LIST_PER_PAGE_IN_WINDOW, :order => 'todo_list_todos.
-  end
-
@@ -15 +15 @@
-    begin
-      ActiveRecord::Base.transaction do
-
+@
-      end
-    rescue Exception => ex
-
-
-
+
+
+
+
+
+
+
-    end
-
+
+
-    headers["Content-Type"] = "text/javascript"
-  end

components/todo_list/trunk/todo_list/common/_todo_input_window.rhtml

@@ -6 +6 @@
-      <table class="rubricks_general_table">
-        <tr class="rubricks_general_table_even">
- 
+
-          <%= validate 'todo_title', [{:required => true}, {:length => '1..30'}] %>
- 
+
-            <%= text_field('todo', 'title', :size => 48, :maxlength => 30, :value => ((tlt.blank?) ? '' : tlt.title), :class => 'input_text_inactive focus') %>
-            <div id="todo_title_msg" class="todo_validate_msg"></div>
@@ -26 +26 @@
-          <td>
-            <%= text_field('todo', 'start_on', :size => 16, :maxlength => 10, :class => 'input_text_inactive focus', :value => ((tlt.blank?) ? '' : render_todo_date(tlt.start_on))) %>
-><span id="datepicker_todo_start_on_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span><span id="datepicker_todo_start_on_picker_cancel_form" class="icon_frame_inactive swap
+ title="<%= hl('[_Common_DatePicker]') %>"><span id="datepicker_todo_start_on_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span><span id="datepicker_todo_start_on_picker_cancel_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_DateClear]') %>
-            <div id="todo_start_on_msg" class="todo_validate_msg"></div>
-            <%= rollover_swap('datepicker_todo_start_on_picker_form', 'datepicker_todo_start_on_picker_cancel_form') %>
@@ -36 +36 @@
-          <td>
-            <%= text_field('todo', 'close_on', :size => 16, :maxlength => 10, :class => 'input_text_inactive focus', :value => ((tlt.blank?) ? '' : render_todo_date(tlt.close_on))) %>
-><span id="datepicker_todo_close_on_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span><span id="datepicker_todo_close_on_picker_cancel_form" class="icon_frame_inactive swap
+ title="<%= hl('[_Common_DatePicker]') %>"><span id="datepicker_todo_close_on_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span><span id="datepicker_todo_close_on_picker_cancel_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_DateClear]') %>
-            <div id="todo_close_on_msg" class="todo_validate_msg"></div>
-            <%= rollover_swap('datepicker_todo_close_on_picker_form', 'datepicker_todo_close_on_picker_cancel_form') %>
@@ -49 +49 @@
-          <td><%= hl('[_TodoList_Common_ThisOrder]') %></td>
-          <td>
-3" name="todo[this_order]" class="check" value="3" <%= (!tlt.blank? && tlt.this_order == 3)
-3"><%= hl('[_Common_OrderHigh]')
-2" name="todo[this_order]" class="check" value="2" <%= (tlt.blank?  || tlt.this_order == 2
-2
-1" name="todo[this_order]" class="check" value="1" <%= (!tlt.blank? && tlt.this_order == 1)
-1"><%= hl('[_Common_OrderLow]')
+<%= TodoList::TodoListTodo::ORDER_VALUE[:high]   %>" name="todo[this_order]" class="check" value="<%= TodoList::TodoListTodo::ORDER_VALUE[:high]   %>" <%= (!tlt.blank? && tlt.this_order == TodoList::TodoListTodo::ORDER_VALUE[:high])  
+<%= TodoList::TodoListTodo::ORDER_VALUE[:high]   %>"><%= hl('[_Common_OrderHigh]')  
+<%= TodoList::TodoListTodo::ORDER_VALUE[:middle] %>" name="todo[this_order]" class="check" value="<%= TodoList::TodoListTodo::ORDER_VALUE[:middle] %>" <%= (tlt.blank?  || tlt.this_order == TodoList::TodoListTodo::ORDER_VALUE[:middle]
+<%= TodoList::TodoListTodo::ORDER_VALUE[:middle] %>
+<%= TodoList::TodoListTodo::ORDER_VALUE[:low]    %>" name="todo[this_order]" class="check" value="<%= TodoList::TodoListTodo::ORDER_VALUE[:low]    %>" <%= (!tlt.blank? && tlt.this_order == TodoList::TodoListTodo::ORDER_VALUE[:low])   
+<%= TodoList::TodoListTodo::ORDER_VALUE[:low]    %>"><%= hl('[_Common_OrderLow]')   
-          </td>
-        </tr>
@@ -61 +61 @@
-          <td>
-            <%= select('todo', 'progress', progress_options, {:selected => ((tlt.blank?) ? nil : tlt.progress)}) %>
-
+
+
+
+
+
+
+
+
-            <%= rollover_swap('todo_progress_finish_form') %>
+          </td>
+        </tr>
+        <tr class="rubricks_general_table_even">
+          <td><%= hl('[_TodoList_Common_Allot]') %></td>
+          <td>
+            <% ru = tlt.share_worker rescue nil %>
+            <input type="hidden" id="todo_allot_to" name="todo[allot_to]" <%= (ru.blank?) ? '' : %Q|value="#{ru.id}"| %> />
+            <input type="text" id="todo_allot_to_display" name="todo[allot_to_display]" <%= (ru.blank?) ? '' : %Q|value="#{hl(ru.name)}"| %> class="background_readonly" size="24" readonly="readonly" />
+            <span id="todo_allot_to_select_button" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelect]') %>" onclick="rubricks.todo_list.common_todo_allot_to_window_open();"><span class="rubricks_icon icon_user">&nbsp;</span></span><span id="todo_allot_to_clear_button" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelectClear]') %>" onclick="rubricks.todo_list.common_todo_allot_to_clear();"><span class="rubricks_icon icon_user_remove">&nbsp;</span></span>
+            <%= rollover_swap('todo_allot_to_select_button', 'todo_allot_to_clear_button') %>
-          </td>
-        </tr>

components/todo_list/trunk/todo_list/common_controller.rb

@@ -6 +6 @@
-  end
-
+  def allot_to_window
+  end
+
-  def input
-    @tlc = TodoList::TodoListConfig.instance
-
+
+
+
+
+
+
-    @url_options = {:controller => ((params[:ctl].blank?) ? '/todo_list/index' : params[:ctl]), :action => ((params[:act].blank?) ? 'update' : params[:act])}
-    headers["Content-Type"] = "text/javascript"

components/todo_list/trunk/todo_list/common_helper.rb

@@ -7 +7 @@
-    html  = []
-    html << text_field('todo_filter', 'start_on', {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'})
-
-
+ title="#{hl('[_Common_DatePicker]')}"
+title="#{hl('[_Common_DateClear]')}" 
-    html << hl('[_Common_RangeMark]')
-    html << text_field('todo_filter', 'close_on', {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'})
-
-
+ title="#{hl('[_Common_DatePicker]')}"
+title="#{hl('[_Common_DateClear]')}" 
-    html << rollover_swap('datepicker_todo_filter_start_on_picker_form', 'datepicker_todo_filter_start_on_picker_cancel_form', 'datepicker_todo_filter_close_on_picker_form', 'datepicker_todo_filter_close_on_picker_cancel_form')
-    return html.join('')
@@ -41 +41 @@
-  end
-
+  def render_share_info(*args)
+    options = args.flex :tlt, :human_legible
+    case options[:tlt].share_status
+    when nil
+      if options[:human_legible].blank?
+        return ''
+      else
+        return RubricksLib.hl('[_TodoList_Common_NotAllotted]')
+      end
+    when TodoList::TodoListTodoLink::SHARE_CREATER
+      return %Q|<div>#{hl('[_TodoList_Common_AllotTo]', options[:tlt].share_worker.name)}</div>|
+    when TodoList::TodoListTodoLink::SHARE_MIDDLEMAN
+      return %Q|<div class="pointcolor_text">#{hl('[_TodoList_Common_AllotFrom]', options[:tlt].share_creater.name)}</div><div>#{hl('[_TodoList_Common_AllotTo]', options[:tlt].share_worker.name)}</div>|
+    when TodoList::TodoListTodoLink::SHARE_WORKER
+      return %Q|<div class="pointcolor_text">#{hl('[_TodoList_Common_AllotFrom]', options[:tlt].share_creater.name)}</div>|
+    end
+  end
+
-  def render_todo(tlt)
-    render :partial => '/todo_list/index/todo',  :locals => {:tlt => tlt}
@@ -47 +65 @@
-  def render_todo_buttons(tlt)
-    html  = []
-
-
-onclick="rubricks.todo_list.index_delete_confirm(#{tlt.id});"><span class="rubricks_icon icon_delete">&nbsp;</span></span>|
+title="#{hl('[_Common_Finish]')}" 
+title="#{hl('[_Common_Edit]')}"   
+title="#{hl('[_Common_Delete]')}" onclick="rubricks.todo_list.index_delete_confirm(#{tlt.id});"><span class="rubricks_icon icon_delete">&nbsp;</span></span>| if tlt.deletable?
-    html << rollover_swap("todo_#{tlt.id}_finish_button", "todo_#{tlt.id}_update_button", "todo_#{tlt.id}_delete_button")
-    return html.join('')
-  end
-
-
-
-
+
+
+
+
+
+
+
+
-    else
-date
+options[:date]
-    end
-  end
-
-  def render_todo_deadline(tlt)
-    html  = []
-    distance = tlt.distance_for_close_on
-
-
+
+
+
-      if distance > TodoList::TodoListTodo::DEADLINE_CAUTION
-html << tlt.close_on.strftime(hl('[_Common_Date_Format]'))
+return %Q|<div>#{tlt.close_on.strftime(hl('[_Common_Date_Format]'))}</div>|
-      else
-html << %Q|<span class="pointcolor_text">#{TodoList::TodoListLib.deadline_message(distance)}</span
+return %Q|<div class="pointcolor_text">#{TodoList::TodoListLib.deadline_message(distance)}</div
-      end
-      html << '</div>'
-    end
-    return html.join('')
-  end
-
@@ -90 +111 @@
-  def render_todo_order(tlt)
-    case tlt.this_order
-3
+TodoList::TodoListTodo::ORDER_VALUE[:high]
-      return hl('[_Common_OrderHigh]')
-2
+TodoList::TodoListTodo::ORDER_VALUE[:middle]
-      return hl('[_Common_OrderMiddle]')
-1
+TodoList::TodoListTodo::ORDER_VALUE[:low]
-      return hl('[_Common_OrderLow]')
-    end
-  end
-
-
-
+
-    options = {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-

components/todo_list/trunk/todo_list/component_plugins/calendar/init.rb

@@ -1 +1 @@
-lib = File.expand_path("#{File.dirname(__FILE__)}/lib")
-require_dependency "#{lib}/todo_list_adapter"
-
-RubricksScheduleManager << TodoList::TodoListAdapter

components/todo_list/trunk/todo_list/component_plugins/calendar/lib/todo_list_adapter.rb

@@ -2 +2 @@
-  class << self
-    def schedules(params)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    end
-
-
-
-
-
+
+
-    end
-

components/todo_list/trunk/todo_list/index/_todo.rhtml

@@ -1 @@
-background_white <%= (print?) ? '' : 'cursor_move' %> rubricks_general_table_border" <%= (print?) ? '' : %Q|ondblclick="rubricks.todo_list.common_input_window_render(#{tlt.id});"|
+<%= (tlt.share?) ? 'todo_tile_bg_shared' : 'background_white' %> <%= (print?) ? '' : 'cursor_move' %> rubricks_general_table_border" <%= (print?) ? '' : %Q|ondblclick="rubricks.todo_list.common_input_window_render(#{tlt.id});"| %> <%= (msie?) ? 'style="width:95%;"' : ''
-  <div class="todo_tile_priority_<%= tlt.this_order %>">
-    <table class="todo_tile">
+      <tr class="todo_tile_dummy">
+        <td style="width:74px;"></td>
+        <td style="width:32px;"></td>
+        <td></td>
+      </tr>
-      <tr>
-        <% if print? %>
-2
+3
-            <div class="overflow_auto">
-              <%= hl(tlt.title) %>
@@ -10 +15 @@
-          </td>
-        <% else %>
-
+ style="width:74px;"
-            <%= render_todo_buttons(tlt) %>
-          </td>
-lass="overflow_auto
+olspan="2
-            <div class="overflow_auto">
-              <%= hl(tlt.title) %>
@@ -22 +27 @@
-      <tr>
-        <td>
-.progress
+
-        </td>
-        <td>
+          <span id="todo_progress_text_<%= tlt.id %>"><%= tlt.progress %></span>%
+        </td>
+        <td class="text_right">
-          <%= render_todo_deadline(tlt) %>
-tlt.progress %>%
+render_share_info(tlt) %>
-        </td>
-      </tr>

components/todo_list/trunk/todo_list/index/main.rhtml

@@ -1 +1 @@
-<div class="rubricks_general_frame_borderless">
-  <% render_operation_bar do %>
-age
+rint_action
-      <span id="print_button" class="buttons darkicon_print textcolor_white" onclick="rubricks.todo_list.index_print();"><%= hl('[_Common_Print]') %></span>
-    <% end %>
-    <div id="operationbar_button_todo_create" class="operationbar_button_left_inactive swap">
-0
+
-    </div>
-  <% end %>
@@ -18 +18 @@
-  <% end %>
-</div>
+<div id="todo_category_edit_window_frame"></div>

components/todo_list/trunk/todo_list/index/show.rhtml

@@ -3 +3 @@
-    <tr>
-      <% @tlcb_list.each do |tlcb| %>
-><%= hl(tlcb.title) %
+ class="todo_category_box_title"><span id="todo_category_title_<%= tlcb.id %>"><%= hl(tlcb.title) %></span><span id="todo_category_<%= tlcb.id %>_title_edit_button" class="icon_frame_inactive swap" title="<%= hl('[_Common_Edit]') %>" onclick="rubricks.todo_list.index_todo_category_edit_window_render(<%= tlcb.id %>);"><span class="rubricks_icon icon_edit">&nbsp;</span></span
-      <% end %>
-    </tr>
@@ -21 +21 @@
-  </tbody>
-</table>
+<% @tlcb_list.each do |tlcb| %>
+  <%= rollover_swap("todo_category_#{tlcb.id}_title_edit_button") %>
+<% end %>
-<%= sortable_element('todo_category_box_3', :url => {:controller => '/todo_list/index', :action => "change_order", :params => {:box_no => 3}}, :tag => 'div', :dropOnEmpty => true, :constraint => false, :containment => ['todo_category_box_3', 'todo_category_box_2', 'todo_category_box_1']) %>
-<%= sortable_element('todo_category_box_2', :url => {:controller => '/todo_list/index', :action => "change_order", :params => {:box_no => 2}}, :tag => 'div', :dropOnEmpty => true, :constraint => false, :containment => ['todo_category_box_3', 'todo_category_box_2', 'todo_category_box_1']) %>

components/todo_list/trunk/todo_list/index/update.rjs

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+

components/todo_list/trunk/todo_list/index_controller.rb

@@ -2 +2 @@
-  define_page
-  uses_component_template_root
-
+
+
-
-  def main
-    @tlc = TodoList::TodoListConfig.instance
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -17 +34 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-    render :nothing => true
@@ -32 +62 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-flash[:todo_update_error] =
+raise RubricksError::Common::AjaxError,
-    end
-update_
+
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/index/update.rjs'
@@ -47 +77 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-flash[:todo_update_error] =
+raise RubricksError::Common::AjaxError,
-    end
-    rubricks_logger({:action_type => :update, :data => @tlt})
-update_message] =
+message] = (@tlt.pending_approval?) ? '[_TodoList_Common_MessageUpdatePendingApproval]' :
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/index/update.rjs'
@@ -56 +86 @@
-
-  def print_content
-
+, {:with_task => true}
-  end
-
-  def show
-
+
+
-  end
-
-  def update
-    begin
+      flash[:todo_message] = '[_TodoList_Common_MessageCreate]' if params[:todo][:id].blank?
-      ActiveRecord::Base.transaction do
-        @tlt = TodoList::TodoListTodo.create_or_update_todo(params[:todo])
-      end
-    rescue Exception => ex
-
-
-
+
+
+
+
+
+
+
+
-    end
-    rubricks_logger({:action_type => :update, :data => @tlt})
-update_message] = (params[:todo][:id].blank?) ? '[_TodoList_Common_MessageCreate
+message] ||= (@tlt.pending_approval?) ? '[_TodoList_Common_MessageUpdatePendingApproval
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/index/update.rjs'

components/todo_list/trunk/todo_list/languages/english.rb

@@ -5 +5 @@
-      '_TodoList_Admin_MessageUpdate'                           => 'todo configs are updated.',
-      '_TodoList_Admin_RemindTime'                              => 'Remind Time',
+      '_TodoList_Common_Allot'                                  => 'Allot the task',
+      '_TodoList_Common_AllotFrom'                              => 'This task is allotted from %s.',
+      '_TodoList_Common_AllotTo'                                => 'This task is allotted to %s.',
+      '_TodoList_Common_CategoryWindowTitle'                    => 'Edit Category Title',
-      '_TodoList_Common_CloseOn'                                => 'Closing date',
-      '_TodoList_Common_DeadlineAfter'                          => '%d day(s) after',
-      '_TodoList_Common_DeadlineBefore'                         => '%d day(s) before',
-      '_TodoList_Common_DeadlineJust'                           => 'Today',
+      '_TodoList_Common_ErrorAllotToCreator'                    => 'You can not allot the task to task-owner.',
+      '_TodoList_Common_ErrorCategoryUpdate'                    => 'Failed to update a title of the category.',
-      '_TodoList_Common_ErrorCreate'                            => 'Failed to create the task.',
-      '_TodoList_Common_ErrorDelete'                            => 'Failed to delete the task.',
+      '_TodoList_Common_ErrorReturnByOther'                     => 'You can not return the tast because you are not owner of it.',
-      '_TodoList_Common_ErrorTodoNotSelected'                   => 'Any task is not selected.',
+      '_TodoList_Common_ErrorUneditable'                        => 'Failed to access the task. Please refresh the screen and try again.',
-      '_TodoList_Common_ErrorUpdate'                            => 'Failed to update the task.',
-      '_TodoList_Common_InputWindowTitle'                       => 'ToDo Input Window',
+      '_TodoList_Common_MessageCategoryUpdate'                  => 'A title of the category is updated.',
-      '_TodoList_Common_MessageCreate'                          => 'The task is created.',
-      '_TodoList_Common_MessageDelete'                          => 'The task is deleted.',
-      '_TodoList_Common_MessageFinishConfirm'                   => 'Are you sure to finish this task?',
+      '_TodoList_Common_MessageNeedApproval'                    => 'This task will be finished by save on.',
+      '_TodoList_Common_MessagePendingApproval'                 => 'This task will be finished by approval.',
-      '_TodoList_Common_MessageRevertConfirm'                   => 'Are you sure to revert this task?',
-      '_TodoList_Common_MessageUpdate'                          => 'The task is updated.',
+      '_TodoList_Common_MessageUpdatePendingApproval'           => 'The task is updated. It will be finished when the owner approve.',
-      '_TodoList_Common_Progress'                               => 'Progress',
-      '_TodoList_Common_Reminder'                               => 'Reminder',
@@ -24 +36 @@
-      '_TodoList_Common_RemindOptionAtOnce'                     => 'At Once',
-      '_TodoList_Common_RemindOptionEveryday'                   => 'Everyday',
+      '_TodoList_Common_SendReminder'                           => 'Send Reminder',
-      '_TodoList_Common_SendReminderAtOnce'                     => 'Send remind mail at %s',
-      '_TodoList_Common_SendReminderEveryday'                   => 'Send remind mail everyday from %s',
-      '_TodoList_Common_SendReminder'                           => 'Send Reminder',
-      '_TodoList_Common_StartOn'                                => 'Starting date',
-      '_TodoList_Common_ThisOrder'                              => 'Priority',
@@ -33 +45 @@
-      '_TodoList_Common_TodoDetail'                             => 'ToDo Detail',
-      '_TodoList_Common_TodoList'                               => 'ToDo List',
-
+
+
+
+
+
-      '_TodoList_Filter_TargetOptionCompleted'                  => 'Completed',
-      '_TodoList_Filter_TargetOptionUncompleted'                => 'Uncompleted',

components/todo_list/trunk/todo_list/languages/japanese.rb

@@ -2 +2 @@
-  def define_lang
-    lang('japanese').merge!({
-d
-d
+D
+D
-      '_TodoList_Admin_RemindTime'                              => 'リマむンドメヌル送信時刻',
+      '_TodoList_Common_Allot'                                  => '割圓',
+      '_TodoList_Common_AllotFrom'                              => '「%s」から割圓',
+      '_TodoList_Common_AllotTo'                                => '「%s」に割圓',
+      '_TodoList_Common_CategoryWindowTitle'                    => 'カテゎリ名線集',
-      '_TodoList_Common_CloseOn'                                => '完了予定日',
-      '_TodoList_Common_DeadlineAfter'                          => 'ç· åˆ‡%d日è¶
@@ -10 +14 @@
-      '_TodoList_Common_DeadlineBefore'                         => 'ç· åˆ‡%d日前',
-      '_TodoList_Common_DeadlineJust'                           => 'æœ¬æ—¥ç· åˆ‡',
+      '_TodoList_Common_ErrorAllotToCreator'                    => 'ToDoを䜜成è€
+自身に割圓するこずはできたせん。',
+      '_TodoList_Common_ErrorCategoryUpdate'                    => 'カテゎリ名の曎新に倱敗したした。',
-      '_TodoList_Common_ErrorCreate'                            => 'ToDoの新芏䜜成に倱敗したした。',
-      '_TodoList_Common_ErrorDelete'                            => 'ToDoの削陀に倱敗したした。',
+      '_TodoList_Common_ErrorReturnByOther'                     => 'ToDo䜜成è€
+以倖が差し戻すこずはできたせん。',
-      '_TodoList_Common_ErrorTodoNotSelected'                   => 'ToDoが遞択されおいたせん。',
+      '_TodoList_Common_ErrorUneditable'                        => '指定されたToDoを参ç
+§ã™ã‚‹ã“ずができたせん。該圓ToDoの閲芧・曎新暩限がなくなった可胜性がありたす。画面を曎新しおやり盎しおください。',
-      '_TodoList_Common_ErrorUpdate'                            => 'ToDoの曎新に倱敗したした。',
-      '_TodoList_Common_InputWindowTitle'                       => 'ToDoå
-¥åŠ›ç”»é¢',
+      '_TodoList_Common_MessageCategoryUpdate'                  => 'カテゎリ名を曎新したした。',
-      '_TodoList_Common_MessageCreate'                          => 'ToDoを新芏䜜成したした。',
-      '_TodoList_Common_MessageDelete'                          => 'ToDoを削陀したした。',
-      '_TodoList_Common_MessageFinishConfirm'                   => 'タスクを完了(進捗率100%)にしたす。よろしいですか',
+      '_TodoList_Common_MessageNeedApproval'                    => '※ このたた保存するこずで完了ずなりたす。',
+      '_TodoList_Common_MessagePendingApproval'                 => '※ ToDo䜜成è€
+の承認埌、完了ずなりたす。',
-      '_TodoList_Common_MessageRevertConfirm'                   => 'タスクを未完了(進捗率90%)にしたす。よろしいですか',
-      '_TodoList_Common_MessageUpdate'                          => 'ToDoを曎新したした。',
+      '_TodoList_Common_MessageUpdatePendingApproval'           => 'ToDoを曎新したした。ToDo䜜成è€
+の承認埌、完了ずなりたす。',
+      '_TodoList_Common_NotAllotted'                            => '未割圓',
-      '_TodoList_Common_Progress'                               => '進捗率',
-      '_TodoList_Common_Reminder'                               => 'ToDoリマむンダ',
@@ -36 +54 @@
-      '_TodoList_Common_TodoDetail'                             => 'ToDo詳现',
-      '_TodoList_Common_TodoList'                               => 'ToDo䞀芧',
-
-
+
+
+
+
+
+
+
+
+
+
-      '_TodoList_Filter_TargetOptionCompleted'                  => '完了のみ',
-      '_TodoList_Filter_TargetOptionUncompleted'                => '未完了のみ',
@@ -44 +70 @@
-ちタスク',
-      '_TodoList_Index_LabelPriority3'                          => '察応䞭タスク',
-d
-d
+D
+D
-      '_TodoList_Info_Description'                              => 'ToDoの管理を行うコンポヌネントです。',
-      '_TodoList_Info_DisplayName'                              => 'ToDo',
-      '_TodoList_Info_MenuDescAdmin'                            => 'ToDo蚭定',
-
-
+
+
+
-      '_TodoList_Info_MenuTitleAdmin'                           => 'ToDo蚭定',
-
-
+
+
+
-      '_TodoList_Info_TrailRead'                                => 'ToDoの閲芧',
-      '_TodoList_Info_TrailUpdate'                              => 'ToDoの登録・曎新・削陀',

components/todo_list/trunk/todo_list/list/_main_filter.rhtml

@@ -1 +1 @@
-<% render_filter({:form_options => {:url => {:controller => '/todo_list/list', :action => 'list'}, :html => {:onsubmit => 'rubricks.common.blur();'}, :update => 'todo_list_frame'}, :function_clear => 'rubricks.todo_list.list_filter_clear();', :prefix => 'todo_filter_', :switcher_options => {:open => false}}) do %>
-  <div class="rubricks_general_filter">
-
+
+
+
-    <select id="todo_filter_target" name="todo_filter[target]">
+      <option value="all"><%= hl('[_TodoList_Filter_TargetOptionAll]') %></option>
-      <option value="uncompleted"><%= hl('[_TodoList_Filter_TargetOptionUncompleted]') %></option>
-      <option value="completed"><%= hl('[_TodoList_Filter_TargetOptionCompleted]') %></option>
-
+
+
+
+
+
+
-    </select>
-  </div>

components/todo_list/trunk/todo_list/list/_show_edit_content.rhtml

@@ -60 +60 @@
-    </td>
-  </tr>
+  <tr class="rubricks_general_table_even">
+    <td><%= hl('[_TodoList_Common_Allot]') %></td>
+    <td>
+      <% ru = @tlt.share_worker %>
+      <input type="hidden" id="todo_edit_allot_to" name="todo_edit[allot_to]" <%= (ru.blank?) ? '' : %Q|value="#{ru.id}"| %> />
+      <input type="text" id="todo_edit_allot_to_display" name="todo_edit[allot_to_display]" <%= (ru.blank?) ? '' : %Q|value="#{hl(ru.name)}"| %> class="background_readonly" size="24" readonly="readonly" />
+      <span id="todo_edit_allot_to_select_button" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelect]') %>" onclick="rubricks.todo_list.common_todo_allot_to_window_open();"><span class="rubricks_icon icon_user">&nbsp;</span></span><span id="todo_edit_allot_to_clear_button" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelectClear]') %>" onclick="rubricks.todo_list.common_todo_allot_to_clear();"><span class="rubricks_icon icon_user_remove">&nbsp;</span></span>
+      <%= rollover_swap('todo_edit_allot_to_select_button', 'todo_edit_allot_to_clear_button') %>
+    </td>
+  </tr>
-</table>
-<script type="text/javascript">
+  rubricks.todo_list.list_todo_edit_allot_to_value = <%= (ru.blank?) ? %q|''| : %Q|value="#{ru.id}"| %>;
-  rubricks.common.datepicker.set('datepicker_todo_edit_start_on_picker_button', 'todo_edit_start_on', function() {rubricks.common.Validator.refresh_by_id('todo_edit_start_on');});
-  rubricks.common.datepicker.set('datepicker_todo_edit_close_on_picker_button', 'todo_edit_close_on', function() {rubricks.common.Validator.refresh_by_id('todo_edit_close_on');});

components/todo_list/trunk/todo_list/list/_show_print_content.rhtml

@@ -10 +10 @@
-  <tr class="rubricks_general_table_even">
-    <td><%= hl('[_TodoList_Common_StartOn]') %></td>
-
+, true
-  </tr>
-  <tr class="rubricks_general_table_even">
-    <td><%= hl('[_TodoList_Common_CloseOn]') %></td>
-
+, true
-  </tr>
-  <tr class="rubricks_general_table_even">
@@ -22 +22 @@
-  <tr class="rubricks_general_table_even">
-    <td><%= hl('[_TodoList_Common_Progress]') %></td>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </tr>
-</table>

components/todo_list/trunk/todo_list/list/delete.rjs

@@ -1 @@
-
-
-
-
-
-
-
-
-
+
+
+
+

components/todo_list/trunk/todo_list/list/list.rhtml

@@ -23 +23 @@
-      <% @tlt_list.each do |tlt| %>
-        <% render_selectable_tr(tlt.id) do %>
+          <% render_selectable_td(:style => 'width:36px;') do %>
+            <div class="text_right">
+              <%= tlt.progress %>%
+            </div>
+          <% end %>
-          <% render_selectable_td do %>
-            <div class="overflow_auto"><%= hl(tlt.title) %></div>

components/todo_list/trunk/todo_list/list/main.rhtml

@@ -1 +1 @@
-<div class="rubricks_general_frame_borderless">
-  <% render_operation_bar do %>
-age
+rint_action
-      <input type="hidden" id="todo_print_id" name="id" value="" />
-      <span id="print_button" class="buttons disabled darkicon_print textcolor_white" onclick="rubricks.todo_list.list_print();"><%= hl('[_Common_Print]') %></span>
-    <% end %>
-    <div id="operationbar_button_todo_create" class="operationbar_button_left_inactive swap">
-0
+null
-    </div>
-  <% end %>

components/todo_list/trunk/todo_list/list/show.rhtml

@@ -4 +4 @@
-      <% render_detail('01', '[_TodoList_Common_TodoDetail]') do %>
-        <% render_float_button('todo_list_detail_fba1') do %>
-
-
-
+
+
+
+
+
-          <div id="todo_edit_mode_form" class="float_button_right_inactive swap">
-            <span id="todo_edit_mode_button" class="buttons icon_edit" onclick="rubricks.todo_list.list_detail_edit_mode();"><%= hl('[_Common_Edit]') %></span>

components/todo_list/trunk/todo_list/list/update.rjs

@@ -1 @@
-
-
-
-
-
-
-
-
-
+
+
+
+

components/todo_list/trunk/todo_list/list_controller.rb

@@ -2 +2 @@
-  define_page
-  uses_component_template_root
-
+
+
-
-  def main
@@ -16 +17 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-flash[:todo_update_error] =
+raise RubricksError::Common::AjaxError,
-    end
-    rubricks_logger({:action_type => :create, :data => @tlt})
-update_
+
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/list/update.rjs'
@@ -36 +37 @@
-      logger.error(ex.message)
-      logger.error(ex.backtrace.join("\n  "))
-flash[:todo_update_error] =
+raise RubricksError::Common::AjaxError,
-    end
-update_
+
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/list/delete.rjs'
@@ -48 +49 @@
-    filter_conditions = filter_merge_conditions({:input_data => params[:todo_filter], :page => params[:page].to_i})
-    @search           = filter_conditions[:search]
-
+, :include => :todo_list_category_boxes
-    @pages            = ::ActionController::Pagination::Paginator.new(self, count, per_page, filter_conditions[:page])
-limit => @pages.items_per_page, :offset => @pages.current.offset
+include => :todo_list_category_boxes, :limit => @pages.items_per_page, :offset => @pages.current.offset, :order => 'todo_list_todos.id desc'
-    rubricks_logger({:action_type => :list, :data => @tlt_list})
-  end
@@ -57 +58 @@
-    @tlc = TodoList::TodoListConfig.instance
-    @tlt = TodoList::TodoListTodo.find(params[:id])
+    raise RubricksError::Common::AjaxError, '[_TodoList_Common_ErrorUneditable]' unless @tlt.editable?
-  end
-
@@ -63 +65 @@
-      @tlc = TodoList::TodoListConfig.instance
-      @tlt = TodoList::TodoListTodo.find(params[:id])
+      raise RubricksError::Common::AjaxError, '[_TodoList_Common_ErrorUneditable]' unless @tlt.editable?
-      rubricks_logger({:action_type => :detail, :data => @tlt})
-    else
@@ -75 +78 @@
-      end
-    rescue Exception => ex
-
-
-
+
+
+
+
+
+
+
-    end
-    rubricks_logger({:action_type => :update, :data => @tlt})
-update_message] =
+message] = (@tlt.pending_approval?) ? '[_TodoList_Common_MessageUpdatePendingApproval]' :
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/todo_list/list/update.rjs'

components/todo_list/trunk/todo_list/preload/_preload.rhtml

@@ -1 @@
-
+   
-<%= javascript_include_tag '/javascripts/components/todo_list/todo' %>
-<script type="text/javascript">
-  Object.extend(rubricks.todo_list, {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  });
-</script>
-1
+4
-  <div id="todo_input_window_contents"></div>
-<% end %>
+<div id="todo_allot_to_window_frame"></div>

components/todo_list/trunk/todo_list/todo_list_category_box.rb

@@ -1 +1 @@
-class TodoList::TodoListCategoryBox < ActiveRecord::Base
-  acts_as_record_trails     :trails_fields => {:title => '[_Common_Title]'}, :default_methods => [:title]
-
+
+
-  belongs_to                :rubricks_user
-:in => 1..15
-
-:in=>
+                :in => 1..16
+               
+               :in => 
-
-  unless defined? BOX_NUMBERS
@@ -12 +13 @@
-
-  class << self
-
-:conditions => ['rubricks_user_id = ?', ru_id], :order => 'box_no desc'
+, options = {}
+{:conditions => ['rubricks_user_id = ?', ru_id], :order => 'box_no desc'}
-      if tlcb_list.blank?
-        tlcb_list = []
-        BOX_NUMBERS.each do |no|
-
+
+
+
+
-        end
-      end
@@ -25 +29 @@
-
-  def current_todos
-category_box_id = ? and closed_on is null', self.id], :order => 'order_in_box
+todos.closed_on is null and todo_list_category_boxes.id = ?', self.id], :include => :todo_list_category_boxes, :order => 'todo_list_todo_links.todo_order
-  end
-end

components/todo_list/trunk/todo_list/todo_list_config.rb

@@ -9 +9 @@
-  class << self
-    def instance
- rescue self.create!({:site_reminder_flag => false, :site_remind_hour => 0, :site_remind_min => 0})
+
-    end
-  end

components/todo_list/trunk/todo_list/todo_list_lib.rb

@@ -1 +1 @@
-class TodoList::TodoListLib
+  unless defined? USER_SELECT_WINDOW
+    USER_SELECT_WINDOW  = {
+      :prefix => 'rubricks.system.user.user_select.todo_allot_to_',
+      :window => %q|render_user_select_window({:element_id => 'todo_allot_to_window', :js_options => {:appendToBody => true}, :options => {:limit => 1, :prefix => 'todo_allot_to_'}, :title => hl('[_TodoList_Common_Allot]'), :variable => 'rubricks.todo_list.todo_allot_to_window'})|,
+    }
+  end
+
-  class << self
-    def deadline_message(distance)

components/todo_list/trunk/todo_list/todo_list_todo.rb

@@ -2 +2 @@
-  unless defined? DEADLINE_CAUTION
-    DEADLINE_CAUTION    = 5
-MAX           = 65535
+VALUE         = {:high => 3, :middle => 2, :low => 1}
-    PROGRESS_RANGE      = [0,10,20,30,40,50,60,70,80,90,100]
-  end
-
-  acts_as_record_trails     :trails_fields => {:title => '[_Common_Title]'}, :default_methods => [:title]
-
+
+
-  validates_bool_of         :reminder_flag
-  validates_bool_of         :sync_calendar_flag
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  class << self
@@ -35 +35 @@
-        input_data[:id] = tlt.id
-      end
-, :include => :todo_list_category_box
+
-      tlt.update_todo(input_data)
-      return tlt
@@ -41 +41 @@
-
-    def create_todo
-
-
-
-
-
+
+
+
+
-    end
-
-    def filter_merge_conditions(filter_conditions_hash)
-      filter_conditions, query, conditions = {}, [], []
-_
+es.
-      conditions    << TodoList::TodoListCategoryBox.find_or_create_boxes(RubricksLib.current_user.id).map{|tlcb| tlcb.id}
-      case filter_conditions_hash[:target]
-      when 'all'
-      when 'completed'
-        query       << 'closed_on is not null'
-else
+when 'uncompleted'
-        query       << 'closed_on is null'
-      end
+      case filter_conditions_hash[:order]
+      when 'high'
+        query       << 'this_order = ?'
+        conditions  << ORDER_VALUE[:high]
+      when 'low'
+        query       << 'this_order = ?'
+        conditions  << ORDER_VALUE[:low]
+      when 'middle'
+        query       << 'this_order = ?'
+        conditions  << ORDER_VALUE[:middle]
+      end
-      unless filter_conditions_hash[:word].blank?
-
-
-
-
+
+
+
-      end
-      date_range = RubricksLib.dates_to_range(filter_conditions_hash[:start_on], filter_conditions_hash[:close_on])
@@ -109 +117 @@
-        filter_conditions_hash[:word]       = input_data[:word]     unless input_data[:word].nil?
-        filter_conditions_hash[:target]     = input_data[:target]   unless input_data[:target].nil?
+        filter_conditions_hash[:order]      = input_data[:order]    unless input_data[:order].nil?
-        filter_conditions_hash[:start_on]   = input_data[:start_on] unless input_data[:start_on].nil?
-        filter_conditions_hash[:close_on]   = input_data[:close_on] unless input_data[:close_on].nil?
@@ -127 +136 @@
-
-    def finish_todo(id)
+      self.progress(id, PROGRESS_RANGE.last)
+    end
+
+    def progress(id, progress)
-      tlt = self.find(id)
-PROGRESS_RANGE.last
+progress, :ignore_share => true
-    end
-
@@ -135 +148 @@
-      unless options[:tlt_id_list].nil?
-        tlcb = TodoList::TodoListCategoryBox.find(:first, :conditions => ['rubricks_user_id = ? and box_no = ?', RubricksLib.current_user.id, options[:box_no]])
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -152 +170 @@
-  end
-
+  def editable?(ru_id = nil)
+    ru_id ||= RubricksLib.current_user.id
+    if self.share?
+      tltl_list     = TodoList::TodoListTodoLink.find(:all, :conditions => ['todo_list_todo_id = ?', self.id], :include => :todo_list_category_box)
+      ru_id_list    = tltl_list.map{|tltl| tltl.todo_list_category_box.rubricks_user_id}
+      return ru_id_list.include?(ru_id)
+    else
+      return self.todo_list_category_boxes.first.rubricks_user_id == ru_id
+    end
+  end
+
+  def pending_approval?
+    return self.progress == PROGRESS_RANGE.last && self.closed_on.nil?
+  end
+
-  def remind_unwanted?
-    if(Time.now >= Time.at(self.close_on - self.reminder_delay.day))
@@ -159 +192 @@
-    end
-    return true
+  end
+
+  def share?
+    self.todo_list_todo_links.length > 1
+  end
+
+  def share_creater
+    ru_id = nil
+    self.todo_list_todo_links.each do |tltl|
+      ru_id = tltl.todo_list_category_box.rubricks_user_id if tltl.share_creater?
+    end
+    ru = RubricksUser.find(ru_id) rescue nil
+    return ru
+  end
+
+  def share_creater?(ru_id = nil)
+    return false unless self.share?
+    ru_id ||= RubricksLib.current_user.id
+    self.todo_list_todo_links.each do |tltl|
+      return true if tltl.todo_list_category_box.rubricks_user_id == ru_id && tltl.share_creater?
+    end
+    return false
+  end
+
+  def share_middleman?(ru_id = nil)
+    return false unless self.share?
+    ru_id ||= RubricksLib.current_user.id
+    self.todo_list_todo_links.each do |tltl|
+      return true if tltl.todo_list_category_box.rubricks_user_id == ru_id && tltl.share_middleman?
+    end
+    return false
+  end
+
+  def share_status(ru_id = nil)
+    ru_id ||= RubricksLib.current_user.id
+    self.todo_list_todo_links.each do |tltl|
+      return tltl.share_status if tltl.todo_list_category_box.rubricks_user_id == ru_id
+    end
+    return nil
+  end
+
+  def share_worker
+    ru_id = nil
+    self.todo_list_todo_links.each do |tltl|
+      ru_id = tltl.todo_list_category_box.rubricks_user_id if tltl.share_worker?
+    end
+    ru = RubricksUser.find(ru_id) rescue nil
+    return ru
+  end
+
+  def share_worker?(ru_id = nil)
+    return false unless self.share?
+    ru_id ||= RubricksLib.current_user.id
+    self.todo_list_todo_links.each do |tltl|
+      return true if tltl.todo_list_category_box.rubricks_user_id == ru_id && tltl.share_worker?
+    end
+    return false
+  end
+
+  def to_schedule
+    range = self.close_on.to_date.to_range
+    return RubricksSchedule.new({:id => self.id, :start => range.first, :finish => range.last, :description => self.title})
-  end
-
@@ -166 +261 @@
-    self.start_on   = input_data[:start_on]   unless input_data[:start_on].nil?
-    self.close_on   = input_data[:close_on]   unless input_data[:close_on].nil?
-
-
-
+
-    self.progress   = input_data[:progress]   unless input_data[:progress].blank?
-ategory
+losed_on(input_data)
-    set_reminder(input_data)
-    self.save!
+    TodoList::TodoListTodoLink.share(self, input_data[:allot_to]) if input_data[:ignore_share].blank?
-    return self
-  end
-
-  def validate
-    raise_if_invalid_user
-  end
-
-  private
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-