Skip to content

Commit

Permalink
Merge pull request #2 from renanfranca/breastfeed-feature
Browse files Browse the repository at this point in the history 
Breastfeed feature
  • Loading branch information
@renanfranca
renanfranca authored Dec 12, 2021
2 parents c5b463d + 393f8f6 commit 5958a7a
Show file tree
Hide file tree
Showing 34 changed files with 1,459 additions and 319 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.mamazinha.gateway</groupId>
<artifactId>gateway</artifactId>
<version>1.1.0</version>
<version>2.0.0</version>
<packaging>jar</packaging>
<name>Gateway</name>

Expand Down
18 changes: 9 additions & 9 deletions src/main/webapp/app/account/register/register.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ <h1 jhiTranslate="register.title" data-cy="registerTitle">Registration</h1>
<strong>Registration saved!</strong> Please check your email for confirmation.
</div>

<div class="mt-3 alert alert-warning" *ngIf="success">
<span jhiTranslate="global.messages.info.authenticated.prefix">If you want to </span>
<a class="alert-link" routerLink="/login" jhiTranslate="global.messages.info.authenticated.link">sign in</a
><span jhiTranslate="global.messages.info.authenticated.suffix"
>, you can try the default accounts:<br />- Administrator (login="admin" and password="admin") <br />- User (login="user" and
password="user").</span
>
</div>

<div class="alert alert-danger" *ngIf="error" jhiTranslate="register.messages.error.fail">
<strong>Registration failed!</strong> Please try again later.
</div>
Expand Down Expand Up @@ -222,15 +231,6 @@ <h1 jhiTranslate="register.title" data-cy="registerTitle">Registration</h1>
Register
</button>
</form>

<div class="mt-3 alert alert-warning">
<span jhiTranslate="global.messages.info.authenticated.prefix">If you want to </span>
<a class="alert-link" routerLink="/login" jhiTranslate="global.messages.info.authenticated.link">sign in</a
><span jhiTranslate="global.messages.info.authenticated.suffix"
>, you can try the default accounts:<br />- Administrator (login="admin" and password="admin") <br />- User (login="user" and
password="user").</span
>
</div>
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions src/main/webapp/app/config/font-awesome-icons.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
faBell,
faBook,
faCalendarAlt,
faChartArea,
faCheck,
faCloud,
faCogs,
Expand Down Expand Up @@ -94,5 +95,6 @@ export const fontAwesomeIcons = [
faSmile,
faLaugh,
faThumbsUp,
faChartArea,
// jhipster-needle-add-icon-import
];
11 changes: 7 additions & 4 deletions src/main/webapp/app/entities/baby/baby-profile/baby-profile.module.ts
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { NgModule } from '@angular/core';
import { SharedModule } from 'app/shared/shared.module';
import { BabyProfileComponent } from './list/baby-profile.component';
import { BabyProfileDetailComponent } from './detail/baby-profile-detail.component';
import { BabyProfileUpdateComponent } from './update/baby-profile-update.component';
import 'd3';
import { NvD3Module } from 'ng2-nvd3';
import 'nvd3';
import { BabyProfileDeleteDialogComponent } from './delete/baby-profile-delete-dialog.component';
import { BabyProfileDetailComponent } from './detail/baby-profile-detail.component';
import { BabyProfileComponent } from './list/baby-profile.component';
import { BabyProfileRoutingModule } from './route/baby-profile-routing.module';
import { BabyProfileUpdateComponent } from './update/baby-profile-update.component';

@NgModule({
imports: [SharedModule, BabyProfileRoutingModule],
imports: [SharedModule, NvD3Module, BabyProfileRoutingModule],
declarations: [BabyProfileComponent, BabyProfileDetailComponent, BabyProfileUpdateComponent, BabyProfileDeleteDialogComponent],
entryComponents: [BabyProfileDeleteDialogComponent],
})
Expand Down
76 changes: 66 additions & 10 deletions src/main/webapp/app/entities/baby/baby-profile/detail/baby-profile-detail.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="col-md-8 col-sm-12">
<div *ngIf="babyProfile">
<h2 data-cy="babyProfileDetailsHeading">
<span jhiTranslate="gatewayApp.babyBabyProfile.detail.title" [translateValues]="{ date: currentDate | date: 'd MMM' }"
<span jhiTranslate="gatewayApp.babyBabyProfile.detail.title" [translateValues]="{ date: currentTodayDateShortFormat }"
>Baby Profile</span
>
</h2>
Expand Down Expand Up @@ -50,7 +50,7 @@ <h2 data-cy="babyProfileDetailsHeading">
<div class="row align-items-center">
<div class="col-lg-2 col-sm-3 col-6 m-0 pr-0 text-center">
<a [routerLink]="['/humor-history']">
<div *ngIf="humorAverageHumorHistory">
<div *ngIf="humorAverageHumorHistory && humorAverageHumorHistory?.humorAverage > 0">
<div [ngSwitch]="humorAverageHumorHistory?.humorAverage">
<fa-icon *ngSwitchCase="1" icon="angry" class="emoji angry select"></fa-icon>
<fa-icon *ngSwitchCase="2" icon="frown" class="emoji frown select"></fa-icon>
Expand All @@ -59,16 +59,27 @@ <h2 data-cy="babyProfileDetailsHeading">
<fa-icon *ngSwitchCase="5" icon="laugh" class="emoji laugh select"></fa-icon>
</div>
</div>
<div *ngIf="!humorAverageHumorHistory">
<div *ngIf="humorAverageHumorHistory && humorAverageHumorHistory?.humorAverage === 0">
<fa-icon icon="window-minimize" class="text-muted"></fa-icon>
</div>
</a>
</div>
<div class="col-lg-10 col-sm-9 col-6 text-left">
<a [routerLink]="['/humor-history/new']" class="btn btn-primary m-0 text-white">
<a [routerLink]="['/humor-history/new']" class="btn btn-primary m-0 text-white p-2 mt-1">
<fa-icon icon="plus"></fa-icon>
<span class="d-none d-sm-inline" jhiTranslate="gatewayApp.babyBabyProfile.addHumorHistory"> Humor </span>
</a>
<button (click)="showHideWeekAverageHumorHistoryGraphic()" [disabled]="graphicLoading" class="btn btn-info btn-sm p-2 mt-1">
<fa-icon icon="chart-area" [ngClass]="graphicLoading ? 'fa-bounce' : ''"></fa-icon>
</button>
</div>
</div>
</dd>
<dt *ngIf="isShowWeekAverageHumorHistoryGraphic(averageHumorHistoryLastCurrentWeek)"></dt>
<dd class="gird-col-span-2" *ngIf="isShowWeekAverageHumorHistoryGraphic(averageHumorHistoryLastCurrentWeek)">
<div class="row mt-1">
<div class="col-md-12 col-xs-12">
<nvd3 [options]="averageHumorHistoryOptions" [data]="averageHumorHistoryData"></nvd3>
</div>
</div>
</dd>
Expand All @@ -77,7 +88,7 @@ <h2 data-cy="babyProfileDetailsHeading">
<div class="row align-items-center">
<div class="col-lg-2 col-sm-3 col-6 m-0 pr-0 text-center">
<a [routerLink]="['/nap']">
<div *ngIf="humorAverageNap">
<div *ngIf="humorAverageNap && humorAverageNap?.humorAverage > 0">
<div [ngSwitch]="humorAverageNap?.humorAverage">
<fa-icon *ngSwitchCase="1" icon="angry" class="emoji angry select"></fa-icon>
<fa-icon *ngSwitchCase="2" icon="frown" class="emoji frown select"></fa-icon>
Expand All @@ -86,16 +97,27 @@ <h2 data-cy="babyProfileDetailsHeading">
<fa-icon *ngSwitchCase="5" icon="laugh" class="emoji laugh select"></fa-icon>
</div>
</div>
<div *ngIf="!humorAverageNap">
<div *ngIf="humorAverageNap && humorAverageNap?.humorAverage === 0">
<fa-icon icon="window-minimize" class="text-muted"></fa-icon>
</div>
</a>
</div>
<div class="col-lg-10 col-sm-9 col-6 text-left">
<a [routerLink]="['/nap/new']" class="btn btn-primary m-0 text-white">
<a [routerLink]="['/nap/new']" class="btn btn-primary m-0 text-white p-2 mt-1">
<fa-icon icon="plus"></fa-icon>
<span class="d-none d-sm-inline" jhiTranslate="gatewayApp.babyBabyProfile.addNap"> Nap </span>
</a>
<button (click)="showHideWeekAverageNapHumorGraphic()" [disabled]="graphicLoading" class="btn btn-info btn-sm p-2 mt-1">
<fa-icon icon="chart-area" [ngClass]="graphicLoading ? 'fa-bounce' : ''"></fa-icon>
</button>
</div>
</div>
</dd>
<dt *ngIf="isShowWeekAverageNapHumorGraphic(averageNapHumorLastCurrentWeek)"></dt>
<dd class="gird-col-span-2" *ngIf="isShowWeekAverageNapHumorGraphic(averageNapHumorLastCurrentWeek)">
<div class="row mt-1">
<div class="col-md-12 col-xs-12">
<nvd3 [options]="averageNapHumorOptions" [data]="averageNapHumorData"></nvd3>
</div>
</div>
</dd>
Expand Down Expand Up @@ -132,7 +154,7 @@ <h2 data-cy="babyProfileDetailsHeading">
</a>
</div>
<div class="col-lg-10 col-sm-9 col-6 text-left">
<a [routerLink]="['/nap/new']" class="btn btn-primary m-0 text-white">
<a [routerLink]="['/nap/new']" class="btn btn-primary m-0 text-white p-2 mt-1">
<fa-icon icon="plus"></fa-icon>
<span class="d-none d-sm-inline" jhiTranslate="gatewayApp.babyBabyProfile.addNap"> Nap </span>
</a>
Expand All @@ -157,10 +179,27 @@ <h2 data-cy="babyProfileDetailsHeading">
</a>
</div>
<div class="col-lg-10 col-sm-9 col-6 text-left">
<a [routerLink]="['/weight/new']" class="btn btn-primary m-0 text-white">
<a [routerLink]="['/weight/new']" class="btn btn-primary m-0 text-white p-2 mt-1">
<fa-icon icon="plus"></fa-icon>
<span class="d-none d-sm-inline" jhiTranslate="gatewayApp.babyBabyProfile.addWight"> Weight </span>
</a>
<button
(click)="showHideLastWeightsDaysAgoGraphic()"
[hidden]="hideLastWeightsDaysAgoGraphicIcon"
[disabled]="graphicLoading"
class="btn btn-info btn-sm p-2 mt-1"
>
<fa-icon icon="chart-area" [ngClass]="graphicLoading ? 'fa-bounce' : ''"></fa-icon>
</button>
</div>
</div>
</dd>
<dt *ngIf="isShowLastWeightsDaysAgoGraphic(lastWeightsDaysAgo)"></dt>
<dd class="gird-col-span-2" *ngIf="isShowLastWeightsDaysAgoGraphic(lastWeightsDaysAgo)">
<div class="row mt-1">
<div class="col-md-12 col-xs-12">
<h4 class="nvd3-chart-title mobile">{{ d3ChartTranslate.last30Days }}</h4>
<nvd3 [options]="lastWeightsDaysAgoOptions" [data]="lastWeightsDaysAgoData"></nvd3>
</div>
</div>
</dd>
Expand All @@ -182,10 +221,27 @@ <h2 data-cy="babyProfileDetailsHeading">
</a>
</div>
<div class="col-lg-10 col-sm-9 col-6 text-left">
<a [routerLink]="['/height/new']" class="btn btn-primary m-0 text-white">
<a [routerLink]="['/height/new']" class="btn btn-primary m-0 text-white p-2 mt-1">
<fa-icon icon="plus"></fa-icon>
<span class="d-none d-sm-inline" jhiTranslate="gatewayApp.babyBabyProfile.addHight"> Height </span>
</a>
<button
(click)="showHideLastHeightsDaysAgoGraphic()"
[hidden]="hideLastHeightsDaysAgoGraphicIcon"
[disabled]="graphicLoading"
class="btn btn-info btn-sm p-2 mt-1"
>
<fa-icon icon="chart-area" [ngClass]="graphicLoading ? 'fa-bounce' : ''"></fa-icon>
</button>
</div>
</div>
</dd>
<dt *ngIf="isShowLastHeightsDaysAgoGraphic(lastHeightsDaysAgo)"></dt>
<dd class="gird-col-span-2" *ngIf="isShowLastHeightsDaysAgoGraphic(lastHeightsDaysAgo)">
<div class="row mt-1">
<div class="col-md-12 col-xs-12">
<h4 class="nvd3-chart-title mobile">{{ d3ChartTranslate.last30Days }}</h4>
<nvd3 [options]="lastHeightsDaysAgoOptions" [data]="lastHeightsDaysAgoData"></nvd3>
</div>
</div>
</dd>
Expand Down
Loading

0 comments on commit 5958a7a

Please sign in to comment.