DTT

Gemfile.lock

@@ -57,15 +57,12 @@ GEM
       builder
       mime-types
       xml-simple
-    aws-sdk (2.0.29)
-      aws-sdk-resources (= 2.0.29)
-    aws-sdk-core (2.0.29)
-      builder (~> 3.0)
+    aws-sdk (2.1.2)
+      aws-sdk-resources (= 2.1.2)
+    aws-sdk-core (2.1.2)
       jmespath (~> 1.0)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-    aws-sdk-resources (2.0.29)
-      aws-sdk-core (= 2.0.29)
+    aws-sdk-resources (2.1.2)
+      aws-sdk-core (= 2.1.2)
     bcrypt (3.1.7)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
@@ -218,7 +215,7 @@ GEM
       powerbar
     mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.1)
     multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

Rakefile

@@ -156,14 +156,14 @@ namespace :build do
         begin
           RakeUtils.rake 'db:migrate'
         rescue => e
-          HipChat.log "/quote #{e.message} #{e.backtrace.join("\n")}", message_format: 'text'
+          HipChat.log "/quote #{e.message} #{CDO.backtrace e}", message_format: 'text'
         end
 
         HipChat.log 'Seeding <b>pegasus</b>...'
         begin
           RakeUtils.rake 'seed:migrate'
         rescue => e
-          HipChat.log "/quote #{e.message} #{e.backtrace.join("\n")}", message_format: 'text'
+          HipChat.log "/quote #{e.message} #{CDO.backtrace e}", message_format: 'text'
         end
       end
 

apps/src/applab/applab.js

@@ -691,6 +691,34 @@ Applab.init = function(config) {
       dom.addClickTouchEvent(viewDataButton, throttledViewDataClick);
     }
 
+    // Prevent the backspace key from navigating back. Make sure it's still
+    // allowed on other elements.
+    // Based on http://stackoverflow.com/a/2768256/2506748
+    $(document).on('keydown', function (event) {
+      var doPrevent = false;
+      if (event.keyCode !== KeyCodes.BACKSPACE) {
+        return;
+      }
+      var d = event.srcElement || event.target;
+      if ((d.tagName.toUpperCase() === 'INPUT' && (
+          d.type.toUpperCase() === 'TEXT' ||
+          d.type.toUpperCase() === 'PASSWORD' ||
+          d.type.toUpperCase() === 'FILE' ||
+          d.type.toUpperCase() === 'EMAIL' ||
+          d.type.toUpperCase() === 'SEARCH' ||
+          d.type.toUpperCase() === 'DATE' )) ||
+          d.tagName.toUpperCase() === 'TEXTAREA') {
+        doPrevent = d.readOnly || d.disabled;
+      }
+      else {
+        doPrevent = !d.isContentEditable;
+      }
+
+      if (doPrevent) {
+        event.preventDefault();
+      }
+    });
+
     designMode.addKeyboardHandlers();
 
     designMode.renderDesignWorkspace();

apps/src/applab/designElements/button.jsx

@@ -99,5 +99,11 @@ module.exports = {
     element.style.backgroundColor = '#1abc9c';
 
     return element;
+  },
+  onDeserialize: function (element, onPropertyChange) {
+    var url = element.getAttribute('data-canonical-image-url');
+    if (url) {
+      onPropertyChange(element, 'image', url);
+    }
   }
 };

apps/src/applab/designElements/elementUtils.js

@@ -9,8 +9,3 @@ module.exports.rgb2hex = function (rgb) {
   }
   return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
 };
-
-module.exports.extractImageUrl = function (str) {
-  var inner = str.match(/^url\((.*)\)$/);
-  return inner ? inner[1] : str;
-};

apps/src/applab/designElements/image.jsx

@@ -80,5 +80,11 @@ module.exports = {
     element.setAttribute('src', '');
 
     return element;
+  },
+  onDeserialize: function (element, onPropertyChange) {
+    var url = element.getAttribute('data-canonical-image-url');
+    if (url) {
+      onPropertyChange(element, 'picture', url);
+    }
   }
 };

apps/src/applab/designElements/library.js

@@ -142,10 +142,10 @@ module.exports = {
    * Code to be called after deserializing element, allowing us to attach any
    * necessary event handlers.
    */
-  onDeserialize: function (element) {
+  onDeserialize: function (element, onPropertyChange) {
     var elementType = this.getElementType(element);
-    if (elements[elementType].onDeserialize) {
-      elements[elementType].onDeserialize(element);
+    if (elements[elementType] && elements[elementType].onDeserialize) {
+      elements[elementType].onDeserialize(element, onPropertyChange);
     }
   },
 

apps/src/applab/designElements/screen.jsx

@@ -53,5 +53,11 @@ module.exports = {
     element.style.zIndex = 0;
 
     return element;
+  },
+  onDeserialize: function (element, onPropertyChange) {
+    var url = element.getAttribute('data-canonical-image-url');
+    if (url) {
+      onPropertyChange(element, 'screen-image', url);
+    }
   }
 };

apps/src/applab/designMode.js

@@ -394,7 +394,10 @@ designMode.parseFromLevelHtml = function(rootEl, allowDragging) {
   }
 
   children.each(function () {
-    elementLibrary.onDeserialize($(this)[0]);
+    elementLibrary.onDeserialize($(this)[0], designMode.onPropertyChange.bind(this));
+  });
+  children.children().each(function() {
+    elementLibrary.onDeserialize($(this)[0], designMode.onPropertyChange.bind(this));
   });
 };
 

apps/src/constants.js

@@ -66,6 +66,7 @@ exports.BeeTerminationValue = {
 };
 
 exports.KeyCodes = {
+  BACKSPACE: 8,
   ENTER: 13,
   SPACE: 32,
   LEFT: 37,

bin/analyze_hoc_activity

@@ -21,12 +21,16 @@ def add_count_to_hash(hash, key, count)
 end
 
 def analyze_day_fast(date)
+  day = date.strftime('%Y-%m-%d')
+  next_day = (date + 1).strftime('%Y-%m-%d')
   froms = [
-    "FROM hoc_activity WHERE started_at LIKE '#{date.strftime('%Y-%m-%d')} %' OR pixel_started_at LIKE '#{date.strftime('%Y-%m-%d')} %'",
+    "FROM hoc_activity WHERE (started_at >= '#{day}' AND started_at < '#{next_day}')" +
+      " OR (pixel_started_at >= '#{day}' AND pixel_started_at < '#{next_day}')",
   ]
 
   finished_froms = [
-    "FROM hoc_activity WHERE finished_at LIKE '#{date.strftime('%Y-%m-%d')} %' OR pixel_finished_at LIKE '#{date.strftime('%Y-%m-%d')} %'",
+    "FROM hoc_activity WHERE (finished_at >= '#{day}' AND finished_at < '#{next_day}')" +
+      " OR (pixel_finished_at >= '#{day}' AND pixel_finished_at < '#{next_day}')",
   ]
 
   #HipChat.log "Analyzing by <b>tutorial</b>..." if rack_env?(:production)
@@ -153,7 +157,7 @@ def main()
   }
 
   #HipChat.log 'Calculating lines of code...' if rack_env?(:production)
-  lines_of_code = rack_env?(:production) ? `#{deploy_dir('bin','count-lines-of-code-from-milestone-logs')}`.to_i : 0
+  lines_of_code = rack_env?(:production) ? `#{deploy_dir('bin','count-lines-of-code-from-milestone-logs_v2')}`.to_i : 0
 
   time = DateTime.now
   Properties.set :metrics, {

bin/count-lines-of-code-from-milestone-logs_v2

@@ -3,4 +3,4 @@
 require_relative '../deployment'
 require 'cdo/analytics/milestone_parser'
 
-puts "Total Lines of Code: #{MilestoneParser::count}"
+puts MilestoneParser::count

dashboard/app/models/user.rb

@@ -581,6 +581,15 @@ def reset_secret_words
     save!
   end
 
+  def completed?(script)
+    user_script = user_scripts.where(script_id: script.id).first
+    user_script.try(:completed_at) || (user_script && next_unpassed_progression_level(script).nil?)
+  end
+
+  def working_on?(script)
+    working_on_scripts.include?(script)
+  end
+
   def working_on_scripts
     backfill_user_scripts if needs_to_backfill_user_scripts?
 

dashboard/app/views/home/index.html.haml

@@ -25,7 +25,9 @@
   - if current_user
     #user_hero
       = render template: 'api/user_hero'
-    - [current_user.working_on_user_scripts, current_user.completed_user_scripts].compact.reduce([], :|).each_slice(2) do |course_pair|
+    - advertised_scripts = [Script::HOC_NAME, Script::FROZEN_NAME, Script::INFINITY_NAME, Script::FLAPPY_NAME, Script::PLAYLAB_NAME, Script::ARTIST_NAME, Script::COURSE1_NAME, Script::COURSE2_NAME, Script::COURSE3_NAME, Script::COURSE4_NAME, Script::TWENTY_HOUR_NAME]
+    - unadvertised_user_scripts = [current_user.working_on_user_scripts, current_user.completed_user_scripts].compact.flatten.delete_if { |user_script| user_script.script.name.in?(advertised_scripts)}
+    - unadvertised_user_scripts.each_slice(2) do |course_pair|
       .row
         - course_pair.each do |user_script|
           = render partial: 'shared/course_progress_block', locals: { script: user_script.script, user_script: user_script }

dashboard/app/views/layouts/_analytics.html.haml

@@ -1,13 +1,14 @@
 - create_params = {cookieDomain: (Rails.env.development? ? 'none' : 'auto')}
 -# The following dimensions must match in order the custom dimension settings in our Google Analytics account.
-- selected_language_dim, age_dim, gender_dim, user_type_dim, env_dim, pixel_ratio = (1..6).map{|x|"dimension#{x}"}
+- selected_language_dim, age_dim, gender_dim, user_type_dim, env_dim, pixel_ratio, has_teacher = (1..7).map{|x|"dimension#{x}"}
 - dimensions = {}
 - dimensions[selected_language_dim] = language if (accepted_languages.present? && accepted_languages.first != language)
 - dimensions[env_dim] = Rails.env
 - if user_signed_in?
-  - dimensions[age_dim] = current_user.age
+  - dimensions[age_dim] = current_user.age.to_s
   - dimensions[gender_dim] = current_user.gender
   - dimensions[user_type_dim] = current_user.user_type
+  - dimensions[has_teacher] = current_user.teachers.any? ? '1' : '0'
   - create_params[:userId] = "#{current_user.id}#{'-dev' unless Rails.env.production?}"
 :javascript
   // Google Analytics snippet (https://developers.google.com/analytics/devguides/collection/analyticsjs/)
@@ -20,7 +21,7 @@
 
   var dimensions = #{dimensions.to_json};
   if ('devicePixelRatio' in window) {
-    dimensions["#{pixel_ratio}"] = window.devicePixelRatio;
+    dimensions["#{pixel_ratio}"] = window.devicePixelRatio.toString();
   }
 
   ga('set', dimensions);

dashboard/app/views/shared/_course_progress_block.html.haml

@@ -1,20 +1,17 @@
 - user_script ||= nil
 .course_progress{style: 'float: left; position: relative;'}
-  - unless script.name.in?([Script::HOC_NAME, Script::FROZEN_NAME, Script::INFINITY_NAME, Script::FLAPPY_NAME, Script::PLAYLAB_NAME, Script::ARTIST_NAME, Script::COURSE1_NAME, Script::COURSE2_NAME, Script::COURSE3_NAME, Script::COURSE4_NAME, Script::TWENTY_HOUR_NAME])
-    .courseblock-span3.courseblock-wide-small{style: 'width: 460px; height: 110px;'}
-      =link_to script_url(script.id) do
-        .heading
-          %h3= data_t_suffix('script.name', script.name, 'title')
-        .clear
-        .smalltext= data_t_suffix('script.name', script.name, 'description')
-        .clear
-        - next_unpassed_progression_level = current_user.next_unpassed_progression_level(script)
-        - if user_script.try(:completed_at) || (user_script && next_unpassed_progression_level.nil?)
-          %a{href: script_certificate_image_url(current_user, script)}
-            .bottombar.smalltext.printcertificate{style: 'bottom: 0; position: absolute'}= t('home.print_certificate')
-        - elsif next_unpassed_progression_level
-          %a{href: build_script_level_url(next_unpassed_progression_level)}
-            .bottombar.smalltext.continue{style: 'bottom: 0; position: absolute'}= t('continue')
-        - else
-          = link_to build_script_level_url(current_user.next_unpassed_progression_level(script)) do
-            .bottombar.smalltext.trynow{style: 'bottom: 0; position: absolute'}= t('home.trynow') 
+  .courseblock-span3.courseblock-wide-small{style: 'width: 460px; height: 120px;'}
+    =link_to script_url(script.id) do
+      %h3= data_t_suffix('script.name', script.name, 'title')
+      .clear
+      .smalltext= data_t_suffix('script.name', script.name, 'description_short')
+      .clear
+    - if current_user.completed?(script)
+      %a{href: script_certificate_image_url(current_user, script)}
+        .bottombar.bottombartext.printcertificate{style: 'bottom: 0; position: absolute'}= t('home.print_certificate')
+    - elsif current_user.working_on?(script)
+      %a{href: build_script_level_url(current_user.next_unpassed_progression_level(script))}
+        .bottombar.bottombartext.continue{style: 'bottom: 0; position: absolute'}= t('continue')
+    - else
+      %a{href: script_url(script.id)}
+        .bottombar.bottombartext.trynow{style: 'bottom: 0; position: absolute'}= t('home.trynow') 

dashboard/app/views/shared/_courseblock_action.haml

@@ -2,15 +2,13 @@
   .clear
 
   - script = Script.find_by_name(id)
-  - user_script = current_user.user_scripts.where(script_id: script.id).first
-  - next_unpassed_progression_level = current_user.next_unpassed_progression_level(script)
 
-  - if user_script.try(:completed_at) || (user_script && next_unpassed_progression_level.nil?)
+  - if current_user.completed? (script)
     = link_to script_certificate_image_url(current_user, script), class: 'whitelink' do
       .bottombar.smalltext.printcertificate
         = t('home.print_certificate')
-  - elsif next_unpassed_progression_level
-    %a.whitelink{href: build_script_level_url(next_unpassed_progression_level)}
+  - elsif current_user.working_on? (script)
+    %a.whitelink{href: build_script_level_url(current_user.next_unpassed_progression_level(script))}
       .bottombar.smalltext.continue
         = t('continue')
   - else

dashboard/app/views/shared/_user_stats.html.haml

@@ -27,11 +27,10 @@
               - puzzle_outer_class = 'puzzle_outer_level'
             %span{class: puzzle_outer_class}
               - link = url_from_path("/s/#{script_summary[:name]}/stage/#{stage[:position]}/puzzle/#{level[:position]}")
-              - if current_user.try(:admin?) # TODO remove when we ship this feature
-                - if current_user && current_user != user # viewing someone else's progress
-                  - link += "?user_id=#{user.id}"
-                - if @section
-                  - link += "&section_id=#{@section.id}"
+              - if current_user && current_user != user # viewing someone else's progress
+                - link += "?user_id=#{user.id}"
+              - if @section
+                - link += "&section_id=#{@section.id}"
               %a.level_link{href: link, class: status}
                 - if level[:kind] == 'unplugged'
                   %span.puzzle-named