Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/models/task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1467,6 +1467,7 @@ class TaskAppController < ApplicationController
include LatexHelper

attr_accessor :task
attr_accessor :submission_date
attr_accessor :files
attr_accessor :base_path
attr_accessor :image_path
Expand All @@ -1475,6 +1476,7 @@ class TaskAppController < ApplicationController

def init(task, is_retry)
@task = task
@submission_date = task.submission_date || task.file_uploaded_at || task.task_submissions.maximum(:submission_time)
@files = task.in_process_files_for_task(is_retry)
@base_path = task.student_work_dir(:in_process, false)
@image_path = Rails.root.join('public/assets/images')
Expand Down Expand Up @@ -1747,7 +1749,7 @@ def create_submission_and_trigger_state_change(user, propagate = true, contribut
reverse_jplag_similarities(&:destroy)
reverse_moss_similarities(&:destroy)

save
save!
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/task/task_pdf.pdf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<% else %>
<%= lesc @task.student.first_name %> \textsc{<%= lesc @task.student.last_name %>}\\
<%= lesc @task.student.username %>\\
<%= lesc @task.submission_date.nil? ? "" : @task.submission_date.localtime.strftime("%Y/%m/%d %H:%M") %>
<%= lesc @submission_date.nil? ? "" : @submission_date.localtime.strftime("%Y/%m/%d %H:%M") %>
<% end %>
\end{flushleft}
\end{minipage}
Expand Down
5 changes: 5 additions & 0 deletions test/models/task_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,16 @@ def test_pdf_creation_with_gif
assert_equal 201, last_response.status, last_response_body

task = project.task_for_task_definition(td)
submission_time = task.file_uploaded_at
assert submission_time
task.update_column(:submission_date, nil)
assert task.convert_submission_to_pdf(log_to_stdout: true)
path = task.zip_file_path_for_done_task
assert path
assert File.exist? path
assert File.exist? task.final_pdf_path
assert_includes PDF::Reader.new(task.final_pdf_path).pages.first.text,
submission_time.localtime.strftime('%Y/%m/%d %H:%M')

td.destroy
assert_not File.exist? path
Expand Down
Loading