Skip to content

Commit

Permalink
SAM-2970 Refactor Extended Time
Browse files Browse the repository at this point in the history
Front end is working. Jquery date selector only for new items.

When saving the extended time entries, all new entries are compared
to what is in the database by ID. If there are
no matches than (that is an old entry is not present in the new ones),
than that entry is removed. (see saveExtendedTimeEntriesHelper within
ExtendedTimeFacade.java).

ExtendedTimeDeliveryService is used as a medium for the delivery
aspect of the assessments. This has been modified to use the new
ExtendedTime entries. This should reduce the testing load necessary.

Entries are validating when an assessment is published / all ready
published exam is saved.

All done except for auto-submit. Minor testing done

KNOWN BUG (probably all ready present):
When viewing the submissions on the totalScores.jsp page, assessments
will be marked LATE even though they where submitted within the users
extended time window.
Leonardo Canessa authored and jonespm committed Nov 23, 2016
1 parent b59ceaa commit 3041f26
Showing 34 changed files with 1,828 additions and 1,766 deletions.
Original file line number Diff line number Diff line change
@@ -199,4 +199,51 @@
text-decoration:underline;
}
}

.extendedTimeDataTable {
margin-bottom: .5em;
}

.extendedTimeDataTable thead tr th {
padding-left: .5em;
border-bottom: 1px solid black;
}

.extendedTime-user {
min-width: 130px;
}

.extendedTime-group {
min-width: 130px;
}

.extendedTime-start {
min-width: 250px;
}
.extendedTime-due {
min-width: 250px;
}
.extendedTime-retract {
min-width: 250px;
}
.extendedTime-hours {
min-width: 70px;
}
.extendedTime-mins {
min-width: 70px;
}

.extendedTimeDataTable tr {
border-bottom: 1px solid lightgrey;
}

.extendedTimeDataTable tr td {
padding-left: .25em;
padding-right: .25em;
}

.extendedTimeEntryTable tr td {
padding-left: .25em;
padding-right: .25em;
}
}
Original file line number Diff line number Diff line change
@@ -61,9 +61,7 @@ public List getAllPublishedAssessments(
public PublishedAssessmentIfc getPublishedAssessment(String assessmentId);

public Long getPublishedAssessmentId(String assessmentId);

public PublishedAssessmentIfc publishAssessment(AssessmentIfc assessment);


public PublishedAssessmentIfc publishPreviewAssessment(AssessmentIfc
assessment, String protocol);

6 changes: 5 additions & 1 deletion samigo/samigo-app/pom.xml
Original file line number Diff line number Diff line change
@@ -252,7 +252,11 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.sakaiproject.samigo</groupId>
<artifactId>samigo-impl</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
Original file line number Diff line number Diff line change
@@ -306,7 +306,32 @@ selectFromFavorites=Select from Favorites

# Extended time
extendedTimeHeading=Exceptions to Time Limit and Delivery Date
extendedTimeAdd=Add a Time Limit/Delivery Date Exception.
extendedTimeAdd=Add a Time Limit/Delivery Date Exception
extendedTimeEdit=Update a Time Limit / Delivery Date Exception
extendedTimeCancel=Cancel
header_extendedTime_user=User
header_extendedTime_group=Group
header_extendedTime_start_date=Start Date
header_extendedTime_due_date=Due Date
header_extendedTime_retract_date=Retract Date
header_extendedTime_hours=Hours
header_extendedTime_minutes=Minutes
header_extendedTime_delete=Delete
header_extendedTime_edit=Edit
extendedTime_select_group=Select Group
extendedTime_select_User=Select User
extendedTime_data_table_title=Extended time entry data table.
extendedTime_entry_table_title=Add/edit an extended time entry.

# Extended Time Errors
extended_time_user_and_group_set=User OR group must be set for extended time entry, with user '{0}' and group '{1}'.
extended_time_due_earlier_than_available=The Due Date cannot be earlier than the Start Date for extended time entry user '{0}' / group '{1}'.
extended_time_retract_earlier_than_available=The Retract Date cannot be earlier than the Available Date / Due Date for extended time entry user '{0}' / group '{1}'.
extended_time_due_same_as_available=The Due Date cannot be the same as the Available Date for extended time entry user '{0}' / group '{1}'.
extended_time_name_not_found=N/A
extended_time_duplicate_users=Entries may not be duplicated. Duplicate extended time entries detected for the following users: {0}.
extended_time_duplicate_groups=Entries may not be duplicated. Duplicate extended time entries detected for the following groups: {0}.
extended_time_and=&

# Expand Collapse
expandAll=Expand All
Loading

0 comments on commit 3041f26

Please sign in to comment.