Fixed formatting issues with dates

alexaylwin · May 9, 2018 · a78dc91 · a78dc91
1 parent a247e4a
commit a78dc91
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/src/app/components/recent-activities/recent-activities.component.ts b/src/app/components/recent-activities/recent-activities.component.ts
@@ -49,13 +49,13 @@ class DisplayRecord {
 		let endWrapper = moment(record.endTime);
 
 		if(startWrapper.date() == endWrapper.date()) {
-			this.startTime = startWrapper.format('h:m A');
-			this.endTime = endWrapper.format('h:m A');
-			this.displayDate = startWrapper.format('MMMM DD YYYY');
+			this.startTime = startWrapper.format('h:mm A');
+			this.endTime = endWrapper.format('h:mm A');
+			this.displayDate = startWrapper.format('MMMM DD, YYYY');
 		} else {
-			this.startTime = startWrapper.format('MMMM DD YYYY h:m A')
-			this.endTime = endWrapper.format('MMMM DD YYYY h:m A')
-			this.displayDate = startWrapper.format('MMMM DD YYYY') + ' to ' + endWrapper.format('MMMM DD YYYY');
+			this.startTime = startWrapper.format('MMMM DD, YYYY h:mm A')
+			this.endTime = endWrapper.format('MMMM DD, YYYY h:mm A')
+			this.displayDate = startWrapper.format('MMMM DD, YYYY') + ' to ' + endWrapper.format('MMMM DD, YYYY');
 		}
 	}
 }
diff --git a/src/app/services/recent-activities.service.ts b/src/app/services/recent-activities.service.ts
@@ -45,21 +45,26 @@ export class RecentActivitiesService {
 				let ar: ActivityRecord[] = new Array();
 				for(let i = 0; i < response.length; i++) {
 					let record = new ActivityRecord();
+					console.log(response[i]);
 					record.activityId = response[i].activityId;
-					record.endTime.setDate(response[i].endTime.dayOfMonth);
-					record.endTime.setMonth(response[i].endTime.monthValue);
-					record.endTime.setFullYear(response[i].endTime.year);
-					record.endTime.setHours(response[i].endTime.hour);
-					record.endTime.setMinutes(response[i].endTime.minute);
-					record.endTime.setSeconds(response[i].endTime.second);
-
-					record.startTime.setDate(response[i].startTime.dayOfMonth);
-					record.startTime.setMonth(response[i].startTime.monthValue);
-					record.startTime.setFullYear(response[i].startTime.year);
-					record.startTime.setHours(response[i].startTime.hour);
-					record.startTime.setMinutes(response[i].startTime.minute);
-					record.startTime.setSeconds(response[i].startTime.second);
+					let endTimeWrapper = moment(response[i].endTime, 'YYYY-DD-MM hh:mm:ss A');
+					let startTimeWrapper = moment(response[i].startTime, 'YYYY-DD-MM hh:mm:ss A');
+					record.endTime = endTimeWrapper.toDate();
+					record.startTime = startTimeWrapper.toDate();
+					// record.endTime.setDate(response[i].endTime.dayOfMonth);
+					// record.endTime.setMonth(response[i].endTime.monthValue);
+					// record.endTime.setFullYear(response[i].endTime.year);
+					// record.endTime.setHours(response[i].endTime.hour);
+					// record.endTime.setMinutes(response[i].endTime.minute);
+					// record.endTime.setSeconds(response[i].endTime.second);
 
+					// record.startTime.setDate(response[i].startTime.dayOfMonth);
+					// record.startTime.setMonth(response[i].startTime.monthValue);
+					// record.startTime.setFullYear(response[i].startTime.year);
+					// record.startTime.setHours(response[i].startTime.hour);
+					// record.startTime.setMinutes(response[i].startTime.minute);
+					// record.startTime.setSeconds(response[i].startTime.second);
+					console.log(record);
 					ar.push(record);
 				}
 				return ar;