Skip to content

Commit

Permalink
Still need to fix the bar chart label issue - checkout ChartsOrg/Char…
Browse files Browse the repository at this point in the history
  • Loading branch information
tagreene committed Oct 2, 2017
1 parent 4772ffe commit 729539e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
Binary file modified .DS_Store
Binary file not shown.
Binary file not shown.
37 changes: 36 additions & 1 deletion Daily/AnalyticsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,54 @@ import Charts

class AnalyticsViewController: UIViewController {
var completionChart: PieChartView!
var activityChart: BarChartView!

let pieChartDataLabels = ["Completed", "Missed"]
let pieChartCompletionData = [0.64, 0.36]

let barChartDataLabels = [Date.init(timeInterval: -604800, since: Date()), Date.init(timeInterval: -518400, since: Date()), Date.init(timeInterval: -345600, since: Date()), Date.init(timeInterval: -259200, since: Date()), Date.init(timeInterval: -172800, since: Date()), Date.init(timeInterval: -86400, since: Date()), Date()]
let barChartEntryCountData = [1, 1, 2, 3, 8, 2, 1]


let screenHeight = UIScreen.main.bounds.height
let screenWidth = UIScreen.main.bounds.width

override func viewDidLoad() {
super.viewDidLoad()
// set up charts here
setUpPieChart(labels: pieChartDataLabels, values: pieChartCompletionData)
setUpBarChart(dates: barChartDataLabels, entryCount: barChartEntryCountData)

view.backgroundColor = .lightGray
}

func setUpBarChart(dates: [Date], entryCount: [Int]) {
activityChart = BarChartView()
var dataEntries: [BarChartDataEntry] = []
var days: [String] = []

for i in 0..<entryCount.count {
let dataEntry = BarChartDataEntry(x: Double(i + 1), y: Double(entryCount[i]))
dataEntries.append(dataEntry)
}

for i in 0..<dates.count {
let date = dates[i]
let calendar = Calendar.current

let month = calendar.component(.month, from: date)
let day = calendar.component(.day, from: date)
let year = calendar.component(.year, from: date)


days.append("\(month)/\(day)/\(year)")
}

let barChartDataSet = BarChartDataSet(values: dataEntries, label: "Submission Count")
let barChartData = BarChartData()

}

func setUpPieChart(labels: [String], values: [Double]) {
completionChart = PieChartView()
var dataEntries: [PieChartDataEntry] = []
Expand All @@ -45,7 +80,7 @@ class AnalyticsViewController: UIViewController {
completionChart.drawHoleEnabled = false
completionChart.drawEntryLabelsEnabled = false
completionChart.isUserInteractionEnabled = false
view.addSubview(completionChart)
// view.addSubview(completionChart)

let heightConstraint = completionChart.heightAnchor.constraint(equalToConstant: screenHeight * 0.25)
let widthConstraint = completionChart.widthAnchor.constraint(equalToConstant: screenWidth * 0.5)
Expand Down

0 comments on commit 729539e

Please sign in to comment.