student_progress 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d9dea94b9cd8654f0adc44aee02f20d47c2960550c225cdca11b83c83485d03
-  data.tar.gz: d81aeaf2c9d5724ccb1f42ddc42b0c0fdd74716e734d580d9268c052b6f30ae0
+  metadata.gz: 429b3f920a6cba30aa9acc9f355dc9d9c68e1e2f1dc429b356645ccc0fcf4da3
+  data.tar.gz: 30097be3a7e0c598b58a52a04074499df3eeb49d243e099f8f04fc54de4d127c
 SHA512:
-  metadata.gz: c52570801505fd77e3d6a3be41d9496f9307a538e811daa56c9f60a330e391ae6ce4872e2bd001bb2b13478130d496347217de541390f9b63f0081863327474a
-  data.tar.gz: ee0dd4fc7f72210c1112405dc8f0d675236e04b7bf4637906c746e6a1cde7ed575cf38f86b3606289c6715679e0da681e599fdc93e6304a10eec957712cabf3e
+  metadata.gz: 46dd020fb09416d02df9a3d5ad11b92a8677da10a60a0d72d8f8173eb86f7b75268cbf8116344ae62977b12310d535b567136bbf467ced87d4161690a527b020
+  data.tar.gz: 65f7b13ade40d3a4ef3d4b159e34ed3efda6790162c8bea7a20c78f3859201e96a919bac16a04f9b6046dd784d2e063946d72d56141c74c4f91a1d18ab4733e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    student_progress (0.1.2)
+    student_progress (0.2.0)
       json
       nokogiri
       poltergeist
@@ -40,7 +40,7 @@ GEM
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (10.5.0)
     rspec (3.7.0)

data/lib/student_progress.rb

@@ -64,6 +64,29 @@ unless DB.table_exists? :students
   end
 end
 
+unless DB.table_exists? :completed_lessons 
+  DB.create_table :completed_lessons do
+    primary_key :id
+    Integer :lesson_id
+  end
+end
+
+unless DB[:completed_lessons].columns.include?(:date)
+  DB.add_column :completed_lessons, :date, :date
+end
+
+unless DB[:cohorts].columns.include?(:periscope_url)
+  DB.add_column :cohorts, :periscope_url, :string
+end
+
+unless DB[:completed_lessons].columns.include?(:student_id)
+  DB.add_column :completed_lessons, :student_id, :integer
+end
+
+unless DB[:student_reports].columns.include?(:current_topic_status)
+  DB.add_column :student_reports, :current_topic_status, :string
+end
+
 require_relative "./student_progress/version"
 require_relative "./student_progress/cli"
 require_relative "./student_progress/student"
@@ -74,6 +97,8 @@ require_relative "./student_progress/topic"
 require_relative "./student_progress/unit"
 require_relative "./student_progress/student_report"
 require_relative "./student_progress/progress_report"
+require_relative "./student_progress/progress_importer"
+require_relative "./student_progress/completed_lesson"
 
 
 # module StudentProgress

data/lib/student_progress/cli.rb

@@ -1,7 +1,7 @@
 class StudentProgress::CLI
   def call
     puts "Hello from CLI"
-    prompt_for_login
+    prompt_for_login 
     StudentProgress::Scraper.scrape_lessons
     main_menu
     goodbye
@@ -14,7 +14,10 @@ class StudentProgress::CLI
     puts "\n"
     print "Password: "
     password = STDIN.noecho(&:gets).chomp
-    StudentProgress::Scraper.login_user(email, password)
+    unless StudentProgress::Scraper.login_user(email, password)
+      prompt_for_login
+    end
+    true
   end
 
   def main_menu
@@ -48,7 +51,7 @@ class StudentProgress::CLI
 
   def list_choices
     puts "Choose an option below by number"
-    puts "1. Select Cohort"
+    puts "1. Manage Cohorts"
     puts "2. Add Cohort"
     puts "3. Set goal for the week"
     puts "4. To view a list of past reports"
@@ -72,11 +75,86 @@ class StudentProgress::CLI
         puts "Whoops! Didn't understand that input"
       end
     end
-    display_students
+    show_options_for_cohort
+  end
+
+  def show_options_for_cohort
+    puts "What would you like to do with the cohort?"
+    puts "1. Create Progress Report"
+    puts "2. Add a member(s) to the cohort"
+    puts "3. Remove a member from the cohort"
+    puts "4. Add a periscope URL to scrape progress from"
+    puts "5. Delete this cohort"
+    puts "type 'back' to return to the main menu or 'exit' to exit the CLI"
+    @input = gets.strip.downcase
+    return if ["back", "exit"].include?(@input)
+    case @input.to_i 
+    when 1
+      display_students
+    when 2 
+      add_students_to_cohort_view
+    when 3
+      remove_students_from_cohort_view
+    when 4
+      add_periscope_link_for_cohort_data
+    when 5
+      delete_this_cohort_view
+    else
+      puts "Whoops! didn't understand that input"
+      show_options_for_cohort
+    end
+  end
+
+  def add_students_to_cohort_view
+    puts "Enter the github usernames of the students you'd like to add as a comma separated list"
+    @input = gets.strip
+    return if ["back", "exit"].include?(@input.downcase)
+    usernames = @input.chomp.split(',').map(&:strip)
+    @selected_cohort.add_students(usernames)
+    puts "Just added #{usernames.count} students to your cohort"
+    puts "#{@selected_cohort.name} now has #{@selected_cohort.students.count} students"
+    show_options_for_cohort
   end
 
-  def prompt_for_cohort_by_number
+  def remove_students_from_cohort_view 
+    puts "Enter the github usernames of the students you'd like to remove as a comma separated list"
+    puts "Current usernames:"
+    puts @selected_cohort.students.collect{|s| s.github_username}.join(', ')
+    @input = gets.strip
+    return if ["back", "exit"].include?(@input.downcase)
+    usernames = @input.chomp.split(',').map(&:strip)
+    removed = @selected_cohort.remove_students(usernames)
+    puts "Just removed #{removed} students from the cohort"
+    puts "#{@selected_cohort.name} now has #{@selected_cohort.students.count} students"
+    show_options_for_cohort
+  end
+
+  def add_periscope_link_for_cohort_data
+    puts "Paste in the link to the periscope doc you'd like to use to import Cohort progress"
+    @input = gets.strip
+    @selected_cohort.periscope_url = @input
+    @selected_cohort.save
+    puts "Successfully added the periscope url to #{@selected_cohort.name}"
+  end
 
+  def delete_this_cohort_view 
+    puts "Are you sure you want to delete the #{@selected_cohort.name} cohort?"
+    puts "type 'yes' to confirm or 'no' to go back to the cohort menu"
+    puts "You can also type 'back' to return to the main menu, or 'exit' to exit the CLI"
+    @input = gets.strip
+    return if ["back", "exit"].include?(@input.downcase)
+    case @input.downcase 
+    when 'yes'
+      @selected_cohort.delete_and_unassign_students
+      @selected_cohort = nil
+      puts "cohort successfully deleted"
+      list_choices
+    when 'no'
+      show_options_for_cohort
+    else
+      puts "Whoops! Didn't understand that."
+      delete_this_cohort_view
+    end
   end
 
   def prompt_for_cohort_name
@@ -88,7 +166,7 @@ class StudentProgress::CLI
 
   def prompt_for_usernames
     puts "Please enter the GitHub usernames for the students you'd like info about (separated by commas)"
-    usernames = gets.chomp.split(',').map(&:strip)
+    usernames = gets.chomp.split(',').map(&:strip).map(&:downcase)
     puts "Hang on a sec, adding #{usernames.count} students"
     @new_cohort.add_students(usernames)
     puts "All done!"
@@ -139,10 +217,11 @@ class StudentProgress::CLI
       output << "Students should #{@goal[:goal]} by the end of the week"
       output << "To do that, they'll have completed #{@goal[:lessons]} lessons and #{@goal[:labs]} labs"
     end
-    headers = ['Student Name', 'Current Lab', 'Lessons', 'Labs']
+    headers = ['Student Name', 'Current Lab', 'Current Topic', 'Lessons', 'Labs']
     report = @selected_cohort.progress_reports.last
     rows = report.student_reports.collect.with_index(1) do |student_report|
-      [student_report.student_name, student_report.current_lab, student_report.lessons_complete, student_report.labs_complete]
+      student_report.generate_current_topic_status
+      [student_report.student_name, student_report.current_lab, student_report.current_topic_status, student_report.lessons_complete, student_report.labs_complete]
     end
     table = Terminal::Table.new headings: headers, rows: rows
     output << table

data/lib/student_progress/cohort.rb

@@ -3,10 +3,34 @@ class StudentProgress::Cohort < Sequel::Model
   one_to_many :progress_reports
   def add_students(usernames)
     usernames.each do |username|
-      student = StudentProgress::Student.find_or_create(github_username: username)
-      student.cohort_id = self.id
+      student = StudentProgress::Student.find_or_create(github_username: username.downcase)
+      self.add_student(student)
       student.save
     end
+    self.save
+  end
+
+  def remove_students(usernames)
+    removed = 0
+    usernames.each do |username|
+      student = self.students_dataset.first(github_username: username.downcase)
+      if student
+        self.remove_student(student)
+        removed += 1
+      else
+        puts "Student with github username: #{username} not found."
+      end
+    end
+    self.save
+    removed
+  end
+
+  def delete_and_unassign_students
+    students.each do |student|
+      student.cohort_id = nil
+      student.save
+    end
+    self.delete
   end
 
   def run_progress_report

data/lib/student_progress/completed_lesson.rb

@@ -0,0 +1,3 @@
+class StudentProgress::CompletedLesson < Sequel::Model 
+  many_to_one :student
+end

data/lib/student_progress/lesson.rb

@@ -53,6 +53,12 @@ class StudentProgress::Lesson
     lesson ? lesson.unit.title : "couldn't find that lesson"
   end
 
+  def self.topic_from_lesson_title(lesson_title)
+    lesson = @@all.find{ |l| l.title.strip == lesson_title.strip}
+    binding.pry unless lesson
+    lesson ? lesson.unit.topic : "couldn't find that lesson"
+  end
+
   def self.progress_when_unit_complete(unit_title)
     lessons = 0
     labs = 0

data/lib/student_progress/progress_importer.rb

@@ -0,0 +1,42 @@
+class StudentProgress::ProgressImporter 
+  require 'csv'
+  require 'open-uri'
+
+  def self.import(url)
+    options  = { headers: true, header_converters: :symbol }
+
+    
+    csv_file = open(url)
+    content  = File.new(csv_file)
+    CSV.foreach(content, options, &method(:create_and_associate_progress))
+
+    nil
+  end
+
+  def self.create_and_associate_progress(row)
+    # Example Row:
+    #<CSV::Row 
+    #   first_name:"Brennan" 
+    #   last_name:"Fulmer" 
+    #   deprecated_github_username:"BrennanFulmer" 
+    #   curriculum_id:"31648" 
+    #   completed_at:"2018-07-26 19:12:46.353279" 
+    #   track_id:"31303" 
+    #   title:"Rails Static Request"
+    # >
+    student = StudentProgress::Student.first(github_username: row[:deprecated_github_username].downcase)
+    lesson = StudentProgress::Lesson.find_by_id(row[:curriculum_id].to_i)
+    if student && lesson
+      if completed = StudentProgress::CompletedLesson.first(student_id: student.id, lesson_id: lesson.id)
+        return 
+      else
+        completed = StudentProgress::CompletedLesson.create(student_id: student.id, lesson_id: lesson.id)
+        completed.date = row[:completed_at]
+        completed.save
+      end
+    else
+      binding.pry
+    end
+
+  end
+end

data/lib/student_progress/progress_report.rb

@@ -1,5 +1,6 @@
 class StudentProgress::ProgressReport < Sequel::Model
   one_to_many :student_reports
+  many_to_one :cohort
 
   def on_track(labs_goal, cohort=nil)
     result = {}
@@ -14,4 +15,10 @@ class StudentProgress::ProgressReport < Sequel::Model
     end
     result
   end
+
+  def import_progress_from_periscope
+    if self.cohort.periscope_url 
+      StudentProgress::ProgressImporter.import(self.cohort.periscope_url)
+    end
+  end
 end

data/lib/student_progress/scraper.rb

@@ -9,7 +9,7 @@ class StudentProgress::Scraper
     end.each.with_index(1) do |username, index|
       @@session.visit("https://learn.co/#{username}")
       student = StudentProgress::Student.find_or_create(
-        github_username: username
+        github_username: username.downcase
       )
       student.first_name = @@session.first('.media-block__content--fill').text.split("\n").first.split(' ').first
       student.last_name = @@session.first('.media-block__content--fill').text.split("\n").first.split(' ').slice(1)
@@ -22,9 +22,11 @@ class StudentProgress::Scraper
         student_id: student.id,
         progress_report_id: report.id
       )
-          
       print "#{index}.."
     end
+    if cohort.periscope_url
+      StudentProgress::ProgressImporter.import(cohort.periscope_url)
+    end
     puts "Done!"
   end
 
@@ -37,6 +39,13 @@ class StudentProgress::Scraper
     puts "Signing in now..."
     sleep 0.5
     @@session.click_button "Sign in"
+    if @@session.current_path == "/account_check/failure" || @@session.current_path == "/"
+      puts "Invalid email or password"
+      puts "\n"
+      false
+    else 
+      true
+    end
   end
 
   def self.scrape_lessons

data/lib/student_progress/student.rb

@@ -1,6 +1,7 @@
 class StudentProgress::Student < Sequel::Model
   many_to_one :cohort
   one_to_many :student_reports
+  one_to_many :completed_lessons
                 
   def current_lab
     student_reports.last.current_lab

data/lib/student_progress/student_report.rb

@@ -5,4 +5,14 @@ class StudentProgress::StudentReport < Sequel::Model
   def student_name
     self.student && self.student.full_name
   end
+
+  def generate_current_topic_status
+    topic = StudentProgress::Lesson.topic_from_lesson_title(student.current_lab)
+    ratio = (topic.lessons.map(&:id) & student.completed_lessons.map(&:lesson_id)).length/topic.lessons.count.to_f
+    percent = (ratio*100).round(2)
+    status = student.cohort.periscope_url ? "#{topic.title}: #{percent}% complete" : "to track this, add perisocpe url to cohort"
+    self.current_topic_status = status
+    self.save
+    status
+  end
 end 

data/lib/student_progress/version.rb

@@ -1,3 +1,3 @@
 module StudentProgress
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: student_progress
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dakota Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,7 +187,9 @@ files:
 - lib/student_progress.rb
 - lib/student_progress/cli.rb
 - lib/student_progress/cohort.rb
+- lib/student_progress/completed_lesson.rb
 - lib/student_progress/lesson.rb
+- lib/student_progress/progress_importer.rb
 - lib/student_progress/progress_report.rb
 - lib/student_progress/scraper.rb
 - lib/student_progress/student.rb