Add points from empty calendar page

mraible · Oct 15, 2018 · 6798770 · 6798770
1 parent 9b700ce
commit 6798770
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/webapp/app/entities/points/points.route.ts b/src/main/webapp/app/entities/points/points.route.ts
@@ -23,9 +23,14 @@ export class PointsResolve implements Resolve<IPoints> {
         if (id) {
             return this.service.find(id).pipe(map((points: HttpResponse<Points>) => points.body));
         } else {
-            // populate date with current date if new
             const points = new Points();
-            points.date = moment();
+            // populate date with current date if date not passed in
+            const date = route.queryParams['date'];
+            if (date) {
+                points.date = moment(date);
+            } else {
+                points.date = moment();
+            }
             // default to the best day possible
             points.exercise = 1;
             points.meals = 1;

diff --git a/src/main/webapp/app/history/history.component.ts b/src/main/webapp/app/history/history.component.ts
@@ -231,6 +231,10 @@ export class HistoryComponent implements OnInit, OnDestroy {
         if (isSameMonth(date, this.viewDate)) {
             if ((isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) || events.length === 0) {
                 this.activeDayIsOpen = false;
+                // if no events, clicking on day brings up add points
+                if (events.length === 0) {
+                    this.router.navigateByUrl('/points/new?date=' + format(date, 'YYYY-MM-DD'));
+                }
             } else {
                 this.activeDayIsOpen = true;
                 this.viewDate = date;