diff --git a/src/app/pages/admin/requests/request-details/request-details.component.html b/src/app/pages/admin/requests/request-details/request-details.component.html index cc5f1202..7c035a16 100644 --- a/src/app/pages/admin/requests/request-details/request-details.component.html +++ b/src/app/pages/admin/requests/request-details/request-details.component.html @@ -184,7 +184,7 @@

Coordinates

- + {{ operator.first_name }} {{ operator.last_name }} @@ -210,7 +210,7 @@

Coordinates

Active? Has Money? Has Symptoms? - Is Curator? + Has Curator? diff --git a/src/app/pages/admin/requests/request-details/request-details.component.ts b/src/app/pages/admin/requests/request-details/request-details.component.ts index 9c5c5b4a..dc7ee064 100644 --- a/src/app/pages/admin/requests/request-details/request-details.component.ts +++ b/src/app/pages/admin/requests/request-details/request-details.component.ts @@ -192,6 +192,12 @@ export class RequestDetailsComponent implements OnInit, OnDestroy { if (request.address) { this.fakeAddressControl.patchValue({ address: request.address }); } + // Autofill secret field + if (!request.secret) { + this.tagsFacade.getRandomWord().pipe(first()).subscribe(secret => { + this.form.get('secret').patchValue(secret); + }); + } }); this.zones$.pipe(takeUntil(this.componentDestroyed$)).subscribe((z) => { diff --git a/src/app/pages/admin/volunteers/volunteer-modal-info/volunteer-modal-info.component.html b/src/app/pages/admin/volunteers/volunteer-modal-info/volunteer-modal-info.component.html index 9bbf5ebe..1a7f6d98 100644 --- a/src/app/pages/admin/volunteers/volunteer-modal-info/volunteer-modal-info.component.html +++ b/src/app/pages/admin/volunteers/volunteer-modal-info/volunteer-modal-info.component.html @@ -18,7 +18,7 @@

Distance: {{volunteer.distance | number: '1.0-0'}} Km.

Has Telegram: {{volunteer.telegram_chat_id ? 'Yes' : 'No'}}

Availability: {{volunteer.availability_day|| 'None'}}

-

Accepted Volunteers: {{volunteer.count}}

+

Accepted Requests: {{volunteer.count}}

Activity Types

{{activity.ro}}

diff --git a/src/app/services/tags/tags-facade.service.ts b/src/app/services/tags/tags-facade.service.ts index 0994bcb2..30b19436 100644 --- a/src/app/services/tags/tags-facade.service.ts +++ b/src/app/services/tags/tags-facade.service.ts @@ -11,6 +11,7 @@ import { selectOffersTags, } from '@store/tags-store/selectors'; import { map } from 'rxjs/operators'; +import { TagsService } from './tags.service'; // import { getActivityTypesTagsAction } from '@store/tags-store/actions'; @Injectable({ @@ -23,16 +24,21 @@ export class TagsFacadeService { activityTypesTags$ = this.store.pipe(select(selectActivityTypesTags)); agesTags$ = this.store.pipe(select(selectAgesTags)); availabilitiesTags$ = this.store.pipe(select(selectAvailabilitiesTags)); + teamsTags$ = this.store.pipe(select(selectTeamsTags)); + offersTags$ = this.store.pipe(select(selectOffersTags)); + availabilitiesById$ = (id: any) => this.store .pipe(select(selectAvailabilitiesTags)) .pipe(map((tags) => tags.find((t) => t._id === id))); - teamsTags$ = this.store.pipe(select(selectTeamsTags)); - offersTags$ = this.store.pipe(select(selectOffersTags)); - constructor(private store: Store) {} + constructor(private store: Store, private tagsService: TagsService) { } // getActivityTypesTags() { // this.store.dispatch(getActivityTypesTagsAction()); // } + + getRandomWord() { + return this.tagsService.getRandomWord().pipe(map(({ secret }) => secret)); + } } diff --git a/src/app/services/tags/tags.service.ts b/src/app/services/tags/tags.service.ts index 76d8b57f..46e1555f 100644 --- a/src/app/services/tags/tags.service.ts +++ b/src/app/services/tags/tags.service.ts @@ -30,4 +30,8 @@ export class TagsService { getOffers(): Observable<{ list: IOfferTag[] }> { return this.http.get<{ list: IOfferTag[] }>(`${environment.url}/tag/offer`); } + + getRandomWord() { + return this.http.get<{ secret: string }>(`${environment.url}/secret`) + } }