cafe-grader-web Commit - r412:cee35860e689

cafe-grader-web

Commit `r412:cee35860e689` public

parent | child

Description:

(in progress) add date range

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r412:cee35860e689 - Thu, 28 Aug 2014 12:15:51 - 8 files changed: 71 inserted, 12 deleted

app/assets/javascripts/new.js created 644 ¶ +6

			@@ -0,0 +1,6
		1	+ //= require jquery
		2	+ //= require jquery_ujs
		3	+ //= require jquery.ui.all
		4	+ //= require jquery.ui.datepicker
		5	+ //= require jquery.ui.slider
		6	+ //= require jquery-ui-timepicker-addon

Gemfile ¶ +6

               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
+            + #
+            +
+            + gem 'jquery-rails'
+            + gem 'jquery-ui-sass-rails'
+            + gem 'jquery-timepicker-addon-rails'
+            +
               gem "haml"
               gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"

Gemfile.lock ¶ +15

                     execjs
                   coffee-script-source (1.7.1)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.2.1)
                   haml (4.0.5)
                     tilt
                   hike (1.2.3)
                   i18n (0.6.11)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
+            +     jquery-rails (3.1.1)
+            +       railties (>= 3.0, < 5.0)
+            +       thor (>= 0.14, < 2.0)
+            +     jquery-timepicker-addon-rails (1.4.1)
+            +       railties (>= 3.1)
+            +     jquery-ui-rails (4.0.3)
+            +       jquery-rails
+            +       railties (>= 3.1.0)
+            +     jquery-ui-sass-rails (4.0.3.0)
+            +       jquery-rails
+            +       jquery-ui-rails (= 4.0.3)
+            +       railties (>= 3.1.0)
                   json (1.8.1)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
                   multi_json (1.10.1)
                   mysql2 (0.3.16)
                   polyglot (0.3.5)
                   power_assert (0.1.3)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
+            +   jquery-rails
+            +   jquery-timepicker-addon-rails
+            +   jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.19)
                 rdiscount
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/assets/stylesheets/application.css.sass ¶ +9 -1

+            +
+            + @import jquery.ui.core
+            + @import jquery.ui.theme
+            + @import jquery.ui.datepicker
+            + @import jquery.ui.slider
+            + @import jquery-ui-timepicker-addon
+            +
+            +
               body
                 background: white image-url("topbg.jpg") repeat-x top center
                 font-size: 13px
                 font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
               input
                 font-family: Tahoma, "sans-serif"
                   line-height: 2em
                 &.registration-desc, &.test-desc
                   border: 1px dotted gray
                   background: #f5f5f5
                   padding: 5px
                   margin: 10px 0
                   font-size: 12px
                   line-height: 1.5em
               h2.contest-title
                 margin-top: 5px
-            -   margin-bottom: 5px
  No newline at end of file
+            +   margin-bottom: 5px

app/controllers/report_controller.rb ¶ +5

               class ReportController < ApplicationController
                 def login_stat
                   @logins = Array.new
                   login = Login.all
+            +
+            +     date_and_time = '%y-%m-%d %H:%M'
+            +     since_time = strptime(params[:since_datetime],date_and_time)
+            +     until_time = strptime(params[:until_datetime],date_and_time)
+            +
                   User.all.each do |user|
                     @logins << { login: user.login,
                                  full_name: user.full_name,
                                  count: Login.where(user_id: user.id).count(:id),
                                  min: Login.where(user_id: user.id).maximum(:created_at),
                                  max: Login.where(user_id: user.id).minimum(:created_at) }
                   end
                 end
               end

app/views/layouts/application.html.erb ¶ +2

               <!DOCTYPE html>
               <html>
               <head>
                 <title><%= GraderConfiguration['contest.name'] %></title>
                 <%= stylesheet_link_tag "application", :media => "all" %>
                 <%= javascript_include_tag "application" %>
                 <%= csrf_meta_tags %>
+            +   <%= content_for :header %>
                 <%= yield :head %>
+            +
               </head>
               <body>
               <div class="userbar">
               <%= user_header %>
               </div>
               <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
               <%= yield %>
               </body>

app/views/report/_date_range.html.haml ¶ +11 -10

-            - = form_tag({action: :user_stat_max })  do
+            + = form_tag({session: :url })  do
                 .submitbox
                   %table
                     %tr
                       %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range
                     %tr
-            -         %td{style: 'width: 120px; font-weight: bold'} Submission ID:
-            -         %td{align: 'right'} From date:
-            -         %td= text_field_tag 'start_date', params[:start_date]
-            -         %td Time:
-            -         %td= text_field_tag 'start_time', params[:start_time], style: 'width:40px'
+            +         %td{style: 'width: 120px; font-weight: bold'}= param_text
+            +         %td{align: 'right'} since:
+            +         %td= text_field_tag 'since_datetime'
+            +       %tr
+            +         %td
+            +         %td{align: 'right'} until:
+            +         %td= text_field_tag 'until_datetime'
+            +       %tr
+            +         %td
+            +         %td
                       %td= submit_tag 'query'
-            -       %tr
-            -         %td
-            -           %td{colspan: 5} Leave blank date and/or time for no condition
-            -           %br/

app/views/report/login_stat.html.haml ¶ +17 -1

+            + - content_for :header do
+            +   = javascript_include_tag 'new'
+            +
+            + %script{:type=>"text/javascript"}
+            +   $(function () {
+            +   $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
+            +   $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
+            +   });
+            +
+            +
               %h1 Login status
+            +
               .task-menu
                 Reports
                 %br/
                 = link_to '[Submission]', :action => 'submit_stat'
                 = link_to '[Login]', :action => 'login_stat'
-            - =render partial: 'date_range'
+            +
+            + =render partial: 'date_range', locals: {param_text: 'Submission range:'  }
+            +
+            + hahaha
+            +
+            + =params[:since_datetime]
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r412:cee35860e689 - Thu, 28 Aug 2014 12:15:51 - 8 files changed: 71 inserted, 12 deleted

Sign in to your account

Commit r412:cee35860e689 public

Author

r412:cee35860e689 - Thu, 28 Aug 2014 12:15:51 - 8 files changed: 71 inserted, 12 deleted

Commit `r412:cee35860e689` public