Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed deadline warning for non-submittable assignments #1701

Merged
merged 3 commits into from
Jan 30, 2023
Merged

Removed deadline warning for non-submittable assignments #1701

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9f91a0
Removed deadline warning for non-submittable assignments
kushalnl7 Jan 27, 2023
c7fa53c
Removed deadline warning for non-submittable assignments: Code Refact…
kushalnl7 Jan 29, 2023
4c3cc89
Removed deadline warning for non-submittable assignments: Code Refact…
kushalnl7 Jan 30, 2023
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
61 changes: 36 additions & 25 deletions app/views/assessments/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,38 +154,49 @@
<div class="col s12 m8">
<br>
<br>
<div class="handin-panel card z-depth-0">
<div class="card-content">
<p class="valign-wrapper">
<i class="material-icons valign">access_time</i>
&nbsp;&nbsp;Due<% if @extension %> (with <% if @extension.infinite? %> infinite <% else %> <%= pluralize(@extension.days, "day") %> <% end %> extension)<% end %>:&nbsp;
<% if !@assessment.disable_handins %>
<div class="handin-panel card z-depth-0">
<div class="card-content">
<p class="valign-wrapper">
<i class="material-icons valign">access_time</i>
&nbsp;&nbsp;Due<% if @extension %> (with <% if @extension.infinite? %> infinite <% else %> <%= pluralize(@extension.days, "day") %> <% end %> extension)<% end %>:&nbsp;
<b>
<% if @extension&.infinite? %>
<%= due_at_display @aud.due_at %>
<% else %>
<span class="moment-date-time" data-format="MMMM Do YYYY, h:mm a z [(UTC] Z[)]"><%= due_at_display @aud.due_at %></span>
<% end %>
</b>
</p>

<p class="valign-wrapper">
<i class="valign material-icons">today</i>
&nbsp;&nbsp;Last day to handin:&nbsp;
<b>
<% if @extension&.infinite? %>
<%= due_at_display @aud.due_at %>
<%= end_at_display(@aud.end_at false) %>
<% else %>
<span class="moment-date-time" data-format="MMMM Do YYYY, h:mm a z [(UTC] Z[)]"><%= due_at_display @aud.due_at %></span>
<span class="moment-date-time" data-format="MMMM Do YYYY, h:mm a z [(UTC] Z[)]"><%= end_at_display(@aud.end_at false) %></span>
<% end %>
</b>
</p>

<p class="valign-wrapper">
<i class="valign material-icons">today</i>
&nbsp;&nbsp;Last day to handin:&nbsp;
<b>
<% if @extension&.infinite? %>
<%= end_at_display(@aud.end_at false) %>
<% else %>
<span class="moment-date-time" data-format="MMMM Do YYYY, h:mm a z [(UTC] Z[)]"><%= end_at_display(@aud.end_at false) %></span>
<% end %>
</b>
</p>
</p>

<% if @cud.instructor? and @assessment.exam? %>
<p class="attention">This is an exam. While it is in progress, please check Admin > Edit Course > Exam In Progress.</p>
<% end %>
<% if @cud.instructor? and @assessment.exam? %>
<p class="attention">This is an exam. While it is in progress, please check Admin > Edit Course > Exam In Progress.</p>
<% end %>
</div>
<%= render partial: "handin_form", locals: {modal: false, id: "handin_show_assessment"} %>
</div>
<%= render partial: "handin_form", locals: {modal: false, id: "handin_show_assessment"} %>
</div>
<% else %>
<div class="handin-panel card z-depth-0">
<div class="card-content">
<p class="valign-wrapper">
<i class="material-icons valign">file_upload_off</i>
<b class="red-text">&nbsp;Handins are disabled for this assessment.</b>
</p>
</div>
</div>
<% end %>
</div>
</div>
<% download_access = (@cud.instructor?) %>
Expand Down