diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 864fccb..5ae3d76 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -32,6 +32,16 @@ 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; }; 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; }; 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; + AD122AB6208433BA00C7D0AD /* ProgramVacateDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AB5208433BA00C7D0AD /* ProgramVacateDetailViewController.swift */; }; + AD122AB8208436F100C7D0AD /* ProgramVacateDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AB7208436F100C7D0AD /* ProgramVacateDetailView.swift */; }; + AD122ABB20843AD700C7D0AD /* ProgramVacateDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AB920843AD700C7D0AD /* ProgramVacateDetailCell.swift */; }; + AD122ABC20843AD700C7D0AD /* ProgramVacateDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD122ABA20843AD700C7D0AD /* ProgramVacateDetailCell.xib */; }; + AD122AC120843FAF00C7D0AD /* ProgramVacateTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122ABF20843FAE00C7D0AD /* ProgramVacateTextFieldCell.swift */; }; + AD122AC220843FAF00C7D0AD /* ProgramVacateTextFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD122AC020843FAF00C7D0AD /* ProgramVacateTextFieldCell.xib */; }; + AD122AC5208442BC00C7D0AD /* ProgramVacateImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AC3208442BC00C7D0AD /* ProgramVacateImageCell.swift */; }; + AD122AC6208442BC00C7D0AD /* ProgramVacateImageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD122AC4208442BC00C7D0AD /* ProgramVacateImageCell.xib */; }; + AD122AC8208448E900C7D0AD /* ProgramVacateAddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AC7208448E900C7D0AD /* ProgramVacateAddViewController.swift */; }; + AD122ACA2084498F00C7D0AD /* ProgramVacateAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD122AC92084498F00C7D0AD /* ProgramVacateAddView.swift */; }; AD198173207D9FB4009AB8B5 /* ProgramCheckViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */; }; AD198175207D9FC1009AB8B5 /* ProgramCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */; }; AD198177207D9FF5009AB8B5 /* ProgramVacateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */; }; @@ -200,6 +210,16 @@ 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = ""; }; A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AD122AB5208433BA00C7D0AD /* ProgramVacateDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateDetailViewController.swift; sourceTree = ""; }; + AD122AB7208436F100C7D0AD /* ProgramVacateDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateDetailView.swift; sourceTree = ""; }; + AD122AB920843AD700C7D0AD /* ProgramVacateDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateDetailCell.swift; sourceTree = ""; }; + AD122ABA20843AD700C7D0AD /* ProgramVacateDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateDetailCell.xib; sourceTree = ""; }; + AD122ABF20843FAE00C7D0AD /* ProgramVacateTextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateTextFieldCell.swift; sourceTree = ""; }; + AD122AC020843FAF00C7D0AD /* ProgramVacateTextFieldCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateTextFieldCell.xib; sourceTree = ""; }; + AD122AC3208442BC00C7D0AD /* ProgramVacateImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateImageCell.swift; sourceTree = ""; }; + AD122AC4208442BC00C7D0AD /* ProgramVacateImageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateImageCell.xib; sourceTree = ""; }; + AD122AC7208448E900C7D0AD /* ProgramVacateAddViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateAddViewController.swift; sourceTree = ""; }; + AD122AC92084498F00C7D0AD /* ProgramVacateAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateAddView.swift; sourceTree = ""; }; AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramCheckViewController.swift; sourceTree = ""; }; AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramCardViewController.swift; sourceTree = ""; }; AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateViewController.swift; sourceTree = ""; }; @@ -520,6 +540,57 @@ path = userCenter; sourceTree = ""; }; + AD122ABD20843E8A00C7D0AD /* ProgramView */ = { + isa = PBXGroup; + children = ( + AD122AC92084498F00C7D0AD /* ProgramVacateAddView.swift */, + AD122AB7208436F100C7D0AD /* ProgramVacateDetailView.swift */, + AD122AC3208442BC00C7D0AD /* ProgramVacateImageCell.swift */, + AD122AC4208442BC00C7D0AD /* ProgramVacateImageCell.xib */, + AD122ABF20843FAE00C7D0AD /* ProgramVacateTextFieldCell.swift */, + AD122AC020843FAF00C7D0AD /* ProgramVacateTextFieldCell.xib */, + AD122AB920843AD700C7D0AD /* ProgramVacateDetailCell.swift */, + AD122ABA20843AD700C7D0AD /* ProgramVacateDetailCell.xib */, + AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */, + AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */, + AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */, + AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */, + AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */, + AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */, + AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */, + AD5681CD2080449A0034A948 /* GrowCheckDownTableViewCell.xib */, + ); + path = ProgramView; + sourceTree = ""; + }; + AD122ABE20843EEC00C7D0AD /* ReportView */ = { + isa = PBXGroup; + children = ( + ADF159602069E00000A9485D /* CalendarView.swift */, + AD4BA4A820819AB000F83F13 /* ReportHeaderView.swift */, + AD4BA4AA20819CAD00F83F13 /* ReportHeaderCollectionViewCell.swift */, + AD4BA4AB20819CAD00F83F13 /* ReportHeaderCollectionViewCell.xib */, + ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */, + ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */, + AD65FB77206354220052415B /* MoralTableViewCell.swift */, + ADC9AB73207C64B300348EF1 /* MoralTableViewCell.xib */, + AD34D1192064C79D00989F8D /* MoralDetailCell.swift */, + ADC9AB79207C66A300348EF1 /* MoralDetailCell.xib */, + AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */, + ADC9AB7B207C66C300348EF1 /* EducationDetailCell.xib */, + AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */, + ADC9AB7D207C66DA00348EF1 /* BehaviorDetailCell.xib */, + AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */, + ADC9AB7F207C672800348EF1 /* SceneTopCell.xib */, + AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */, + ADC9AB81207C673300348EF1 /* SceneMiddleCell.xib */, + AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, + ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */, + ADAEA3992064C44900A47D2C /* LineChartView.swift */, + ); + path = ReportView; + sourceTree = ""; + }; ADC9AB70207C558600348EF1 /* Model */ = { isa = PBXGroup; children = ( @@ -544,6 +615,8 @@ AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */, AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */, AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */, + AD122AB5208433BA00C7D0AD /* ProgramVacateDetailViewController.swift */, + AD122AC7208448E900C7D0AD /* ProgramVacateAddViewController.swift */, ); path = Program; sourceTree = ""; @@ -590,35 +663,8 @@ BF3B829E2050CC7E002078EA /* View */ = { isa = PBXGroup; children = ( - ADF159602069E00000A9485D /* CalendarView.swift */, - AD4BA4A820819AB000F83F13 /* ReportHeaderView.swift */, - AD4BA4AA20819CAD00F83F13 /* ReportHeaderCollectionViewCell.swift */, - AD4BA4AB20819CAD00F83F13 /* ReportHeaderCollectionViewCell.xib */, - ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */, - ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */, - AD65FB77206354220052415B /* MoralTableViewCell.swift */, - ADC9AB73207C64B300348EF1 /* MoralTableViewCell.xib */, - AD34D1192064C79D00989F8D /* MoralDetailCell.swift */, - ADC9AB79207C66A300348EF1 /* MoralDetailCell.xib */, - AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */, - ADC9AB7B207C66C300348EF1 /* EducationDetailCell.xib */, - AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */, - ADC9AB7D207C66DA00348EF1 /* BehaviorDetailCell.xib */, - AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */, - ADC9AB7F207C672800348EF1 /* SceneTopCell.xib */, - AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */, - ADC9AB81207C673300348EF1 /* SceneMiddleCell.xib */, - AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, - ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */, - ADAEA3992064C44900A47D2C /* LineChartView.swift */, - AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */, - AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */, - AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */, - AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */, - AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */, - AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */, - AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */, - AD5681CD2080449A0034A948 /* GrowCheckDownTableViewCell.xib */, + AD122ABD20843E8A00C7D0AD /* ProgramView */, + AD122ABE20843EEC00C7D0AD /* ReportView */, ); path = View; sourceTree = ""; @@ -918,6 +964,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + AD122AC220843FAF00C7D0AD /* ProgramVacateTextFieldCell.xib in Resources */, BF67F3BF20590A2F002FDC61 /* Info-watchOS.plist in Resources */, 599364EB204E62E700C8B371 /* Information.storyboard in Resources */, BF7A4C87204E338500460463 /* Info.plist in Resources */, @@ -934,6 +981,7 @@ AD5681CF2080449A0034A948 /* GrowCheckDownTableViewCell.xib in Resources */, ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */, BFEAAAC8205257460072FAAF /* LXCalenderCell.xib in Resources */, + AD122ABC20843AD700C7D0AD /* ProgramVacateDetailCell.xib in Resources */, 599364F8204E648C00C8B371 /* ChannelCollectionViewCell.xib in Resources */, BFEAAAC3205257460072FAAF /* LXCalendarHearder.xib in Resources */, 59936501204E946300C8B371 /* UserCenter.storyboard in Resources */, @@ -949,6 +997,7 @@ AD64A2C5207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib in Resources */, BF7A4C84204E338500460463 /* Assets.xcassets in Resources */, BF7A4C85204E338500460463 /* LaunchScreen.storyboard in Resources */, + AD122AC6208442BC00C7D0AD /* ProgramVacateImageCell.xib in Resources */, ADC9AB82207C673300348EF1 /* SceneMiddleCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1043,6 +1092,7 @@ BFEAAAD620525D620072FAAF /* LxButton.m in Sources */, 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */, 5993652A2052553900C8B371 /* pinyin.c in Sources */, + AD122AB6208433BA00C7D0AD /* ProgramVacateDetailViewController.swift in Sources */, BFF9B7EF20577CD300F39B3E /* MyChildrenTableViewCell.swift in Sources */, 590944E22057DA73004478B5 /* utils.swift in Sources */, BFEAAAC9205257460072FAAF /* NSDate+GFCalendar.m in Sources */, @@ -1091,8 +1141,10 @@ BF38847E205CDE2D00A240EF /* JSViewController.swift in Sources */, ADE33B312062202300BEA6E6 /* Macro.swift in Sources */, ADF159612069E00000A9485D /* CalendarView.swift in Sources */, + AD122ACA2084498F00C7D0AD /* ProgramVacateAddView.swift in Sources */, BF406CD82057B529000A6681 /* MessageTableViewCell.swift in Sources */, 599364EC204E62E700C8B371 /* EvaluationViewController.swift in Sources */, + AD122ABB20843AD700C7D0AD /* ProgramVacateDetailCell.swift in Sources */, 599364F0204E62E700C8B371 /* ReportViewController.swift in Sources */, BF621CAE2056663C0040D2C1 /* LoginViewController.swift in Sources */, AD64A2C0207F289400B25E80 /* ProgramVacateTableViewCell.swift in Sources */, @@ -1116,11 +1168,15 @@ 59936527205231A500C8B371 /* BaseCityChooseSchoolViewController.swift in Sources */, 599364FB204E742000C8B371 /* ChannelSelectViewCollectionViewCell.swift in Sources */, AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */, + AD122AC8208448E900C7D0AD /* ProgramVacateAddViewController.swift in Sources */, + AD122AB8208436F100C7D0AD /* ProgramVacateDetailView.swift in Sources */, BFBC06C82063AE8900CCFAFF /* ZLaunchAdCache.swift in Sources */, BFF9B7F62057A4C900F39B3E /* ChildrenDetailViewController.swift in Sources */, 599364FF204E945600C8B371 /* BindingViewController.swift in Sources */, 590944E020579CFA004478B5 /* InvitationCodeVerificationViewController.swift in Sources */, + AD122AC120843FAF00C7D0AD /* ProgramVacateTextFieldCell.swift in Sources */, ADC9AB77207C65FC00348EF1 /* GrowSubjectCell.swift in Sources */, + AD122AC5208442BC00C7D0AD /* ProgramVacateImageCell.swift in Sources */, BFEAAAC5205257460072FAAF /* LXCalendarView.m in Sources */, BFEAAADA20525D620072FAAF /* UIView+LX_Frame.m in Sources */, BF406CDA2057BEB8000A6681 /* OrderDetailModel.swift in Sources */, diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 9bba17d..5131b06 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/ProgramVacateAddViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateAddViewController.swift new file mode 100644 index 0000000..d16fa1c --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateAddViewController.swift @@ -0,0 +1,36 @@ +// +// ProgramVacateAddViewController.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateAddViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + let addView = ProgramVacateAddView.init(frame: self.view.bounds) + self.view.addSubview(addView) + + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateDetailViewController.swift new file mode 100644 index 0000000..3c1e7b3 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateDetailViewController.swift @@ -0,0 +1,25 @@ +// +// ProgramVacateDetailViewController.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateDetailViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + let view = ProgramVacateDetailView.init(frame: self.view.bounds) + self.view.addSubview(view) + + } + + 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 bcf0532..7a1579a 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift @@ -29,6 +29,7 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV btn.backgroundColor = Theme.topBarColor() btn.layer.cornerRadius = 5 btn.clipsToBounds = true + btn.addTarget(self, action: #selector(addVacateAction), for: UIControlEvents.touchUpInside) return btn }() @@ -39,6 +40,15 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV var vacateRecodeArray = Array() + /// 请假页面 + @objc func addVacateAction(){ + print("申请请假!") + let vc = ProgramVacateAddViewController() + vc.title = "申请请假" + vc.view.backgroundColor = backGroundColor + self.navigationController?.pushViewController(vc, animated: true) + } + override func viewDidLoad() { super.viewDidLoad() self.view.backgroundColor = backGroundColor @@ -131,7 +141,11 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { if indexPath.section == 1 && indexPath.row != 0 && vacateRecodeArray.count>0 { - + print(indexPath.row) + let vc = ProgramVacateDetailViewController() + vc.view.backgroundColor = UIColor.white + vc.title = "请假详情" + self.navigationController?.pushViewController(vc, animated: true) } } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift deleted file mode 100644 index ab16d31..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// BehaviorDetailCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/23. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class BehaviorDetailCell: UITableViewCell { - - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/BehaviorDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib deleted file mode 100644 index d5e16be..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/CalendarView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/CalendarView.swift deleted file mode 100644 index 45f7c9b..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/CalendarView.swift +++ /dev/null @@ -1,99 +0,0 @@ -// -// CalendarView.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/27. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource { - - - var weekLab = ["日","一","二","三","四","五","六"] - var firstDay = Int() - var monthDay = Int() - var todayDay = Int() - - override init(frame: CGRect) { - super.init(frame: frame) - self.drawCalendarView(frame: frame) - } - - func drawCalendarView(frame:CGRect) { - - - self.firstDay = CalendarDateManager.shared.getFirstMonthDays() - self.monthDay = CalendarDateManager.shared.getCurrentMonthDay() - self.todayDay = CalendarDateManager.shared.getTodayDate() - //设置layout - let flowlayout = UICollectionViewFlowLayout() - flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40) - flowlayout.minimumLineSpacing = 0 - flowlayout.minimumInteritemSpacing = 0 - flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0) - flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0) - flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0) - - let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout) - calendarView.delegate = self - calendarView.dataSource = self - calendarView.backgroundColor = UIColor.white - calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell") - self.addSubview(calendarView) - } - - //MARK: - Delegate - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return weekLab.count + monthDay + firstDay - 1 - } - - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath) - let lab = UILabel.init(frame: cell.bounds) - - if indexPath.row < weekLab.count { - lab.text = weekLab[indexPath.row] - }else{ - // 超出这个月显示为空 - if indexPath.row+1 >= firstDay+7 && indexPath.row < monthDay+7+firstDay { - lab.text = "\(indexPath.row+1-firstDay-7+1)" - }else{ - lab.text = "" - } - } - // 设置日期颜色 - if indexPath.row+1 > todayDay+7+firstDay-1{ - lab.textColor = UIColor.gray - }else - if indexPath.row+1 == todayDay+7+firstDay-1 { - lab.textColor = UIColor.red - }else{ - lab.textColor = UIColor.black - } - - lab.textAlignment = .center - cell.addSubview(lab) - return cell - - } - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - if indexPath.row >= firstDay-1+7 && indexPath.row < todayDay+7+firstDay-1 { - print("点击了 ...\(indexPath.row+1-7-firstDay+1)号") - } - } - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - /* - // Only override draw() if you perform custom drawing. - // An empty implementation adversely affects performance during animation. - override func draw(_ rect: CGRect) { - // Drawing code - } - */ - -} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift deleted file mode 100644 index aede27c..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// EducationDetailCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/23. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class EducationDetailCell: UITableViewCell { - - @IBOutlet weak var lineChartView: UIView! - - var customLineChart = LineChartView() - - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - let rect = self.lineChartView.bounds - print(rect) - customLineChart = LineChartView.init(frame: rect) - customLineChart.drawUI(xLableArr: nil) - let arr1 = [4,4,2,1,3] - let arr2 = [2,1,4,4,5] - - customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190)) - customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16)) - - - - self.lineChartView.addSubview(customLineChart) - - - // 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/EducationDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib deleted file mode 100644 index 14adb86..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift deleted file mode 100644 index 796cddc..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// 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 - self.backgroundColor = backgroundColor - } - - 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 deleted file mode 100644 index 1f2a2c6..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift deleted file mode 100644 index bae915c..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// 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() - self.backgroundColor = backgroundColor - - // 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 deleted file mode 100644 index ec6a157..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift deleted file mode 100644 index 635ec73..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// GrowSubjectCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/4/10. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class GrowSubjectCell: UITableViewCell { - - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/GrowSubjectCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib deleted file mode 100644 index 5fb1895..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/LineChartView.swift deleted file mode 100644 index 18e4d6e..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/LineChartView.swift +++ /dev/null @@ -1,220 +0,0 @@ -// -// LineChartView.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/23. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class LineChartView: UIView { - - //默认横坐标 - private var xLabArr = ["行为","文明","课堂","作业","礼仪"] - //设置纵坐标 - private let yCount = 6 - //横坐标个数 - private let xCount = 5 - //最大绩点分数 - private let GPA = 5 - //储存横纵坐标,画线用 - private var xCenterArr = Array() - private var yCenterArr = Array() - //判断是否重复点击 - private var btnTouch = 10 - //虚线 - private let lineLayer = CAShapeLayer() - //横坐标下划线 - private let xMoveLayer = CAShapeLayer() - //纵坐标Lab数组 - private var yMoveLaArr = Array() - //折线图数据数组 - private var dateArr = Array>() - //显示的数字 - var yLabArray = Array() - - override init(frame: CGRect) { - super.init(frame: frame) - print("frame==\(frame)") - - } - func drawUI(xLableArr:Array?){ - - if xLableArr != nil { - xLabArr = xLableArr! - } - drawX() - drawY() - } - //设置纵坐标 - private func drawY() { - - let yHeight = (self.bounds.height-60)/CGFloat(yCount) - for index in 0..,color:UIColor){ - - let pointArr = swichPoint(arr: point) - - let drawLayer = DrawLayer() - drawLayer.xPointArr = xCenterArr - drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]] - drawLayer.bounds = self.bounds - drawLayer.position = self.center - drawLayer.lineColor = color - self.layer.addSublayer(drawLayer) - drawLayer.setNeedsDisplay() - - dateArr.append(point) - - } - //MARK: - 点击横坐标 - @objc func touchXAction(tap:UIButton){ - - let index = tap.tag - - - if btnTouch != index { - - //竖虚线 - lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor - lineLayer.lineWidth = 1 - let arr = [5,5] - lineLayer.lineDashPhase = 0 - lineLayer.lineDashPattern = arr as [NSNumber] - self.layer.addSublayer(lineLayer) - - //X轴下划线 - let movePath = CGMutablePath() - movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0])) - movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height-60)/CGFloat(yCount))) - lineLayer.path = movePath - - xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor - xMoveLayer.lineWidth = 2 - self.layer.addSublayer(xMoveLayer) - let movePath2 = CGMutablePath() - movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-45)) - movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45)) - xMoveLayer.path = movePath2 - - if yLabArray.count == dateArr.count { - for label in yLabArray { - label.removeFromSuperview() - } - } - yLabArray.removeAll() - //数字显示 - for i in 0..)->Array{ - var array = Array() - for index in 0..() - var xPointArr = Array() - var lineColor = UIColor() - - override func draw(in ctx: CGContext) { - - let context = ctx - //点 - context.setFillColor(lineColor.cgColor) - - for i in 0.. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift deleted file mode 100644 index ae1eaee..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// MoralTableViewCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/22. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class MoralTableViewCell: UITableViewCell { - - @IBOutlet weak var pointLab: UILabel! - @IBOutlet weak var todayReName: UILabel! - @IBOutlet weak var rankingLab: UILabel! - @IBOutlet weak var evaluateLab: UILabel! - @IBOutlet weak var rankStatusLab: UILabel! - @IBOutlet weak var reportDateLab: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/MoralTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib deleted file mode 100644 index 96e535f..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift deleted file mode 100644 index 9de7f44..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// ProgramVacateBodyTableViewCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/4/12. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class ProgramVacateBodyTableViewCell: UITableViewCell { - - @IBOutlet weak var upLine: UILabel! - @IBOutlet weak var vacateName: UILabel! - @IBOutlet weak var vacateType: UILabel! - @IBOutlet weak var startTime: UILabel! - @IBOutlet weak var endTime: UILabel! - @IBOutlet weak var examinePerson: UILabel! - @IBOutlet weak var vacateResult: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/ProgramVacateBodyTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib deleted file mode 100644 index 962e527..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift deleted file mode 100644 index 4bfce70..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// ProgramVacateTableViewCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/4/12. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class ProgramVacateTableViewCell: UITableViewCell { - - @IBOutlet weak var vacateName: UILabel! - @IBOutlet weak var startTime: UILabel! - @IBOutlet weak var endTime: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/ProgramVacateTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib deleted file mode 100644 index 102517d..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift new file mode 100644 index 0000000..796cddc --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.swift @@ -0,0 +1,28 @@ +// +// 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 + self.backgroundColor = backgroundColor + } + + 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/ProgramView/GrowCheckDownTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.xib new file mode 100644 index 0000000..1f2a2c6 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckDownTableViewCell.xib @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckUpTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckUpTableViewCell.swift new file mode 100644 index 0000000..bae915c --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckUpTableViewCell.swift @@ -0,0 +1,29 @@ +// +// 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() + self.backgroundColor = backgroundColor + + // 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/ProgramView/GrowCheckUpTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckUpTableViewCell.xib new file mode 100644 index 0000000..ec6a157 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/GrowCheckUpTableViewCell.xib @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift new file mode 100644 index 0000000..a3830e1 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift @@ -0,0 +1,22 @@ +// +// ProgramVacateAddView.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateAddView: UIView { + + override init(frame: CGRect) { + super.init(frame: frame) + } + + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift new file mode 100644 index 0000000..9de7f44 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.swift @@ -0,0 +1,33 @@ +// +// ProgramVacateBodyTableViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/12. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateBodyTableViewCell: UITableViewCell { + + @IBOutlet weak var upLine: UILabel! + @IBOutlet weak var vacateName: UILabel! + @IBOutlet weak var vacateType: UILabel! + @IBOutlet weak var startTime: UILabel! + @IBOutlet weak var endTime: UILabel! + @IBOutlet weak var examinePerson: UILabel! + @IBOutlet weak var vacateResult: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ProgramView/ProgramVacateBodyTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib new file mode 100644 index 0000000..962e527 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift new file mode 100644 index 0000000..a88a854 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift @@ -0,0 +1,26 @@ +// +// ProgramVacateDetailCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateDetailCell: UITableViewCell { + + @IBOutlet weak var titileLab: UILabel! + @IBOutlet weak var contentLab: 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/ProgramView/ProgramVacateDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib new file mode 100644 index 0000000..673bdc1 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift new file mode 100644 index 0000000..5295b37 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift @@ -0,0 +1,77 @@ +// +// ProgramVacateDetailView.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateDetailView: UIView,UITableViewDelegate,UITableViewDataSource { + + lazy var tableView = { ()-> UITableView in + + let table = UITableView.init(frame: self.bounds) + table.delegate = self + table.dataSource = self + table.register(UINib.init(nibName: "ProgramVacateDetailCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateDetailCell") + table.register(UINib.init(nibName: "ProgramVacateTextFieldCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateTextFieldCell") + table.register(UINib.init(nibName: "ProgramVacateImageCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateImageCell") + return table + }() + + //data + var dataArr = Array() + + + override init(frame: CGRect) { + super.init(frame: frame) + + self.dataArr = ["学生姓名:","班级:","请假场景:","请假类型:","请假时间:","返校时间:","离校原因:","照片:","审核人:","发起时间","审核情况:"] + + self.addSubview(self.tableView) + + } + + //MARK: - TableView Delegate && DataSource + func numberOfSections(in tableView: UITableView) -> Int { + return 1 + } + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return dataArr.count + } + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.row == 6 || indexPath.row == 7 { + return 100 + } + return 50 + } + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + + if indexPath.row != 6 && indexPath.row != 7 { + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateDetailCell", for: indexPath) as! ProgramVacateDetailCell + cell.titileLab.text = dataArr[indexPath.row] + cell.contentLab.text = "张三" + return cell + }else if indexPath.row == 6 { + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateTextFieldCell", for: indexPath) as! ProgramVacateTextFieldCell + cell.titleLab.text = dataArr[indexPath.row] + cell.textFieldView.text = "肚子痛" + return cell + }else if indexPath.row == 7 { + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateImageCell", for: indexPath) as! ProgramVacateImageCell + cell.titleLab.text = dataArr[indexPath.row] + return cell + } + return UITableViewCell.init() + + } + + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateImageCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateImageCell.swift new file mode 100644 index 0000000..d89990e --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateImageCell.swift @@ -0,0 +1,26 @@ +// +// ProgramVacateImageCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateImageCell: UITableViewCell { + + @IBOutlet weak var titleLab: UILabel! + @IBOutlet weak var imageShowView: 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/ProgramView/ProgramVacateImageCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateImageCell.xib new file mode 100644 index 0000000..dae5692 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateImageCell.xib @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift new file mode 100644 index 0000000..4bfce70 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.swift @@ -0,0 +1,28 @@ +// +// ProgramVacateTableViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/12. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateTableViewCell: UITableViewCell { + + @IBOutlet weak var vacateName: UILabel! + @IBOutlet weak var startTime: UILabel! + @IBOutlet weak var endTime: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ProgramView/ProgramVacateTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib new file mode 100644 index 0000000..102517d --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTextFieldCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTextFieldCell.swift new file mode 100644 index 0000000..43f9f31 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTextFieldCell.swift @@ -0,0 +1,26 @@ +// +// ProgramVacateTextFieldCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/16. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ProgramVacateTextFieldCell: UITableViewCell { + + @IBOutlet weak var titleLab: UILabel! + @IBOutlet weak var textFieldView: UITextView! + 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/ProgramView/ProgramVacateTextFieldCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTextFieldCell.xib new file mode 100644 index 0000000..933fd11 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTextFieldCell.xib @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.swift deleted file mode 100644 index cf352c2..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// ReportHeaderCollectionViewCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/4/14. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class ReportHeaderCollectionViewCell: UICollectionViewCell { - - @IBOutlet weak var weekLab: UILabel! - @IBOutlet weak var dataLab: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - } - func setCellData(index:IndexPath){ - if index.row%7 == 0 || index.row == 0 { - self.weekLab.text = "日" - } - if index.row == 1 || index.row%7 == 1 { - self.weekLab.text = "一" - } - if index.row == 2 || index.row%7 == 2 { - self.weekLab.text = "二" - } - if index.row == 3 || index.row%7 == 3 { - self.weekLab.text = "三" - } - if index.row == 4 || index.row%7 == 4 { - self.weekLab.text = "四" - } - if index.row == 5 || index.row%7 == 5 { - self.weekLab.text = "五" - } - if index.row == 6 || index.row%7 == 6 { - self.weekLab.text = "六" - } - } -} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.xib deleted file mode 100644 index 46c81f4..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderCollectionViewCell.xib +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.swift deleted file mode 100644 index fd4392c..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.swift +++ /dev/null @@ -1,142 +0,0 @@ -// -// ReportHeaderView.swift -// ParentAssistant -// -// Created by Cao yang on 2018/4/14. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class ReportHeaderView: UIView,UICollectionViewDelegate,UICollectionViewDataSource { - - lazy var collectionView = {()-> UICollectionView in - - let flowlayout = UICollectionViewFlowLayout() - flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:60) - flowlayout.minimumLineSpacing = 0 - flowlayout.minimumInteritemSpacing = 0 - flowlayout.scrollDirection = UICollectionViewScrollDirection.horizontal - flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0) - flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0) - flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0) - - let collect = UICollectionView.init(frame: CGRect.init(x: 0, y: 0, width: self.bounds.size.width, height: self.bounds.size.height), collectionViewLayout: flowlayout) - collect.delegate = self - collect.dataSource = self - collect.showsHorizontalScrollIndicator = true - collect.scrollsToTop = false - collect.showsVerticalScrollIndicator = false - collect.isPagingEnabled = true - collect.backgroundColor = UIColor.white - collect.register(UINib.init(nibName: "ReportHeaderCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "ReportHeaderCollectionViewCell") - return collect - }() - - //Data - - /// 展示 - var count = Int() - /// 当月1号 周几 - var firstDay = Int() - /// 当月天数 - var monthDays = Int() - /// 今天日期 - var todayDate = Int() - - override init(frame: CGRect) { - super.init(frame: frame) - self.addSubview(self.collectionView) - - self.count = CalendarDateManager.shared.getMonthDayCount()*7 - self.firstDay = CalendarDateManager.shared.getFirstMonthDays() - self.monthDays = CalendarDateManager.shared.getCurrentMonthDay() - self.todayDate = CalendarDateManager.shared.getTodayDate() - - //初始位置:显示本周 - collectionView.scrollToItem(at: [0,count-1], at: UICollectionViewScrollPosition.right, animated: true) - } - - //MARK: - Collection Delegate && DataSource - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return count - } - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ReportHeaderCollectionViewCell", for: indexPath) as! ReportHeaderCollectionViewCell - cell.setCellData(index: indexPath) - - // 超出这个月显示为空 - if indexPath.row+1 >= firstDay && indexPath.row <= monthDays { - cell.dataLab.text = "\(indexPath.row+1-firstDay+1)" - }else{ - cell.dataLab.text = "" - } - // 设置日期颜色 - if indexPath.row+1 > todayDate+firstDay-1{ - cell.dataLab.textColor = UIColor.gray - }else - if indexPath.row+1 == todayDate+firstDay-1 { - cell.dataLab.textColor = UIColor.red - }else{ - cell.dataLab.textColor = UIColor.black - } - return cell - } - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - if indexPath.row >= firstDay-1 && indexPath.row < todayDate+firstDay-1 { - print("点击了 ...\(indexPath.row+1-firstDay+1)号") - } - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } -} -class CalendarDateManager: NSObject { - - static let shared = CalendarDateManager() - - private var date = Date.init(timeInterval: 150*86400, since: Date()) -// private var date = Date() - override init() {} - - /// 获取当前周ofMonth - /// - /// - Returns: 第几周 - func getMonthDayCount() -> Int { - let comps = Calendar.current.dateComponents([.weekOfMonth], from: date) - return comps.weekOfMonth! - } - - /// 获取当前月第一天周几 - /// - /// - Returns: 月1号周几 - func getFirstMonthDays() -> Int{ - let comps = Calendar.current.dateComponents([.day], from: date) - let dayDate = comps.day!-1 - let firstDay = Date.init(timeInterval: TimeInterval(-dayDate*86400), since: date) - let firstMonth = Calendar.current.dateComponents([.weekday], from: firstDay) - return firstMonth.weekday! - } - - /// 获取当天 - /// - /// - Returns: 今天几号 - func getTodayDate() -> Int { - let comps = Calendar.current.dateComponents([.day], from: date) - return comps.day! - } - - /// 获取当月天数 - /// - /// - Returns: 天数 - func getCurrentMonthDay () ->Int{ - - let comps = Calendar.current.range(of: .day, in: .month, for: date) - return (comps?.count)! - } - -} - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift new file mode 100644 index 0000000..ab16d31 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.swift @@ -0,0 +1,26 @@ +// +// BehaviorDetailCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/23. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class BehaviorDetailCell: UITableViewCell { + + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ReportView/BehaviorDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.xib new file mode 100644 index 0000000..d5e16be --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/BehaviorDetailCell.xib @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift new file mode 100644 index 0000000..45f7c9b --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift @@ -0,0 +1,99 @@ +// +// CalendarView.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/27. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource { + + + var weekLab = ["日","一","二","三","四","五","六"] + var firstDay = Int() + var monthDay = Int() + var todayDay = Int() + + override init(frame: CGRect) { + super.init(frame: frame) + self.drawCalendarView(frame: frame) + } + + func drawCalendarView(frame:CGRect) { + + + self.firstDay = CalendarDateManager.shared.getFirstMonthDays() + self.monthDay = CalendarDateManager.shared.getCurrentMonthDay() + self.todayDay = CalendarDateManager.shared.getTodayDate() + //设置layout + let flowlayout = UICollectionViewFlowLayout() + flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40) + flowlayout.minimumLineSpacing = 0 + flowlayout.minimumInteritemSpacing = 0 + flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0) + flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0) + flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0) + + let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout) + calendarView.delegate = self + calendarView.dataSource = self + calendarView.backgroundColor = UIColor.white + calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell") + self.addSubview(calendarView) + } + + //MARK: - Delegate + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + return weekLab.count + monthDay + firstDay - 1 + } + + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath) + let lab = UILabel.init(frame: cell.bounds) + + if indexPath.row < weekLab.count { + lab.text = weekLab[indexPath.row] + }else{ + // 超出这个月显示为空 + if indexPath.row+1 >= firstDay+7 && indexPath.row < monthDay+7+firstDay { + lab.text = "\(indexPath.row+1-firstDay-7+1)" + }else{ + lab.text = "" + } + } + // 设置日期颜色 + if indexPath.row+1 > todayDay+7+firstDay-1{ + lab.textColor = UIColor.gray + }else + if indexPath.row+1 == todayDay+7+firstDay-1 { + lab.textColor = UIColor.red + }else{ + lab.textColor = UIColor.black + } + + lab.textAlignment = .center + cell.addSubview(lab) + return cell + + } + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + if indexPath.row >= firstDay-1+7 && indexPath.row < todayDay+7+firstDay-1 { + print("点击了 ...\(indexPath.row+1-7-firstDay+1)号") + } + } + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + /* + // Only override draw() if you perform custom drawing. + // An empty implementation adversely affects performance during animation. + override func draw(_ rect: CGRect) { + // Drawing code + } + */ + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift new file mode 100644 index 0000000..aede27c --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.swift @@ -0,0 +1,45 @@ +// +// EducationDetailCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/23. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class EducationDetailCell: UITableViewCell { + + @IBOutlet weak var lineChartView: UIView! + + var customLineChart = LineChartView() + + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + let rect = self.lineChartView.bounds + print(rect) + customLineChart = LineChartView.init(frame: rect) + customLineChart.drawUI(xLableArr: nil) + let arr1 = [4,4,2,1,3] + let arr2 = [2,1,4,4,5] + + customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190)) + customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16)) + + + + self.lineChartView.addSubview(customLineChart) + + + // 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/ReportView/EducationDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.xib new file mode 100644 index 0000000..14adb86 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/EducationDetailCell.xib @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift new file mode 100644 index 0000000..635ec73 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.swift @@ -0,0 +1,26 @@ +// +// GrowSubjectCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/10. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class GrowSubjectCell: UITableViewCell { + + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ReportView/GrowSubjectCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.xib new file mode 100644 index 0000000..5fb1895 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/GrowSubjectCell.xib @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift new file mode 100644 index 0000000..18e4d6e --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/LineChartView.swift @@ -0,0 +1,220 @@ +// +// LineChartView.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/23. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class LineChartView: UIView { + + //默认横坐标 + private var xLabArr = ["行为","文明","课堂","作业","礼仪"] + //设置纵坐标 + private let yCount = 6 + //横坐标个数 + private let xCount = 5 + //最大绩点分数 + private let GPA = 5 + //储存横纵坐标,画线用 + private var xCenterArr = Array() + private var yCenterArr = Array() + //判断是否重复点击 + private var btnTouch = 10 + //虚线 + private let lineLayer = CAShapeLayer() + //横坐标下划线 + private let xMoveLayer = CAShapeLayer() + //纵坐标Lab数组 + private var yMoveLaArr = Array() + //折线图数据数组 + private var dateArr = Array>() + //显示的数字 + var yLabArray = Array() + + override init(frame: CGRect) { + super.init(frame: frame) + print("frame==\(frame)") + + } + func drawUI(xLableArr:Array?){ + + if xLableArr != nil { + xLabArr = xLableArr! + } + drawX() + drawY() + } + //设置纵坐标 + private func drawY() { + + let yHeight = (self.bounds.height-60)/CGFloat(yCount) + for index in 0..,color:UIColor){ + + let pointArr = swichPoint(arr: point) + + let drawLayer = DrawLayer() + drawLayer.xPointArr = xCenterArr + drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]] + drawLayer.bounds = self.bounds + drawLayer.position = self.center + drawLayer.lineColor = color + self.layer.addSublayer(drawLayer) + drawLayer.setNeedsDisplay() + + dateArr.append(point) + + } + //MARK: - 点击横坐标 + @objc func touchXAction(tap:UIButton){ + + let index = tap.tag + + + if btnTouch != index { + + //竖虚线 + lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor + lineLayer.lineWidth = 1 + let arr = [5,5] + lineLayer.lineDashPhase = 0 + lineLayer.lineDashPattern = arr as [NSNumber] + self.layer.addSublayer(lineLayer) + + //X轴下划线 + let movePath = CGMutablePath() + movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0])) + movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height-60)/CGFloat(yCount))) + lineLayer.path = movePath + + xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor + xMoveLayer.lineWidth = 2 + self.layer.addSublayer(xMoveLayer) + let movePath2 = CGMutablePath() + movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-45)) + movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45)) + xMoveLayer.path = movePath2 + + if yLabArray.count == dateArr.count { + for label in yLabArray { + label.removeFromSuperview() + } + } + yLabArray.removeAll() + //数字显示 + for i in 0..)->Array{ + var array = Array() + for index in 0..() + var xPointArr = Array() + var lineColor = UIColor() + + override func draw(in ctx: CGContext) { + + let context = ctx + //点 + context.setFillColor(lineColor.cgColor) + + for i in 0.. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift new file mode 100644 index 0000000..ae1eaee --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.swift @@ -0,0 +1,32 @@ +// +// MoralTableViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/22. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class MoralTableViewCell: UITableViewCell { + + @IBOutlet weak var pointLab: UILabel! + @IBOutlet weak var todayReName: UILabel! + @IBOutlet weak var rankingLab: UILabel! + @IBOutlet weak var evaluateLab: UILabel! + @IBOutlet weak var rankStatusLab: UILabel! + @IBOutlet weak var reportDateLab: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ReportView/MoralTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.xib new file mode 100644 index 0000000..96e535f --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/MoralTableViewCell.xib @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.swift new file mode 100644 index 0000000..cf352c2 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.swift @@ -0,0 +1,42 @@ +// +// ReportHeaderCollectionViewCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/14. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ReportHeaderCollectionViewCell: UICollectionViewCell { + + @IBOutlet weak var weekLab: UILabel! + @IBOutlet weak var dataLab: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + func setCellData(index:IndexPath){ + if index.row%7 == 0 || index.row == 0 { + self.weekLab.text = "日" + } + if index.row == 1 || index.row%7 == 1 { + self.weekLab.text = "一" + } + if index.row == 2 || index.row%7 == 2 { + self.weekLab.text = "二" + } + if index.row == 3 || index.row%7 == 3 { + self.weekLab.text = "三" + } + if index.row == 4 || index.row%7 == 4 { + self.weekLab.text = "四" + } + if index.row == 5 || index.row%7 == 5 { + self.weekLab.text = "五" + } + if index.row == 6 || index.row%7 == 6 { + self.weekLab.text = "六" + } + } +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.xib new file mode 100644 index 0000000..46c81f4 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderCollectionViewCell.xib @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift new file mode 100644 index 0000000..fd4392c --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift @@ -0,0 +1,142 @@ +// +// ReportHeaderView.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/14. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class ReportHeaderView: UIView,UICollectionViewDelegate,UICollectionViewDataSource { + + lazy var collectionView = {()-> UICollectionView in + + let flowlayout = UICollectionViewFlowLayout() + flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:60) + flowlayout.minimumLineSpacing = 0 + flowlayout.minimumInteritemSpacing = 0 + flowlayout.scrollDirection = UICollectionViewScrollDirection.horizontal + flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0) + flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0) + flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0) + + let collect = UICollectionView.init(frame: CGRect.init(x: 0, y: 0, width: self.bounds.size.width, height: self.bounds.size.height), collectionViewLayout: flowlayout) + collect.delegate = self + collect.dataSource = self + collect.showsHorizontalScrollIndicator = true + collect.scrollsToTop = false + collect.showsVerticalScrollIndicator = false + collect.isPagingEnabled = true + collect.backgroundColor = UIColor.white + collect.register(UINib.init(nibName: "ReportHeaderCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "ReportHeaderCollectionViewCell") + return collect + }() + + //Data + + /// 展示 + var count = Int() + /// 当月1号 周几 + var firstDay = Int() + /// 当月天数 + var monthDays = Int() + /// 今天日期 + var todayDate = Int() + + override init(frame: CGRect) { + super.init(frame: frame) + self.addSubview(self.collectionView) + + self.count = CalendarDateManager.shared.getMonthDayCount()*7 + self.firstDay = CalendarDateManager.shared.getFirstMonthDays() + self.monthDays = CalendarDateManager.shared.getCurrentMonthDay() + self.todayDate = CalendarDateManager.shared.getTodayDate() + + //初始位置:显示本周 + collectionView.scrollToItem(at: [0,count-1], at: UICollectionViewScrollPosition.right, animated: true) + } + + //MARK: - Collection Delegate && DataSource + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + return count + } + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ReportHeaderCollectionViewCell", for: indexPath) as! ReportHeaderCollectionViewCell + cell.setCellData(index: indexPath) + + // 超出这个月显示为空 + if indexPath.row+1 >= firstDay && indexPath.row <= monthDays { + cell.dataLab.text = "\(indexPath.row+1-firstDay+1)" + }else{ + cell.dataLab.text = "" + } + // 设置日期颜色 + if indexPath.row+1 > todayDate+firstDay-1{ + cell.dataLab.textColor = UIColor.gray + }else + if indexPath.row+1 == todayDate+firstDay-1 { + cell.dataLab.textColor = UIColor.red + }else{ + cell.dataLab.textColor = UIColor.black + } + return cell + } + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + if indexPath.row >= firstDay-1 && indexPath.row < todayDate+firstDay-1 { + print("点击了 ...\(indexPath.row+1-firstDay+1)号") + } + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} +class CalendarDateManager: NSObject { + + static let shared = CalendarDateManager() + + private var date = Date.init(timeInterval: 150*86400, since: Date()) +// private var date = Date() + override init() {} + + /// 获取当前周ofMonth + /// + /// - Returns: 第几周 + func getMonthDayCount() -> Int { + let comps = Calendar.current.dateComponents([.weekOfMonth], from: date) + return comps.weekOfMonth! + } + + /// 获取当前月第一天周几 + /// + /// - Returns: 月1号周几 + func getFirstMonthDays() -> Int{ + let comps = Calendar.current.dateComponents([.day], from: date) + let dayDate = comps.day!-1 + let firstDay = Date.init(timeInterval: TimeInterval(-dayDate*86400), since: date) + let firstMonth = Calendar.current.dateComponents([.weekday], from: firstDay) + return firstMonth.weekday! + } + + /// 获取当天 + /// + /// - Returns: 今天几号 + func getTodayDate() -> Int { + let comps = Calendar.current.dateComponents([.day], from: date) + return comps.day! + } + + /// 获取当月天数 + /// + /// - Returns: 天数 + func getCurrentMonthDay () ->Int{ + + let comps = Calendar.current.range(of: .day, in: .month, for: date) + return (comps?.count)! + } + +} + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift new file mode 100644 index 0000000..86aabb6 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.swift @@ -0,0 +1,32 @@ +// +// SceneDownCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/24. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class SceneDownCell: UITableViewCell { + + @IBOutlet weak var evaluateLab: UILabel! + @IBOutlet weak var sceneLab: UILabel! + @IBOutlet weak var scoreLab: UILabel! + @IBOutlet weak var nameLab: UILabel! + @IBOutlet weak var classLab: UILabel! + @IBOutlet weak var dateLab: UILabel! + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ReportView/SceneDownCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.xib new file mode 100644 index 0000000..c9ee753 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneDownCell.xib @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift new file mode 100644 index 0000000..d88a946 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.swift @@ -0,0 +1,46 @@ +// +// SceneMiddleCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/24. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class SceneMiddleCell: UITableViewCell { + + @IBOutlet weak var lineChartView: UIView! + + var customLineChart = LineChartView() + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // Initialization code + let rect = self.lineChartView.bounds + customLineChart = LineChartView.init(frame: rect) + let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"] + + customLineChart.drawUI(xLableArr:customXLabArr) + + let arr1 = [5,4,5,5,5] + let arr2 = [4,4,2,1,3] + let arr3 = [3,3,4,3,4] + + + customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 129, G: 199, B: 132)) + customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 92, G: 145, B: 230)) + customLineChart.drawLine(point: arr3, color: UIColorWithRGB(R: 255, G: 213, B: 79)) + + self.lineChartView.addSubview(customLineChart) + + } + + 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/ReportView/SceneMiddleCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.xib new file mode 100644 index 0000000..4980a09 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneMiddleCell.xib @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift new file mode 100644 index 0000000..dcef1d5 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.swift @@ -0,0 +1,30 @@ +// +// SceneTopCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/24. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class SceneTopCell: UITableViewCell { + + @IBOutlet weak var scoreLab: UILabel! //得分 + @IBOutlet weak var GPALab: UILabel! //绩点 + @IBOutlet weak var LevelLab: UILabel! //等级 + @IBOutlet weak var SuggestLab: UITextView! //指导意见 + override func awakeFromNib() { + super.awakeFromNib() + self.backgroundColor = backgroundColor + + // 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/ReportView/SceneTopCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.xib new file mode 100644 index 0000000..b3d9a2d --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/SceneTopCell.xib @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift deleted file mode 100644 index 86aabb6..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// SceneDownCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/24. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class SceneDownCell: UITableViewCell { - - @IBOutlet weak var evaluateLab: UILabel! - @IBOutlet weak var sceneLab: UILabel! - @IBOutlet weak var scoreLab: UILabel! - @IBOutlet weak var nameLab: UILabel! - @IBOutlet weak var classLab: UILabel! - @IBOutlet weak var dateLab: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/SceneDownCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib deleted file mode 100644 index c9ee753..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift deleted file mode 100644 index d88a946..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift +++ /dev/null @@ -1,46 +0,0 @@ -// -// SceneMiddleCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/24. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class SceneMiddleCell: UITableViewCell { - - @IBOutlet weak var lineChartView: UIView! - - var customLineChart = LineChartView() - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // Initialization code - let rect = self.lineChartView.bounds - customLineChart = LineChartView.init(frame: rect) - let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"] - - customLineChart.drawUI(xLableArr:customXLabArr) - - let arr1 = [5,4,5,5,5] - let arr2 = [4,4,2,1,3] - let arr3 = [3,3,4,3,4] - - - customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 129, G: 199, B: 132)) - customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 92, G: 145, B: 230)) - customLineChart.drawLine(point: arr3, color: UIColorWithRGB(R: 255, G: 213, B: 79)) - - self.lineChartView.addSubview(customLineChart) - - } - - 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/SceneMiddleCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib deleted file mode 100644 index 4980a09..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift deleted file mode 100644 index dcef1d5..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// SceneTopCell.swift -// ParentAssistant -// -// Created by Cao yang on 2018/3/24. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit - -class SceneTopCell: UITableViewCell { - - @IBOutlet weak var scoreLab: UILabel! //得分 - @IBOutlet weak var GPALab: UILabel! //绩点 - @IBOutlet weak var LevelLab: UILabel! //等级 - @IBOutlet weak var SuggestLab: UITextView! //指导意见 - override func awakeFromNib() { - super.awakeFromNib() - self.backgroundColor = backgroundColor - - // 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/SceneTopCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib deleted file mode 100644 index b3d9a2d..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/Information.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/Information/Information.storyboard index 8bafa0a..b0ac96b 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/Information.storyboard +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/Information.storyboard @@ -1,11 +1,11 @@ - + - + @@ -134,7 +134,7 @@ - + diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index a8f9911..9e769f0 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -1038,7 +1038,7 @@ - + -- libgit2 0.21.0