cafe-grader-web

Commit r428:06bd0f1beeb4 public

parent | child
Description:
fix exclude admin in report
Commit status:
[Not Reviewed]
References:
algo
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

r428:06bd0f1beeb4 - - 1 file changed: 2 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -89,98 +89,98
89 89
90 90 # get selected problems or the default
91 91 if params[:id]
92 92 begin
93 93 @problem = Problem.available.find(params[:id])
94 94 rescue
95 95 redirect_to action: :problem_hof
96 96 flash[:notice] = 'Error: submissions for that problem are not viewable.'
97 97 return
98 98 end
99 99 end
100 100
101 101 if @problem
102 102 #aggregrate by language
103 103 @by_lang = {}
104 104 Submission.where(problem_id: @problem.id).find_each do |sub|
105 105 lang = Language.find_by_id(sub.language_id)
106 106 next unless lang
107 107 next unless sub.points >= @problem.full_score
108 108
109 109 #initialize
110 110 unless @by_lang.has_key?(lang.pretty_name)
111 111 @by_lang[lang.pretty_name] = {
112 112 runtime: { avail: false, value: 2**30-1 },
113 113 memory: { avail: false, value: 2**30-1 },
114 114 length: { avail: false, value: 2**30-1 },
115 115 first: { avail: false, value: DateTime.new(3000,1,1) }
116 116 }
117 117 end
118 118
119 119 if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
120 120 @by_lang[lang.pretty_name][:runtime] = {
121 121 avail: true,
122 122 user_id: sub.user_id,
123 123 value: sub.max_runtime,
124 124 sub_id: sub.id
125 125 }
126 126 end
127 127
128 128 if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
129 129 @by_lang[lang.pretty_name][:memory] = {
130 130 avail: true,
131 131 user_id: sub.user_id,
132 132 value: sub.peak_memory,
133 133 sub_id: sub.id
134 134 }
135 135 end
136 136
137 - if sub.user.admin? == false and
138 - sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value]
137 + if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
138 + !sub.user.admin?
139 139 @by_lang[lang.pretty_name][:first] = {
140 140 avail: true,
141 141 user_id: sub.user_id,
142 142 value: sub.submitted_at,
143 143 sub_id: sub.id
144 144 }
145 145 end
146 146
147 147 if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
148 148 @by_lang[lang.pretty_name][:length] = {
149 149 avail: true,
150 150 user_id: sub.user_id,
151 151 value: sub.effective_code_length,
152 152 sub_id: sub.id
153 153 }
154 154 end
155 155 end
156 156
157 157 #process user_id
158 158 @by_lang.each do |lang,prop|
159 159 prop.each do |k,v|
160 160 v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
161 161 end
162 162 end
163 163
164 164 #sum into best
165 165 if @by_lang and @by_lang.first
166 166 @best = @by_lang.first[1]
167 167 @by_lang.each do |lang,prop|
168 168 if @best[:runtime][:value] >= prop[:runtime][:value]
169 169 @best[:runtime] = prop[:runtime]
170 170 @best[:runtime][:lang] = lang
171 171 end
172 172 if @best[:memory][:value] >= prop[:memory][:value]
173 173 @best[:memory] = prop[:memory]
174 174 @best[:memory][:lang] = lang
175 175 end
176 176 if @best[:length][:value] >= prop[:length][:value]
177 177 @best[:length] = prop[:length]
178 178 @best[:length][:lang] = lang
179 179 end
180 180 if @best[:first][:value] >= prop[:first][:value]
181 181 @best[:first] = prop[:first]
182 182 @best[:first][:lang] = lang
183 183 end
184 184 end
185 185 end
186 186 end
You need to be logged in to leave comments. Login now