Download as
Browse Code »

Commit e13f2060ff8c28d04702f752d52640189dd868bc

Authored by Diego Camarinha
Committed by João M. M. da Silva
1 parent 4b7a05d3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] Adding date picker to project result.

Showing 2 changed files with 17 additions and 44 deletions   Show diff stats
plugins/mezuro/public/javascripts/project_content.js
  Diff comments   View file @e13f206
@@ -51,23 +51,14 @@ function reloadModule(){ @@ -51,23 +51,14 @@ function reloadModule(){
51 return false; 51 return false;
52 } 52 }
53 53
54 -function reloadProjectWithDate(){  
55 - var day = jQuery("#project_date_day").val();  
56 - var month = jQuery("#project_date_month").val();  
57 - var year = jQuery("#project_date_year").val();  
58 -  
59 - if(day.length == 1)  
60 - day = "0" + day;  
61 - if(month.length == 1)  
62 - month = "0" + month; 54 +function reloadProjectWithDate(date){
  55 + var new_date = new Date(date + "T00:00:00+00:00");
63 56
64 - var date = new Date(year + "-" + month + "-" + day + "T00:00:00+00:00");  
65 -  
66 - if(isNaN(date)){  
67 - alert("Invalid date! " + date); 57 + if(isNaN(new_date)){
  58 + alert("Invalid date! " + new_date);
68 return false; 59 return false;
69 } 60 }
70 - reloadProject(date); 61 + reloadProject(new_date);
71 return false; 62 return false;
72 } 63 }
73 64
plugins/mezuro/views/content_viewer/_project_result.rhtml
  Diff comments   View file @e13f206
1 <% unless @content.errors[:base].nil? %> 1 <% unless @content.errors[:base].nil? %>
2 <%= @content.errors[:base] %> 2 <%= @content.errors[:base] %>
3 <% else %> 3 <% else %>
4 - <% form_for :project_date, :html=>{:id=>"project_history_date"} do |f| %>  
5 - <%= f.label :day, "Choose project date:" %>  
6 -  
7 - <table>  
8 - <tr>  
9 - <td>  
10 - Day  
11 - </td>  
12 - <td>  
13 - Month  
14 - </td>  
15 - <td>  
16 - Year  
17 - </td>  
18 - </tr>  
19 - <tr>  
20 - <td>  
21 - <%= f.text_field :day, :size => 1, :maxlength => 2, :placeholder =>"dd" %>  
22 - </td>  
23 - <td>  
24 - <%= f.text_field :month, :size => 1, :maxlength => 2, :placeholder =>"mm" %>  
25 - </td>  
26 - <td>  
27 - <%= f.text_field :year, :size => 1, :maxlength => 4, :placeholder =>"yyyy" %>  
28 - </td>  
29 - </tr>  
30 - </table>  
31 - <%= f.submit "Refresh" %>  
32 - <% end %>  
33 - 4 + <p> Choose a date to see specific project results: </p><input id="datepicker" style="display:none"/>
34 5
35 <h4><%= _('Last Result') %></h4> 6 <h4><%= _('Last Result') %></h4>
36 7
@@ -48,4 +19,15 @@ @@ -48,4 +19,15 @@
48 <td><%= @project_result.formatted_analysis_time %></td> 19 <td><%= @project_result.formatted_analysis_time %></td>
49 </tr> 20 </tr>
50 </table> 21 </table>
  22 +
  23 +
  24 + <script>
  25 + jQuery(document).ready(function($) {
  26 + $("#datepicker").datepicker({ altField: '#datepicker', showOn: 'button', dateFormat: "yy-mm-dd",
  27 + buttonImageOnly: true, buttonImage: '/images/calendar_date_select/calendar.png',
  28 + onSelect: function(dateText, inst) {
  29 + reloadProjectWithDate(dateText) } });
  30 + });
  31 + </script>
  32 +
51 <% end %> 33 <% end %>