mylife: smoother achievement summary (fixes #7469) (#7470)

Co-authored-by: dogi <[email protected]>

package.json

@@ -1,10 +1,10 @@
 {
  "name": "planet",
  "license": "AGPL-3.0",
- "version": "0.14.36",
+ "version": "0.14.37",
  "myplanet": {
- "latest": "v0.15.47",
- "min": "v0.14.47"
+ "latest": "v0.15.50",
+ "min": "v0.14.50"
  },
  "scripts": {
  "ng": "ng",

src/app/users/users-achievements/users-achievements-update.component.ts

@@ -164,9 +164,6 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
  if (formValue === undefined) {
  return;
  }
- if (formValue.resources) {
- formValue.resources.sort((a, b) => a.title.toLowerCase() > b.title.toLowerCase() ? 1 : -1);
- }
  this.updateFormArray(formArray, formGroup, index);
  };
  }
@@ -237,8 +234,4 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
  this.router.navigate([ '..' ], { relativeTo: this.route });
  }
 
- removeResource(achievement: FormControl, resource) {
- achievement.setValue({ ...achievement.value, resources: achievement.value.resources.filter(({ _id }) => _id !== resource._id) });
- }
-
 }

src/app/users/users-achievements/users-achievements.component.html

@@ -9,7 +9,7 @@
  <span *ngIf="user?.firstName; else elseBlock">{{ user.firstName}} {{user.middleName}} {{user.lastName }}</span>
  <ng-template #elseBlock>{{ user.name }}</ng-template>
  <span class="toolbar-fill"></span>
- <a mat-raised-button color="primary" style="margin-right: 1rem;" *ngIf="ownAchievements" (click)="generatePDF()">
+ <a mat-raised-button color="primary" style="margin-right: 1rem;" *ngIf="ownAchievements && !achievementNotFound" (click)="generatePDF()">
  <span i18n>Print Achievements</span>
  </a> <br>
  <a mat-raised-button color="accent" routerLink="update" *ngIf="ownAchievements">

src/app/users/users-achievements/users-achievements.service.ts

@@ -1,8 +1,5 @@
 import { Injectable } from '@angular/core';
 import { CouchService } from '../../shared/couchdb.service';
-import { forkJoin } from 'rxjs';
-import { map, first } from 'rxjs/operators';
-import { ResourcesService } from '../../resources/resources.service';
 
 @Injectable({
  providedIn: 'root'
@@ -14,26 +11,10 @@ export class UsersAchievementsService {
 
  constructor(
  private couchService: CouchService,
- private resourcesService: ResourcesService
  ) {}
 
-
  getAchievements(id) {
- this.resourcesService.requestResourcesUpdate(this.parent);
- return forkJoin([
- this.couchService.get(this.dbName + '/' + id),
- this.resourcesService.resourcesListener(this.parent).pipe(first())
- ]).pipe(
- map(([ userAchievements, resources ]: any[]) => {
- const resourceIds = resources.map((res: any) => res._id);
- userAchievements.achievements.forEach((achievement: any) => {
- if (achievement.resources.length !== 0) {
- achievement.resources = achievement.resources.filter(res => resourceIds.indexOf(res._id) !== -1);
- }
- });
- return userAchievements;
- })
- );
+ return this.couchService.get(this.dbName + '/' + id);
  }
 
  isEmpty(achievement) {