a370347...develop · dashared/hookah-tau

Hookah Tau.xcodeproj/project.pbxproj+2−2

since splitsnapshots

unifiedsplit

@@ -1466,7 +1466,7 @@

1466 buildSettings = {

1467 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

1468 CODE_SIGN_STYLE = Automatic;

1469− CURRENT_PROJECT_VERSION = 4;

1469+ CURRENT_PROJECT_VERSION = 5;

1470 DEVELOPMENT_TEAM = 23S94LRHD8;

1471 INFOPLIST_FILE = "Hookah Tau/Info.plist";

1472 IPHONEOS_DEPLOYMENT_TARGET = 11.0;

@@ -1486,7 +1486,7 @@

1486 buildSettings = {

1487 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

1488 CODE_SIGN_STYLE = Automatic;

1489− CURRENT_PROJECT_VERSION = 4;

1489+ CURRENT_PROJECT_VERSION = 5;

1490 DEVELOPMENT_TEAM = 23S94LRHD8;

1491 INFOPLIST_FILE = "Hookah Tau/Info.plist";

1492 IPHONEOS_DEPLOYMENT_TARGET = 11.0;

Hookah Tau/Controllers/Admin/Clients/Profile/ClientProfileCoordinator.swift+11−1

@@ -24,8 +24,18 @@ class ClientProfileCoordinator: BaseCoordinator {

24

25

26 // Создание бронирования из профиля клиента

27− func createReservation(forUserWithPhone phoneNumber: String) {

27+ func createReservation(forUserWithPhone phoneNumber: String, user fullUser: FullUser) {

28+ let coordinator = AdminFirstStepReservationViewCoordinator(navigationController: navigationController)

29+ coordinator.phone = phoneNumber

30+ coordinator.fullUser = fullUser

28

31

32+ addDependency(coordinator)

33+ coordinator.didFinish = { [weak self] in

34+ self?.removeDependency(coordinator)

35+ self?.navigationController?.popViewController(animated: true)

36+ }

37+

38+ coordinator.start()

29 }

39 }

30

40

31 // Просмотр (и редактирование) брони

41 // Просмотр (и редактирование) брони

Hookah Tau/Controllers/Admin/Clients/Profile/ProfileTableViewController.swift+16−2

@@ -79,14 +79,19 @@ class ProfileTableViewController: BaseViewController {

79 setupNavBar()

80 setupTable()

81 setupActivityIndicator()

82− loadReservations()

82+ //loadReservations()

83 }

84

85 override func viewWillAppear(_ animated: Bool) {

86− super.viewDidAppear(animated)

86+ super.viewWillAppear(animated)

87 tabBarController?.tabBar.isHidden = true

88 }

89

90+ override func viewDidAppear(_ animated: Bool) {

91+ super.viewDidAppear(animated)

92+ loadReservations()

93+ }

94+

90 // MARK: - Setup

95 // MARK: - Setup

91

96

92 func setupNavBar() {

97 func setupNavBar() {

@@ -183,7 +188,16 @@ class ProfileTableViewController: BaseViewController {

183 }

188 }

184

189

185 @objc func book() {

190 @objc func book() {

191+ guard

192+ let phone = user?.phoneNumber,

193+ let user = user

194+ else { return }

186

195

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)

187 }

201 }

188}

202}

189

203

Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/1/AdminFirstStepReservationViewCoordinator.swift+39

@@ -28,6 +28,12 @@ class AdminFirstStepReservationViewCoordinator: BaseCoordinator{

28

29 var establishment: Int = 1

30

31+ var phone: String?

32+

33+ var fullUser: FullUser?

34+

35+ var model: SecondStepModel?

36+

31 // MARK: - Lifecycle

37 // MARK: - Lifecycle

32

38

33 override func start() {

39 override func start() {

@@ -52,6 +58,39 @@ extension AdminFirstStepReservationViewCoordinator: FirstStepReservationProtocol

52 }

58 }

53

59

54 func makeReservation(model: SecondStepModel, mapView: MapImageScroll?) {

60 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?) {

55 let reservationCoordinaotor = AdminSecondStepReservationViewCoordinator(navigationController: navigationController)

94 let reservationCoordinaotor = AdminSecondStepReservationViewCoordinator(navigationController: navigationController)

56 reservationCoordinaotor.model = model

95 reservationCoordinaotor.model = model

57 reservationCoordinaotor.map = mapView

96 reservationCoordinaotor.map = mapView

Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewController.swift+4−1

@@ -22,6 +22,8 @@ class AdminSecondStepReservationViewController: BaseViewController {

22

23 // MARK: - Properties

24

25+ var table: Int?

26+

25 var mapScrollView: MapImageScroll?

27 var mapScrollView: MapImageScroll?

26

28

27 var clientsService: ClientsService?

29 var clientsService: ClientsService?

@@ -58,7 +60,8 @@ class AdminSecondStepReservationViewController: BaseViewController {

58 // MARK: - Set up

60 // MARK: - Set up

59

61

60 func setupMap() {

62 func setupMap() {

63+ guard let t = table else { return }

61− mapScrollView?.scrollToTable(table: 8)

64+ mapScrollView?.scrollToTable(table: t)

62 mapContainerView.addSubviewThatFills(mapScrollView)

65 mapContainerView.addSubviewThatFills(mapScrollView)

63 }

66 }

64

67

Hookah Tau/Controllers/Admin/Reservations/Making a reeservation/2/AdminSecondStepReservationViewCoordinator.swift+1

@@ -24,6 +24,7 @@ class AdminSecondStepReservationViewCoordinator: BaseCoordinator {

24 let storyboard = UIStoryboard(name: "AdminReservations", bundle: nil)

25 let reservationVC = storyboard.instantiateViewController(withIdentifier: "AdminSecondStepReservationViewController") as! AdminSecondStepReservationViewController

26 reservationVC.mapScrollView = map

27+ reservationVC.table = model?.table

27 reservationVC.coordinator = self

28 reservationVC.coordinator = self

28 navigationController?.pushViewController(reservationVC, animated: true)

29 navigationController?.pushViewController(reservationVC, animated: true)

29 }

30 }

Hookah Tau/Controllers/Admin/Reservations/Views/AdminReservationView.swift+4−4

@@ -116,7 +116,7 @@ class AdminReservationView: UIView {

116

117 startDate = start

118

119− setUpIntervals(model.owner.isAdmin)

119+ setUpIntervals()

120

121 guestSlider?.maximumValue = Float((TotalStorage.standard.getTable(establishment: model.establishment, table: model.reservedTable)?.maxGuestNumber ?? 2) + 1)

122 }

@@ -165,11 +165,11 @@ class AdminReservationView: UIView {

165 // MARK: - Setup

166

167 /// Тут происходит установка интервалов. Разное для клиента и админа

168− func setUpIntervals(_ isAdmin: Bool) {

168+ func setUpIntervals() {

169 guard let startPoint = startDate else { return }

170

171− let startingPoint = isAdmin ? startPoint.getAdminsStartingPoint() : Constants.clientStartingPoint

171+ let startingPoint = startPoint.getAdminsStartingPoint()

172− let endingPoint = startingPoint + (isAdmin ? Constants.adminDuration : Constants.clientDuration)

172+ let endingPoint = Constants.adminDuration

173

174 for period in startingPoint...endingPoint {

175 let timePointView = TimePointView.loadFromNib()