Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mylife: smoother myhealth allergy info (fixes #8038) #8128

Merged
merged 4 commits into from
Jan 27, 2025
Merged

mylife: smoother myhealth allergy info (fixes #8038) #8128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
908a20e
removed allergies from exams. Added allergies to profile
jessewashburn Jan 22, 2025
8be9e0f
reorder
Mutugiii Jan 27, 2025
e6505c4
Update package.json
dogi Jan 27, 2025
a104070
Merge branch 'master' into 8038-myhealth-move-allergies-to-user-details
dogi Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.16.78",
"version": "0.16.79",
"myplanet": {
"latest": "v0.22.40",
"min": "v0.21.40"
"latest": "v0.22.45",
"min": "v0.21.45"
},
"scripts": {
"ng": "ng",
Expand Down
1 change: 0 additions & 1 deletion src/app/health/health-event-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ <h4 class="primary-text-color" *ngIf="hasConditionAndTreatment" i18n>Other Notes
<p *ngIf="event.treatments"><strong class="mat-body-strong" i18n>Treatments: </strong><td-markdown [content]="event.treatments"></td-markdown>
<p *ngIf="event.medications"><strong class="mat-body-strong" i18n>Medications: </strong><td-markdown [content]="event.medications"></td-markdown>
<p *ngIf="event.immunizations"><strong class="mat-body-strong" i18n>Immunizations: </strong><td-markdown [content]="event.immunizations"></td-markdown>
<p *ngIf="event.allergies"><strong class="mat-body-strong" i18n>Allergies: </strong><td-markdown [content]="event.allergies"></td-markdown>
<p *ngIf="event.xrays"><strong class="mat-body-strong" i18n>X-rays: </strong><td-markdown [content]="event.xrays"></td-markdown>
<p *ngIf="event.tests"><strong class="mat-body-strong" i18n>Lab Tests: </strong><td-markdown [content]="event.tests"></td-markdown>
<p *ngIf="event.referrals"><strong class="mat-body-strong" i18n>Referrals: </strong><td-markdown [content]="event.referrals"></td-markdown>
Expand Down
3 changes: 0 additions & 3 deletions src/app/health/health-event.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ <h4 class="full-width primary-text-color" i18n>Condition and Treatment</h4>
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="Immunization Dates" [formControl]="healthForm.controls.immunizations"></planet-markdown-textbox>
</mat-form-field>
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="Allergies" [formControl]="healthForm.controls.allergies"></planet-markdown-textbox>
</mat-form-field>
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="X-rays" [formControl]="healthForm.controls.xrays"></planet-markdown-textbox>
</mat-form-field>
Expand Down
3 changes: 3 additions & 0 deletions src/app/health/health-update.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="Special Needs" [formControl]="healthForm.controls.specialNeeds"></planet-markdown-textbox>
</mat-form-field>
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="Allergies" [formControl]="healthForm.controls.allergies"></planet-markdown-textbox>
</mat-form-field>
<mat-form-field class="full-width mat-form-field-type-no-underline">
<planet-markdown-textbox i18n-placeholder placeholder="Other Notes" [formControl]="healthForm.controls.notes"></planet-markdown-textbox>
</mat-form-field>
Expand Down
1 change: 1 addition & 0 deletions src/app/health/health-update.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export class HealthUpdateComponent implements OnInit {
emergencyContactType: '',
emergencyContact: '',
specialNeeds: '',
allergies: '',
notes: ''
});
this.healthForm.controls.emergencyContactType.valueChanges.subscribe(value => {
Expand Down
7 changes: 7 additions & 0 deletions src/app/health/health.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ <h4 class="primary-text-color" i18n>Emergency Contact</h4>
</div>
<mat-divider></mat-divider>
</div>
<div class="full-width">
<div>
<h4 class="primary-text-color" i18n>Allergies</h4>
<td-markdown [content]="healthDetail?.allergies || 'N/A'"></td-markdown>
</div>
<mat-divider></mat-divider>
</div>
<div class="full-width">
<div>
<h4 class="primary-text-color" i18n>Special Needs</h4>
Expand Down
Loading