Repository navigation
London | 26-ITP-Sep| Mars Adesina | Sprint 1 | formatAs12HourClock #1640
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
marscancode
wants to merge
6
commits into
CodeYourFuture:main
Choose a base branch
from
marscancode:coursework/sprint-1
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
6 commits
Select commit
Hold shift + click to select a range
dbad16a
added edge case tests for time converter function
marscancode a21732b
updated function to include midnight and half hour time conversion
marscancode bd95d82
added edge case test for 12pm conversion
marscancode be8c392
added edge case test for 1 minute before 12pm
marscancode 2c38ec5
added edge case test for 1 minute before midnight
marscancode 6eace5f
renamed edge case test 30 mins before midnight
marscancode 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,16 @@ | ||
| function formatAs12HourClock(time) { | ||
|
|
||
| const hours = Number(time.slice(0, 2)); | ||
| const minutes = time.slice(3, 5); | ||
|
|
||
| if (hours > 12) { | ||
| return `${hours - 12}:00 pm`; | ||
| if (hours === 0) { | ||
| return `12:${minutes} am`; | ||
| } else if (hours > 12) { | ||
| return `${hours - 12}:${minutes} pm`; | ||
| } else if (hours === 12) { | ||
| return `12:${minutes} pm`; | ||
| } else { | ||
| return `${time} am`; | ||
| } | ||
| return `${time} am`; | ||
| } | ||
|
|
||
| export {formatAs12HourClock}; | ||
| export { formatAs12HourClock }; | ||
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,55 @@ | ||
| 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:00 pm"); | ||
| }); | ||
|
|
||
| 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:00 am"); | ||
| }); | ||
|
|
||
| test("can correctly convert midnight", function () { | ||
| assert.equal(formatAs12HourClock("00:00"), "12:00 am"); | ||
| }); | ||
|
|
||
| test("correctly convert time 1 hour before 12:00", function () { | ||
|
marscancode marked this conversation as resolved.
|
||
| assert.equal(formatAs12HourClock("11:00"), "11:00 am"); | ||
| }); | ||
|
|
||
| test("correctly convert time 2 hours before 12:00", function () { | ||
| assert.equal(formatAs12HourClock("10:00"), "10:00 am"); | ||
| }); | ||
|
|
||
| test("correctly convert time 3 hours before 12:00", function () { | ||
| assert.equal(formatAs12HourClock("09:00"), "09:00 am"); | ||
| }); | ||
|
|
||
| test("can correctly convert every half hour before 12:00", function () { | ||
| assert.equal(formatAs12HourClock("09:30"), "09:30 am"); | ||
| }); | ||
|
|
||
| test("can correctly convert hours in the afternoon", function () { | ||
| assert.equal(formatAs12HourClock("13:00"), "1:00 pm"); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Optional, not needed for Complete: morning times keep their zero ( |
||
| }); | ||
|
|
||
| test("correctly convert half hour after 12:00", function () { | ||
| assert.equal(formatAs12HourClock("13:30"), "1:30 pm"); | ||
| }); | ||
|
|
||
| test("correctly convert half hour before midnight", function () { | ||
| assert.equal(formatAs12HourClock("23:30"), "11:30 pm"); | ||
| }); | ||
|
|
||
| test("correctly convert 12:00 pm", function () { | ||
| assert.equal(formatAs12HourClock("12:00"), "12:00 pm"); | ||
| }); | ||
|
|
||
| test("correctly convert 1 minute before 12:00pm", function () { | ||
| assert.equal(formatAs12HourClock("11:59"), "11:59 am"); | ||
| }); | ||
|
|
||
| test("correctly convert 1 minute before midnight", function () { | ||
| assert.equal(formatAs12HourClock("23:59"), "11:59 pm"); | ||
| }); | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.