Skip to content

F
Fengshui-Seller-iOS
Commit 701c438c by Anand.suthar
Options

Resolve issues

parent aac95166
Showing with 782 additions and 507 deletions
Bhagyashree.xcodeproj/project.pbxproj
......@@ -106,6 +106,9 @@
B0B9026920B6C9D600AE834E /* WithdrawHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0B9026820B6C9D600AE834E /* WithdrawHistoryViewController.swift */; };
B0BC1BEA20F0E56200944FD3 /* Enquiry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BC1BE920F0E56200944FD3 /* Enquiry.swift */; };
B0BC1BEC20F0E5D700944FD3 /* EnquiryExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BC1BEB20F0E5D700944FD3 /* EnquiryExt.swift */; };
B0BD88D6212EE7C700188279 /* MyNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BD88D5212EE7C700188279 /* MyNotification.swift */; };
B0BD88D8212EE7D800188279 /* MyNotificationExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BD88D7212EE7D800188279 /* MyNotificationExt.swift */; };
B0BD88DA212EF96900188279 /* ProcessingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0BD88D9212EF96900188279 /* ProcessingViewController.swift */; };
B0C8AFEC20F20F36006D7775 /* MeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0C8AFEB20F20F35006D7775 /* MeViewController.swift */; };
B0DB804020B687B8003F3D24 /* SellerProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0DB803F20B687B8003F3D24 /* SellerProfileViewController.swift */; };
B0DB804220B687D4003F3D24 /* ChangePasswordViewPagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0DB804120B687D4003F3D24 /* ChangePasswordViewPagerController.swift */; };
......@@ -634,6 +637,9 @@
B0B9026820B6C9D600AE834E /* WithdrawHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithdrawHistoryViewController.swift; sourceTree = "<group>"; };
B0BC1BE920F0E56200944FD3 /* Enquiry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enquiry.swift; sourceTree = "<group>"; };
B0BC1BEB20F0E5D700944FD3 /* EnquiryExt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnquiryExt.swift; sourceTree = "<group>"; };
B0BD88D5212EE7C700188279 /* MyNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyNotification.swift; sourceTree = "<group>"; };
B0BD88D7212EE7D800188279 /* MyNotificationExt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyNotificationExt.swift; sourceTree = "<group>"; };
B0BD88D9212EF96900188279 /* ProcessingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProcessingViewController.swift; sourceTree = "<group>"; };
B0C8AFEB20F20F35006D7775 /* MeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeViewController.swift; sourceTree = "<group>"; };
B0DB803F20B687B8003F3D24 /* SellerProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SellerProfileViewController.swift; sourceTree = "<group>"; };
B0DB804120B687D4003F3D24 /* ChangePasswordViewPagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePasswordViewPagerController.swift; sourceTree = "<group>"; };
......@@ -996,6 +1002,7 @@
B01B216D20EF877A002AC8D5 /* Model */ = {
isa = PBXGroup;
children = (
B0BD88CC212EE7AC00188279 /* Notifications */,
B04824602128342100B088C0 /* UpdateOrder.swift */,
B091CD672119A43F00E270BF /* FireBaseChat */,
B038371420F37F2F00B68870 /* Appointment */,
......@@ -1072,6 +1079,7 @@
B024387120B53CA6007D12AE /* ServiceDetailViewController.swift */,
B024386D20B53CA4007D12AE /* ServicesListViewController.swift */,
B024386A20B53CA2007D12AE /* VideoCallingViewController.swift */,
B0BD88D9212EF96900188279 /* ProcessingViewController.swift */,
);
path = Appointment;
sourceTree = "<group>";
......@@ -1327,6 +1335,15 @@
path = Enquiry;
sourceTree = "<group>";
};
B0BD88CC212EE7AC00188279 /* Notifications */ = {
isa = PBXGroup;
children = (
B0BD88D5212EE7C700188279 /* MyNotification.swift */,
B0BD88D7212EE7D800188279 /* MyNotificationExt.swift */,
);
path = Notifications;
sourceTree = "<group>";
};
B0F371E320EFB08D000F92D2 /* Home */ = {
isa = PBXGroup;
children = (
......@@ -2041,7 +2058,7 @@
EC04CD312052CC0100B425BB = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0920;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.Push = {
enabled = 1;
......@@ -2337,6 +2354,7 @@
EC04D03B2052D2F500B425BB /* OrderReviewProductCell.swift in Sources */,
EC04CE772052CDE700B425BB /* CompareListTableViewCell.swift in Sources */,
EC04CFD72052CF2A00B425BB /* IQKeyboardReturnKeyHandler.swift in Sources */,
B0BD88D8212EE7D800188279 /* MyNotificationExt.swift in Sources */,
EC04CDE02052CD5500B425BB /* TransactionDetailsTopCell.swift in Sources */,
B098116C212C524900BD7407 /* DrawTextField.swift in Sources */,
EC04CDCC2052CD4500B425BB /* SellerProductTableViewCell.swift in Sources */,
......@@ -2450,6 +2468,7 @@
EC04CFB62052CF2A00B425BB /* BlueIndicatorStyle.swift in Sources */,
EC04CDAA2052CD3500B425BB /* SellerListController.swift in Sources */,
B01B217C20EF87E9002AC8D5 /* User.swift in Sources */,
B0BD88DA212EF96900188279 /* ProcessingViewController.swift in Sources */,
EC04CFBF2052CF2A00B425BB /* UIFloatLabelTextField.m in Sources */,
EC04CE802052CDF400B425BB /* SearchTermsModel.swift in Sources */,
EC04CD9A2052CD2100B425BB /* SellerOrderDetailsController.swift in Sources */,
......@@ -2465,6 +2484,7 @@
EC04CDEE2052CD6E00B425BB /* SellerOrderViewController.swift in Sources */,
B024386920B53C58007D12AE /* SplashViewController.swift in Sources */,
EC04CD592052CC6000B425BB /* CreateCreditMemoModel.swift in Sources */,
B0BD88D6212EE7C700188279 /* MyNotification.swift in Sources */,
B09212A620B8052400798423 /* DateExt.swift in Sources */,
B038371E20F37F5200B68870 /* Appointment.swift in Sources */,
B0B9025320B6B36100AE834E /* MyIncomeViewController.swift in Sources */,
......@@ -2809,15 +2829,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Bhagyashree/Bhagyashree.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = S5AR757G56;
INFOPLIST_FILE = Bhagyashree/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller-dev";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "a5e812ba-74cb-472e-adf1-da31e8ca0c05";
PROVISIONING_PROFILE_SPECIFIER = FengShui_Seller_AdHok;
SWIFT_OBJC_BRIDGING_HEADER = "Bhagyashree/MARKET PLACE/Seller Create Credit Memo/Bhagyashree-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
......@@ -2833,15 +2853,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Bhagyashree/Bhagyashree.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = S5AR757G56;
INFOPLIST_FILE = Bhagyashree/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller-dev";
PRODUCT_BUNDLE_IDENTIFIER = "com.gdi.yuanzhongsiu-seller";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "a5e812ba-74cb-472e-adf1-da31e8ca0c05";
PROVISIONING_PROFILE_SPECIFIER = FengShui_Seller_AdHok;
SWIFT_OBJC_BRIDGING_HEADER = "Bhagyashree/MARKET PLACE/Seller Create Credit Memo/Bhagyashree-Bridging-Header.h";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
......
Bhagyashree.xcworkspace/xcuserdata/sunarcmac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -6,22 +6,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/UpdateOrder.swift"
timestampString = "556626783.326553"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "54"
endingLineNumber = "54"
landmarkName = "updateOrder(to:orderId:success:failuer:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
......@@ -41,13 +25,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift"
timestampString = "556629972.389267"
filePath = "Bhagyashree/Sunarc/Model/Appointment/EditResult.swift"
timestampString = "556699185.727886"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "45"
endingLineNumber = "45"
landmarkName = "viewWillAppear(_:)"
startingLineNumber = "74"
endingLineNumber = "74"
landmarkName = "updateResult(for:success:failure:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -57,13 +41,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift"
timestampString = "556629972.390362"
filePath = "Bhagyashree/Sunarc/Model/Appointment/EditResult.swift"
timestampString = "556699185.7279789"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "42"
endingLineNumber = "42"
landmarkName = "viewWillAppear(_:)"
startingLineNumber = "51"
endingLineNumber = "51"
landmarkName = "updateResult(for:success:failure:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -73,13 +57,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/UpdateOrder.swift"
timestampString = "556626783.326924"
filePath = "Bhagyashree/Sunarc/Model/Notifications/NotificationExt.swift"
timestampString = "556722450.552536"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "47"
endingLineNumber = "47"
landmarkName = "updateOrder(to:orderId:success:failuer:)"
startingLineNumber = "21"
endingLineNumber = "21"
landmarkName = "getNotifications(_:failur:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -89,13 +73,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/UpdateOrder.swift"
timestampString = "556626783.326986"
filePath = "Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift"
timestampString = "556895749.937322"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "31"
endingLineNumber = "31"
landmarkName = "updateOrder(to:orderId:success:failuer:)"
startingLineNumber = "43"
endingLineNumber = "43"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -105,13 +89,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Bhagyashree/Sunarc/Model/Appointment/AppointmentExt.swift"
timestampString = "556629862.15785"
filePath = "Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift"
timestampString = "556895749.937796"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "49"
endingLineNumber = "49"
landmarkName = "detailOfComlpeted(orderId:success:failure:)"
startingLineNumber = "56"
endingLineNumber = "56"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
Bhagyashree/Info.plist
......@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>4</string>
<string>8</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
Bhagyashree/Sunarc/Controller/Appointment/CompletedServicesViewController.swift
......@@ -53,7 +53,7 @@ class CompletedServicesViewController: BaseViewController {
if nextPage == true {
service.nextPage(serviceStatus: .SERVICE_COMPLETE, success: {
service.nextPage(serviceStatus: .COMPLETE, success: {
self.tblCompletedServices.reloadData()
self.tblCompletedServices.mj_footer.endRefreshing()
}) { (error) in
......@@ -61,7 +61,7 @@ class CompletedServicesViewController: BaseViewController {
self.view.showToast(error, position: .bottom, popTime: 2.0, dismissOnTap: false )
}
} else {
service.getServices(serviceStatus: .SERVICE_COMPLETE, success: {
service.getServices(serviceStatus: .COMPLETE, success: {
self.tblCompletedServices.reloadData()
self.tblCompletedServices.mj_header.endRefreshing()
}) { (errorMessage) in
......@@ -105,7 +105,7 @@ extension CompletedServicesViewController: UITableViewDelegate, UITableViewDataS
if selectedService.serviceType == .BOOKING {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.serviceStatus = .completed
appointmentdetails.incrementId = selectedService.incrementId
appointmentdetails.orderId = selectedService.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
......@@ -125,7 +125,7 @@ extension CompletedServicesViewController: UITableViewDelegate, UITableViewDataS
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType){
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType){
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Appointment/MoreServicesViewController.swift
......@@ -12,6 +12,8 @@ import WMPageController
enum PMenuEnquiryTitle: String {
case ongoing = "Ongoing"
case complet = "Complete"
case processing = "Processing"
case invalid = "Invalid"
}
class MoreServicesViewController: WMPageController {
......@@ -24,7 +26,7 @@ class MoreServicesViewController: WMPageController {
// var userProfileHeaderView: UIViewController!
var panGesture: WMPanGestureRecognizer!
var lastPoint = CGPoint.zero
var vcTitles = ["Ongoing", "Complete"]
var vcTitles = ["Processing", "Ongoing", "Invalid", "Complete"]
var viewTop: CGFloat = 5 {
didSet {
......@@ -146,8 +148,12 @@ class MoreServicesViewController: WMPageController {
switch index {
case 0:
return Utils.viewController(storyboardName: "Appointment", ofType: OnGoingServicesViewController.self)
return Utils.viewController(storyboardName: "Appointment", ofType: ProcessingViewController.self)
case 1:
return Utils.viewController(storyboardName: "Appointment", ofType: OnGoingServicesViewController.self)
case 2:
return UIViewController()
case 3:
return Utils.viewController(storyboardName: "Appointment", ofType: CompletedServicesViewController.self)
default:
return UIViewController()
......@@ -172,9 +178,9 @@ class MoreServicesViewController: WMPageController {
override func menuView(_ menu: WMMenuView!, widthForItemAt index: Int) -> CGFloat {
switch index {
case 0:
return self.view.frame.size.width/2
return self.view.frame.size.width/4
case 1:
return self.view.frame.size.width/2 - 20
return self.view.frame.size.width/4 - 20
default:
return 150
}
......
Bhagyashree/Sunarc/Controller/Appointment/OnGoingServicesViewController.swift
......@@ -104,11 +104,17 @@ extension OnGoingServicesViewController: UITableViewDelegate, UITableViewDataSou
if selectedService.serviceType == .BOOKING {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.incrementId = selectedService.incrementId
appointmentdetails.orderId = selectedService.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
if selectedService.status == .SERVICE_ONGOING {
let videoCallVC = Utils.viewController(storyboardName: "Appointment", ofType: VideoCallingViewController.self)
videoCallVC.orderId = selectedService.orderId!
self.navigationController?.pushViewController(videoCallVC, animated: true)
}
// let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
// appointmentdetails.serviceStatus = .tbc
// appointmentdetails.incrementId = selectedService.incrementId
// appointmentdetails.orderId = selectedService.orderId
// self.navigationController?.pushViewController(appointmentdetails, animated: true)
} else if selectedService.serviceType == .FAQ {
if selectedService.status == .PROCESSING {
......@@ -126,7 +132,7 @@ extension OnGoingServicesViewController: UITableViewDelegate, UITableViewDataSou
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType){
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Appointment/ProcessingViewController.swift 0 → 100644
//
// OnGoingServicesViewController.swift
// FengshuiLayout
//
// Created by SunarcMAC on 18/05/18.
// Copyright © 2018 SunarcMAC. All rights reserved.
//
import UIKit
import Kingfisher
import MJRefresh
class ProcessingViewController: BaseViewController {
@IBOutlet var tblOnGoingNotices: UITableView!
let service = Service()
var footerForLoading: MJRefreshAutoNormalFooter!
override func viewDidLoad() {
super.viewDidLoad()
self.setupRefreshHeaderFooter()
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
if service.services.count == 0 {
tblOnGoingNotices.mj_header.beginRefreshing()
}
}
func setupRefreshHeaderFooter() {
let headerForLoading = MJRefreshNormalHeader {
self.services(nextPage: false)
}
headerForLoading?.activityIndicatorViewStyle = .gray
headerForLoading?.lastUpdatedTimeLabel.isHidden = true
headerForLoading?.stateLabel.isHidden = true
tblOnGoingNotices.mj_header = headerForLoading
footerForLoading = MJRefreshAutoNormalFooter {
self.services(nextPage: true)
}
footerForLoading.isRefreshingTitleHidden = true
footerForLoading.activityIndicatorViewStyle = .gray
footerForLoading.stateLabel.isHidden = true
tblOnGoingNotices.mj_footer = footerForLoading
}
func services(nextPage: Bool) {
if nextPage == true {
service.nextPage(serviceStatus: .PROCESSING, success: {
self.tblOnGoingNotices.reloadData()
self.tblOnGoingNotices.mj_footer.endRefreshing()
}) { (error) in
self.tblOnGoingNotices.mj_footer.endRefreshing()
self.view.showToast(error, position: .bottom, popTime: 2.0, dismissOnTap: false )
}
} else {
service.getServices(serviceStatus: .PROCESSING, success: {
self.tblOnGoingNotices.reloadData()
self.tblOnGoingNotices.mj_header.endRefreshing()
}) { (errorMessage) in
self.tblOnGoingNotices.mj_header.endRefreshing()
self.view.showToast(errorMessage, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
}
}
extension ProcessingViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return service.services.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let service_ = service.services[indexPath.row]
let cell = tableView.dequeueReusableCell(withIdentifier: "ongoingServiceCell", for: indexPath) as! ProcessingServiceCell
cell.lblCustomerName.text = service_.customerName
cell.lblService.text = service_.productName
cell.lblDate.text = service_.customerDate
if let profileImage = service_.customerProfileImage {
let url = URL(string: profileImage)
cell.imgCustomer.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
let selectedService = service.services[indexPath.row]
if selectedService.serviceType == .BOOKING {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.incrementId = selectedService.incrementId
appointmentdetails.orderId = selectedService.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
} else if selectedService.serviceType == .FAQ {
if selectedService.status == .PROCESSING {
let chatViewController = Utils.viewController(storyboardName: "Home", ofType: OnlineEnquiryViewController.self)
if let orderId = selectedService.orderId {
chatViewController.orderId = orderId
self.navigationController?.pushViewController(chatViewController, animated: true)
}
} else {
let enquiryDetailsViewController = Utils.viewController(storyboardName: "Home", ofType: EnquiryDetailsViewController.self)
enquiryDetailsViewController.incrementId = selectedService.incrementId!
enquiryDetailsViewController.orderId = selectedService.orderId!
self.navigationController?.pushViewController(enquiryDetailsViewController, animated: true)
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
self.navigationController?.pushViewController(form, animated: true)
}
} else {
self.view.showToast("Unknown service", position: .bottom, popTime: 2.0, dismissOnTap: false)
}
// let serviceDetail = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
// serviceDetail.serviceStatus = .ongoing
// serviceDetail.incrementId = service.services[indexPath.row].incrementId
// serviceDetail.orderId = service.services[indexPath.row].orderId
// self.navigationController?.pushViewController(serviceDetail, animated: true)
}
}
class ProcessingServiceCell: UITableViewCell {
@IBOutlet var imgCustomer: UIImageView!
@IBOutlet var lblCustomerName: UILabel!
@IBOutlet var lblService: UILabel!
@IBOutlet var lblDate: UILabel!
}
Bhagyashree/Sunarc/Controller/Appointment/ServiceDetailViewController.swift
......@@ -14,6 +14,7 @@ enum ServiceStatus: Int {
case ongoing
case completed
case uploadResult
case processing
}
class ServiceDetailViewController: UIViewController {
......@@ -39,10 +40,13 @@ class ServiceDetailViewController: UIViewController {
appointment.getAppointmentDetails(incrementId: incrementId, success: {
print(self.appointment.orderStatus)
if self.appointment.orderStatus == "Service Upload Result" {
self.serviceStatus = .uploadResult
} else if self.appointment.orderStatus == "Processing" {
self.serviceStatus = .processing
} else if self.appointment.orderStatus == "Service Ongoing" {
self.serviceStatus = .ongoing
}
self.tblServiceDetail.reloadData()
......@@ -64,11 +68,15 @@ class ServiceDetailViewController: UIViewController {
case .ongoing:
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = false
case .completed: break
// do nothing
case .completed:
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = true
case .uploadResult:
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = false
case .processing:
self.btnStartMeeting.isHidden = true
self.btnEditResult.isHidden = true
}
......
Bhagyashree/Sunarc/Controller/Appointment/ServicesListViewController.swift
......@@ -131,7 +131,7 @@ extension ServicesListViewController: UITableViewDelegate, UITableViewDataSource
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType){
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType){
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Appointment/VideoCallingViewController.swift
......@@ -26,6 +26,8 @@ class VideoCallingViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
print(orderId)
initializeAgoraEngine()
setupVideo()
setupLocalVideo()
......@@ -100,6 +102,9 @@ extension VideoCallingViewController {
agoraKit.setupLocalVideo(videoCanvas)
}
func joinChannel() {
self.view.showToast(orderId, position: .bottom, popTime: 2.0, dismissOnTap: false)
agoraKit.joinChannel(byToken: nil, channelId: orderId, info:nil, uid:0) {[weak self] (sid, uid, elapsed) -> Void in
// Join channel "demoChannel1"
if let weakSelf = self {
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/AuspiciousDateContainer.swift
......@@ -23,7 +23,7 @@ class AuspiciousDateContainer: BaseViewController {
var service: String?
var categoryType: CategoryType = .Groundbreaking
var incrementId: String = ""
var orderId: String = "0"
override func viewDidLoad() {
super.viewDidLoad()
}
......@@ -40,49 +40,49 @@ class AuspiciousDateContainer: BaseViewController {
groundbreakingDateSelection.isHidden = false
if segue.identifier == "GroundbreakingDateSelectionViewController" {
(segue.destination as! GroundbreakingDateSelectionViewController).incrementId = incrementId
// (segue.destination as! GroundbreakingDateSelectionViewController).service = service
(segue.destination as! GroundbreakingDateSelectionViewController).orderId = orderId
}
case .MovingCompany:
companyMovingDateSelection.isHidden = false
if segue.identifier == "CompanyMovingDateSelectionViewController" {
(segue.destination as! CompanyMovingDateSelectionViewController).incrementId = incrementId
// (segue.destination as! CompanyMovingDateSelectionViewController).service = service
(segue.destination as! CompanyMovingDateSelectionViewController).orderId = orderId
}
case .Marriage:
marriageDateSelection.isHidden = false
if segue.identifier == "MarriageDateSelectionViewController" {
(segue.destination as! MarriageDateSelectionViewController).incrementId = incrementId
// (segue.destination as! MarriageDateSelectionViewController).service = service
(segue.destination as! MarriageDateSelectionViewController).orderId = orderId
}
case .Registration:
registrationDateSelection.isHidden = false
if segue.identifier == "RegsirationDateSelectionViewController" {
(segue.destination as! RegsirationDateSelectionViewController).incrementId = incrementId
// (segue.destination as! RegsirationDateSelectionViewController).service = service
(segue.destination as! RegsirationDateSelectionViewController).orderId = orderId
}
case .StartOpeningBusiness:
businessOpeningDateSelection.isHidden = false
if segue.identifier == "BusinessOpeningDateSelectionViewController" {
(segue.destination as! BusinessOpeningDateSelectionViewController).incrementId = incrementId
// (segue.destination as! BusinessOpeningDateSelectionViewController).service = service
(segue.destination as! BusinessOpeningDateSelectionViewController).orderId = orderId
}
case .BedSetting:
bedSettingDateSelection.isHidden = false
if segue.identifier == "BedSettingDateSelectionViewController" {
(segue.destination as! BedSettingDateSelectionViewController).incrementId = incrementId
// (segue.destination as! BedSettingDateSelectionViewController).service = service
(segue.destination as! BedSettingDateSelectionViewController).orderId = orderId
}
case .MovingHouse:
houseMovingDateSelection.isHidden = false
if segue.identifier == "HouseMovingDateSelectionViewController" {
(segue.destination as! HouseMovingDateSelectionViewController).incrementId = incrementId
// (segue.destination as! HouseMovingDateSelectionViewController).service = service
(segue.destination as! HouseMovingDateSelectionViewController).orderId = orderId
}
case .GODSetting:
godSettingDateSelection.isHidden = false
if segue.identifier == "GodSettingDateSelectionViewController" {
(segue.destination as! GodSettingDateSelectionViewController).incrementId = incrementId
// (segue.destination as! GodSettingDateSelectionViewController).service = service
(segue.destination as! GodSettingDateSelectionViewController).orderId = orderId
}
default:
print("Form not found")
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/BedSettingDateSelectionViewController.swift
......@@ -23,6 +23,7 @@ class BedSettingDateSelectionViewController: BaseViewController {
// var customOption = ServiceCustomOption()
var isWeekDay = false
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -61,6 +62,11 @@ class BedSettingDateSelectionViewController: BaseViewController {
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/BusinessOpeningDateSelectionViewController.swift
......@@ -27,6 +27,7 @@ class BusinessOpeningDateSelectionViewController: BaseViewController {
var service: String?
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -61,6 +62,11 @@ class BusinessOpeningDateSelectionViewController: BaseViewController {
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/CompanyMovingDateSelectionViewController.swift
......@@ -21,6 +21,7 @@ class CompanyMovingDateSelectionViewController: BaseViewController {
@IBOutlet var txtRemarks: UITextView!
var incrementId: String?
var orderId: String?
var isWeekday = false
......@@ -69,7 +70,11 @@ class CompanyMovingDateSelectionViewController: BaseViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/GodSettingDateSelectionViewController.swift
......@@ -23,6 +23,7 @@ class GodSettingDateSelectionViewController: BaseViewController {
// var customOption = ServiceCustomOption()
var isWeekday = false
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -63,7 +64,11 @@ class GodSettingDateSelectionViewController: BaseViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/GroundbreakingDateSelectionViewController.swift
......@@ -21,6 +21,7 @@ class GroundbreakingDateSelectionViewController: BaseViewController {
@IBOutlet var txtRemarks: UITextView!
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -61,6 +62,11 @@ class GroundbreakingDateSelectionViewController: BaseViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/HouseMovingDateSelectionViewController.swift
......@@ -19,11 +19,10 @@ class HouseMovingDateSelectionViewController: BaseViewController {
@IBOutlet var imgWeekend: UIImageView!
@IBOutlet var txtRemarks: UITextView!
// var seller: Seller?
var service: String?
// var customOption = ServiceCustomOption()
var isWeekDay = false
var incrementId: String?
var orderId: String = "0"
override func viewDidLoad() {
super.viewDidLoad()
......@@ -36,155 +35,44 @@ class HouseMovingDateSelectionViewController: BaseViewController {
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
for option in customOptions {
// if option.option == "Owner Name" {
// self.txtOwnerName.text = option.value
// } else if option.option == "Members" {
// self.txtMembers.text = option.value
// } else if option.option == "Expected Month" {
// self.btnExpectedMonth.setTitle(option.value, for: .normal)
// } else if option.option == "Expected Day" {
//
// if option.value.lowercased() == "weekday" {
// self.imgWeekDay.image = UIImage(named: "radioOn")
// } else {
// self.imgWeekend.image = UIImage(named: "radioOn")
// }
//
// } else if option.option == "Remarks" {
// self.txtRemarks.text = option.value
// }
//
if option.option == "Owner Name" {
self.txtOwnerName.text = option.value
} else if option.option == "Members" {
self.txtMembers.text = option.value
} else if option.option == "New Address" {
self.txtNewAddress.text = option.value
} else if option.option == "Expected Month" {
self.btnExpectedMonth.setTitle(option.value, for: .normal)
} else if option.option == "Expected Day" {
if option.value.lowercased() == "weekday" {
self.imgWeekDay.image = UIImage(named: "radioOn")
} else {
self.imgWeekend.image = UIImage(named: "radioOn")
}
}) { (errorMessage) in
print(errorMessage)
} else if option.option == "Remarks" {
self.txtRemarks.text = option.value
}
}
}
extension HouseMovingDateSelectionViewController {
@IBAction func weekdayWeekend(btn: UIButton) {
if btn.tag == 1 {
isWeekDay = true
imgWeekDay.image = UIImage(named: "radioOn")
imgWeekend.image = UIImage(named: "radioOff")
} else {
isWeekDay = false
imgWeekDay.image = UIImage(named: "radioOff")
imgWeekend.image = UIImage(named: "radioOn")
}
}) { (errorMessage) in
print(errorMessage)
}
@IBAction func monthPicker() {
// let monthPicker = Utils.viewController(storyboardName: "HomePage", ofType: MonthPickerViewController.self)
// monthPicker.delegate = self
// self.present(monthPicker, animated: true, completion: nil)
//
// UIView.animate(withDuration: 0.25) {
// self.scroller.contentOffset = CGPoint(x: self.scroller.contentOffset.x, y: 100)
// }
}
@IBAction func submit() {
// if formValidation() == false {
// return
// }
//
// var paramsJSON = ""
// var params = [String: Any]()
// for option in customOption.options {
//
// switch option.title {
// case "Service Type":
// params["\(option.id!)"] = "Auspicious Date Selection"
// case "Service Title":
// params["\(option.id!)"] = "Moving (House)"
// // case "Owner Name":
// // params["\(option.id!)"] = txtOwner.text
// // case "Address":
// // params["\(option.id!)"] = txtAddress.text
// // case "Expected Month":
// // params["\(option.id!)"] = btnMonth.titleLabel?.text
// // case "Expected Days":
// // params["\(option.id!)"] = isWeekday == true ? "weekday" : "weekend"
// // case "Remarks":
// // params["\(option.id!)"] = txtRemarks.text
// default:
// params["\(option.id!)"] = ""
// }
//
// }
//
// do {
// let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
// paramsJSON = NSString(data: jsonData, encoding: String.Encoding.utf8.rawValue)! as String
// } catch {
// print(error.localizedDescription)
// }
//
// let keyValueDict: [String: Any] = ["productId": self.seller!.entityId ?? "",
// "websiteId": "1",
// "qty": "1",
// "customerId": User.customerId,
// "storeId": UserSettings.storeId ?? "0",
// "params": paramsJSON
// ]
//
//
// let serviceConfirmationVC = Utils.viewController(storyboardName: "HomePage", ofType: ServiceConfirmationViewController.self)
// serviceConfirmationVC.keyValueDict = keyValueDict
// serviceConfirmationVC.sellerName = seller?.sellerName
// serviceConfirmationVC.service = service
// serviceConfirmationVC.termsAndConditions = customOption.sellerTerms
// self.navigationController?.pushViewController(serviceConfirmationVC, animated: true)
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
editResult.orderId = orderId
self.navigationController?.pushViewController(editResult, animated: true)
}
func formValidation() -> Bool{
if txtOwnerName.text?.count == 0 {
self.view.showToast("Please fill owner name", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if txtMembers.text?.count == 0 {
self.view.showToast("Please fill members", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if txtNewAddress.text?.count == 0 {
self.view.showToast("Please new address", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if btnExpectedMonth.titleLabel?.text == "Month" {
self.view.showToast("Please select a month", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
if imgWeekDay.image == UIImage(named: "radioOff") && imgWeekend.image == UIImage(named: "radioOff") {
self.view.showToast("Please select a day", position: .bottom, popTime: 2.0, dismissOnTap: false)
return false
}
}
return true
}
}
extension HouseMovingDateSelectionViewController: UITextFieldDelegate {
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
if textField == txtOwnerName {
txtMembers.becomeFirstResponder()
}
return true
}
}
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/MarriageDateSelectionViewController.swift
......@@ -35,14 +35,9 @@ class MarriageDateSelectionViewController: BaseViewController {
@IBOutlet var imgWeekend: UIImageView!
@IBOutlet var txtRemarks: UITextView!
// var datePickerFor: DatePickerFor = .owner
// var zodiacPickerFor: ZodiacPickerFor = .husbandFather
//
// var seller: Seller?
var service: String?
var incrementId: String?
// var customOption = ServiceCustomOption()
var orderId: String = "0"
override func viewDidLoad() {
super.viewDidLoad()
......@@ -55,228 +50,65 @@ class MarriageDateSelectionViewController: BaseViewController {
FormDetail.get(incrementId: incrementId_, success: { (customOptions) in
for option in customOptions {
// if option.option == "Owner Name" {
// self.txtOwnerName.text = option.value
// } else if option.option == "Owner DOB" {
// self.txtDate.text = option.value
// } else if option.option == "Shareholders" {
// self.txtShareholders.text = option.value
// } else if option.option == "Expected Day" {
//
// if option.value.lowercased() == "weekday" {
// self.imgWeekDay.image = UIImage(named: "radioOn")
// } else {
// self.imgWeekend.image = UIImage(named: "radioOn")
// }
//
// } else if option.option == "Expected Month" {
// self.btnMonth.setTitle(option.value, for: .normal)
// } else if option.option == "New Address" {
// self.txtNewAddress.text = option.value
// } else if option.option == "Remarks" {
// self.txtRemarks.text = option.value
// }
}
}) { (errorMessage) in
print(errorMessage)
}
}
}
extension MarriageDateSelectionViewController {
func showDatePicker() {
// let datePicker = Utils.viewController(storyboardName: "HomePage", ofType: DateWithYearPickerViewController.self)
// datePicker.delegate = self
// self.present(datePicker, animated: true, completion: nil)
}
@IBAction func weekdayWeekend(btn: UIButton) {
if btn.tag == 1 {
imgWeekDay.image = UIImage(named: "radioOn")
imgWeekend.image = UIImage(named: "radioOff")
if option.option == "Husband Name" {
self.txtHusbandName.text = option.value
} else if option.option == "Husband DOB" {
self.txtHusbandDOB.text = option.value
} else if option.option == "Husband's Father Name" {
self.txtHusbandFatherName.text = option.value
} else if option.option == "Husband's Father Zodiac" {
self.btnHusbandFathersZodiac.setTitle(option.value, for: .normal)
} else if option.option == "Husband's Father Age" {
self.txtHusbandFatherAge.text = option.value
} else if option.option == "Husband's Mother Name" {
self.txtHusbandMotherName.text = option.value
} else if option.option == "Husband's Mother Zodiac" {
self.btnHusbandMothersZodiac.setTitle(option.value, for: .normal)
} else if option.option == "Husband's Mother Age" {
self.txtHusbandMotherAge.text = option.value
} else if option.option == "Wife Name" {
self.txtWifeName.text = option.value
} else if option.option == "Wife DOB" {
self.txtWifeDOB.text = option.value
} else if option.option == "Wife's Father Name" {
self.txtWifeFatherName.text = option.value
} else if option.option == "Wife's Father Zodiac" {
self.btnWifeFatherZodiac.setTitle(option.value, for: .normal)
} else if option.option == "Wife's Father Age" {
self.txtWifeFatherAge.text = option.value
} else if option.option == "Wife's Mother Name" {
self.txtWifeMotherName.text = option.value
} else if option.option == "Wife's Mother Zodiac" {
self.btnWifeMotherZodiac.setTitle(option.value, for: .normal)
} else if option.option == "Wife's Mother Age" {
self.btnWifeMotherAge.text = option.value
} else if option.option == "Expected Month" {
self.btnMonth.setTitle(option.value, for: .normal)
} else if option.option == "Expected Day" {
if option.value.lowercased() == "weekday" {
self.imgWeekDay.image = UIImage(named: "radioOn")
} else {
imgWeekDay.image = UIImage(named: "radioOff")
imgWeekend.image = UIImage(named: "radioOn")
self.imgWeekend.image = UIImage(named: "radioOn")
}
} else if option.option == "Remarks" {
self.txtRemarks.text = option.value
}
@IBAction func monthPicker() {
// let monthPicker = Utils.viewController(storyboardName: "HomePage", ofType: MonthPickerViewController.self)
// monthPicker.delegate = self
// self.present(monthPicker, animated: true, completion: nil)
//
// UIView.animate(withDuration: 0.25) {
// self.scroller.contentOffset = CGPoint(x: self.scroller.contentOffset.x, y: 100)
// }
}
@IBAction func showZodiacPicker(btn: UIButton) {
// zodiacPickerFor = ZodiacPickerFor(rawValue: btn.tag)!
// let picker = Utils.viewController(storyboardName: "HomePage", ofType: ZodiacPickerViewController.self)
// picker.delegate = self
// self.present(picker, animated: true, completion: nil)
//
// if btn.tag == 2 {
// UIView.animate(withDuration: 0.25) {
// self.scroller.contentOffset = CGPoint(x: self.scroller.contentOffset.x, y: 130)
// }
// }
}) { (errorMessage) in
print(errorMessage)
}
@IBAction func submit() {
// if formValidation() == false {
// return
// }
//
// var paramsJSON = ""
// var params = [String: Any]()
// for option in customOption.options {
//
// switch option.title {
// case "Service Type":
// params["\(option.id!)"] = "Auspicious Date Selection"
// case "Service Title":
// params["\(option.id!)"] = "Groundbreaking"
// // case "Owner Name":
// // params["\(option.id!)"] = txtOwner.text
// // case "Address":
// // params["\(option.id!)"] = txtAddress.text
// // case "Expected Month":
// // params["\(option.id!)"] = btnMonth.titleLabel?.text
// // case "Expected Days":
// // params["\(option.id!)"] = isWeekday == true ? "weekday" : "weekend"
// // case "Remarks":
// // params["\(option.id!)"] = txtRemarks.text
// default:
// params["\(option.id!)"] = ""
// }
//
// }
//
// do {
// let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
// paramsJSON = NSString(data: jsonData, encoding: String.Encoding.utf8.rawValue)! as String
// } catch {
// print(error.localizedDescription)
// }
//
// let keyValueDict: [String: Any] = ["productId": self.seller!.entityId ?? "",
// "websiteId": "1",
// "qty": "1",
// "customerId": User.customerId,
// "storeId": UserSettings.storeId ?? "0",
// "params": paramsJSON
// ]
//
//
// let serviceConfirmationVC = Utils.viewController(storyboardName: "HomePage", ofType: ServiceConfirmationViewController.self)
// serviceConfirmationVC.keyValueDict = keyValueDict
// serviceConfirmationVC.sellerName = seller?.sellerName
// serviceConfirmationVC.service = service
// serviceConfirmationVC.termsAndConditions = customOption.sellerTerms
// self.navigationController?.pushViewController(serviceConfirmationVC, animated: true)
}
func formValidation() -> Bool{
// if txtOwner.text?.count == 0 {
// self.view.showToast("Please fill owner name", position: .bottom, popTime: 2.0, dismissOnTap: false)
// return false
// }
return true
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
editResult.orderId = orderId
self.navigationController?.pushViewController(editResult, animated: true)
}
}
extension MarriageDateSelectionViewController: UITextFieldDelegate {
func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
// if textField == txtHusbandDOB {
// self.showDatePicker()
// datePickerFor = .husband
// return false
// } else if textField == txtWifeDOB {
// self.showDatePicker()
// datePickerFor = .wife
// return false
// }
return true
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
if textField == txtHusbandName {
txtHusbandDOB.becomeFirstResponder()
} else if textField == txtHusbandFatherAge {
txtHusbandMotherName.becomeFirstResponder()
} else if textField == txtWifeName {
txtWifeDOB.becomeFirstResponder()
} else if textField == txtWifeFatherAge {
txtWifeMotherName.becomeFirstResponder()
}
return true
}
}
//extension MarriageDateSelectionViewController: DateWithYearPickerViewControllerDelegate {
//
// func selecteDate(dateString: String) {
// if datePickerFor == .husband {
// txtHusbandDOB.text = dateString
// } else {
// txtWifeDOB.text = dateString
// }
// }
//
//}
//
//extension MarriageDateSelectionViewController: ZodiacPickerViewControllerDelegate {
//
// func selectedZodiac(zodiac: String) {
//
// switch zodiacPickerFor {
// case .husbandFather:
// btnHusbandFathersZodiac.setTitle(" \(zodiac)", for: .normal)
// case .husbandMother:
// btnHusbandMothersZodiac.setTitle(" \(zodiac)", for: .normal)
// case .wifeFather:
// btnWifeFatherZodiac.setTitle(" \(zodiac)", for: .normal)
// case .wifeMother:
// btnWifeMotherZodiac.setTitle(" \(zodiac)", for: .normal)
// }
// }
//
//}
//
//
//
//extension MarriageDateSelectionViewController: MonthPickerViewControllerDelegate {
// func selectedMonth(month: String) {
// btnMonth.setTitle(" \(month)", for: .normal)
// }
//
// func done() {
// UIView.animate(withDuration: 0.25) {
// self.scroller.contentOffset = CGPoint(x: self.scroller.contentOffset.x, y: 0)
// }
// }
//}
......
Bhagyashree/Sunarc/Controller/Forms/Auspicious Date Selection/RegsirationDateSelectionViewController.swift
......@@ -24,6 +24,7 @@ class RegsirationDateSelectionViewController: BaseViewController {
var service: String?
var isWeekDay = false
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -76,6 +77,11 @@ class RegsirationDateSelectionViewController: BaseViewController {
extension RegsirationDateSelectionViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/FengshuiServiceContainerViewController.swift
......@@ -17,7 +17,7 @@ class FengshuiServiceContainerViewController: UIViewController {
var service: String?
var categoryType: CategoryType = .FloorPlanFengShuiGeomancy
var incrementId: String = ""
var orderId: String = "0"
var formFor: String = "Floor Plan Feng Shui - Geomancy"
......@@ -48,9 +48,11 @@ class FengshuiServiceContainerViewController: UIViewController {
if segue.identifier == "OnsiteFengshuiViewController" {
(segue.destination as! OnsiteFengshuiViewController).categoryType = categoryType
(segue.destination as! OnsiteFengshuiViewController).incrementId = incrementId
(segue.destination as! OnsiteFengshuiViewController).orderId = orderId
} else if segue.identifier == "FloorPlanFengshuiViewController" {
(segue.destination as! FloorPlanFengshuiViewController).categoryType = categoryType
(segue.destination as! FloorPlanFengshuiViewController).incrementId = incrementId
(segue.destination as! FloorPlanFengshuiViewController).orderId = orderId
}
}
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/FloorPlanFengshuiViewController.swift
......@@ -21,6 +21,7 @@ class FloorPlanFengshuiViewController: UIViewController {
var photoFor:PhotoFor = .home
var categoryType: CategoryType = .OnsiteServiceGeomancy
var incrementId: String?
var orderId: String?
@IBOutlet var txtFullAddress: UITextView!
@IBOutlet var txtFamilyMembers: UITextView!
......@@ -73,7 +74,11 @@ class FloorPlanFengshuiViewController: UIViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Fengshui Services/OnsiteFengshuiViewController.swift
......@@ -21,6 +21,7 @@ class OnsiteFengshuiViewController: UIViewController {
var categoryType: CategoryType = .OnsiteServiceGeomancy
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -52,7 +53,11 @@ class OnsiteFengshuiViewController: UIViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/Form.swift
......@@ -10,7 +10,8 @@ import Foundation
class Form {
class func VC(with incrementId: String, categoryType: CategoryType) -> UIViewController? {
class func VC(with incrementId: String, orderId: String, categoryType: CategoryType) -> UIViewController? {
switch categoryType {
case .FloorPlanFengShuiGeomancy:
......@@ -23,6 +24,7 @@ class Form {
let vc = Utils.viewController(storyboardName: "Forms", ofType: FengshuiServiceContainerViewController.self)
vc.incrementId = incrementId
vc.categoryType = categoryType
vc.orderId = orderId
return vc
......@@ -36,6 +38,7 @@ class Form {
let vc = Utils.viewController(storyboardName: "Forms", ofType: ScienceOfNamingContainerViewController.self)
vc.incrementId = incrementId
vc.categoryType = categoryType
vc.orderId = orderId
return vc
......@@ -61,6 +64,7 @@ class Form {
let vc = Utils.viewController(storyboardName: "Forms", ofType: AuspiciousDateContainer.self)
vc.incrementId = incrementId
vc.categoryType = categoryType
vc.orderId = orderId
return vc
default:
return nil
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/CompanyNamingServiceViewController.swift
......@@ -25,6 +25,7 @@ class CompanyNamingServiceViewController: BaseViewController {
@IBOutlet var imgFemale: UIImageView!
@IBOutlet var scroller: UIScrollView!
var zodiacPickerFor = 0
var orderId: String?
// var seller: Seller?
var service: String?
......@@ -73,7 +74,11 @@ class CompanyNamingServiceViewController: BaseViewController {
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/CompanyReNamingServiceViewController.swift
......@@ -25,6 +25,7 @@ class CompanyReNamingServiceViewController: BaseViewController {
var zodiacPickerFor = 0
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -70,6 +71,11 @@ class CompanyReNamingServiceViewController: BaseViewController {
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/IndividualNamingServiceViewController.swift
......@@ -31,6 +31,7 @@ class IndividualNamingServiceViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
var zodiacPickerFor = 0
var incrementId: String?
var orderId: String?
// var seller: Seller?
var service: String?
......@@ -92,6 +93,11 @@ class IndividualNamingServiceViewController: BaseViewController {
}
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/IndividualReNamingServiceViewController.swift
......@@ -28,6 +28,7 @@ class IndividualReNamingServiceViewController: BaseViewController {
@IBOutlet var scroller: UIScrollView!
var zodiacPickerFor = 0
var incrementId: String?
var orderId: String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -80,7 +81,11 @@ class IndividualReNamingServiceViewController: BaseViewController {
@IBAction func submit() {
let editResult = Utils.viewController(storyboardName: "Appointment", ofType: EditResultViewController.self)
if let orderId = orderId {
editResult.orderId = orderId
}
self.navigationController?.pushViewController(editResult, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Forms/ScienceOfNaming/ScienceOfNamingContainerViewController.swift
......@@ -19,6 +19,7 @@ class ScienceOfNamingContainerViewController: BaseViewController {
var service: String?
var categoryType: CategoryType = .IndividualNamingServiceNamed
var incrementId: String = ""
var orderId: String = "0"
override func viewDidLoad() {
super.viewDidLoad()
......@@ -37,21 +38,25 @@ class ScienceOfNamingContainerViewController: BaseViewController {
individualNamingServiceView.isHidden = false
if segue.identifier == "IndividualNamingServiceViewController" {
(segue.destination as! IndividualNamingServiceViewController).incrementId = incrementId
(segue.destination as! IndividualNamingServiceViewController).orderId = orderId
}
case .IndividualNamingServiceReNamedChangeName:
individualReNamingServiceView.isHidden = false
if segue.identifier == "IndividualReNamingServiceViewController" {
(segue.destination as! IndividualReNamingServiceViewController).incrementId = incrementId
(segue.destination as! IndividualReNamingServiceViewController).orderId = orderId
}
case .CompanyNamingServiceNamed:
companyNamingServiceView.isHidden = false
if segue.identifier == "CompanyNamingServiceViewController" {
(segue.destination as! CompanyNamingServiceViewController).incrementId = incrementId
(segue.destination as! CompanyNamingServiceViewController).orderId = orderId
}
case .CompanyNamingServiceReNamedChangeName:
companyReNamingServiceView.isHidden = false
if segue.identifier == "CompanyReNamingServiceViewController" {
(segue.destination as! CompanyReNamingServiceViewController).incrementId = incrementId
(segue.destination as! CompanyReNamingServiceViewController).orderId = orderId
}
default:
print("Form not found")
......
Bhagyashree/Sunarc/Controller/Home/EnquiryDetailsViewController.swift
......@@ -40,6 +40,8 @@ extension EnquiryDetailsViewController {
let chatViewController = Utils.viewController(storyboardName: "Home", ofType: OnlineEnquiryViewController.self)
chatViewController.orderId = orderId
chatViewController.isOrderCompleted = true
chatViewController.customerProfileImage = appointmentDetails.customerProfileImage
chatViewController.customerName = appointmentDetails.customerName!
self.navigationController?.pushViewController(chatViewController, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Home/HomePageViewController.swift
......@@ -144,7 +144,7 @@ extension HomePageViewController: UITableViewDelegate, UITableViewDataSource {
} else if order.products.first?.serviceType == .FORM{
if let form = Form.VC(with: order.incrementId!, categoryType: order.products.first!.categoryType) {
if let form = Form.VC(with: order.incrementId!, orderId: order.orderId!, categoryType: order.products.first!.categoryType){
self.navigationController?.pushViewController(form, animated: true)
}
......
Bhagyashree/Sunarc/Controller/Home/OngoingEnquiryViewController.swift
......@@ -107,6 +107,8 @@ extension OngoingEnquiryViewController: UITableViewDataSource, UITableViewDelega
let chatViewController = Utils.viewController(storyboardName: "Home", ofType: OnlineEnquiryViewController.self)
if let orderId = enquiry.enquiries[indexPath.row].orderId {
chatViewController.orderId = orderId
chatViewController.customerProfileImage = enquiry.enquiries[indexPath.row].customerProfileImage
chatViewController.customerName = enquiry.enquiries[indexPath.row].customerName!
self.navigationController?.pushViewController(chatViewController, animated: true)
}
}
......
Bhagyashree/Sunarc/Controller/Home/OnlineEnquiryViewController.swift
......@@ -8,6 +8,7 @@
import UIKit
import FirebaseDatabase
import Kingfisher
class OnlineEnquiryViewController: UIViewController {
......@@ -17,17 +18,21 @@ class OnlineEnquiryViewController: UIViewController {
@IBOutlet weak var commentViewHeight: NSLayoutConstraint!
@IBOutlet var btnSend: UIButton!
@IBOutlet var btnEndService: UIView!
@IBOutlet var lblCustomerName: UILabel!
@IBOutlet var chatInputView: UIView!
var ref = Database.database().reference()
var chats = [Chat]()
var orderId: String = "0"
var isOrderCompleted = false
var isViewVisable = true
var customerProfileImage: String?
var customerName: String = ""
override func viewDidLoad() {
super.viewDidLoad()
lblCustomerName.text = customerName
ref = Database.database().reference().child(orderId)
ref.queryOrdered(byChild: "timestamp") .observe(DataEventType.value, with: { (snapshot) in
self.chats = [Chat]()
......@@ -54,8 +59,17 @@ class OnlineEnquiryViewController: UIViewController {
}
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
isViewVisable = false
}
func makeAllMSGAsRead() {
if isViewVisable == false {
return
}
for chat in chats {
if chat.name == "Customer" {
if chat.readStatus == "unread" {
......@@ -140,6 +154,7 @@ extension OnlineEnquiryViewController: UITableViewDelegate, UITableViewDataSourc
} else {
let customerCell = tableView.dequeueReusableCell(withIdentifier: "customer") as! OnlineEnquiryCustomerCell
customerCell.lblMessage.text = chat.msg
customerCell.customerProfileImage = customerProfileImage
return customerCell
}
......@@ -182,6 +197,12 @@ class OnlineEnquiryMasterCell: UITableViewCell {
override func layoutIfNeeded() {
imgMaster.layer.cornerRadius = imgMaster.frame.size.width/2
if let profileImage = User.profileImage {
let url = URL(string: profileImage)
self.imgMaster.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
}
}
......@@ -190,9 +211,15 @@ class OnlineEnquiryCustomerCell: UITableViewCell {
@IBOutlet var imgCostomer: UIImageView!
@IBOutlet var lblMessage: UILabel!
var customerProfileImage: String?
override func layoutIfNeeded() {
imgCostomer.layer.cornerRadius = imgCostomer.frame.size.width/2
if let customerProfileImage = customerProfileImage {
let url = URL(string: customerProfileImage)
self.imgCostomer.kf.setImage(with: url, placeholder: UIImage(named: "placeholder"), options: [.transition(ImageTransition.fade(1)), .scaleFactor(1.0)], progressBlock: nil, completionHandler: nil)
}
}
}
Bhagyashree/Sunarc/Controller/Me/MyAllServiceOrderViewController.swift
......@@ -125,7 +125,8 @@ extension MyAllServiceOrderViewController: UITableViewDelegate, UITableViewDataS
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType) {
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Me/MyCompletedOrdersViewController.swift
......@@ -52,7 +52,7 @@ class MyCompletedOrdersViewController: UIViewController {
if nextPage == true {
service.nextPage(serviceStatus: .SERVICE_COMPLETE, success: {
service.nextPage(serviceStatus: .COMPLETE, success: {
self.tblServices.reloadData()
self.tblServices.mj_footer.endRefreshing()
}) { (error) in
......@@ -60,7 +60,7 @@ class MyCompletedOrdersViewController: UIViewController {
self.view.showToast(error, position: .bottom, popTime: 2.0, dismissOnTap: false )
}
} else {
service.getServices(serviceStatus: .SERVICE_COMPLETE, success: {
service.getServices(serviceStatus: .COMPLETE, success: {
self.tblServices.reloadData()
self.tblServices.mj_header.endRefreshing()
}) { (errorMessage) in
......@@ -104,7 +104,7 @@ extension MyCompletedOrdersViewController: UITableViewDelegate, UITableViewDataS
if selectedService.serviceType == .BOOKING {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.serviceStatus = .completed
appointmentdetails.incrementId = selectedService.incrementId
appointmentdetails.orderId = selectedService.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
......@@ -124,7 +124,8 @@ extension MyCompletedOrdersViewController: UITableViewDelegate, UITableViewDataS
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType) {
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Me/MyOngoingServiceOrderViewController.swift
......@@ -103,11 +103,18 @@ extension MyOngoingServiceOrderViewController: UITableViewDelegate, UITableViewD
if selectedService.serviceType == .BOOKING {
let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
appointmentdetails.serviceStatus = .tbc
appointmentdetails.incrementId = selectedService.incrementId
appointmentdetails.orderId = selectedService.orderId
self.navigationController?.pushViewController(appointmentdetails, animated: true)
if selectedService.status == .SERVICE_ONGOING {
let videoCallVC = Utils.viewController(storyboardName: "Appointment", ofType: VideoCallingViewController.self)
videoCallVC.orderId = selectedService.orderId!
self.navigationController?.pushViewController(videoCallVC, animated: true)
}
// let appointmentdetails = Utils.viewController(storyboardName: "Appointment", ofType: ServiceDetailViewController.self)
// appointmentdetails.serviceStatus = .tbc
// appointmentdetails.incrementId = selectedService.incrementId
// appointmentdetails.orderId = selectedService.orderId
// self.navigationController?.pushViewController(appointmentdetails, animated: true)
} else if selectedService.serviceType == .FAQ {
if selectedService.status == .PROCESSING {
......@@ -124,7 +131,8 @@ extension MyOngoingServiceOrderViewController: UITableViewDelegate, UITableViewD
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType){
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType){
self.navigationController?.pushViewController(form, animated: true)
}
} else {
......
Bhagyashree/Sunarc/Controller/Me/MyUploadResultViewController.swift
......@@ -124,9 +124,11 @@ extension MyUploadResultViewController: UITableViewDelegate, UITableViewDataSour
}
} else if selectedService.serviceType == .FORM{
if let form = Form.VC(with: selectedService.incrementId!, categoryType: selectedService.categoryType){
if let form = Form.VC(with: selectedService.incrementId!, orderId: selectedService.orderId!, categoryType: selectedService.categoryType) {
self.navigationController?.pushViewController(form, animated: true)
}
} else {
self.view.showToast("Unknown service", position: .bottom, popTime: 2.0, dismissOnTap: false)
}
......
Bhagyashree/Sunarc/Controller/Messages/NotificationsViewController.swift
......@@ -8,27 +8,26 @@
import UIKit
class NotificationsViewController: UIViewController {
class NotificationsViewController: BaseViewController {
var notifications = [[String: Any]]()
var notification = MyNotification()
@IBOutlet var tblNotification: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
notification.getNotifications({
self.tblNotification.reloadData()
}) { (errorMessage) in
if errorMessage != nil {
self.view.showToast(errorMessage!, position: .bottom, popTime: 2.0, dismissOnTap: false)
}
}
let noti1 = ["msg": "You have new reservation service, Please be aware of it.", "dateTime": "02:30 pm 12/02/2018"]
notifications.append(noti1)
let noti2 = ["msg": "An appointment service will start in 15 minutes. Please get ready.", "dateTime": "01:40 am 13/03/2018"]
notifications.append(noti2)
let noti3 = ["msg": "You have new reservation service, Please be aware of it.", "dateTime": "05:50 pm 14/04/2018"]
notifications.append(noti3)
let noti4 = ["msg": "An appointment service will start in 15 minutes. Please get ready.", "dateTime": "06:06 am 15/05/2018"]
notifications.append(noti4)
let noti5 = ["msg": "You have new reservation service, Please be aware of it.", "dateTime": "04:20 pm 16/06/2018"]
notifications.append(noti5)
let noti6 = ["msg": "An appointment service will start in 15 minutes. Please get ready.", "dateTime": "08:30 pm 17/07/2018"]
notifications.append(noti6)
let noti7 = ["msg": "You have new reservation service, Please be aware of it.", "dateTime": "09:30 am 18/08/2018"]
notifications.append(noti7)
}
......@@ -37,16 +36,12 @@ class NotificationsViewController: UIViewController {
extension NotificationsViewController: UITableViewDataSource, UITableViewDelegate {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return notifications.count
return notification.notifications.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let notification = notifications[indexPath.row]
let ongoinCell = tableView.dequeueReusableCell(withIdentifier: "notifications") as! NotificationsCell
ongoinCell.lblMessage.text = notification["msg"] as! String
ongoinCell.lblDateTime.text = notification["dateTime"] as! String
ongoinCell.notification = notification.notifications[indexPath.row]
return ongoinCell
}
......@@ -63,5 +58,14 @@ class NotificationsCell: UITableViewCell {
@IBOutlet var lblMessage: UILabel!
@IBOutlet var lblDateTime: UILabel!
var notification: MyNotification? {
didSet {
if let notification = notification {
self.lblMessage.text = notification.title
self.lblDateTime.text = notification.content
}
}
}
}
Bhagyashree/Sunarc/Model/Appointment/EditResult.swift
......@@ -49,6 +49,8 @@ class EditResult {
let postData = try! JSONSerialization.data(withJSONObject: parameters, options: [])
print(HOST_NAME+API.UPDATE_RESULT)
print(parameters)
print(headers)
let request = NSMutableURLRequest(url: NSURL(string: HOST_NAME+API.UPDATE_RESULT)! as URL,
cachePolicy: .useProtocolCachePolicy,
......@@ -71,6 +73,8 @@ class EditResult {
do {
let response = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers)
print(" ***\(response)*** ")
if let validResponse = response as? [[String: Any]] {
if validResponse.count > 0 {
if let apiStatus = validResponse[0]["api_status"] as? [String: Any] {
......
Bhagyashree/Sunarc/Model/Home/FormDetail.swift
......@@ -7,11 +7,14 @@
//
import Foundation
import SVProgressHUD
class FormDetail {
class func get(incrementId: String, success: @escaping (_ customOptions: [CustomOption]) -> Void, failure: @escaping (_ errorMessage: String) -> Void) {
SVProgressHUD.show()
let parameters: [String: Any] = ["customerId": User.customerId,
"storeId": UserDefaults.standard.value(forKey: "storeId") as! String,
"incrementId": incrementId
......@@ -32,6 +35,8 @@ class FormDetail {
let option = CustomOption(json: customOptionJSON)
options.append(option)
}
SVProgressHUD.dismiss()
success(options)
return
}
......@@ -40,13 +45,16 @@ class FormDetail {
}
SVProgressHUD.dismiss()
failure("")
} else {
SVProgressHUD.dismiss()
failure("Incorrect data format")
}
}) { (errorMessage) in
SVProgressHUD.dismiss()
failure(errorMessage)
}
......
Bhagyashree/Sunarc/Model/Me/ServiceExt.swift
......@@ -32,7 +32,10 @@ extension Service {
if serviceStatus != nil {
var statusParameter = ""
if serviceStatus == .COMPLETE {
if serviceStatus == .PROCESSING {
statusParameter = "processing"
} else if serviceStatus == .COMPLETE {
statusParameter = "complete"
} else if serviceStatus == .SERVICE_COMPLETE {
statusParameter = "service_complete"
......@@ -45,12 +48,14 @@ extension Service {
parameters = ["customerId": User.customerId,
"storeId": UserDefaults.standard.value(forKey: "storeId") as! String,
"status": statusParameter,
"pageNumber": self.currentPage
"pageNumber": self.currentPage,
"type": "booking"
]
} else {
parameters = ["customerId": User.customerId,
"storeId": UserDefaults.standard.value(forKey: "storeId") as! String,
"pageNumber": self.currentPage
"pageNumber": self.currentPage,
"type": "booking"
]
}
......
Bhagyashree/Sunarc/Model/Notifications/MyNotification.swift 0 → 100644
//
// Notification.swift
// Bhagyashree
//
// Created by SunarcMAC on 23/08/18.
// Copyright © 2018 Sunarc. All rights reserved.
//
import Foundation
class MyNotification {
var banner: String?
var categoryId: String?
var categoryName: String?
var content: String?
var id: String?
var notificationType: String?
var title: String?
var notifications = [MyNotification]()
func initWithJSON(json: [String: Any]) {
if let banner = json["banner"] as? String {
self.banner = banner
}
if let categoryId = json["categoryId"] as? String {
self.categoryId = categoryId
}
if let categoryName = json["categoryName"] as? String {
self.categoryName = categoryName
}
if let content = json["content"] as? String {
self.content = content
}
if let id = json["id"] as? String {
self.id = id
}
if let notificationType = json["notificationType"] as? String {
self.notificationType = notificationType
}
if let title = json["title"] as? String {
self.title = title
}
}
}
Bhagyashree/Sunarc/Model/Notifications/MyNotificationExt.swift 0 → 100644
//
// NotificationExt.swift
// Bhagyashree
//
// Created by SunarcMAC on 23/08/18.
// Copyright © 2018 Sunarc. All rights reserved.
//
import Foundation
extension MyNotification {
func getNotifications(_ success:@escaping () -> Void, failur: @escaping (_ errorMessage: String?) -> Void) {
let parameters: [String: Any] = ["storeId": UserDefaults.standard.value(forKey: "storeId") as! String,
"customerId": User.customerId
]
HTTP().connectionWithRequestObjectFormUrl(api: API.NOTIFICATION, parameters: parameters, method: .post, indicator: true, success: { (response) in
if let json = response as? [String: Any] {
if let notificationList = json["notificationList"] as? [[String: Any]] {
self.notifications = [MyNotification]()
for notification in notificationList {
let noti = MyNotification()
noti.initWithJSON(json: notification)
self.notifications.append(noti)
}
success()
} else {
failur(nil)
}
} else {
failur(nil)
}
success()
}) { (errorMessage) in
failur(errorMessage)
}
}
}
Bhagyashree/Sunarc/Model/UpdateOrder.swift
......@@ -30,7 +30,7 @@ class UpdateOrder {
let postData = try! JSONSerialization.data(withJSONObject: parameters, options: [])
let request = NSMutableURLRequest(url: NSURL(string: "http://54.251.144.17/rest/V1/service/updateorder")! as URL,
let request = NSMutableURLRequest(url: NSURL(string: HOST_NAME + API.UPDATE_ORDER)! as URL,
cachePolicy: .useProtocolCachePolicy,
timeoutInterval: 10.0)
request.httpMethod = "POST"
......
Bhagyashree/Sunarc/Other/HTTP/API.swift
......@@ -39,8 +39,11 @@ class API {
static let VIEW_ORDER = "mobikulmphttp/marketplace/viewOrder"
static let RECOMEND_PRODUCTS = "/rest/V1/seller/recommendedproducts?page="
static let UPDATE_RESULT = "/rest/V1/service/saveResult"
static let UPDATE_ORDER = "rest/V1/service/updateorder"
// Notification
static let NOTIFICATION = "mobikulhttp/extra/notificationList"
}
......
Bhagyashree/Sunarc/View/Appointment.storyboard
......@@ -217,7 +217,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="53v-FP-ut9" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="960.79999999999995" y="115.59220389805098"/>
<point key="canvasLocation" x="986" y="-358"/>
</scene>
<!--Service Detail View Controller-->
<scene sceneID="2EX-tu-ihH">
......@@ -997,7 +997,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="oCW-Hk-hWJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5984.8000000000002" y="111.54422788605699"/>
<point key="canvasLocation" x="7818" y="131"/>
</scene>
<!--Video Calling View Controller-->
<scene sceneID="39G-3n-d9I">
......@@ -1147,7 +1147,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nhp-dO-5PY" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5160.8000000000002" y="115.59220389805098"/>
<point key="canvasLocation" x="6994" y="135"/>
</scene>
<!--Edit Result View Controller-->
<scene sceneID="fGT-Ih-kSu">
......@@ -1728,7 +1728,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="AtS-9W-M2D" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3600.8000000000002" y="118.29085457271366"/>
<point key="canvasLocation" x="5434" y="138"/>
</scene>
<!--Recommend Product View Controller-->
<scene sceneID="F7T-bg-49H">
......@@ -2153,12 +2153,12 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="uYF-dX-YLC" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4360.8000000000002" y="118.29085457271366"/>
<point key="canvasLocation" x="6194" y="138"/>
</scene>
<!--More Services View Controller-->
<scene sceneID="nNa-r3-Ji0">
<objects>
<viewController storyboardIdentifier="MoreServicesViewController" hidesBottomBarWhenPushed="YES" id="X0H-0P-BZg" customClass="MoreServicesViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="MoreServicesViewController" id="X0H-0P-BZg" customClass="MoreServicesViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="rG7-PT-MHf">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......@@ -2166,14 +2166,14 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SFf-Yq-HAJ" customClass="CardView" customModule="Bhagyashree" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back" translatesAutoresizingMaskIntoConstraints="NO" id="NMi-k4-kj0">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back" translatesAutoresizingMaskIntoConstraints="NO" id="NMi-k4-kj0">
<rect key="frame" x="7" y="34" width="20" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="4es-yE-h50"/>
<constraint firstAttribute="height" constant="22" id="dyg-DY-2zp"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oPQ-WX-fxO">
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oPQ-WX-fxO">
<rect key="frame" x="0.0" y="0.0" width="66" height="65"/>
<constraints>
<constraint firstAttribute="width" constant="66" id="uHH-um-Bb0"/>
......@@ -2222,14 +2222,16 @@
</constraints>
<viewLayoutGuide key="safeArea" id="wZH-b0-CF9"/>
</view>
<navigationItem key="navigationItem" id="aXh-r3-nQq"/>
<connections>
<segue destination="BHa-Uk-cKc" kind="show" id="7lc-Yf-y2z"/>
<segue destination="foy-sn-gwC" kind="show" id="AMb-PE-zUf"/>
<segue destination="fqz-WO-LY5" kind="show" id="fLc-as-fbi"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e3s-D9-3JU" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1813.5999999999999" y="112.89355322338831"/>
<point key="canvasLocation" x="2752.8000000000002" y="112.89355322338831"/>
</scene>
<!--Completed Services View Controller-->
<scene sceneID="wW9-qk-qL6">
......@@ -2240,7 +2242,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ar2-r6-eBS">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<rect key="frame" x="0.0" y="20" width="375" height="598"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="completedServiceCell" rowHeight="96" id="62Z-Pq-btf" customClass="CompletedServicesCell" customModule="Bhagyashree" customModuleProvider="target">
......@@ -2274,7 +2276,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-done" translatesAutoresizingMaskIntoConstraints="NO" id="SuD-Yn-Ggv">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-done" translatesAutoresizingMaskIntoConstraints="NO" id="SuD-Yn-Ggv">
<rect key="frame" x="336" y="13" width="26" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="2kf-zp-rSm"/>
......@@ -2352,7 +2354,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ROS-Zm-yX6" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2672.8000000000002" y="490.70464767616198"/>
<point key="canvasLocation" x="3612" y="490.70464767616198"/>
</scene>
<!--On Going Services View Controller-->
<scene sceneID="NKJ-Bm-I75">
......@@ -2363,7 +2365,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="MFZ-JI-cdZ">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<rect key="frame" x="0.0" y="20" width="375" height="598"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ongoingServiceCell" rowHeight="96" id="OCX-iE-Jfi" customClass="OngoingServiceCell" customModule="Bhagyashree" customModuleProvider="target">
......@@ -2397,7 +2399,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tbc" translatesAutoresizingMaskIntoConstraints="NO" id="Tap-dA-rCp">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tbc" translatesAutoresizingMaskIntoConstraints="NO" id="Tap-dA-rCp">
<rect key="frame" x="336" y="13" width="26" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="T2t-sF-eb2"/>
......@@ -2474,7 +2476,129 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="IW3-ul-hrS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2672.8000000000002" y="-261.31934032983509"/>
<point key="canvasLocation" x="3612" y="-261.31934032983509"/>
</scene>
<!--Processing View Controller-->
<scene sceneID="VY4-NN-BNl">
<objects>
<viewController storyboardIdentifier="ProcessingViewController" id="fqz-WO-LY5" customClass="ProcessingViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="SI9-pZ-JGs">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="37g-wV-xCA">
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ongoingServiceCell" rowHeight="96" id="JDg-1e-UiA" customClass="ProcessingServiceCell" customModule="Bhagyashree" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="96"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JDg-1e-UiA" id="G6w-bb-jBE">
<rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cellCardView" translatesAutoresizingMaskIntoConstraints="NO" id="j3C-lB-ejs">
<rect key="frame" x="3" y="3" width="371" height="91"/>
<constraints>
<constraint firstAttribute="height" constant="91" id="o5f-WX-v8F"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="BTb-71-2re">
<rect key="frame" x="15" y="13" width="72" height="72"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="72" id="GHp-Lu-k0R"/>
<constraint firstAttribute="height" constant="72" id="yBy-fr-sr2"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="16/03/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OwZ-cB-drS">
<rect key="frame" x="93" y="62" width="59" height="16"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="hut-XJ-q5M"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="11"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tbc" translatesAutoresizingMaskIntoConstraints="NO" id="COT-kB-v1s">
<rect key="frame" x="336" y="13" width="26" height="26"/>
<constraints>
<constraint firstAttribute="width" constant="26" id="6tJ-R1-MAM"/>
<constraint firstAttribute="height" constant="26" id="sVK-Yg-7JL"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4RG-aN-VG6">
<rect key="frame" x="95" y="13" width="229" height="21"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="jPy-zZ-bHm"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xxxxxxxxx" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1nc-WH-amc">
<rect key="frame" x="95" y="35" width="59.5" height="21"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="R1y-7A-dpu"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="BTb-71-2re" firstAttribute="centerY" secondItem="j3C-lB-ejs" secondAttribute="centerY" id="8Fd-f1-Fzg"/>
<constraint firstItem="j3C-lB-ejs" firstAttribute="leading" secondItem="G6w-bb-jBE" secondAttribute="leading" constant="3" id="AW1-96-x3m"/>
<constraint firstItem="1nc-WH-amc" firstAttribute="top" secondItem="4RG-aN-VG6" secondAttribute="bottom" constant="1" id="JEb-LH-Ws6"/>
<constraint firstItem="OwZ-cB-drS" firstAttribute="top" secondItem="1nc-WH-amc" secondAttribute="bottom" constant="6" id="SuR-SC-h53"/>
<constraint firstItem="j3C-lB-ejs" firstAttribute="leading" secondItem="BTb-71-2re" secondAttribute="trailing" constant="-84" id="Tk7-qX-bw9"/>
<constraint firstItem="4RG-aN-VG6" firstAttribute="leading" secondItem="BTb-71-2re" secondAttribute="trailing" constant="8" id="V5J-Pn-qBR"/>
<constraint firstItem="j3C-lB-ejs" firstAttribute="top" secondItem="G6w-bb-jBE" secondAttribute="top" constant="3" id="VmY-00-32c"/>
<constraint firstAttribute="bottom" secondItem="j3C-lB-ejs" secondAttribute="bottom" constant="2" id="Vnw-lA-z7B"/>
<constraint firstItem="1nc-WH-amc" firstAttribute="leading" secondItem="BTb-71-2re" secondAttribute="trailing" constant="8" id="acg-Pg-PMG"/>
<constraint firstAttribute="trailing" secondItem="j3C-lB-ejs" secondAttribute="trailing" constant="1" id="f49-Kz-Sz3"/>
<constraint firstItem="COT-kB-v1s" firstAttribute="top" secondItem="G6w-bb-jBE" secondAttribute="top" constant="13" id="fkB-kj-40U"/>
<constraint firstItem="1nc-WH-amc" firstAttribute="leading" secondItem="4RG-aN-VG6" secondAttribute="trailing" constant="-229" id="gVJ-Wh-NcN"/>
<constraint firstItem="OwZ-cB-drS" firstAttribute="leading" secondItem="BTb-71-2re" secondAttribute="trailing" constant="6" id="tWJ-ox-onn"/>
<constraint firstAttribute="trailing" secondItem="COT-kB-v1s" secondAttribute="trailing" constant="13" id="td9-vm-y0j"/>
<constraint firstItem="4RG-aN-VG6" firstAttribute="top" secondItem="G6w-bb-jBE" secondAttribute="topMargin" constant="2" id="yMB-B9-JD2"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="imgCustomer" destination="BTb-71-2re" id="gVb-tt-EXG"/>
<outlet property="lblCustomerName" destination="4RG-aN-VG6" id="QVO-69-LED"/>
<outlet property="lblDate" destination="OwZ-cB-drS" id="XnK-0g-JEX"/>
<outlet property="lblService" destination="1nc-WH-amc" id="JIu-41-4SE"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="fqz-WO-LY5" id="bWb-bC-dEU"/>
<outlet property="delegate" destination="fqz-WO-LY5" id="n1d-xS-4Uc"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="37g-wV-xCA" firstAttribute="bottom" secondItem="Pk4-Ne-5Ef" secondAttribute="bottom" id="MGv-cH-x01"/>
<constraint firstItem="37g-wV-xCA" firstAttribute="trailing" secondItem="Pk4-Ne-5Ef" secondAttribute="trailing" id="qRh-1n-2i8"/>
<constraint firstItem="37g-wV-xCA" firstAttribute="top" secondItem="SI9-pZ-JGs" secondAttribute="top" id="xwL-sA-b46"/>
<constraint firstItem="37g-wV-xCA" firstAttribute="leading" secondItem="Pk4-Ne-5Ef" secondAttribute="leading" id="z2j-8r-syU"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Pk4-Ne-5Ef"/>
</view>
<connections>
<outlet property="tblOnGoingNotices" destination="37g-wV-xCA" id="WqA-3n-pYd"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="x0O-7F-TAC" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4344.8000000000002" y="-261.31934032983509"/>
</scene>
<!--Appointment-->
<scene sceneID="4KZ-At-zoG">
......@@ -2488,12 +2612,12 @@
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="aYC-3e-JR7" kind="relationship" relationship="rootViewController" id="Ugz-zO-bSH"/>
<segue destination="X0H-0P-BZg" kind="relationship" relationship="rootViewController" id="BiP-BR-cUl"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="HwV-gq-n43" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="101.59999999999999" y="116.49175412293854"/>
<point key="canvasLocation" x="1846" y="112"/>
</scene>
</scenes>
<resources>
......
Bhagyashree/Sunarc/View/Forms.storyboard
......@@ -13,7 +13,7 @@
<!--Fengshui Service Container View Controller-->
<scene sceneID="21P-jn-eCu">
<objects>
<viewController storyboardIdentifier="FengshuiServiceContainerViewController" id="EQ8-wY-UYs" customClass="FengshuiServiceContainerViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="FengshuiServiceContainerViewController" hidesBottomBarWhenPushed="YES" id="EQ8-wY-UYs" customClass="FengshuiServiceContainerViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="tG5-Tk-Yo3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......@@ -806,7 +806,7 @@
<!--Science Of Naming Container View Controller-->
<scene sceneID="nWL-K4-on2">
<objects>
<viewController storyboardIdentifier="ScienceOfNamingContainerViewController" id="9uw-As-fmK" customClass="ScienceOfNamingContainerViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ScienceOfNamingContainerViewController" hidesBottomBarWhenPushed="YES" id="9uw-As-fmK" customClass="ScienceOfNamingContainerViewController" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="dkM-R3-Js0">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......@@ -3201,7 +3201,7 @@
<!--Auspicious Date Container-->
<scene sceneID="jo2-Dh-3sN">
<objects>
<viewController storyboardIdentifier="AuspiciousDateContainer" id="zlY-5g-iig" customClass="AuspiciousDateContainer" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="AuspiciousDateContainer" hidesBottomBarWhenPushed="YES" id="zlY-5g-iig" customClass="AuspiciousDateContainer" customModule="Bhagyashree" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Dpx-wd-vWm">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......
Bhagyashree/Sunarc/View/Home.storyboard
......@@ -808,7 +808,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="19:00 28/04/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Deu-Vy-knx">
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="19:00 28/04/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Deu-Vy-knx">
<rect key="frame" x="75" y="39" width="271" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="t6s-LY-fze"/>
......@@ -1363,9 +1363,9 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RX5-Vv-exD">
<rect key="frame" x="122" y="29" width="130" height="27"/>
<rect key="frame" x="99" y="29" width="176" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="130" id="9eC-Qy-Kzm"/>
<constraint firstAttribute="width" constant="176" id="9eC-Qy-Kzm"/>
<constraint firstAttribute="height" constant="27" id="dWn-9y-Kwm"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
......@@ -1704,6 +1704,7 @@
<outlet property="btnSend" destination="aVM-iS-vM0" id="1zJ-Hw-hTF"/>
<outlet property="chatInputView" destination="Sld-01-3ke" id="TGV-X0-NxQ"/>
<outlet property="commentViewHeight" destination="zyR-Jh-Kpw" id="kQW-fA-yBh"/>
<outlet property="lblCustomerName" destination="RX5-Vv-exD" id="1No-VB-DjB"/>
<outlet property="lblPlaceHolder" destination="MTH-Qs-B62" id="RFk-e4-kUU"/>
<outlet property="tblChat" destination="zMo-HV-qAx" id="x3N-0U-L6g"/>
<outlet property="txtComment" destination="aYB-vl-13h" id="JaU-cj-RjW"/>
......
Bhagyashree/Sunarc/View/Me.storyboard
......@@ -791,7 +791,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tbc" translatesAutoresizingMaskIntoConstraints="NO" id="Hv7-qG-JN1">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tbc" translatesAutoresizingMaskIntoConstraints="NO" id="Hv7-qG-JN1">
<rect key="frame" x="323" y="4" width="26" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -3747,7 +3747,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-inprogress" translatesAutoresizingMaskIntoConstraints="NO" id="266-Eb-3x7">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-inprogress" translatesAutoresizingMaskIntoConstraints="NO" id="266-Eb-3x7">
<rect key="frame" x="323" y="5" width="26" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -3909,7 +3909,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-inprogress" translatesAutoresizingMaskIntoConstraints="NO" id="KWG-T1-Rjh">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-inprogress" translatesAutoresizingMaskIntoConstraints="NO" id="KWG-T1-Rjh">
<rect key="frame" x="325" y="5" width="26" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -4069,7 +4069,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-done" translatesAutoresizingMaskIntoConstraints="NO" id="ALu-F0-reH">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="status-done" translatesAutoresizingMaskIntoConstraints="NO" id="ALu-F0-reH">
<rect key="frame" x="322" y="5" width="26" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......
Bhagyashree/Sunarc/View/Messages.storyboard
......@@ -138,6 +138,9 @@
</view>
<navigationItem key="navigationItem" id="DTh-jT-pW6"/>
<nil key="simulatedTopBarMetrics"/>
<connections>
<outlet property="tblNotification" destination="9qw-qV-yAg" id="VJd-HR-bAP"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4pj-DW-Nrb" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment