|
|
@@ -9,10 +9,10 @@ export class FunctionsService {
|
|
|
|
|
|
constructor() { }
|
|
|
|
|
|
- orderDate(date: string): string | undefined {
|
|
|
+ orderDate(date: string): string {
|
|
|
let dateTimeArr = date.split(' ');
|
|
|
if(dateTimeArr[0] == undefined || dateTimeArr[0] == 'undefined'){
|
|
|
- return undefined;
|
|
|
+ return '';
|
|
|
}else if(dateTimeArr[0].includes('T')){
|
|
|
let dateJSArr = dateTimeArr[0].split('T');
|
|
|
dateTimeArr[0] = dateJSArr[0];
|
|
|
@@ -21,18 +21,18 @@ export class FunctionsService {
|
|
|
let dateArr = dateTimeArr[0].split('-');
|
|
|
dateArr = dateArr.reverse();
|
|
|
|
|
|
- let dateStr =dateArr.join('-');
|
|
|
+ let dateStr = dateArr.join('-');
|
|
|
let timeArr = dateTimeArr[1].split(':');
|
|
|
let hour = parseInt(timeArr[0]);
|
|
|
+ let period = hour < 12 ? 'AM' : 'PM';
|
|
|
|
|
|
- let timeLapse = hour > 12 ? 'PM' : 'AM';
|
|
|
- if(timeLapse == 'PM') hour = hour - 12;
|
|
|
+ if(hour > 12) hour = hour - 12;
|
|
|
let hourStr = hour < 10 ? `0${hour}` : `${hour}`;
|
|
|
|
|
|
timeArr[0] = hourStr;
|
|
|
let timeStr = timeArr.join(':');
|
|
|
|
|
|
- return `${dateStr} ${timeStr} ${timeLapse}`;
|
|
|
+ return `${dateStr} ${timeStr} ${period}`;
|
|
|
}
|
|
|
|
|
|
buildHumanDate(date: string): string{
|