Merge pull request #56 from WiteFox/master

made js\ruby refactoring + fix for all items\group items check\uncheck, remov...

Author: hishammalik

app/helpers/timesheet_helper.rb

@@ -39,45 +39,31 @@ def link_to_csv_export(timesheet)
       :class => 'icon icon-timesheet')
   end
 
-  def toggle_issue_arrows(issue_id)
-    js = "toggleTimeEntries('#{issue_id}'); return false;"
+  def toggle_arrows(element, js_function)
+    js = "#{js_function}('#{element}');"
 
-    return toggle_issue_arrow(issue_id, 'toggle-arrow-closed.gif', js, false) +
-      toggle_issue_arrow(issue_id, 'toggle-arrow-open.gif', js, true)
+    return toggle_arrow(element, 'toggle-arrow-closed.gif', js, false) +
+        toggle_arrow(element, 'toggle-arrow-open.gif', js, true)
   end
 
-  def toggle_issue_arrow(issue_id, image, js, hide=false)
-    style = "display:none;" if hide
+  def toggle_arrow(element, image, js, hide=false)
+    style = 'display:none;' if hide
     style ||= ''
 
     content_tag(:span,
-      link_to_function(image_tag(image, :plugin => "redmine_timesheet_plugin"), js),
-      :class => "toggle-" + issue_id.to_s,
-      :style => style
+                link_to_function(image_tag(image, :plugin => "redmine_timesheet_plugin"), js),
+                :class => "toggle-" + element.to_s,
+                :style => style
     )
-
   end
-  
-    def toggle_issue_arrows_date(spent_on)
-    js = "toggleTimeEntriesdate('#{spent_on}'); return false;"
-
-    return toggle_issue_arrow_date(spent_on, 'toggle-arrow-closed.gif', js, false) +
-      toggle_issue_arrow(spent_on, 'toggle-arrow-open.gif', js, true)
-  end
-
-  def toggle_issue_arrow_date(spent_on, image, js, hide=false)
-    style = "display:none;" if hide
-    style ||= ''
-
-    content_tag(:span,
-      link_to_function(image_tag(image, :plugin => "redmine_timesheet_plugin"), js),
-      :class => "toggle-" + spent_on.to_s,
-      :style => style
-    )
 
+  def toggle_issue_arrows(issue_id)
+    return toggle_arrows(issue_id, 'toggleTimeEntriesIssue')
   end
 
-  
+  def toggle_issue_arrows_date(spent_on)
+    return toggle_arrows(spent_on, 'toggleTimeEntriesDate')
+  end
 
   def displayed_time_entries_for_issue(time_entries)
     time_entries.collect(&:hours).sum

app/views/timesheet/#_by_issue.html.erb#

@@ -2,7 +2,7 @@
   <thead>
     <th width="2%">
       <%= link_to image_tag('toggle_check.png'), "javascript:;", 
-        :onclick => 'toggleIssuesSelection(".toggle-all"); return false;',
+        :onclick => 'toggleIssuesSelection(this); return false;',
         :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :class => 'toggle-all' %>
     </th>
     <th width="2%">&nbsp;</th>
@@ -18,19 +18,4 @@
   </tbody>
 </table>
 <br />
-<script type="text/javascript">
-function toggleTimeEntries(id) {
-$('.issue-time-entry-' + id).each(function() { $(this).toggle();} )
-$('.toggle-' + id).each(function() { $(this).toggle();} )
-}
 
-/*
- * Checks all the Time Entries under issue_id
- */
-function toggleTimeEntriesSelection(issue_id) {
-    $$('.issue-time-entry-' + issue_id).each(function(ele) {
-        toggleIssuesSelection(ele);
-    });
-}
-
-</script>

app/views/timesheet/_by_issue.html.erb

@@ -4,7 +4,7 @@
 <% unless issue.nil? %>
   <tr class="<%= cycle("odd", "even") %>">
     <td align="center">
-      <%= link_to image_tag('toggle_check.png'), {}, :onclick => "toggleTimeEntriesSelection('#{issue.id}'); return false;",
+      <%= link_to image_tag('toggle_check.png'), {}, :onclick => "toggleTimeEntriesSelectionIssue('#{issue.id}'); return false;",
       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :class => 'toggle-all' %>
     </td>
     <td align="center">

app/views/timesheet/_issue_time_entries.html.erb

@@ -2,7 +2,7 @@
   <thead>
     <th width="2%">
       <%= link_to image_tag('toggle_check.png'), "javascript:;",
-        :onclick => 'toggleIssuesSelection(".toggle-all"); return false;',
+        :onclick => 'toggleTimeEntriesSelectionProject(this); return false;',
         :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :class => 'toggle-all' %>
     </th>
     <th width="8%"><%= l(:label_date) %></th>

app/views/timesheet/_timesheet_group.html.erb

@@ -31,35 +31,12 @@
 
         <span class="<%= cycle("odd", "even") %> issue-time-entry-<%= entryname -%>" style="display:none;">
           <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %>
-        </span> 
-
+        </span>
         <%#*end%>
-        <script type="text/javascript">
-          function toggleTimeEntriesdate(entryname) {
-
-            $('.issue-time-entry-' + entryname).each(function() {
-              $(this).toggle();
-            })
-            $('.toggle-' + entryname).each(function() {
-              $(this).toggle();
-            })
-          }
-
-          /*
-           * Checks all the Time Entries under issue_id
-           */
-          function toggleTimeEntriesSelection(entryname) {
-            $$('.issue-time-entry-' + entryname).each(function(ele) {
-              toggleIssuesSelection(ele);
-            });
-          }
-
-        </script>
       <% else %>
         <%# Default to :project %>
         <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>) <%= showing_users(entry[:users]) %></h3> 
         <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %>
-
       <% end
       end # each
     end # length

app/views/timesheet/report.html.erb

@@ -1,16 +1,58 @@
 $(function() {
-  $('#select_timesheet_period_type_2').click(function() {
-    $('#timesheet_period_type_2').attr('checked','checked')
-  })
-
-  $('#select_timesheet_period_type_1').focus(function() {
-    $('#timesheet_period_type_1').attr('checked','checked')
-  })
-
-	$("label.select-all").click(function () {
-		var select = $(this).siblings("select")
-		var options = select.children()
-		var selected = options.length != select.find(":selected").length
-		options.each(function (index, ele) { ele.selected = selected });
-	})
+    $('#select_timesheet_period_type_2').click(function() {
+        $('#timesheet_period_type_2').attr('checked','checked')
+    })
+
+    $('#select_timesheet_period_type_1').focus(function() {
+        $('#timesheet_period_type_1').attr('checked','checked')
+    })
+
+    $("label.select-all").click(function () {
+        var select = $(this).siblings("select")
+        var options = select.children()
+        var selected = options.length != select.find(":selected").length
+        options.each(function (index, ele) { ele.selected = selected });
+    })
 })
+
+function toggleTimeEntries(element) {
+    $('.issue-time-entry-' + element).each(function() { $(this).toggle();} )
+    $('.toggle-' + element).each(function() { $(this).toggle();} )
+}
+
+function toggleTimeEntriesIssue(id) {
+    toggleTimeEntries(id);
+}
+
+function toggleTimeEntriesDate(entryname) {
+    toggleTimeEntries(entryname);
+}
+
+/*
+ * Checks all the Time Entries under issue_id
+ */
+function toggleTimeEntriesSelectionIssue(issue_id) {
+    var issues = $('.issue-time-entry-' + issue_id);
+    toggleTimeEntriesSelection(issues);
+}
+
+function toggleTimeEntriesSelectionProject(element){
+    var table = $(element).parents('table.list.issues');
+    toggleTimeEntriesSelection(table);
+}
+
+function toggleTimeEntriesSelection(element){
+    var boxes = $(element).find('input[type=checkbox]');
+    var all_checked = true;
+    boxes.each(function(){ if (!$(this).prop('checked')) { all_checked = false; } });
+    boxes.each(function(){
+        if (all_checked) {
+            $(this).removeAttr('checked');
+            $(this).parents('tr').removeClass('context-menu-selection');
+        } else if (!$(this).prop('checked')) {
+            $(this).prop('checked', true);
+            $(this).parents('tr').addClass('context-menu-selection');
+        }
+    });
+}
+