central-develop into 0.17.x

kalite/coachreports/static/css/coachreports/exercise_mastery_view.css

@@ -0,0 +1,158 @@
+.selection {
+    float: left;
+    padding: 0 10px 10px 0;
+}
+
+#displaygrid {
+    width: 100%;
+    padding-top: 5px;
+    padding-left: 2px;
+}
+
+#displaygrid > .users {
+    width: 11%;
+    margin-right: 1px;
+    float: left;
+}
+
+.userstatus {
+    overflow: auto;
+    width: 88%;
+}
+
+.users table {
+    width: 100%;
+}
+
+#displaygrid table {
+    table-layout: fixed;
+}
+
+th, td {
+    border: 1px solid black;
+    padding: 2px;
+    vertical-align:middle;
+}
+
+.users th {
+    text-align: left;  
+}
+
+.subtitle {
+    font-size: 1.15em;
+    font-weight: bold;
+}
+
+.status {
+    height: 27px;
+    background-color: #EEE;
+}
+
+th.username {
+    height: 27px;
+    border: 1px solid black;
+    padding-left: 5px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+th.headrow, th.headrow div {
+    width: 80px;
+    font-weight: bold;
+    background-color: white;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+th.headrowuser {
+    font-weight: bold;
+}
+
+.complete {
+    background-color: #2F942F;
+}
+
+.partial {
+    background-color: #94BE48;
+}
+
+.struggle {
+    background-color: #CA4D4D;
+}
+
+#displaygrid td, #displaygrid th {
+    min-width: 60px;
+    max-width: 60px;
+    overflow: hidden;
+}
+
+#legend a {
+    height:12px;
+    margin:0px;
+    padding:0px;
+}
+
+.student-name, .attempts, .streak_progress, .points, .total_seconds_watched {
+    float:left;
+    display:none;
+    overflow:hidden;
+    white-space:nowrap;
+    width:100%;
+    margin:0px 5px 0px 0px;
+    padding:0px;
+    text-align:right;
+    vertical-align:middle;
+}
+
+.student-name {
+    float:none;
+    text-align:left;
+    display:block;
+    text-overflow: ellipsis;
+}
+
+#legend {
+    float:left;
+    vertical-align:middle;
+    margin:12px 25px 2px 10px;
+}
+
+.legend {
+    float:right;
+    width:160px;
+    height:20px;
+    text-align:center;
+    vertical-align:middle;
+    white-space:nowrap;
+    overflow:hidden;
+    border-style:solid;
+    border-width: 1px;
+    padding:2px;
+    margin-right: 10px;
+    font-weight: bold;
+}
+
+.legend div {
+    float:left;
+    width:35px;
+    height:21px;
+}
+
+#selection-bar {
+    overflow:hide;
+}
+
+#disp_options {
+    float:right;
+}
+
+.exercise-name {
+    height: 100px;
+    text-align: center;
+    vertical-align: none;
+    padding: 0px;
+}
+
+#exercise-mastery {
+    font-size: 10px
+}

kalite/coachreports/static/js/coachreports/exercise_mastery_view.js

@@ -0,0 +1,74 @@
+$(function() {
+
+    $("#student").change(function() {
+        window.location.href = setGetParam(window.location.href, "user", $("#student option:selected").val());
+    });
+
+    $("#playlist").change(function() {
+        window.location.href = setGetParam(window.location.href, "playlist", $("#playlist option:selected").val());
+    });
+
+    $("#facility").change(function() {
+        window.location.href = setGetParamDict(window.location.href, {
+            "facility": $("#facility option:selected").val(),
+            "group": $("#" + $("#facility option:selected").val() + "_group_select").val(),
+            "playlist": ""
+        });
+    });
+
+    $(".group_select").change(function(event) {
+        window.location.href = setGetParam(window.location.href, "group", $(event.target).val());
+    });
+
+    // Selector to toggle visible elements is stored in each option value
+    cell_height = 27;
+    $("#disp_options").change(function() {
+        selector = $("#disp_options option:selected").val();
+
+        // adjust the cell height
+        cell_height += 50 * Math.pow(-1, 0 + $(selector).is(":visible"));
+
+        // adjust view in data cells
+        $(selector).each(function() {
+            $(this).toggle();
+        });
+        $(selector).each(function() {
+            $(this).height(20);
+            $(this).parent().height(cell_height);
+        });
+
+        // Adjust student name cell heights
+        $("th.username").each(function() {
+            $(this).height(cell_height);
+        });
+    });
+    $(window).resize(function() {
+        $('.headrowuser').height($('.headrow.data').height());
+    }).resize();
+});
+
+$(function(){
+    $("#tree").dynatree({
+        persist: true,
+        expand: false,
+        checkbox: true,
+        selectMode: 3,
+        cookieId: "exercises",
+        children: null,
+
+        onPostInit: function(isReloading, isError) {
+            if (window.location.href.indexOf("&playlist=") == -1) {
+                $("#tree").dynatree("getTree").visit(function(node){
+                    node.select(false);
+                    node.expand(false);
+                });
+            }
+        },
+        onSelect: function(select, dtnode) {
+            var selKeys = $.map(dtnode.tree.getSelectedNodes(), function(dtnode){
+              return dtnode.data.key;
+            });
+            window.location.href = setGetParam(window.location.href, "playlist", selKeys);
+        }
+    });
+});

kalite/control_panel/api_resources.py

@@ -282,6 +282,23 @@ def alter_list_data_to_serialize(self, request, to_be_serialized):
             attempt_logs = AttemptLog.objects.filter(user=user, exercise_id=bundle.data["exercise_id"], context_type__in=["playlist", "exercise"])
             bundle.data["timestamp_first"] = attempt_logs.count() and attempt_logs.aggregate(Min('timestamp'))['timestamp__min'] or None
             bundle.data["timestamp_last"] = attempt_logs.count() and attempt_logs.aggregate(Max('timestamp'))['timestamp__max'] or None
+            bundle.data["unit"] = 0
+
+            # Anything done after Nov 15, 2014 is in the RCT which starts from Unit 101
+            if StoreTransactionLog.objects.filter(user=user, context_type="unit_points_reset", purchased_at__gte=datetime(2014, 11, 15, 0, 0, 0)).count() == 0:
+                bundle.data["unit"] = 101
+
+            elif bundle.data["timestamp_first"]:
+                for i in xrange(101,104):
+                    if StoreTransactionLog.objects.filter(user=user, context_id=i, context_type="unit_points_reset", purchased_at__gte=bundle.data["timestamp_first"]).count() > 0:
+                        bundle.data["unit"] = i
+                        break
+
+            # For entries we are not sure about the unit, we keep them as 0, mostly chances are that the unit would be the current_unit.
+            # As we can't predict the current unit on the central server, its better to have the value as 0.
+            # We can't predict the current unit because in some database we have unit_point_reset gift card for unit 101 whereas the current unit is also 101.
+            # So we can't find current_unit by saying that the first unit that doesn't have the unit_point_reset gift card is current_unit.
+
             bundle.data["part1_answered"] = AttemptLog.objects.filter(user=user, exercise_id=bundle.data["exercise_id"], context_type__in=["playlist", "exercise"]).count()
             bundle.data["part1_correct"] = AttemptLog.objects.filter(user=user, exercise_id=bundle.data["exercise_id"], correct=True, context_type__in=["playlist", "exercise"]).count()
             bundle.data["part2_attempted"] = AttemptLog.objects.filter(user=user, exercise_id=bundle.data["exercise_id"], context_type__in=["exercise_fixedblock", "playlist_fixedblock"]).count()

kalite/control_panel/static/js/control_panel/data_export/views.js

@@ -104,7 +104,7 @@ var ZoneSelectView = Backbone.View.extend({
 
     template: require('./hbtemplates/zone-select.handlebars'),
 
-    initialize: function() {
+    initialize: function(options) {
         // Create collections
         this.zone_list = new Models.ZoneCollection();
 
@@ -117,7 +117,7 @@ var ZoneSelectView = Backbone.View.extend({
             // Fetch collection by org_id
             this.zone_list.fetch({
                 data: $.param({
-                    "org_id": this.options.org_id,
+                    "org_id": options.org_id,
                     "limit": 0
                 })
             });

kalite/distributed/management/commands/screenshots.py

@@ -226,6 +226,9 @@ def __init__(self, *args, **kwargs):
         # After initializing the server (with setUp) and a browser, set the language
         self.set_session_language(kwargs['language'])
 
+        # After initializing the server (with setUp) and a browser, set the language
+        self.set_session_language(kwargs['language'])
+
         self.loginfo("==> Browser %s successfully setup with live_server_url %s." %
                  (self.browser.name, self.live_server_url,))
         self.loginfo("==> Saving screenshots to %s ..." % (settings.SCREENSHOTS_OUTPUT_PATH,))

kalite/distributed/static/js/distributed/bundle_modules/base.js

@@ -14,6 +14,9 @@ require("browsernizr/test/canvas");
 require("browsernizr/test/touchevents");
 var Modernizr = require("browsernizr");
 
+// Expose this as a global object for use in central server inline JS.
+global.getCookie = require("utils/get_cookie");
+
 global.$ = $;
 global._ = _;
 global.sessionModel = new SessionModel();

kalite/packages/bundled/fle_utils/django_utils/command.py

@@ -118,6 +118,73 @@ def call_command_async(cmd, *args, **kwargs):
         return call_command_subprocess(cmd, *args, **kwargs)
 
 
+def call_outside_command_with_output(command, *args, **kwargs):
+    """
+    Runs call_command for a KA Lite installation at the given location,
+    and returns the output.
+    """
+
+    if settings.IS_SOURCE:
+        assert "kalite_dir" in kwargs, "don't forget to specify the kalite_dir"
+        kalite_dir = kwargs.pop('kalite_dir')
+    else:
+        kalite_dir = None
+
+    # some custom variables that have to be put inside kwargs
+    # or else will mess up the way the command is called
+    output_to_stdout = kwargs.pop('output_to_stdout', False)
+    output_to_stderr = kwargs.pop('output_to_stderr', False)
+    wait = kwargs.pop('wait', True)
+
+    # build the command
+    if kalite_dir:
+        kalite_bin = os.path.join(kalite_dir, "bin", "kalite")
+    else:
+        kalite_bin = 'kalite'
+
+    cmd = (kalite_bin, "manage", command) if os.name != "nt" else (sys.executable, kalite_bin, "manage", command)
+    for arg in args:
+        cmd += (arg,)
+
+    kwargs_keys = kwargs.keys()
+
+    # Ensure --settings occurs first, as otherwise docopt parsing barfs
+    kwargs_keys = sorted(kwargs_keys, cmp=lambda x,y: -1 if x=="settings" else 0)
+
+    for key in kwargs_keys:
+        val = kwargs[key]
+        key = key.replace(u"_",u"-")
+        prefix = u"--" if command != "runcherrypyserver" else u""  # hack, but ... whatever!
+        if isinstance(val, bool):
+            cmd += (u"%s%s" % (prefix, key),)
+        else:
+            # TODO(jamalex): remove this replacement, after #4066 is fixed:
+            # https://github.com/learningequality/ka-lite/issues/4066
+            cleaned_val = unicode(val).replace(" ", "")
+            cmd += (u"%s%s=%s" % (prefix, key, cleaned_val),)
+
+    # we also need to change the environment to point to the the local
+    # kalite settings. This is especially important for when the
+    # central server calls this function, as if we don't change this,
+    # kalitectl.py wil look for centralserver.settings instead of
+    # kalite.settings.
+    new_env = os.environ.copy()
+    new_env["DJANGO_SETTINGS_MODULE"] = kwargs.get("settings") or "kalite.settings"
+
+    p = subprocess.Popen(
+        cmd,
+        shell=False,
+        # cwd=os.path.split(cmd[0])[0],
+        stdout=None if output_to_stdout else subprocess.PIPE,
+        stderr=None if output_to_stderr else subprocess.PIPE,
+        env=new_env,
+    )
+    out = p.communicate() if wait else (None, None)
+
+    # tuple output of stdout, stderr, exit code and process object
+    return out + (1 if out[1] else 0, p)
+
+
 class LocaleAwareCommand(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--locale',

kalite/packages/bundled/securesync/api_client.py

@@ -13,9 +13,9 @@
 
 class BaseClient(object):
 
-    def __init__(self, host="%s://%s/" % (settings.SECURESYNC_PROTOCOL, settings.CENTRAL_SERVER_HOST), require_trusted=True, verbose=True):
-        self.parsed_url = urllib2.urlparse.urlparse(host)
-        self.url = "%s://%s" % (self.parsed_url.scheme, self.parsed_url.netloc)
+    def __init__(self, host=None, require_trusted=True, verbose=True):
+        self.url = host or settings.CENTRAL_SERVER_URL
+        self.parsed_url = urllib2.urlparse.urlparse(self.url)
         self.require_trusted = require_trusted
         self.verbose = verbose