will_filter 3.1.11 → 5.1.0

data/app/views/will_filter/calendar/index.html.erb

@@ -1,52 +1,64 @@
-<div style="font-size:12px;font-weight:bold;">
+<div class="wf_calendar_header">
   <div style="float:right; padding-right:2px;">
-	  <% if @calendar.mode == 'month' %>
-	     <%=link_to_function("&laquo; expand".html_safe, "wfCalendar.changeMode('quarter', #{@calendar.show_time?})", :style => "font-size:10px; padding-bottom: 3px")%> &nbsp;
-		<% elsif @calendar.mode == 'quarter' %>
-       <%=link_to_function("&laquo; expand".html_safe, "wfCalendar.changeMode('annual', #{@calendar.show_time?})", :style => "font-size:10px; padding-bottom: 3px")%> &nbsp;
-		<% end %>
-		 
-    <%=link_to_function(image_tag("will_filter/close.gif", :title=>"Close"), "wfCalendar.hide()")%>
+    <% if @calendar.mode == 'month' %>
+      <%= link_to("&laquo; expand".html_safe, "#", :onclick => "wfCalendar.changeMode('quarter', #{@calendar.show_time?});", :style => "font-size:10px; padding-bottom: 3px") %> &nbsp;
+    <% elsif @calendar.mode == 'quarter' %>
+      <%= link_to("&laquo; expand".html_safe, "#", :onclick => "wfCalendar.changeMode('annual', #{@calendar.show_time?});", :style => "font-size:10px; padding-bottom: 3px") %> &nbsp;
+    <% end %>
+
+    <%= link_to('&times;'.html_safe, '#', :title=>"Close", :onclick => "wfCalendar.hide(); return false;") %>
   </div>
-	
-  Calendar
-</div>  
+
+  <% if @calendar.show_time? %>
+    Select Date/Time
+  <% else %>
+    Select Date
+  <% end %>
+</div>
+
 <div class="wf_calendar_container">
-<%= form_tag({:controller => "/will_filter/calendar"}, {:method => :get, :id => "wf_calendar_form"}) do %>
+  <%= form_tag({:controller => "/will_filter/calendar"}, {:method => :get, :id => "wf_calendar_form"}) do %>
     <%= hidden_field_tag :wf_calendar_start_date, @calendar.start_date.strftime("%Y/%m/%d") %>
-	  <%= hidden_field_tag :wf_calendar_selected_date, @calendar.selected_date.strftime("%Y/%m/%d") %>
+    <%= hidden_field_tag :wf_calendar_selected_date, @calendar.selected_date.strftime("%Y/%m/%d") %>
     <%= hidden_field_tag :wf_calendar_mode, @calendar.mode %>
     <%= hidden_field_tag :wf_calendar_show_time, @calendar.show_time? %>
 
-	  <div style="padding:5px;text-align:center; margin-bottom:5px; border-bottom: 1px solid #ccc;"> 
-			  &nbsp; 				
-		  	<%=link_to_function("&laquo;".html_safe, "wfCalendar.goToStartDate('#{@calendar.previous_start_date}')", :style=>"font-size:16px;")%>	
-			  &nbsp;&nbsp;&nbsp; 			
-				<% if @calendar.mode != 'annual' %>	
-  		 		 <%= select_tag("month", options_for_select(WillFilter::Calendar.month_options, @calendar.month), {:id => "wf_calendar_month", :onChange=>"wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
-				<% end %>
-		 		<%= select_tag("year", options_for_select(WillFilter::Calendar.year_options, @calendar.year), {:id => "wf_calendar_year",:onChange=>"wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
-			  &nbsp;&nbsp;&nbsp; 				
-		  	<%=link_to_function("&raquo".html_safe, "wfCalendar.goToStartDate('#{@calendar.next_start_date}')", :style=>"font-size:16px;")%>	
-			  &nbsp; 	
-		</div>					
-		
+    <div style="padding:5px;text-align:center; margin-bottom:5px; border-bottom: 1px solid #ccc;">
+      &nbsp;
+      <%= link_to("&laquo;".html_safe, "#", :onclick => "wfCalendar.goToStartDate('#{@calendar.previous_start_date}');", :style => "font-size:16px;") %>
+      &nbsp;&nbsp;&nbsp;
+      <% if @calendar.mode != 'annual' %>
+        <%= select_tag("month", options_for_select(WillFilter::Calendar.month_options, @calendar.month), {:id => "wf_calendar_month", :onChange => "wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
+      <% end %>
+      <%= select_tag("year", options_for_select(WillFilter::Calendar.year_options, @calendar.year), {:id => "wf_calendar_year", :onChange => "wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
+      &nbsp;&nbsp;&nbsp;
+      <%= link_to("&raquo".html_safe, "#", :onclick => "wfCalendar.goToStartDate('#{@calendar.next_start_date}');", :style => "font-size:16px;") %>
+      &nbsp;
+    </div>
+
     <%= render :partial => @calendar.mode, :locals => {:calendar => @calendar} %>
-		
-		<% if @calendar.show_time? %>
-		  <div style="text-align:center; margin-top:10px; padding:5px; border-top:1px solid #ccc;">
- 	        <div style="margin:5px;">
-				      Time: &nbsp; 
-				      <%= select_tag("wf_calendar_hour", options_for_select(WillFilter::Calendar.hour_options, @calendar.hour), :style => "width:auto;") %>
-				      :
-				      <%= select_tag("wf_calendar_minute", options_for_select(WillFilter::Calendar.minute_options, @calendar.minute), :style => "width:auto;") %>
-				      :
-				      <%= select_tag("wf_calendar_second", options_for_select(WillFilter::Calendar.second_options, @calendar.second), :style => "width:auto;") %>
-			    </div>
-		      <%=link_to_function("<span>Set Date and Time</span>".html_safe, "wfCalendar.setDateTime()", :class => "wf_grey_button wf_pcb") %>
-		      <%=link_to_function("<span>Cancel</span>".html_safe, "wfCalendar.hide()", :class => "wf_grey_button wf_pcb") %>
-		  </div>
-		<% end %>
-	
-<% end %>
+
+    <% if @calendar.show_time? %>
+      <div style="text-align:center; margin-top:10px; padding:5px; border-top:1px solid #ccc;">
+        <div style="margin:10px;">
+          Time: &nbsp;
+          <%= select_tag("wf_calendar_hour", options_for_select(WillFilter::Calendar.hour_options, @calendar.hour), :style => "width:auto;") %>
+          :
+          <%= select_tag("wf_calendar_minute", options_for_select(WillFilter::Calendar.minute_options, @calendar.minute), :style => "width:auto;") %>
+          :
+          <%= select_tag("wf_calendar_second", options_for_select(WillFilter::Calendar.second_options, @calendar.second), :style => "width:auto;") %>
+        </div>
+
+
+        <button type="button" class="btn btn-primary btn-xs" onclick="wfCalendar.setDateTime()">
+          Select Date and Time
+        </button>
+
+        <button type="button" class="btn btn-default btn-xs" onclick="wfCalendar.hide()">
+          Cancel
+        </button>
+      </div>
+    <% end %>
+
+  <% end %>
 </div>

data/app/views/will_filter/common/_actions_bar.html.erb

@@ -1,7 +1,7 @@
 <% if results.size > 0 %>
 <div class="<%=opts[:class]%>" style="<%=opts[:style]%>">
   <% actions.each do |action| %>
-      <%=link_to_function("<span>#{action.first}</span>".html_safe, "#{action.last}", :class => "wf_grey_button wf_pcb") %>
-	<% end %>  
-</div>    
+  <%=link_to("<span>#{action.first}</span>".html_safe, "#", :onclick => "#{action.last};", :class => "wf_grey_button wf_pcb") %>
+	<% end %>
+</div>
 <% end %>

data/app/views/will_filter/common/_results_table.html.erb

@@ -15,7 +15,7 @@
 <table class='wf_results_table'>
   <thead>
     <tr>
-      <% 
+      <%
         carray = [] # stores the order of the columns
 
         opts[:columns].each_with_index do |column, index|
@@ -23,34 +23,32 @@
 
           # supported notations for columns => [
           #  :id,
-          #  [:id, lambda{|obj| obj.id}], 
-          #  [:id, lambda{|obj| obj.id}, "color: white"], 
-          #  [:id, lambda{|obj| obj.id}, {:style => "color: white"}], 
+          #  [:id, lambda{|obj| obj.id}],
+          #  [:id, lambda{|obj| obj.id}, "color: white"],
+          #  [:id, lambda{|obj| obj.id}, {:style => "color: white"}],
           #  [:id, {:filterable => true, :value => lambda{|obj| obj.id}}],
           #  [:id, {:filterable => true, :value => lambda{|obj| obj.id}}],
-          #  {:key => :id, :filterable => true} 
+          #  {:key => :id, :filterable => true}
           # ]
 
           if column.is_a?(Array)
             if column.size < 2
-              raise WillFilter::FilterException.new("Array table column definition must have at least two elements") 
+              raise WillFilter::FilterException.new("Array table column definition must have at least two elements")
             end
 
             cmeta[:key] = column[0]  # first param must always be the column key
 
             if column[1].is_a?(Hash)  # second param is a hash
-              cmeta.merge!(column[1])  
-            else  
+              cmeta.merge!(column[1])
+            else
               cmeta[:value] = column[1]
               unless column[2].nil?
                 if column[2].is_a?(Hash)   # third param can be a set of attributes
                   cmeta.merge!(column[2])
-                elsif column[2].is_a?(String)  # third param can be a string, which represents a style
+                else  # third param can be a string, which represents a style
                   cmeta[:style] = column[2]
-                else
-                  raise WillFilter::FilterException.new("Unsupported table column format #{column[2]}")  
                 end
-              end    
+              end
             end
           elsif column.is_a?(Hash)
             cmeta = column
@@ -66,7 +64,7 @@
 
           if cmeta[:sort_key]
             sort_key = cmeta[:sort_key].call(filter)
-          else  
+          else
             sort_key = cmeta[:key]
           end
 
@@ -80,7 +78,7 @@
             column_title = cmeta[:title].call(filter)
           else
             # column_title = cmeta[:title] || filter ? filter.condition_title_for(cmeta[:key]) : "Undefined"
-            if filter 
+            if filter
               column_title = cmeta[:title] || filter.condition_title_for(cmeta[:key])
             else
               column_title = cmeta[:title] || cmeta[:key].to_s.titleize
@@ -88,18 +86,18 @@
 
             if sortable
               column_title = link_to(column_title, filter.to_params(:wf_order => cmeta[:key], :wf_order_type => sort_direction_click), :title => "sort by #{cmeta[:key]} ascending", :class => "sort_link")
-            end  
-          end  
+            end
+          end
 
-          # column class name 
+          # column class name
           title_class_name      = "wf_#{cmeta[:title_class] || cmeta[:key].to_s}"
-          title_class_name      << " sortable"                 if sortable            
+          title_class_name      << " sortable"                 if sortable
           title_class_name      << " current_sort"             if filter && filter.column_sorted?(sort_key)
           title_class_name      << " #{sort_direction}"
 
           # extra styling that can be applied on a column
-          title_style           = cmeta[:title_style] || "" 
-          title_style           << ";width:15px" if cmeta[:key] == :checkbox          
+          title_style           = cmeta[:title_style] || ""
+          title_style           << ";width:15px" if cmeta[:key] == :checkbox
         %>
 
         <th class="<%= title_class_name %>" style="<%=title_style%>">
@@ -109,7 +107,7 @@
                 <%= link_to "", filter.to_params(:wf_order => sort_key, :wf_order_type => 'asc'), :title => "sort by #{sort_key} ascending", :class => 'up' %>
                 <%= link_to "", filter.to_params(:wf_order => sort_key, :wf_order_type => 'desc'), :title => "sort by #{sort_key} descending", :class => 'down' %>
               </div>
-            
+
               <div style='white-space: nowrap;'>
                 <%= column_title %>
               </div>
@@ -118,14 +116,14 @@
               <%= check_box_tag("wf_check_all", "", false, :onClick => "wfCheckAll(this)") %>
 
             <% else %>
-              <%= column_title %> 
+              <%= column_title %>
 
-            <% end %> 
+            <% end %>
           </div>
         </th>
       <% end %>
     </tr>
-  </thead>  
+  </thead>
 
   <tbody>
 
@@ -137,11 +135,18 @@
       <tr class='data_row <%=(index % 2 == 0) ? "wf_row_even" : "wf_row_odd"%>'>
         <% carray.each_with_index do |cmeta, column_index| %>
           <%
-            value_style = cmeta[:style] || 'padding-top:2px;padding-bottom:2px;vertical-align:middle;' # should be moved to css
+           if cmeta[:style].nil?
+		value_style = 'padding-top:2px;padding-bottom:2px;vertical-align:middle;'
+           elsif cmeta[:style].is_a?(Proc)
+              value_style = cmeta[:style].call(obj)
+            else
+              value_style = cmeta[:style]
+            end
+
             value_class = cmeta[:class] || ''
 
             if cmeta[:value].nil?
-              value = obj.send(cmeta[:key]) 
+              value = obj.send(cmeta[:key])
             elsif cmeta[:value].is_a?(Proc)
               value = cmeta[:value].call(obj)
             else
@@ -158,26 +163,26 @@
           <td style='<%=value_style%>' class='<%=value_class%>'>
               <% if cmeta[:filterable] %>
                 <div style='float:right;'><%=link_to(image_tag("will_filter/filter.png", :style=>"width:12px;"), results.add_filter_condition(cmeta[:key], :is, filter_value.to_s).to_params, {:title => "Show only #{filter_value}"}) %></div>
-              <% end -%>  
+              <% end -%>
 
                <% if cmeta[:key] == :checkbox %>
                   <%= check_box_tag("#{value}[]", obj.id, false, :id => "wf_check_#{index}", :onClick => "wfVerifyTrigger(this)") %>
-            
+
                <% elsif value.is_a?(Hash) %>
                   <% value.each do |key, value| %>
                     <strong><%=key%>:</strong> <%= value %>;
                   <% end -%>
-                  
-                <% elsif value.is_a?(Time) %> 
-                  <%= value.strftime("%m/%d/%Y %l:%M:%S") %>
 
-                <% elsif value.is_a?(Date) %>  
+                <% elsif value.is_a?(Time) %>
+                  <%= value.strftime("%m/%d/%Y %l:%M:%S %p %Z") %>
+
+                <% elsif value.is_a?(Date) %>
                   <%= value.strftime("%m/%d/%Y") %>
-                  
+
                <% else %>
 
-                  <%= value.to_s %> 
-               <% end -%>  
+                  <%= value.to_s %>
+               <% end -%>
           </td>
         <% end -%>
       </tr>
@@ -188,8 +193,19 @@
     <% end -%>
 
   </tbody>
-</table>    
-    
+</table>
+
+<table class='wf_paginator'>
+    <tr>
+        <td style='text-align:left;vertical-align:middle;'>
+            <%= paginate(results) %>
+        </td>
+        <td style='text-align:right;vertical-align:middle;'>
+            Showing <%= results.offset_value + 1 %> - <%= results.offset_value + results.length %> of <%= results.total_count %>
+        </td>
+    </tr>
+</table>
+  
 <script>
   function wfVerifyTrigger(check) {
     if (!check.checked) {
@@ -197,7 +213,7 @@
       check_all.checked = false;
     }
   }
-  
+
   function wfCheckAll(trigger) {
     var index = 0;
     var check = document.getElementById("wf_check_" + index);
@@ -220,4 +236,4 @@
     </tr>
 </table>
 
-<% end %>
+<% end %>

data/app/views/will_filter/common/_scripts.html.erb

@@ -1,15 +1,5 @@
-<%= stylesheet_link_tag("will_filter/filter") -%>
-<%= stylesheet_link_tag("will_filter/calendar") -%>
-<%= stylesheet_link_tag("will_filter/exporter") -%>
-<%= stylesheet_link_tag("will_filter/actions") -%>
-<%= stylesheet_link_tag("will_filter/results") -%>
-<%= stylesheet_link_tag("will_filter/buttons") -%>
-
-<%= javascript_include_tag("will_filter/filter") -%>
-
-<% if WillFilter::Config.effects_options[:enabled] %>
-  <%= javascript_include_tag(WillFilter::Config.effects_options[:script_path]) -%>
-<% end %>
+<%= stylesheet_link_tag('will_filter/filter') -%>
+<%= javascript_include_tag('will_filter/filter') -%>
 
 <script>
 	initializeWillFilter();

data/app/views/will_filter/exporter/index.html.erb

@@ -1,39 +1,43 @@
 <div class="wf_exporter_header">
-  <div class="end">
-    <%=link_to_function("&times;".html_safe, "wfExporter.hide()", :title=>"Close", :class => "close")%>
+  <div class="end" style="margin-top: -3px;">
+    <%= link_to("&times;".html_safe, "#", :onclick => "wfExporter.hide(); return false;", :title => "Close", :class => "close") %>
   </div>
-  Exporter
+  Export Data
 </div>
 
 <div class="wf_exporter_container">
 
   <table style="width:100%" cellpadding="0px" cellspacing="0px;">
     <thead>
-      <tr>
-        <td><input type="checkbox" id="wf_fld_all" onClick="wfExporter.selectAllFields(this);" style="width:20px;"></td>
-        <td>Name</td>
-        <td>Type</td>
-      </tr>        
+    <tr>
+      <td><input type="checkbox" id="wf_fld_all" onClick="wfExporter.selectAllFields(this);" style="width:20px;"></td>
+      <td>Name</td>
+      <td>Type</td>
+    </tr>
     </thead>
     <tbody>
-      <% @wf_filter.model_class.columns.each_with_index do |col, index| %>
+    <% @wf_filter.model_class.columns.each_with_index do |col, index| %>
       <tr>
-          <td>
-              <input type="checkbox" id="wf_fld_chk_<%=index%>" onClick="wfExporter.selectField(this);" style="width:20px;"><input type="hidden" id="wf_fld_name_<%=index%>" value="<%=col.name%>">
-          </td>
-          <td><%=col.name %></td>
-          <td><%=col.type %></td>
+        <td>
+          <input type="checkbox" id="wf_fld_chk_<%= index %>" onClick="wfExporter.selectField(this);" style="width:20px;"><input type="hidden" id="wf_fld_name_<%= index %>" value="<%= col.name %>">
+        </td>
+        <td><%= col.name %></td>
+        <td><%= col.type %></td>
       </tr>
-      <% end %>
+    <% end %>
     </tbody>
   </table>
-  
-  <hr>
-  <div class="center">
-    Format: <%= select_tag("wf_export_format_selector", options_for_select(@wf_filter.export_formats,  @wf_filter.format)) %>
+
+
+  <div class="center" style="border-top: 1px solid #ccc; padding-top: 5px; margin-top: 5px;">
+    Format: <%= select_tag("wf_export_format_selector", options_for_select(@wf_filter.export_formats, @wf_filter.format)) %>
   </div>
   <div class="center">
-      <%=link_to_function("<span>Export</span>".html_safe, "wfExporter.exportFilter()", :class => "wf_grey_button wf_pcb") %>
-      <%=link_to_function("<span>Cancel</span>".html_safe, "wfExporter.hide()", :class => "wf_grey_button wf_pcb") %>
+    <button type="button" class="btn btn-primary btn-xs" onclick="wfExporter.exportFilter()">
+      Export
+    </button>
+    <button type="button" class="btn btn-default btn-xs" onclick="wfExporter.hide()">
+      Cancel
+    </button>
   </div>
-</div>
+</div>

data/app/views/will_filter/filter/_condition.html.erb

@@ -1,28 +1,44 @@
 <% if wf_filter.errors[index] %>
   <tr>
-    <td colspan="2"></td> 
+    <td colspan="2"></td>
     <td>
       <div class="error">
-        <%= wf_filter.errors[index] %>  
+        <%= wf_filter.errors[index] %>
       </div>
     </td>
     <td></td>
-  </tr> 
+  </tr>
 <% end %>
 
 <tr>
   <td class="condition">
-    <%= select_tag "wf_c#{index}", options_for_select(wf_filter.condition_options, condition.key.to_s), {:class=>"wf_input full_width", :onChange=>"wfFilter.updateConditionAt('#{index}')"} %>
+    <%= select_tag "wf_c#{index}", options_for_select(wf_filter.condition_options, condition.key.to_s), {:class => "wf_input full_width", style: 'width:100%', :onChange => "wfFilter.updateConditionAt('#{index}')"} %>
+    <script>
+      $("#wf_c<%=index%>").select2().on("change", function (e) {
+        wfFilter.updateConditionAt('<%=index%>');
+      });
+    </script>
   </td>
   <td class="operator">
-    <%= select_tag "wf_o#{index}", options_for_select(wf_filter.operator_options_for(condition.key), condition.operator.to_s), {:class=>"wf_input full_width", :onChange=>"wfFilter.updateConditionAt('#{index}')"} %>
+    <%= select_tag "wf_o#{index}", options_for_select(wf_filter.operator_options_for(condition.key), condition.operator.to_s), {:class => "wf_input full_width", style: 'width:100%', :onChange => "wfFilter.updateConditionAt('#{index}')"} %>
+    <script>
+      $("#wf_o<%=index%>").select2().on("change", function (e) {
+        wfFilter.updateConditionAt('<%=index%>');
+      });
+    </script>
   </td>
   <td class="values">
-	  <%= render :partial => "/will_filter/filter/containers/#{condition.container.template_name}", :locals => {:container => condition.container, :index => index} %>
+    <%= render :partial => "/will_filter/filter/containers/#{condition.container.template_name}", :locals => {:container => condition.container, :index => index} %>
   </td>
   <td class="actions">
-    <%=link_to_function("<span>-</span>".html_safe, "wfFilter.removeConditionAt('#{index}')", :class => "wf_grey_button wf_pcb") %>
-    <%=link_to_function("<span>+</span>".html_safe, "wfFilter.addConditionAfter('#{index}')", :class => "wf_grey_button wf_pcb") %>
+    <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.removeConditionAt('<%= index %>')" style="width: 20px;">
+      -
+    </button>
+    <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.addConditionAfter('<%= index %>')" style="width: 20px;">
+      +
+    </button>
   </td>
 </tr>
-      
+
+</td>
+</tr>