cafe-grader-web Commit - r572:10160025d8ee

cafe-grader-web

Commit `r572:10160025d8ee` public

parent | child

Description:

- countdown timer

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r572:10160025d8ee - Tue, 26 Jul 2016 05:23:26 - 9 files changed: 65 inserted, 14 deleted

Gemfile ¶ +1

               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
+            + gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'

Gemfile.lock ¶ +2

                     haml (>= 3.1, < 4.1)
                     railties (>= 3.1, < 4.1)
                   hike (1.2.3)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
+            +     jquery-countdown-rails (2.0.2)
                   jquery-rails (3.1.2)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.13.4)
                     railties (>= 3.1, < 5)
                   jquery-timepicker-addon-rails (1.4.1)
                 bootstrap-toggle-rails
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
                 haml-rails
                 in_place_editing
+            +   jquery-countdown-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 momentjs-rails

app/assets/javascripts/application.js ¶ +9 -2

               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
               //= require moment
               //= require bootstrap-sortable
               //= require select2
-            - //= require custom
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require ace/mode-ruby
               //= require ace/mode-pascal
               //= require ace/mode-javascript
               //= require ace/mode-java
               //= require ace/theme-merbivore
+            + //= require custom
+            + //= require jquery.countdown
+            + //-------------- addition from local_jquery -----------
+            + //= require jquery.ui.datepicker
+            + //= require jquery.ui.slider
+            + //= require jquery-ui-timepicker-addon
+            + //= require jquery-tablesorter
+            + //= require best_in_place
+            + //= require best_in_place.jquery-ui
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop

app/assets/javascripts/custom.js.coffee ¶ +10 -5

               # document ready
               $ ->
                 $(".select2").select2()
                 #$(".bootstrap-switch").bootstrapSwitch()
-            -   $(".bootstrap-toggle").bootstrapToggle()
+            +   #$(".bootstrap-toggle").bootstrapToggle()
                 $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
                   input = $(this).parents('.input-group').find(':text')
                   log = if numFiles > 1 then numFiles + ' files selected' else label
                   if input.length
                     input.val log
                   else
                   target.removeClass 'btn-default'
                   target.removeClass 'btn-success'
                   target.addClass 'btn-warning'
                   target.text '...'
                   return
+            +
                 #ace editor
-            -   e = ace.edit("editor")
+            +   if $("#editor").length > 0
-            -   e.setTheme('ace/theme/merbivore')
+            +     e = ace.edit("editor")
-            -   e.getSession().setTabSize(2)
+            +     e.setTheme('ace/theme/merbivore')
-            -   e.getSession().setUseSoftTabs(true)
+            +     e.getSession().setTabSize(2)
+            +     e.getSession().setUseSoftTabs(true)
+            +
+            +   #best in place
+            +   jQuery(".best_in_place").best_in_place()
                 return

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

                #   *= require_tree .
                #   *= require_self
                */
               @import jquery.ui.all
               @import jquery.ui.core
-            - @import jquery.ui.core
               @import jquery.ui.theme
               @import jquery.ui.datepicker
               @import jquery.ui.slider
               @import jquery-ui-timepicker-addon
               @import jquery-tablesorter/theme.metro-dark
+            + @import jquery.countdown
               @import tablesorter-theme.cafe
               //bootstrap
               @import bootstrap-sprockets
               @import bootstrap
               @import select2

app/helpers/application_helper.rb ¶ +1

                       'ace/mode/java'
                     else
                       'ace/mode/c_cpp'
                   end
                 end
+            +
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over

app/views/configurations/index.html.haml ¶ +6 -4

-            - - content_for :header do
+            + /- content_for :header do
-            -   = javascript_include_tag 'local_jquery'
+            + /  = javascript_include_tag 'local_jquery'
               %h1 System configuration
               %table.info
                 %tr.info-head
                   %th Key
                   %th Value
                   %th Description
                 - @configurations.each do |conf|
                   - @grader_configuration = conf
                   %tr{:class => cycle("info-odd", "info-even")}
                     %td
-            -         = in_place_editor_field :grader_configuration, :key, {}, :rows=>1
+            +         /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1
+            +         = @grader_configuration.key
                     %td
-            -         = in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
+            +         /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
+            +         = @grader_configuration.value_type
                     %td
                       = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
                     %td= conf.description
               - if GraderConfiguration.config_cached?
                 %br/

app/views/layouts/_header.html.haml ¶ +13 -2

                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'main', 'submission')
                               = add_menu("Self Test", 'test', 'index')
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
+            +           / display MODE button (with countdown in contest mode)
+            +           - if GraderConfiguration.analysis_mode?
+            +             %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
+            +           - elsif GraderConfiguration.time_limit_mode?
+            +             - if @current_user.contest_finished?
+            +               %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
+            +             - elsif !@current_user.contest_started?
+            +               %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
+            +             - else
+            +               %div.navbar-btn.btn.btn-primary#countdown asdf
+            +               :javascript
+            +                 $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
+            +           / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Results', 'user_admin', 'user_stat')
                               = add_menu( 'Report', 'report', 'multiple_login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
-            -             =link_to 'Contest Mode, time remain: 00:20:33',grader_list_path,
-            -               class: 'navbar-btn btn btn-primary'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})

app/views/user_admin/index.html.haml ¶ +22

@@ -19,12 +19,34
19	= text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'	19	= text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
20	.form-group	20	.form-group
21	= label_tag 'user_email', 'email'	21	= label_tag 'user_email', 'email'
22	= text_field 'user', 'email', :size => 10,class: 'form-control'	22	= text_field 'user', 'email', :size => 10,class: 'form-control'
23	=submit_tag "Create", class: 'btn btn-primary'	23	=submit_tag "Create", class: 'btn btn-primary'
24		24
		25	+ .panel.panel-primary
		26	+ .panel-title.panel-heading
		27	+ Import from site management
		28	+ .panel-body
		29	+ = form_tag( {method: 'post',multipart: true, action: 'import'}, {class: 'form-inline'}) do
		30	+ .form-group
		31	+ = label_tag 'user_login', 'Login'
		32	+ = text_field 'user', 'login', :size => 10,class: 'form-control'
		33	+ .form-group
		34	+ = label_tag 'user_full_name', 'Full Name'
		35	+ = text_field 'user', 'full_name', :size => 10,class: 'form-control'
		36	+ .form-group
		37	+ = label_tag 'user_password', 'Password'
		38	+ = text_field 'user', 'password', :size => 10,class: 'form-control'
		39	+ .form-group
		40	+ = label_tag 'user_password_confirmation', 'Confirm'
		41	+ = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
		42	+ .form-group
		43	+ = label_tag 'user_email', 'email'
		44	+ = text_field 'user', 'email', :size => 10,class: 'form-control'
		45	+ =submit_tag "Create", class: 'btn btn-primary'
		46	+
25	.submitbox	47	.submitbox
26	%b Import from site management	48	%b Import from site management
27	= form_tag({:action => 'import'}, :multipart => true) do	49	= form_tag({:action => 'import'}, :multipart => true) do
28	File: #{file_field_tag 'file'} #{submit_tag 'Import'}	50	File: #{file_field_tag 'file'} #{submit_tag 'Import'}
29	%br/	51	%br/
30	%b What else:	52	%b What else:

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

r572:10160025d8ee - Tue, 26 Jul 2016 05:23:26 - 9 files changed: 65 inserted, 14 deleted

Sign in to your account

Commit r572:10160025d8ee public

Author

r572:10160025d8ee - Tue, 26 Jul 2016 05:23:26 - 9 files changed: 65 inserted, 14 deleted

Commit `r572:10160025d8ee` public