git.iko.soy/dashared/hookah-tau
on a370347 help sign in
7 files changed+10−77
since splitsnapshots
unifiedsplit
Hookah Tau.xcodeproj/project.pbxproj+2−2 Hookah Tau/Controllers/Admin/Clients/Profile/ClientProfileCoordinator.swift+1−11 Hookah Tau/Controllers/Admin/Clients/Profile/ProfileTableViewController.swift+2−16 Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/1/AdminFirstStepReservationViewCoordinator.swift−39 Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewController.swift+1−4 Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewCoordinator.swift−1 Hookah Tau/Controllers/Admin/Reservations/Views/AdminReservationView.swift+4−4
Hookah Tau.xcodeproj/project.pbxproj+2−2
@@ -1466,7 +1466,7 @@
14661466 buildSettings = {
14671467 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14681468 CODE_SIGN_STYLE = Automatic;
1469− CURRENT_PROJECT_VERSION = 5;
1469+ CURRENT_PROJECT_VERSION = 4;
14701470 DEVELOPMENT_TEAM = 23S94LRHD8;
14711471 INFOPLIST_FILE = "Hookah Tau/Info.plist";
14721472 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -1486,7 +1486,7 @@
14861486 buildSettings = {
14871487 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14881488 CODE_SIGN_STYLE = Automatic;
1489− CURRENT_PROJECT_VERSION = 5;
1489+ CURRENT_PROJECT_VERSION = 4;
14901490 DEVELOPMENT_TEAM = 23S94LRHD8;
14911491 INFOPLIST_FILE = "Hookah Tau/Info.plist";
14921492 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Hookah Tau/Controllers/Admin/Clients/Profile/ClientProfileCoordinator.swift+1−11
@@ -24,18 +24,8 @@ class ClientProfileCoordinator: BaseCoordinator {
2424
2525
2626 // Создание бронирования из профиля клиента
27− func createReservation(forUserWithPhone phoneNumber: String, user fullUser: FullUser) {
28− let coordinator = AdminFirstStepReservationViewCoordinator(navigationController: navigationController)
29− coordinator.phone = phoneNumber
30− coordinator.fullUser = fullUser
27+ func createReservation(forUserWithPhone phoneNumber: String) {
3128
32− addDependency(coordinator)
33− coordinator.didFinish = { [weak self] in
34− self?.removeDependency(coordinator)
35− self?.navigationController?.popViewController(animated: true)
36− }
37−
38− coordinator.start()
3929 }
4030
4131 // Просмотр (и редактирование) брони
Hookah Tau/Controllers/Admin/Clients/Profile/ProfileTableViewController.swift+2−16
@@ -79,17 +79,12 @@ class ProfileTableViewController: BaseViewController {
7979 setupNavBar()
8080 setupTable()
8181 setupActivityIndicator()
82− //loadReservations()
82+ loadReservations()
8383 }
8484
8585 override func viewWillAppear(_ animated: Bool) {
86− super.viewWillAppear(animated)
87− tabBarController?.tabBar.isHidden = true
88− }
89−
90− override func viewDidAppear(_ animated: Bool) {
9186 super.viewDidAppear(animated)
92− loadReservations()
87+ tabBarController?.tabBar.isHidden = true
9388 }
9489
9590 // MARK: - Setup
@@ -188,16 +183,7 @@ class ProfileTableViewController: BaseViewController {
188183 }
189184
190185 @objc func book() {
191− guard
192− let phone = user?.phoneNumber,
193− let user = user
194− else { return }
195186
196− let fullUser = FullUser(uuid: user.uuid,
197− name: user.name,
198− phoneNumber: user.phoneNumber,
199− isAdmin: user.isAdmin)
200− coodinator?.createReservation(forUserWithPhone: phone, user: fullUser)
201187 }
202188}
203189
Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/1/AdminFirstStepReservationViewCoordinator.swift−39
@@ -28,12 +28,6 @@ class AdminFirstStepReservationViewCoordinator: BaseCoordinator{
2828
2929 var establishment: Int = 1
3030
31− var phone: String?
32−
33− var fullUser: FullUser?
34−
35− var model: SecondStepModel?
36−
3731 // MARK: - Lifecycle
3832
3933 override func start() {
@@ -58,39 +52,6 @@ extension AdminFirstStepReservationViewCoordinator: FirstStepReservationProtocol
5852 }
5953
6054 func makeReservation(model: SecondStepModel, mapView: MapImageScroll?) {
61− self.model = model
62−
63− if let p = phone {
64− goToFinalStep(with: fullUser, phone: p)
65− } else {
66− goToSecondStep(model: model, mapView: mapView)
67− }
68− }
69−
70− func goToFinalStep(with user: FullUser?, phone phoneNumber: String) {
71− let finalStepCoordinator = AdminFinalStepReservationCoordinator(navigationController: navigationController)
72− finalStepCoordinator.model = self.model
73−
74− addDependency(finalStepCoordinator)
75− finalStepCoordinator.didFinish = { [weak self] in
76− self?.navigationController?.popViewController(animated: false)
77− self?.removeDependency(finalStepCoordinator)
78− self?.didFinish?()
79− }
80−
81− if let u = user {
82− finalStepCoordinator.user = u
83− } else {
84− finalStepCoordinator.user = FullUser(uuid: nil,
85− name: nil,
86− phoneNumber: phoneNumber,
87− isAdmin: true)
88− }
89−
90− finalStepCoordinator.start()
91− }
92−
93− func goToSecondStep(model: SecondStepModel, mapView: MapImageScroll?) {
9455 let reservationCoordinaotor = AdminSecondStepReservationViewCoordinator(navigationController: navigationController)
9556 reservationCoordinaotor.model = model
9657 reservationCoordinaotor.map = mapView
Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewController.swift+1−4
@@ -22,8 +22,6 @@ class AdminSecondStepReservationViewController: BaseViewController {
2222
2323 // MARK: - Properties
2424
25− var table: Int?
26−
2725 var mapScrollView: MapImageScroll?
2826
2927 var clientsService: ClientsService?
@@ -60,8 +58,7 @@ class AdminSecondStepReservationViewController: BaseViewController {
6058 // MARK: - Set up
6159
6260 func setupMap() {
63− guard let t = table else { return }
64− mapScrollView?.scrollToTable(table: t)
61+ mapScrollView?.scrollToTable(table: 8)
6562 mapContainerView.addSubviewThatFills(mapScrollView)
6663 }
6764
Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewCoordinator.swift−1
@@ -24,7 +24,6 @@ class AdminSecondStepReservationViewCoordinator: BaseCoordinator {
2424 let storyboard = UIStoryboard(name: "AdminReservations", bundle: nil)
2525 let reservationVC = storyboard.instantiateViewController(withIdentifier: "AdminSecondStepReservationViewController") as! AdminSecondStepReservationViewController
2626 reservationVC.mapScrollView = map
27− reservationVC.table = model?.table
2827 reservationVC.coordinator = self
2928 navigationController?.pushViewController(reservationVC, animated: true)
3029 }
Hookah Tau/Controllers/Admin/Reservations/Views/AdminReservationView.swift+4−4
@@ -116,7 +116,7 @@ class AdminReservationView: UIView {
116116
117117 startDate = start
118118
119− setUpIntervals()
119+ setUpIntervals(model.owner.isAdmin)
120120
121121 guestSlider?.maximumValue = Float((TotalStorage.standard.getTable(establishment: model.establishment, table: model.reservedTable)?.maxGuestNumber ?? 2) + 1)
122122 }
@@ -165,11 +165,11 @@ class AdminReservationView: UIView {
165165 // MARK: - Setup
166166
167167 /// Тут происходит установка интервалов. Разное для клиента и админа
168− func setUpIntervals() {
168+ func setUpIntervals(_ isAdmin: Bool) {
169169 guard let startPoint = startDate else { return }
170170
171− let startingPoint = startPoint.getAdminsStartingPoint()
172− let endingPoint = Constants.adminDuration
171+ let startingPoint = isAdmin ? startPoint.getAdminsStartingPoint() : Constants.clientStartingPoint
172+ let endingPoint = startingPoint + (isAdmin ? Constants.adminDuration : Constants.clientDuration)
173173
174174 for period in startingPoint...endingPoint {
175175 let timePointView = TimePointView.loadFromNib()