Repository navigation
Manchester | 26-ITP-Sep | Mathew Shaibu | Sprint 1 | Structuring and testing data #1635
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.
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
Open
MattCarolus10
wants to merge
11
commits into
CodeYourFuture:main
Choose a base branch
from
MattCarolus10:Structuring-and-testing-data
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
0658917
test for 12:00pm failed
MattCarolus10 333dbbc
minutes test error 12:30
MattCarolus10 7a3baaa
1:30pm test error
MattCarolus10 3e84b2c
00:00 to 12am bug
MattCarolus10 a87db9c
Fix time formatting in formatAs12HourClock function
MattCarolus10 3879758
Fix formatting and spacing in formatAs12HourClock function
MattCarolus10 f8404e8
Refactor time formatting in formatAs12HourClock function and improve …
MattCarolus10 f9e406f
padStart pm times to stay consistent with am
MattCarolus10 c375f66
Fix formatting in export statement for consistency
MattCarolus10 e2ea533
Fix time formatting in test for 24-hour to 12-hour conversion
MattCarolus10 e0f18e7
Remove console log statement from formatAs12HourClock function
MattCarolus10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,19 @@ | ||
| function formatAs12HourClock(time) { | ||
|
|
||
| const hours = Number(time.slice(0, 2)); | ||
| const minutes = time.slice(3); | ||
|
|
||
| if (hours === 12) { | ||
| return `12:${minutes}pm`; | ||
| } | ||
|
|
||
| if (hours === 0) { | ||
| return `12:${minutes}am`; | ||
| } | ||
|
cjyuan marked this conversation as resolved.
Resolved
|
||
|
|
||
| if (hours > 12) { | ||
| return `${hours - 12}:00 pm`; | ||
| return `${String(hours - 12).padStart(2, "0")}:${minutes}pm`; | ||
| } | ||
| return `${time} am`; | ||
| return `${time}am`; | ||
| } | ||
|
|
||
| export {formatAs12HourClock}; | ||
| export { formatAs12HourClock }; | ||
|
cjyuan marked this conversation as resolved.
Resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,27 @@ | ||
| import {formatAs12HourClock} from "./timeConverter.js"; | ||
| import { formatAs12HourClock } from "./timeConverter.js"; | ||
| import assert from "node:assert"; | ||
| import test from "node:test"; | ||
|
|
||
| test("correctly convert time after 12:00", function(){ | ||
| assert.equal(formatAs12HourClock("23:00"), "11:00 pm"); | ||
| test("correctly convert time after 12:00", function () { | ||
| assert.equal(formatAs12HourClock("23:00"), "11:00pm"); | ||
| }); | ||
|
|
||
| test("can correctly convert morning time", function() { | ||
| assert.equal(formatAs12HourClock("08:00"), "08:00 am"); | ||
| test("can correctly convert morning time", function () { | ||
| assert.equal(formatAs12HourClock("08:00"), "08:00am"); | ||
| }); | ||
|
|
||
| test("can correctly convert morning time", function () { | ||
| assert.equal(formatAs12HourClock("12:00"), "12:00pm"); | ||
| }); | ||
|
|
||
| test("can correctly convert morning time", function () { | ||
| assert.equal(formatAs12HourClock("12:30"), "12:30pm"); | ||
| }); | ||
|
|
||
| test("can correctly convert morning time", function () { | ||
| assert.equal(formatAs12HourClock("13:30"), "01:30pm"); | ||
| }); | ||
|
|
||
| test("can correctly convert morning time", function () { | ||
| assert.equal(formatAs12HourClock("00:00"), "12:00am"); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: The
.slice()method supports negative indices, which count positions from the end of the string.For example,
str.slice(-3)returns the substring containing last three characters fromstr.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this an error that needs to be fixed, I thought negative values don't make a real time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you misunderstood my comment.