refactor pages

This commit is contained in:
Alexander Kacheryants 2024-04-07 23:17:43 +03:00
parent 0dfa7e79a6
commit 1e545721a4
19 changed files with 11 additions and 10 deletions

View File

@ -22,7 +22,7 @@ export class IssueBookModalPage {
}
protected user: readerUser | undefined = undefined;
public userId = 0;
public userId: number | null = null;
public userFio = '';
public date = '';
@ -34,7 +34,7 @@ export class IssueBookModalPage {
this.userId = user.id;
this.userFio = user.fio;
} else {
user = undefined;
this.user = undefined;
}
}
@ -67,7 +67,7 @@ export class IssueBookModalPage {
date: _date.toString(),
dateTo: this.date,
};
this.storage.addBookIssued(issue).then((r) => {
this.storage.addBookIssued(issue).then(() => {
this.modal?.dismiss(null, 'confirm');
});
}

View File

@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
import { RentPage } from './rent.page';
import { RentPageRoutingModule } from './rent-routing.module';
import { BookPageModule } from '../modals/book-page/book-page.module';
import { BookPageModule } from '../../modals/book-page/book-page.module';
@NgModule({
imports: [

View File

@ -3,8 +3,8 @@ import {
bookIssued,
readerUser,
StorageService,
} from '../services/storage/storage.service';
import { Book, GoogleBookApiService } from '../api/google-book-api.service';
} from '../../services/storage/storage.service';
import { Book, GoogleBookApiService } from '../../api/google-book-api.service';
interface issue {
issue: bookIssued;

View File

@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
import { SearchPage } from './search.page';
import { SearchPageRoutingModule } from './search-routing.module';
import { BookPageModule } from '../modals/book-page/book-page.module';
import { BookPageModule } from '../../modals/book-page/book-page.module';
@NgModule({
imports: [

View File

@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { Subject, takeUntil } from 'rxjs';
import { Book, GoogleBookApiService } from '../api/google-book-api.service';
import { Book, GoogleBookApiService } from '../../api/google-book-api.service';
@Component({
selector: 'app-search-page',

View File

@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms';
import { UsersPage } from './users.page';
import { UsersPageRoutingModule } from './users-routing.module';
import { NewUserModalPageModule } from '../modals/new-user/new-user-modal.module';
import { NewUserModalPageModule } from '../../modals/new-user/new-user-modal.module';
@NgModule({
imports: [
@ -14,6 +14,7 @@ import { NewUserModalPageModule } from '../modals/new-user/new-user-modal.module
FormsModule,
UsersPageRoutingModule,
NewUserModalPageModule,
NewUserModalPageModule,
],
declarations: [UsersPage],
})

View File

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {
readerUser,
StorageService,
} from '../services/storage/storage.service';
} from '../../services/storage/storage.service';
@Component({
selector: 'app-users-page',