Skip to content

RO-3199: Flytt bildesøk til egen tab #990

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

Open
jorgkv wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RO-3199: Flytt bildesøk til egen tab #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...components/observation/observation-image-carousel/observation-image-carousel.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class ObservationImageCarouselComponent {
layerComments = computed(() => this.snowProfile()?.comments());
showsComments = computed(() => !!this.snowProfile()?.showComments());

isImageListView = computed(() => this.router.url.includes('search/pictures'));
isImageListView = computed(() => this.router.url.includes('/images'));
roundedDownOrientationValue = computed(() => {
const item = this.currentItem();
if (item.type === 'SnowProfile') {
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/observation-list/image-list/image-list.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
:host {
display: block;
height: 100%;
display: contents;
}

ion-content {
Expand Down
92 changes: 61 additions & 31 deletions src/app/pages/observation-list/image-list/image-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,64 @@
<!-- En liste av bilder fra observasjoner, organisert i tabellform -->
<ion-content>
<ion-refresher slot="fixed" (ionRefresh)="refresh()">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>

<div class="list-header">
<p>{{ "OBSERVATION_LIST.IMAGES_DESCRIPTION" | translate }}</p>
<app-list-controls pageType="images"></app-list-controls>
</div>

<div class="grid" #grid>
@for (reg of registrations(); track reg.RegId) {
@for (attachment of reg.Attachments; track attachment.AttachmentId) {
<app-grid-image
[attachment]="attachment"
(click)="openImageCarousel(attachment.Url, reg.RegId, reg.Attachments)"
></app-grid-image>
}
} @empty {
@if (error().hasError) {
<app-error-state></app-error-state>
} @else if (isLoading()) {
<p>{{ "OBSERVATION_LIST.LOADING" | translate }}</p>
} @else {
<app-empty-state></app-empty-state>
}
<ion-split-pane contentId="main-content-image-list">
<ion-menu side="start" menuId="list-filter" contentId="main-content-image-list" max-edge-start="0">
@defer {
Comment on lines +2 to +4
<app-filter-menu>
<!-- TODO: Legg til filter for kartutsnitt her -->
</app-filter-menu>
}
</div>
</ion-menu>

<div id="main-content-image-list" class="ion-page">
<app-header>
<!-- Høyremeny -->
<ion-buttons slot="end">
<ion-menu-button color="light"> </ion-menu-button>
</ion-buttons>

<!-- Venstremeny / filtermeny -->
<ion-buttons slot="start">
<ion-menu-button menu="list-filter" color="light">
<ion-icon name="options-outline"></ion-icon>
</ion-menu-button>
</ion-buttons>

<ion-title>{{ "OBSERVATION_LIST.TITLE" | translate }}</ion-title>
</app-header>

<ion-infinite-scroll (ionInfinite)="loadNextPage()" [disabled]="disableInfiniteScroll()">
<ion-infinite-scroll-content> </ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>
<ion-content>
<ion-refresher slot="fixed" (ionRefresh)="refresh()">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>

<div class="list-header">
<p>{{ "OBSERVATION_LIST.IMAGES_DESCRIPTION" | translate }}</p>
<app-list-controls pageType="images"></app-list-controls>
</div>

<div class="grid" #grid>
@for (reg of registrations(); track reg.RegId) {
@for (attachment of reg.Attachments; track attachment.AttachmentId) {
<app-grid-image
[attachment]="attachment"
(click)="openImageCarousel(attachment.Url, reg.RegId, reg.Attachments)"
></app-grid-image>
}
} @empty {
@if (error().hasError) {
<app-error-state></app-error-state>
} @else if (isLoading()) {
<p>{{ "OBSERVATION_LIST.LOADING" | translate }}</p>
} @else {
<app-empty-state></app-empty-state>
}
}
</div>

<ion-infinite-scroll (ionInfinite)="loadNextPage()" [disabled]="disableInfiniteScroll()">
<ion-infinite-scroll-content> </ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>

<app-add-menu></app-add-menu>
</div>
</ion-split-pane>
18 changes: 18 additions & 0 deletions src/app/pages/observation-list/image-list/image-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ import {
IonRefresherContent,
LoadingController,
ModalController,
IonSplitPane,
IonMenu,
IonButtons,
IonMenuButton,
IonIcon,
IonTitle,
} from '@ionic/angular/standalone';
import { tap, combineLatest, map, firstValueFrom } from 'rxjs';
import { SearchCriteriaService } from 'src/app/core/services/search-criteria/search-criteria.service';
Expand All @@ -32,6 +38,9 @@ import { ObservationImageCarouselComponent } from 'src/app/components/observatio
import { AttachmentViewModel, SearchService } from 'src/app/modules/common-regobs-api';
import { LoggingService } from 'src/app/modules/shared/services/logging/logging.service';
import { CarouselItems } from 'src/app/components/observation/observation-image-carousel/models';
import { FilterMenuComponent } from 'src/app/modules/side-menu/components/filter-menu/filter-menu.component';
import { HeaderComponent } from 'src/app/modules/shared/components/header/header.component';
import { AddMenuComponent } from 'src/app/modules/shared/components/add-menu/add-menu.component';

const DEBUG_TAG = 'ImageList';

Expand All @@ -51,6 +60,15 @@ const DEBUG_TAG = 'ImageList';
ListControlsComponent,
GridImageComponent,
TranslatePipe,
IonSplitPane,
IonMenu,
FilterMenuComponent,
HeaderComponent,
IonButtons,
IonMenuButton,
IonIcon,
IonTitle,
AddMenuComponent,
],
templateUrl: './image-list.component.html',
styleUrl: './image-list.component.css',
Expand Down
14 changes: 0 additions & 14 deletions src/app/pages/observation-list/list-controls/list-controls.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@
</ion-checkbox>

<div class="selects">
<ion-select
[label]="'OBSERVATION_LIST.VIEW_TYPE' | translate"
fill="outline"
[value]="pageType()"
interface="popover"
color="primary"
(ionChange)="navigate($event.target.value)"
>
<ion-select-option value="observations">{{
"OBSERVATION_LIST.VIEW_TYPE_OBSERVATIONS" | translate
}}</ion-select-option>
<ion-select-option value="images">{{ "OBSERVATION_LIST.VIEW_TYPE_IMAGES" | translate }}</ion-select-option>
</ion-select>

<ion-select
[label]="'OBSERVATION_LIST.SORT_BY_TEXT' | translate"
fill="outline"
Expand Down
12 changes: 1 addition & 11 deletions src/app/pages/observation-list/list-controls/list-controls.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core';
import { Router } from '@angular/router';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
import { IonCheckbox, IonSelect, IonSelectOption } from '@ionic/angular/standalone';
import {
SearchCriteriaOrderBy,
SearchCriteriaService,
} from 'src/app/core/services/search-criteria/search-criteria.service';
import { TranslatePipe } from '@ngx-translate/core';

type Page = 'observations' | 'images';

/**
* Kontrollene i toppen av listevisninga. Viser knapper for "Sortert etter oppdatert tid", osv.
*/
Expand All @@ -21,9 +18,6 @@ type Page = 'observations' | 'images';
})
export class ListControlsComponent {
private searchCriteria = inject(SearchCriteriaService);
private router = inject(Router);

pageType = input<Page>('observations');

extentCheckboxValue = this.searchCriteria.isExtentCriteriaActive;
extentCheckboxDisabled = this.searchCriteria.isExtentCriteriaDisabled;
Expand All @@ -33,10 +27,6 @@ export class ListControlsComponent {
this.searchCriteria.isExtentCriteriaActive.update((isActive) => !isActive);
}

navigate(page: Page) {
this.router.navigate(['search', page === 'observations' ? 'list' : 'pictures']);
}

setOrderBy(orderBy: SearchCriteriaOrderBy) {
this.searchCriteria.orderBy.set(orderBy);
}
Expand Down
61 changes: 0 additions & 61 deletions src/app/pages/observation-list/list.page.ts
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/app/pages/observation-list/observation-list/observation-list.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
:host {
display: block;
height: 100%;
width: 100%;
display: contents;
}

.list-header {
Expand Down
84 changes: 57 additions & 27 deletions src/app/pages/observation-list/observation-list/observation-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,61 @@
<!-- Viser observasjoner i en liste -->
<ion-content>
<ion-refresher slot="fixed" (ionRefresh)="refresh()">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>

@if (isDesktop()) {
<div class="list-header">
<p>{{ isLoading() ? " - " : count() }} {{ "OBSERVATION_LIST.COUNT_POSTFIX" | translate }}</p>
<app-list-controls></app-list-controls>
</div>
}

<div class="list">
@for (reg of registrations(); track reg.RegId) {
<app-observation class="obs" [registration]="reg"></app-observation>
} @empty {
@if (error().hasError) {
<app-error-state></app-error-state>
} @else if (isLoading()) {
<p>{{ "OBSERVATION_LIST.LOADING" | translate }}</p>
} @else {
<app-empty-state></app-empty-state>
}
<ion-split-pane contentId="main-content-list-page">
<ion-menu side="start" menuId="list-filter" contentId="main-content-list-page" max-edge-start="0">
@defer {
Comment on lines +2 to +4
<app-filter-menu>
<!-- TODO: Legg til filter for kartutsnitt her -->
</app-filter-menu>
}
</ion-menu>

<div id="main-content-list-page" class="ion-page">
<app-header>
<!-- Høyremeny -->
<ion-buttons slot="end">
<ion-menu-button color="light"> </ion-menu-button>
</ion-buttons>

<!-- Venstremeny / filtermeny -->
<ion-buttons slot="start">
<ion-menu-button menu="list-filter" color="light">
<ion-icon name="options-outline"></ion-icon>
</ion-menu-button>
</ion-buttons>

<ion-title>{{ "OBSERVATION_LIST.TITLE" | translate }}</ion-title>
</app-header>

<ion-content>
<ion-refresher slot="fixed" (ionRefresh)="refresh()">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>

@if (isDesktop()) {
<div class="list-header">
<p>{{ isLoading() ? " - " : count() }} {{ "OBSERVATION_LIST.COUNT_POSTFIX" | translate }}</p>
<app-list-controls></app-list-controls>
</div>
}

<div class="list">
@for (reg of registrations(); track reg.RegId) {
<app-observation class="obs" [registration]="reg"></app-observation>
} @empty {
@if (error().hasError) {
<app-error-state></app-error-state>
} @else if (isLoading()) {
<p>{{ "OBSERVATION_LIST.LOADING" | translate }}</p>
} @else {
<app-empty-state></app-empty-state>
}
}

<ion-infinite-scroll (ionInfinite)="loadNextPage()" [disabled]="disableInfiniteScroll()">
<ion-infinite-scroll-content> </ion-infinite-scroll-content>
</ion-infinite-scroll>
</div>
</ion-content>

<ion-infinite-scroll (ionInfinite)="loadNextPage()" [disabled]="disableInfiniteScroll()">
<ion-infinite-scroll-content> </ion-infinite-scroll-content>
</ion-infinite-scroll>
<app-add-menu></app-add-menu>
</div>
</ion-content>
</ion-split-pane>
Loading
Loading