diff --git a/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/AppViewModelProvider.kt b/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/AppViewModelProvider.kt index 49ff0af..10e36dd 100644 --- a/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/AppViewModelProvider.kt +++ b/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/AppViewModelProvider.kt @@ -53,9 +53,7 @@ object AppViewModelProvider { initializer { FindFlightsViewModel( this.createSavedStateHandle(), - ticketApplication().container.flightRestRepository, - ticketApplication().container.appService - ) + ticketApplication().container.flightRestRepository) } initializer { UserEditViewModel( diff --git a/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/FindFlightsViewModel.kt b/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/FindFlightsViewModel.kt index c592b00..6c79fdb 100644 --- a/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/FindFlightsViewModel.kt +++ b/app/src/main/java/ru/ulstu/is/airticketrentservice/viewModel/FindFlightsViewModel.kt @@ -25,22 +25,22 @@ class FindFlightsViewModel( private val from: String = checkNotNull(savedStateHandle["direction_from"]) private val to: String = checkNotNull(savedStateHandle["direction_to"]) private val departureDate: String = checkNotNull(savedStateHandle["departure_date"]) - private val appService: AppService - get() { - return AppService - } +// private val appService: AppService +// get() { +// return AppService +// } var foundFlightsList: List by mutableStateOf(emptyList()) private set -// var foundFlightsUiState by mutableStateOf(FoundFlightsUiState()) -// private set + var foundFlightsUiState by mutableStateOf(FoundFlightsUiState()) + private set init { viewModelScope.launch { - foundFlightsList = appService.foundFlights().map { it.toFlight() } - //foundFlightsUiState = FoundFlightsUiState(flightRepository.foundFlights(from, to, departureDate)) + //foundFlightsList = appService.foundFlights().map { it.toFlight() } + foundFlightsUiState = FoundFlightsUiState(flightRepository.foundFlights(from, to, departureDate)) } } } diff --git a/ОТЧЕТЫ/ПМУ Лабораторная работа №1.docx b/ОТЧЕТЫ/ПМУ Лабораторная работа №1.docx new file mode 100644 index 0000000..428db6c Binary files /dev/null and b/ОТЧЕТЫ/ПМУ Лабораторная работа №1.docx differ diff --git a/ОТЧЕТЫ/ПМУ Лабораторная работа №2.docx b/ОТЧЕТЫ/ПМУ Лабораторная работа №2.docx new file mode 100644 index 0000000..4e2eddf Binary files /dev/null and b/ОТЧЕТЫ/ПМУ Лабораторная работа №2.docx differ diff --git a/ОТЧЕТЫ/ПМУ Лабораторная работа №3.docx b/ОТЧЕТЫ/ПМУ Лабораторная работа №3.docx new file mode 100644 index 0000000..6dada69 Binary files /dev/null and b/ОТЧЕТЫ/ПМУ Лабораторная работа №3.docx differ diff --git a/ОТЧЕТЫ/ПМУ Лабораторная работа №4.docx b/ОТЧЕТЫ/ПМУ Лабораторная работа №4.docx new file mode 100644 index 0000000..1948a46 Binary files /dev/null and b/ОТЧЕТЫ/ПМУ Лабораторная работа №4.docx differ diff --git a/ОТЧЕТЫ/ПМУ Лабораторная работа №5.docx b/ОТЧЕТЫ/ПМУ Лабораторная работа №5.docx new file mode 100644 index 0000000..43b94e2 Binary files /dev/null and b/ОТЧЕТЫ/ПМУ Лабораторная работа №5.docx differ