cafe-grader-web

Commit r351:a14389fe8773 public

parent | child
Description:
update Current time to properly use rails time
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r351:a14389fe8773 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,133 +1,133
1 1 # Methods added to this helper will be available to all templates in the application.
2 2 module ApplicationHelper
3 3
4 4 def user_header
5 5 menu_items = ''
6 6 user = User.find(session[:user_id])
7 7
8 8 if (user!=nil) and (session[:admin])
9 9 # admin menu
10 10 menu_items << "<b>Administrative task:</b> "
11 11 append_to menu_items, '[Announcements]', 'announcements', 'index'
12 12 append_to menu_items, '[Msg console]', 'messages', 'console'
13 13 append_to menu_items, '[Problems]', 'problems', 'index'
14 14 append_to menu_items, '[Users]', 'user_admin', 'index'
15 15 append_to menu_items, '[Results]', 'user_admin', 'user_stat'
16 16 append_to menu_items, '[Graders]', 'graders', 'list'
17 17 append_to menu_items, '[Contests]', 'contest_management', 'index'
18 18 append_to menu_items, '[Sites]', 'sites', 'index'
19 19 append_to menu_items, '[System config]', 'configurations', 'index'
20 20 menu_items << "<br/>"
21 21 end
22 22
23 23 # main page
24 24 append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
25 25 append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
26 26
27 27 if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
28 28 append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
29 29 append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
30 30 append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
31 31 end
32 32 append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
33 33
34 34 if GraderConfiguration['system.user_setting_enabled']
35 35 append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
36 36 end
37 37 append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
38 38
39 39 menu_items.html_safe
40 40 end
41 41
42 42 def append_to(option,label, controller, action)
43 43 option << ' ' if option!=''
44 44 option << link_to_unless_current(label,
45 45 :controller => controller,
46 46 :action => action)
47 47 end
48 48
49 49 def format_short_time(time)
50 50 now = Time.now.gmtime
51 51 st = ''
52 52 if (time.yday != now.yday) or
53 53 (time.year != now.year)
54 54 st = time.strftime("%x ")
55 55 end
56 56 st + time.strftime("%X")
57 57 end
58 58
59 59 def format_short_duration(duration)
60 60 return '' if duration==nil
61 61 d = duration.to_f
62 62 return Time.at(d).gmtime.strftime("%X")
63 63 end
64 64
65 65 def read_textfile(fname,max_size=2048)
66 66 begin
67 67 File.open(fname).read(max_size)
68 68 rescue
69 69 nil
70 70 end
71 71 end
72 72
73 73 def user_title_bar(user)
74 74 header = ''
75 75 time_left = ''
76 76
77 77 #
78 78 # if the contest is over
79 79 if GraderConfiguration.time_limit_mode?
80 80 if user.contest_finished?
81 81 header = <<CONTEST_OVER
82 82 <tr><td colspan="2" align="center">
83 83 <span class="contest-over-msg">THE CONTEST IS OVER</span>
84 84 </td></tr>
85 85 CONTEST_OVER
86 86 end
87 87 if !user.contest_started?
88 88 time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
89 89 else
90 90 time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
91 91 " #{format_short_duration(user.contest_time_left)}"
92 92 end
93 93 end
94 94
95 95 #
96 96 # if the contest is in the anaysis mode
97 97 if GraderConfiguration.analysis_mode?
98 98 header = <<ANALYSISMODE
99 99 <tr><td colspan="2" align="center">
100 100 <span class="contest-over-msg">ANALYSIS MODE</span>
101 101 </td></tr>
102 102 ANALYSISMODE
103 103 end
104 104
105 105 contest_name = GraderConfiguration['contest.name']
106 106
107 107 #
108 108 # build real title bar
109 109 result = <<TITLEBAR
110 110 <div class="title">
111 111 <table>
112 112 #{header}
113 113 <tr>
114 114 <td class="left-col">
115 115 #{user.full_name}<br/>
116 - #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
116 + #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
117 117 #{time_left}
118 118 <br/>
119 119 </td>
120 120 <td class="right-col">#{contest_name}</td>
121 121 </tr>
122 122 </table>
123 123 </div>
124 124 TITLEBAR
125 125 result.html_safe
126 126 end
127 127
128 128 def markdown(text)
129 129 markdown = RDiscount.new(text)
130 130 markdown.to_html.html_safe
131 131 end
132 132
133 133 end
You need to be logged in to leave comments. Login now