Skip to content

Commit

Permalink
Merge pull request #39 from Resgrid/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ucswift authored Apr 5, 2024
2 parents b49f39a + 6386bd0 commit 2b5d24f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ npm-debug.log*
/platforms
/plugins
/www
android/app/google-services.json
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-feature android:name="android.hardware.location.gps" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
12 changes: 9 additions & 3 deletions src/app/features/calls/pages/view-call/view-call.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,15 @@ <h2>Contact Info</h2>

<ion-list *ngSwitchCase="'protocols'">
<ion-item *ngFor="let protocol of (callsState$ | async)?.callViewData?.Protocols">
<h4>{{protocol.Name}} ({{protocol.Code}})</h4>
<p>{{protocol.Description}}</p>
<p>{{protocol.ProtocolText}}</p>
<ion-label class="ion-text-wrap">
<ion-text color="primary">
<h3>{{protocol.Name}} ({{protocol.Code}})</h3>
</ion-text>
<p [innerHTML]="protocol.Description"></p>
<ion-text color="secondary" [innerHTML]="protocol.ProtocolText">

</ion-text>
</ion-label>
</ion-item>
</ion-list>

Expand Down

0 comments on commit 2b5d24f

Please sign in to comment.