From b51616b793d2b178ebd7a918cc38b5c69e574d77 Mon Sep 17 00:00:00 2001 From: Cao yang Date: Fri, 13 Apr 2018 16:22:40 +0800 Subject: [PATCH] 考勤补卡页面添加 --- ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj | 16 ++++++++++++++++ ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 2 +- ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 182380 -> 0 bytes ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift | 4 +++- ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift | 27 +++++++++++++++++++++++++++ ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift | 27 +++++++++++++++++++++++++++ ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 18 +++++++++--------- 10 files changed, 364 insertions(+), 13 deletions(-) create mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift create mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib create mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift create mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 7214ed2..f4337c5 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -41,6 +41,10 @@ AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; }; AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; }; AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; }; + AD5681CA208044860034A948 /* GrowCheckUpTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */; }; + AD5681CB208044860034A948 /* GrowCheckUpTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */; }; + AD5681CE2080449A0034A948 /* GrowCheckDownTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */; }; + AD5681CF2080449A0034A948 /* GrowCheckDownTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD5681CD2080449A0034A948 /* GrowCheckDownTableViewCell.xib */; }; AD64A2C0207F289400B25E80 /* ProgramVacateTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */; }; AD64A2C1207F289400B25E80 /* ProgramVacateTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */; }; AD64A2C3207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */; }; @@ -204,6 +208,10 @@ AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = ""; }; AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = ""; }; AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = ""; }; + AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowCheckUpTableViewCell.swift; sourceTree = ""; }; + AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GrowCheckUpTableViewCell.xib; sourceTree = ""; }; + AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowCheckDownTableViewCell.swift; sourceTree = ""; }; + AD5681CD2080449A0034A948 /* GrowCheckDownTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GrowCheckDownTableViewCell.xib; sourceTree = ""; }; AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateTableViewCell.swift; sourceTree = ""; }; AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateTableViewCell.xib; sourceTree = ""; }; AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateBodyTableViewCell.swift; sourceTree = ""; }; @@ -602,6 +610,10 @@ AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */, AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */, AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */, + AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */, + AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */, + AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */, + AD5681CD2080449A0034A948 /* GrowCheckDownTableViewCell.xib */, ); path = View; sourceTree = ""; @@ -915,6 +927,7 @@ AD64A2C1207F289400B25E80 /* ProgramVacateTableViewCell.xib in Resources */, BFF9B7F42057A29D00F39B3E /* TableEmptyView.xib in Resources */, ADC9AB7E207C66DA00348EF1 /* BehaviorDetailCell.xib in Resources */, + AD5681CF2080449A0034A948 /* GrowCheckDownTableViewCell.xib in Resources */, ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */, BFEAAAC8205257460072FAAF /* LXCalenderCell.xib in Resources */, 599364F8204E648C00C8B371 /* ChannelCollectionViewCell.xib in Resources */, @@ -924,6 +937,7 @@ ADC9AB74207C64B300348EF1 /* MoralTableViewCell.xib in Resources */, BF7A4C86204E338500460463 /* Main.storyboard in Resources */, ADC9AB7A207C66A300348EF1 /* MoralDetailCell.xib in Resources */, + AD5681CB208044860034A948 /* GrowCheckUpTableViewCell.xib in Resources */, BF67F3BD20590A2F002FDC61 /* Info-OSX.plist in Resources */, BF621CAC205660E90040D2C1 /* My.storyboard in Resources */, BF67F3BC20590A2F002FDC61 /* Info-iOS.plist in Resources */, @@ -1017,6 +1031,7 @@ buildActionMask = 2147483647; files = ( BF621CB02056664C0040D2C1 /* CurrentInfoViewController.swift in Sources */, + AD5681CA208044860034A948 /* GrowCheckUpTableViewCell.swift in Sources */, ADC9AB88207C940700348EF1 /* ProgramViewController.swift in Sources */, BF7A4C3C204CD55300460463 /* ParentAssistant.xcdatamodeld in Sources */, AD198177207D9FF5009AB8B5 /* ProgramVacateViewController.swift in Sources */, @@ -1089,6 +1104,7 @@ BFCED888205280B700055373 /* MyViewController.swift in Sources */, AD198175207D9FC1009AB8B5 /* ProgramCardViewController.swift in Sources */, AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */, + AD5681CE2080449A0034A948 /* GrowCheckDownTableViewCell.swift in Sources */, BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */, BFBC06C92063AE8900CCFAFF /* ZLaunchAdConfig.swift in Sources */, BFEAAAD820525D620072FAAF /* UILabel+LXLabel.m in Sources */, diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist index 449940c..51a860c 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ ParentAssistant.xcscheme orderHint - 9 + 0 diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 6a998ce..5b100fd 100644 Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift index cf4bdce..fe47a8a 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift @@ -8,14 +8,88 @@ import UIKit -class ProgramCardViewController: UIViewController { +class ProgramCardViewController: UIViewController,UITextFieldDelegate { + var cardInputTextField = UITextField() + + lazy var cardView = { ()-> UIView in + + let view = UIView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: 140)) + view.backgroundColor = UIColor.white + return view + }() + lazy var bottomBtn = {()-> UIButton in + let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-80, width: 200, height: 40)) + btn.setTitle("补卡申请", for: UIControlState.normal) + btn.layer.cornerRadius = 5 + btn.clipsToBounds = true + btn.setTitleColor(UIColor.black, for: UIControlState.normal) + btn.backgroundColor = Theme.topBarColor() + btn.addTarget(self, action: #selector(applyAction), for: UIControlEvents.touchUpInside) + return btn + }() + + @objc func applyAction(){ + print("补卡申请提交") + } + override func viewDidLoad() { super.viewDidLoad() - + self.view.backgroundColor = backGroundColor + self.view.addSubview(self.cardView) + self.view.addSubview(self.bottomBtn) + setUpContentView() // Do any additional setup after loading the view. + + //点击空白区域收起键盘 + self.view.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(handleTap(sender:)))) + } + + @objc func handleTap(sender:UITapGestureRecognizer){ + if sender.state == .ended { + self.cardInputTextField.resignFirstResponder() + } + sender.cancelsTouchesInView = false } + + func setUpContentView () { + + let cardLable = UILabel.init(frame: CGRect.init(x: 10, y: 10, width: 100, height: 30)) + cardLable.text = "补卡人:" + + let cardName = UILabel.init(frame: CGRect.init(x: 110, y: 10, width: 100, height: 30)) + cardName.text = "张三" + + let cardNumberLab = UILabel.init(frame: CGRect.init(x: 10, y: 50, width: 100, height: 30)) + cardNumberLab.text = "卡号:" + + let cardNumberInput = UITextField.init(frame: CGRect.init(x: 110, y: 50, width: screenWidth-120, height: 30)) + cardNumberInput.placeholder = "请输入卡号" + cardNumberInput.keyboardType = .numbersAndPunctuation + cardNumberInput.delegate = self + self.cardInputTextField = cardNumberInput + + let cardDateLab = UILabel.init(frame: CGRect.init(x: 10, y: 90, width: 100, height: 30)) + cardDateLab.text = "考勤日期:" + + let cardDateInput = UILabel.init(frame: CGRect.init(x: 110, y: 90, width: screenWidth-120, height: 30)) + cardDateInput.text = "2018-02-12 09:40" + + self.cardView.addSubview(cardLable) + self.cardView.addSubview(cardName) + self.cardView.addSubview(cardNumberLab) + self.cardView.addSubview(cardNumberInput) + self.cardView.addSubview(cardDateLab) + self.cardView.addSubview(cardDateInput) + + } + //收回键盘 + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + + return textField.resignFirstResponder() + } + override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift index 4cfa83a..4d6d6e0 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift @@ -23,10 +23,12 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV }() lazy var bottomBtn = {()-> UIButton in - let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-60, y: screenHeight-66-50, width: 120, height: 40)) + let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-50, width: 200, height: 40)) btn.setTitle("请假", for: UIControlState.normal) btn.setTitleColor(UIColor.black, for: UIControlState.normal) btn.backgroundColor = Theme.topBarColor() + btn.layer.cornerRadius = 5 + btn.clipsToBounds = true return btn }() diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift new file mode 100644 index 0000000..4212c3a --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift @@ -0,0 +1,27 @@ +// +// GrowCheckDownTableViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/13. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class GrowCheckDownTableViewCell: UITableViewCell { + + @IBOutlet weak var studentParents: UILabel! + @IBOutlet weak var studentMessage: UILabel! + @IBOutlet weak var studentImage: UIImageView! + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib new file mode 100644 index 0000000..7404840 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift new file mode 100644 index 0000000..d4b4af9 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift @@ -0,0 +1,27 @@ +// +// GrowCheckUpTableViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/13. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class GrowCheckUpTableViewCell: UITableViewCell { + + @IBOutlet weak var checkName: UILabel! + @IBOutlet weak var checkDate: UILabel! + @IBOutlet weak var checkCount: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib new file mode 100644 index 0000000..6cb6088 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist index 89dc66c..d1b4da5 100644 --- a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,47 +7,47 @@ Alamofire.xcscheme orderHint - 0 + 1 DZNEmptyDataSet.xcscheme orderHint - 1 + 2 Pods-ParentAssistant.xcscheme orderHint - 2 + 3 Reachability.xcscheme orderHint - 3 + 4 SDWebImage.xcscheme orderHint - 4 + 5 SVProgressHUD.xcscheme orderHint - 5 + 6 SwiftHash.xcscheme orderHint - 6 + 7 Toast.xcscheme orderHint - 7 + 8 XRCarouselView.xcscheme orderHint - 8 + 9 -- libgit2 0.21.0