Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
whats-open-web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
whats-open-web
Commits
d5ebefad
Commit
d5ebefad
authored
May 24, 2018
by
Andrew Hrdy
Browse files
Options
Browse Files
Download
Plain Diff
Merge master into develop
parents
90366827
45ce6b5f
Pipeline
#2465
passed with stages
in 2 minutes and 3 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
.gitignore
.gitignore
+1
-1
CHANGELOG.md
CHANGELOG.md
+8
-1
src/utils/facilityUtils.js
src/utils/facilityUtils.js
+5
-5
No files found.
.gitignore
View file @
d5ebefad
...
...
@@ -23,7 +23,7 @@ yarn-error.log*
#local dotfiles
/.storybook
/.idea
/.vscode
/.idea
/src/stories
/src/styles/build
CHANGELOG.md
View file @
d5ebefad
# Changelog
## [2.1.3] - 2018-05-24
### Fixed
-
Fixed bug causing facility times that started at 12:00pm to show as 12:00am.
## [2.1.2] - 2018-03-06
### Changed
...
...
@@ -50,4 +56,5 @@
[
2.0.1
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.0...v2.0.1
[
2.1.0
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.0.1...v2.1-Midnight-Cherry
[
2.1.1
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.1-Midnight-Cherry...v2.1.1
[
2.1.2
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.1.1...v2.1.2
\ No newline at end of file
[
2.1.2
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.1.1...v2.1.2
[
2.1.3
]:
https://git.gmu.edu/srct/whats-open-web/compare/v2.1.2...v2.1.3
\ No newline at end of file
src/utils/facilityUtils.js
View file @
d5ebefad
...
...
@@ -298,11 +298,11 @@ const convertToMeridianTime = (time) => {
let
amPM
=
'
am
'
;
if
(
timeArr
[
0
]
===
0
||
timeArr
[
0
]
===
24
)
{
timeArr
[
0
]
=
12
;
}
else
{
if
(
timeArr
[
0
]
>
12
)
{
timeArr
[
0
]
-=
12
;
amPM
=
'
pm
'
;
}
}
else
if
(
timeArr
[
0
]
===
12
)
{
amPM
=
'
pm
'
;
}
else
if
(
timeArr
[
0
]
>
12
)
{
timeArr
[
0
]
-=
12
;
amPM
=
'
pm
'
;
}
if
(
timeArr
[
1
]
===
0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment