diff --git a/src/app/visualize-all/visualize-all.component.html b/src/app/visualize-all/visualize-all.component.html index c238e47..da361f0 100644 --- a/src/app/visualize-all/visualize-all.component.html +++ b/src/app/visualize-all/visualize-all.component.html @@ -5,7 +5,7 @@
{{laymanDataVal$}} Graph
-+
Dates: {{startTime$}} - {{endTime$}}
Units: {{unit$}}
Function: {{function$}}
diff --git a/src/app/visualize-all/visualize-all.component.ts b/src/app/visualize-all/visualize-all.component.ts
index 4ff56a9..5f99604 100644
--- a/src/app/visualize-all/visualize-all.component.ts
+++ b/src/app/visualize-all/visualize-all.component.ts
@@ -108,23 +108,23 @@ export class VisualizeAllComponent implements OnInit {
if (startArray.length === 3 && endArray.length === 3) {
startNumArray = [parseInt(startArray[0], 10), parseInt(startArray[1], 10), parseInt(startArray[2], 10)];
endNumArray = [parseInt(endArray[0], 10), parseInt(endArray[1], 10), parseInt(endArray[2], 10)];
- if (startNumArray[0] === endNumArray[0]) {
- if (startNumArray[1] === endNumArray[0]) {
- if (startNumArray[2] < endNumArray[0]) {
- timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2];
- timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2];
+ if (startNumArray[0] === endNumArray[0]) { // if years are equal
+ if (startNumArray[1] === endNumArray[1]) { // if months are equal
+ if (startNumArray[2] <= endNumArray[2]) { // if start days are less than or equal
+ timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2] + '-00:00:00';
+ timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2] + '-23:59:59';
} else {
timeStart = 'invalid';
this.signal = true;
}
- } else if (startNumArray[1] < endNumArray[0]) {
+ } else if (startNumArray[1] < endNumArray[1]) { // if start month is less
timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2];
timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2];
} else {
timeStart = 'invalid';
this.signal = true;
}
- } else if (startNumArray[0] < endNumArray[0]) {
+ } else if (startNumArray[0] < endNumArray[0]) { // if start year is less
timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2];
timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2];
} else {