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

Jump to bottom

[#11254] Instructor Feedback Session Results: Session Duration formatting #11272

Merged
merged 8 commits into from
Aug 21, 2021
Merged

[#11254] Instructor Feedback Session Results: Session Duration formatting #11272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31e8be3
convert spaces to non-breaking spaces in variables formattedSessionOp…
ericluoliu Jul 14, 2021
ae49019
Merge branch 'master' of https://github.com/TEAMMATES/teammates into …
ericluoliu Jul 31, 2021
bd49c94
Change nonbreaking spaces to regular spaces and add linebreak
ericluoliu Jul 31, 2021
cf41673
Merge branch 'master' of https://github.com/TEAMMATES/teammates into …
ericluoliu Aug 3, 2021
f95de5d
Fix spacing
ericluoliu Aug 3, 2021
ff602ec
Change InstructorFeedbackResultsPage in e2e test.
ericluoliu Aug 4, 2021
b1c1457
Merge branch 'master' into instruction-session-result-page-format
hhdqirui Aug 14, 2021
175e516
Merge branch 'master' into instruction-session-result-page-format
rrtheonlyone Aug 21, 2021
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
2 changes: 1 addition & 1 deletion src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackResultsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ private String getUserHeader(boolean isGiver, String name) {
}

private String getSessionDurationString(FeedbackSessionAttributes feedbackSession) {
return getDateString(feedbackSession.getStartTime(), feedbackSession.getTimeZone()) + " to "
return getDateString(feedbackSession.getStartTime(), feedbackSession.getTimeZone()) + " to\n"
+ getDateString(feedbackSession.getEndTime(), feedbackSession.getTimeZone());
}

Expand Down
2 changes: 1 addition & 1 deletion ...s-instructor/instructor-session-result-page/instructor-session-result-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>
<div class="form-group row">
<label class="col-lg-4 control-label"><b>Session duration:</b></label>
<div id="session-duration" class="col-lg-8">
<p class="form-control-static">{{ formattedSessionOpeningTime }}&nbsp;&nbsp;&nbsp;<b>to</b>&nbsp;&nbsp;&nbsp;{{ formattedSessionClosingTime }}</p>
<p class="form-control-static">{{ formattedSessionOpeningTime }}&nbsp;&nbsp;&nbsp;<b>to</b><br>{{ formattedSessionClosingTime }}</p>
</div>
</div>
<div class="form-group row">
Expand Down