git.iko.soy/dashared/hookah-tau
on develop help sign in
(#19): добавила вертелки на обновление списка брони и клиенту, и админу
commit0686cabf8ce6a0e6ac10fc9d4928d07fb4b943e1 authorDarya Rednikina <rednikina.com@yandex.ru> dateTue 7 Jan 2020, 15:05 (7 years ago) parent4c4c7de
2 files changed+31
compare with develop
unifiedsplit
Hookah Tau/Controllers/Admin/Reservations/List of reservations/AdminReservationsController.swift+16 Hookah Tau/Controllers/Client/Reservations/Active Reservations/ReservationsViewController.swift+15
Hookah Tau/Controllers/Admin/Reservations/List of reservations/AdminReservationsController.swift+16
@@ -33,6 +33,8 @@ class AdminReservationsController: BaseViewController {
3333
3434 weak var coordinator: AdminReservationsCoordinator?
3535
36+ var refrControl: UIRefreshControl?
37+
3638 var activeReservations: [ReservationWithUser] = [] {
3739 didSet {
3840 guard let empty = noReservationsView else { return }
@@ -52,6 +54,7 @@ class AdminReservationsController: BaseViewController {
5254 super.viewDidLoad()
5355
5456 reservationsService = ReservationsService(apiClient: APIClient.shared)
57+ setupRefreshControl()
5558 setUpContentView()
5659 setupNavBar()
5760 }
@@ -106,6 +109,7 @@ class AdminReservationsController: BaseViewController {
106109 case .failure(let err):
107110 self?.displayAlert(forError: err)
108111 }
112+ self?.refrControl?.endRefreshing()
109113 })
110114 }
111115
@@ -126,6 +130,18 @@ class AdminReservationsController: BaseViewController {
126130 completion(nil)
127131 }
128132 }
133+
134+ // MARK: - Refresh control
135+
136+ @objc func refreshData( _ ff: UIRefreshControl) {
137+ performUpdate()
138+ }
139+
140+ func setupRefreshControl() {
141+ refrControl = UIRefreshControl()
142+ tableView?.refreshControl = refrControl
143+ refrControl?.addTarget(self, action: #selector(refreshData(_:)), for: .valueChanged)
144+ }
129145
130146}
131147
Hookah Tau/Controllers/Client/Reservations/Active Reservations/ReservationsViewController.swift+15
@@ -85,6 +85,7 @@ class ReservationsViewController: BaseViewController {
8585 contentView.addSubviewThatFills(tableView)
8686
8787 setUpTableView()
88+ setupRefreshControl()
8889 }
8990
9091 func setUpTableView() {
@@ -120,6 +121,7 @@ class ReservationsViewController: BaseViewController {
120121 case .failure(let err):
121122 self?.displayAlert(forError: err)
122123 }
124+ self?.refrControl?.endRefreshing()
123125 })
124126 }
125127
@@ -135,6 +137,19 @@ class ReservationsViewController: BaseViewController {
135137 }
136138 }
137139
140+ // MARK: - Refresh control
141+
142+ var refrControl: UIRefreshControl?
143+
144+ func setupRefreshControl() {
145+ refrControl = UIRefreshControl()
146+ tableView?.refreshControl = refrControl
147+ refrControl?.addTarget(self, action: #selector(refreshData(_:)), for: .valueChanged)
148+ }
149+
150+ @objc func refreshData( _ ff: UIRefreshControl) {
151+ performUpdate()
152+ }
138153}
139154
140155extension ReservationsViewController: UITableViewDelegate, UITableViewDataSource {